From 7d050b8cb88393a05816159fe848b42f90cad438 Mon Sep 17 00:00:00 2001 From: satawatnack Date: Mon, 10 Feb 2025 10:52:21 +0700 Subject: [PATCH] clean up --- api/band/tunnel/v1beta1/params.pulsar.go | 4 +- api/band/tunnel/v1beta1/route.pulsar.go | 34 +++---- app/keepers/keepers.go | 2 +- proto/band/tunnel/v1beta1/params.proto | 4 +- proto/band/tunnel/v1beta1/route.proto | 10 +-- x/tunnel/client/cli/tx.go | 4 +- x/tunnel/keeper/msg_server.go | 8 -- x/tunnel/types/memo_router.go | 2 +- x/tunnel/types/params.go | 20 ++--- x/tunnel/types/params.pb.go | 4 +- x/tunnel/types/route.pb.go | 109 +++++++++++------------ 11 files changed, 95 insertions(+), 106 deletions(-) diff --git a/api/band/tunnel/v1beta1/params.pulsar.go b/api/band/tunnel/v1beta1/params.pulsar.go index 984e0c50c..47b7f5948 100644 --- a/api/band/tunnel/v1beta1/params.pulsar.go +++ b/api/band/tunnel/v1beta1/params.pulsar.go @@ -1047,9 +1047,9 @@ type Params struct { MaxSignals uint64 `protobuf:"varint,6,opt,name=max_signals,json=maxSignals,proto3" json:"max_signals,omitempty"` // base_packet_fee is the base fee for each packet. BasePacketFee []*v1beta1.Coin `protobuf:"bytes,7,rep,name=base_packet_fee,json=basePacketFee,proto3" json:"base_packet_fee,omitempty"` - // router_ibc_channel specifies the IBC channel used by the tunnel to communicate with the router chain. + // router_ibc_channel specifies the IBC channel used by the tunnel to communicate with the Router chain. RouterIbcChannel string `protobuf:"bytes,8,opt,name=router_ibc_channel,json=routerIbcChannel,proto3" json:"router_ibc_channel,omitempty"` - // router_integration_contract specifies the address of the router integration contract on the router chain + // router_integration_contract specifies the address of the Router integration contract on the Router chain // that the tunnel module will interact with. RouterIntegrationContract string `protobuf:"bytes,9,opt,name=router_integration_contract,json=routerIntegrationContract,proto3" json:"router_integration_contract,omitempty"` } diff --git a/api/band/tunnel/v1beta1/route.pulsar.go b/api/band/tunnel/v1beta1/route.pulsar.go index 207e753ed..55ee0411c 100644 --- a/api/band/tunnel/v1beta1/route.pulsar.go +++ b/api/band/tunnel/v1beta1/route.pulsar.go @@ -3674,26 +3674,26 @@ func (x *fastReflection_RouterRoute) ProtoMethods() *protoiface.Methods { if x.DestinationGasPrice != 0 { i = runtime.EncodeVarint(dAtA, i, uint64(x.DestinationGasPrice)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x20 } if x.DestinationGasLimit != 0 { i = runtime.EncodeVarint(dAtA, i, uint64(x.DestinationGasLimit)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x18 } if len(x.DestinationContractAddress) > 0 { i -= len(x.DestinationContractAddress) copy(dAtA[i:], x.DestinationContractAddress) i = runtime.EncodeVarint(dAtA, i, uint64(len(x.DestinationContractAddress))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x12 } if len(x.DestinationChainId) > 0 { i -= len(x.DestinationChainId) copy(dAtA[i:], x.DestinationChainId) i = runtime.EncodeVarint(dAtA, i, uint64(len(x.DestinationChainId))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0xa } if input.Buf != nil { input.Buf = append(input.Buf, dAtA...) @@ -3744,7 +3744,7 @@ func (x *fastReflection_RouterRoute) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: RouterRoute: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 3: + case 1: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field DestinationChainId", wireType) } @@ -3776,7 +3776,7 @@ func (x *fastReflection_RouterRoute) ProtoMethods() *protoiface.Methods { } x.DestinationChainId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 2: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field DestinationContractAddress", wireType) } @@ -3808,7 +3808,7 @@ func (x *fastReflection_RouterRoute) ProtoMethods() *protoiface.Methods { } x.DestinationContractAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: + case 3: if wireType != 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field DestinationGasLimit", wireType) } @@ -3827,7 +3827,7 @@ func (x *fastReflection_RouterRoute) ProtoMethods() *protoiface.Methods { break } } - case 6: + case 4: if wireType != 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field DestinationGasPrice", wireType) } @@ -4611,20 +4611,20 @@ func (x *IBCHookPacketReceipt) GetSequence() uint64 { return 0 } -// RouterRoute is the type for a router route +// RouterRoute is the type for a Router route type RouterRoute struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields // destination_chain_id is the destination chain ID - DestinationChainId string `protobuf:"bytes,3,opt,name=destination_chain_id,json=destinationChainId,proto3" json:"destination_chain_id,omitempty"` + DestinationChainId string `protobuf:"bytes,1,opt,name=destination_chain_id,json=destinationChainId,proto3" json:"destination_chain_id,omitempty"` // destination_contract_address is the destination contract address - DestinationContractAddress string `protobuf:"bytes,4,opt,name=destination_contract_address,json=destinationContractAddress,proto3" json:"destination_contract_address,omitempty"` + DestinationContractAddress string `protobuf:"bytes,2,opt,name=destination_contract_address,json=destinationContractAddress,proto3" json:"destination_contract_address,omitempty"` // destination_gas_limit is the destination gas limit - DestinationGasLimit uint64 `protobuf:"varint,5,opt,name=destination_gas_limit,json=destinationGasLimit,proto3" json:"destination_gas_limit,omitempty"` + DestinationGasLimit uint64 `protobuf:"varint,3,opt,name=destination_gas_limit,json=destinationGasLimit,proto3" json:"destination_gas_limit,omitempty"` // destination_gas_price is the destination gas price - DestinationGasPrice uint64 `protobuf:"varint,6,opt,name=destination_gas_price,json=destinationGasPrice,proto3" json:"destination_gas_price,omitempty"` + DestinationGasPrice uint64 `protobuf:"varint,4,opt,name=destination_gas_price,json=destinationGasPrice,proto3" json:"destination_gas_price,omitempty"` } func (x *RouterRoute) Reset() { @@ -4784,19 +4784,19 @@ var file_band_tunnel_v1beta1_route_proto_rawDesc = []byte{ 0x12, 0xca, 0xb4, 0x2d, 0x0e, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x49, 0x22, 0x8d, 0x02, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x48, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x6f, 0x6e, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x16, 0xe2, 0xde, 0x1f, 0x12, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x44, 0x52, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x40, 0x0a, 0x1c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, - 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, + 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x67, - 0x61, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x13, + 0x61, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x13, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, + 0x6f, 0x6e, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x13, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x3a, 0x0a, 0xca, 0xb4, 0x2d, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x49, 0x22, 0x45, 0x0a, 0x13, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x50, 0x61, 0x63, diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 87cf4aaf3..593b4a606 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -375,7 +375,7 @@ func NewAppKeeper( runtime.ProvideCometInfoService(), ) - // If evidence needs to be handled for the app, set routes in router here and seal + // If evidence needs to be handled for the app, set routes in Router here and seal appKeepers.EvidenceKeeper = *evidenceKeeper // GlobalFeeKeeper appKeepers.GlobalFeeKeeper = globalfeekeeper.NewKeeper( diff --git a/proto/band/tunnel/v1beta1/params.proto b/proto/band/tunnel/v1beta1/params.proto index 399a2bb57..bf164d7d7 100644 --- a/proto/band/tunnel/v1beta1/params.proto +++ b/proto/band/tunnel/v1beta1/params.proto @@ -26,9 +26,9 @@ message Params { // base_packet_fee is the base fee for each packet. repeated cosmos.base.v1beta1.Coin base_packet_fee = 7 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; - // router_ibc_channel specifies the IBC channel used by the tunnel to communicate with the router chain. + // router_ibc_channel specifies the IBC channel used by the tunnel to communicate with the Router chain. string router_ibc_channel = 8 [(gogoproto.customname) = "RouterIBCChannel"]; - // router_integration_contract specifies the address of the router integration contract on the router chain + // router_integration_contract specifies the address of the Router integration contract on the Router chain // that the tunnel module will interact with. string router_integration_contract = 9 [(gogoproto.customname) = "RouterIntegrationContract"]; } diff --git a/proto/band/tunnel/v1beta1/route.proto b/proto/band/tunnel/v1beta1/route.proto index 9c8981645..40652912c 100644 --- a/proto/band/tunnel/v1beta1/route.proto +++ b/proto/band/tunnel/v1beta1/route.proto @@ -79,18 +79,18 @@ message IBCHookPacketReceipt { uint64 sequence = 1; } -// RouterRoute is the type for a router route +// RouterRoute is the type for a Router route message RouterRoute { option (cosmos_proto.implements_interface) = "RouteI"; // destination_chain_id is the destination chain ID - string destination_chain_id = 3 [(gogoproto.customname) = "DestinationChainID"]; + string destination_chain_id = 1 [(gogoproto.customname) = "DestinationChainID"]; // destination_contract_address is the destination contract address - string destination_contract_address = 4; + string destination_contract_address = 2; // destination_gas_limit is the destination gas limit - uint64 destination_gas_limit = 5; + uint64 destination_gas_limit = 3; // destination_gas_price is the destination gas price - uint64 destination_gas_price = 6; + uint64 destination_gas_price = 4; } // RouterPacketReceipt represents a receipt for a Router packet and implements the PacketReceiptI interface. diff --git a/x/tunnel/client/cli/tx.go b/x/tunnel/client/cli/tx.go index 2566d09f7..fd5040485 100644 --- a/x/tunnel/client/cli/tx.go +++ b/x/tunnel/client/cli/tx.go @@ -210,7 +210,7 @@ func GetTxCmdCreateIBCHookTunnel() *cobra.Command { func GetTxCmdCreateRouterTunnel() *cobra.Command { cmd := &cobra.Command{ Use: "router [destination-chain-id] [destination-contract-address] [destination-gas-limit] [destination-gas-price] [initial-deposit] [interval] [signalDeviations-json-file]", - Short: "Create a new router tunnel", + Short: "Create a new Router tunnel", Args: cobra.ExactArgs(7), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) @@ -361,7 +361,7 @@ func GetTxCmdUpdateIBCHookRoute() *cobra.Command { func GetTxCmdUpdateRouterRoute() *cobra.Command { cmd := &cobra.Command{ Use: "router [tunnel-id] [destination-chain-id] [destination-contract-address] [destination-gas-limit] [destination-gas-price]", - Short: "Update router route of a router tunnel", + Short: "Update Router route of a Router tunnel", Args: cobra.ExactArgs(5), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) diff --git a/x/tunnel/keeper/msg_server.go b/x/tunnel/keeper/msg_server.go index 8613867ff..e30004b02 100644 --- a/x/tunnel/keeper/msg_server.go +++ b/x/tunnel/keeper/msg_server.go @@ -52,9 +52,6 @@ func (k msgServer) CreateTunnel( // isIBCRoute is true if the route is IBCRoute var isIBCRoute bool - // get router ibc channel id - routerIBCChannel := k.GetParams(ctx).RouterIBCChannel - route, err := msg.GetRouteValue() if err != nil { return nil, err @@ -72,11 +69,6 @@ func (k msgServer) CreateTunnel( if !found { return nil, types.ErrInvalidChannelID } - case *types.RouterRoute: - _, found := k.channelKeeper.GetChannel(ctx, ibctransfertypes.PortID, routerIBCChannel) - if !found { - return nil, types.ErrInvalidChannelID - } } // add a new tunnel diff --git a/x/tunnel/types/memo_router.go b/x/tunnel/types/memo_router.go index 4c99d40dd..936f8ff94 100644 --- a/x/tunnel/types/memo_router.go +++ b/x/tunnel/types/memo_router.go @@ -2,7 +2,7 @@ package types import "encoding/json" -// RouterReceiveBandData represents the payload of the router message. +// RouterReceiveBandData represents the payload of the Router message. type RouterReceiveBandData struct { DestChainID string `json:"dest_chain_id"` DestContractAddress string `json:"dest_contract_address"` diff --git a/x/tunnel/types/params.go b/x/tunnel/types/params.go index cb7b4ed93..f90a767de 100644 --- a/x/tunnel/types/params.go +++ b/x/tunnel/types/params.go @@ -11,15 +11,13 @@ import ( var ( // Each value below is the default value for each parameter when generating the default // genesis file. See comments in types.proto for explanation for each parameter. - DefaultMinInterval = uint64(60) - DefaultMaxInterval = uint64(3600) - DefaultMinDeviationBPS = uint64(50) - DefaultMaxDeviationBPS = uint64(3000) - DefaultMinDeposit = sdk.NewCoins(sdk.NewInt64Coin("uband", 1_000_000_000)) - DefaultMaxSignals = uint64(25) - DefaultBasePacketFee = sdk.NewCoins(sdk.NewInt64Coin("uband", 500)) - DefaultRouterIBCChannel = "channel-0" - DefaultRouterIntegrationContract = "router17c2txg2px6vna8a6v4ql4eh4ruvprerhytxvwt2ugp4qr473pajsyj9pgm" + DefaultMinInterval = uint64(60) + DefaultMaxInterval = uint64(3600) + DefaultMinDeviationBPS = uint64(50) + DefaultMaxDeviationBPS = uint64(3000) + DefaultMinDeposit = sdk.NewCoins(sdk.NewInt64Coin("uband", 1_000_000_000)) + DefaultMaxSignals = uint64(25) + DefaultBasePacketFee = sdk.NewCoins(sdk.NewInt64Coin("uband", 500)) ) // NewParams creates a new Params instance @@ -57,8 +55,8 @@ func DefaultParams() Params { DefaultMaxDeviationBPS, DefaultMaxSignals, DefaultBasePacketFee, - DefaultRouterIBCChannel, - DefaultRouterIntegrationContract, + "", + "", ) } diff --git a/x/tunnel/types/params.pb.go b/x/tunnel/types/params.pb.go index 95ac51042..49cee303b 100644 --- a/x/tunnel/types/params.pb.go +++ b/x/tunnel/types/params.pb.go @@ -41,9 +41,9 @@ type Params struct { MaxSignals uint64 `protobuf:"varint,6,opt,name=max_signals,json=maxSignals,proto3" json:"max_signals,omitempty"` // base_packet_fee is the base fee for each packet. BasePacketFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,7,rep,name=base_packet_fee,json=basePacketFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"base_packet_fee"` - // router_ibc_channel specifies the IBC channel used by the tunnel to communicate with the router chain. + // router_ibc_channel specifies the IBC channel used by the tunnel to communicate with the Router chain. RouterIBCChannel string `protobuf:"bytes,8,opt,name=router_ibc_channel,json=routerIbcChannel,proto3" json:"router_ibc_channel,omitempty"` - // router_integration_contract specifies the address of the router integration contract on the router chain + // router_integration_contract specifies the address of the Router integration contract on the Router chain // that the tunnel module will interact with. RouterIntegrationContract string `protobuf:"bytes,9,opt,name=router_integration_contract,json=routerIntegrationContract,proto3" json:"router_integration_contract,omitempty"` } diff --git a/x/tunnel/types/route.pb.go b/x/tunnel/types/route.pb.go index 9eeeadac6..08c6f44f6 100644 --- a/x/tunnel/types/route.pb.go +++ b/x/tunnel/types/route.pb.go @@ -402,16 +402,16 @@ func (m *IBCHookPacketReceipt) GetSequence() uint64 { return 0 } -// RouterRoute is the type for a router route +// RouterRoute is the type for a Router route type RouterRoute struct { // destination_chain_id is the destination chain ID - DestinationChainID string `protobuf:"bytes,3,opt,name=destination_chain_id,json=destinationChainId,proto3" json:"destination_chain_id,omitempty"` + DestinationChainID string `protobuf:"bytes,1,opt,name=destination_chain_id,json=destinationChainId,proto3" json:"destination_chain_id,omitempty"` // destination_contract_address is the destination contract address - DestinationContractAddress string `protobuf:"bytes,4,opt,name=destination_contract_address,json=destinationContractAddress,proto3" json:"destination_contract_address,omitempty"` + DestinationContractAddress string `protobuf:"bytes,2,opt,name=destination_contract_address,json=destinationContractAddress,proto3" json:"destination_contract_address,omitempty"` // destination_gas_limit is the destination gas limit - DestinationGasLimit uint64 `protobuf:"varint,5,opt,name=destination_gas_limit,json=destinationGasLimit,proto3" json:"destination_gas_limit,omitempty"` + DestinationGasLimit uint64 `protobuf:"varint,3,opt,name=destination_gas_limit,json=destinationGasLimit,proto3" json:"destination_gas_limit,omitempty"` // destination_gas_price is the destination gas price - DestinationGasPrice uint64 `protobuf:"varint,6,opt,name=destination_gas_price,json=destinationGasPrice,proto3" json:"destination_gas_price,omitempty"` + DestinationGasPrice uint64 `protobuf:"varint,4,opt,name=destination_gas_price,json=destinationGasPrice,proto3" json:"destination_gas_price,omitempty"` } func (m *RouterRoute) Reset() { *m = RouterRoute{} } @@ -536,48 +536,47 @@ func init() { func init() { proto.RegisterFile("band/tunnel/v1beta1/route.proto", fileDescriptor_543238289d94b7a6) } var fileDescriptor_543238289d94b7a6 = []byte{ - // 642 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdf, 0x4e, 0x13, 0x4f, - 0x14, 0xee, 0xd2, 0xfe, 0xfa, 0x6b, 0x0f, 0x48, 0xc8, 0x82, 0x64, 0xa9, 0xba, 0x6d, 0x7a, 0x55, - 0x13, 0xd9, 0x0d, 0x10, 0x63, 0xc2, 0x95, 0x6c, 0x8b, 0xb2, 0x51, 0x13, 0xb2, 0xe5, 0xca, 0x9b, - 0x66, 0x3a, 0x33, 0x96, 0x15, 0x98, 0xa9, 0x3b, 0x53, 0xa2, 0xaf, 0x60, 0x62, 0x62, 0x7c, 0x0a, - 0x1f, 0x80, 0xc4, 0x57, 0x20, 0x5c, 0x71, 0xa9, 0x37, 0x8d, 0x59, 0xde, 0xc2, 0x2b, 0xb3, 0x33, - 0xc3, 0x9f, 0x35, 0x8d, 0x1a, 0xf0, 0x6e, 0xe7, 0x9c, 0x6f, 0xbe, 0x73, 0xbe, 0x6f, 0xce, 0x59, - 0xa8, 0xf7, 0x11, 0x23, 0xbe, 0x1c, 0x31, 0x46, 0xf7, 0xfd, 0xc3, 0x95, 0x3e, 0x95, 0x68, 0xc5, - 0x4f, 0xf8, 0x48, 0x52, 0x6f, 0x98, 0x70, 0xc9, 0xed, 0xf9, 0x0c, 0xe0, 0x69, 0x80, 0x67, 0x00, - 0xb5, 0x25, 0xcc, 0xc5, 0x01, 0x17, 0x3d, 0x05, 0xf1, 0xf5, 0x41, 0xe3, 0x6b, 0x0b, 0x03, 0x3e, - 0xe0, 0x3a, 0x9e, 0x7d, 0x99, 0x68, 0x43, 0x95, 0x79, 0x45, 0x29, 0x11, 0x17, 0x55, 0x28, 0xc3, - 0x9c, 0xd0, 0xc4, 0x20, 0xdc, 0x09, 0x08, 0x75, 0xd2, 0xf9, 0xe6, 0x37, 0x0b, 0x2a, 0x3b, 0xdd, - 0x6e, 0x94, 0xb5, 0x66, 0x6f, 0xc1, 0x02, 0xa1, 0x42, 0xc6, 0x0c, 0xc9, 0x98, 0xb3, 0x1e, 0xde, - 0x45, 0x31, 0xeb, 0xc5, 0xc4, 0xb1, 0x1a, 0x56, 0xab, 0x1a, 0x2c, 0xa6, 0xe3, 0xba, 0xdd, 0xb9, - 0xcc, 0xb7, 0xb3, 0x74, 0xd8, 0x89, 0x6c, 0xf2, 0x6b, 0x8c, 0xd8, 0x8f, 0xe1, 0x6e, 0x8e, 0x89, - 0x33, 0x99, 0x20, 0x2c, 0x7b, 0x88, 0x90, 0x84, 0x0a, 0xe1, 0x4c, 0x65, 0x8c, 0x51, 0xed, 0xea, - 0x4d, 0x03, 0xd9, 0xd0, 0x08, 0xfb, 0x21, 0xfc, 0x6f, 0x94, 0x38, 0xc5, 0x86, 0xd5, 0x9a, 0x5d, - 0xbd, 0xe3, 0x29, 0xcb, 0x74, 0xf3, 0x46, 0x8a, 0xb7, 0xa9, 0x21, 0xd1, 0x39, 0x76, 0x1d, 0x4e, - 0x8e, 0x96, 0xcb, 0x4a, 0x4d, 0xd8, 0xfc, 0x64, 0xc1, 0xdc, 0x4e, 0xb7, 0xbb, 0x8d, 0xf0, 0x1e, - 0x95, 0x11, 0xc5, 0x34, 0x1e, 0x4a, 0xfb, 0x35, 0x80, 0x88, 0x07, 0x2c, 0x66, 0x83, 0x73, 0x65, - 0xa5, 0xe0, 0x59, 0x3a, 0xae, 0x57, 0xbb, 0x3a, 0x1a, 0x76, 0x7e, 0x8c, 0xeb, 0xeb, 0x83, 0x58, - 0xee, 0x8e, 0xfa, 0x1e, 0xe6, 0x07, 0x7e, 0x56, 0x55, 0x79, 0x85, 0xf9, 0xbe, 0xaf, 0x2c, 0xf1, - 0x0f, 0xd7, 0xfc, 0xb7, 0x2a, 0x2e, 0x85, 0xf0, 0xe5, 0xbb, 0x21, 0x15, 0xde, 0xc5, 0xed, 0xa8, - 0x6a, 0xe8, 0x43, 0xb2, 0x6e, 0x9f, 0x1c, 0x2d, 0xcf, 0xe6, 0xca, 0x87, 0xcd, 0x0e, 0x54, 0xc2, - 0xa0, 0xad, 0xfd, 0x7e, 0x00, 0x80, 0x77, 0x51, 0x36, 0x02, 0x97, 0x2e, 0xdf, 0xca, 0x7a, 0x69, - 0xeb, 0x68, 0xc6, 0x66, 0x00, 0x21, 0xc9, 0x49, 0x0b, 0x60, 0x2e, 0x0c, 0xda, 0x79, 0x65, 0x35, - 0xa8, 0x08, 0xfa, 0x66, 0x44, 0x19, 0xa6, 0x5a, 0x57, 0x74, 0x71, 0x9e, 0xd8, 0xc9, 0x17, 0x0b, - 0x16, 0x77, 0xd4, 0x00, 0x6e, 0x27, 0x31, 0xa6, 0x42, 0xa7, 0x3b, 0x48, 0x22, 0xfb, 0x3e, 0x54, - 0xf5, 0x68, 0x5e, 0x7a, 0x34, 0x93, 0x8e, 0xeb, 0x15, 0x0d, 0x0f, 0x3b, 0x51, 0x45, 0xa7, 0x43, - 0x92, 0xab, 0x3a, 0x95, 0xaf, 0x6a, 0x3f, 0x82, 0xf2, 0x50, 0x51, 0x3b, 0xc5, 0x46, 0xb1, 0x35, - 0xbd, 0xba, 0x34, 0xe9, 0x09, 0x55, 0xf1, 0xa0, 0x74, 0x3c, 0xae, 0x17, 0x22, 0x03, 0xb7, 0xef, - 0x01, 0xe0, 0x84, 0x22, 0x49, 0x49, 0x0f, 0x49, 0xa7, 0xd4, 0xb0, 0x5a, 0xc5, 0xa8, 0x6a, 0x22, - 0x1b, 0xb2, 0xf9, 0xde, 0x82, 0x99, 0x30, 0x68, 0x6f, 0x71, 0xbe, 0x77, 0x0d, 0x23, 0x6f, 0x3e, - 0x9c, 0xb9, 0xa7, 0x78, 0x02, 0x0b, 0xa6, 0x97, 0x6b, 0x3d, 0x47, 0x46, 0x4d, 0x99, 0x0c, 0x9b, - 0x1f, 0xa6, 0x60, 0x5a, 0x51, 0x26, 0xbf, 0x5f, 0xc6, 0xe2, 0x3f, 0x5f, 0xc6, 0xd2, 0x1f, 0x97, - 0x71, 0x15, 0x6e, 0x5f, 0x65, 0x18, 0x20, 0xd1, 0xdb, 0x8f, 0x0f, 0x62, 0xe9, 0xfc, 0xa7, 0x84, - 0xcd, 0x5f, 0x49, 0x3e, 0x45, 0xe2, 0x79, 0x96, 0x9a, 0x74, 0x47, 0xbd, 0xae, 0x53, 0x9e, 0x74, - 0x47, 0x4d, 0x41, 0xce, 0xd7, 0x4d, 0x98, 0xd7, 0x76, 0xdc, 0x68, 0xca, 0x83, 0x17, 0x9f, 0x53, - 0xd7, 0x3a, 0x4e, 0x5d, 0xeb, 0x34, 0x75, 0xad, 0xef, 0xa9, 0x6b, 0x7d, 0x3c, 0x73, 0x0b, 0xa7, - 0x67, 0x6e, 0xe1, 0xeb, 0x99, 0x5b, 0x78, 0xe9, 0xff, 0xc5, 0xa2, 0x9b, 0xbf, 0xb8, 0xda, 0xf3, - 0x7e, 0x59, 0x21, 0xd6, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, 0xab, 0x2e, 0xae, 0x9a, 0xe1, 0x05, - 0x00, 0x00, + // 635 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0x8e, 0x9b, 0xa8, 0xbf, 0x64, 0xda, 0x5f, 0x55, 0xb9, 0xa5, 0x4a, 0x03, 0x38, 0x51, 0x4e, + 0x41, 0xa2, 0xb6, 0xda, 0x0a, 0x21, 0xf5, 0x44, 0x9d, 0x14, 0xba, 0x02, 0xa4, 0xca, 0xe9, 0x89, + 0x4b, 0xb4, 0xd9, 0x5d, 0x52, 0xd3, 0x76, 0x37, 0x78, 0x37, 0x15, 0xbc, 0x02, 0x12, 0x12, 0xe2, + 0x29, 0x78, 0x80, 0x4a, 0xbc, 0x42, 0xd5, 0x53, 0x8f, 0x70, 0x89, 0x90, 0xfb, 0x16, 0x9c, 0x90, + 0x77, 0xb7, 0x7f, 0x0c, 0x39, 0xa0, 0xf6, 0xc2, 0xcd, 0x3b, 0xf3, 0xcd, 0x37, 0x33, 0xdf, 0xcc, + 0x18, 0xea, 0x7d, 0xcc, 0x69, 0xa0, 0x46, 0x9c, 0xb3, 0x83, 0xe0, 0x68, 0xb5, 0xcf, 0x14, 0x5e, + 0x0d, 0x12, 0x31, 0x52, 0xcc, 0x1f, 0x26, 0x42, 0x09, 0x77, 0x21, 0x03, 0xf8, 0x06, 0xe0, 0x5b, + 0x40, 0x6d, 0x99, 0x08, 0x79, 0x28, 0x64, 0x4f, 0x43, 0x02, 0xf3, 0x30, 0xf8, 0xda, 0xe2, 0x40, + 0x0c, 0x84, 0xb1, 0x67, 0x5f, 0xd6, 0xda, 0xd0, 0x69, 0x5e, 0x33, 0x46, 0xe5, 0x65, 0x16, 0xc6, + 0x89, 0xa0, 0x2c, 0xb1, 0x08, 0x6f, 0x02, 0x42, 0xbf, 0x8c, 0xbf, 0xf9, 0xdd, 0x81, 0xf2, 0x6e, + 0xb7, 0x1b, 0x65, 0xa5, 0xb9, 0xdb, 0xb0, 0x48, 0x99, 0x54, 0x31, 0xc7, 0x2a, 0x16, 0xbc, 0x47, + 0xf6, 0x70, 0xcc, 0x7b, 0x31, 0xad, 0x3a, 0x0d, 0xa7, 0x55, 0x09, 0x97, 0xd2, 0x71, 0xdd, 0xed, + 0x5c, 0xf9, 0xdb, 0x99, 0x1b, 0x75, 0x22, 0x97, 0xfe, 0x6e, 0xa3, 0xee, 0x13, 0xb8, 0x97, 0x63, + 0x12, 0x5c, 0x25, 0x98, 0xa8, 0x1e, 0xa6, 0x34, 0x61, 0x52, 0x56, 0xa7, 0x32, 0xc6, 0xa8, 0x76, + 0x3d, 0xd2, 0x42, 0x36, 0x0d, 0xc2, 0x7d, 0x04, 0xff, 0xd9, 0x4e, 0xaa, 0xc5, 0x86, 0xd3, 0x9a, + 0x5b, 0xbb, 0xeb, 0x6b, 0xc9, 0x4c, 0xf1, 0xb6, 0x15, 0x7f, 0xcb, 0x40, 0xa2, 0x0b, 0xec, 0x06, + 0x9c, 0x1e, 0xaf, 0x4c, 0xeb, 0x6e, 0x50, 0xf3, 0xb3, 0x03, 0xf3, 0xbb, 0xdd, 0xee, 0x0e, 0x26, + 0xfb, 0x4c, 0x45, 0x8c, 0xb0, 0x78, 0xa8, 0xdc, 0x37, 0x00, 0x32, 0x1e, 0xf0, 0x98, 0x0f, 0x2e, + 0x3a, 0x2b, 0x85, 0xcf, 0xd3, 0x71, 0xbd, 0xd2, 0x35, 0x56, 0xd4, 0xf9, 0x39, 0xae, 0x6f, 0x0c, + 0x62, 0xb5, 0x37, 0xea, 0xfb, 0x44, 0x1c, 0x06, 0x59, 0x56, 0xad, 0x15, 0x11, 0x07, 0x81, 0x96, + 0x24, 0x38, 0x5a, 0x0f, 0xde, 0x69, 0xbb, 0x92, 0x32, 0x50, 0xef, 0x87, 0x4c, 0xfa, 0x97, 0xd1, + 0x51, 0xc5, 0xd2, 0x23, 0xba, 0xe1, 0x9e, 0x1e, 0xaf, 0xcc, 0xe5, 0xd2, 0xa3, 0x66, 0x07, 0xca, + 0x28, 0x6c, 0x1b, 0xbd, 0x1f, 0x02, 0x90, 0x3d, 0x9c, 0xad, 0xc0, 0x95, 0xca, 0xff, 0x67, 0xb5, + 0xb4, 0x8d, 0x35, 0x63, 0xb3, 0x00, 0x44, 0x73, 0xad, 0x85, 0x30, 0x8f, 0xc2, 0x76, 0xbe, 0xb3, + 0x1a, 0x94, 0x25, 0x7b, 0x3b, 0x62, 0x9c, 0x30, 0xd3, 0x57, 0x74, 0xf9, 0x9e, 0x58, 0xc9, 0x57, + 0x07, 0x96, 0x76, 0xf5, 0x02, 0xee, 0x24, 0x31, 0x61, 0xd2, 0xb8, 0x3b, 0x58, 0x61, 0xf7, 0x01, + 0x54, 0xcc, 0x6a, 0x5e, 0x69, 0x34, 0x9b, 0x8e, 0xeb, 0x65, 0x03, 0x47, 0x9d, 0xa8, 0x6c, 0xdc, + 0x88, 0xe6, 0xb2, 0x4e, 0xe5, 0xb3, 0xba, 0x8f, 0x61, 0x7a, 0xa8, 0xa9, 0xab, 0xc5, 0x46, 0xb1, + 0x35, 0xb3, 0xb6, 0x3c, 0x69, 0x84, 0x3a, 0x79, 0x58, 0x3a, 0x19, 0xd7, 0x0b, 0x91, 0x85, 0xbb, + 0xf7, 0x01, 0x48, 0xc2, 0xb0, 0x62, 0xb4, 0x87, 0x55, 0xb5, 0xd4, 0x70, 0x5a, 0xc5, 0xa8, 0x62, + 0x2d, 0x9b, 0xaa, 0xf9, 0xc1, 0x81, 0x59, 0x14, 0xb6, 0xb7, 0x85, 0xd8, 0xbf, 0x81, 0x90, 0xb7, + 0x5f, 0xce, 0xdc, 0x28, 0x9e, 0xc2, 0xa2, 0xad, 0xe5, 0x46, 0xe3, 0xc8, 0xa8, 0x19, 0x57, 0xa8, + 0xf9, 0x71, 0x0a, 0x66, 0x34, 0x65, 0xf2, 0xef, 0x1d, 0xe3, 0x1a, 0xdc, 0xb9, 0xce, 0x30, 0xc0, + 0xb2, 0x77, 0x10, 0x1f, 0xc6, 0x4a, 0x9f, 0x66, 0x29, 0x5a, 0xb8, 0xe6, 0x7c, 0x86, 0xe5, 0x8b, + 0xcc, 0x35, 0x29, 0x46, 0x4f, 0x57, 0x8f, 0xf3, 0x8f, 0x18, 0xbd, 0x05, 0x39, 0x5d, 0xb7, 0x60, + 0xc1, 0xc8, 0x71, 0xab, 0x2d, 0x0f, 0x5f, 0x7e, 0x49, 0x3d, 0xe7, 0x24, 0xf5, 0x9c, 0xb3, 0xd4, + 0x73, 0x7e, 0xa4, 0x9e, 0xf3, 0xe9, 0xdc, 0x2b, 0x9c, 0x9d, 0x7b, 0x85, 0x6f, 0xe7, 0x5e, 0xe1, + 0x55, 0xf0, 0x17, 0x87, 0x6e, 0xff, 0xe2, 0xfa, 0xce, 0xfb, 0xd3, 0x1a, 0xb1, 0xfe, 0x2b, 0x00, + 0x00, 0xff, 0xff, 0xbd, 0xa1, 0x94, 0xce, 0xe1, 0x05, 0x00, 0x00, } func (this *TSSRoute) Equal(that interface{}) bool { @@ -1096,26 +1095,26 @@ func (m *RouterRoute) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.DestinationGasPrice != 0 { i = encodeVarintRoute(dAtA, i, uint64(m.DestinationGasPrice)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x20 } if m.DestinationGasLimit != 0 { i = encodeVarintRoute(dAtA, i, uint64(m.DestinationGasLimit)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x18 } if len(m.DestinationContractAddress) > 0 { i -= len(m.DestinationContractAddress) copy(dAtA[i:], m.DestinationContractAddress) i = encodeVarintRoute(dAtA, i, uint64(len(m.DestinationContractAddress))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x12 } if len(m.DestinationChainID) > 0 { i -= len(m.DestinationChainID) copy(dAtA[i:], m.DestinationChainID) i = encodeVarintRoute(dAtA, i, uint64(len(m.DestinationChainID))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -2016,7 +2015,7 @@ func (m *RouterRoute) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: RouterRoute: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 3: + case 1: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DestinationChainID", wireType) } @@ -2048,7 +2047,7 @@ func (m *RouterRoute) Unmarshal(dAtA []byte) error { } m.DestinationChainID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DestinationContractAddress", wireType) } @@ -2080,7 +2079,7 @@ func (m *RouterRoute) Unmarshal(dAtA []byte) error { } m.DestinationContractAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: + case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field DestinationGasLimit", wireType) } @@ -2099,7 +2098,7 @@ func (m *RouterRoute) Unmarshal(dAtA []byte) error { break } } - case 6: + case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field DestinationGasPrice", wireType) }