diff --git a/proto/neutron/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto index ef59d3075..32148ce7b 100644 --- a/proto/neutron/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -11,6 +11,7 @@ import "google/api/http.proto"; import "google/protobuf/any.proto"; import "neutron/feerefunder/fee.proto"; import "neutron/interchaintxs/v1/params.proto"; +import "ibc/core/channel/v1/channel.proto"; option go_package = "github.com/neutron-org/neutron/v4/x/interchaintxs/types"; @@ -36,6 +37,7 @@ message MsgRegisterInterchainAccount { (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; + ibc.core.channel.v1.Order ordering = 5; } // MsgRegisterInterchainAccountResponse is the response type for diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index b0e65087b..6e52c57d5 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -31,8 +31,9 @@ type LimitOrderTrancheUser struct { Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` SharesOwned cosmossdk_io_math.Int `protobuf:"bytes,5,opt,name=shares_owned,json=sharesOwned,proto3,customtype=cosmossdk.io/math.Int" json:"shares_owned" yaml:"shares_owned"` SharesWithdrawn cosmossdk_io_math.Int `protobuf:"bytes,6,opt,name=shares_withdrawn,json=sharesWithdrawn,proto3,customtype=cosmossdk.io/math.Int" json:"shares_withdrawn" yaml:"shares_withdrawn"` - SharesCancelled cosmossdk_io_math.Int `protobuf:"bytes,7,opt,name=shares_cancelled,json=sharesCancelled,proto3,customtype=cosmossdk.io/math.Int" json:"shares_cancelled" yaml:"shares_cancelled"` - OrderType LimitOrderType `protobuf:"varint,8,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` + // TODO: remove this in next release. It is no longer used + SharesCancelled cosmossdk_io_math.Int `protobuf:"bytes,7,opt,name=shares_cancelled,json=sharesCancelled,proto3,customtype=cosmossdk.io/math.Int" json:"shares_cancelled" yaml:"shares_cancelled"` + OrderType LimitOrderType `protobuf:"varint,8,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` } func (m *LimitOrderTrancheUser) Reset() { *m = LimitOrderTrancheUser{} } diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index ed1dcc9ed..54c64e9e8 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -66,7 +66,8 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. Owner: icaOwner, ConnectionId: msg.ConnectionId, Version: "", // FIXME: empty version string doesn't look good - Ordering: channeltypes.ORDERED, + // underlying controller uses ORDER_ORDERED as default in case msg's ordering is NONE + Ordering: msg.Ordering, }) if err != nil { k.Logger(ctx).Debug("RegisterInterchainAccount: failed to RegisterInterchainAccount:", "error", err, "owner", icaOwner, "msg", &msg) diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 8b7fb7755..4b18fd1a1 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types1 "github.com/cosmos/cosmos-sdk/codec/types" + types2 "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" @@ -15,7 +15,8 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types2 "github.com/neutron-org/neutron/v4/x/feerefunder/types" + types1 "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + types3 "github.com/neutron-org/neutron/v4/x/feerefunder/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -42,6 +43,7 @@ type MsgRegisterInterchainAccount struct { ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` InterchainAccountId string `protobuf:"bytes,3,opt,name=interchain_account_id,json=interchainAccountId,proto3" json:"interchain_account_id,omitempty" yaml:"interchain_account_id"` RegisterFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=register_fee,json=registerFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"register_fee"` + Ordering types1.Order `protobuf:"varint,5,opt,name=ordering,proto3,enum=ibc.core.channel.v1.Order" json:"ordering,omitempty"` } func (m *MsgRegisterInterchainAccount) Reset() { *m = MsgRegisterInterchainAccount{} } @@ -126,11 +128,11 @@ type MsgSubmitTx struct { // claim our capability for. InterchainAccountId string `protobuf:"bytes,2,opt,name=interchain_account_id,json=interchainAccountId,proto3" json:"interchain_account_id,omitempty"` ConnectionId string `protobuf:"bytes,3,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` - Msgs []*types1.Any `protobuf:"bytes,4,rep,name=msgs,proto3" json:"msgs,omitempty"` + Msgs []*types2.Any `protobuf:"bytes,4,rep,name=msgs,proto3" json:"msgs,omitempty"` Memo string `protobuf:"bytes,5,opt,name=memo,proto3" json:"memo,omitempty"` // timeout in seconds after which the packet times out Timeout uint64 `protobuf:"varint,6,opt,name=timeout,proto3" json:"timeout,omitempty"` - Fee types2.Fee `protobuf:"bytes,7,opt,name=fee,proto3" json:"fee"` + Fee types3.Fee `protobuf:"bytes,7,opt,name=fee,proto3" json:"fee"` } func (m *MsgSubmitTx) Reset() { *m = MsgSubmitTx{} } @@ -332,60 +334,63 @@ func init() { func init() { proto.RegisterFile("neutron/interchaintxs/v1/tx.proto", fileDescriptor_50f087790e59c806) } var fileDescriptor_50f087790e59c806 = []byte{ - // 839 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xbf, 0x6f, 0xfb, 0x44, - 0x14, 0x8f, 0x93, 0x7c, 0x53, 0x72, 0x09, 0x42, 0xb8, 0xa9, 0xea, 0x44, 0x6d, 0x92, 0x1a, 0x2a, - 0x85, 0x4a, 0xb1, 0x9b, 0x80, 0x8a, 0x14, 0x09, 0xa4, 0xa6, 0x52, 0xa5, 0x0c, 0x91, 0x8a, 0x5b, - 0x16, 0x96, 0xe8, 0x62, 0x5f, 0x1c, 0x8b, 0xf8, 0xce, 0xf8, 0xce, 0x51, 0xb2, 0x21, 0x26, 0xc4, - 0xc4, 0xc2, 0xde, 0x11, 0x31, 0xa0, 0x0e, 0xfc, 0x01, 0x8c, 0x1d, 0x2b, 0x26, 0xa6, 0x02, 0xed, - 0x50, 0xe6, 0x0e, 0xcc, 0xe8, 0xec, 0x73, 0x7e, 0xa9, 0x89, 0xaa, 0xef, 0x92, 0xdc, 0x7b, 0xef, - 0x73, 0xef, 0xbd, 0xfb, 0x7c, 0xee, 0x9d, 0xc1, 0x01, 0x46, 0x01, 0xf3, 0x09, 0xd6, 0x1d, 0xcc, - 0x90, 0x6f, 0x0e, 0xa1, 0x83, 0xd9, 0x84, 0xea, 0xe3, 0x86, 0xce, 0x26, 0x9a, 0xe7, 0x13, 0x46, - 0x64, 0x45, 0x40, 0xb4, 0x25, 0x88, 0x36, 0x6e, 0x94, 0xde, 0x87, 0xae, 0x83, 0x89, 0x1e, 0xfe, - 0x46, 0xe0, 0x52, 0xd9, 0x24, 0xd4, 0x25, 0x54, 0xef, 0x43, 0x8a, 0xf4, 0x71, 0xa3, 0x8f, 0x18, - 0x6c, 0xe8, 0x26, 0x71, 0xb0, 0x88, 0xef, 0x8a, 0xb8, 0x4b, 0x6d, 0x5e, 0xc4, 0xa5, 0xb6, 0x08, - 0x14, 0xa3, 0x40, 0x2f, 0xb4, 0xf4, 0xc8, 0x10, 0xa1, 0x82, 0x4d, 0x6c, 0x12, 0xf9, 0xf9, 0x4a, - 0x78, 0xf7, 0x6c, 0x42, 0xec, 0x11, 0xd2, 0xa1, 0xe7, 0xe8, 0x10, 0x63, 0xc2, 0x20, 0x73, 0x08, - 0x8e, 0xf7, 0xec, 0x2c, 0x44, 0x87, 0x8c, 0x79, 0x71, 0x15, 0xe1, 0x0e, 0xad, 0x7e, 0x30, 0xd0, - 0x21, 0x9e, 0x8a, 0xd0, 0x7e, 0xcc, 0xc4, 0x00, 0x21, 0x1f, 0x0d, 0x02, 0x6c, 0x21, 0x9f, 0xaf, - 0x45, 0xf8, 0x70, 0x2d, 0x51, 0x1e, 0xf4, 0xa1, 0x2b, 0xea, 0xaa, 0xff, 0x24, 0xc1, 0x5e, 0x97, - 0xda, 0x06, 0xb2, 0x1d, 0xca, 0x90, 0xdf, 0x99, 0x81, 0x4f, 0x4d, 0x93, 0x04, 0x98, 0xc9, 0x07, - 0x20, 0x3f, 0xf0, 0x89, 0xdb, 0x83, 0x96, 0xe5, 0x23, 0x4a, 0x15, 0xa9, 0x2a, 0xd5, 0xb2, 0x46, - 0x8e, 0xfb, 0x4e, 0x23, 0x97, 0xfc, 0x19, 0x78, 0xd7, 0x24, 0x18, 0x23, 0x93, 0x1f, 0xa8, 0xe7, - 0x58, 0x4a, 0x92, 0x63, 0xda, 0xca, 0xf3, 0x7d, 0xa5, 0x30, 0x85, 0xee, 0xa8, 0xa5, 0x2e, 0x85, - 0x55, 0x23, 0x3f, 0xb7, 0x3b, 0x96, 0x7c, 0x05, 0x76, 0xe6, 0x3d, 0xf6, 0x60, 0x54, 0x97, 0xa7, - 0x49, 0x85, 0x69, 0xaa, 0xcf, 0xf7, 0x95, 0xbd, 0x28, 0xcd, 0x8b, 0x30, 0xd5, 0xd8, 0x76, 0x56, - 0xbb, 0xee, 0x58, 0x32, 0x06, 0x79, 0x5f, 0x1c, 0xaa, 0x37, 0x40, 0x48, 0x49, 0x57, 0x53, 0xb5, - 0x5c, 0xb3, 0xa8, 0x09, 0xa5, 0xb8, 0xde, 0x9a, 0xd0, 0x5b, 0x3b, 0x23, 0x0e, 0x6e, 0x1f, 0xdf, - 0xde, 0x57, 0x12, 0xbf, 0xfc, 0x55, 0xa9, 0xd9, 0x0e, 0x1b, 0x06, 0x7d, 0xcd, 0x24, 0xae, 0x90, - 0x55, 0xfc, 0xd5, 0xa9, 0xf5, 0xb5, 0xce, 0xa6, 0x1e, 0xa2, 0xe1, 0x06, 0x6a, 0xe4, 0xe2, 0x02, - 0xe7, 0x08, 0xb5, 0x8a, 0xdf, 0x5f, 0x57, 0x12, 0xff, 0x5e, 0x57, 0x12, 0xdf, 0x3d, 0xdd, 0x1c, - 0x2d, 0x51, 0xa6, 0x5a, 0xe0, 0xc3, 0x4d, 0x14, 0x1b, 0x88, 0x7a, 0x04, 0x53, 0x24, 0xef, 0x03, - 0x60, 0x0e, 0x21, 0xc6, 0x68, 0xc4, 0x4f, 0x1f, 0x11, 0x9d, 0x15, 0x9e, 0x8e, 0x25, 0xef, 0x82, - 0x2d, 0x8f, 0xf8, 0x6c, 0x46, 0xb0, 0x91, 0xe1, 0x66, 0xc7, 0x6a, 0xa5, 0x79, 0x69, 0xf5, 0xd7, - 0x24, 0xc8, 0x75, 0xa9, 0x7d, 0x19, 0xf4, 0x5d, 0x87, 0x5d, 0x4d, 0x5e, 0x23, 0x5c, 0x73, 0x1d, - 0xf3, 0x51, 0xfe, 0x17, 0x79, 0xfd, 0x60, 0x55, 0xec, 0x50, 0xa5, 0x15, 0x49, 0x6b, 0x20, 0xed, - 0x52, 0x9b, 0x0a, 0xd2, 0x0b, 0x5a, 0x74, 0x8b, 0xb5, 0xf8, 0x16, 0x6b, 0xa7, 0x78, 0x6a, 0x84, - 0x08, 0x59, 0x06, 0x69, 0x17, 0xb9, 0x44, 0x79, 0x13, 0x66, 0x09, 0xd7, 0xb2, 0x02, 0xb6, 0x98, - 0xe3, 0x22, 0x12, 0x30, 0x25, 0x53, 0x95, 0x6a, 0x69, 0x23, 0x36, 0xe5, 0x63, 0x90, 0xe2, 0x5a, - 0x6e, 0x55, 0xa5, 0x5a, 0xae, 0xa9, 0x68, 0xf1, 0xa0, 0x2f, 0x4c, 0x80, 0x76, 0x8e, 0x50, 0x3b, - 0xcd, 0xa5, 0x34, 0x38, 0x74, 0x93, 0x2c, 0x17, 0x60, 0x7b, 0x81, 0xaf, 0x99, 0x0a, 0x15, 0x90, - 0xa3, 0xe8, 0x9b, 0x00, 0x61, 0x13, 0xc5, 0x32, 0xa4, 0x0d, 0x10, 0xbb, 0x3a, 0x16, 0x6f, 0x4f, - 0x88, 0x22, 0x78, 0x8a, 0x4d, 0xf5, 0x77, 0x09, 0xbc, 0xd7, 0xa5, 0xf6, 0x97, 0x9e, 0x05, 0x19, - 0xba, 0x08, 0xc7, 0x4c, 0x3e, 0x01, 0x59, 0x18, 0xb0, 0x21, 0xf1, 0x1d, 0x36, 0x8d, 0x34, 0x68, - 0x2b, 0x7f, 0xfc, 0x56, 0x2f, 0x88, 0x7b, 0x28, 0xa4, 0xb8, 0x64, 0xbe, 0x83, 0x6d, 0x63, 0x0e, - 0x95, 0xcf, 0x40, 0x26, 0x1a, 0xd4, 0xb0, 0x48, 0xae, 0x59, 0xd5, 0xd6, 0x3d, 0x6b, 0x5a, 0x54, - 0xa9, 0x9d, 0xe5, 0xa7, 0xfe, 0xf9, 0xe9, 0xe6, 0x48, 0x32, 0xc4, 0xd6, 0xd6, 0x31, 0x3f, 0xf5, - 0x3c, 0xe9, 0x0f, 0x4f, 0x37, 0x47, 0xfb, 0xcb, 0xef, 0xc1, 0x4a, 0xbb, 0x6a, 0x11, 0xec, 0xae, - 0xb8, 0x62, 0x62, 0x9a, 0xff, 0x25, 0x41, 0xaa, 0x4b, 0x6d, 0xf9, 0x27, 0x09, 0x14, 0xd7, 0xbf, - 0x17, 0x27, 0xeb, 0xfb, 0xdc, 0x34, 0x04, 0xa5, 0xcf, 0xdf, 0x6e, 0x5f, 0xdc, 0x9d, 0x9a, 0x90, - 0xfb, 0xe0, 0x9d, 0xd9, 0xe5, 0x3f, 0xdc, 0x98, 0x2d, 0x86, 0x95, 0xea, 0xaf, 0x82, 0x2d, 0xd4, - 0x18, 0x81, 0xfc, 0x92, 0xba, 0x1f, 0x6d, 0x4c, 0xb0, 0x08, 0x2d, 0x35, 0x5e, 0x0d, 0x8d, 0xeb, - 0x95, 0xde, 0x7c, 0xcb, 0xd5, 0x6c, 0x7f, 0x71, 0xfb, 0x50, 0x96, 0xee, 0x1e, 0xca, 0xd2, 0xdf, - 0x0f, 0x65, 0xe9, 0xc7, 0xc7, 0x72, 0xe2, 0xee, 0xb1, 0x9c, 0xf8, 0xf3, 0xb1, 0x9c, 0xf8, 0xea, - 0xd3, 0x85, 0xb7, 0x4a, 0x64, 0xaf, 0x13, 0xdf, 0x8e, 0xd7, 0xfa, 0xf8, 0x13, 0x7d, 0xb2, 0xf2, - 0x01, 0x08, 0x1f, 0xb0, 0x7e, 0x26, 0x1c, 0xc5, 0x8f, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xd9, - 0x95, 0xf0, 0x9e, 0x4f, 0x07, 0x00, 0x00, + // 891 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x31, 0x6f, 0x23, 0x45, + 0x14, 0xf6, 0xc6, 0xbe, 0xe4, 0x3c, 0x0e, 0x20, 0xf6, 0x72, 0xca, 0xda, 0x4a, 0x6c, 0x67, 0xe1, + 0x24, 0x13, 0x29, 0xb3, 0xb1, 0x41, 0x41, 0x8a, 0x04, 0x52, 0x7c, 0xd2, 0x49, 0x2e, 0x22, 0x8e, + 0xbd, 0xa3, 0xa1, 0xb1, 0x66, 0x77, 0xc7, 0xeb, 0x11, 0xd9, 0x19, 0x33, 0x33, 0x6b, 0xc5, 0x1d, + 0xa2, 0x42, 0x54, 0x34, 0x14, 0x74, 0x57, 0x22, 0x0a, 0x94, 0x82, 0x1f, 0x40, 0x79, 0xe5, 0x89, + 0x8a, 0x2a, 0xa0, 0xa4, 0x08, 0xf5, 0x15, 0xd4, 0x68, 0x76, 0x67, 0x1c, 0xdb, 0x3a, 0x5b, 0x11, + 0x8d, 0x3d, 0xef, 0xbd, 0x6f, 0xde, 0x37, 0xf3, 0xbe, 0x37, 0x6f, 0xc1, 0x1e, 0xc5, 0xa9, 0xe4, + 0x8c, 0x7a, 0x84, 0x4a, 0xcc, 0xc3, 0x21, 0x22, 0x54, 0x9e, 0x0b, 0x6f, 0xdc, 0xf6, 0xe4, 0x39, + 0x1c, 0x71, 0x26, 0x99, 0xed, 0x68, 0x08, 0x9c, 0x83, 0xc0, 0x71, 0xbb, 0xf6, 0x2e, 0x4a, 0x08, + 0x65, 0x5e, 0xf6, 0x9b, 0x83, 0x6b, 0xf5, 0x90, 0x89, 0x84, 0x09, 0x2f, 0x40, 0x02, 0x7b, 0xe3, + 0x76, 0x80, 0x25, 0x6a, 0x7b, 0x21, 0x23, 0x54, 0xc7, 0xb7, 0x75, 0x3c, 0x11, 0xb1, 0x22, 0x49, + 0x44, 0xac, 0x03, 0xd5, 0x3c, 0xd0, 0xcf, 0x2c, 0x2f, 0x37, 0x74, 0x68, 0x2b, 0x66, 0x31, 0xcb, + 0xfd, 0x6a, 0xa5, 0xbd, 0x3b, 0x31, 0x63, 0xf1, 0x19, 0xf6, 0xd0, 0x88, 0x78, 0x88, 0x52, 0x26, + 0x91, 0x24, 0x8c, 0x9a, 0x3d, 0x0f, 0x67, 0xa2, 0x43, 0x29, 0x47, 0x86, 0x45, 0xbb, 0x33, 0x2b, + 0x48, 0x07, 0x1e, 0xa2, 0x13, 0x1d, 0xda, 0x35, 0x95, 0x18, 0x60, 0xcc, 0xf1, 0x20, 0xa5, 0x11, + 0xe6, 0x6a, 0xad, 0xc3, 0x8f, 0x96, 0x16, 0x6a, 0x84, 0x38, 0x4a, 0x0c, 0xef, 0x1e, 0x09, 0x42, + 0x2f, 0x64, 0x1c, 0x7b, 0xe1, 0x10, 0x51, 0x8a, 0xcf, 0x14, 0x42, 0x2f, 0x73, 0x88, 0xfb, 0x53, + 0x11, 0xec, 0x9c, 0x8a, 0xd8, 0xc7, 0x31, 0x11, 0x12, 0xf3, 0xde, 0x34, 0xdf, 0x49, 0x18, 0xb2, + 0x94, 0x4a, 0x7b, 0x0f, 0x6c, 0x0e, 0x38, 0x4b, 0xfa, 0x28, 0x8a, 0x38, 0x16, 0xc2, 0xb1, 0x9a, + 0x56, 0xab, 0xec, 0x57, 0x94, 0xef, 0x24, 0x77, 0xd9, 0x9f, 0x80, 0xb7, 0x42, 0x46, 0x29, 0x0e, + 0xd5, 0x9d, 0xfb, 0x24, 0x72, 0xd6, 0x14, 0xa6, 0xeb, 0xbc, 0xbe, 0x6c, 0x6c, 0x4d, 0x50, 0x72, + 0x76, 0xec, 0xce, 0x85, 0x5d, 0x7f, 0xf3, 0xd6, 0xee, 0x45, 0xf6, 0x73, 0xf0, 0xf0, 0xf6, 0x1a, + 0x7d, 0x94, 0xf3, 0xaa, 0x34, 0xc5, 0x2c, 0x4d, 0xf3, 0xf5, 0x65, 0x63, 0x27, 0x4f, 0xf3, 0x46, + 0x98, 0xeb, 0x3f, 0x20, 0x8b, 0xa7, 0xee, 0x45, 0x36, 0x05, 0x9b, 0x5c, 0x5f, 0xaa, 0x3f, 0xc0, + 0xd8, 0x29, 0x35, 0x8b, 0xad, 0x4a, 0xa7, 0x0a, 0xb5, 0x98, 0xaa, 0x25, 0xa0, 0x6e, 0x09, 0xf8, + 0x98, 0x11, 0xda, 0x3d, 0x7c, 0x79, 0xd9, 0x28, 0xfc, 0xf2, 0x57, 0xa3, 0x15, 0x13, 0x39, 0x4c, + 0x03, 0x18, 0xb2, 0x44, 0x2b, 0xaf, 0xff, 0x0e, 0x44, 0xf4, 0x95, 0x27, 0x27, 0x23, 0x2c, 0xb2, + 0x0d, 0xc2, 0xaf, 0x18, 0x82, 0x27, 0x18, 0xdb, 0x47, 0xe0, 0x3e, 0xe3, 0x11, 0xe6, 0x84, 0xc6, + 0xce, 0xbd, 0xa6, 0xd5, 0x7a, 0xbb, 0x53, 0x83, 0x24, 0x08, 0xa1, 0x2a, 0x3f, 0x34, 0x35, 0x1f, + 0xb7, 0xe1, 0x67, 0x0a, 0xe4, 0x4f, 0xb1, 0xc7, 0xd5, 0xef, 0x5e, 0x34, 0x0a, 0xff, 0xbc, 0x68, + 0x14, 0xbe, 0xbd, 0xb9, 0xd8, 0x9f, 0x2b, 0xb5, 0x1b, 0x81, 0xf7, 0x57, 0x49, 0xe3, 0x63, 0x31, + 0x62, 0x54, 0x60, 0x7b, 0x17, 0x00, 0x4d, 0xa0, 0xaa, 0x96, 0x0b, 0x54, 0xd6, 0x9e, 0x5e, 0x64, + 0x6f, 0x83, 0x8d, 0x11, 0xe3, 0x72, 0x2a, 0x8c, 0xbf, 0xae, 0xcc, 0x5e, 0x74, 0x5c, 0x52, 0xd4, + 0xee, 0xaf, 0x6b, 0xa0, 0x72, 0x2a, 0xe2, 0x67, 0x69, 0x90, 0x10, 0xf9, 0xfc, 0xfc, 0x2e, 0x82, + 0x77, 0x96, 0x29, 0x96, 0xe7, 0x7f, 0xa3, 0x1e, 0xef, 0x2d, 0x36, 0x49, 0xa6, 0xee, 0x42, 0x2b, + 0xb4, 0x40, 0x29, 0x11, 0xb1, 0xd0, 0x62, 0x6d, 0xc1, 0xfc, 0x81, 0x40, 0xf3, 0x40, 0xe0, 0x09, + 0x9d, 0xf8, 0x19, 0xc2, 0xb6, 0x41, 0x29, 0xc1, 0x09, 0xcb, 0x4a, 0x5d, 0xf6, 0xb3, 0xb5, 0xed, + 0x80, 0x0d, 0x49, 0x12, 0xcc, 0x52, 0xe9, 0xac, 0x37, 0xad, 0x56, 0xc9, 0x37, 0xa6, 0x7d, 0x08, + 0x8a, 0xaa, 0x07, 0x36, 0x9a, 0x56, 0xab, 0xd2, 0x71, 0xa0, 0x99, 0x21, 0x33, 0x8f, 0x0b, 0x3e, + 0xc1, 0xb8, 0x5b, 0x52, 0x2d, 0xe0, 0x2b, 0xe8, 0x2a, 0x59, 0x9e, 0x82, 0x07, 0x33, 0xf5, 0x9a, + 0xaa, 0xd0, 0x00, 0x15, 0x81, 0xbf, 0x4e, 0x31, 0x0d, 0xb1, 0x91, 0xa1, 0xe4, 0x03, 0xe3, 0xea, + 0x45, 0xea, 0x78, 0x5a, 0x14, 0x5d, 0x27, 0x63, 0xba, 0xbf, 0x5b, 0xe0, 0x9d, 0x53, 0x11, 0x7f, + 0x31, 0x8a, 0x90, 0xc4, 0x4f, 0xb3, 0x17, 0x6c, 0x1f, 0x81, 0x32, 0x4a, 0xe5, 0x90, 0x71, 0x22, + 0x27, 0xb9, 0x06, 0x5d, 0xe7, 0x8f, 0xdf, 0x0e, 0xb6, 0x74, 0xff, 0x6a, 0x29, 0x9e, 0x49, 0xd5, + 0x44, 0xfe, 0x2d, 0xd4, 0x7e, 0x0c, 0xd6, 0xf3, 0x19, 0x90, 0x91, 0x54, 0x3a, 0x4d, 0xb8, 0x6c, + 0x62, 0xc2, 0x9c, 0xa9, 0x5b, 0x56, 0xb7, 0xfe, 0xf9, 0xe6, 0x62, 0xdf, 0xf2, 0xf5, 0xd6, 0xe3, + 0x43, 0x75, 0xeb, 0xdb, 0xa4, 0xdf, 0xdf, 0x5c, 0xec, 0xef, 0xce, 0x8f, 0x9a, 0x85, 0xe3, 0xba, + 0x55, 0xb0, 0xbd, 0xe0, 0x32, 0x85, 0xe9, 0xfc, 0xbb, 0x06, 0x8a, 0xa7, 0x22, 0xb6, 0x7f, 0xb4, + 0x40, 0x75, 0xf9, 0x9c, 0x39, 0x5a, 0x7e, 0xce, 0x55, 0x8f, 0xa0, 0xf6, 0xe9, 0xff, 0xdb, 0x67, + 0x4e, 0xe7, 0x16, 0xec, 0x00, 0xdc, 0x9f, 0x36, 0xff, 0xa3, 0x95, 0xd9, 0x0c, 0xac, 0x76, 0x70, + 0x27, 0xd8, 0x0c, 0xc7, 0x19, 0xd8, 0x9c, 0x53, 0xf7, 0x83, 0x95, 0x09, 0x66, 0xa1, 0xb5, 0xf6, + 0x9d, 0xa1, 0x86, 0xaf, 0x76, 0xef, 0x1b, 0xa5, 0x66, 0xf7, 0xf3, 0x97, 0x57, 0x75, 0xeb, 0xd5, + 0x55, 0xdd, 0xfa, 0xfb, 0xaa, 0x6e, 0xfd, 0x70, 0x5d, 0x2f, 0xbc, 0xba, 0xae, 0x17, 0xfe, 0xbc, + 0xae, 0x17, 0xbe, 0xfc, 0x78, 0x66, 0xc6, 0xe9, 0xec, 0x07, 0x8c, 0xc7, 0x66, 0xed, 0x8d, 0x3f, + 0xf2, 0xce, 0x17, 0xbe, 0x2d, 0xd9, 0xe0, 0x0b, 0xd6, 0xb3, 0xa7, 0xf8, 0xe1, 0x7f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x03, 0x83, 0x36, 0x64, 0xaa, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -560,6 +565,11 @@ func (m *MsgRegisterInterchainAccount) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l + if m.Ordering != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.Ordering)) + i-- + dAtA[i] = 0x28 + } if len(m.RegisterFee) > 0 { for iNdEx := len(m.RegisterFee) - 1; iNdEx >= 0; iNdEx-- { { @@ -848,6 +858,9 @@ func (m *MsgRegisterInterchainAccount) Size() (n int) { n += 1 + l + sovTx(uint64(l)) } } + if m.Ordering != 0 { + n += 1 + sovTx(uint64(m.Ordering)) + } return n } @@ -1109,6 +1122,25 @@ func (m *MsgRegisterInterchainAccount) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Ordering", wireType) + } + m.Ordering = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Ordering |= types1.Order(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -1398,7 +1430,7 @@ func (m *MsgSubmitTx) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Msgs = append(m.Msgs, &types1.Any{}) + m.Msgs = append(m.Msgs, &types2.Any{}) if err := m.Msgs[len(m.Msgs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err }