WIP on proto tx generator

simapp/cmd/simcli/main.go

@@ -24,7 +24,7 @@ import (
 )
 
 var (
-	appCodec, _, cdc = simapp.MakeCodecs()
+	appCodec, interfaceRegistry, cdc = simapp.MakeCodecs()
 )
 
 func init() {

simapp/cmd/simcli/proto.go

@@ -4,14 +4,17 @@ package main
 
 import (
 	"github.com/cosmos/cosmos-sdk/client/context"
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 func MakeTxCLIContext() context.CLIContext {
 	cliCtx := context.CLIContext{}
+	protoCdc := codec.NewProtoCodec(interfaceRegistry)
 	return cliCtx.
-		WithJSONMarshaler(appCodec).
-		WithTxGenerator(types.StdTxGenerator{Cdc: cdc}).
+		WithJSONMarshaler(protoCdc).
+		WithTxGenerator(signing.TxGenerator{Marshaler: protoCdc}).
 		WithAccountRetriever(types.NewAccountRetriever(appCodec)).
 		WithCodec(cdc)
 }

types/tx/signing/tx_generator.go

@@ -0,0 +1,94 @@
+package signing
+
+import (
+	"fmt"
+
+	"github.com/gogo/protobuf/proto"
+
+	"github.com/cosmos/cosmos-sdk/client/context"
+	"github.com/cosmos/cosmos-sdk/codec"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	types "github.com/cosmos/cosmos-sdk/types/tx"
+)
+
+type TxGenerator struct {
+	Marshaler codec.Marshaler
+}
+
+var _ context.TxGenerator = TxGenerator{}
+
+func (t TxGenerator) NewTx() context.TxBuilder {
+	return TxBuilder{}
+}
+
+func (t TxGenerator) NewFee() context.ClientFee {
+	panic("implement me")
+}
+
+func (t TxGenerator) NewSignature() context.ClientSignature {
+	panic("implement me")
+}
+
+func (t TxGenerator) MarshalTx(tx sdk.Tx) ([]byte, error) {
+	ptx, ok := tx.(*types.Tx)
+	if !ok {
+		return nil, fmt.Errorf("expected protobuf Tx, got %T", tx)
+	}
+	return t.Marshaler.MarshalBinaryBare(ptx)
+}
+
+type TxBuilder struct {
+	*types.Tx
+}
+
+var _ context.TxBuilder = TxBuilder{}
+
+func (t TxBuilder) GetTx() sdk.Tx {
+	return t.Tx
+}
+
+func (t TxBuilder) SetMsgs(msgs ...sdk.Msg) error {
+	anys := make([]*codectypes.Any, len(msgs))
+	for i, msg := range msgs {
+		pmsg, ok := msg.(proto.Message)
+		if !ok {
+			return fmt.Errorf("cannot proto marshal %T", msg)
+		}
+		any, err := codectypes.NewAnyWithValue(pmsg)
+		if err != nil {
+			return err
+		}
+		anys[i] = any
+	}
+	t.Body.Messages = anys
+	return nil
+}
+
+func (t TxBuilder) GetSignatures() []sdk.Signature {
+	panic("implement me")
+}
+
+func (t TxBuilder) SetSignatures(signature ...context.ClientSignature) error {
+	panic("implement me")
+}
+
+func (t TxBuilder) GetFee() sdk.Fee {
+	panic("implement me")
+}
+
+func (t TxBuilder) SetFee(fee context.ClientFee) error {
+	panic("implement me")
+}
+
+func (t TxBuilder) GetMemo() string {
+	panic("implement me")
+}
+
+func (t TxBuilder) SetMemo(s string) {
+	panic("implement me")
+}
+
+func (t TxBuilder) CanonicalSignBytes(cid string, num, seq uint64) ([]byte, error) {
+	panic("implement me")
+}

types/tx/tx.go

@@ -27,3 +27,43 @@ func (m *TxBody) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
 	}
 	return nil
 }
+
+var _ sdk.Tx = &Tx{}
+
+func (tx *Tx) GetMsgs() []sdk.Msg {
+	anys := tx.Body.Messages
+	res := make([]sdk.Msg, len(anys))
+	for i, any := range anys {
+		msg := any.GetCachedValue().(sdk.Msg)
+		res[i] = msg
+	}
+	return res
+}
+
+func (tx *Tx) ValidateBasic() error {
+	// TODO
+	//stdSigs := tx.GetSignatures()
+	//
+	//if tx.Fee.Gas > MaxGasWanted {
+	//	return sdkerrors.Wrapf(
+	//		sdkerrors.ErrInvalidRequest,
+	//		"invalid gas supplied; %d > %d", tx.Fee.Gas, MaxGasWanted,
+	//	)
+	//}
+	//if tx.Fee.Amount.IsAnyNegative() {
+	//	return sdkerrors.Wrapf(
+	//		sdkerrors.ErrInsufficientFee,
+	//		"invalid fee provided: %s", tx.Fee.Amount,
+	//	)
+	//}
+	//if len(stdSigs) == 0 {
+	//	return sdkerrors.ErrNoSignatures
+	//}
+	//if len(stdSigs) != len(tx.GetSigners()) {
+	//	return sdkerrors.Wrapf(
+	//		sdkerrors.ErrUnauthorized,
+	//		"wrong number of signers; expected %d, got %d", tx.GetSigners(), len(stdSigs),
+	//	)
+	//}
+	return nil
+}