From 404da253ee2eb2a25de38b3579002e40b46119ef Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Thu, 24 Aug 2023 15:42:05 +0000 Subject: [PATCH] Refactor channel upgradability msgs to reflect updated spec (#4456) --- modules/core/04-channel/types/msgs.go | 17 +- modules/core/04-channel/types/msgs_test.go | 18 +- modules/core/04-channel/types/tx.pb.go | 352 ++++++++------------- modules/core/keeper/msg_server_test.go | 19 +- proto/ibc/core/channel/v1/tx.proto | 14 +- testing/endpoint.go | 8 - 6 files changed, 150 insertions(+), 278 deletions(-) diff --git a/modules/core/04-channel/types/msgs.go b/modules/core/04-channel/types/msgs.go index 40dcb45a511..1585f4851e1 100644 --- a/modules/core/04-channel/types/msgs.go +++ b/modules/core/04-channel/types/msgs.go @@ -751,20 +751,17 @@ var _ sdk.Msg = &MsgChannelUpgradeTimeout{} func NewMsgChannelUpgradeTimeout( portID, channelID string, counterpartyChannel Channel, - errorReceipt *ErrorReceipt, - proofChannel, proofErrorReceipt []byte, + proofChannel []byte, proofHeight clienttypes.Height, signer string, ) *MsgChannelUpgradeTimeout { return &MsgChannelUpgradeTimeout{ - PortId: portID, - ChannelId: channelID, - CounterpartyChannel: counterpartyChannel, - PreviousErrorReceipt: errorReceipt, - ProofChannel: proofChannel, - ProofErrorReceipt: proofErrorReceipt, - ProofHeight: proofHeight, - Signer: signer, + PortId: portID, + ChannelId: channelID, + CounterpartyChannel: counterpartyChannel, + ProofChannel: proofChannel, + ProofHeight: proofHeight, + Signer: signer, } } diff --git a/modules/core/04-channel/types/msgs_test.go b/modules/core/04-channel/types/msgs_test.go index 923e4f75f44..3cffeb3f8ae 100644 --- a/modules/core/04-channel/types/msgs_test.go +++ b/modules/core/04-channel/types/msgs_test.go @@ -862,16 +862,6 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeTimeoutValidateBasic() { func() {}, true, }, - { - "success with non-nil error receipt", - func() { - msg.PreviousErrorReceipt = &types.ErrorReceipt{ - Sequence: 1, - Message: "error message", - } - }, - true, - }, { "invalid port identifier", func() { @@ -914,8 +904,8 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeTimeoutValidateBasic() { suite.Run(tc.name, func() { msg = types.NewMsgChannelUpgradeTimeout( ibctesting.MockPort, ibctesting.FirstChannelID, - types.Channel{State: types.OPEN}, nil, - suite.proof, suite.proof, + types.Channel{State: types.OPEN}, + suite.proof, height, addr, ) @@ -937,8 +927,8 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeTimeoutGetSigners() { msg := types.NewMsgChannelUpgradeTimeout( ibctesting.MockPort, ibctesting.FirstChannelID, - types.Channel{}, nil, - suite.proof, suite.proof, + types.Channel{}, + suite.proof, height, addr, ) diff --git a/modules/core/04-channel/types/tx.pb.go b/modules/core/04-channel/types/tx.pb.go index 443374ba59c..b38de35bd67 100644 --- a/modules/core/04-channel/types/tx.pb.go +++ b/modules/core/04-channel/types/tx.pb.go @@ -1290,14 +1290,12 @@ var xxx_messageInfo_MsgChannelUpgradeOpenResponse proto.InternalMessageInfo // MsgChannelUpgradeTimeout defines the request type for the ChannelUpgradeTimeout rpc type MsgChannelUpgradeTimeout 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"` - CounterpartyChannel Channel `protobuf:"bytes,3,opt,name=counterparty_channel,json=counterpartyChannel,proto3" json:"counterparty_channel"` - PreviousErrorReceipt *ErrorReceipt `protobuf:"bytes,4,opt,name=previous_error_receipt,json=previousErrorReceipt,proto3" json:"previous_error_receipt,omitempty"` - ProofChannel []byte `protobuf:"bytes,5,opt,name=proof_channel,json=proofChannel,proto3" json:"proof_channel,omitempty"` - ProofErrorReceipt []byte `protobuf:"bytes,6,opt,name=proof_error_receipt,json=proofErrorReceipt,proto3" json:"proof_error_receipt,omitempty"` - ProofHeight types.Height `protobuf:"bytes,7,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` - Signer string `protobuf:"bytes,8,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"` + CounterpartyChannel Channel `protobuf:"bytes,3,opt,name=counterparty_channel,json=counterpartyChannel,proto3" json:"counterparty_channel"` + ProofChannel []byte `protobuf:"bytes,4,opt,name=proof_channel,json=proofChannel,proto3" json:"proof_channel,omitempty"` + ProofHeight types.Height `protobuf:"bytes,5,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` + Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"` } func (m *MsgChannelUpgradeTimeout) Reset() { *m = MsgChannelUpgradeTimeout{} } @@ -1574,124 +1572,123 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/tx.proto", fileDescriptor_bc4637e0ac3fc7b7) } var fileDescriptor_bc4637e0ac3fc7b7 = []byte{ - // 1869 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x6f, 0xdb, 0x46, - 0x16, 0x37, 0x25, 0x59, 0xb2, 0x9f, 0x9d, 0xc8, 0xa6, 0x9c, 0x58, 0xa6, 0x6d, 0x59, 0xf1, 0x2e, + // 1845 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x6f, 0xdb, 0x46, + 0x16, 0x36, 0x25, 0x59, 0xb2, 0x9f, 0x9d, 0xc8, 0xa6, 0x9c, 0x58, 0xa6, 0x6d, 0x59, 0xf1, 0x2e, 0x12, 0xc7, 0x1b, 0x4b, 0xb1, 0x93, 0xec, 0x22, 0x41, 0x80, 0x5d, 0x5b, 0xab, 0x6c, 0x0c, 0xc4, - 0xb1, 0x41, 0x59, 0xfb, 0x91, 0x2c, 0x56, 0x90, 0xa9, 0x89, 0x44, 0x48, 0x22, 0x19, 0x92, 0x52, - 0xe2, 0x05, 0x5a, 0x14, 0x3d, 0x05, 0x39, 0x14, 0x3d, 0xf4, 0x1a, 0xa0, 0x40, 0xcf, 0x05, 0x72, - 0xea, 0xa1, 0x1f, 0x87, 0x1e, 0x0a, 0xe4, 0x98, 0x63, 0x50, 0x20, 0x41, 0x11, 0x1f, 0x72, 0xca, - 0x9f, 0x50, 0xa0, 0xe0, 0x70, 0x48, 0x91, 0x12, 0x29, 0x8d, 0x22, 0x39, 0xcd, 0x8d, 0x9c, 0xf9, - 0xcd, 0xfb, 0xfa, 0xbd, 0x37, 0x9c, 0x37, 0x12, 0x2c, 0x88, 0x07, 0x42, 0x5a, 0x90, 0x55, 0x94, - 0x16, 0x2a, 0x45, 0x49, 0x42, 0xb5, 0x74, 0x73, 0x3d, 0xad, 0x3f, 0x4c, 0x29, 0xaa, 0xac, 0xcb, - 0x6c, 0x4c, 0x3c, 0x10, 0x52, 0xc6, 0x6c, 0x8a, 0xcc, 0xa6, 0x9a, 0xeb, 0xdc, 0x4c, 0x59, 0x2e, - 0xcb, 0x78, 0x3e, 0x6d, 0x3c, 0x99, 0x50, 0x6e, 0x56, 0x90, 0xb5, 0xba, 0xac, 0xa5, 0xeb, 0x5a, - 0xd9, 0x10, 0x51, 0xd7, 0xca, 0x64, 0x62, 0xa9, 0xa5, 0xa1, 0x26, 0x22, 0x49, 0x37, 0x66, 0xcd, - 0x27, 0x02, 0x38, 0xe3, 0x65, 0x82, 0xa5, 0xaf, 0x0b, 0xa4, 0xa1, 0x94, 0xd5, 0x62, 0x09, 0x99, - 0x90, 0xe5, 0x2f, 0x18, 0x60, 0x77, 0xb4, 0x72, 0xc6, 0x9c, 0xdf, 0x55, 0x90, 0xb4, 0x2d, 0x89, - 0x3a, 0x3b, 0x0b, 0x11, 0x45, 0x56, 0xf5, 0x82, 0x58, 0x8a, 0x33, 0x49, 0x66, 0x65, 0x9c, 0x0f, - 0x1b, 0xaf, 0xdb, 0x25, 0xf6, 0x3a, 0x44, 0x88, 0xac, 0x78, 0x20, 0xc9, 0xac, 0x4c, 0x6c, 0x2c, - 0xa4, 0x3c, 0x9c, 0x4d, 0x11, 0x79, 0x5b, 0xa1, 0x67, 0xaf, 0x96, 0x46, 0x78, 0x6b, 0x09, 0x7b, - 0x1a, 0xc2, 0x9a, 0x58, 0x96, 0x90, 0x1a, 0x0f, 0x9a, 0x52, 0xcd, 0xb7, 0x6b, 0xd1, 0x47, 0x5f, - 0x2e, 0x8d, 0x7c, 0xfa, 0xe6, 0xe9, 0x2a, 0x19, 0x58, 0xbe, 0x0b, 0x5c, 0xa7, 0x55, 0x3c, 0xd2, - 0x14, 0x59, 0xd2, 0x10, 0xbb, 0x08, 0x40, 0x24, 0xb6, 0x0c, 0x1c, 0x27, 0x23, 0xdb, 0x25, 0x36, - 0x0e, 0x91, 0x26, 0x52, 0x35, 0x51, 0x96, 0xb0, 0x8d, 0xe3, 0xbc, 0xf5, 0x7a, 0x2d, 0x64, 0xe8, - 0x59, 0x7e, 0x15, 0x80, 0x69, 0xb7, 0xf4, 0x7d, 0xf5, 0xd0, 0xdf, 0xe5, 0x0d, 0x88, 0x29, 0x2a, - 0x6a, 0x8a, 0x72, 0x43, 0x2b, 0x38, 0xd4, 0x62, 0xd1, 0x5b, 0x81, 0x38, 0xc3, 0x4f, 0x5b, 0xd3, - 0x19, 0xdb, 0x04, 0x47, 0x98, 0x82, 0xfd, 0x87, 0x69, 0x1d, 0x66, 0x04, 0xb9, 0x21, 0xe9, 0x48, - 0x55, 0x8a, 0xaa, 0x7e, 0x58, 0xb0, 0xbc, 0x09, 0x61, 0xbb, 0x62, 0xce, 0xb9, 0x7f, 0x9a, 0x53, - 0x46, 0x48, 0x14, 0x55, 0x96, 0xef, 0x15, 0x44, 0x49, 0xd4, 0xe3, 0xa3, 0x49, 0x66, 0x65, 0x92, - 0x1f, 0xc7, 0x23, 0x98, 0xcf, 0x0c, 0x4c, 0x9a, 0xd3, 0x15, 0x24, 0x96, 0x2b, 0x7a, 0x3c, 0x8c, - 0x8d, 0xe2, 0x1c, 0x46, 0x99, 0xa9, 0xd5, 0x5c, 0x4f, 0xdd, 0xc4, 0x08, 0x62, 0xd2, 0x04, 0x5e, - 0x65, 0x0e, 0x39, 0xd8, 0x8b, 0x74, 0x67, 0xef, 0x0e, 0xcc, 0x75, 0xc4, 0xd7, 0x26, 0xcf, 0xc1, - 0x0e, 0xe3, 0x62, 0xa7, 0x8d, 0xd6, 0x40, 0x1b, 0xad, 0x84, 0xbc, 0x1f, 0x3b, 0xc8, 0xdb, 0x14, - 0xaa, 0xfe, 0xe4, 0x75, 0x97, 0xc9, 0xfe, 0x19, 0x66, 0x5d, 0x91, 0x76, 0x60, 0xcd, 0x0c, 0x3d, - 0xe5, 0x9c, 0x6e, 0xf1, 0xfb, 0x0e, 0x0c, 0xcd, 0x83, 0xc9, 0x47, 0x41, 0x57, 0x0f, 0x09, 0x41, - 0x63, 0x78, 0xc0, 0x48, 0xbe, 0xf7, 0xcb, 0xcf, 0x7c, 0x3b, 0x3f, 0x9b, 0x42, 0xd5, 0xe2, 0x67, - 0xf9, 0x67, 0x06, 0x4e, 0xb9, 0x67, 0x33, 0xb2, 0x74, 0x4f, 0x54, 0xeb, 0xef, 0x1c, 0x64, 0xdb, - 0xf3, 0xa2, 0x50, 0xc5, 0x61, 0xb5, 0x3c, 0x37, 0x98, 0x6b, 0xf7, 0x3c, 0x34, 0x98, 0xe7, 0xa3, - 0xdd, 0x3d, 0x5f, 0x82, 0x45, 0x4f, 0xdf, 0x6c, 0xef, 0x9b, 0x10, 0x6b, 0x01, 0x32, 0x35, 0x59, - 0x43, 0xdd, 0xf7, 0xc3, 0x1e, 0xae, 0x53, 0x6f, 0x78, 0x8b, 0x30, 0xef, 0xa1, 0xd7, 0x36, 0xeb, - 0x25, 0x03, 0xa7, 0xdb, 0xe6, 0x07, 0x65, 0xc5, 0xbd, 0x63, 0x04, 0x7b, 0xed, 0x18, 0xc7, 0xcb, - 0x4b, 0x12, 0x12, 0xde, 0xee, 0xd9, 0x11, 0x38, 0x62, 0xe0, 0xc4, 0x8e, 0x56, 0xe6, 0x91, 0xd0, - 0xdc, 0x2b, 0x0a, 0x55, 0xa4, 0xb3, 0x57, 0x21, 0xac, 0xe0, 0x27, 0xec, 0xf7, 0xc4, 0xc6, 0xbc, - 0xe7, 0x16, 0x6b, 0x82, 0x89, 0x71, 0x64, 0x01, 0x7b, 0x1e, 0xa6, 0x4c, 0xe7, 0x04, 0xb9, 0x5e, - 0x17, 0xf5, 0x3a, 0x92, 0x74, 0x1c, 0xa0, 0x49, 0x3e, 0x8a, 0xc7, 0x33, 0xf6, 0x70, 0x47, 0x1c, - 0x82, 0x83, 0xc5, 0x21, 0xd4, 0x3d, 0x0e, 0xff, 0xc3, 0xb5, 0xd7, 0x72, 0xd2, 0xde, 0x35, 0xff, - 0x0a, 0x61, 0x15, 0x69, 0x8d, 0x9a, 0xe9, 0xec, 0xc9, 0x8d, 0x73, 0x9e, 0xce, 0x5a, 0x70, 0x1e, - 0x43, 0xf7, 0x0f, 0x15, 0xc4, 0x93, 0x65, 0x64, 0xf7, 0xfc, 0x2c, 0x00, 0xb0, 0xa3, 0x95, 0xf7, - 0xc5, 0x3a, 0x92, 0x1b, 0xc3, 0x09, 0x61, 0x43, 0x52, 0x91, 0x80, 0xc4, 0x26, 0x2a, 0xb9, 0x42, - 0x98, 0xb7, 0x87, 0x87, 0x13, 0xc2, 0x0b, 0xc0, 0x4a, 0xe8, 0xa1, 0x5e, 0xd0, 0xd0, 0xfd, 0x06, - 0x92, 0x04, 0x54, 0x50, 0x91, 0xd0, 0xc4, 0xe1, 0x0c, 0xf1, 0x53, 0xc6, 0x4c, 0x8e, 0x4c, 0x18, - 0xc1, 0xa3, 0x4f, 0xbc, 0xbb, 0xf8, 0xf8, 0x43, 0xe2, 0x31, 0xec, 0x68, 0x7f, 0x63, 0x7e, 0xab, - 0x88, 0xf4, 0x5d, 0x09, 0x27, 0xf6, 0x7b, 0x0a, 0xfa, 0x12, 0x4c, 0x90, 0x14, 0x37, 0x94, 0x92, - 0xfa, 0x36, 0x2b, 0xde, 0x34, 0x63, 0x28, 0x05, 0xee, 0xcd, 0xca, 0x68, 0x4f, 0x56, 0xc2, 0xdd, - 0x59, 0x39, 0xc0, 0x1f, 0x28, 0x77, 0xdc, 0x86, 0x4d, 0xce, 0xa3, 0x00, 0xa6, 0x7e, 0x53, 0xa8, - 0x4a, 0xf2, 0x83, 0x1a, 0x2a, 0x95, 0x11, 0xae, 0xf7, 0x01, 0xd8, 0x59, 0x81, 0x68, 0xd1, 0x2d, - 0xcd, 0x22, 0xa7, 0x6d, 0xb8, 0x45, 0x8e, 0xb1, 0xb0, 0xe4, 0x22, 0x67, 0xd3, 0x18, 0x79, 0xcf, - 0xbb, 0xaf, 0x80, 0x4f, 0xdb, 0x6d, 0x91, 0x18, 0x76, 0xbc, 0xbf, 0x75, 0x9d, 0x2b, 0xf2, 0x66, - 0x17, 0x32, 0xd0, 0xc7, 0xf5, 0x6f, 0x10, 0xbe, 0x27, 0xa2, 0x5a, 0x49, 0x23, 0x3b, 0xca, 0xb2, - 0xa7, 0x61, 0x44, 0xd3, 0x0d, 0x8c, 0xb4, 0x18, 0x33, 0xd7, 0xd1, 0xef, 0xcb, 0x5f, 0x33, 0xce, - 0x83, 0x83, 0xc3, 0x78, 0xda, 0x9e, 0xe4, 0x3a, 0x44, 0x48, 0xe3, 0xd5, 0xb5, 0x6f, 0x22, 0x92, - 0xad, 0x86, 0x80, 0x2c, 0x31, 0xea, 0x9e, 0x3c, 0xda, 0x95, 0x86, 0x7d, 0x0e, 0xf1, 0x51, 0x32, - 0x6e, 0xd5, 0x19, 0x09, 0xf6, 0xaf, 0x41, 0x98, 0xe9, 0xb0, 0xb7, 0x6b, 0x97, 0xd3, 0x23, 0xd6, - 0xff, 0x80, 0xa4, 0xa2, 0xca, 0x8a, 0xac, 0xa1, 0x52, 0xc1, 0x32, 0x45, 0x90, 0x25, 0x09, 0x09, - 0xba, 0x28, 0x4b, 0x85, 0x8a, 0xac, 0x18, 0x2c, 0x04, 0x57, 0xc6, 0xf9, 0x45, 0x0b, 0x47, 0xb4, - 0x66, 0x6c, 0xd4, 0x4d, 0x59, 0xd1, 0xd8, 0x0a, 0xcc, 0xbb, 0x4e, 0xce, 0x96, 0x30, 0xc2, 0x64, - 0xa8, 0x4f, 0x26, 0xe7, 0x9c, 0xc2, 0x5c, 0x00, 0x76, 0x0b, 0x16, 0x3d, 0x35, 0xd9, 0x11, 0x34, - 0xb7, 0xa9, 0x79, 0x0f, 0x09, 0x56, 0x34, 0xd9, 0x3f, 0xc0, 0x09, 0xb2, 0x8b, 0x92, 0x6e, 0x2e, - 0x8c, 0x4b, 0xd5, 0x2c, 0x4e, 0x12, 0xdd, 0x16, 0xc8, 0x62, 0x38, 0xe2, 0x00, 0x11, 0x89, 0x1d, - 0x15, 0x3d, 0x36, 0x58, 0x45, 0x8f, 0x77, 0xcf, 0xd7, 0xb7, 0x0c, 0x2c, 0x78, 0xf1, 0xff, 0xa1, - 0xa5, 0xab, 0x63, 0x73, 0x09, 0x0d, 0xb2, 0xb9, 0xbc, 0x0c, 0x78, 0xe4, 0xfb, 0x20, 0x8d, 0x61, - 0xbe, 0xad, 0xc1, 0xb3, 0xa2, 0x11, 0xa4, 0x8e, 0x46, 0xcc, 0x23, 0xaf, 0x3a, 0xf3, 0x29, 0x44, - 0x93, 0x4f, 0xa3, 0x14, 0xf9, 0x74, 0xbc, 0x1d, 0x23, 0xf2, 0x48, 0x27, 0x47, 0xd3, 0x38, 0xac, - 0x6f, 0xc4, 0x77, 0x41, 0x88, 0x77, 0xe8, 0x19, 0xb4, 0xd1, 0xf9, 0x37, 0x70, 0x9e, 0x3d, 0xbe, - 0xa6, 0x17, 0x75, 0x93, 0xd0, 0x93, 0xae, 0xb8, 0xb5, 0xec, 0xcd, 0x19, 0x08, 0x3e, 0xee, 0x71, - 0x05, 0x80, 0x67, 0x7c, 0x93, 0x24, 0x34, 0xe4, 0x24, 0x19, 0xa5, 0x49, 0x92, 0x30, 0x45, 0x92, - 0x44, 0x06, 0x4b, 0x92, 0xb1, 0xee, 0x49, 0x22, 0x42, 0xd2, 0x8f, 0xbc, 0x61, 0x27, 0xca, 0xf7, - 0x01, 0x8f, 0xc3, 0x84, 0xd1, 0xcf, 0x7f, 0x80, 0x59, 0x42, 0x55, 0xf3, 0xed, 0x4c, 0x8d, 0x0e, - 0xc6, 0x54, 0xb8, 0x8f, 0x6b, 0x10, 0x47, 0xf4, 0xec, 0x6e, 0xfb, 0x27, 0xaf, 0x42, 0xb4, 0xba, - 0xc6, 0x61, 0xed, 0xa9, 0xfd, 0xdf, 0x90, 0xc6, 0x3c, 0x82, 0xcc, 0xfe, 0x0b, 0x4e, 0xdb, 0xf7, - 0xb3, 0x48, 0x55, 0x65, 0xb5, 0x80, 0x9b, 0x20, 0xc5, 0x3a, 0x35, 0x9f, 0xf1, 0x14, 0x9c, 0x35, - 0x90, 0xbc, 0x09, 0xe4, 0x67, 0x2c, 0x01, 0xce, 0x51, 0xba, 0x3a, 0x4c, 0x41, 0xcc, 0x04, 0xb9, - 0x55, 0x9b, 0xd5, 0x38, 0x8d, 0xa7, 0x5c, 0x42, 0x7f, 0xff, 0x92, 0x3c, 0xa6, 0x66, 0xf7, 0x87, - 0x00, 0xcc, 0x76, 0x96, 0x7f, 0x51, 0x12, 0x50, 0xed, 0x9d, 0x33, 0xe6, 0x16, 0x9c, 0x70, 0x87, - 0x35, 0x48, 0xc9, 0x28, 0x09, 0xda, 0x24, 0x72, 0x86, 0xde, 0x87, 0xaa, 0x10, 0x2d, 0x55, 0xc7, - 0x5b, 0x93, 0x67, 0x60, 0xc9, 0x27, 0x7c, 0x76, 0x55, 0x7e, 0x0c, 0xd1, 0x1d, 0xad, 0x9c, 0x57, - 0x4a, 0x45, 0x1d, 0xed, 0x15, 0xd5, 0x62, 0x5d, 0x63, 0x17, 0x60, 0xbc, 0xd8, 0xd0, 0x2b, 0xb2, - 0x2a, 0xea, 0x87, 0xd6, 0x31, 0xce, 0x1e, 0x30, 0x9b, 0x59, 0x03, 0x47, 0x4e, 0x71, 0x7e, 0xcd, - 0xac, 0x01, 0x69, 0x35, 0xb3, 0xc6, 0xdb, 0x35, 0xd6, 0xb2, 0xaf, 0x25, 0x6e, 0x79, 0x0e, 0x33, - 0xec, 0xd4, 0x6f, 0x99, 0xb6, 0xfa, 0x82, 0x01, 0xb6, 0x33, 0x45, 0xd8, 0x2b, 0x90, 0xe4, 0xb3, - 0xb9, 0xbd, 0xdd, 0xdb, 0xb9, 0x6c, 0x81, 0xcf, 0xe6, 0xf2, 0xb7, 0xf6, 0x0b, 0xfb, 0xff, 0xd9, - 0xcb, 0x16, 0xf2, 0xb7, 0x73, 0x7b, 0xd9, 0xcc, 0xf6, 0x8d, 0xed, 0xec, 0xdf, 0xa7, 0x46, 0xb8, - 0xe8, 0xe3, 0x27, 0xc9, 0x09, 0xc7, 0x10, 0x7b, 0x0e, 0xe6, 0x3c, 0x97, 0xdd, 0xde, 0xdd, 0xdd, - 0x9b, 0x62, 0xb8, 0xb1, 0xc7, 0x4f, 0x92, 0x21, 0xe3, 0x99, 0x5d, 0x83, 0x05, 0x4f, 0x60, 0x2e, - 0x9f, 0xc9, 0x64, 0x73, 0xb9, 0xa9, 0x00, 0x37, 0xf1, 0xf8, 0x49, 0x32, 0x42, 0x5e, 0x7d, 0xe1, - 0x37, 0x36, 0xb7, 0x6f, 0xe5, 0xf9, 0xec, 0x54, 0xd0, 0x84, 0x93, 0x57, 0x2e, 0xf4, 0xe8, 0xab, - 0xc4, 0xc8, 0xc6, 0xdb, 0x28, 0x04, 0x77, 0xb4, 0x32, 0x5b, 0x85, 0x68, 0xfb, 0xcf, 0x64, 0xde, - 0xa5, 0xd2, 0xf9, 0xcb, 0x15, 0x97, 0xa6, 0x04, 0xda, 0x45, 0x59, 0x81, 0x93, 0x6d, 0xbf, 0x4f, - 0x9d, 0xa5, 0x10, 0xb1, 0xaf, 0x1e, 0x72, 0x29, 0x3a, 0x9c, 0x8f, 0x26, 0xe3, 0xcc, 0x4c, 0xa3, - 0x69, 0x53, 0xa8, 0x52, 0x69, 0x72, 0x1e, 0x12, 0x75, 0x60, 0x3d, 0x7e, 0x55, 0x58, 0xa5, 0x90, - 0x42, 0xb0, 0xdc, 0x06, 0x3d, 0xd6, 0xd6, 0x2a, 0xc1, 0x54, 0xc7, 0x75, 0xfe, 0x4a, 0x0f, 0x39, - 0x36, 0x92, 0xbb, 0x48, 0x8b, 0xb4, 0xf5, 0x3d, 0x80, 0x98, 0xd7, 0x35, 0xfd, 0x9f, 0x68, 0x04, - 0x59, 0x7e, 0x5e, 0xea, 0x03, 0x6c, 0x2b, 0xfe, 0x2f, 0x80, 0xe3, 0x76, 0x7c, 0xd9, 0x4f, 0x44, - 0x0b, 0xc3, 0xad, 0xf6, 0xc6, 0xd8, 0xd2, 0x73, 0x10, 0xb1, 0xbe, 0xff, 0x4b, 0x7e, 0xcb, 0x08, - 0x80, 0x3b, 0xd7, 0x03, 0xe0, 0xcc, 0xbd, 0xb6, 0xcb, 0xd1, 0xb3, 0x3d, 0x96, 0x12, 0x9c, 0x7f, - 0xee, 0xf9, 0x5c, 0x1a, 0x56, 0x21, 0xda, 0x7e, 0xd3, 0xe7, 0x6b, 0x65, 0x1b, 0xd0, 0xbf, 0x78, - 0xfd, 0x6e, 0xcc, 0x5a, 0x89, 0xee, 0xbc, 0xe6, 0xea, 0x95, 0xe8, 0x0e, 0x6c, 0xcf, 0x44, 0xf7, - 0xba, 0x81, 0xba, 0x0f, 0xd3, 0x9d, 0xf7, 0x3d, 0xe7, 0xe9, 0x04, 0x19, 0x1b, 0xc7, 0x3a, 0x35, - 0xd4, 0x5f, 0xa5, 0xb1, 0x7d, 0x50, 0xaa, 0x34, 0x76, 0x90, 0x75, 0x6a, 0xa8, 0xad, 0xf2, 0x23, - 0x38, 0xe5, 0xdd, 0x1e, 0xae, 0xd1, 0xc9, 0xb2, 0x4a, 0xec, 0x4a, 0x5f, 0x70, 0x7f, 0x6a, 0x71, - 0xd3, 0x41, 0x49, 0xad, 0x81, 0xa5, 0xa5, 0xd6, 0x79, 0x1c, 0xef, 0x74, 0xda, 0x2a, 0x45, 0x4a, - 0xa7, 0xad, 0xc2, 0xbc, 0xd2, 0x17, 0xdc, 0x56, 0xff, 0x7f, 0x98, 0xf1, 0x3c, 0xd6, 0x5d, 0xa0, - 0x8c, 0x21, 0x46, 0x73, 0x97, 0xfb, 0x41, 0xdb, 0xba, 0x45, 0x88, 0x99, 0x07, 0x0e, 0x82, 0x22, - 0xe7, 0x9e, 0x3f, 0xfa, 0x09, 0x73, 0x9e, 0x4e, 0xb8, 0x0b, 0x34, 0x28, 0x4b, 0x15, 0x37, 0xfa, - 0xc9, 0x9b, 0xa7, 0xab, 0xcc, 0x56, 0xee, 0xd9, 0xeb, 0x04, 0xf3, 0xfc, 0x75, 0x82, 0xf9, 0xe5, - 0x75, 0x82, 0xf9, 0xfc, 0x28, 0x31, 0xf2, 0xfc, 0x28, 0x31, 0xf2, 0xe2, 0x28, 0x31, 0x72, 0xe7, - 0x6a, 0x59, 0xd4, 0x2b, 0x8d, 0x83, 0x94, 0x20, 0xd7, 0xd3, 0xe4, 0x7f, 0x3b, 0xe2, 0x81, 0xb0, - 0x56, 0x96, 0xd3, 0xcd, 0xbf, 0xa4, 0xeb, 0x72, 0xa9, 0x51, 0x43, 0x9a, 0xf9, 0x7f, 0x9b, 0x8b, - 0x97, 0xd7, 0xac, 0xbf, 0xdc, 0xe8, 0x87, 0x0a, 0xd2, 0x0e, 0xc2, 0xf8, 0xef, 0x36, 0x97, 0x7e, - 0x0b, 0x00, 0x00, 0xff, 0xff, 0x37, 0x62, 0xbc, 0x56, 0x39, 0x24, 0x00, 0x00, + 0xb1, 0x41, 0x59, 0x8b, 0xdd, 0xa4, 0xa8, 0x20, 0x53, 0x13, 0x8a, 0x90, 0x44, 0x32, 0x24, 0xa5, + 0xc4, 0x05, 0x5a, 0x14, 0x3d, 0x05, 0x39, 0x14, 0x3d, 0xf4, 0x1a, 0xa0, 0x40, 0xcf, 0x05, 0x72, + 0xea, 0xa1, 0x4d, 0x0f, 0xbd, 0xe5, 0x98, 0x63, 0x50, 0x20, 0x41, 0x11, 0x1f, 0x72, 0xca, 0x9f, + 0x50, 0xa0, 0xe0, 0x70, 0x48, 0x51, 0xd2, 0x50, 0xa2, 0x22, 0xc5, 0xc8, 0x8d, 0x9c, 0xf9, 0xe6, + 0xfd, 0xfa, 0xde, 0x1b, 0xce, 0x1b, 0x09, 0x16, 0xa4, 0x03, 0x21, 0x2d, 0x28, 0x1a, 0x4a, 0x0b, + 0xe5, 0xa2, 0x2c, 0xa3, 0x6a, 0xba, 0xb1, 0x9e, 0x36, 0x1e, 0xa6, 0x54, 0x4d, 0x31, 0x14, 0x36, + 0x26, 0x1d, 0x08, 0x29, 0x73, 0x36, 0x45, 0x66, 0x53, 0x8d, 0x75, 0x6e, 0x46, 0x54, 0x44, 0x05, + 0xcf, 0xa7, 0xcd, 0x27, 0x0b, 0xca, 0xcd, 0x0a, 0x8a, 0x5e, 0x53, 0xf4, 0x74, 0x4d, 0x17, 0x4d, + 0x11, 0x35, 0x5d, 0x24, 0x13, 0x4b, 0x4d, 0x0d, 0x55, 0x09, 0xc9, 0x86, 0x39, 0x6b, 0x3d, 0x11, + 0xc0, 0x19, 0x9a, 0x09, 0xb6, 0xbe, 0x2e, 0x90, 0xba, 0x2a, 0x6a, 0xc5, 0x12, 0xb2, 0x20, 0xcb, + 0xdf, 0x32, 0xc0, 0xee, 0xe8, 0x62, 0xc6, 0x9a, 0xdf, 0x55, 0x91, 0xbc, 0x2d, 0x4b, 0x06, 0x3b, + 0x0b, 0x11, 0x55, 0xd1, 0x8c, 0x82, 0x54, 0x8a, 0x33, 0x49, 0x66, 0x65, 0x9c, 0x0f, 0x9b, 0xaf, + 0xdb, 0x25, 0xf6, 0x3a, 0x44, 0x88, 0xac, 0x78, 0x20, 0xc9, 0xac, 0x4c, 0x6c, 0x2c, 0xa4, 0x28, + 0xce, 0xa6, 0x88, 0xbc, 0xad, 0xd0, 0xf3, 0xd7, 0x4b, 0x23, 0xbc, 0xbd, 0x84, 0x3d, 0x0d, 0x61, + 0x5d, 0x12, 0x65, 0xa4, 0xc5, 0x83, 0x96, 0x54, 0xeb, 0xed, 0x5a, 0xf4, 0xd1, 0x77, 0x4b, 0x23, + 0x5f, 0xbd, 0x7d, 0xba, 0x4a, 0x06, 0x96, 0xef, 0x02, 0xd7, 0x69, 0x15, 0x8f, 0x74, 0x55, 0x91, + 0x75, 0xc4, 0x2e, 0x02, 0x10, 0x89, 0x4d, 0x03, 0xc7, 0xc9, 0xc8, 0x76, 0x89, 0x8d, 0x43, 0xa4, + 0x81, 0x34, 0x5d, 0x52, 0x64, 0x6c, 0xe3, 0x38, 0x6f, 0xbf, 0x5e, 0x0b, 0x99, 0x7a, 0x96, 0x5f, + 0x07, 0x60, 0xba, 0x55, 0xfa, 0xbe, 0x76, 0xe8, 0xed, 0xf2, 0x06, 0xc4, 0x54, 0x0d, 0x35, 0x24, + 0xa5, 0xae, 0x17, 0x5c, 0x6a, 0xb1, 0xe8, 0xad, 0x40, 0x9c, 0xe1, 0xa7, 0xed, 0xe9, 0x8c, 0x63, + 0x82, 0x2b, 0x4c, 0xc1, 0xfe, 0xc3, 0xb4, 0x0e, 0x33, 0x82, 0x52, 0x97, 0x0d, 0xa4, 0xa9, 0x45, + 0xcd, 0x38, 0x2c, 0xd8, 0xde, 0x84, 0xb0, 0x5d, 0x31, 0xf7, 0xdc, 0x7f, 0xad, 0x29, 0x33, 0x24, + 0xaa, 0xa6, 0x28, 0xf7, 0x0a, 0x92, 0x2c, 0x19, 0xf1, 0xd1, 0x24, 0xb3, 0x32, 0xc9, 0x8f, 0xe3, + 0x11, 0xcc, 0x67, 0x06, 0x26, 0xad, 0xe9, 0x32, 0x92, 0xc4, 0xb2, 0x11, 0x0f, 0x63, 0xa3, 0x38, + 0x97, 0x51, 0x56, 0x6a, 0x35, 0xd6, 0x53, 0x37, 0x31, 0x82, 0x98, 0x34, 0x81, 0x57, 0x59, 0x43, + 0x2e, 0xf6, 0x22, 0xdd, 0xd9, 0xbb, 0x03, 0x73, 0x1d, 0xf1, 0x75, 0xc8, 0x73, 0xb1, 0xc3, 0xb4, + 0xb0, 0xd3, 0x46, 0x6b, 0xa0, 0x8d, 0x56, 0x42, 0xde, 0xaf, 0x1d, 0xe4, 0x6d, 0x0a, 0x15, 0x6f, + 0xf2, 0xba, 0xcb, 0x64, 0xff, 0x0e, 0xb3, 0x2d, 0x91, 0x76, 0x61, 0xad, 0x0c, 0x3d, 0xe5, 0x9e, + 0x6e, 0xf2, 0xfb, 0x1e, 0x0c, 0xcd, 0x83, 0xc5, 0x47, 0xc1, 0xd0, 0x0e, 0x09, 0x41, 0x63, 0x78, + 0xc0, 0x4c, 0xbe, 0xe3, 0xe5, 0x67, 0xbe, 0x9d, 0x9f, 0x4d, 0xa1, 0x62, 0xf3, 0xb3, 0xfc, 0x1b, + 0x03, 0xa7, 0x5a, 0x67, 0x33, 0x8a, 0x7c, 0x4f, 0xd2, 0x6a, 0xef, 0x1d, 0x64, 0xc7, 0xf3, 0xa2, + 0x50, 0xc1, 0x61, 0xb5, 0x3d, 0x37, 0x99, 0x6b, 0xf7, 0x3c, 0x34, 0x98, 0xe7, 0xa3, 0xdd, 0x3d, + 0x5f, 0x82, 0x45, 0xaa, 0x6f, 0x8e, 0xf7, 0x0d, 0x88, 0x35, 0x01, 0x99, 0xaa, 0xa2, 0xa3, 0xee, + 0xfb, 0x61, 0x0f, 0xd7, 0x7d, 0x6f, 0x78, 0x8b, 0x30, 0x4f, 0xd1, 0xeb, 0x98, 0xf5, 0x8a, 0x81, + 0xd3, 0x6d, 0xf3, 0x83, 0xb2, 0xd2, 0xba, 0x63, 0x04, 0x7b, 0xed, 0x18, 0x1f, 0x96, 0x97, 0x24, + 0x24, 0xe8, 0xee, 0x39, 0x11, 0x38, 0x62, 0xe0, 0xc4, 0x8e, 0x2e, 0xf2, 0x48, 0x68, 0xec, 0x15, + 0x85, 0x0a, 0x32, 0xd8, 0xab, 0x10, 0x56, 0xf1, 0x13, 0xf6, 0x7b, 0x62, 0x63, 0x9e, 0xba, 0xc5, + 0x5a, 0x60, 0x62, 0x1c, 0x59, 0xc0, 0x9e, 0x87, 0x29, 0xcb, 0x39, 0x41, 0xa9, 0xd5, 0x24, 0xa3, + 0x86, 0x64, 0x03, 0x07, 0x68, 0x92, 0x8f, 0xe2, 0xf1, 0x8c, 0x33, 0xdc, 0x11, 0x87, 0xe0, 0x60, + 0x71, 0x08, 0x75, 0x8f, 0xc3, 0xa7, 0xb8, 0xf6, 0x9a, 0x4e, 0x3a, 0xbb, 0xe6, 0x3f, 0x21, 0xac, + 0x21, 0xbd, 0x5e, 0xb5, 0x9c, 0x3d, 0xb9, 0x71, 0x8e, 0xea, 0xac, 0x0d, 0xe7, 0x31, 0x74, 0xff, + 0x50, 0x45, 0x3c, 0x59, 0x46, 0x76, 0xcf, 0xaf, 0x03, 0x00, 0x3b, 0xba, 0xb8, 0x2f, 0xd5, 0x90, + 0x52, 0x1f, 0x4e, 0x08, 0xeb, 0xb2, 0x86, 0x04, 0x24, 0x35, 0x50, 0xa9, 0x25, 0x84, 0x79, 0x67, + 0x78, 0x38, 0x21, 0xbc, 0x00, 0xac, 0x8c, 0x1e, 0x1a, 0x05, 0x1d, 0xdd, 0xaf, 0x23, 0x59, 0x40, + 0x05, 0x0d, 0x09, 0x0d, 0x1c, 0xce, 0x10, 0x3f, 0x65, 0xce, 0xe4, 0xc8, 0x84, 0x19, 0x3c, 0xff, + 0x89, 0x77, 0x17, 0x1f, 0x7f, 0x48, 0x3c, 0x86, 0x1d, 0xed, 0x1f, 0xad, 0x6f, 0x15, 0x91, 0xbe, + 0x2b, 0xe3, 0xc4, 0x3e, 0xa6, 0xa0, 0x2f, 0xc1, 0x04, 0x49, 0x71, 0x53, 0x29, 0xa9, 0x6f, 0xab, + 0xe2, 0x2d, 0x33, 0x86, 0x52, 0xe0, 0x74, 0x56, 0x46, 0x7b, 0xb2, 0x12, 0xee, 0xce, 0xca, 0x01, + 0xfe, 0x40, 0xb5, 0xc6, 0x6d, 0xd8, 0xe4, 0x3c, 0x0a, 0x60, 0xea, 0x37, 0x85, 0x8a, 0xac, 0x3c, + 0xa8, 0xa2, 0x92, 0x88, 0x70, 0xbd, 0x0f, 0xc0, 0xce, 0x0a, 0x44, 0x8b, 0xad, 0xd2, 0x6c, 0x72, + 0xda, 0x86, 0x9b, 0xe4, 0x98, 0x0b, 0x4b, 0x2d, 0xe4, 0x6c, 0x9a, 0x23, 0xc7, 0xbc, 0xfb, 0x0a, + 0xf8, 0xb4, 0xdd, 0x16, 0x89, 0x61, 0xc7, 0xfb, 0xa7, 0x96, 0x73, 0x45, 0xde, 0xea, 0x42, 0x06, + 0xfa, 0xb8, 0xfe, 0x0b, 0xc2, 0xf7, 0x24, 0x54, 0x2d, 0xe9, 0x64, 0x47, 0x59, 0xa6, 0x1a, 0x46, + 0x34, 0xdd, 0xc0, 0x48, 0x9b, 0x31, 0x6b, 0x9d, 0xff, 0x7d, 0xf9, 0x07, 0xc6, 0x7d, 0x70, 0x70, + 0x19, 0xef, 0xb7, 0x27, 0xb9, 0x0e, 0x11, 0xd2, 0x78, 0x75, 0xed, 0x9b, 0x88, 0x64, 0xbb, 0x21, + 0x20, 0x4b, 0xcc, 0xba, 0x27, 0x8f, 0x4e, 0xa5, 0x61, 0x9f, 0x43, 0x7c, 0x94, 0x8c, 0xdb, 0x75, + 0x46, 0x82, 0xfd, 0x47, 0x10, 0x66, 0x3a, 0xec, 0xed, 0xda, 0xe5, 0xf4, 0x88, 0xf5, 0x7f, 0x20, + 0xa9, 0x6a, 0x8a, 0xaa, 0xe8, 0xa8, 0x54, 0xb0, 0x4d, 0x11, 0x14, 0x59, 0x46, 0x82, 0x21, 0x29, + 0x72, 0xa1, 0xac, 0xa8, 0x26, 0x0b, 0xc1, 0x95, 0x71, 0x7e, 0xd1, 0xc6, 0x11, 0xad, 0x19, 0x07, + 0x75, 0x53, 0x51, 0x75, 0xb6, 0x0c, 0xf3, 0x2d, 0x27, 0x67, 0x5b, 0x18, 0x61, 0x32, 0xd4, 0x27, + 0x93, 0x73, 0x6e, 0x61, 0x2d, 0x00, 0x76, 0x0b, 0x16, 0xa9, 0x9a, 0x9c, 0x08, 0x5a, 0xdb, 0xd4, + 0x3c, 0x45, 0x82, 0x1d, 0x4d, 0xf6, 0x2f, 0x70, 0x82, 0xec, 0xa2, 0xa4, 0x9b, 0x0b, 0xe3, 0x52, + 0xb5, 0x8a, 0x93, 0x44, 0xb7, 0x09, 0xb2, 0x19, 0x8e, 0xb8, 0x40, 0x44, 0x62, 0x47, 0x45, 0x8f, + 0x0d, 0x56, 0xd1, 0xe3, 0xdd, 0xf3, 0xf5, 0x1d, 0x03, 0x0b, 0x34, 0xfe, 0x3f, 0xb6, 0x74, 0x75, + 0x6d, 0x2e, 0xa1, 0x41, 0x36, 0x97, 0x57, 0x01, 0x4a, 0xbe, 0x0f, 0xd2, 0x18, 0xe6, 0xdb, 0x1a, + 0x3c, 0x3b, 0x1a, 0x41, 0xdf, 0xd1, 0x88, 0x51, 0xf2, 0xaa, 0x33, 0x9f, 0x42, 0x7e, 0xf2, 0x69, + 0xd4, 0x47, 0x3e, 0x7d, 0xd8, 0x8e, 0x11, 0x51, 0xd2, 0xc9, 0xd5, 0x34, 0x0e, 0xeb, 0x1b, 0xf1, + 0x73, 0x10, 0xe2, 0x1d, 0x7a, 0x06, 0x6d, 0x74, 0xfe, 0x07, 0x1c, 0xb5, 0xc7, 0xd7, 0x8d, 0xa2, + 0x61, 0x11, 0x7a, 0xb2, 0x25, 0x6e, 0x4d, 0x7b, 0x73, 0x26, 0x82, 0x8f, 0x53, 0xae, 0x00, 0xf0, + 0x8c, 0x67, 0x92, 0x84, 0x86, 0x9c, 0x24, 0xa3, 0x7e, 0x92, 0x24, 0xec, 0x23, 0x49, 0x22, 0x83, + 0x25, 0xc9, 0x58, 0xf7, 0x24, 0x91, 0x20, 0xe9, 0x45, 0xde, 0xb0, 0x13, 0xe5, 0x59, 0x80, 0x72, + 0x98, 0x30, 0xfb, 0xf9, 0x8f, 0x30, 0x4b, 0x7c, 0xd5, 0x7c, 0x3b, 0x53, 0xa3, 0x83, 0x31, 0x15, + 0xee, 0xe3, 0x1a, 0xc4, 0x15, 0x3d, 0xa7, 0xdb, 0x7e, 0x16, 0xa0, 0x14, 0xa2, 0xdd, 0x35, 0x0e, + 0x6b, 0x4f, 0xed, 0xff, 0x86, 0x34, 0x46, 0x09, 0xf2, 0xc7, 0x18, 0x5f, 0x5a, 0x25, 0x7c, 0xa0, + 0x1e, 0xf3, 0x97, 0x00, 0xcc, 0x76, 0x56, 0x5d, 0x51, 0x16, 0x50, 0xf5, 0xbd, 0x89, 0xba, 0x05, + 0x27, 0x90, 0xa6, 0x29, 0x5a, 0x01, 0x77, 0x93, 0xaa, 0xdd, 0xb1, 0x9f, 0xa1, 0x5a, 0x98, 0x35, + 0x91, 0xbc, 0x05, 0x24, 0x41, 0x9b, 0x44, 0xae, 0x31, 0x36, 0x05, 0x31, 0x2b, 0xf4, 0xad, 0x32, + 0x2d, 0x96, 0xa6, 0xf1, 0x94, 0x5b, 0xc6, 0x31, 0x53, 0x75, 0x06, 0x96, 0x3c, 0xc2, 0xe7, 0x14, + 0xc3, 0x17, 0x10, 0xdd, 0xd1, 0xc5, 0xbc, 0x5a, 0x2a, 0x1a, 0x68, 0xaf, 0xa8, 0x15, 0x6b, 0x3a, + 0xbb, 0x00, 0xe3, 0xc5, 0xba, 0x51, 0x56, 0x34, 0xc9, 0x38, 0xb4, 0x4f, 0x4f, 0xce, 0x80, 0xd5, + 0x43, 0x9a, 0x38, 0x72, 0x78, 0xf2, 0xea, 0x21, 0x4d, 0x48, 0xb3, 0x87, 0x34, 0xdf, 0xae, 0xb1, + 0xb6, 0x7d, 0x4d, 0x71, 0xcb, 0x73, 0x98, 0x61, 0xb7, 0x7e, 0xdb, 0xb4, 0xd5, 0x97, 0x0c, 0xb0, + 0x9d, 0x29, 0xc2, 0x5e, 0x81, 0x24, 0x9f, 0xcd, 0xed, 0xed, 0xde, 0xce, 0x65, 0x0b, 0x7c, 0x36, + 0x97, 0xbf, 0xb5, 0x5f, 0xd8, 0xff, 0xff, 0x5e, 0xb6, 0x90, 0xbf, 0x9d, 0xdb, 0xcb, 0x66, 0xb6, + 0x6f, 0x6c, 0x67, 0xff, 0x3d, 0x35, 0xc2, 0x45, 0x1f, 0x3f, 0x49, 0x4e, 0xb8, 0x86, 0xd8, 0x73, + 0x30, 0x47, 0x5d, 0x76, 0x7b, 0x77, 0x77, 0x6f, 0x8a, 0xe1, 0xc6, 0x1e, 0x3f, 0x49, 0x86, 0xcc, + 0x67, 0x76, 0x0d, 0x16, 0xa8, 0xc0, 0x5c, 0x3e, 0x93, 0xc9, 0xe6, 0x72, 0x53, 0x01, 0x6e, 0xe2, + 0xf1, 0x93, 0x64, 0x84, 0xbc, 0x7a, 0xc2, 0x6f, 0x6c, 0x6e, 0xdf, 0xca, 0xf3, 0xd9, 0xa9, 0xa0, + 0x05, 0x27, 0xaf, 0x5c, 0xe8, 0xd1, 0xf7, 0x89, 0x91, 0x8d, 0x77, 0x51, 0x08, 0xee, 0xe8, 0x22, + 0x5b, 0x81, 0x68, 0xfb, 0xaf, 0x53, 0xf4, 0x52, 0xe9, 0xfc, 0xc1, 0x88, 0x4b, 0xfb, 0x04, 0x3a, + 0x45, 0x59, 0x86, 0x93, 0x6d, 0x3f, 0x0b, 0x9d, 0xf5, 0x21, 0x62, 0x5f, 0x3b, 0xe4, 0x52, 0xfe, + 0x70, 0x1e, 0x9a, 0xcc, 0xa3, 0xaa, 0x1f, 0x4d, 0x9b, 0x42, 0xc5, 0x97, 0x26, 0xf7, 0xd9, 0xcc, + 0x00, 0x96, 0x72, 0x99, 0xbf, 0xea, 0x43, 0x0a, 0xc1, 0x72, 0x1b, 0xfe, 0xb1, 0x8e, 0x56, 0x19, + 0xa6, 0x3a, 0x6e, 0xd1, 0x57, 0x7a, 0xc8, 0x71, 0x90, 0xdc, 0x45, 0xbf, 0x48, 0x47, 0xdf, 0x03, + 0x88, 0xd1, 0x6e, 0xc7, 0xff, 0xe6, 0x47, 0x90, 0xed, 0xe7, 0xa5, 0x3e, 0xc0, 0x8e, 0xe2, 0x4f, + 0x00, 0x5c, 0x97, 0xd2, 0xcb, 0x5e, 0x22, 0x9a, 0x18, 0x6e, 0xb5, 0x37, 0xc6, 0x91, 0x9e, 0x83, + 0x88, 0xfd, 0xd9, 0x5d, 0xf2, 0x5a, 0x46, 0x00, 0xdc, 0xb9, 0x1e, 0x00, 0x77, 0xee, 0xb5, 0xdd, + 0x49, 0x9e, 0xed, 0xb1, 0x94, 0xe0, 0xbc, 0x73, 0xcf, 0xe3, 0xae, 0xae, 0x02, 0xd1, 0xf6, 0x0b, + 0x36, 0x4f, 0x2b, 0xdb, 0x80, 0xde, 0xc5, 0xeb, 0x75, 0x51, 0xd5, 0x4c, 0x74, 0xf7, 0xed, 0x52, + 0xaf, 0x44, 0x77, 0x61, 0x7b, 0x26, 0x3a, 0xed, 0xe2, 0xe7, 0x3e, 0x4c, 0x77, 0x5e, 0xb3, 0x9c, + 0xf7, 0x27, 0xc8, 0xdc, 0x38, 0xd6, 0x7d, 0x43, 0xbd, 0x55, 0x9a, 0xdb, 0x87, 0x4f, 0x95, 0xe6, + 0x0e, 0xb2, 0xee, 0x1b, 0xea, 0xa8, 0xfc, 0x1c, 0x4e, 0xd1, 0xbb, 0xb2, 0x35, 0x7f, 0xb2, 0xec, + 0x12, 0xbb, 0xd2, 0x17, 0xdc, 0x9b, 0x5a, 0x7c, 0xd6, 0xf7, 0x49, 0xad, 0x89, 0xf5, 0x4b, 0xad, + 0xfb, 0x14, 0xdc, 0xe9, 0xb4, 0x5d, 0x8a, 0x3e, 0x9d, 0xb6, 0x0b, 0xf3, 0x4a, 0x5f, 0x70, 0x47, + 0xfd, 0x67, 0x30, 0x43, 0x3d, 0xd6, 0x5d, 0xf0, 0x19, 0x43, 0x8c, 0xe6, 0x2e, 0xf7, 0x83, 0x76, + 0x74, 0x4b, 0x10, 0xb3, 0x0e, 0x1c, 0x04, 0x45, 0xce, 0x3d, 0x7f, 0xf5, 0x12, 0xe6, 0x3e, 0x9d, + 0x70, 0x17, 0xfc, 0xa0, 0x6c, 0x55, 0xdc, 0xe8, 0x97, 0x6f, 0x9f, 0xae, 0x32, 0x5b, 0xb9, 0xe7, + 0x6f, 0x12, 0xcc, 0x8b, 0x37, 0x09, 0xe6, 0xf7, 0x37, 0x09, 0xe6, 0x9b, 0xa3, 0xc4, 0xc8, 0x8b, + 0xa3, 0xc4, 0xc8, 0xcb, 0xa3, 0xc4, 0xc8, 0x9d, 0xab, 0xa2, 0x64, 0x94, 0xeb, 0x07, 0x29, 0x41, + 0xa9, 0xa5, 0xc9, 0xdf, 0x65, 0xa4, 0x03, 0x61, 0x4d, 0x54, 0xd2, 0x8d, 0x7f, 0xa4, 0x6b, 0x4a, + 0xa9, 0x5e, 0x45, 0xba, 0xf5, 0x37, 0x97, 0x8b, 0x97, 0xd7, 0xec, 0x7f, 0xba, 0x18, 0x87, 0x2a, + 0xd2, 0x0f, 0xc2, 0xf8, 0x5f, 0x2e, 0x97, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x95, 0x6d, 0x87, + 0x54, 0xb0, 0x23, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3892,7 +3889,7 @@ func (m *MsgChannelUpgradeTimeout) MarshalToSizedBuffer(dAtA []byte) (int, error copy(dAtA[i:], m.Signer) i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) i-- - dAtA[i] = 0x42 + dAtA[i] = 0x32 } { size, err := m.ProofHeight.MarshalToSizedBuffer(dAtA[:i]) @@ -3903,31 +3900,12 @@ func (m *MsgChannelUpgradeTimeout) MarshalToSizedBuffer(dAtA []byte) (int, error i = encodeVarintTx(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a - if len(m.ProofErrorReceipt) > 0 { - i -= len(m.ProofErrorReceipt) - copy(dAtA[i:], m.ProofErrorReceipt) - i = encodeVarintTx(dAtA, i, uint64(len(m.ProofErrorReceipt))) - i-- - dAtA[i] = 0x32 - } + dAtA[i] = 0x2a if len(m.ProofChannel) > 0 { i -= len(m.ProofChannel) copy(dAtA[i:], m.ProofChannel) i = encodeVarintTx(dAtA, i, uint64(len(m.ProofChannel))) i-- - dAtA[i] = 0x2a - } - if m.PreviousErrorReceipt != nil { - { - size, err := m.PreviousErrorReceipt.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- dAtA[i] = 0x22 } { @@ -4783,18 +4761,10 @@ func (m *MsgChannelUpgradeTimeout) Size() (n int) { } l = m.CounterpartyChannel.Size() n += 1 + l + sovTx(uint64(l)) - if m.PreviousErrorReceipt != nil { - l = m.PreviousErrorReceipt.Size() - n += 1 + l + sovTx(uint64(l)) - } l = len(m.ProofChannel) if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.ProofErrorReceipt) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } l = m.ProofHeight.Size() n += 1 + l + sovTx(uint64(l)) l = len(m.Signer) @@ -9619,42 +9589,6 @@ func (m *MsgChannelUpgradeTimeout) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PreviousErrorReceipt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.PreviousErrorReceipt == nil { - m.PreviousErrorReceipt = &ErrorReceipt{} - } - if err := m.PreviousErrorReceipt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProofChannel", wireType) } @@ -9688,41 +9622,7 @@ func (m *MsgChannelUpgradeTimeout) Unmarshal(dAtA []byte) error { m.ProofChannel = []byte{} } iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofErrorReceipt", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofErrorReceipt = append(m.ProofErrorReceipt[:0], dAtA[iNdEx:postIndex]...) - if m.ProofErrorReceipt == nil { - m.ProofErrorReceipt = []byte{} - } - iNdEx = postIndex - case 7: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProofHeight", wireType) } @@ -9755,7 +9655,7 @@ func (m *MsgChannelUpgradeTimeout) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } diff --git a/modules/core/keeper/msg_server_test.go b/modules/core/keeper/msg_server_test.go index b7d45adb72a..cc5ca721d56 100644 --- a/modules/core/keeper/msg_server_test.go +++ b/modules/core/keeper/msg_server_test.go @@ -1527,20 +1527,15 @@ func (suite *KeeperTestSuite) TestChannelUpgradeTimeout() { suite.Require().NoError(path.EndpointB.UpdateClient()) - upgradeErrorReceiptKey := host.ChannelUpgradeErrorKey(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID) - errorReceiptProof, proofHeight := path.EndpointB.QueryProof(upgradeErrorReceiptKey) - - channelProof, _, _ := path.EndpointA.QueryChannelUpgradeProof() + channelProof, _, proofHeight := path.EndpointA.QueryChannelUpgradeProof() msg = &channeltypes.MsgChannelUpgradeTimeout{ - PortId: path.EndpointA.ChannelConfig.PortID, - ChannelId: path.EndpointA.ChannelID, - CounterpartyChannel: path.EndpointB.GetChannel(), - PreviousErrorReceipt: nil, - ProofChannel: channelProof, - ProofErrorReceipt: errorReceiptProof, - ProofHeight: proofHeight, - Signer: suite.chainA.SenderAccount.GetAddress().String(), + PortId: path.EndpointA.ChannelConfig.PortID, + ChannelId: path.EndpointA.ChannelID, + CounterpartyChannel: path.EndpointB.GetChannel(), + ProofChannel: channelProof, + ProofHeight: proofHeight, + Signer: suite.chainA.SenderAccount.GetAddress().String(), } tc.malleate() diff --git a/proto/ibc/core/channel/v1/tx.proto b/proto/ibc/core/channel/v1/tx.proto index 94ba0d9f1cd..67f24d9ba5a 100644 --- a/proto/ibc/core/channel/v1/tx.proto +++ b/proto/ibc/core/channel/v1/tx.proto @@ -394,14 +394,12 @@ message MsgChannelUpgradeTimeout { option (gogoproto.goproto_getters) = false; - string port_id = 1; - string channel_id = 2; - Channel counterparty_channel = 3 [(gogoproto.nullable) = false]; - ErrorReceipt previous_error_receipt = 4; - bytes proof_channel = 5; - bytes proof_error_receipt = 6; - ibc.core.client.v1.Height proof_height = 7 [(gogoproto.nullable) = false]; - string signer = 8; + string port_id = 1; + string channel_id = 2; + Channel counterparty_channel = 3 [(gogoproto.nullable) = false]; + bytes proof_channel = 4; + ibc.core.client.v1.Height proof_height = 5 [(gogoproto.nullable) = false]; + string signer = 6; } // MsgChannelUpgradeTimeoutRepsonse defines the MsgChannelUpgradeTimeout response type diff --git a/testing/endpoint.go b/testing/endpoint.go index df7068b4ddf..f15ad6d1c34 100644 --- a/testing/endpoint.go +++ b/testing/endpoint.go @@ -705,19 +705,11 @@ func (endpoint *Endpoint) ChanUpgradeTimeout() error { channelKey := host.ChannelKey(endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID) proofChannel, height := endpoint.Counterparty.Chain.QueryProof(channelKey) - errorReceiptKey := host.ChannelUpgradeErrorKey(endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID) - proofErrorReceipt, _ := endpoint.Counterparty.Chain.QueryProof(errorReceiptKey) - - errorReceipt, found := endpoint.Counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetUpgradeErrorReceipt(endpoint.Counterparty.Chain.GetContext(), endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID) - require.True(endpoint.Chain.TB, found) - msg := channeltypes.NewMsgChannelUpgradeTimeout( endpoint.ChannelConfig.PortID, endpoint.ChannelID, endpoint.Counterparty.GetChannel(), - &errorReceipt, proofChannel, - proofErrorReceipt, height, endpoint.Chain.SenderAccount.GetAddress().String(), )