diff --git a/client/tx.go b/client/tx.go new file mode 100644 index 0000000000..d7fdb82981 --- /dev/null +++ b/client/tx.go @@ -0,0 +1,42 @@ +package client + +import ( + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +type ( + // ClientMarshaler defines an interface that REST and CLI handler will use to + // create application-specific transactions and be able to serialize types + // specific to the application including transactions. + ClientMarshaler interface { + TxGenerator + codec.Marshaler + } + + // TxGenerator defines an interface a client can utilize to generate an + // application-defined concrete transaction type. The type returned must + // implement ClientTx. + TxGenerator interface { + NewTx() ClientTx + } + + // ClientTx defines an interface which an application-defined concrete transaction + // type must implement. Namely, it must be able to set messages, generate + // signatures, and provide canonical bytes to sign over. The transaction must + // also know how to encode itself. + ClientTx interface { + sdk.Tx + codec.ProtoMarshaler + + SetMsgs(...sdk.Msg) error + GetSignatures() []sdk.Signature + SetSignatures(...sdk.Signature) + GetFee() sdk.Fee + SetFee(sdk.Fee) + GetMemo() string + SetMemo(string) + + CanonicalSignBytes(cid string, num, seq uint64) ([]byte, error) + } +) diff --git a/codec/std/codec.pb.go b/codec/std/codec.pb.go index d5e09db4dc..4330171f9d 100644 --- a/codec/std/codec.pb.go +++ b/codec/std/codec.pb.go @@ -581,8 +581,8 @@ func (*Content) XXX_OneofWrappers() []interface{} { // processed by the state-machine. It contains a base of common fields and // repeated set of Message types. type Transaction struct { - Base types.StdTxBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base"` - Msgs []Message `protobuf:"bytes,2,rep,name=msgs,proto3" json:"msgs"` + types.StdTxBase `protobuf:"bytes,1,opt,name=base,proto3,embedded=base" json:""` + Msgs []Message `protobuf:"bytes,2,rep,name=msgs,proto3" json:"msgs"` } func (m *Transaction) Reset() { *m = Transaction{} } @@ -965,100 +965,100 @@ func init() { func init() { proto.RegisterFile("codec/std/codec.proto", fileDescriptor_daf09dc2dfa19bb4) } var fileDescriptor_daf09dc2dfa19bb4 = []byte{ - // 1476 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcd, 0x6f, 0xd4, 0xc6, - 0x1b, 0xf6, 0xc2, 0x92, 0x84, 0x49, 0x80, 0x30, 0x3f, 0xf8, 0x65, 0x95, 0xc2, 0x26, 0x04, 0x8a, - 0x5a, 0x50, 0xd6, 0x7c, 0xb4, 0x85, 0xac, 0x5a, 0x01, 0x49, 0x40, 0x4b, 0xd5, 0xb4, 0xc8, 0x81, - 0x54, 0xad, 0x68, 0xad, 0x59, 0xcf, 0xe0, 0x4c, 0xb3, 0xf6, 0xb8, 0x9e, 0xf1, 0x66, 0x73, 0xe8, - 0xbd, 0xad, 0x54, 0xa9, 0x52, 0xff, 0x01, 0xd4, 0x1e, 0x7b, 0xe5, 0xd8, 0x73, 0x85, 0x38, 0x71, - 0xec, 0x09, 0x55, 0x70, 0xa9, 0xfa, 0x57, 0x54, 0xf3, 0x61, 0xaf, 0xbd, 0xeb, 0xdd, 0x50, 0xa9, - 0x97, 0xc8, 0x33, 0xef, 0xfb, 0x3c, 0xef, 0x33, 0x9e, 0xf7, 0xc3, 0x1b, 0x70, 0xd2, 0x63, 0x98, - 0x78, 0x36, 0x17, 0xd8, 0x56, 0x4f, 0x8d, 0x28, 0x66, 0x82, 0xc1, 0x39, 0x8f, 0xf1, 0x80, 0x71, - 0x97, 0xe3, 0x9d, 0x86, 0xde, 0xe7, 0x02, 0x37, 0xba, 0x97, 0xe7, 0x2f, 0x8a, 0x6d, 0x1a, 0x63, - 0x37, 0x42, 0xb1, 0xd8, 0xb3, 0x95, 0xaf, 0xad, 0x5d, 0x97, 0xf3, 0x0b, 0xcd, 0x32, 0x7f, 0x7e, - 0xd8, 0xd9, 0x67, 0x3e, 0xeb, 0x3f, 0x19, 0xbf, 0x5a, 0xcf, 0x46, 0x89, 0xd8, 0xb6, 0xc5, 0x5e, - 0x44, 0xb8, 0xfe, 0x6b, 0x2c, 0x8b, 0xc6, 0xd2, 0x25, 0x5c, 0xd0, 0xd0, 0x2f, 0xf1, 0xa8, 0xf5, - 0xec, 0x36, 0x0a, 0x77, 0x4a, 0x2c, 0xf3, 0x3d, 0xdb, 0x8b, 0x29, 0xa7, 0xbc, 0x9c, 0x17, 0x53, - 0x2e, 0x62, 0xda, 0x4e, 0x04, 0x65, 0x61, 0x39, 0x9a, 0x27, 0x51, 0xd4, 0xd9, 0x2b, 0xb1, 0x9d, - 0xea, 0xd9, 0xa4, 0x4b, 0x31, 0x09, 0x3d, 0x52, 0x62, 0x9d, 0xeb, 0xd9, 0x3e, 0xeb, 0x96, 0xc3, - 0x78, 0x07, 0xf1, 0xed, 0xf2, 0x83, 0xbc, 0xd1, 0xb3, 0xb9, 0x40, 0x3b, 0xe5, 0xc6, 0xb3, 0x3d, - 0x3b, 0x42, 0x31, 0x0a, 0xd2, 0xb3, 0x44, 0x31, 0x8b, 0x18, 0x47, 0x9d, 0x41, 0x86, 0x24, 0xf2, - 0x63, 0x84, 0x4b, 0x54, 0x2d, 0xfd, 0x56, 0x05, 0x93, 0xb7, 0x3c, 0x8f, 0x25, 0xa1, 0x80, 0x77, - 0xc0, 0x4c, 0x1b, 0x71, 0xe2, 0x22, 0xbd, 0xae, 0x55, 0x16, 0x2b, 0x6f, 0x4d, 0x5f, 0x39, 0xd3, - 0xc8, 0x5d, 0x7a, 0xaf, 0x21, 0xdf, 0x7b, 0xa3, 0x7b, 0xb9, 0xb1, 0x8a, 0x38, 0x31, 0xc0, 0x96, - 0xe5, 0x4c, 0xb7, 0xfb, 0x4b, 0xd8, 0x05, 0xf3, 0x1e, 0x0b, 0x05, 0x0d, 0x13, 0x96, 0x70, 0xd7, - 0xdc, 0x51, 0xc6, 0x7a, 0x40, 0xb1, 0xbe, 0x57, 0xc6, 0xaa, 0x3d, 0x25, 0xfb, 0x5a, 0x86, 0xdf, - 0xd2, 0x9b, 0xfd, 0x50, 0x35, 0x6f, 0x84, 0x0d, 0x06, 0x60, 0x0e, 0x93, 0x0e, 0xda, 0x23, 0x78, - 0x28, 0xe8, 0x41, 0x15, 0xf4, 0xea, 0xf8, 0xa0, 0xeb, 0x1a, 0x3c, 0x14, 0xf1, 0x24, 0x2e, 0x33, - 0xc0, 0x08, 0xd4, 0x22, 0x12, 0x53, 0x86, 0xa9, 0x37, 0x14, 0xaf, 0xaa, 0xe2, 0xbd, 0x33, 0x3e, - 0xde, 0x3d, 0x83, 0x1e, 0x0a, 0xf8, 0xff, 0xa8, 0xd4, 0x02, 0x3f, 0x06, 0x47, 0x03, 0x86, 0x93, - 0x4e, 0xff, 0x8a, 0x0e, 0xa9, 0x38, 0x6f, 0x16, 0xe3, 0xe8, 0x04, 0x95, 0x11, 0x36, 0x94, 0x77, - 0x9f, 0xf8, 0x48, 0x90, 0xdf, 0x68, 0xae, 0x3c, 0x7b, 0xb2, 0xfc, 0xee, 0x05, 0x9f, 0x8a, 0xed, - 0xa4, 0xdd, 0xf0, 0x58, 0x60, 0xca, 0x34, 0x2d, 0x5d, 0x8e, 0x77, 0x6c, 0x53, 0x68, 0xa4, 0x17, - 0xb1, 0x58, 0x10, 0xdc, 0x30, 0xd0, 0xd5, 0x43, 0xe0, 0x20, 0x4f, 0x82, 0xa5, 0xef, 0x2b, 0x60, - 0x62, 0x53, 0x85, 0x83, 0xd7, 0xc1, 0x84, 0x0e, 0x6c, 0xf2, 0xa6, 0x3e, 0x4a, 0x94, 0xf6, 0x6f, - 0x59, 0x8e, 0xf1, 0x6f, 0xde, 0xf8, 0xeb, 0xf1, 0x42, 0xe5, 0xd9, 0x93, 0xe5, 0x6b, 0xfb, 0x49, - 0x31, 0x95, 0x97, 0x89, 0xd1, 0x4c, 0x77, 0x53, 0x31, 0x3f, 0x57, 0xc0, 0xd4, 0x6d, 0x53, 0x80, - 0xf0, 0x23, 0x30, 0x43, 0xbe, 0x4e, 0x68, 0x97, 0x79, 0x48, 0x96, 0xb2, 0x11, 0x75, 0xbe, 0x28, - 0x2a, 0x2d, 0x57, 0x29, 0xeb, 0x76, 0xce, 0xbb, 0x65, 0x39, 0x05, 0x74, 0xf3, 0x96, 0x91, 0xb8, - 0xb2, 0x8f, 0xc2, 0xac, 0xfe, 0x33, 0x8d, 0xa9, 0xa0, 0x54, 0xe4, 0xaf, 0x15, 0x70, 0x7c, 0x83, - 0xfb, 0x9b, 0x49, 0x3b, 0xa0, 0x22, 0x53, 0xfb, 0x01, 0x98, 0x4a, 0xa1, 0x65, 0x65, 0x97, 0xef, - 0xb5, 0x19, 0xa3, 0x93, 0x41, 0xe0, 0x06, 0xa8, 0xca, 0x02, 0x34, 0xb5, 0x65, 0x8f, 0x3e, 0xe4, - 0x50, 0x64, 0x59, 0xc6, 0xab, 0x53, 0x4f, 0x5f, 0x2c, 0x58, 0xcf, 0x5f, 0x2c, 0x54, 0x1c, 0x45, - 0xd3, 0x9c, 0xfa, 0xf6, 0xf1, 0x82, 0x25, 0x4f, 0xbc, 0xf4, 0x4b, 0x5e, 0xed, 0x3d, 0xd3, 0x5d, - 0x60, 0xcb, 0x84, 0xd3, 0x4a, 0x2f, 0x14, 0xc3, 0xf9, 0xac, 0x5b, 0x88, 0x94, 0xa2, 0xca, 0x22, - 0xc1, 0x26, 0x98, 0x94, 0xe5, 0x4c, 0xb2, 0xbe, 0xb0, 0x38, 0xf2, 0xd8, 0x6b, 0xda, 0xcf, 0x49, - 0x01, 0x39, 0x95, 0x3f, 0x55, 0xc0, 0x54, 0x26, 0xee, 0x46, 0x41, 0xdc, 0x99, 0x52, 0x71, 0x63, - 0x35, 0xdd, 0xfc, 0xd7, 0x9a, 0x56, 0xab, 0x92, 0xa2, 0xaf, 0xac, 0xaa, 0x54, 0x3d, 0xae, 0x82, - 0x49, 0xe3, 0x00, 0xaf, 0x81, 0xaa, 0x20, 0x3d, 0x31, 0x56, 0xd4, 0x7d, 0xd2, 0xcb, 0x5e, 0x56, - 0xcb, 0x72, 0x14, 0x00, 0x3e, 0x04, 0xb3, 0xaa, 0xc3, 0x13, 0x41, 0x62, 0xd7, 0xdb, 0x46, 0xa1, - 0x3f, 0xe2, 0x96, 0xf5, 0x1c, 0x50, 0x87, 0x4b, 0xfd, 0xd7, 0x94, 0x7b, 0x8e, 0xf2, 0x58, 0x54, - 0x34, 0xc1, 0x2f, 0xc0, 0x2c, 0x67, 0x8f, 0xc4, 0x2e, 0x8a, 0x89, 0x6b, 0x66, 0x84, 0x69, 0x95, - 0x97, 0x8a, 0xec, 0xc6, 0xa8, 0xca, 0xd7, 0x00, 0x1e, 0xe8, 0xad, 0x3c, 0x3d, 0x2f, 0x9a, 0x60, - 0x04, 0xe6, 0x3c, 0x14, 0x7a, 0xa4, 0xe3, 0x0e, 0x45, 0xa9, 0x96, 0x4d, 0x81, 0x5c, 0x94, 0x35, - 0x85, 0x1b, 0x1d, 0xeb, 0xa4, 0x57, 0xe6, 0x00, 0x3b, 0xe0, 0x84, 0xc7, 0x82, 0x20, 0x09, 0xa9, - 0xd8, 0x73, 0x23, 0xc6, 0x3a, 0x2e, 0x8f, 0x48, 0x88, 0x4d, 0x9f, 0xbc, 0x5e, 0x0c, 0x97, 0x1f, - 0xf5, 0xfa, 0x36, 0x0d, 0xf2, 0x1e, 0x63, 0x9d, 0x4d, 0x89, 0xcb, 0x05, 0x84, 0xde, 0x90, 0xb5, - 0x79, 0xdd, 0x74, 0x85, 0x4b, 0xfb, 0x74, 0x85, 0x6c, 0xee, 0x67, 0x09, 0xd3, 0x6f, 0x9f, 0xd3, - 0xf7, 0x63, 0x14, 0x72, 0xe4, 0x49, 0x11, 0x70, 0xa5, 0x90, 0xbb, 0x0b, 0xe5, 0x93, 0x77, 0x53, - 0xe0, 0xfb, 0x3d, 0x95, 0xb9, 0x3a, 0xed, 0xd2, 0x4a, 0xaa, 0x06, 0xdc, 0xe7, 0xb5, 0x03, 0x8b, - 0x07, 0xc7, 0xa6, 0xec, 0x06, 0xe1, 0x1c, 0xf9, 0x19, 0x56, 0x62, 0x9a, 0x55, 0x59, 0x49, 0x4b, - 0xbf, 0xcf, 0x80, 0x49, 0x63, 0x85, 0x4d, 0x30, 0x15, 0x70, 0xdf, 0xe5, 0xf2, 0xdd, 0x69, 0x31, - 0xa7, 0x8b, 0x62, 0xe4, 0xc7, 0x55, 0x5a, 0xe6, 0x24, 0xc4, 0x2d, 0xcb, 0x99, 0x0c, 0xf4, 0x23, - 0xfc, 0x10, 0x1c, 0x95, 0xd8, 0x20, 0xe9, 0x08, 0xaa, 0x19, 0x74, 0xc2, 0x2e, 0x8d, 0x64, 0xd8, - 0x90, 0xae, 0x86, 0x66, 0x26, 0xc8, 0xad, 0xe1, 0x97, 0xe0, 0x84, 0xe4, 0xea, 0x92, 0x98, 0x3e, - 0xda, 0x73, 0x69, 0xd8, 0x45, 0x31, 0x45, 0xd9, 0x3c, 0x1f, 0xe8, 0x3c, 0xfa, 0xb3, 0xce, 0x70, - 0x6e, 0x29, 0xc8, 0xdd, 0x14, 0x21, 0x6f, 0x30, 0x18, 0xda, 0x85, 0x21, 0xa8, 0xe9, 0x73, 0x0a, - 0x77, 0x97, 0x8a, 0x6d, 0x1c, 0xa3, 0x5d, 0x17, 0x61, 0x1c, 0x13, 0xce, 0x4d, 0x8a, 0x5e, 0x1d, - 0x9f, 0x33, 0xea, 0xfc, 0xe2, 0x53, 0x83, 0xbd, 0xa5, 0xa1, 0x32, 0x3f, 0x83, 0x32, 0x03, 0xfc, - 0x06, 0x9c, 0x96, 0xf1, 0xb2, 0x58, 0x98, 0x74, 0x88, 0x8f, 0x04, 0x8b, 0xdd, 0x98, 0xec, 0xa2, - 0xf8, 0x35, 0x13, 0x75, 0x83, 0xfb, 0x29, 0xf1, 0x7a, 0x4a, 0xe0, 0x28, 0x7c, 0xcb, 0x72, 0xe6, - 0x83, 0x91, 0x56, 0xf8, 0x5d, 0x05, 0x9c, 0x29, 0xc4, 0xef, 0xa2, 0x0e, 0xc5, 0x2a, 0xbe, 0x4c, - 0x6f, 0xca, 0xb9, 0x1c, 0x95, 0x13, 0x4a, 0xc3, 0xfb, 0xaf, 0xad, 0x61, 0x2b, 0x25, 0x59, 0xcb, - 0x38, 0x5a, 0x96, 0x53, 0x0f, 0xc6, 0x7a, 0xc0, 0x1d, 0x30, 0x27, 0xa5, 0x3c, 0x4a, 0x42, 0xec, - 0x16, 0x6b, 0xb6, 0x36, 0xa9, 0x04, 0x5c, 0xd9, 0x57, 0xc0, 0x9d, 0x24, 0xc4, 0x85, 0xa2, 0x6d, - 0x59, 0x8e, 0xcc, 0x97, 0xa1, 0x7d, 0xf8, 0x10, 0xfc, 0x4f, 0xdd, 0xb3, 0x9a, 0x48, 0x6e, 0x36, - 0x6a, 0xa7, 0x86, 0xd3, 0xa8, 0x58, 0x2c, 0x83, 0xe3, 0xb2, 0x65, 0x39, 0xc7, 0x83, 0xa1, 0xe9, - 0x5d, 0x64, 0x4f, 0x3f, 0xc2, 0x6b, 0x87, 0x5f, 0x97, 0x3d, 0xd7, 0x66, 0xfa, 0xec, 0xd9, 0x40, - 0x5b, 0xd1, 0xb5, 0xd8, 0x65, 0x82, 0xd4, 0x80, 0xa2, 0x3c, 0x35, 0x6a, 0xe2, 0x6e, 0x31, 0x41, - 0x4c, 0x29, 0xca, 0x47, 0xb8, 0x0a, 0xa6, 0x25, 0x14, 0x93, 0x88, 0x71, 0x2a, 0x6a, 0xd3, 0x65, - 0x6d, 0xa5, 0x8f, 0x5e, 0xd7, 0x6e, 0x2d, 0xcb, 0x01, 0x41, 0xb6, 0x82, 0xeb, 0x40, 0xae, 0xdc, - 0x24, 0xfc, 0x0a, 0xd1, 0x4e, 0x6d, 0x46, 0x51, 0x9c, 0x1d, 0xf8, 0xb6, 0x33, 0x3f, 0x5f, 0x0c, - 0xcf, 0x03, 0xe5, 0xda, 0xb2, 0x9c, 0xc3, 0x41, 0xba, 0x80, 0xae, 0x2e, 0x64, 0x2f, 0x26, 0x48, - 0x90, 0x7e, 0xda, 0xd5, 0x8e, 0x28, 0xbe, 0x8b, 0x03, 0x7c, 0xfa, 0x07, 0x8f, 0xa1, 0x5b, 0x53, - 0x98, 0x2c, 0x85, 0x4c, 0x25, 0x0f, 0xec, 0xc2, 0xcf, 0x80, 0xdc, 0x75, 0x09, 0xa6, 0x22, 0x47, - 0x7f, 0x54, 0xd1, 0xbf, 0x3d, 0x8e, 0xfe, 0x36, 0xa6, 0x22, 0x4f, 0x3e, 0x1b, 0x0c, 0xec, 0xc1, - 0xbb, 0x60, 0x46, 0xbf, 0x45, 0x55, 0x4c, 0xa4, 0x76, 0x4c, 0x91, 0x9e, 0x1b, 0x47, 0x6a, 0x0a, - 0x4f, 0x5e, 0xc6, 0x74, 0xd0, 0x5f, 0xa6, 0xaf, 0xa1, 0x4d, 0x7c, 0x1a, 0xba, 0x31, 0xc9, 0x28, - 0x67, 0xf7, 0x7f, 0x0d, 0xab, 0x12, 0xe3, 0x64, 0x10, 0xf3, 0x1a, 0x06, 0x76, 0xe1, 0x27, 0xba, - 0xf9, 0x26, 0x61, 0x46, 0x7d, 0xbc, 0xec, 0xc3, 0xb7, 0x48, 0xfd, 0x20, 0xcc, 0xb1, 0x1e, 0x09, - 0xf2, 0x1b, 0xcd, 0x0b, 0xcf, 0x9e, 0x2c, 0x9f, 0x1f, 0x3b, 0xdf, 0xf4, 0x64, 0x93, 0x0a, 0xcd, - 0x54, 0xfb, 0xa1, 0x02, 0x26, 0x37, 0xa9, 0x1f, 0xae, 0x33, 0x0f, 0xde, 0x29, 0x4c, 0xb4, 0x73, - 0x23, 0x27, 0x9a, 0xf1, 0x57, 0x63, 0x6d, 0x26, 0xfd, 0x20, 0xfb, 0xfb, 0x3f, 0x19, 0x6f, 0xab, - 0x37, 0x9f, 0xbe, 0xac, 0x57, 0x9e, 0xbf, 0xac, 0x57, 0xfe, 0x7c, 0x59, 0xaf, 0xfc, 0xf8, 0xaa, - 0x6e, 0x3d, 0x7f, 0x55, 0xb7, 0xfe, 0x78, 0x55, 0xb7, 0x3e, 0x1f, 0x7f, 0xb0, 0xec, 0x7f, 0x20, - 0xed, 0x09, 0xf5, 0x63, 0xf9, 0xea, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8c, 0xf7, 0xe4, 0x03, - 0x17, 0x11, 0x00, 0x00, + // 1478 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0xd4, 0x46, + 0x1b, 0xf7, 0xc2, 0x92, 0x84, 0x49, 0x80, 0x30, 0x2f, 0xbc, 0x59, 0xe5, 0x85, 0x4d, 0x08, 0xbc, + 0xa8, 0x05, 0x65, 0xcd, 0x47, 0x5b, 0x60, 0xd5, 0x0a, 0xf2, 0x01, 0x5a, 0xaa, 0xa6, 0x45, 0x0e, + 0xa4, 0x6a, 0x45, 0x6b, 0xcd, 0x7a, 0x06, 0x67, 0x9a, 0xb5, 0xc7, 0xf5, 0x8c, 0x37, 0x9b, 0x43, + 0xef, 0x6d, 0xa5, 0x4a, 0x55, 0xfb, 0x0f, 0xa0, 0xf6, 0xd8, 0x2b, 0xc7, 0x9e, 0x2b, 0xc4, 0x89, + 0x63, 0x4f, 0xa8, 0x82, 0x4b, 0xd5, 0xbf, 0xa2, 0x9a, 0x0f, 0x7b, 0xed, 0x5d, 0xef, 0x86, 0x1e, + 0x7a, 0x89, 0x3c, 0xf3, 0x3c, 0xbf, 0xdf, 0xf3, 0x1b, 0xcf, 0xf3, 0xe1, 0x0d, 0x38, 0xe9, 0x31, + 0x4c, 0x3c, 0x9b, 0x0b, 0x6c, 0xab, 0xa7, 0x46, 0x14, 0x33, 0xc1, 0xe0, 0x9c, 0xc7, 0x78, 0xc0, + 0xb8, 0xcb, 0xf1, 0x4e, 0x43, 0xef, 0x73, 0x81, 0x1b, 0xdd, 0xcb, 0xf3, 0x17, 0xc5, 0x36, 0x8d, + 0xb1, 0x1b, 0xa1, 0x58, 0xec, 0xd9, 0xca, 0xd7, 0xd6, 0xae, 0xcb, 0xf9, 0x85, 0x66, 0x99, 0x3f, + 0x3f, 0xec, 0xec, 0x33, 0x9f, 0xf5, 0x9f, 0x8c, 0x5f, 0xad, 0x67, 0xa3, 0x44, 0x6c, 0xdb, 0x62, + 0x2f, 0x22, 0x5c, 0xff, 0x35, 0x96, 0x45, 0x63, 0xe9, 0x12, 0x2e, 0x68, 0xe8, 0x97, 0x78, 0xd4, + 0x7a, 0x76, 0x1b, 0x85, 0x3b, 0x25, 0x96, 0xf9, 0x9e, 0xed, 0xc5, 0x94, 0x53, 0x5e, 0xce, 0x8b, + 0x29, 0x17, 0x31, 0x6d, 0x27, 0x82, 0xb2, 0xb0, 0x1c, 0xcd, 0x93, 0x28, 0xea, 0xec, 0x95, 0xd8, + 0x4e, 0xf5, 0x6c, 0xd2, 0xa5, 0x98, 0x84, 0x1e, 0x29, 0xb1, 0xce, 0xf5, 0x6c, 0x9f, 0x75, 0xcb, + 0x61, 0xbc, 0x83, 0xf8, 0x76, 0xf9, 0x41, 0xfe, 0xd7, 0xb3, 0xb9, 0x40, 0x3b, 0xe5, 0xc6, 0xb3, + 0x3d, 0x3b, 0x42, 0x31, 0x0a, 0xd2, 0xb3, 0x44, 0x31, 0x8b, 0x18, 0x47, 0x9d, 0x41, 0x86, 0x24, + 0xf2, 0x63, 0x84, 0x4b, 0x54, 0x2d, 0xfd, 0x5a, 0x05, 0x93, 0x2b, 0x9e, 0xc7, 0x92, 0x50, 0xc0, + 0x3b, 0x60, 0xa6, 0x8d, 0x38, 0x71, 0x91, 0x5e, 0xd7, 0x2a, 0x8b, 0x95, 0x37, 0xa6, 0xaf, 0x9c, + 0x69, 0xe4, 0x2e, 0xbd, 0xd7, 0x90, 0xef, 0xbd, 0xd1, 0xbd, 0xdc, 0x58, 0x45, 0x9c, 0x18, 0x60, + 0xcb, 0x72, 0xa6, 0xdb, 0xfd, 0x25, 0xec, 0x82, 0x79, 0x8f, 0x85, 0x82, 0x86, 0x09, 0x4b, 0xb8, + 0x6b, 0xee, 0x28, 0x63, 0x3d, 0xa0, 0x58, 0xdf, 0x29, 0x63, 0xd5, 0x9e, 0x92, 0x7d, 0x2d, 0xc3, + 0x6f, 0xe9, 0xcd, 0x7e, 0xa8, 0x9a, 0x37, 0xc2, 0x06, 0x03, 0x30, 0x87, 0x49, 0x07, 0xed, 0x11, + 0x3c, 0x14, 0xf4, 0xa0, 0x0a, 0x7a, 0x75, 0x7c, 0xd0, 0x75, 0x0d, 0x1e, 0x8a, 0x78, 0x12, 0x97, + 0x19, 0x60, 0x04, 0x6a, 0x11, 0x89, 0x29, 0xc3, 0xd4, 0x1b, 0x8a, 0x57, 0x55, 0xf1, 0xde, 0x1a, + 0x1f, 0xef, 0x9e, 0x41, 0x0f, 0x05, 0xfc, 0x6f, 0x54, 0x6a, 0x81, 0x1f, 0x82, 0xa3, 0x01, 0xc3, + 0x49, 0xa7, 0x7f, 0x45, 0x87, 0x54, 0x9c, 0xff, 0x17, 0xe3, 0xe8, 0x04, 0x95, 0x11, 0x36, 0x94, + 0x77, 0x9f, 0xf8, 0x48, 0x90, 0xdf, 0x68, 0xde, 0x78, 0xf6, 0x64, 0xf9, 0xed, 0x0b, 0x3e, 0x15, + 0xdb, 0x49, 0xbb, 0xe1, 0xb1, 0xc0, 0x94, 0x69, 0x5a, 0xba, 0x1c, 0xef, 0xd8, 0xa6, 0xd0, 0x48, + 0x2f, 0x62, 0xb1, 0x20, 0xb8, 0x61, 0xa0, 0xab, 0x87, 0xc0, 0x41, 0x9e, 0x04, 0x4b, 0xdf, 0x56, + 0xc0, 0xc4, 0xa6, 0x0a, 0x07, 0xaf, 0x83, 0x09, 0x1d, 0xd8, 0xe4, 0x4d, 0x7d, 0x94, 0x28, 0xed, + 0xdf, 0xb2, 0x1c, 0xe3, 0xdf, 0xbc, 0xf9, 0xe7, 0xe3, 0x85, 0xca, 0xb3, 0x27, 0xcb, 0xd7, 0xf6, + 0x93, 0x62, 0x2a, 0x2f, 0x13, 0xa3, 0x99, 0xee, 0xa6, 0x62, 0x7e, 0xaa, 0x80, 0xa9, 0xdb, 0xa6, + 0x00, 0xe1, 0x07, 0x60, 0x86, 0x7c, 0x99, 0xd0, 0x2e, 0xf3, 0x90, 0x2c, 0x65, 0x23, 0xea, 0x7c, + 0x51, 0x54, 0x5a, 0xae, 0x52, 0xd6, 0xed, 0x9c, 0x77, 0xcb, 0x72, 0x0a, 0xe8, 0xe6, 0x8a, 0x91, + 0x78, 0x63, 0x1f, 0x85, 0x59, 0xfd, 0x67, 0x1a, 0x53, 0x41, 0xa9, 0xc8, 0x5f, 0x2a, 0xe0, 0xf8, + 0x06, 0xf7, 0x37, 0x93, 0x76, 0x40, 0x45, 0xa6, 0xf6, 0x3d, 0x30, 0x95, 0x42, 0xcb, 0xca, 0x2e, + 0xdf, 0x6b, 0x33, 0x46, 0x27, 0x83, 0xc0, 0x0d, 0x50, 0x95, 0x05, 0x68, 0x6a, 0xcb, 0x1e, 0x7d, + 0xc8, 0xa1, 0xc8, 0xb2, 0x8c, 0x57, 0xa7, 0x9e, 0xbe, 0x58, 0xb0, 0x9e, 0xbf, 0x58, 0xa8, 0x38, + 0x8a, 0xa6, 0x39, 0xf5, 0xf5, 0xe3, 0x05, 0x4b, 0x9e, 0x78, 0xe9, 0xe7, 0xbc, 0xda, 0x7b, 0xa6, + 0xbb, 0xc0, 0x96, 0x09, 0xa7, 0x95, 0x5e, 0x28, 0x86, 0xf3, 0x59, 0xb7, 0x10, 0x29, 0x45, 0x95, + 0x45, 0x82, 0x4d, 0x30, 0x29, 0xcb, 0x99, 0x64, 0x7d, 0x61, 0x71, 0xe4, 0xb1, 0xd7, 0xb4, 0x9f, + 0x93, 0x02, 0x72, 0x2a, 0x7f, 0xac, 0x80, 0xa9, 0x4c, 0xdc, 0xcd, 0x82, 0xb8, 0x33, 0xa5, 0xe2, + 0xc6, 0x6a, 0xba, 0xf5, 0x8f, 0x35, 0xad, 0x56, 0x25, 0x45, 0x5f, 0x59, 0x55, 0xa9, 0x7a, 0x5c, + 0x05, 0x93, 0xc6, 0x01, 0x5e, 0x03, 0x55, 0x41, 0x7a, 0x62, 0xac, 0xa8, 0xfb, 0xa4, 0x97, 0xbd, + 0xac, 0x96, 0xe5, 0x28, 0x00, 0x7c, 0x08, 0x66, 0x55, 0x87, 0x27, 0x82, 0xc4, 0xae, 0xb7, 0x8d, + 0x42, 0x7f, 0xc4, 0x2d, 0xeb, 0x39, 0xa0, 0x0e, 0x97, 0xfa, 0xaf, 0x29, 0xf7, 0x1c, 0xe5, 0xb1, + 0xa8, 0x68, 0x82, 0x9f, 0x81, 0x59, 0xce, 0x1e, 0x89, 0x5d, 0x14, 0x13, 0xd7, 0xcc, 0x08, 0xd3, + 0x2a, 0x2f, 0x15, 0xd9, 0x8d, 0x51, 0x95, 0xaf, 0x01, 0x3c, 0xd0, 0x5b, 0x79, 0x7a, 0x5e, 0x34, + 0xc1, 0x08, 0xcc, 0x79, 0x28, 0xf4, 0x48, 0xc7, 0x1d, 0x8a, 0x52, 0x2d, 0x9b, 0x02, 0xb9, 0x28, + 0x6b, 0x0a, 0x37, 0x3a, 0xd6, 0x49, 0xaf, 0xcc, 0x01, 0x76, 0xc0, 0x09, 0x8f, 0x05, 0x41, 0x12, + 0x52, 0xb1, 0xe7, 0x46, 0x8c, 0x75, 0x5c, 0x1e, 0x91, 0x10, 0x9b, 0x3e, 0x79, 0xbd, 0x18, 0x2e, + 0x3f, 0xea, 0xf5, 0x6d, 0x1a, 0xe4, 0x3d, 0xc6, 0x3a, 0x9b, 0x12, 0x97, 0x0b, 0x08, 0xbd, 0x21, + 0x6b, 0xf3, 0xba, 0xe9, 0x0a, 0x97, 0xf6, 0xe9, 0x0a, 0xd9, 0xdc, 0xcf, 0x12, 0xc6, 0x34, 0x83, + 0x1f, 0x2a, 0x60, 0xfa, 0x7e, 0x8c, 0x42, 0x8e, 0x3c, 0x29, 0x02, 0xae, 0x14, 0x72, 0x77, 0xa1, + 0x7c, 0xf2, 0x6e, 0x0a, 0x7c, 0xbf, 0xa7, 0x32, 0x77, 0x26, 0xcd, 0xdc, 0xbf, 0x64, 0xfa, 0xa5, + 0x15, 0x55, 0x0d, 0xb8, 0xcf, 0x6b, 0x07, 0x16, 0x0f, 0x8e, 0x4d, 0xdd, 0x0d, 0xc2, 0x39, 0xf2, + 0x89, 0x49, 0x5d, 0x85, 0x69, 0x56, 0x65, 0x45, 0x2d, 0xfd, 0x36, 0x03, 0x26, 0x8d, 0x15, 0x36, + 0xc1, 0x54, 0xc0, 0x7d, 0x97, 0xcb, 0x77, 0xa8, 0x45, 0x9d, 0x2e, 0x8a, 0x92, 0x1f, 0x59, 0x69, + 0xb9, 0x93, 0x10, 0xb7, 0x2c, 0x67, 0x32, 0xd0, 0x8f, 0xf0, 0x7d, 0x70, 0x54, 0x62, 0x83, 0xa4, + 0x23, 0xa8, 0x66, 0xd0, 0x89, 0xbb, 0x34, 0x92, 0x61, 0x43, 0xba, 0x1a, 0x9a, 0x99, 0x20, 0xb7, + 0x86, 0x9f, 0x83, 0x13, 0x92, 0xab, 0x4b, 0x62, 0xfa, 0x68, 0xcf, 0xa5, 0x61, 0x17, 0xc5, 0x14, + 0x65, 0x73, 0x7d, 0xa0, 0x03, 0xe9, 0xcf, 0x3b, 0xc3, 0xb9, 0xa5, 0x20, 0x77, 0x53, 0x84, 0xbc, + 0xc9, 0x60, 0x68, 0x17, 0x86, 0xa0, 0xa6, 0xcf, 0x29, 0xdc, 0x5d, 0x2a, 0xb6, 0x71, 0x8c, 0x76, + 0x5d, 0x84, 0x71, 0x4c, 0x38, 0x37, 0xa9, 0x7a, 0x75, 0x7c, 0xee, 0xa8, 0xf3, 0x8b, 0x8f, 0x0d, + 0x76, 0x45, 0x43, 0x65, 0x9e, 0x06, 0x65, 0x06, 0xf8, 0x15, 0x38, 0x2d, 0xe3, 0x65, 0xb1, 0x30, + 0xe9, 0x10, 0x1f, 0x09, 0x16, 0xbb, 0x31, 0xd9, 0x45, 0xf1, 0x6b, 0x26, 0xec, 0x06, 0xf7, 0x53, + 0xe2, 0xf5, 0x94, 0xc0, 0x51, 0xf8, 0x96, 0xe5, 0xcc, 0x07, 0x23, 0xad, 0xf0, 0x9b, 0x0a, 0x38, + 0x53, 0x88, 0xdf, 0x45, 0x1d, 0x8a, 0x55, 0x7c, 0x99, 0xe6, 0x94, 0x73, 0x39, 0x32, 0x27, 0x94, + 0x86, 0x77, 0x5f, 0x5b, 0xc3, 0x56, 0x4a, 0xb2, 0x96, 0x71, 0xb4, 0x2c, 0xa7, 0x1e, 0x8c, 0xf5, + 0x80, 0x3b, 0x60, 0x4e, 0x4a, 0x79, 0x94, 0x84, 0xd8, 0x2d, 0xd6, 0x6e, 0x6d, 0x52, 0x09, 0xb8, + 0xb2, 0xaf, 0x80, 0x3b, 0x49, 0x88, 0x0b, 0xc5, 0xdb, 0xb2, 0x1c, 0x99, 0x2f, 0x43, 0xfb, 0xf0, + 0x21, 0xf8, 0x8f, 0xba, 0x67, 0x35, 0x99, 0xdc, 0x6c, 0xe4, 0x4e, 0x0d, 0xa7, 0x51, 0xb1, 0x58, + 0x06, 0xc7, 0x66, 0xcb, 0x72, 0x8e, 0x07, 0x43, 0x53, 0xbc, 0xc8, 0x9e, 0x7e, 0x8c, 0xd7, 0x0e, + 0xbf, 0x2e, 0x7b, 0xae, 0xdd, 0xf4, 0xd9, 0xb3, 0xc1, 0x76, 0x43, 0xd7, 0x62, 0x97, 0x09, 0x52, + 0x03, 0x8a, 0xf2, 0xd4, 0xa8, 0xc9, 0xbb, 0xc5, 0x04, 0x31, 0xa5, 0x28, 0x1f, 0xe1, 0x2a, 0x98, + 0x96, 0x50, 0x4c, 0x22, 0xc6, 0xa9, 0xa8, 0x4d, 0x97, 0xb5, 0x97, 0x3e, 0x7a, 0x5d, 0xbb, 0xb5, + 0x2c, 0x07, 0x04, 0xd9, 0x0a, 0xae, 0x03, 0xb9, 0x72, 0x93, 0xf0, 0x0b, 0x44, 0x3b, 0xb5, 0x19, + 0x45, 0x71, 0x76, 0xe0, 0x1b, 0xcf, 0xfc, 0x8c, 0x31, 0x3c, 0x0f, 0x94, 0x6b, 0xcb, 0x72, 0x0e, + 0x07, 0xe9, 0x02, 0xba, 0xba, 0x90, 0xbd, 0x98, 0x20, 0x41, 0xfa, 0x69, 0x57, 0x3b, 0xa2, 0xf8, + 0x2e, 0x0e, 0xf0, 0xe9, 0x1f, 0x3e, 0x86, 0x6e, 0x4d, 0x61, 0xb2, 0x14, 0x32, 0x95, 0x3c, 0xb0, + 0x0b, 0x3f, 0x01, 0x72, 0xd7, 0x25, 0x98, 0x8a, 0x1c, 0xfd, 0x51, 0x45, 0xff, 0xe6, 0x38, 0xfa, + 0xdb, 0x98, 0x8a, 0x3c, 0xf9, 0x6c, 0x30, 0xb0, 0x07, 0xef, 0x82, 0x19, 0xfd, 0x16, 0x55, 0x31, + 0x91, 0xda, 0x31, 0x45, 0x7a, 0x6e, 0x1c, 0xa9, 0x29, 0x3c, 0x79, 0x19, 0xd3, 0x41, 0x7f, 0x99, + 0xbe, 0x86, 0x36, 0xf1, 0x69, 0xe8, 0xc6, 0x24, 0xa3, 0x9c, 0xdd, 0xff, 0x35, 0xac, 0x4a, 0x8c, + 0x93, 0x41, 0xcc, 0x6b, 0x18, 0xd8, 0x85, 0x1f, 0xe9, 0xe6, 0x9b, 0x84, 0x19, 0xf5, 0xf1, 0xb2, + 0x0f, 0xe0, 0x22, 0xf5, 0x83, 0x30, 0xc7, 0x7a, 0x24, 0xc8, 0x6f, 0x34, 0x2f, 0x3c, 0x7b, 0xb2, + 0x7c, 0x7e, 0xec, 0x9c, 0xd3, 0x13, 0x4e, 0x2a, 0x34, 0xd3, 0xed, 0xbb, 0x0a, 0x98, 0xdc, 0xa4, + 0x7e, 0xb8, 0xce, 0x3c, 0x78, 0xa7, 0x30, 0xd9, 0xce, 0x8d, 0x9c, 0x6c, 0xc6, 0xff, 0xdf, 0x18, + 0x6f, 0xab, 0xb7, 0x9e, 0xbe, 0xac, 0x57, 0x9e, 0xbf, 0xac, 0x57, 0xfe, 0x78, 0x59, 0xaf, 0x7c, + 0xff, 0xaa, 0x6e, 0x3d, 0x7f, 0x55, 0xb7, 0x7e, 0x7f, 0x55, 0xb7, 0x3e, 0x1d, 0x7f, 0xb0, 0xec, + 0x7f, 0x21, 0xed, 0x09, 0xf5, 0xa3, 0xf9, 0xea, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x54, 0x48, + 0xa8, 0xb7, 0x1f, 0x11, 0x00, 0x00, } func (this *Supply) Equal(that interface{}) bool { @@ -2261,7 +2261,7 @@ func (m *Transaction) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } { - size, err := m.Base.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.StdTxBase.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2965,7 +2965,7 @@ func (m *Transaction) Size() (n int) { } var l int _ = l - l = m.Base.Size() + l = m.StdTxBase.Size() n += 1 + l + sovCodec(uint64(l)) if len(m.Msgs) > 0 { for _, e := range m.Msgs { @@ -4241,7 +4241,7 @@ func (m *Transaction) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Base", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field StdTxBase", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4268,7 +4268,7 @@ func (m *Transaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Base.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.StdTxBase.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/codec/std/codec.proto b/codec/std/codec.proto index f5ec7b9878..4f3f8034ad 100644 --- a/codec/std/codec.proto +++ b/codec/std/codec.proto @@ -106,8 +106,9 @@ message Content { message Transaction { option (gogoproto.goproto_getters) = false; - cosmos_sdk.x.auth.v1.StdTxBase base = 1 [(gogoproto.nullable) = false]; - repeated Message msgs = 2 [(gogoproto.nullable) = false]; + cosmos_sdk.x.auth.v1.StdTxBase base = 1 + [(gogoproto.jsontag) = "", (gogoproto.embed) = true, (gogoproto.nullable) = false]; + repeated Message msgs = 2 [(gogoproto.nullable) = false]; } // Message defines the set of valid concrete message types that can be used to diff --git a/docs/architecture/adr-020-protobuf-transaction-encoding.md b/docs/architecture/adr-020-protobuf-transaction-encoding.md index 1244cf24d2..6fd37bda8c 100644 --- a/docs/architecture/adr-020-protobuf-transaction-encoding.md +++ b/docs/architecture/adr-020-protobuf-transaction-encoding.md @@ -104,7 +104,6 @@ and messages. ```go type TxGenerator interface { NewTx() ClientTx - SignBytes func(chainID string, num, seq uint64, fee StdFee, msgs []sdk.Msg, memo string) ([]byte, error) } type ClientTx interface { @@ -112,12 +111,14 @@ type ClientTx interface { codec.ProtoMarshaler SetMsgs(...sdk.Msg) error - GetSignatures() []StdSignature - SetSignatures(...StdSignature) error - GetFee() StdFee - SetFee(StdFee) + GetSignatures() []sdk.Signature + SetSignatures(...sdk.Signature) + GetFee() sdk.Fee + SetFee(sdk.Fee) GetMemo() string SetMemo(string) + + CanonicalSignBytes(cid string, num, seq uint64) ([]byte, error) } ``` diff --git a/types/tx_msg.go b/types/tx_msg.go index 1b0da612b7..20ead7db19 100644 --- a/types/tx_msg.go +++ b/types/tx_msg.go @@ -2,45 +2,60 @@ package types import ( "encoding/json" + + "github.com/tendermint/tendermint/crypto" ) -// Transactions messages must fulfill the Msg -type Msg interface { +type ( +// Msg defines the interface a transaction message must fulfill. + Msg interface { - // Return the message type. - // Must be alphanumeric or empty. - Route() string + // Return the message type. + // Must be alphanumeric or empty. + Route() string - // Returns a human-readable string for the message, intended for utilization - // within tags - Type() string + // Returns a human-readable string for the message, intended for utilization + // within tags + Type() string - // ValidateBasic does a simple validation check that - // doesn't require access to any other information. - ValidateBasic() error + // ValidateBasic does a simple validation check that + // doesn't require access to any other information. + ValidateBasic() error - // Get the canonical byte representation of the Msg. - GetSignBytes() []byte + // Get the canonical byte representation of the Msg. + GetSignBytes() []byte - // Signers returns the addrs of signers that must sign. - // CONTRACT: All signatures must be present to be valid. - // CONTRACT: Returns addrs in some deterministic order. - GetSigners() []AccAddress -} + // Signers returns the addrs of signers that must sign. + // CONTRACT: All signatures must be present to be valid. + // CONTRACT: Returns addrs in some deterministic order. + GetSigners() []AccAddress + } -//__________________________________________________________ + // Fee defines an interface for an application application-defined concrete + // transaction type to be able to set and return the transaction fee. + Fee interface { + GetGas() uint64 + GetAmount() Coins + } -// Transactions objects must fulfill the Tx -type Tx interface { - // Gets the all the transaction's messages. - GetMsgs() []Msg + // Signature defines an interface for an application application-defined + // concrete transaction type to be able to set and return transaction signatures. + Signature interface { + GetPubKey() crypto.PubKey + GetSignature() []byte + } - // ValidateBasic does a simple and lightweight validation check that doesn't - // require access to any other information. - ValidateBasic() error -} +// Tx defines the interface a transaction must fulfill. + Tx interface { + // Gets the all the transaction's messages. + GetMsgs() []Msg + + // ValidateBasic does a simple and lightweight validation check that doesn't + // require access to any other information. + ValidateBasic() error + } +) -//__________________________________________________________ // TxDecoder unmarshals transaction bytes type TxDecoder func(txBytes []byte) (Tx, error) diff --git a/x/auth/alias.go b/x/auth/alias.go index ce005797b3..e34b9ec68d 100644 --- a/x/auth/alias.go +++ b/x/auth/alias.go @@ -59,6 +59,9 @@ var ( MakeSignature = types.MakeSignature ValidateGenAccounts = types.ValidateGenAccounts GetGenesisStateFromAppState = types.GetGenesisStateFromAppState + NewStdSignature = types.NewStdSignature + NewStdTxBase = types.NewStdTxBase + NewStdSignDocBase = types.NewStdSignDocBase // variable aliases ModuleCdc = types.ModuleCdc @@ -89,4 +92,5 @@ type ( GenesisAccountIterator = types.GenesisAccountIterator Codec = types.Codec StdSignDocBase = types.StdSignDocBase + StdTxBase = types.StdTxBase ) diff --git a/x/auth/types/types.pb.go b/x/auth/types/types.pb.go index 699182bc8d..69e8d5a860 100644 --- a/x/auth/types/types.pb.go +++ b/x/auth/types/types.pb.go @@ -108,20 +108,6 @@ func (m *StdFee) XXX_DiscardUnknown() { var xxx_messageInfo_StdFee proto.InternalMessageInfo -func (m *StdFee) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Amount - } - return nil -} - -func (m *StdFee) GetGas() uint64 { - if m != nil { - return m.Gas - } - return 0 -} - // StdSignature defines a signature structure that contains the signature of a // transaction and an optional public key. type StdSignature struct { @@ -391,56 +377,56 @@ func init() { proto.RegisterFile("x/auth/types/types.proto", fileDescriptor_2d52 var fileDescriptor_2d526fa662daab74 = []byte{ // 803 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xc6, 0x5b, 0x27, 0x99, 0x84, 0x42, 0x26, 0x6e, 0xeb, 0x5a, 0xd1, 0x8e, 0xb5, 0x07, - 0x64, 0x24, 0xb2, 0xc6, 0x86, 0x20, 0xc5, 0x07, 0x44, 0xd6, 0xa1, 0xa2, 0x2a, 0x54, 0xd5, 0x18, - 0x71, 0x40, 0x42, 0xab, 0xf1, 0xee, 0x74, 0xbd, 0x72, 0xd6, 0xbb, 0xdd, 0x99, 0x8d, 0xbc, 0xb9, - 0x70, 0x45, 0x9c, 0x38, 0x72, 0x23, 0x67, 0xfe, 0x92, 0x1e, 0x7b, 0xe4, 0xb4, 0x45, 0xce, 0x05, - 0x71, 0x5c, 0x6e, 0x9c, 0xd0, 0xcc, 0xf8, 0x67, 0x71, 0x11, 0xa8, 0x17, 0x7b, 0xe6, 0xcd, 0xfb, - 0xbe, 0xf7, 0xfc, 0xcd, 0x37, 0xcf, 0xa0, 0x36, 0x69, 0x91, 0x94, 0x0f, 0x5b, 0x3c, 0x8b, 0x29, - 0x53, 0x9f, 0x56, 0x9c, 0x44, 0x3c, 0x82, 0x55, 0x37, 0x62, 0x61, 0xc4, 0x1c, 0xe6, 0x8d, 0xac, - 0x89, 0x25, 0x92, 0xac, 0xcb, 0x76, 0xfd, 0x5d, 0x3e, 0x0c, 0x12, 0xcf, 0x89, 0x49, 0xc2, 0xb3, - 0x96, 0x4c, 0x6c, 0xf9, 0x91, 0x1f, 0x2d, 0x57, 0x0a, 0x5d, 0x3f, 0xf8, 0x07, 0xa1, 0xf9, 0xc3, - 0x16, 0xd8, 0xb3, 0x09, 0xa3, 0x67, 0xae, 0x1b, 0xa5, 0x63, 0x0e, 0x1f, 0x81, 0x6d, 0xe2, 0x79, - 0x09, 0x65, 0xac, 0xa6, 0x35, 0xb4, 0xe6, 0xbe, 0xdd, 0xfe, 0x2b, 0x47, 0xc7, 0x7e, 0xc0, 0x87, - 0xe9, 0xc0, 0x72, 0xa3, 0xb0, 0xa5, 0x1a, 0x98, 0x7d, 0x1d, 0x33, 0x6f, 0x34, 0xa3, 0x3b, 0x73, - 0xdd, 0x33, 0x05, 0xc4, 0x73, 0x06, 0xf8, 0x00, 0x6c, 0xc7, 0xe9, 0xc0, 0x19, 0xd1, 0xac, 0xb6, - 0x25, 0xc9, 0x8e, 0xff, 0xc8, 0x51, 0x35, 0x4e, 0x07, 0x17, 0x81, 0x2b, 0xa2, 0xef, 0x47, 0x61, - 0xc0, 0x69, 0x18, 0xf3, 0xac, 0xc8, 0xd1, 0x41, 0x46, 0xc2, 0x8b, 0xae, 0xb9, 0x3c, 0x35, 0x71, - 0x25, 0x4e, 0x07, 0x8f, 0x68, 0x06, 0x3f, 0x05, 0xb7, 0x89, 0xea, 0xcf, 0x19, 0xa7, 0xe1, 0x80, - 0x26, 0xb5, 0x72, 0x43, 0x6b, 0xea, 0xf6, 0xfd, 0x22, 0x47, 0x77, 0x14, 0x6c, 0xfd, 0xdc, 0xc4, - 0x6f, 0xcd, 0x02, 0x8f, 0xe5, 0x1e, 0xd6, 0xc1, 0x0e, 0xa3, 0xcf, 0x52, 0x3a, 0x76, 0x69, 0x4d, - 0x17, 0x58, 0xbc, 0xd8, 0x77, 0x77, 0xbe, 0xbf, 0x46, 0xa5, 0x9f, 0xae, 0x51, 0xc9, 0xfc, 0x0e, - 0x54, 0xfa, 0xdc, 0x7b, 0x40, 0x29, 0xfc, 0x16, 0x54, 0x48, 0x28, 0xf0, 0x35, 0xad, 0x51, 0x6e, - 0xee, 0x75, 0x0e, 0xad, 0x15, 0xe1, 0x2f, 0xdb, 0x56, 0x2f, 0x0a, 0xc6, 0xf6, 0x07, 0xcf, 0x73, - 0x54, 0xfa, 0xe5, 0x25, 0x6a, 0xfe, 0x07, 0x79, 0x04, 0x80, 0xe1, 0x19, 0x29, 0x7c, 0x07, 0x94, - 0x7d, 0xc2, 0xa4, 0x28, 0x3a, 0x16, 0xcb, 0xae, 0xfe, 0xfb, 0x35, 0xd2, 0xcc, 0x2b, 0xb0, 0xdf, - 0xe7, 0x5e, 0x3f, 0xf0, 0xc7, 0x84, 0xa7, 0x09, 0x5d, 0x15, 0x50, 0x7b, 0x13, 0x01, 0x8f, 0xc0, - 0x2e, 0x9b, 0x93, 0xaa, 0xab, 0xc0, 0xcb, 0x40, 0x57, 0x17, 0x02, 0x98, 0x2f, 0xcb, 0xa0, 0xf2, - 0x84, 0x24, 0x24, 0x64, 0xf0, 0x31, 0x38, 0x0c, 0xc9, 0xc4, 0x09, 0x69, 0x18, 0x39, 0xee, 0x90, - 0x24, 0xc4, 0xe5, 0x34, 0x51, 0x86, 0xd0, 0x6d, 0xa3, 0xc8, 0x51, 0x5d, 0x95, 0xda, 0x90, 0x64, - 0xe2, 0x83, 0x90, 0x4c, 0xbe, 0xa4, 0x61, 0xd4, 0x5b, 0xc4, 0xe0, 0x29, 0xd8, 0xe7, 0x13, 0x87, - 0x05, 0xbe, 0x73, 0x11, 0x84, 0x01, 0x57, 0xbf, 0xdb, 0xbe, 0x57, 0xe4, 0xe8, 0x50, 0x11, 0xad, - 0x9e, 0x9a, 0x18, 0xf0, 0x49, 0x3f, 0xf0, 0xbf, 0x10, 0x1b, 0x88, 0xc1, 0x1d, 0x79, 0x78, 0x45, - 0x1d, 0x37, 0x62, 0xdc, 0x89, 0x69, 0xe2, 0x0c, 0x32, 0x4e, 0x67, 0x0e, 0x68, 0x14, 0x39, 0x3a, - 0x5a, 0xe1, 0x78, 0x35, 0xcd, 0xc4, 0x07, 0x82, 0xec, 0x8a, 0xf6, 0x22, 0xc6, 0x9f, 0xd0, 0xc4, - 0xce, 0x38, 0x85, 0xcf, 0xc0, 0x3d, 0x51, 0xed, 0x92, 0x26, 0xc1, 0xd3, 0x4c, 0xe5, 0x53, 0xaf, - 0x73, 0x72, 0xd2, 0x3e, 0x55, 0xde, 0xb0, 0xbb, 0xd3, 0x1c, 0x55, 0xfb, 0x81, 0xff, 0xb5, 0xcc, - 0x10, 0xd0, 0xcf, 0xce, 0xe5, 0x79, 0x91, 0x23, 0x43, 0x55, 0x7b, 0x0d, 0x81, 0x89, 0xab, 0x6c, - 0x0d, 0xa7, 0xc2, 0x30, 0x03, 0xf7, 0x5f, 0x45, 0x30, 0xea, 0xc6, 0x9d, 0x93, 0x8f, 0x47, 0xed, - 0xda, 0x2d, 0x59, 0xf4, 0x93, 0x69, 0x8e, 0xee, 0xae, 0x15, 0xed, 0xcf, 0x33, 0x8a, 0x1c, 0x35, - 0x36, 0x97, 0x5d, 0x90, 0x98, 0xf8, 0x2e, 0xdb, 0x88, 0xed, 0xee, 0x08, 0x6b, 0x4b, 0x77, 0xfd, - 0xac, 0x81, 0xdd, 0x3e, 0xf7, 0xbe, 0x9a, 0x88, 0x07, 0x0f, 0x3f, 0x02, 0xe5, 0xa7, 0x94, 0xca, - 0x4b, 0xdd, 0xeb, 0x1c, 0x59, 0x9b, 0x06, 0x8b, 0xa5, 0x5e, 0x83, 0xad, 0x0b, 0xa3, 0x63, 0x91, - 0x0e, 0x3f, 0x07, 0x60, 0x61, 0x1c, 0x61, 0x60, 0xf1, 0x38, 0xcc, 0xd7, 0x82, 0x17, 0x4e, 0x9e, - 0x51, 0xac, 0x60, 0x21, 0x04, 0xba, 0xf0, 0x8e, 0xbc, 0xc8, 0x5d, 0x2c, 0xd7, 0xe6, 0x9f, 0x1a, - 0xb8, 0x3d, 0x83, 0x9d, 0x47, 0xae, 0x6c, 0xf3, 0x14, 0xec, 0xb8, 0x43, 0x12, 0x8c, 0x9d, 0xc0, - 0x93, 0xbd, 0xee, 0xda, 0xc6, 0x34, 0x47, 0xdb, 0x3d, 0x11, 0x7b, 0x78, 0x5e, 0xe4, 0xe8, 0x6d, - 0xa5, 0xcc, 0x3c, 0xc9, 0xc4, 0xdb, 0x72, 0xf9, 0xd0, 0xdb, 0x30, 0x36, 0xb6, 0xde, 0x60, 0x6c, - 0x94, 0xd7, 0xc7, 0xc6, 0xa2, 0x7f, 0x7d, 0xd9, 0xff, 0x5c, 0xd3, 0x5b, 0xff, 0x4b, 0x53, 0xbb, - 0xf7, 0x7c, 0x6a, 0x68, 0x2f, 0xa6, 0x86, 0xf6, 0xdb, 0xd4, 0xd0, 0x7e, 0xbc, 0x31, 0x4a, 0x2f, - 0x6e, 0x8c, 0xd2, 0xaf, 0x37, 0x46, 0xe9, 0x9b, 0xf7, 0xfe, 0x75, 0xb2, 0xac, 0xfe, 0x4b, 0x0c, - 0x2a, 0x72, 0x9e, 0x7f, 0xf8, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2, 0xcf, 0xcb, 0xc3, 0x3c, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x8f, 0xdb, 0x44, + 0x14, 0x8e, 0x37, 0x6e, 0x36, 0x99, 0x5d, 0x0a, 0x99, 0x4d, 0xdb, 0x34, 0x5a, 0x79, 0x22, 0x1f, + 0x50, 0x90, 0x58, 0x87, 0x04, 0x16, 0x69, 0x73, 0x40, 0xac, 0xb3, 0x54, 0x54, 0x85, 0xaa, 0x9a, + 0x20, 0x0e, 0x48, 0xc8, 0x9a, 0xd8, 0x53, 0xc7, 0xca, 0x3a, 0x76, 0x3d, 0xe3, 0x55, 0xbc, 0x57, + 0x2e, 0x88, 0x13, 0xc7, 0xde, 0xd8, 0x33, 0x7f, 0x49, 0x8f, 0x3d, 0x72, 0x72, 0x51, 0xf6, 0x82, + 0x38, 0x9a, 0x1b, 0x27, 0x34, 0x9e, 0xfc, 0x2c, 0x29, 0xa2, 0xda, 0x4b, 0x32, 0xf3, 0xe6, 0xfb, + 0xbe, 0xf7, 0xf2, 0xe6, 0x9b, 0x17, 0x50, 0x9f, 0xb6, 0x49, 0xcc, 0x47, 0x6d, 0x9e, 0x84, 0x94, + 0xc9, 0x4f, 0x23, 0x8c, 0x02, 0x1e, 0xc0, 0x9a, 0x1d, 0x30, 0x3f, 0x60, 0x16, 0x73, 0xc6, 0xc6, + 0xd4, 0x10, 0x20, 0xe3, 0xa2, 0xd3, 0x78, 0x9f, 0x8f, 0xbc, 0xc8, 0xb1, 0x42, 0x12, 0xf1, 0xa4, + 0x9d, 0x03, 0xdb, 0x6e, 0xe0, 0x06, 0xab, 0x95, 0x64, 0x37, 0xaa, 0xff, 0x12, 0xd4, 0x7f, 0xda, + 0x01, 0x7b, 0x26, 0x61, 0xf4, 0xd4, 0xb6, 0x83, 0x78, 0xc2, 0xe1, 0x23, 0xb0, 0x4b, 0x1c, 0x27, + 0xa2, 0x8c, 0xd5, 0x95, 0xa6, 0xd2, 0xda, 0x37, 0x3b, 0x7f, 0xa7, 0xe8, 0xc8, 0xf5, 0xf8, 0x28, + 0x1e, 0x1a, 0x76, 0xe0, 0xb7, 0x65, 0x01, 0xf3, 0xaf, 0x23, 0xe6, 0x8c, 0xe7, 0x72, 0xa7, 0xb6, + 0x7d, 0x2a, 0x89, 0x78, 0xa1, 0x00, 0x1f, 0x80, 0xdd, 0x30, 0x1e, 0x5a, 0x63, 0x9a, 0xd4, 0x77, + 0x72, 0xb1, 0xa3, 0x3f, 0x53, 0x54, 0x0b, 0xe3, 0xe1, 0xb9, 0x67, 0x8b, 0xe8, 0x87, 0x81, 0xef, + 0x71, 0xea, 0x87, 0x3c, 0xc9, 0x52, 0x54, 0x4d, 0x88, 0x7f, 0xde, 0xd3, 0x57, 0xa7, 0x3a, 0x2e, + 0x85, 0xf1, 0xf0, 0x11, 0x4d, 0xe0, 0xe7, 0xe0, 0x36, 0x91, 0xf5, 0x59, 0x93, 0xd8, 0x1f, 0xd2, + 0xa8, 0x5e, 0x6c, 0x2a, 0x2d, 0xd5, 0xbc, 0x9f, 0xa5, 0xe8, 0x8e, 0xa4, 0x6d, 0x9e, 0xeb, 0xf8, + 0x9d, 0x79, 0xe0, 0x71, 0xbe, 0x87, 0x0d, 0x50, 0x66, 0xf4, 0x59, 0x4c, 0x27, 0x36, 0xad, 0xab, + 0x82, 0x8b, 0x97, 0xfb, 0x5e, 0xf9, 0xc7, 0x2b, 0x54, 0x78, 0x7e, 0x85, 0x0a, 0xfa, 0x0f, 0x0a, + 0x28, 0x0d, 0xb8, 0xf3, 0x80, 0x52, 0xf8, 0x3d, 0x28, 0x11, 0x5f, 0x08, 0xd4, 0x95, 0x66, 0xb1, + 0xb5, 0xd7, 0x3d, 0x30, 0xd6, 0x3a, 0x7f, 0xd1, 0x31, 0xfa, 0x81, 0x37, 0x31, 0x3f, 0x7a, 0x91, + 0xa2, 0xc2, 0xaf, 0xaf, 0x50, 0xeb, 0x7f, 0xf4, 0x47, 0x10, 0x18, 0x9e, 0x8b, 0xc2, 0xf7, 0x40, + 0xd1, 0x25, 0x2c, 0xef, 0x8a, 0x8a, 0xc5, 0x52, 0x56, 0xf1, 0xc7, 0x15, 0x52, 0xf4, 0x4b, 0xb0, + 0x3f, 0xe0, 0xce, 0xc0, 0x73, 0x27, 0x84, 0xc7, 0x11, 0x5d, 0xef, 0xa2, 0x72, 0x93, 0x2e, 0x1e, + 0x82, 0x0a, 0x5b, 0x88, 0xca, 0xfb, 0xc0, 0xab, 0x40, 0x4f, 0x15, 0xf9, 0xf5, 0x57, 0x45, 0x50, + 0x7a, 0x42, 0x22, 0xe2, 0x33, 0xf8, 0x18, 0x1c, 0xf8, 0x64, 0x6a, 0xf9, 0xd4, 0x0f, 0x2c, 0x7b, + 0x44, 0x22, 0x62, 0x73, 0x1a, 0x49, 0x57, 0xa8, 0xa6, 0x96, 0xa5, 0xa8, 0x21, 0x53, 0x6d, 0x01, + 0xe9, 0xb8, 0xea, 0x93, 0xe9, 0xd7, 0xd4, 0x0f, 0xfa, 0xcb, 0x18, 0x3c, 0x01, 0xfb, 0x7c, 0x6a, + 0x31, 0xcf, 0xb5, 0xce, 0x3d, 0xdf, 0xe3, 0xf2, 0xb7, 0x9b, 0xf7, 0xb2, 0x14, 0x1d, 0x48, 0xa1, + 0xf5, 0x53, 0x1d, 0x03, 0x3e, 0x1d, 0x78, 0xee, 0x57, 0x62, 0x03, 0x31, 0xb8, 0x93, 0x1f, 0x5e, + 0x52, 0xcb, 0x0e, 0x18, 0xb7, 0x42, 0x1a, 0x59, 0xc3, 0x84, 0xd3, 0xb9, 0x0d, 0x9a, 0x59, 0x8a, + 0x0e, 0xd7, 0x34, 0x5e, 0x87, 0xe9, 0xb8, 0x2a, 0xc4, 0x2e, 0x69, 0x3f, 0x60, 0xfc, 0x09, 0x8d, + 0xcc, 0x84, 0x53, 0xf8, 0x0c, 0xdc, 0x13, 0xd9, 0x2e, 0x68, 0xe4, 0x3d, 0x4d, 0x24, 0x9e, 0x3a, + 0xdd, 0xe3, 0xe3, 0xce, 0x89, 0x34, 0x88, 0xd9, 0x9b, 0xa5, 0xa8, 0x36, 0xf0, 0xdc, 0x6f, 0x73, + 0x84, 0xa0, 0x7e, 0x71, 0x96, 0x9f, 0x67, 0x29, 0xd2, 0x64, 0xb6, 0x37, 0x08, 0xe8, 0xb8, 0xc6, + 0x36, 0x78, 0x32, 0x0c, 0x13, 0x70, 0xff, 0x75, 0x06, 0xa3, 0x76, 0xd8, 0x3d, 0xfe, 0x74, 0xdc, + 0xa9, 0xdf, 0xca, 0x93, 0x7e, 0x36, 0x4b, 0xd1, 0xdd, 0x8d, 0xa4, 0x83, 0x05, 0x22, 0x4b, 0x51, + 0x73, 0x7b, 0xda, 0xa5, 0x88, 0x8e, 0xef, 0xb2, 0xad, 0xdc, 0x5e, 0xf9, 0xf9, 0xc2, 0x5d, 0xbf, + 0x28, 0xa0, 0x32, 0xe0, 0xce, 0x37, 0x53, 0xf1, 0xea, 0xe1, 0x27, 0xa0, 0xf8, 0x94, 0xd2, 0xfc, + 0x52, 0xf7, 0xba, 0x87, 0xc6, 0xb6, 0xe9, 0x62, 0xc8, 0x17, 0x61, 0xaa, 0xc2, 0xec, 0x58, 0xc0, + 0xe1, 0x97, 0x00, 0x2c, 0x8d, 0x23, 0x4c, 0x2c, 0x1e, 0x88, 0xfe, 0x46, 0xf2, 0xd2, 0xc9, 0x73, + 0x89, 0x35, 0x2e, 0x84, 0x40, 0x15, 0xde, 0xc9, 0x2f, 0xb2, 0x82, 0xf3, 0xb5, 0xfe, 0x97, 0x02, + 0x6e, 0xcf, 0x69, 0x67, 0x81, 0x9d, 0x97, 0x79, 0x02, 0xca, 0xf6, 0x88, 0x78, 0x13, 0xcb, 0x73, + 0xf2, 0x5a, 0x2b, 0xa6, 0x36, 0x4b, 0xd1, 0x6e, 0x5f, 0xc4, 0x1e, 0x9e, 0x65, 0x29, 0x7a, 0x57, + 0x76, 0x66, 0x01, 0xd2, 0xf1, 0x6e, 0xbe, 0x7c, 0xe8, 0x6c, 0x99, 0x1d, 0x3b, 0x37, 0x98, 0x1d, + 0xc5, 0xcd, 0xd9, 0xb1, 0xac, 0x5f, 0x5d, 0xd5, 0xbf, 0xe8, 0xe9, 0xad, 0xb7, 0xea, 0xa9, 0xd9, + 0x7f, 0x31, 0xd3, 0x94, 0x97, 0x33, 0x4d, 0xf9, 0x7d, 0xa6, 0x29, 0x3f, 0x5f, 0x6b, 0x85, 0x97, + 0xd7, 0x5a, 0xe1, 0xb7, 0x6b, 0xad, 0xf0, 0xdd, 0x07, 0xff, 0x39, 0x5d, 0xd6, 0xff, 0x2a, 0x86, + 0xa5, 0x7c, 0xa8, 0x7f, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0xb1, 0x78, 0x7e, 0x41, 0x06, 0x00, 0x00, } diff --git a/x/auth/types/types.proto b/x/auth/types/types.proto index e15e0342f1..305b5368ff 100644 --- a/x/auth/types/types.proto +++ b/x/auth/types/types.proto @@ -23,7 +23,8 @@ message BaseAccount { // gas to be used by the transaction. The ratio yields an effective "gasprice", // which must be above some miminum to be accepted into the mempool. message StdFee { - option (gogoproto.equal) = true; + option (gogoproto.goproto_getters) = false; + option (gogoproto.equal) = true; repeated cosmos_sdk.v1.Coin amount = 1 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];