From 0e4fdb14823e678602ca0c555ea73b9f48ef209a Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Tue, 21 Nov 2023 21:08:35 +0200 Subject: [PATCH] wip wip --- .../interchain_accounts/localhost_test.go | 3 +- modules/core/04-channel/keeper/handshake.go | 13 +- .../core/04-channel/keeper/handshake_test.go | 14 +- modules/core/04-channel/keeper/timeout.go | 12 +- .../core/04-channel/keeper/timeout_test.go | 27 +- modules/core/04-channel/types/msgs.go | 27 +- modules/core/04-channel/types/msgs_test.go | 41 +-- modules/core/04-channel/types/tx.pb.go | 313 +++++++++++------- modules/core/ante/ante_test.go | 2 +- modules/core/keeper/msg_server.go | 4 +- modules/core/keeper/msg_server_test.go | 9 +- proto/ibc/core/channel/v1/tx.proto | 24 +- testing/endpoint.go | 1 + testing/solomachine.go | 2 + 14 files changed, 292 insertions(+), 200 deletions(-) diff --git a/e2e/tests/interchain_accounts/localhost_test.go b/e2e/tests/interchain_accounts/localhost_test.go index 9f1f2272a03..99dbc591eb1 100644 --- a/e2e/tests/interchain_accounts/localhost_test.go +++ b/e2e/tests/interchain_accounts/localhost_test.go @@ -327,7 +327,8 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan }) t.Run("close interchain accounts host channel end", func(t *testing.T) { - msgCloseConfirm := channeltypes.NewMsgChannelCloseConfirm(icatypes.HostPortID, msgChanOpenTryRes.ChannelId, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress()) + // Pass in zero for counterpartyUpgradeSequence given that channel has not undergone any upgrades. + msgCloseConfirm := channeltypes.NewMsgChannelCloseConfirm(icatypes.HostPortID, msgChanOpenTryRes.ChannelId, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), 0) txResp := s.BroadcastMessages(ctx, chainA, rlyWallet, msgCloseConfirm) s.AssertTxSuccess(txResp) diff --git a/modules/core/04-channel/keeper/handshake.go b/modules/core/04-channel/keeper/handshake.go index 30420a67270..ccb1633f98d 100644 --- a/modules/core/04-channel/keeper/handshake.go +++ b/modules/core/04-channel/keeper/handshake.go @@ -431,6 +431,7 @@ func (k Keeper) ChanCloseConfirm( chanCap *capabilitytypes.Capability, proofInit []byte, proofHeight exported.Height, + counterpartyUpgradeSequence uint64, ) error { if !k.scopedKeeper.AuthenticateCapability(ctx, chanCap, host.ChannelCapabilityPath(portID, channelID)) { return errorsmod.Wrap(types.ErrChannelCapabilityNotFound, "caller does not own capability for channel, port ID (%s) channel ID (%s)") @@ -460,10 +461,14 @@ func (k Keeper) ChanCloseConfirm( counterpartyHops := []string{connectionEnd.GetCounterparty().GetConnectionID()} counterparty := types.NewCounterparty(portID, channelID) - expectedChannel := types.NewChannel( - types.CLOSED, channel.Ordering, counterparty, - counterpartyHops, channel.Version, - ) + expectedChannel := types.Channel{ + State: types.CLOSED, + Ordering: channel.Ordering, + Counterparty: counterparty, + ConnectionHops: counterpartyHops, + Version: channel.Version, + UpgradeSequence: counterpartyUpgradeSequence, + } if err := k.connectionKeeper.VerifyChannelState( ctx, connectionEnd, proofHeight, proofInit, diff --git a/modules/core/04-channel/keeper/handshake_test.go b/modules/core/04-channel/keeper/handshake_test.go index 988de93045d..c8c418cd41c 100644 --- a/modules/core/04-channel/keeper/handshake_test.go +++ b/modules/core/04-channel/keeper/handshake_test.go @@ -718,9 +718,10 @@ func (suite *KeeperTestSuite) TestChanCloseInit() { // bypassed on chainA by setting the channel state in the ChannelKeeper. func (suite *KeeperTestSuite) TestChanCloseConfirm() { var ( - path *ibctesting.Path - channelCap *capabilitytypes.Capability - heightDiff uint64 + path *ibctesting.Path + channelCap *capabilitytypes.Capability + heightDiff uint64 + counterpartyUpgradeSequence uint64 ) testCases := []testCase{ @@ -799,8 +800,9 @@ func (suite *KeeperTestSuite) TestChanCloseConfirm() { for _, tc := range testCases { tc := tc suite.Run(fmt.Sprintf("Case %s", tc.msg), func() { - suite.SetupTest() // reset - heightDiff = 0 // must explicitly be changed + suite.SetupTest() // reset + heightDiff = 0 // must explicitly be changed + counterpartyUpgradeSequence = 0 // must explicitly be changed path = ibctesting.NewPath(suite.chainA, suite.chainB) tc.malleate() @@ -810,7 +812,7 @@ func (suite *KeeperTestSuite) TestChanCloseConfirm() { err := suite.chainB.App.GetIBCKeeper().ChannelKeeper.ChanCloseConfirm( suite.chainB.GetContext(), path.EndpointB.ChannelConfig.PortID, ibctesting.FirstChannelID, channelCap, - proof, malleateHeight(proofHeight, heightDiff), + proof, malleateHeight(proofHeight, heightDiff), counterpartyUpgradeSequence, ) if tc.expPass { diff --git a/modules/core/04-channel/keeper/timeout.go b/modules/core/04-channel/keeper/timeout.go index f137dde4836..603a74cc5e3 100644 --- a/modules/core/04-channel/keeper/timeout.go +++ b/modules/core/04-channel/keeper/timeout.go @@ -209,6 +209,7 @@ func (k Keeper) TimeoutOnClose( proofClosed []byte, proofHeight exported.Height, nextSequenceRecv uint64, + counterpartyUpgradeSequence uint64, ) error { channel, found := k.GetChannel(ctx, packet.GetSourcePort(), packet.GetSourceChannel()) if !found { @@ -263,9 +264,14 @@ func (k Keeper) TimeoutOnClose( counterpartyHops := []string{connectionEnd.GetCounterparty().GetConnectionID()} counterparty := types.NewCounterparty(packet.GetSourcePort(), packet.GetSourceChannel()) - expectedChannel := types.NewChannel( - types.CLOSED, channel.Ordering, counterparty, counterpartyHops, channel.Version, - ) + expectedChannel := types.Channel{ + State: types.CLOSED, + Ordering: channel.Ordering, + Counterparty: counterparty, + ConnectionHops: counterpartyHops, + Version: channel.Version, + UpgradeSequence: counterpartyUpgradeSequence, + } // check that the opposing channel end has closed if err := k.connectionKeeper.VerifyChannelState( diff --git a/modules/core/04-channel/keeper/timeout_test.go b/modules/core/04-channel/keeper/timeout_test.go index eab261063a5..d355f8273e1 100644 --- a/modules/core/04-channel/keeper/timeout_test.go +++ b/modules/core/04-channel/keeper/timeout_test.go @@ -542,11 +542,12 @@ func (suite *KeeperTestSuite) TestTimeoutExecuted() { // channel on chainB after the packet commitment has been created. func (suite *KeeperTestSuite) TestTimeoutOnClose() { var ( - path *ibctesting.Path - packet types.Packet - chanCap *capabilitytypes.Capability - nextSeqRecv uint64 - ordered bool + path *ibctesting.Path + packet types.Packet + chanCap *capabilitytypes.Capability + nextSeqRecv uint64 + counterpartyUpgradeSequence uint64 + ordered bool ) testCases := []testCase{ @@ -718,8 +719,9 @@ func (suite *KeeperTestSuite) TestTimeoutOnClose() { suite.Run(fmt.Sprintf("Case %s, %d/%d tests", tc.msg, i, len(testCases)), func() { var proof []byte - suite.SetupTest() // reset - nextSeqRecv = 1 // must be explicitly changed + suite.SetupTest() // reset + nextSeqRecv = 1 // must be explicitly changed + counterpartyUpgradeSequence = 0 // must be explicitly changed path = ibctesting.NewPath(suite.chainA, suite.chainB) tc.malleate() @@ -736,7 +738,16 @@ func (suite *KeeperTestSuite) TestTimeoutOnClose() { proof, _ = suite.chainB.QueryProof(unorderedPacketKey) } - err := suite.chainA.App.GetIBCKeeper().ChannelKeeper.TimeoutOnClose(suite.chainA.GetContext(), chanCap, packet, proof, proofClosed, proofHeight, nextSeqRecv) + err := suite.chainA.App.GetIBCKeeper().ChannelKeeper.TimeoutOnClose( + suite.chainA.GetContext(), + chanCap, + packet, + proof, + proofClosed, + proofHeight, + nextSeqRecv, + counterpartyUpgradeSequence, + ) if tc.expPass { suite.Require().NoError(err) diff --git a/modules/core/04-channel/types/msgs.go b/modules/core/04-channel/types/msgs.go index 6ca9fb44a51..b31fcfde8a9 100644 --- a/modules/core/04-channel/types/msgs.go +++ b/modules/core/04-channel/types/msgs.go @@ -225,14 +225,15 @@ func (msg MsgChannelCloseInit) ValidateBasic() error { // NewMsgChannelCloseConfirm creates a new MsgChannelCloseConfirm instance func NewMsgChannelCloseConfirm( portID, channelID string, proofInit []byte, proofHeight clienttypes.Height, - signer string, + signer string, counterpartyUpgradeSequence uint64, ) *MsgChannelCloseConfirm { return &MsgChannelCloseConfirm{ - PortId: portID, - ChannelId: channelID, - ProofInit: proofInit, - ProofHeight: proofHeight, - Signer: signer, + PortId: portID, + ChannelId: channelID, + ProofInit: proofInit, + ProofHeight: proofHeight, + Signer: signer, + CounterpartyUpgradeSequence: counterpartyUpgradeSequence, } } @@ -320,14 +321,16 @@ func NewMsgTimeoutOnClose( packet Packet, nextSequenceRecv uint64, proofUnreceived, proofClose []byte, proofHeight clienttypes.Height, signer string, + counterpartyUpgradeSequence uint64, ) *MsgTimeoutOnClose { return &MsgTimeoutOnClose{ - Packet: packet, - NextSequenceRecv: nextSequenceRecv, - ProofUnreceived: proofUnreceived, - ProofClose: proofClose, - ProofHeight: proofHeight, - Signer: signer, + Packet: packet, + NextSequenceRecv: nextSequenceRecv, + ProofUnreceived: proofUnreceived, + ProofClose: proofClose, + ProofHeight: proofHeight, + Signer: signer, + CounterpartyUpgradeSequence: counterpartyUpgradeSequence, } } diff --git a/modules/core/04-channel/types/msgs_test.go b/modules/core/04-channel/types/msgs_test.go index 9b388fe9c15..3548827c93c 100644 --- a/modules/core/04-channel/types/msgs_test.go +++ b/modules/core/04-channel/types/msgs_test.go @@ -27,10 +27,11 @@ import ( const ( // valid constants used for testing - portid = "testportid" - chanid = "channel-0" - cpportid = "testcpport" - cpchanid = "testcpchannel" + portid = "testportid" + chanid = "channel-0" + cpportid = "testcpport" + cpchanid = "testcpchannel" + counterpartyUpgradeSequence = 0 version = "1.0" @@ -350,14 +351,14 @@ func (suite *TypesTestSuite) TestMsgChannelCloseConfirmValidateBasic() { msg *types.MsgChannelCloseConfirm expPass bool }{ - {"", types.NewMsgChannelCloseConfirm(portid, chanid, suite.proof, height, addr), true}, - {"too short port id", types.NewMsgChannelCloseConfirm(invalidShortPort, chanid, suite.proof, height, addr), false}, - {"too long port id", types.NewMsgChannelCloseConfirm(invalidLongPort, chanid, suite.proof, height, addr), false}, - {"port id contains non-alpha", types.NewMsgChannelCloseConfirm(invalidPort, chanid, suite.proof, height, addr), false}, - {"too short channel id", types.NewMsgChannelCloseConfirm(portid, invalidShortChannel, suite.proof, height, addr), false}, - {"too long channel id", types.NewMsgChannelCloseConfirm(portid, invalidLongChannel, suite.proof, height, addr), false}, - {"channel id contains non-alpha", types.NewMsgChannelCloseConfirm(portid, invalidChannel, suite.proof, height, addr), false}, - {"empty proof", types.NewMsgChannelCloseConfirm(portid, chanid, emptyProof, height, addr), false}, + {"", types.NewMsgChannelCloseConfirm(portid, chanid, suite.proof, height, addr, 1), true}, + {"too short port id", types.NewMsgChannelCloseConfirm(invalidShortPort, chanid, suite.proof, height, addr, 1), false}, + {"too long port id", types.NewMsgChannelCloseConfirm(invalidLongPort, chanid, suite.proof, height, addr, 1), false}, + {"port id contains non-alpha", types.NewMsgChannelCloseConfirm(invalidPort, chanid, suite.proof, height, addr, 1), false}, + {"too short channel id", types.NewMsgChannelCloseConfirm(portid, invalidShortChannel, suite.proof, height, addr, 1), false}, + {"too long channel id", types.NewMsgChannelCloseConfirm(portid, invalidLongChannel, suite.proof, height, addr, 1), false}, + {"channel id contains non-alpha", types.NewMsgChannelCloseConfirm(portid, invalidChannel, suite.proof, height, addr, 1), false}, + {"empty proof", types.NewMsgChannelCloseConfirm(portid, chanid, emptyProof, height, addr, 1), false}, } for _, tc := range testCases { @@ -378,7 +379,7 @@ func (suite *TypesTestSuite) TestMsgChannelCloseConfirmValidateBasic() { func (suite *TypesTestSuite) TestMsgChannelCloseConfirmGetSigners() { expSigner, err := sdk.AccAddressFromBech32(addr) suite.Require().NoError(err) - msg := types.NewMsgChannelCloseConfirm(portid, chanid, suite.proof, height, addr) + msg := types.NewMsgChannelCloseConfirm(portid, chanid, suite.proof, height, addr, counterpartyUpgradeSequence) encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) @@ -472,12 +473,12 @@ func (suite *TypesTestSuite) TestMsgTimeoutOnCloseValidateBasic() { msg *types.MsgTimeoutOnClose expPass bool }{ - {"success", types.NewMsgTimeoutOnClose(packet, 1, suite.proof, suite.proof, height, addr), true}, - {"seq 0", types.NewMsgTimeoutOnClose(packet, 0, suite.proof, suite.proof, height, addr), false}, - {"signer address is empty", types.NewMsgTimeoutOnClose(packet, 1, suite.proof, suite.proof, height, emptyAddr), false}, - {"empty proof", types.NewMsgTimeoutOnClose(packet, 1, emptyProof, suite.proof, height, addr), false}, - {"empty proof close", types.NewMsgTimeoutOnClose(packet, 1, suite.proof, emptyProof, height, addr), false}, - {"invalid packet", types.NewMsgTimeoutOnClose(invalidPacket, 1, suite.proof, suite.proof, height, addr), false}, + {"success", types.NewMsgTimeoutOnClose(packet, 1, suite.proof, suite.proof, height, addr, 1), true}, + {"seq 0", types.NewMsgTimeoutOnClose(packet, 0, suite.proof, suite.proof, height, addr, 1), false}, + {"signer address is empty", types.NewMsgTimeoutOnClose(packet, 1, suite.proof, suite.proof, height, emptyAddr, 1), false}, + {"empty proof", types.NewMsgTimeoutOnClose(packet, 1, emptyProof, suite.proof, height, addr, 1), false}, + {"empty proof close", types.NewMsgTimeoutOnClose(packet, 1, suite.proof, emptyProof, height, addr, 1), false}, + {"invalid packet", types.NewMsgTimeoutOnClose(invalidPacket, 1, suite.proof, suite.proof, height, addr, 1), false}, } for _, tc := range testCases { @@ -498,7 +499,7 @@ func (suite *TypesTestSuite) TestMsgTimeoutOnCloseValidateBasic() { func (suite *TypesTestSuite) TestMsgTimeoutOnCloseGetSigners() { expSigner, err := sdk.AccAddressFromBech32(addr) suite.Require().NoError(err) - msg := types.NewMsgTimeoutOnClose(packet, 1, suite.proof, suite.proof, height, addr) + msg := types.NewMsgTimeoutOnClose(packet, 1, suite.proof, suite.proof, height, addr, counterpartyUpgradeSequence) encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) diff --git a/modules/core/04-channel/types/tx.pb.go b/modules/core/04-channel/types/tx.pb.go index 550617b20c3..efceccbdc59 100644 --- a/modules/core/04-channel/types/tx.pb.go +++ b/modules/core/04-channel/types/tx.pb.go @@ -477,11 +477,12 @@ var xxx_messageInfo_MsgChannelCloseInitResponse proto.InternalMessageInfo // MsgChannelCloseConfirm defines a msg sent by a Relayer to Chain B // to acknowledge the change of channel state to CLOSED on Chain A. type MsgChannelCloseConfirm struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` - ProofInit []byte `protobuf:"bytes,3,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"` - ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` - Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + ProofInit []byte `protobuf:"bytes,3,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"` + ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` + Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` + CounterpartyUpgradeSequence uint64 `protobuf:"varint,6,opt,name=counterparty_upgrade_sequence,json=counterpartyUpgradeSequence,proto3" json:"counterparty_upgrade_sequence,omitempty"` } func (m *MsgChannelCloseConfirm) Reset() { *m = MsgChannelCloseConfirm{} } @@ -716,12 +717,13 @@ var xxx_messageInfo_MsgTimeoutResponse proto.InternalMessageInfo // MsgTimeoutOnClose timed-out packet upon counterparty channel closure. type MsgTimeoutOnClose struct { - Packet Packet `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"` - ProofUnreceived []byte `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty"` - ProofClose []byte `protobuf:"bytes,3,opt,name=proof_close,json=proofClose,proto3" json:"proof_close,omitempty"` - ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` - NextSequenceRecv uint64 `protobuf:"varint,5,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty"` - Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"` + Packet Packet `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"` + ProofUnreceived []byte `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty"` + ProofClose []byte `protobuf:"bytes,3,opt,name=proof_close,json=proofClose,proto3" json:"proof_close,omitempty"` + ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` + NextSequenceRecv uint64 `protobuf:"varint,5,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty"` + Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"` + CounterpartyUpgradeSequence uint64 `protobuf:"varint,7,opt,name=counterparty_upgrade_sequence,json=counterpartyUpgradeSequence,proto3" json:"counterparty_upgrade_sequence,omitempty"` } func (m *MsgTimeoutOnClose) Reset() { *m = MsgTimeoutOnClose{} } @@ -1571,123 +1573,124 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/tx.proto", fileDescriptor_bc4637e0ac3fc7b7) } var fileDescriptor_bc4637e0ac3fc7b7 = []byte{ - // 1854 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x6f, 0xd3, 0x58, - 0x1e, 0xaf, 0x93, 0x34, 0x69, 0xbf, 0x2d, 0xa4, 0x75, 0x0a, 0x4d, 0xdd, 0x36, 0x0d, 0xdd, 0x15, - 0x94, 0x2e, 0x4d, 0x68, 0x81, 0xd5, 0x82, 0x90, 0x76, 0xdb, 0x6c, 0x58, 0x2a, 0x51, 0x5a, 0x39, - 0xcd, 0x6a, 0x17, 0x46, 0x13, 0xa5, 0xce, 0xc3, 0xb1, 0x92, 0xd8, 0xc6, 0x76, 0x02, 0x1d, 0x69, - 0x46, 0xa3, 0x39, 0x21, 0x0e, 0x68, 0x0e, 0x73, 0x45, 0x1a, 0x69, 0xfe, 0x01, 0x4e, 0x73, 0x98, - 0x61, 0x0e, 0x73, 0xe3, 0xc8, 0x11, 0x8d, 0x04, 0x1a, 0xd1, 0x03, 0x27, 0xfe, 0x84, 0x91, 0x46, - 0x7e, 0x7e, 0x76, 0x9c, 0xe4, 0x39, 0x71, 0x48, 0xa8, 0xb8, 0xd9, 0xef, 0x7d, 0xde, 0xf7, 0xd7, - 0xe7, 0xfb, 0x7d, 0x7e, 0xdf, 0x97, 0xc0, 0x82, 0x74, 0x20, 0xa4, 0x05, 0x45, 0x43, 0x69, 0xa1, - 0x5c, 0x94, 0x65, 0x54, 0x4d, 0x37, 0xd6, 0xd3, 0xc6, 0xc3, 0x94, 0xaa, 0x29, 0x86, 0xc2, 0xc6, - 0xa4, 0x03, 0x21, 0x65, 0xce, 0xa6, 0xc8, 0x6c, 0xaa, 0xb1, 0xce, 0xcd, 0x88, 0x8a, 0xa8, 0xe0, - 0xf9, 0xb4, 0xf9, 0x64, 0x41, 0xb9, 0x59, 0x41, 0xd1, 0x6b, 0x8a, 0x9e, 0xae, 0xe9, 0xa2, 0x29, - 0xa2, 0xa6, 0x8b, 0x64, 0x62, 0xa9, 0xa9, 0xa1, 0x2a, 0x21, 0xd9, 0x30, 0x67, 0xad, 0x27, 0x02, - 0x38, 0x43, 0x33, 0xc1, 0xd6, 0xd7, 0x05, 0x52, 0x57, 0x45, 0xad, 0x58, 0x42, 0x16, 0x64, 0xf9, - 0x3b, 0x06, 0xd8, 0x1d, 0x5d, 0xcc, 0x58, 0xf3, 0xbb, 0x2a, 0x92, 0xb7, 0x65, 0xc9, 0x60, 0x67, - 0x21, 0xa2, 0x2a, 0x9a, 0x51, 0x90, 0x4a, 0x71, 0x26, 0xc9, 0xac, 0x8c, 0xf3, 0x61, 0xf3, 0x75, - 0xbb, 0xc4, 0x5e, 0x87, 0x08, 0x91, 0x15, 0x0f, 0x24, 0x99, 0x95, 0x89, 0x8d, 0x85, 0x14, 0xc5, - 0xd9, 0x14, 0x91, 0xb7, 0x15, 0x7a, 0xf1, 0x66, 0x69, 0x84, 0xb7, 0x97, 0xb0, 0xa7, 0x21, 0xac, - 0x4b, 0xa2, 0x8c, 0xb4, 0x78, 0xd0, 0x92, 0x6a, 0xbd, 0x5d, 0x8b, 0x3e, 0xfa, 0x7e, 0x69, 0xe4, - 0x9b, 0x77, 0xcf, 0x56, 0xc9, 0xc0, 0xf2, 0x5d, 0xe0, 0x3a, 0xad, 0xe2, 0x91, 0xae, 0x2a, 0xb2, - 0x8e, 0xd8, 0x45, 0x00, 0x22, 0xb1, 0x69, 0xe0, 0x38, 0x19, 0xd9, 0x2e, 0xb1, 0x71, 0x88, 0x34, - 0x90, 0xa6, 0x4b, 0x8a, 0x8c, 0x6d, 0x1c, 0xe7, 0xed, 0xd7, 0x6b, 0x21, 0x53, 0xcf, 0xf2, 0x9b, - 0x00, 0x4c, 0xb7, 0x4a, 0xdf, 0xd7, 0x0e, 0xbd, 0x5d, 0xde, 0x80, 0x98, 0xaa, 0xa1, 0x86, 0xa4, - 0xd4, 0xf5, 0x82, 0x4b, 0x2d, 0x16, 0xbd, 0x15, 0x88, 0x33, 0xfc, 0xb4, 0x3d, 0x9d, 0x71, 0x4c, - 0x70, 0x85, 0x29, 0xd8, 0x7f, 0x98, 0xd6, 0x61, 0x46, 0x50, 0xea, 0xb2, 0x81, 0x34, 0xb5, 0xa8, - 0x19, 0x87, 0x05, 0xdb, 0x9b, 0x10, 0xb6, 0x2b, 0xe6, 0x9e, 0xfb, 0xaf, 0x35, 0x65, 0x86, 0x44, - 0xd5, 0x14, 0xe5, 0x5e, 0x41, 0x92, 0x25, 0x23, 0x3e, 0x9a, 0x64, 0x56, 0x26, 0xf9, 0x71, 0x3c, - 0x82, 0xf9, 0xcc, 0xc0, 0xa4, 0x35, 0x5d, 0x46, 0x92, 0x58, 0x36, 0xe2, 0x61, 0x6c, 0x14, 0xe7, - 0x32, 0xca, 0x4a, 0xad, 0xc6, 0x7a, 0xea, 0x26, 0x46, 0x10, 0x93, 0x26, 0xf0, 0x2a, 0x6b, 0xc8, - 0xc5, 0x5e, 0xa4, 0x3b, 0x7b, 0x77, 0x60, 0xae, 0x23, 0xbe, 0x0e, 0x79, 0x2e, 0x76, 0x98, 0x16, - 0x76, 0xda, 0x68, 0x0d, 0xb4, 0xd1, 0x4a, 0xc8, 0xfb, 0xb5, 0x83, 0xbc, 0x4d, 0xa1, 0xe2, 0x4d, - 0x5e, 0x77, 0x99, 0xec, 0xdf, 0x61, 0xb6, 0x25, 0xd2, 0x2e, 0xac, 0x95, 0xa1, 0xa7, 0xdc, 0xd3, - 0x4d, 0x7e, 0x3f, 0x80, 0xa1, 0x79, 0xb0, 0xf8, 0x28, 0x18, 0xda, 0x21, 0x21, 0x68, 0x0c, 0x0f, - 0x98, 0xc9, 0x77, 0xbc, 0xfc, 0xcc, 0xb7, 0xf3, 0xb3, 0x29, 0x54, 0x6c, 0x7e, 0x96, 0x7f, 0x63, - 0xe0, 0x54, 0xeb, 0x6c, 0x46, 0x91, 0xef, 0x49, 0x5a, 0xed, 0x83, 0x83, 0xec, 0x78, 0x5e, 0x14, - 0x2a, 0x38, 0xac, 0xb6, 0xe7, 0x26, 0x73, 0xed, 0x9e, 0x87, 0x06, 0xf3, 0x7c, 0xb4, 0xbb, 0xe7, - 0x4b, 0xb0, 0x48, 0xf5, 0xcd, 0xf1, 0xbe, 0x01, 0xb1, 0x26, 0x20, 0x53, 0x55, 0x74, 0xd4, 0x7d, - 0x3f, 0xec, 0xe1, 0xba, 0xef, 0x0d, 0x6f, 0x11, 0xe6, 0x29, 0x7a, 0x1d, 0xb3, 0x5e, 0x33, 0x70, - 0xba, 0x6d, 0x7e, 0x50, 0x56, 0x5a, 0x77, 0x8c, 0x60, 0xaf, 0x1d, 0xe3, 0xe3, 0xf2, 0x92, 0x84, - 0x04, 0xdd, 0x3d, 0x27, 0x02, 0x47, 0x0c, 0x9c, 0xd8, 0xd1, 0x45, 0x1e, 0x09, 0x8d, 0xbd, 0xa2, - 0x50, 0x41, 0x06, 0x7b, 0x15, 0xc2, 0x2a, 0x7e, 0xc2, 0x7e, 0x4f, 0x6c, 0xcc, 0x53, 0xb7, 0x58, - 0x0b, 0x4c, 0x8c, 0x23, 0x0b, 0xd8, 0xf3, 0x30, 0x65, 0x39, 0x27, 0x28, 0xb5, 0x9a, 0x64, 0xd4, - 0x90, 0x6c, 0xe0, 0x00, 0x4d, 0xf2, 0x51, 0x3c, 0x9e, 0x71, 0x86, 0x3b, 0xe2, 0x10, 0x1c, 0x2c, - 0x0e, 0xa1, 0xee, 0x71, 0xf8, 0x1c, 0xd7, 0x5e, 0xd3, 0x49, 0x67, 0xd7, 0xfc, 0x27, 0x84, 0x35, - 0xa4, 0xd7, 0xab, 0x96, 0xb3, 0x27, 0x37, 0xce, 0x51, 0x9d, 0xb5, 0xe1, 0x3c, 0x86, 0xee, 0x1f, - 0xaa, 0x88, 0x27, 0xcb, 0xc8, 0xee, 0xf9, 0x24, 0x00, 0xb0, 0xa3, 0x8b, 0xfb, 0x52, 0x0d, 0x29, - 0xf5, 0xe1, 0x84, 0xb0, 0x2e, 0x6b, 0x48, 0x40, 0x52, 0x03, 0x95, 0x5a, 0x42, 0x98, 0x77, 0x86, - 0x87, 0x13, 0xc2, 0x0b, 0xc0, 0xca, 0xe8, 0xa1, 0x51, 0xd0, 0xd1, 0xfd, 0x3a, 0x92, 0x05, 0x54, - 0xd0, 0x90, 0xd0, 0xc0, 0xe1, 0x0c, 0xf1, 0x53, 0xe6, 0x4c, 0x8e, 0x4c, 0x98, 0xc1, 0xf3, 0x9f, - 0x78, 0x77, 0xf1, 0xf1, 0x87, 0xc4, 0x63, 0xd8, 0xd1, 0xfe, 0xd1, 0xfa, 0x56, 0x11, 0xe9, 0xbb, - 0x32, 0x4e, 0xec, 0x63, 0x0a, 0xfa, 0x12, 0x4c, 0x90, 0x14, 0x37, 0x95, 0x92, 0xfa, 0xb6, 0x2a, - 0xde, 0x32, 0x63, 0x28, 0x05, 0x4e, 0x67, 0x65, 0xb4, 0x27, 0x2b, 0xe1, 0xee, 0xac, 0x1c, 0xe0, - 0x0f, 0x54, 0x6b, 0xdc, 0x86, 0x4d, 0xce, 0xa3, 0x00, 0xa6, 0x7e, 0x53, 0xa8, 0xc8, 0xca, 0x83, - 0x2a, 0x2a, 0x89, 0x08, 0xd7, 0xfb, 0x00, 0xec, 0xac, 0x40, 0xb4, 0xd8, 0x2a, 0xcd, 0x26, 0xa7, - 0x6d, 0xb8, 0x49, 0x8e, 0xb9, 0xb0, 0xd4, 0x42, 0xce, 0xa6, 0x39, 0x72, 0xcc, 0xbb, 0xaf, 0x80, - 0x4f, 0xdb, 0x6d, 0x91, 0x18, 0x76, 0xbc, 0x7f, 0x6a, 0x39, 0x57, 0xe4, 0xad, 0x2e, 0x64, 0xa0, - 0x8f, 0xeb, 0xbf, 0x20, 0x7c, 0x4f, 0x42, 0xd5, 0x92, 0x4e, 0x76, 0x94, 0x65, 0xaa, 0x61, 0x44, - 0xd3, 0x0d, 0x8c, 0xb4, 0x19, 0xb3, 0xd6, 0xf9, 0xdf, 0x97, 0x9f, 0x30, 0xee, 0x83, 0x83, 0xcb, - 0x78, 0x27, 0x4a, 0xd7, 0x21, 0x42, 0x3a, 0x2b, 0x92, 0x38, 0x0b, 0xdd, 0xac, 0xb1, 0x4f, 0xfc, - 0x64, 0x89, 0x59, 0xd8, 0xe4, 0xd1, 0x29, 0x25, 0xec, 0x6f, 0x88, 0x8f, 0x92, 0x71, 0xbb, 0x90, - 0x48, 0x34, 0xff, 0x08, 0xc2, 0x4c, 0x87, 0x41, 0x5d, 0xdb, 0x98, 0x1e, 0xc1, 0xfc, 0x0f, 0x24, - 0x55, 0x4d, 0x51, 0x15, 0x1d, 0x95, 0x0a, 0xb6, 0x29, 0x82, 0x22, 0xcb, 0x48, 0x30, 0x24, 0x45, - 0x2e, 0x94, 0x15, 0xd5, 0x0c, 0x73, 0x70, 0x65, 0x9c, 0x5f, 0xb4, 0x71, 0x44, 0x6b, 0xc6, 0x41, - 0xdd, 0x54, 0x54, 0x9d, 0x2d, 0xc3, 0x7c, 0xcb, 0xd1, 0xd8, 0x16, 0x46, 0xa8, 0x0a, 0xf5, 0x49, - 0xd5, 0x9c, 0x5b, 0x58, 0x0b, 0x80, 0xdd, 0x82, 0x45, 0xaa, 0x26, 0x27, 0x82, 0xd6, 0x3e, 0x34, - 0x4f, 0x91, 0x60, 0x47, 0x93, 0xfd, 0x0b, 0x9c, 0x20, 0xdb, 0x24, 0x69, 0xd7, 0xc2, 0xb8, 0x16, - 0xad, 0xea, 0x23, 0xd1, 0x6d, 0x82, 0x6c, 0x86, 0x23, 0x2e, 0x10, 0x91, 0xd8, 0x51, 0xb2, 0x63, - 0x83, 0x95, 0xec, 0x78, 0xf7, 0x84, 0x7c, 0xcf, 0xc0, 0x02, 0x8d, 0x7f, 0xbf, 0x3d, 0xb2, 0x2b, - 0x5d, 0x03, 0xc3, 0x49, 0xd7, 0x20, 0x35, 0x5d, 0x5d, 0xbb, 0x47, 0x68, 0x90, 0xdd, 0xe3, 0x75, - 0x80, 0x92, 0xef, 0x83, 0x74, 0x7e, 0xf9, 0xb6, 0x0e, 0xce, 0x8e, 0x46, 0xd0, 0x77, 0x34, 0x62, - 0x94, 0xbc, 0xea, 0xcc, 0xa7, 0x90, 0x9f, 0x7c, 0x1a, 0xf5, 0x91, 0x4f, 0x1f, 0xb7, 0x25, 0x44, - 0x94, 0x74, 0x72, 0x75, 0x85, 0xc3, 0xfa, 0x08, 0xfc, 0x1c, 0x84, 0x78, 0x87, 0x9e, 0x41, 0x3b, - 0x99, 0xff, 0x01, 0x47, 0x6d, 0xe2, 0x75, 0xa3, 0x68, 0x58, 0x84, 0x9e, 0x6c, 0x89, 0x5b, 0xd3, - 0xde, 0x9c, 0x89, 0xe0, 0xe3, 0x94, 0x1e, 0x1f, 0xcf, 0x78, 0x26, 0x49, 0x68, 0xc8, 0x49, 0x32, - 0xea, 0x27, 0x49, 0xc2, 0x3e, 0x92, 0x24, 0x32, 0x58, 0x92, 0x8c, 0x75, 0x4f, 0x12, 0x09, 0x92, - 0x5e, 0xe4, 0x0d, 0x3b, 0x51, 0x9e, 0x07, 0x28, 0xa7, 0x05, 0xb3, 0x61, 0xff, 0x04, 0xb3, 0xc4, - 0x57, 0xcd, 0xb7, 0x33, 0x35, 0x3a, 0x18, 0x53, 0xe1, 0x3e, 0xee, 0x39, 0x5c, 0xd1, 0x73, 0xda, - 0xe9, 0xe7, 0x01, 0x4a, 0x21, 0xda, 0x6d, 0xe1, 0xb0, 0xf6, 0xd4, 0xfe, 0xaf, 0x40, 0x63, 0x94, - 0x20, 0x7f, 0x8a, 0xf1, 0xa5, 0x55, 0xc2, 0x47, 0x6a, 0x22, 0x7f, 0x09, 0xc0, 0x6c, 0x67, 0xd5, - 0x15, 0x65, 0x01, 0x55, 0x3f, 0x98, 0xa8, 0x5b, 0x70, 0x02, 0x69, 0x9a, 0xa2, 0x15, 0x70, 0xbb, - 0xa8, 0xda, 0x2d, 0xf9, 0x19, 0xaa, 0x85, 0x59, 0x13, 0xc9, 0x5b, 0x40, 0x12, 0xb4, 0x49, 0xe4, - 0x1a, 0x63, 0x53, 0x10, 0xb3, 0x42, 0xdf, 0x2a, 0xd3, 0x62, 0x69, 0x1a, 0x4f, 0xb9, 0x65, 0x1c, - 0x33, 0x55, 0x67, 0x60, 0xc9, 0x23, 0x7c, 0x4e, 0x31, 0x7c, 0x05, 0xd1, 0x1d, 0x5d, 0xcc, 0xab, - 0xa5, 0xa2, 0x81, 0xf6, 0x8a, 0x5a, 0xb1, 0xa6, 0xb3, 0x0b, 0x30, 0x5e, 0xac, 0x1b, 0x65, 0x45, - 0x93, 0x8c, 0x43, 0xfb, 0xf4, 0xe4, 0x0c, 0x58, 0x4d, 0xa2, 0x89, 0x23, 0x87, 0x27, 0xaf, 0x26, - 0xd1, 0x84, 0x34, 0x9b, 0x44, 0xf3, 0xed, 0x1a, 0x6b, 0xdb, 0xd7, 0x14, 0xb7, 0x3c, 0x87, 0x19, - 0x76, 0xeb, 0xb7, 0x4d, 0x5b, 0x7d, 0xc5, 0x00, 0xdb, 0x99, 0x22, 0xec, 0x15, 0x48, 0xf2, 0xd9, - 0xdc, 0xde, 0xee, 0xed, 0x5c, 0xb6, 0xc0, 0x67, 0x73, 0xf9, 0x5b, 0xfb, 0x85, 0xfd, 0xff, 0xef, - 0x65, 0x0b, 0xf9, 0xdb, 0xb9, 0xbd, 0x6c, 0x66, 0xfb, 0xc6, 0x76, 0xf6, 0xdf, 0x53, 0x23, 0x5c, - 0xf4, 0xf1, 0xd3, 0xe4, 0x84, 0x6b, 0x88, 0x3d, 0x07, 0x73, 0xd4, 0x65, 0xb7, 0x77, 0x77, 0xf7, - 0xa6, 0x18, 0x6e, 0xec, 0xf1, 0xd3, 0x64, 0xc8, 0x7c, 0x66, 0xd7, 0x60, 0x81, 0x0a, 0xcc, 0xe5, - 0x33, 0x99, 0x6c, 0x2e, 0x37, 0x15, 0xe0, 0x26, 0x1e, 0x3f, 0x4d, 0x46, 0xc8, 0xab, 0x27, 0xfc, - 0xc6, 0xe6, 0xf6, 0xad, 0x3c, 0x9f, 0x9d, 0x0a, 0x5a, 0x70, 0xf2, 0xca, 0x85, 0x1e, 0xfd, 0x90, - 0x18, 0xd9, 0x78, 0x1f, 0x85, 0xe0, 0x8e, 0x2e, 0xb2, 0x15, 0x88, 0xb6, 0xff, 0xfc, 0x44, 0x2f, - 0x95, 0xce, 0x5f, 0x84, 0xb8, 0xb4, 0x4f, 0xa0, 0x53, 0x94, 0x65, 0x38, 0xd9, 0xf6, 0xbb, 0xcf, - 0x59, 0x1f, 0x22, 0xf6, 0xb5, 0x43, 0x2e, 0xe5, 0x0f, 0xe7, 0xa1, 0xc9, 0x3c, 0xaa, 0xfa, 0xd1, - 0xb4, 0x29, 0x54, 0x7c, 0x69, 0x72, 0x9f, 0xcd, 0x0c, 0x60, 0x29, 0xb7, 0xf5, 0xab, 0x3e, 0xa4, - 0x10, 0x2c, 0xb7, 0xe1, 0x1f, 0xeb, 0x68, 0x95, 0x61, 0xaa, 0xe3, 0x9a, 0x7c, 0xa5, 0x87, 0x1c, - 0x07, 0xc9, 0x5d, 0xf4, 0x8b, 0x74, 0xf4, 0x3d, 0x80, 0x18, 0xed, 0xfa, 0xfb, 0x6f, 0x7e, 0x04, - 0xd9, 0x7e, 0x5e, 0xea, 0x03, 0xec, 0x28, 0xfe, 0x0c, 0xc0, 0x75, 0xeb, 0xbc, 0xec, 0x25, 0xa2, - 0x89, 0xe1, 0x56, 0x7b, 0x63, 0x1c, 0xe9, 0x39, 0x88, 0xd8, 0x9f, 0xdd, 0x25, 0xaf, 0x65, 0x04, - 0xc0, 0x9d, 0xeb, 0x01, 0x70, 0xe7, 0x5e, 0xdb, 0xa5, 0xe3, 0xd9, 0x1e, 0x4b, 0x09, 0xce, 0x3b, - 0xf7, 0x3c, 0x2e, 0xe3, 0x2a, 0x10, 0x6d, 0xbf, 0x41, 0xf3, 0xb4, 0xb2, 0x0d, 0xe8, 0x5d, 0xbc, - 0x5e, 0x37, 0x51, 0xcd, 0x44, 0x77, 0x5f, 0x1f, 0xf5, 0x4a, 0x74, 0x17, 0xb6, 0x67, 0xa2, 0xd3, - 0x6e, 0x76, 0xee, 0xc3, 0x74, 0xe7, 0x35, 0xcb, 0x79, 0x7f, 0x82, 0xcc, 0x8d, 0x63, 0xdd, 0x37, - 0xd4, 0x5b, 0xa5, 0xb9, 0x7d, 0xf8, 0x54, 0x69, 0xee, 0x20, 0xeb, 0xbe, 0xa1, 0x8e, 0xca, 0x2f, - 0xe1, 0x14, 0xbd, 0x2b, 0x5b, 0xf3, 0x27, 0xcb, 0x2e, 0xb1, 0x2b, 0x7d, 0xc1, 0xbd, 0xa9, 0xc5, - 0x67, 0x7d, 0x9f, 0xd4, 0x9a, 0x58, 0xbf, 0xd4, 0xba, 0x4f, 0xc1, 0x9d, 0x4e, 0xdb, 0xa5, 0xe8, - 0xd3, 0x69, 0xbb, 0x30, 0xaf, 0xf4, 0x05, 0x77, 0xd4, 0x7f, 0x01, 0x33, 0xd4, 0x63, 0xdd, 0x05, - 0x9f, 0x31, 0xc4, 0x68, 0xee, 0x72, 0x3f, 0x68, 0x47, 0xb7, 0x04, 0x31, 0xeb, 0xc0, 0x41, 0x50, - 0xe4, 0xdc, 0xf3, 0x57, 0x2f, 0x61, 0xee, 0xd3, 0x09, 0x77, 0xc1, 0x0f, 0xca, 0x56, 0xc5, 0x8d, - 0x7e, 0xfd, 0xee, 0xd9, 0x2a, 0xb3, 0x95, 0x7b, 0xf1, 0x36, 0xc1, 0xbc, 0x7c, 0x9b, 0x60, 0x7e, - 0x7f, 0x9b, 0x60, 0xbe, 0x3d, 0x4a, 0x8c, 0xbc, 0x3c, 0x4a, 0x8c, 0xbc, 0x3a, 0x4a, 0x8c, 0xdc, - 0xb9, 0x2a, 0x4a, 0x46, 0xb9, 0x7e, 0x90, 0x12, 0x94, 0x5a, 0x9a, 0xfc, 0x1f, 0x46, 0x3a, 0x10, - 0xd6, 0x44, 0x25, 0xdd, 0xf8, 0x47, 0xba, 0xa6, 0x94, 0xea, 0x55, 0xa4, 0x5b, 0xff, 0x63, 0xb9, - 0x78, 0x79, 0xcd, 0xfe, 0x2b, 0x8b, 0x71, 0xa8, 0x22, 0xfd, 0x20, 0x8c, 0xff, 0xc6, 0x72, 0xe9, - 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x91, 0x9e, 0x8f, 0x6a, 0x91, 0x23, 0x00, 0x00, + // 1870 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x6f, 0xdb, 0xc8, + 0x15, 0x36, 0xf5, 0xd3, 0x7e, 0x76, 0x22, 0x9b, 0x72, 0x62, 0x99, 0xb6, 0x65, 0xc5, 0x2d, 0x12, + 0xc7, 0x8d, 0xa5, 0xd8, 0x49, 0x8a, 0x26, 0x08, 0xd0, 0xda, 0xaa, 0xd2, 0x18, 0x88, 0x63, 0x83, + 0xb2, 0x8a, 0x36, 0x29, 0x2a, 0xc8, 0xd4, 0x44, 0x22, 0x24, 0x91, 0x0c, 0x49, 0x29, 0x71, 0x81, + 0x16, 0x45, 0x4f, 0x41, 0x0e, 0x41, 0x0f, 0xbd, 0x06, 0x68, 0xd1, 0x7f, 0x20, 0xe7, 0xdd, 0xec, + 0x61, 0x6f, 0x39, 0xe6, 0x18, 0x2c, 0xb0, 0xc1, 0x22, 0x3e, 0xe4, 0x94, 0x7f, 0x60, 0x81, 0x05, + 0x16, 0x1c, 0x0e, 0x29, 0x4a, 0x1c, 0x4a, 0x94, 0xa5, 0x18, 0xb9, 0x49, 0x33, 0x1f, 0xdf, 0x7b, + 0xf3, 0x7d, 0xef, 0x3d, 0xce, 0x8c, 0x04, 0x8b, 0xe2, 0xa1, 0x90, 0x11, 0x64, 0x15, 0x65, 0x84, + 0x6a, 0x49, 0x92, 0x50, 0x3d, 0xd3, 0xda, 0xc8, 0xe8, 0x4f, 0xd3, 0x8a, 0x2a, 0xeb, 0x32, 0x1b, + 0x17, 0x0f, 0x85, 0xb4, 0x31, 0x9b, 0x26, 0xb3, 0xe9, 0xd6, 0x06, 0x37, 0x5b, 0x91, 0x2b, 0x32, + 0x9e, 0xcf, 0x18, 0x9f, 0x4c, 0x28, 0x37, 0x27, 0xc8, 0x5a, 0x43, 0xd6, 0x32, 0x0d, 0xad, 0x62, + 0x98, 0x68, 0x68, 0x15, 0x32, 0xb1, 0xdc, 0xf6, 0x50, 0x17, 0x91, 0xa4, 0x1b, 0xb3, 0xe6, 0x27, + 0x02, 0xb8, 0x40, 0x0b, 0xc1, 0xf2, 0xd7, 0x03, 0xd2, 0x54, 0x2a, 0x6a, 0xa9, 0x8c, 0x4c, 0xc8, + 0xca, 0x7f, 0x18, 0x60, 0x77, 0xb5, 0x4a, 0xd6, 0x9c, 0xdf, 0x53, 0x90, 0xb4, 0x23, 0x89, 0x3a, + 0x3b, 0x07, 0x51, 0x45, 0x56, 0xf5, 0xa2, 0x58, 0x4e, 0x30, 0x29, 0x66, 0x75, 0x82, 0x8f, 0x18, + 0x5f, 0x77, 0xca, 0xec, 0x6d, 0x88, 0x12, 0x5b, 0x89, 0x40, 0x8a, 0x59, 0x9d, 0xdc, 0x5c, 0x4c, + 0x53, 0x16, 0x9b, 0x26, 0xf6, 0xb6, 0x43, 0x6f, 0xde, 0x2f, 0x8f, 0xf1, 0xd6, 0x23, 0xec, 0x79, + 0x88, 0x68, 0x62, 0x45, 0x42, 0x6a, 0x22, 0x68, 0x5a, 0x35, 0xbf, 0xdd, 0x8a, 0x3d, 0xfb, 0xef, + 0xf2, 0xd8, 0xbf, 0x3e, 0xbe, 0x5a, 0x23, 0x03, 0x2b, 0x0f, 0x81, 0x73, 0x47, 0xc5, 0x23, 0x4d, + 0x91, 0x25, 0x0d, 0xb1, 0x4b, 0x00, 0xc4, 0x62, 0x3b, 0xc0, 0x09, 0x32, 0xb2, 0x53, 0x66, 0x13, + 0x10, 0x6d, 0x21, 0x55, 0x13, 0x65, 0x09, 0xc7, 0x38, 0xc1, 0x5b, 0x5f, 0x6f, 0x85, 0x0c, 0x3f, + 0x2b, 0xef, 0x03, 0x30, 0xd3, 0x69, 0xfd, 0x40, 0x3d, 0xf2, 0x5e, 0xf2, 0x26, 0xc4, 0x15, 0x15, + 0xb5, 0x44, 0xb9, 0xa9, 0x15, 0x1d, 0x6e, 0xb1, 0xe9, 0xed, 0x40, 0x82, 0xe1, 0x67, 0xac, 0xe9, + 0xac, 0x1d, 0x82, 0x83, 0xa6, 0xe0, 0xe0, 0x34, 0x6d, 0xc0, 0xac, 0x20, 0x37, 0x25, 0x1d, 0xa9, + 0x4a, 0x49, 0xd5, 0x8f, 0x8a, 0xd6, 0x6a, 0x42, 0x38, 0xae, 0xb8, 0x73, 0xee, 0x8f, 0xe6, 0x94, + 0x41, 0x89, 0xa2, 0xca, 0xf2, 0xa3, 0xa2, 0x28, 0x89, 0x7a, 0x22, 0x9c, 0x62, 0x56, 0xa7, 0xf8, + 0x09, 0x3c, 0x82, 0xf5, 0xcc, 0xc2, 0x94, 0x39, 0x5d, 0x45, 0x62, 0xa5, 0xaa, 0x27, 0x22, 0x38, + 0x28, 0xce, 0x11, 0x94, 0x99, 0x5a, 0xad, 0x8d, 0xf4, 0x5d, 0x8c, 0x20, 0x21, 0x4d, 0xe2, 0xa7, + 0xcc, 0x21, 0x87, 0x7a, 0xd1, 0xde, 0xea, 0x3d, 0x80, 0x79, 0x17, 0xbf, 0xb6, 0x78, 0x0e, 0x75, + 0x98, 0x0e, 0x75, 0xba, 0x64, 0x0d, 0x74, 0xc9, 0x4a, 0xc4, 0xfb, 0xd6, 0x25, 0xde, 0x96, 0x50, + 0xf3, 0x16, 0xaf, 0xb7, 0x4d, 0xf6, 0xd7, 0x30, 0xd7, 0xc1, 0xb4, 0x03, 0x6b, 0x66, 0xe8, 0x39, + 0xe7, 0x74, 0x5b, 0xdf, 0x13, 0x28, 0xb4, 0x00, 0xa6, 0x1e, 0x45, 0x5d, 0x3d, 0x22, 0x02, 0x8d, + 0xe3, 0x01, 0x23, 0xf9, 0x4e, 0x57, 0x9f, 0x85, 0x6e, 0x7d, 0xb6, 0x84, 0x9a, 0xa5, 0xcf, 0xca, + 0x77, 0x0c, 0x9c, 0xeb, 0x9c, 0xcd, 0xca, 0xd2, 0x23, 0x51, 0x6d, 0x9c, 0x98, 0x64, 0x7b, 0xe5, + 0x25, 0xa1, 0x86, 0x69, 0xb5, 0x56, 0x6e, 0x28, 0xd7, 0xbd, 0xf2, 0xd0, 0x70, 0x2b, 0x0f, 0xf7, + 0x5e, 0xf9, 0x32, 0x2c, 0x51, 0xd7, 0x66, 0xaf, 0xbe, 0x05, 0xf1, 0x36, 0x20, 0x5b, 0x97, 0x35, + 0xd4, 0xbb, 0x1f, 0xf6, 0x59, 0xba, 0xef, 0x86, 0xb7, 0x04, 0x0b, 0x14, 0xbf, 0x76, 0x58, 0xff, + 0x0b, 0xc0, 0xf9, 0xae, 0xf9, 0x61, 0x55, 0xe9, 0xec, 0x18, 0xc1, 0x7e, 0x1d, 0x63, 0x94, 0xba, + 0xb0, 0xdb, 0xb0, 0xd4, 0x51, 0x3e, 0xe4, 0x9d, 0x54, 0xd4, 0xd0, 0xe3, 0x26, 0x92, 0x04, 0x84, + 0xf3, 0x3f, 0xc4, 0x2f, 0x38, 0x41, 0x05, 0x13, 0x93, 0x27, 0x10, 0x37, 0x85, 0x29, 0x48, 0xd2, + 0x29, 0xb2, 0x59, 0x3c, 0x66, 0xe0, 0xcc, 0xae, 0x56, 0xe1, 0x91, 0xd0, 0xda, 0x2f, 0x09, 0x35, + 0xa4, 0xb3, 0x37, 0x21, 0xa2, 0xe0, 0x4f, 0x98, 0xbb, 0xc9, 0xcd, 0x05, 0x6a, 0x9b, 0x36, 0xc1, + 0x64, 0x81, 0xe4, 0x01, 0xf6, 0x32, 0x4c, 0x9b, 0x04, 0x09, 0x72, 0xa3, 0x21, 0xea, 0x0d, 0x24, + 0xe9, 0x98, 0xe4, 0x29, 0x3e, 0x86, 0xc7, 0xb3, 0xf6, 0xb0, 0x8b, 0xcb, 0xe0, 0x70, 0x5c, 0x86, + 0x7a, 0xa7, 0xd2, 0x5f, 0x71, 0xfd, 0xb6, 0x17, 0x69, 0x77, 0xde, 0xdf, 0x42, 0x44, 0x45, 0x5a, + 0xb3, 0x6e, 0x2e, 0xf6, 0xec, 0xe6, 0x25, 0xea, 0x62, 0x2d, 0x38, 0x8f, 0xa1, 0x07, 0x47, 0x0a, + 0xe2, 0xc9, 0x63, 0xa4, 0x03, 0xbf, 0x08, 0x00, 0xec, 0x6a, 0x95, 0x03, 0xb1, 0x81, 0xe4, 0xe6, + 0x68, 0x28, 0x6c, 0x4a, 0x2a, 0x12, 0x90, 0xd8, 0x42, 0xe5, 0x0e, 0x0a, 0x0b, 0xf6, 0xf0, 0x68, + 0x28, 0xbc, 0x02, 0xac, 0x84, 0x9e, 0xea, 0x76, 0x9a, 0x15, 0x55, 0x24, 0xb4, 0x30, 0x9d, 0x21, + 0x7e, 0xda, 0x98, 0xb1, 0x92, 0xcb, 0x20, 0xcf, 0x7f, 0x53, 0x79, 0x88, 0xb7, 0x50, 0x84, 0x8f, + 0x51, 0xb3, 0xfd, 0xa3, 0xf9, 0xbe, 0x23, 0xd6, 0xf7, 0x24, 0x9c, 0xd8, 0xa7, 0x44, 0xfa, 0x32, + 0x4c, 0x92, 0x14, 0x37, 0x9c, 0x92, 0x1e, 0x61, 0x76, 0x0d, 0x33, 0x8c, 0x91, 0x34, 0x09, 0xba, + 0x2a, 0xe1, 0xbe, 0xaa, 0x44, 0x06, 0x6b, 0x29, 0xd1, 0x13, 0xb4, 0x94, 0x43, 0xfc, 0xa2, 0xec, + 0xe4, 0x7e, 0xd4, 0x02, 0x3f, 0x0b, 0xe0, 0xf4, 0xd9, 0x12, 0x6a, 0x92, 0xfc, 0xa4, 0x8e, 0xca, + 0x15, 0x84, 0x7b, 0xc6, 0x10, 0x0a, 0xaf, 0x42, 0xac, 0xd4, 0x69, 0xcd, 0x12, 0xb8, 0x6b, 0xb8, + 0x2d, 0xb0, 0xf1, 0x60, 0xb9, 0x43, 0xe0, 0x2d, 0x63, 0xe4, 0x94, 0xdf, 0xce, 0x02, 0xde, 0xf5, + 0x77, 0x31, 0x31, 0x6a, 0xbe, 0xbf, 0xea, 0xd8, 0xdf, 0x90, 0x14, 0x18, 0xea, 0x25, 0xff, 0x3b, + 0x88, 0x3c, 0x12, 0x51, 0xbd, 0xac, 0x91, 0xae, 0xb4, 0x42, 0x0d, 0x8c, 0x78, 0xba, 0x83, 0x91, + 0x96, 0x62, 0xe6, 0x73, 0xfe, 0x7b, 0xfb, 0x0b, 0xc6, 0xb9, 0x81, 0x71, 0x04, 0x6f, 0xb3, 0x74, + 0x1b, 0xa2, 0x24, 0xf5, 0x49, 0xe2, 0x2c, 0xf6, 0x8a, 0xc6, 0x3a, 0x79, 0x90, 0x47, 0x8c, 0xe6, + 0xe0, 0x2a, 0x9c, 0x00, 0x2e, 0x9c, 0x58, 0xb3, 0xab, 0x58, 0x4c, 0x36, 0x7f, 0x0a, 0xc2, 0xac, + 0x2b, 0xa0, 0x9e, 0xc7, 0xa9, 0x3e, 0x64, 0xfe, 0x01, 0x52, 0x8a, 0x2a, 0x2b, 0xb2, 0x86, 0xca, + 0x76, 0x0d, 0x0b, 0xb2, 0x24, 0x21, 0x41, 0x17, 0x65, 0xa9, 0x58, 0x95, 0x15, 0x83, 0xe6, 0xe0, + 0xea, 0x04, 0xbf, 0x64, 0xe1, 0x88, 0xd7, 0xac, 0x8d, 0xba, 0x2b, 0x2b, 0x1a, 0x5b, 0x85, 0x05, + 0x6a, 0x43, 0x20, 0x52, 0x85, 0x06, 0x94, 0x6a, 0x9e, 0xd2, 0x38, 0x4c, 0x40, 0xff, 0xd6, 0x13, + 0xee, 0xdb, 0x7a, 0xd8, 0x5f, 0xc0, 0x19, 0xd2, 0x6a, 0xc9, 0xb1, 0x31, 0x82, 0x6b, 0xd1, 0xac, + 0x3e, 0xc2, 0x6e, 0x1b, 0x64, 0x29, 0x1c, 0x75, 0x80, 0x88, 0x45, 0x57, 0xc9, 0x8e, 0x0f, 0x57, + 0xb2, 0x13, 0xbd, 0x13, 0xf2, 0x13, 0x03, 0x8b, 0x34, 0xfd, 0xfd, 0x9e, 0xd5, 0x1d, 0xe9, 0x1a, + 0x18, 0x4d, 0xba, 0x06, 0xa9, 0xe9, 0xea, 0xe8, 0x1e, 0xa1, 0x61, 0xba, 0xc7, 0xf7, 0x01, 0x4a, + 0xbe, 0x0f, 0x73, 0x02, 0x2d, 0x74, 0x9d, 0x24, 0x2d, 0x36, 0x82, 0xbe, 0xd9, 0x88, 0x53, 0xf2, + 0xca, 0x9d, 0x4f, 0x21, 0x3f, 0xf9, 0x14, 0xf6, 0x91, 0x4f, 0x9f, 0xf7, 0x68, 0x8a, 0x28, 0xe9, + 0xe4, 0x38, 0x9d, 0x8e, 0xea, 0x25, 0xf0, 0x75, 0x10, 0x12, 0x2e, 0x3f, 0xc3, 0x9e, 0xa8, 0xfe, + 0x04, 0x1c, 0xf5, 0x32, 0x41, 0xd3, 0x4b, 0xba, 0x29, 0xe8, 0xd9, 0x0e, 0xde, 0xda, 0xf1, 0xe6, + 0x0d, 0x04, 0x9f, 0xa0, 0xdc, 0x35, 0xe0, 0x19, 0xcf, 0x24, 0x09, 0x8d, 0x38, 0x49, 0xc2, 0x7e, + 0x92, 0x24, 0xe2, 0x23, 0x49, 0xa2, 0xc3, 0x25, 0xc9, 0x78, 0xef, 0x24, 0x11, 0x21, 0xe5, 0x25, + 0xde, 0xa8, 0x13, 0xe5, 0x75, 0x80, 0xb2, 0x5b, 0xd8, 0x53, 0x90, 0xf4, 0x05, 0x66, 0x89, 0xaf, + 0x9a, 0xef, 0x56, 0x2a, 0x3c, 0x9c, 0x52, 0x91, 0x01, 0xee, 0x5b, 0x1c, 0xec, 0xd9, 0x47, 0xf2, + 0xd7, 0x01, 0x4a, 0x21, 0x5a, 0x47, 0xcb, 0x51, 0xf5, 0xd4, 0xc1, 0xaf, 0x62, 0xe3, 0x14, 0x92, + 0xbf, 0x44, 0x7e, 0x69, 0x95, 0xf0, 0x99, 0x0e, 0xa2, 0xdf, 0x04, 0x60, 0xce, 0x5d, 0x75, 0x25, + 0x49, 0x40, 0xf5, 0x13, 0x0b, 0x75, 0x0f, 0xce, 0x20, 0x55, 0x95, 0xd5, 0x22, 0x3e, 0x72, 0x2a, + 0xd6, 0xb1, 0xfe, 0x02, 0x35, 0xc2, 0x9c, 0x81, 0xe4, 0x4d, 0x20, 0x21, 0x6d, 0x0a, 0x39, 0xc6, + 0xd8, 0x34, 0xc4, 0x4d, 0xea, 0x3b, 0x6d, 0x9a, 0x2a, 0xcd, 0xe0, 0x29, 0xa7, 0x8d, 0x53, 0x96, + 0xea, 0x02, 0x2c, 0x7b, 0xd0, 0x67, 0x17, 0xc3, 0x3f, 0x20, 0xb6, 0xab, 0x55, 0x0a, 0x4a, 0xb9, + 0xa4, 0xa3, 0xfd, 0x92, 0x5a, 0x6a, 0x68, 0xec, 0x22, 0x4c, 0x94, 0x9a, 0x7a, 0x55, 0x56, 0x45, + 0xfd, 0xc8, 0xda, 0x3d, 0xd9, 0x03, 0xe6, 0x21, 0xd1, 0xc0, 0x91, 0xcd, 0x93, 0xd7, 0x21, 0xd1, + 0x80, 0xb4, 0x0f, 0x89, 0xc6, 0xb7, 0x5b, 0xac, 0x15, 0x5f, 0xdb, 0xdc, 0xca, 0x3c, 0x56, 0xd8, + 0xe9, 0xdf, 0x0a, 0x6d, 0xed, 0x1d, 0x03, 0xac, 0x3b, 0x45, 0xd8, 0x1b, 0x90, 0xe2, 0x73, 0xf9, + 0xfd, 0xbd, 0xfb, 0xf9, 0x5c, 0x91, 0xcf, 0xe5, 0x0b, 0xf7, 0x0e, 0x8a, 0x07, 0x7f, 0xde, 0xcf, + 0x15, 0x0b, 0xf7, 0xf3, 0xfb, 0xb9, 0xec, 0xce, 0x9d, 0x9d, 0xdc, 0xef, 0xa7, 0xc7, 0xb8, 0xd8, + 0xf3, 0x97, 0xa9, 0x49, 0xc7, 0x10, 0x7b, 0x09, 0xe6, 0xa9, 0x8f, 0xdd, 0xdf, 0xdb, 0xdb, 0x9f, + 0x66, 0xb8, 0xf1, 0xe7, 0x2f, 0x53, 0x21, 0xe3, 0x33, 0xbb, 0x0e, 0x8b, 0x54, 0x60, 0xbe, 0x90, + 0xcd, 0xe6, 0xf2, 0xf9, 0xe9, 0x00, 0x37, 0xf9, 0xfc, 0x65, 0x2a, 0x4a, 0xbe, 0x7a, 0xc2, 0xef, + 0x6c, 0xed, 0xdc, 0x2b, 0xf0, 0xb9, 0xe9, 0xa0, 0x09, 0x27, 0x5f, 0xb9, 0xd0, 0xb3, 0xff, 0x27, + 0xc7, 0x36, 0x3f, 0xc5, 0x20, 0xb8, 0xab, 0x55, 0xd8, 0x1a, 0xc4, 0xba, 0x7f, 0x06, 0xa3, 0x97, + 0x8a, 0xfb, 0x97, 0x29, 0x2e, 0xe3, 0x13, 0x68, 0x17, 0x65, 0x15, 0xce, 0x76, 0xfd, 0xfe, 0x74, + 0xd1, 0x87, 0x89, 0x03, 0xf5, 0x88, 0x4b, 0xfb, 0xc3, 0x79, 0x78, 0x32, 0xb6, 0xaa, 0x7e, 0x3c, + 0x6d, 0x09, 0x35, 0x5f, 0x9e, 0x9c, 0x7b, 0x33, 0x1d, 0x58, 0xca, 0xaf, 0x06, 0x6b, 0x3e, 0xac, + 0x10, 0x2c, 0xb7, 0xe9, 0x1f, 0x6b, 0x7b, 0x95, 0x60, 0xda, 0x75, 0x5d, 0xbf, 0xda, 0xc7, 0x8e, + 0x8d, 0xe4, 0xae, 0xfa, 0x45, 0xda, 0xfe, 0x9e, 0x40, 0x9c, 0x76, 0x0d, 0xff, 0x2b, 0x3f, 0x86, + 0xac, 0x75, 0x5e, 0x1b, 0x00, 0x6c, 0x3b, 0xfe, 0x0b, 0x80, 0xe3, 0xe6, 0x7a, 0xc5, 0xcb, 0x44, + 0x1b, 0xc3, 0xad, 0xf5, 0xc7, 0xd8, 0xd6, 0xf3, 0x10, 0xb5, 0x5e, 0xbb, 0xcb, 0x5e, 0x8f, 0x11, + 0x00, 0x77, 0xa9, 0x0f, 0xc0, 0x99, 0x7b, 0x5d, 0x17, 0x97, 0x17, 0xfb, 0x3c, 0x4a, 0x70, 0xde, + 0xb9, 0xe7, 0x71, 0x19, 0x57, 0x83, 0x58, 0xf7, 0x0d, 0x9a, 0x67, 0x94, 0x5d, 0x40, 0xef, 0xe2, + 0xf5, 0xba, 0x89, 0x6a, 0x27, 0xba, 0xf3, 0xfa, 0xa8, 0x5f, 0xa2, 0x3b, 0xb0, 0x7d, 0x13, 0x9d, + 0x76, 0xb3, 0xf3, 0x18, 0x66, 0xdc, 0xd7, 0x2c, 0x97, 0xfd, 0x19, 0x32, 0x1a, 0xc7, 0x86, 0x6f, + 0xa8, 0xb7, 0x4b, 0xa3, 0x7d, 0xf8, 0x74, 0x69, 0x74, 0x90, 0x0d, 0xdf, 0x50, 0xdb, 0xe5, 0xdf, + 0xe1, 0x1c, 0xfd, 0x54, 0xb6, 0xee, 0xcf, 0x96, 0x55, 0x62, 0x37, 0x06, 0x82, 0x7b, 0x4b, 0x8b, + 0xf7, 0xfa, 0x3e, 0xa5, 0x35, 0xb0, 0x7e, 0xa5, 0x75, 0xee, 0x82, 0xdd, 0x8b, 0xb6, 0x4a, 0xd1, + 0xe7, 0xa2, 0xad, 0xc2, 0xbc, 0x31, 0x10, 0xdc, 0x76, 0xff, 0x37, 0x98, 0xa5, 0x6e, 0xeb, 0xae, + 0xf8, 0xe4, 0x10, 0xa3, 0xb9, 0xeb, 0x83, 0xa0, 0x6d, 0xdf, 0x22, 0xc4, 0xcd, 0x0d, 0x07, 0x41, + 0x91, 0x7d, 0xcf, 0x2f, 0xbd, 0x8c, 0x39, 0x77, 0x27, 0xdc, 0x15, 0x3f, 0x28, 0xcb, 0x15, 0x17, + 0xfe, 0xe7, 0xc7, 0x57, 0x6b, 0xcc, 0x76, 0xfe, 0xcd, 0x87, 0x24, 0xf3, 0xf6, 0x43, 0x92, 0xf9, + 0xe1, 0x43, 0x92, 0xf9, 0xf7, 0x71, 0x72, 0xec, 0xed, 0x71, 0x72, 0xec, 0xdd, 0x71, 0x72, 0xec, + 0xc1, 0xcd, 0x8a, 0xa8, 0x57, 0x9b, 0x87, 0x69, 0x41, 0x6e, 0x64, 0xc8, 0xff, 0x72, 0xc4, 0x43, + 0x61, 0xbd, 0x22, 0x67, 0x5a, 0xbf, 0xc9, 0x34, 0xe4, 0x72, 0xb3, 0x8e, 0x34, 0xf3, 0xff, 0x34, + 0x57, 0xaf, 0xaf, 0x5b, 0x7f, 0xa9, 0xd1, 0x8f, 0x14, 0xa4, 0x1d, 0x46, 0xf0, 0xdf, 0x69, 0xae, + 0xfd, 0x1c, 0x00, 0x00, 0xff, 0xff, 0x43, 0x7e, 0x91, 0x18, 0x19, 0x24, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2888,6 +2891,11 @@ func (m *MsgChannelCloseConfirm) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if m.CounterpartyUpgradeSequence != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.CounterpartyUpgradeSequence)) + i-- + dAtA[i] = 0x30 + } if len(m.Signer) > 0 { i -= len(m.Signer) copy(dAtA[i:], m.Signer) @@ -3147,6 +3155,11 @@ func (m *MsgTimeoutOnClose) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.CounterpartyUpgradeSequence != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.CounterpartyUpgradeSequence)) + i-- + dAtA[i] = 0x38 + } if len(m.Signer) > 0 { i -= len(m.Signer) copy(dAtA[i:], m.Signer) @@ -4343,6 +4356,9 @@ func (m *MsgChannelCloseConfirm) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } + if m.CounterpartyUpgradeSequence != 0 { + n += 1 + sovTx(uint64(m.CounterpartyUpgradeSequence)) + } return n } @@ -4449,6 +4465,9 @@ func (m *MsgTimeoutOnClose) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } + if m.CounterpartyUpgradeSequence != 0 { + n += 1 + sovTx(uint64(m.CounterpartyUpgradeSequence)) + } return n } @@ -6473,6 +6492,25 @@ func (m *MsgChannelCloseConfirm) Unmarshal(dAtA []byte) error { } m.Signer = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CounterpartyUpgradeSequence", wireType) + } + m.CounterpartyUpgradeSequence = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CounterpartyUpgradeSequence |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -7279,6 +7317,25 @@ func (m *MsgTimeoutOnClose) Unmarshal(dAtA []byte) error { } m.Signer = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CounterpartyUpgradeSequence", wireType) + } + m.CounterpartyUpgradeSequence = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CounterpartyUpgradeSequence |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/modules/core/ante/ante_test.go b/modules/core/ante/ante_test.go index 1b9a8c15c64..734d71cc290 100644 --- a/modules/core/ante/ante_test.go +++ b/modules/core/ante/ante_test.go @@ -147,7 +147,7 @@ func (suite *AnteTestSuite) createTimeoutOnCloseMessage(isRedundant bool) sdk.Ms channelKey := host.ChannelKey(packet.GetDestPort(), packet.GetDestChannel()) proofClosed, _ := suite.chainA.QueryProof(channelKey) - return channeltypes.NewMsgTimeoutOnClose(packet, 1, proof, proofClosed, proofHeight, suite.path.EndpointA.Chain.SenderAccount.GetAddress().String()) + return channeltypes.NewMsgTimeoutOnClose(packet, 1, proof, proofClosed, proofHeight, suite.path.EndpointA.Chain.SenderAccount.GetAddress().String(), 0) } func (suite *AnteTestSuite) createUpdateClientMessage() sdk.Msg { diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go index f1086856147..8242ad40d75 100644 --- a/modules/core/keeper/msg_server.go +++ b/modules/core/keeper/msg_server.go @@ -432,7 +432,7 @@ func (k Keeper) ChannelCloseConfirm(goCtx context.Context, msg *channeltypes.Msg return nil, errorsmod.Wrapf(err, "channel close confirm callback failed for port ID: %s, channel ID: %s", msg.PortId, msg.ChannelId) } - err = k.ChannelKeeper.ChanCloseConfirm(ctx, msg.PortId, msg.ChannelId, capability, msg.ProofInit, msg.ProofHeight) + err = k.ChannelKeeper.ChanCloseConfirm(ctx, msg.PortId, msg.ChannelId, capability, msg.ProofInit, msg.ProofHeight, msg.CounterpartyUpgradeSequence) if err != nil { ctx.Logger().Error("channel close confirm failed", "port-id", msg.PortId, "channel-id", msg.ChannelId, "error", err.Error()) return nil, errorsmod.Wrap(err, "channel handshake close confirm failed") @@ -622,7 +622,7 @@ func (k Keeper) TimeoutOnClose(goCtx context.Context, msg *channeltypes.MsgTimeo // If the timeout was already received, perform a no-op // Use a cached context to prevent accidental state changes cacheCtx, writeFn := ctx.CacheContext() - err = k.ChannelKeeper.TimeoutOnClose(cacheCtx, capability, msg.Packet, msg.ProofUnreceived, msg.ProofClose, msg.ProofHeight, msg.NextSequenceRecv) + err = k.ChannelKeeper.TimeoutOnClose(cacheCtx, capability, msg.Packet, msg.ProofUnreceived, msg.ProofClose, msg.ProofHeight, msg.NextSequenceRecv, msg.CounterpartyUpgradeSequence) switch err { case nil: diff --git a/modules/core/keeper/msg_server_test.go b/modules/core/keeper/msg_server_test.go index 2aeec6c37a2..429f41e5ed4 100644 --- a/modules/core/keeper/msg_server_test.go +++ b/modules/core/keeper/msg_server_test.go @@ -578,9 +578,10 @@ func (suite *KeeperTestSuite) TestHandleTimeoutPacket() { // 'TimeoutExecuted' can be found in the 04-channel/keeper/timeout_test.go. func (suite *KeeperTestSuite) TestHandleTimeoutOnClosePacket() { var ( - packet channeltypes.Packet - packetKey []byte - path *ibctesting.Path + packet channeltypes.Packet + packetKey []byte + path *ibctesting.Path + counterpartyUpgradeSequence uint64 ) testCases := []struct { @@ -717,7 +718,7 @@ func (suite *KeeperTestSuite) TestHandleTimeoutOnClosePacket() { channelKey := host.ChannelKey(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID) proofClosed, _ := suite.chainB.QueryProof(channelKey) - msg := channeltypes.NewMsgTimeoutOnClose(packet, 1, proof, proofClosed, proofHeight, suite.chainA.SenderAccount.GetAddress().String()) + msg := channeltypes.NewMsgTimeoutOnClose(packet, 1, proof, proofClosed, proofHeight, suite.chainA.SenderAccount.GetAddress().String(), counterpartyUpgradeSequence) _, err := keeper.Keeper.TimeoutOnClose(*suite.chainA.App.GetIBCKeeper(), suite.chainA.GetContext(), msg) diff --git a/proto/ibc/core/channel/v1/tx.proto b/proto/ibc/core/channel/v1/tx.proto index 758ccc18400..64627b79d40 100644 --- a/proto/ibc/core/channel/v1/tx.proto +++ b/proto/ibc/core/channel/v1/tx.proto @@ -190,11 +190,12 @@ message MsgChannelCloseConfirm { option (gogoproto.goproto_getters) = false; - string port_id = 1; - string channel_id = 2; - bytes proof_init = 3; - ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; - string signer = 5; + string port_id = 1; + string channel_id = 2; + bytes proof_init = 3; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; + string signer = 5; + uint64 counterparty_upgrade_sequence = 6; } // MsgChannelCloseConfirmResponse defines the Msg/ChannelCloseConfirm response @@ -246,12 +247,13 @@ message MsgTimeoutOnClose { option (gogoproto.goproto_getters) = false; - Packet packet = 1 [(gogoproto.nullable) = false]; - bytes proof_unreceived = 2; - bytes proof_close = 3; - ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; - uint64 next_sequence_recv = 5; - string signer = 6; + Packet packet = 1 [(gogoproto.nullable) = false]; + bytes proof_unreceived = 2; + bytes proof_close = 3; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; + uint64 next_sequence_recv = 5; + string signer = 6; + uint64 counterparty_upgrade_sequence = 7; } // MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type. diff --git a/testing/endpoint.go b/testing/endpoint.go index 0738d5e735c..042fac27402 100644 --- a/testing/endpoint.go +++ b/testing/endpoint.go @@ -563,6 +563,7 @@ func (endpoint *Endpoint) TimeoutOnClose(packet channeltypes.Packet) error { timeoutOnCloseMsg := channeltypes.NewMsgTimeoutOnClose( packet, nextSeqRecv, proof, proofClosed, proofHeight, endpoint.Chain.SenderAccount.GetAddress().String(), + endpoint.Counterparty.GetChannel().UpgradeSequence, ) return endpoint.Chain.sendMsgs(timeoutOnCloseMsg) diff --git a/testing/solomachine.go b/testing/solomachine.go index 2293f285bec..81eb087f6bc 100644 --- a/testing/solomachine.go +++ b/testing/solomachine.go @@ -358,6 +358,7 @@ func (solo *Solomachine) ChanCloseConfirm(chain *TestChain, portID, channelID st proofInit, clienttypes.ZeroHeight(), chain.SenderAccount.GetAddress().String(), + 0, // use default value for channel that hasn't undergone an upgrade ) res, err := chain.SendMsgs(msgChanCloseConfirm) @@ -449,6 +450,7 @@ func (solo *Solomachine) TimeoutPacketOnClose(chain *TestChain, packet channelty proofClosed, clienttypes.ZeroHeight(), chain.SenderAccount.GetAddress().String(), + 0, // use default value for channel that hasn't undergone an upgrade ) res, err := chain.SendMsgs(msgTimeout)