diff --git a/docs/openapi/openapi.swagger.yaml b/docs/openapi/openapi.swagger.yaml index 1912024914..a8c0a2516e 100644 --- a/docs/openapi/openapi.swagger.yaml +++ b/docs/openapi/openapi.swagger.yaml @@ -57281,8 +57281,10 @@ definitions: tss_nonce: type: string format: uint64 - call_options: - $ref: '#/definitions/crosschainCallOptions' + gas_limit: + type: string + format: uint64 + title: Deprecated (v21), use CallOptions gas_price: type: string gas_priority_fee: @@ -57309,6 +57311,8 @@ definitions: type: string tx_finalization_status: $ref: '#/definitions/crosschainTxFinalizationStatus' + call_options: + $ref: '#/definitions/crosschainCallOptions' crosschainOutboundTracker: type: object properties: diff --git a/docs/spec/crosschain/messages.md b/docs/spec/crosschain/messages.md index d19ce116a5..c369443d27 100644 --- a/docs/spec/crosschain/messages.md +++ b/docs/spec/crosschain/messages.md @@ -182,13 +182,14 @@ message MsgVoteInbound { string message = 8; string inbound_hash = 9; uint64 inbound_block_height = 10; - CallOptions call_options = 11; + uint64 gas_limit = 11; pkg.coin.CoinType coin_type = 12; string tx_origin = 13; string asset = 14; uint64 event_index = 15; ProtocolContractVersion protocol_contract_version = 16; RevertOptions revert_options = 17; + CallOptions call_options = 18; } ``` diff --git a/e2e/runner/logger.go b/e2e/runner/logger.go index ea6bae643d..24f9c8f7bc 100644 --- a/e2e/runner/logger.go +++ b/e2e/runner/logger.go @@ -153,7 +153,8 @@ func (l *Logger) CCTX(cctx crosschaintypes.CrossChainTx, name string) { l.Info(" TxHeight: %d", outTxParam.ObservedExternalHeight) l.Info(" BallotIndex: %s", outTxParam.BallotIndex) l.Info(" TSSNonce: %d", outTxParam.TssNonce) - l.Info(" GasLimit: %d", outTxParam.CallOptions.GasLimit) + l.Info(" CallOptions: %+v", outTxParam.CallOptions) + l.Info(" GasLimit: %d", outTxParam.GasLimit) l.Info(" GasPrice: %s", outTxParam.GasPrice) l.Info(" GasUsed: %d", outTxParam.GasUsed) l.Info(" EffectiveGasPrice: %s", outTxParam.EffectiveGasPrice.String()) diff --git a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto index 46e03d494b..0ca1f56f7d 100644 --- a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto +++ b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto @@ -68,7 +68,8 @@ message OutboundParams { (gogoproto.nullable) = false ]; uint64 tss_nonce = 5; - CallOptions call_options = 6 [ (gogoproto.nullable) = false ]; + // Deprecated (v21), use CallOptions + uint64 gas_limit = 6; string gas_price = 7; string gas_priority_fee = 23; // the above are commands for zetaclients @@ -85,6 +86,8 @@ message OutboundParams { string tss_pubkey = 11; TxFinalizationStatus tx_finalization_status = 12; + CallOptions call_options = 24; + // not used. do not edit. reserved 13 to 19; } diff --git a/proto/zetachain/zetacore/crosschain/tx.proto b/proto/zetachain/zetacore/crosschain/tx.proto index bb7e5f40da..59a449ddfc 100644 --- a/proto/zetachain/zetacore/crosschain/tx.proto +++ b/proto/zetachain/zetacore/crosschain/tx.proto @@ -163,7 +163,8 @@ message MsgVoteInbound { string message = 8; string inbound_hash = 9; uint64 inbound_block_height = 10; - CallOptions call_options = 11 [ (gogoproto.nullable) = false ]; + // Deprecated (v21), use CallOptions + uint64 gas_limit = 11; pkg.coin.CoinType coin_type = 12; string tx_origin = 13; string asset = 14; @@ -175,6 +176,8 @@ message MsgVoteInbound { // revert options provided by the sender RevertOptions revert_options = 17 [ (gogoproto.nullable) = false ]; + + CallOptions call_options = 18; } message MsgVoteInboundResponse {} diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go index 8f5ca1c82c..8f09271e23 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -153,7 +153,7 @@ func OutboundParams(r *rand.Rand) *types.OutboundParams { CoinType: coin.CoinType(r.Intn(100)), Amount: math.NewUint(uint64(r.Int63())), TssNonce: r.Uint64(), - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: r.Uint64(), }, GasPrice: math.NewUint(uint64(r.Int63())).String(), @@ -171,7 +171,7 @@ func OutboundParamsValidChainID(r *rand.Rand) *types.OutboundParams { ReceiverChainId: chains.Goerli.ChainId, Amount: math.NewUint(uint64(r.Int63())), TssNonce: r.Uint64(), - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: r.Uint64(), }, GasPrice: math.NewUint(uint64(r.Int63())).String(), @@ -283,7 +283,7 @@ func InboundVote(coinType coin.CoinType, from, to int64) types.MsgVoteInbound { Amount: UintInRange(10000000, 1000000000), Message: base64.StdEncoding.EncodeToString(Bytes()), InboundBlockHeight: Uint64InRange(1, 10000), - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000000000, }, InboundHash: Hash().String(), diff --git a/typescript/zetachain/zetacore/crosschain/cross_chain_tx_pb.d.ts b/typescript/zetachain/zetacore/crosschain/cross_chain_tx_pb.d.ts index 02a21edfc1..1ffa04eaca 100644 --- a/typescript/zetachain/zetacore/crosschain/cross_chain_tx_pb.d.ts +++ b/typescript/zetachain/zetacore/crosschain/cross_chain_tx_pb.d.ts @@ -266,9 +266,11 @@ export declare class OutboundParams extends Message { tssNonce: bigint; /** - * @generated from field: zetachain.zetacore.crosschain.CallOptions call_options = 6; + * Deprecated (v21), use CallOptions + * + * @generated from field: uint64 gas_limit = 6; */ - callOptions?: CallOptions; + gasLimit: bigint; /** * @generated from field: string gas_price = 7; @@ -323,6 +325,11 @@ export declare class OutboundParams extends Message { */ txFinalizationStatus: TxFinalizationStatus; + /** + * @generated from field: zetachain.zetacore.crosschain.CallOptions call_options = 24; + */ + callOptions?: CallOptions; + constructor(data?: PartialMessage); static readonly runtime: typeof proto3; diff --git a/typescript/zetachain/zetacore/crosschain/tx_pb.d.ts b/typescript/zetachain/zetacore/crosschain/tx_pb.d.ts index d0a8cee724..751371fa03 100644 --- a/typescript/zetachain/zetacore/crosschain/tx_pb.d.ts +++ b/typescript/zetachain/zetacore/crosschain/tx_pb.d.ts @@ -616,9 +616,11 @@ export declare class MsgVoteInbound extends Message { inboundBlockHeight: bigint; /** - * @generated from field: zetachain.zetacore.crosschain.CallOptions call_options = 11; + * Deprecated (v21), use CallOptions + * + * @generated from field: uint64 gas_limit = 11; */ - callOptions?: CallOptions; + gasLimit: bigint; /** * @generated from field: zetachain.zetacore.pkg.coin.CoinType coin_type = 12; @@ -656,6 +658,11 @@ export declare class MsgVoteInbound extends Message { */ revertOptions?: RevertOptions; + /** + * @generated from field: zetachain.zetacore.crosschain.CallOptions call_options = 18; + */ + callOptions?: CallOptions; + constructor(data?: PartialMessage); static readonly runtime: typeof proto3; diff --git a/x/crosschain/keeper/abci_test.go b/x/crosschain/keeper/abci_test.go index db2c45347c..32499e1827 100644 --- a/x/crosschain/keeper/abci_test.go +++ b/x/crosschain/keeper/abci_test.go @@ -134,7 +134,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, GasPrice: "100", @@ -161,7 +161,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, GasPrice: "100", @@ -192,7 +192,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, GasPrice: "100", @@ -223,7 +223,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, GasPrice: "100", @@ -253,7 +253,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 100, }, GasPrice: "", @@ -278,7 +278,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 0, }, GasPrice: "100", @@ -303,7 +303,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 0, }, GasPrice: "100", @@ -328,7 +328,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, GasPrice: "100", @@ -352,7 +352,7 @@ func TestCheckAndUpdateCctxGasPrice(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, GasPrice: "100", diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go b/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go index 03e8d607db..492ef14db0 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go @@ -78,7 +78,7 @@ func TestKeeper_ValidateInbound(t *testing.T) { Message: message, InboundHash: inboundHash.String(), InboundBlockHeight: inboundBlockHeight, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: gasLimit, }, CoinType: cointType, @@ -138,7 +138,7 @@ func TestKeeper_ValidateInbound(t *testing.T) { Message: message, InboundHash: inboundHash.String(), InboundBlockHeight: inboundBlockHeight, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: gasLimit, }, CoinType: cointType, @@ -207,7 +207,7 @@ func TestKeeper_ValidateInbound(t *testing.T) { Message: message, InboundHash: inboundHash.String(), InboundBlockHeight: inboundBlockHeight, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: gasLimit, }, CoinType: cointType, @@ -273,7 +273,7 @@ func TestKeeper_ValidateInbound(t *testing.T) { Message: message, InboundHash: inboundHash.String(), InboundBlockHeight: inboundBlockHeight, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: gasLimit, }, CoinType: cointType, @@ -337,7 +337,7 @@ func TestKeeper_ValidateInbound(t *testing.T) { Message: message, InboundHash: inboundHash.String(), InboundBlockHeight: inboundBlockHeight, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: gasLimit, }, CoinType: cointType, diff --git a/x/crosschain/keeper/cctx_test.go b/x/crosschain/keeper/cctx_test.go index 09ebd700da..a50470664e 100644 --- a/x/crosschain/keeper/cctx_test.go +++ b/x/crosschain/keeper/cctx_test.go @@ -65,7 +65,7 @@ func createNCctx(keeper *keeper.Keeper, ctx sdk.Context, n int, tssPubkey string ReceiverChainId: int64(i), Hash: fmt.Sprintf("%d", i), TssNonce: uint64(i), - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: uint64(i), }, GasPrice: fmt.Sprintf("%d", i), diff --git a/x/crosschain/keeper/gas_payment_test.go b/x/crosschain/keeper/gas_payment_test.go index 4c281320e0..9f91ffc8d1 100644 --- a/x/crosschain/keeper/gas_payment_test.go +++ b/x/crosschain/keeper/gas_payment_test.go @@ -53,11 +53,11 @@ func TestKeeper_PayGasNativeAndUpdateCctx(t *testing.T) { { ReceiverChainId: chains.ZetaChainPrivnet.ChainId, CoinType: coin.CoinType_Gas, - CallOptions: types.CallOptions{}, + CallOptions: &types.CallOptions{}, }, { ReceiverChainId: chainID, - CallOptions: types.CallOptions{}, + CallOptions: &types.CallOptions{}, }, }, } @@ -478,7 +478,7 @@ func TestKeeper_PayGasInZetaAndUpdateCctx(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: chainID, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, }, @@ -516,7 +516,7 @@ func TestKeeper_PayGasInZetaAndUpdateCctx(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: chainID, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, }, @@ -588,7 +588,7 @@ func TestKeeper_PayGasInZetaAndUpdateCctx(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: chainID, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, }, @@ -624,7 +624,7 @@ func TestKeeper_PayGasInZetaAndUpdateCctx(t *testing.T) { OutboundParams: []*types.OutboundParams{ { ReceiverChainId: chainID, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000, }, }, diff --git a/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go b/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go index 97c24a6509..e824a01707 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go @@ -126,7 +126,7 @@ func TestKeeper_VoteInbound(t *testing.T) { Amount: sdkmath.NewUintFromString("10000000"), Message: "", InboundBlockHeight: 1, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000000000, }, InboundHash: "0x7a900ef978743f91f57ca47c6d1a1add75df4d3531da17671e9cf149e1aefe0b", @@ -155,7 +155,7 @@ func TestKeeper_VoteInbound(t *testing.T) { Amount: sdkmath.NewUintFromString("10000000"), Message: "", InboundBlockHeight: 1, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 1000000001, // <---- Change here }, InboundHash: "0x7a900ef978743f91f57ca47c6d1a1add75df4d3531da17671e9cf149e1aefe0b", diff --git a/x/crosschain/types/cctx.go b/x/crosschain/types/cctx.go index fc961e4f32..26e8f6e07b 100644 --- a/x/crosschain/types/cctx.go +++ b/x/crosschain/types/cctx.go @@ -43,7 +43,16 @@ func (m CrossChainTx) GetCurrentOutboundParam() *OutboundParams { if len(m.OutboundParams) == 0 { return &OutboundParams{} } - return m.OutboundParams[len(m.OutboundParams)-1] + + // TODO: Deprecated (V21) gasLimit should be removed and CallOptions should be mandatory + // this should never happen, but since it is optional, adding it just in case + outboundParams := m.OutboundParams[len(m.OutboundParams)-1] + if outboundParams.CallOptions == nil { + outboundParams.CallOptions = &CallOptions{ + GasLimit: outboundParams.GasLimit, + } + } + return outboundParams } // IsCurrentOutboundRevert returns true if the current outbound is the revert tx. @@ -120,7 +129,7 @@ func (m *CrossChainTx) AddRevertOutbound(gasLimit uint64) error { Receiver: revertReceiver, ReceiverChainId: m.InboundParams.SenderChainId, Amount: m.GetCurrentOutboundParam().Amount, - CallOptions: CallOptions{ + CallOptions: &CallOptions{ GasLimit: gasLimit, }, TssPubkey: m.GetCurrentOutboundParam().TssPubkey, @@ -235,7 +244,7 @@ func NewCCTX(ctx sdk.Context, msg MsgVoteInbound, tssPubkey string) (CrossChainT ReceiverChainId: msg.ReceiverChain, Hash: "", TssNonce: 0, - CallOptions: CallOptions{ + CallOptions: &CallOptions{ IsArbitraryCall: msg.CallOptions.IsArbitraryCall, GasLimit: msg.CallOptions.GasLimit, }, diff --git a/x/crosschain/types/cctx_test.go b/x/crosschain/types/cctx_test.go index b1295c9537..7166259945 100644 --- a/x/crosschain/types/cctx_test.go +++ b/x/crosschain/types/cctx_test.go @@ -90,7 +90,7 @@ func Test_NewCCTX(t *testing.T) { Message: message, InboundHash: inboundHash.String(), InboundBlockHeight: inboundBlockHeight, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: gasLimit, }, CoinType: cointType, @@ -145,7 +145,7 @@ func Test_NewCCTX(t *testing.T) { Message: message, InboundHash: inboundHash.String(), InboundBlockHeight: inboundBlockHeight, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: gasLimit, }, CoinType: cointType, diff --git a/x/crosschain/types/cmd_cctxs.go b/x/crosschain/types/cmd_cctxs.go index d28e26a94c..c2f01a9f1e 100644 --- a/x/crosschain/types/cmd_cctxs.go +++ b/x/crosschain/types/cmd_cctxs.go @@ -298,7 +298,7 @@ func newCmdCCTX( ReceiverChainId: chainID, CoinType: coin.CoinType_Cmd, Amount: amount, - CallOptions: CallOptions{ + CallOptions: &CallOptions{ GasLimit: gasLimit, }, GasPrice: medianGasPrice, diff --git a/x/crosschain/types/cross_chain_tx.pb.go b/x/crosschain/types/cross_chain_tx.pb.go index c802ba4d22..842ba310ba 100644 --- a/x/crosschain/types/cross_chain_tx.pb.go +++ b/x/crosschain/types/cross_chain_tx.pb.go @@ -332,9 +332,10 @@ type OutboundParams struct { CoinType coin.CoinType `protobuf:"varint,3,opt,name=coin_type,json=coinType,proto3,enum=zetachain.zetacore.pkg.coin.CoinType" json:"coin_type,omitempty"` Amount github_com_cosmos_cosmos_sdk_types.Uint `protobuf:"bytes,4,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Uint" json:"amount"` TssNonce uint64 `protobuf:"varint,5,opt,name=tss_nonce,json=tssNonce,proto3" json:"tss_nonce,omitempty"` - CallOptions CallOptions `protobuf:"bytes,6,opt,name=call_options,json=callOptions,proto3" json:"call_options"` - GasPrice string `protobuf:"bytes,7,opt,name=gas_price,json=gasPrice,proto3" json:"gas_price,omitempty"` - GasPriorityFee string `protobuf:"bytes,23,opt,name=gas_priority_fee,json=gasPriorityFee,proto3" json:"gas_priority_fee,omitempty"` + // Deprecated (v21), use CallOptions + GasLimit uint64 `protobuf:"varint,6,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` + GasPrice string `protobuf:"bytes,7,opt,name=gas_price,json=gasPrice,proto3" json:"gas_price,omitempty"` + GasPriorityFee string `protobuf:"bytes,23,opt,name=gas_priority_fee,json=gasPriorityFee,proto3" json:"gas_priority_fee,omitempty"` // the above are commands for zetaclients // the following fields are used when the outbound tx is mined Hash string `protobuf:"bytes,8,opt,name=hash,proto3" json:"hash,omitempty"` @@ -345,6 +346,7 @@ type OutboundParams struct { EffectiveGasLimit uint64 `protobuf:"varint,22,opt,name=effective_gas_limit,json=effectiveGasLimit,proto3" json:"effective_gas_limit,omitempty"` TssPubkey string `protobuf:"bytes,11,opt,name=tss_pubkey,json=tssPubkey,proto3" json:"tss_pubkey,omitempty"` TxFinalizationStatus TxFinalizationStatus `protobuf:"varint,12,opt,name=tx_finalization_status,json=txFinalizationStatus,proto3,enum=zetachain.zetacore.crosschain.TxFinalizationStatus" json:"tx_finalization_status,omitempty"` + CallOptions *CallOptions `protobuf:"bytes,24,opt,name=call_options,json=callOptions,proto3" json:"call_options,omitempty"` } func (m *OutboundParams) Reset() { *m = OutboundParams{} } @@ -408,11 +410,11 @@ func (m *OutboundParams) GetTssNonce() uint64 { return 0 } -func (m *OutboundParams) GetCallOptions() CallOptions { +func (m *OutboundParams) GetGasLimit() uint64 { if m != nil { - return m.CallOptions + return m.GasLimit } - return CallOptions{} + return 0 } func (m *OutboundParams) GetGasPrice() string { @@ -478,6 +480,13 @@ func (m *OutboundParams) GetTxFinalizationStatus() TxFinalizationStatus { return TxFinalizationStatus_NotFinalized } +func (m *OutboundParams) GetCallOptions() *CallOptions { + if m != nil { + return m.CallOptions + } + return nil +} + type Status struct { Status CctxStatus `protobuf:"varint,1,opt,name=status,proto3,enum=zetachain.zetacore.crosschain.CctxStatus" json:"status,omitempty"` StatusMessage string `protobuf:"bytes,2,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"` @@ -744,92 +753,92 @@ func init() { } var fileDescriptor_d4c1966807fb5cb2 = []byte{ - // 1345 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xcf, 0x26, 0x8e, 0x63, 0x3f, 0xff, 0xc8, 0x66, 0xe2, 0xa6, 0xdb, 0x7c, 0x55, 0x37, 0x5f, - 0x43, 0x5a, 0x37, 0x10, 0x5b, 0x75, 0x25, 0x84, 0xb8, 0x25, 0x51, 0xd3, 0x06, 0x68, 0x13, 0x6d, - 0xd3, 0x48, 0xed, 0x81, 0x65, 0xbc, 0x3b, 0xb1, 0x47, 0x59, 0xef, 0x98, 0x9d, 0x71, 0x64, 0x57, - 0xdc, 0x38, 0x23, 0xf1, 0x47, 0x70, 0xe0, 0xc8, 0x9f, 0x51, 0x6e, 0x3d, 0x22, 0x0e, 0x15, 0x6a, - 0xff, 0x03, 0xce, 0x1c, 0xd0, 0xfc, 0xb2, 0x63, 0x08, 0x49, 0x29, 0x9c, 0x3c, 0xf3, 0x99, 0x79, - 0x9f, 0x37, 0xfb, 0xde, 0xfb, 0xbc, 0x19, 0x43, 0xeb, 0x39, 0x11, 0x38, 0xec, 0x62, 0x9a, 0x34, - 0xd5, 0x88, 0xa5, 0xa4, 0x19, 0xa6, 0x8c, 0x73, 0x8d, 0xa9, 0x61, 0xa0, 0xc6, 0x81, 0x18, 0x36, - 0xfa, 0x29, 0x13, 0x0c, 0x5d, 0x1f, 0xdb, 0x34, 0xac, 0x4d, 0x63, 0x62, 0xb3, 0x5a, 0xe9, 0xb0, - 0x0e, 0x53, 0x3b, 0x9b, 0x72, 0xa4, 0x8d, 0x56, 0x6f, 0x9e, 0xe3, 0xa8, 0x7f, 0xd2, 0x69, 0x86, - 0x4c, 0xba, 0x61, 0x34, 0xd1, 0xfb, 0x6a, 0x3f, 0x66, 0xa0, 0xb4, 0x97, 0xb4, 0xd9, 0x20, 0x89, - 0x0e, 0x70, 0x8a, 0x7b, 0x1c, 0xad, 0x40, 0x96, 0x93, 0x24, 0x22, 0xa9, 0xe7, 0xac, 0x39, 0xf5, - 0xbc, 0x6f, 0x66, 0xe8, 0x26, 0x2c, 0xea, 0x91, 0x39, 0x1f, 0x8d, 0xbc, 0xd9, 0x35, 0xa7, 0x3e, - 0xe7, 0x97, 0x34, 0xbc, 0x23, 0xd1, 0xbd, 0x08, 0xfd, 0x0f, 0xf2, 0x62, 0x18, 0xb0, 0x94, 0x76, - 0x68, 0xe2, 0xcd, 0x29, 0x8a, 0x9c, 0x18, 0xee, 0xab, 0x39, 0xda, 0x86, 0xbc, 0x74, 0x1e, 0x88, - 0x51, 0x9f, 0x78, 0x99, 0x35, 0xa7, 0x5e, 0x6e, 0xad, 0x37, 0xce, 0xf9, 0xbe, 0xfe, 0x49, 0xa7, - 0xa1, 0x4e, 0xb9, 0xc3, 0x68, 0x72, 0x38, 0xea, 0x13, 0x3f, 0x17, 0x9a, 0x11, 0xaa, 0xc0, 0x3c, - 0xe6, 0x9c, 0x08, 0x6f, 0x5e, 0x91, 0xeb, 0x09, 0xba, 0x0f, 0x59, 0xdc, 0x63, 0x83, 0x44, 0x78, - 0x59, 0x09, 0x6f, 0x37, 0x5f, 0xbc, 0xba, 0x31, 0xf3, 0xcb, 0xab, 0x1b, 0xb7, 0x3a, 0x54, 0x74, - 0x07, 0xed, 0x46, 0xc8, 0x7a, 0xcd, 0x90, 0xf1, 0x1e, 0xe3, 0xe6, 0x67, 0x93, 0x47, 0x27, 0x4d, - 0x79, 0x0e, 0xde, 0x78, 0x42, 0x13, 0xe1, 0x1b, 0x73, 0xf4, 0x1e, 0x94, 0x58, 0x9b, 0x93, 0xf4, - 0x94, 0x44, 0x41, 0x17, 0xf3, 0xae, 0xb7, 0xa0, 0xdc, 0x14, 0x2d, 0xf8, 0x00, 0xf3, 0x2e, 0xfa, - 0x18, 0xbc, 0xf1, 0x26, 0x32, 0x14, 0x24, 0x4d, 0x70, 0x1c, 0x74, 0x09, 0xed, 0x74, 0x85, 0x97, - 0x5b, 0x73, 0xea, 0x19, 0x7f, 0xc5, 0xae, 0xdf, 0x33, 0xcb, 0x0f, 0xd4, 0x2a, 0xfa, 0x3f, 0x14, - 0xdb, 0x38, 0x8e, 0x99, 0x08, 0x68, 0x12, 0x91, 0xa1, 0x97, 0x57, 0xec, 0x05, 0x8d, 0xed, 0x49, - 0x08, 0xb5, 0xe0, 0xca, 0x31, 0x4d, 0x70, 0x4c, 0x9f, 0x93, 0x28, 0x90, 0x21, 0xb1, 0xcc, 0xa0, - 0x98, 0x97, 0xc7, 0x8b, 0xcf, 0x88, 0xc0, 0x86, 0x96, 0xc2, 0x8a, 0x18, 0x06, 0x66, 0x05, 0x0b, - 0xca, 0x92, 0x80, 0x0b, 0x2c, 0x06, 0xdc, 0x2b, 0xa8, 0x28, 0xdf, 0x6d, 0x5c, 0x58, 0x45, 0x8d, - 0xc3, 0xe1, 0xee, 0x19, 0xdb, 0xc7, 0xca, 0xd4, 0xaf, 0x88, 0x73, 0xd0, 0xda, 0x57, 0x50, 0x96, - 0x8e, 0xb7, 0xc2, 0x50, 0xc6, 0x8b, 0x26, 0x1d, 0x14, 0xc0, 0x32, 0x6e, 0xb3, 0x54, 0xd8, 0xe3, - 0x9a, 0x44, 0x38, 0xef, 0x96, 0x88, 0x25, 0xc3, 0xa5, 0x9c, 0x28, 0xa6, 0xda, 0x11, 0x14, 0x76, - 0x70, 0x1c, 0xef, 0xf7, 0xe5, 0x31, 0xb8, 0x2c, 0xb1, 0x0e, 0xe6, 0x41, 0x4c, 0x7b, 0x54, 0x7b, - 0xc9, 0xf8, 0xb9, 0x0e, 0xe6, 0x9f, 0xcb, 0x39, 0xda, 0x80, 0x25, 0xca, 0x03, 0x9c, 0xb6, 0xa9, - 0x48, 0x71, 0x3a, 0x0a, 0x42, 0x1c, 0xc7, 0xaa, 0x52, 0x73, 0xfe, 0x22, 0xe5, 0x5b, 0x16, 0x97, - 0x7c, 0xb5, 0x9f, 0xb2, 0x50, 0xde, 0x1f, 0x88, 0xb3, 0xe5, 0xbf, 0x0a, 0xb9, 0x94, 0x84, 0x84, - 0x9e, 0x8e, 0x05, 0x30, 0x9e, 0xa3, 0xdb, 0xe0, 0xda, 0xb1, 0x16, 0xc1, 0x9e, 0xd5, 0xc0, 0xa2, - 0xc5, 0xad, 0x0a, 0xa6, 0x0a, 0x7d, 0xee, 0xdd, 0x0a, 0x7d, 0x52, 0xd2, 0x99, 0x7f, 0x57, 0xd2, - 0x52, 0x92, 0x9c, 0x07, 0x09, 0x4b, 0x42, 0xa2, 0x54, 0x93, 0xf1, 0x73, 0x82, 0xf3, 0x47, 0x72, - 0x8e, 0x1e, 0x43, 0x51, 0x86, 0x28, 0x60, 0x3a, 0xb8, 0x4a, 0x3e, 0x85, 0xd6, 0xc6, 0x25, 0xf5, - 0x72, 0x26, 0x1d, 0xdb, 0x19, 0x79, 0x2e, 0xbf, 0x10, 0xfe, 0x35, 0x43, 0xfd, 0x94, 0x86, 0xc4, - 0x08, 0x48, 0x66, 0xe8, 0x40, 0xce, 0x51, 0x1d, 0x5c, 0xb3, 0xc8, 0x52, 0x2a, 0x46, 0xc1, 0x31, - 0x21, 0xde, 0x55, 0xb5, 0xa7, 0xac, 0xf7, 0x28, 0x78, 0x97, 0x10, 0x84, 0x20, 0xa3, 0x24, 0x98, - 0x53, 0xab, 0x6a, 0xfc, 0x36, 0x02, 0xba, 0x48, 0x9d, 0x70, 0xa1, 0x3a, 0xaf, 0x81, 0x3c, 0x66, - 0x30, 0xe0, 0x24, 0xf2, 0x2a, 0x6a, 0xe7, 0x42, 0x07, 0xf3, 0x27, 0x9c, 0x44, 0xe8, 0x0b, 0x58, - 0x26, 0xc7, 0xc7, 0x24, 0x14, 0xf4, 0x94, 0x04, 0x93, 0x8f, 0xbb, 0xa2, 0x52, 0xd3, 0x30, 0xa9, - 0xb9, 0xf9, 0x16, 0xa9, 0xd9, 0x93, 0x35, 0x3e, 0xa6, 0xba, 0x6f, 0xa3, 0xd2, 0xf8, 0x33, 0xbf, - 0x2e, 0xef, 0x15, 0x75, 0x8a, 0xa9, 0xfd, 0xba, 0xce, 0xaf, 0x03, 0xc8, 0xa4, 0xf6, 0x07, 0xed, - 0x13, 0x32, 0x52, 0x2a, 0xcf, 0xfb, 0x32, 0xcd, 0x07, 0x0a, 0xb8, 0xa0, 0x21, 0x14, 0xff, 0xe3, - 0x86, 0xf0, 0x69, 0x26, 0x57, 0x72, 0x2b, 0xb5, 0xdf, 0x1d, 0xc8, 0x6a, 0x00, 0x6d, 0x41, 0xd6, - 0xf8, 0x72, 0x94, 0xaf, 0xdb, 0x97, 0x15, 0x53, 0x28, 0x86, 0xc6, 0x83, 0x31, 0x44, 0xeb, 0x50, - 0xd6, 0xa3, 0xa0, 0x47, 0x38, 0xc7, 0x1d, 0xa2, 0x84, 0x96, 0xf7, 0x4b, 0x1a, 0x7d, 0xa8, 0x41, - 0x74, 0x07, 0x2a, 0x31, 0xe6, 0xe2, 0x49, 0x3f, 0xc2, 0x82, 0x04, 0x82, 0xf6, 0x08, 0x17, 0xb8, - 0xd7, 0x57, 0x8a, 0x9b, 0xf3, 0x97, 0x27, 0x6b, 0x87, 0x76, 0x09, 0xd5, 0x41, 0xb6, 0x01, 0xd9, - 0x62, 0x7c, 0x72, 0x3c, 0x48, 0x22, 0x12, 0x29, 0x79, 0xe9, 0xee, 0x70, 0x16, 0x46, 0x1f, 0xc0, - 0x52, 0x98, 0x12, 0x2c, 0xdb, 0xda, 0x84, 0x79, 0x5e, 0x31, 0xbb, 0x66, 0x61, 0x4c, 0x5b, 0xfb, - 0x66, 0x16, 0x4a, 0x3e, 0x39, 0x25, 0xa9, 0xb0, 0x1a, 0x58, 0x87, 0x72, 0xaa, 0x80, 0x00, 0x47, - 0x51, 0x4a, 0x38, 0x37, 0xfd, 0xa4, 0xa4, 0xd1, 0x2d, 0x0d, 0xa2, 0xf7, 0xa1, 0xac, 0xf5, 0x97, - 0x04, 0x7a, 0xc1, 0x34, 0x2b, 0xa5, 0xca, 0xfd, 0x44, 0x73, 0xca, 0x5b, 0x49, 0xb5, 0xc5, 0x31, - 0x97, 0xbe, 0x59, 0x8b, 0x0a, 0xb4, 0x54, 0x13, 0x8f, 0x36, 0x68, 0xf2, 0xcb, 0x8a, 0xd6, 0xa3, - 0x0d, 0xda, 0x53, 0xd9, 0xc6, 0xd4, 0xb6, 0x49, 0x99, 0xcd, 0xbf, 0x5b, 0x87, 0x31, 0xfe, 0x6c, - 0x51, 0xd6, 0xbe, 0x9d, 0x87, 0xe2, 0x8e, 0x4c, 0xac, 0xea, 0x83, 0x87, 0x43, 0xe4, 0xc1, 0x82, - 0x0a, 0x15, 0xb3, 0xdd, 0xd4, 0x4e, 0xe5, 0x35, 0xae, 0x05, 0xac, 0x13, 0xab, 0x27, 0xe8, 0x4b, - 0xc8, 0xab, 0x2b, 0xe4, 0x98, 0x10, 0x6e, 0x0e, 0xb5, 0xf3, 0x0f, 0x0f, 0xf5, 0xdb, 0xab, 0x1b, - 0xee, 0x08, 0xf7, 0xe2, 0x4f, 0x6a, 0x63, 0xa6, 0x9a, 0x9f, 0x93, 0xe3, 0x5d, 0x42, 0x38, 0xba, - 0x05, 0x8b, 0x29, 0x89, 0xf1, 0x88, 0x44, 0xe3, 0x28, 0x65, 0x75, 0xf3, 0x31, 0xb0, 0x0d, 0xd3, - 0x2e, 0x14, 0xc2, 0x50, 0x0c, 0xad, 0x6c, 0x72, 0xaa, 0x2f, 0xae, 0x5f, 0x52, 0xca, 0xa6, 0x8c, - 0x21, 0x1c, 0x97, 0x34, 0x7a, 0x0c, 0x65, 0xaa, 0x5f, 0x58, 0x41, 0x5f, 0xdd, 0x31, 0xaa, 0x65, - 0x15, 0x5a, 0x1f, 0x5e, 0x42, 0x35, 0xf5, 0x2c, 0xf3, 0x4b, 0x74, 0xea, 0x95, 0x76, 0x04, 0x8b, - 0xcc, 0x5c, 0x5c, 0x96, 0x15, 0xd6, 0xe6, 0xea, 0x85, 0xd6, 0xe6, 0x25, 0xac, 0xd3, 0xd7, 0x9d, - 0x5f, 0x66, 0xd3, 0xd7, 0x5f, 0x0a, 0xd7, 0xd4, 0xc3, 0x30, 0x64, 0x71, 0x10, 0xb2, 0x44, 0xa4, - 0x38, 0x14, 0xc1, 0x29, 0x49, 0x39, 0x65, 0x89, 0x79, 0x4a, 0x7c, 0x74, 0x89, 0x87, 0x03, 0x63, - 0xbf, 0x63, 0xcc, 0x8f, 0xb4, 0xb5, 0x7f, 0xb5, 0x7f, 0xfe, 0x02, 0x7a, 0x3a, 0x2e, 0x5b, 0x7b, - 0x07, 0x15, 0xdf, 0x2a, 0x40, 0x53, 0x72, 0x33, 0xb7, 0x90, 0x29, 0x75, 0x03, 0x6e, 0x7c, 0x0d, - 0x30, 0x69, 0x2e, 0x08, 0x41, 0xf9, 0x80, 0x24, 0x11, 0x4d, 0x3a, 0x26, 0xb6, 0xee, 0x0c, 0x5a, - 0x86, 0x45, 0x83, 0xd9, 0xc8, 0xb8, 0x0e, 0x5a, 0x82, 0x92, 0x9d, 0x3d, 0xa4, 0x09, 0x89, 0xdc, - 0x39, 0x09, 0x99, 0x7d, 0xda, 0xad, 0x9b, 0x41, 0x45, 0xc8, 0xe9, 0x31, 0x89, 0xdc, 0x79, 0x54, - 0x80, 0x85, 0x2d, 0xfd, 0x70, 0x71, 0xb3, 0xab, 0x99, 0x1f, 0xbe, 0xaf, 0x3a, 0x1b, 0x9f, 0x41, - 0xe5, 0xbc, 0x36, 0x8a, 0x5c, 0x28, 0x3e, 0x62, 0x62, 0xd7, 0x3e, 0xe3, 0xdc, 0x19, 0x54, 0x82, - 0xfc, 0x64, 0xea, 0x48, 0xe6, 0x7b, 0x43, 0x12, 0x0e, 0x24, 0xd9, 0xac, 0x21, 0x6b, 0xc2, 0xd5, - 0xbf, 0x89, 0x2c, 0xca, 0xc2, 0xec, 0xd1, 0x1d, 0x77, 0x46, 0xfd, 0xb6, 0x5c, 0x47, 0x1b, 0x6c, - 0xdf, 0x7f, 0xf1, 0xba, 0xea, 0xbc, 0x7c, 0x5d, 0x75, 0x7e, 0x7d, 0x5d, 0x75, 0xbe, 0x7b, 0x53, - 0x9d, 0x79, 0xf9, 0xa6, 0x3a, 0xf3, 0xf3, 0x9b, 0xea, 0xcc, 0xb3, 0xcd, 0x33, 0x4a, 0x92, 0x81, - 0xdd, 0xd4, 0x7f, 0x14, 0x12, 0x16, 0x91, 0xe6, 0xf0, 0xec, 0xff, 0x11, 0x25, 0xaa, 0x76, 0x56, - 0x25, 0xee, 0xee, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x32, 0x58, 0x13, 0x23, 0xbd, 0x0c, 0x00, - 0x00, + // 1348 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4d, 0x6f, 0x1b, 0x37, + 0x13, 0xf6, 0xda, 0xb2, 0x2c, 0x8d, 0x3e, 0xbc, 0xa6, 0x15, 0x67, 0xe3, 0x17, 0x51, 0xfc, 0xaa, + 0x75, 0xa2, 0xb8, 0xb5, 0x84, 0x28, 0x40, 0x51, 0xf4, 0x66, 0x1b, 0x71, 0xe2, 0xb6, 0x89, 0x8d, + 0x8d, 0x63, 0x20, 0x39, 0x74, 0x4b, 0xed, 0xd2, 0x12, 0xe1, 0xd5, 0x52, 0x5d, 0x52, 0x86, 0x14, + 0xf4, 0xd6, 0x73, 0x81, 0xfe, 0x88, 0x1e, 0x7a, 0xec, 0xcf, 0xc8, 0x31, 0xc7, 0xa2, 0x87, 0x20, + 0x48, 0xfe, 0x41, 0xcf, 0x3d, 0x14, 0xfc, 0x92, 0xac, 0xc0, 0xb5, 0xd3, 0xb4, 0x27, 0x71, 0x66, + 0x38, 0xcf, 0xcc, 0x0e, 0xe7, 0x19, 0x52, 0xd0, 0x7a, 0x4e, 0x04, 0x0e, 0xbb, 0x98, 0x26, 0x4d, + 0xb5, 0x62, 0x29, 0x69, 0x86, 0x29, 0xe3, 0x5c, 0xeb, 0xd4, 0x32, 0x50, 0xeb, 0x40, 0x0c, 0x1b, + 0xfd, 0x94, 0x09, 0x86, 0xae, 0x8f, 0x7d, 0x1a, 0xd6, 0xa7, 0x31, 0xf1, 0x59, 0xad, 0x74, 0x58, + 0x87, 0xa9, 0x9d, 0x4d, 0xb9, 0xd2, 0x4e, 0xab, 0x37, 0xcf, 0x09, 0xd4, 0x3f, 0xe9, 0x34, 0x43, + 0x26, 0xc3, 0x30, 0x9a, 0xe8, 0x7d, 0xb5, 0x5f, 0x33, 0x50, 0xda, 0x4b, 0xda, 0x6c, 0x90, 0x44, + 0x07, 0x38, 0xc5, 0x3d, 0x8e, 0x56, 0x20, 0xcb, 0x49, 0x12, 0x91, 0xd4, 0x73, 0xd6, 0x9c, 0x7a, + 0xde, 0x37, 0x12, 0xba, 0x09, 0x8b, 0x7a, 0x65, 0xf2, 0xa3, 0x91, 0x37, 0xbb, 0xe6, 0xd4, 0xe7, + 0xfc, 0x92, 0x56, 0xef, 0x48, 0xed, 0x5e, 0x84, 0xfe, 0x07, 0x79, 0x31, 0x0c, 0x58, 0x4a, 0x3b, + 0x34, 0xf1, 0xe6, 0x14, 0x44, 0x4e, 0x0c, 0xf7, 0x95, 0x8c, 0xb6, 0x21, 0x2f, 0x83, 0x07, 0x62, + 0xd4, 0x27, 0x5e, 0x66, 0xcd, 0xa9, 0x97, 0x5b, 0xeb, 0x8d, 0x73, 0xbe, 0xaf, 0x7f, 0xd2, 0x69, + 0xa8, 0x2c, 0x77, 0x18, 0x4d, 0x0e, 0x47, 0x7d, 0xe2, 0xe7, 0x42, 0xb3, 0x42, 0x15, 0x98, 0xc7, + 0x9c, 0x13, 0xe1, 0xcd, 0x2b, 0x70, 0x2d, 0xa0, 0xfb, 0x90, 0xc5, 0x3d, 0x36, 0x48, 0x84, 0x97, + 0x95, 0xea, 0xed, 0xe6, 0x8b, 0x57, 0x37, 0x66, 0x7e, 0x7f, 0x75, 0xe3, 0x56, 0x87, 0x8a, 0xee, + 0xa0, 0xdd, 0x08, 0x59, 0xaf, 0x19, 0x32, 0xde, 0x63, 0xdc, 0xfc, 0x6c, 0xf2, 0xe8, 0xa4, 0x29, + 0xf3, 0xe0, 0x8d, 0x27, 0x34, 0x11, 0xbe, 0x71, 0x47, 0x1f, 0x41, 0x89, 0xb5, 0x39, 0x49, 0x4f, + 0x49, 0x14, 0x74, 0x31, 0xef, 0x7a, 0x0b, 0x2a, 0x4c, 0xd1, 0x2a, 0x1f, 0x60, 0xde, 0x45, 0x9f, + 0x83, 0x37, 0xde, 0x44, 0x86, 0x82, 0xa4, 0x09, 0x8e, 0x83, 0x2e, 0xa1, 0x9d, 0xae, 0xf0, 0x72, + 0x6b, 0x4e, 0x3d, 0xe3, 0xaf, 0x58, 0xfb, 0x3d, 0x63, 0x7e, 0xa0, 0xac, 0xe8, 0xff, 0x50, 0x6c, + 0xe3, 0x38, 0x66, 0x22, 0xa0, 0x49, 0x44, 0x86, 0x5e, 0x5e, 0xa1, 0x17, 0xb4, 0x6e, 0x4f, 0xaa, + 0x50, 0x0b, 0xae, 0x1c, 0xd3, 0x04, 0xc7, 0xf4, 0x39, 0x89, 0x02, 0x59, 0x12, 0x8b, 0x0c, 0x0a, + 0x79, 0x79, 0x6c, 0x7c, 0x46, 0x04, 0x36, 0xb0, 0x14, 0x56, 0xc4, 0x30, 0x30, 0x16, 0x2c, 0x28, + 0x4b, 0x02, 0x2e, 0xb0, 0x18, 0x70, 0xaf, 0xa0, 0xaa, 0x7c, 0xb7, 0x71, 0x61, 0x17, 0x35, 0x0e, + 0x87, 0xbb, 0x67, 0x7c, 0x1f, 0x2b, 0x57, 0xbf, 0x22, 0xce, 0xd1, 0xd6, 0xbe, 0x83, 0xb2, 0x0c, + 0xbc, 0x15, 0x86, 0xb2, 0x5e, 0x34, 0xe9, 0xa0, 0x00, 0x96, 0x71, 0x9b, 0xa5, 0xc2, 0xa6, 0x6b, + 0x0e, 0xc2, 0xf9, 0xb0, 0x83, 0x58, 0x32, 0x58, 0x2a, 0x88, 0x42, 0xaa, 0x1d, 0x41, 0x61, 0x07, + 0xc7, 0xf1, 0x7e, 0x5f, 0xa6, 0xc1, 0x65, 0x8b, 0x75, 0x30, 0x0f, 0x62, 0xda, 0xa3, 0x3a, 0x4a, + 0xc6, 0xcf, 0x75, 0x30, 0xff, 0x5a, 0xca, 0x68, 0x03, 0x96, 0x28, 0x0f, 0x70, 0xda, 0xa6, 0x22, + 0xc5, 0xe9, 0x28, 0x08, 0x71, 0x1c, 0xab, 0x4e, 0xcd, 0xf9, 0x8b, 0x94, 0x6f, 0x59, 0xbd, 0xc4, + 0xab, 0xbd, 0xce, 0x42, 0x79, 0x7f, 0x20, 0xce, 0xb6, 0xff, 0x2a, 0xe4, 0x52, 0x12, 0x12, 0x7a, + 0x3a, 0x26, 0xc0, 0x58, 0x46, 0xb7, 0xc1, 0xb5, 0x6b, 0x4d, 0x82, 0x3d, 0xcb, 0x81, 0x45, 0xab, + 0xb7, 0x2c, 0x98, 0x6a, 0xf4, 0xb9, 0x0f, 0x6b, 0xf4, 0x49, 0x4b, 0x67, 0xfe, 0x5d, 0x4b, 0x4b, + 0x4a, 0x72, 0x1e, 0x24, 0x2c, 0x09, 0x89, 0x62, 0x4d, 0xc6, 0xcf, 0x09, 0xce, 0x1f, 0x49, 0x79, + 0xba, 0x98, 0xd9, 0x77, 0x8a, 0x69, 0x8c, 0xfd, 0x94, 0x86, 0xc4, 0x10, 0x41, 0x1a, 0x0f, 0xa4, + 0x8c, 0xea, 0xe0, 0x1a, 0x23, 0x4b, 0xa9, 0x18, 0x05, 0xc7, 0x84, 0x78, 0x57, 0xd5, 0x9e, 0xb2, + 0xde, 0xa3, 0xd4, 0xbb, 0x84, 0x20, 0x04, 0x19, 0x45, 0xa5, 0x9c, 0xb2, 0xaa, 0xf5, 0xfb, 0x10, + 0xe1, 0x22, 0x96, 0xc1, 0x85, 0x2c, 0xbb, 0x06, 0x32, 0xcd, 0x60, 0xc0, 0x49, 0xe4, 0x55, 0xd4, + 0xce, 0x85, 0x0e, 0xe6, 0x4f, 0x38, 0x89, 0xd0, 0x37, 0xb0, 0x4c, 0x8e, 0x8f, 0x49, 0x28, 0xe8, + 0x29, 0x09, 0x26, 0x1f, 0x77, 0x45, 0x95, 0xb8, 0x61, 0x4a, 0x7c, 0xf3, 0x3d, 0x4a, 0xbc, 0x27, + 0x7b, 0x75, 0x0c, 0x75, 0xdf, 0x56, 0xa5, 0xf1, 0x2e, 0xbe, 0xae, 0xec, 0x8a, 0xca, 0x62, 0x6a, + 0xbf, 0x2e, 0xf1, 0x75, 0x00, 0x79, 0x38, 0xfd, 0x41, 0xfb, 0x84, 0x8c, 0x14, 0x5b, 0xf3, 0xbe, + 0x3c, 0xae, 0x03, 0xa5, 0xb8, 0x80, 0xd8, 0xc5, 0xff, 0x98, 0xd8, 0xe8, 0x21, 0x14, 0x25, 0x59, + 0x02, 0xa6, 0x69, 0xe6, 0x79, 0x6b, 0x4e, 0xbd, 0xd0, 0xda, 0xb8, 0x24, 0xc0, 0x19, 0x62, 0xfa, + 0x85, 0x70, 0x22, 0x7c, 0x99, 0xc9, 0x95, 0xdc, 0x4a, 0xed, 0x4f, 0x07, 0xb2, 0x06, 0x7f, 0x0b, + 0xb2, 0x26, 0x75, 0x47, 0xa5, 0x7e, 0xfb, 0x32, 0xe4, 0x50, 0x0c, 0x4d, 0xc2, 0xc6, 0x11, 0xad, + 0x43, 0x59, 0xaf, 0x82, 0x1e, 0xe1, 0x1c, 0x77, 0x88, 0xe2, 0x5f, 0xde, 0x2f, 0x69, 0xed, 0x43, + 0xad, 0x44, 0x77, 0xa0, 0x12, 0x63, 0x2e, 0x9e, 0xf4, 0x23, 0x2c, 0x48, 0x20, 0x68, 0x8f, 0x70, + 0x81, 0x7b, 0x7d, 0x45, 0xc4, 0x39, 0x7f, 0x79, 0x62, 0x3b, 0xb4, 0x26, 0x54, 0x07, 0x39, 0x1d, + 0xe4, 0xe4, 0xf1, 0xc9, 0xf1, 0x20, 0x89, 0x48, 0xa4, 0x58, 0xa7, 0x87, 0xc6, 0x59, 0x35, 0xfa, + 0x04, 0x96, 0xc2, 0x94, 0x60, 0x39, 0xed, 0x26, 0xc8, 0xf3, 0x0a, 0xd9, 0x35, 0x86, 0x31, 0x6c, + 0xed, 0x87, 0x59, 0x28, 0xf9, 0xe4, 0x94, 0xa4, 0xc2, 0x0e, 0xaf, 0x75, 0x28, 0xa7, 0x4a, 0x11, + 0xe0, 0x28, 0x4a, 0x09, 0xe7, 0x66, 0xcc, 0x94, 0xb4, 0x76, 0x4b, 0x2b, 0xd1, 0xc7, 0x50, 0xd6, + 0x87, 0x91, 0x04, 0xda, 0x60, 0x66, 0x98, 0x3a, 0xa2, 0xfd, 0x44, 0x63, 0xca, 0xcb, 0x4a, 0x4d, + 0xcb, 0x31, 0x96, 0xbe, 0x70, 0x8b, 0x4a, 0x69, 0xa1, 0x26, 0x11, 0x6d, 0xd1, 0xe4, 0x97, 0x15, + 0x6d, 0x44, 0x5b, 0xb4, 0xa7, 0x72, 0xba, 0xa9, 0x6d, 0x93, 0xae, 0x9d, 0xff, 0xb0, 0xc1, 0x63, + 0xe2, 0xd9, 0x1e, 0xaf, 0xfd, 0x38, 0x0f, 0xc5, 0x1d, 0x79, 0xb0, 0x6a, 0x3c, 0x1e, 0x0e, 0x91, + 0x07, 0x0b, 0xaa, 0x54, 0xcc, 0x0e, 0x59, 0x2b, 0xca, 0xdb, 0x5d, 0xcf, 0x03, 0x7d, 0xb0, 0x5a, + 0x40, 0xdf, 0x42, 0x5e, 0xdd, 0x2c, 0xc7, 0x84, 0x70, 0x93, 0xd4, 0xce, 0x3f, 0x4c, 0xea, 0x8f, + 0x57, 0x37, 0xdc, 0x11, 0xee, 0xc5, 0x5f, 0xd4, 0xc6, 0x48, 0x35, 0x3f, 0x27, 0xd7, 0xbb, 0x84, + 0x70, 0x74, 0x0b, 0x16, 0x53, 0x12, 0xe3, 0x11, 0x89, 0xc6, 0x55, 0xca, 0xea, 0x59, 0x66, 0xd4, + 0xb6, 0x4c, 0xbb, 0x50, 0x08, 0x43, 0x31, 0xb4, 0x2c, 0xcc, 0x29, 0x92, 0xac, 0x5f, 0xd2, 0xca, + 0xa6, 0x8d, 0x21, 0x1c, 0xb7, 0x34, 0x7a, 0x0c, 0x65, 0xaa, 0x1f, 0x5e, 0x41, 0x5f, 0x5d, 0x3d, + 0x6a, 0x02, 0x16, 0x5a, 0x9f, 0x5e, 0x02, 0x35, 0xf5, 0x5a, 0xf3, 0x4b, 0x74, 0xea, 0xf1, 0x76, + 0x04, 0x8b, 0xcc, 0xdc, 0x67, 0x16, 0x15, 0xd6, 0xe6, 0xea, 0x85, 0xd6, 0xe6, 0x25, 0xa8, 0xd3, + 0xb7, 0xa0, 0x5f, 0x66, 0xd3, 0xb7, 0x62, 0x0a, 0xd7, 0xd4, 0x7b, 0x31, 0x64, 0x71, 0x10, 0xb2, + 0x44, 0xa4, 0x38, 0x14, 0xc1, 0x29, 0x49, 0x39, 0x65, 0x89, 0x79, 0x61, 0x7c, 0x76, 0x49, 0x84, + 0x03, 0xe3, 0xbf, 0x63, 0xdc, 0x8f, 0xb4, 0xb7, 0x7f, 0xb5, 0x7f, 0xbe, 0x01, 0x3d, 0x1d, 0xb7, + 0xad, 0x1d, 0x48, 0xc5, 0xf7, 0x2a, 0xd0, 0x14, 0xdd, 0xb6, 0x33, 0xb2, 0x4d, 0x6c, 0xab, 0x1b, + 0xe5, 0xc6, 0xf7, 0x00, 0x93, 0xe1, 0x82, 0x10, 0x94, 0x0f, 0x48, 0x12, 0xd1, 0xa4, 0x63, 0x6a, + 0xeb, 0xce, 0xa0, 0x65, 0x58, 0x34, 0x3a, 0x5b, 0x19, 0xd7, 0x41, 0x4b, 0x50, 0xb2, 0xd2, 0x43, + 0x9a, 0x90, 0xc8, 0x9d, 0x93, 0x2a, 0xb3, 0x4f, 0x87, 0x75, 0x33, 0xa8, 0x08, 0x39, 0xbd, 0x26, + 0x91, 0x3b, 0x8f, 0x0a, 0xb0, 0xb0, 0xa5, 0xdf, 0x33, 0x6e, 0x76, 0x35, 0xf3, 0xcb, 0xcf, 0x55, + 0x67, 0xe3, 0x2b, 0xa8, 0x9c, 0x37, 0x95, 0x91, 0x0b, 0xc5, 0x47, 0x4c, 0xec, 0xda, 0xd7, 0x9d, + 0x3b, 0x83, 0x4a, 0x90, 0x9f, 0x88, 0x8e, 0x44, 0xbe, 0x37, 0x24, 0xe1, 0x40, 0x82, 0xcd, 0x1a, + 0xb0, 0x26, 0x5c, 0xfd, 0x9b, 0xca, 0xa2, 0x2c, 0xcc, 0x1e, 0xdd, 0x71, 0x67, 0xd4, 0x6f, 0xcb, + 0x75, 0xb4, 0xc3, 0xf6, 0xfd, 0x17, 0x6f, 0xaa, 0xce, 0xcb, 0x37, 0x55, 0xe7, 0xf5, 0x9b, 0xaa, + 0xf3, 0xd3, 0xdb, 0xea, 0xcc, 0xcb, 0xb7, 0xd5, 0x99, 0xdf, 0xde, 0x56, 0x67, 0x9e, 0x6d, 0x9e, + 0x61, 0x92, 0x2c, 0xec, 0xa6, 0xfe, 0xff, 0x90, 0xb0, 0x88, 0x34, 0x87, 0x67, 0xff, 0xa6, 0x28, + 0x52, 0xb5, 0xb3, 0xea, 0xe0, 0xee, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0x94, 0x4b, 0x30, 0xb4, + 0xd4, 0x0c, 0x00, 0x00, } func (m *InboundParams) Marshal() (dAtA []byte, err error) { @@ -1016,6 +1025,20 @@ func (m *OutboundParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.CallOptions != nil { + { + size, err := m.CallOptions.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrossChainTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xc2 + } if len(m.GasPriorityFee) > 0 { i -= len(m.GasPriorityFee) copy(dAtA[i:], m.GasPriorityFee) @@ -1089,16 +1112,11 @@ func (m *OutboundParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - { - size, err := m.CallOptions.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCrossChainTx(dAtA, i, uint64(size)) + if m.GasLimit != 0 { + i = encodeVarintCrossChainTx(dAtA, i, uint64(m.GasLimit)) + i-- + dAtA[i] = 0x30 } - i-- - dAtA[i] = 0x32 if m.TssNonce != 0 { i = encodeVarintCrossChainTx(dAtA, i, uint64(m.TssNonce)) i-- @@ -1464,8 +1482,9 @@ func (m *OutboundParams) Size() (n int) { if m.TssNonce != 0 { n += 1 + sovCrossChainTx(uint64(m.TssNonce)) } - l = m.CallOptions.Size() - n += 1 + l + sovCrossChainTx(uint64(l)) + if m.GasLimit != 0 { + n += 1 + sovCrossChainTx(uint64(m.GasLimit)) + } l = len(m.GasPrice) if l > 0 { n += 1 + l + sovCrossChainTx(uint64(l)) @@ -1500,6 +1519,10 @@ func (m *OutboundParams) Size() (n int) { if l > 0 { n += 2 + l + sovCrossChainTx(uint64(l)) } + if m.CallOptions != nil { + l = m.CallOptions.Size() + n += 2 + l + sovCrossChainTx(uint64(l)) + } return n } @@ -2267,10 +2290,10 @@ func (m *OutboundParams) Unmarshal(dAtA []byte) error { } } case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CallOptions", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field GasLimit", wireType) } - var msglen int + m.GasLimit = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrossChainTx @@ -2280,25 +2303,11 @@ func (m *OutboundParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.GasLimit |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthCrossChainTx - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCrossChainTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.CallOptions.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field GasPrice", wireType) @@ -2569,6 +2578,42 @@ func (m *OutboundParams) Unmarshal(dAtA []byte) error { } m.GasPriorityFee = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 24: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CallOptions", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrossChainTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrossChainTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrossChainTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.CallOptions == nil { + m.CallOptions = &CallOptions{} + } + if err := m.CallOptions.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCrossChainTx(dAtA[iNdEx:]) diff --git a/x/crosschain/types/message_vote_inbound.go b/x/crosschain/types/message_vote_inbound.go index 897b8c98bf..c73c9a24d4 100644 --- a/x/crosschain/types/message_vote_inbound.go +++ b/x/crosschain/types/message_vote_inbound.go @@ -70,7 +70,7 @@ func NewMsgVoteInbound( Message: message, InboundHash: inboundHash, InboundBlockHeight: inboundBlockHeight, - CallOptions: CallOptions{ + CallOptions: &CallOptions{ GasLimit: gasLimit, IsArbitraryCall: isArbitraryCall, }, diff --git a/x/crosschain/types/message_vote_inbound_test.go b/x/crosschain/types/message_vote_inbound_test.go index a6e715d643..77631f20fd 100644 --- a/x/crosschain/types/message_vote_inbound_test.go +++ b/x/crosschain/types/message_vote_inbound_test.go @@ -330,7 +330,7 @@ func TestMsgVoteInbound_Digest(t *testing.T) { Message: sample.String(), InboundHash: sample.String(), InboundBlockHeight: 42, - CallOptions: types.CallOptions{ + CallOptions: &types.CallOptions{ GasLimit: 42, }, CoinType: coin.CoinType_Zeta, diff --git a/x/crosschain/types/tx.pb.go b/x/crosschain/types/tx.pb.go index fc1b9d8fd7..7496f74404 100644 --- a/x/crosschain/types/tx.pb.go +++ b/x/crosschain/types/tx.pb.go @@ -988,19 +988,21 @@ type MsgVoteInbound struct { // string zeta_burnt = 6; Amount github_com_cosmos_cosmos_sdk_types.Uint `protobuf:"bytes,6,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Uint" json:"amount"` // string mMint = 7; - Message string `protobuf:"bytes,8,opt,name=message,proto3" json:"message,omitempty"` - InboundHash string `protobuf:"bytes,9,opt,name=inbound_hash,json=inboundHash,proto3" json:"inbound_hash,omitempty"` - InboundBlockHeight uint64 `protobuf:"varint,10,opt,name=inbound_block_height,json=inboundBlockHeight,proto3" json:"inbound_block_height,omitempty"` - CallOptions CallOptions `protobuf:"bytes,11,opt,name=call_options,json=callOptions,proto3" json:"call_options"` - CoinType coin.CoinType `protobuf:"varint,12,opt,name=coin_type,json=coinType,proto3,enum=zetachain.zetacore.pkg.coin.CoinType" json:"coin_type,omitempty"` - TxOrigin string `protobuf:"bytes,13,opt,name=tx_origin,json=txOrigin,proto3" json:"tx_origin,omitempty"` - Asset string `protobuf:"bytes,14,opt,name=asset,proto3" json:"asset,omitempty"` + Message string `protobuf:"bytes,8,opt,name=message,proto3" json:"message,omitempty"` + InboundHash string `protobuf:"bytes,9,opt,name=inbound_hash,json=inboundHash,proto3" json:"inbound_hash,omitempty"` + InboundBlockHeight uint64 `protobuf:"varint,10,opt,name=inbound_block_height,json=inboundBlockHeight,proto3" json:"inbound_block_height,omitempty"` + // Deprecated (v21), use CallOptions + GasLimit uint64 `protobuf:"varint,11,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` + CoinType coin.CoinType `protobuf:"varint,12,opt,name=coin_type,json=coinType,proto3,enum=zetachain.zetacore.pkg.coin.CoinType" json:"coin_type,omitempty"` + TxOrigin string `protobuf:"bytes,13,opt,name=tx_origin,json=txOrigin,proto3" json:"tx_origin,omitempty"` + Asset string `protobuf:"bytes,14,opt,name=asset,proto3" json:"asset,omitempty"` // event index of the sent asset in the observed tx EventIndex uint64 `protobuf:"varint,15,opt,name=event_index,json=eventIndex,proto3" json:"event_index,omitempty"` // protocol contract version to use for the cctx workflow ProtocolContractVersion ProtocolContractVersion `protobuf:"varint,16,opt,name=protocol_contract_version,json=protocolContractVersion,proto3,enum=zetachain.zetacore.crosschain.ProtocolContractVersion" json:"protocol_contract_version,omitempty"` // revert options provided by the sender RevertOptions RevertOptions `protobuf:"bytes,17,opt,name=revert_options,json=revertOptions,proto3" json:"revert_options"` + CallOptions *CallOptions `protobuf:"bytes,18,opt,name=call_options,json=callOptions,proto3" json:"call_options,omitempty"` } func (m *MsgVoteInbound) Reset() { *m = MsgVoteInbound{} } @@ -1092,11 +1094,11 @@ func (m *MsgVoteInbound) GetInboundBlockHeight() uint64 { return 0 } -func (m *MsgVoteInbound) GetCallOptions() CallOptions { +func (m *MsgVoteInbound) GetGasLimit() uint64 { if m != nil { - return m.CallOptions + return m.GasLimit } - return CallOptions{} + return 0 } func (m *MsgVoteInbound) GetCoinType() coin.CoinType { @@ -1141,6 +1143,13 @@ func (m *MsgVoteInbound) GetRevertOptions() RevertOptions { return RevertOptions{} } +func (m *MsgVoteInbound) GetCallOptions() *CallOptions { + if m != nil { + return m.CallOptions + } + return nil +} + type MsgVoteInboundResponse struct { } @@ -1706,120 +1715,120 @@ func init() { } var fileDescriptor_15f0860550897740 = []byte{ - // 1798 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8, - 0x15, 0x0f, 0x37, 0xb2, 0x2c, 0x3d, 0x59, 0xb2, 0xcd, 0x75, 0x6c, 0x99, 0x5e, 0xcb, 0x8e, 0xd2, - 0xb8, 0xc6, 0x22, 0x96, 0x5c, 0x65, 0x9b, 0x6e, 0xbd, 0x45, 0xb7, 0xb1, 0x76, 0xe3, 0x75, 0x11, - 0x25, 0x06, 0xe3, 0x6c, 0x3f, 0x2e, 0x04, 0x45, 0x8e, 0x69, 0xc2, 0x12, 0x47, 0xe0, 0x8c, 0xb4, - 0x72, 0x50, 0xa0, 0x45, 0x81, 0x02, 0x3d, 0xb6, 0x45, 0x4f, 0x7b, 0x28, 0xd0, 0x43, 0x81, 0xf6, - 0x3f, 0xd9, 0xe3, 0xa2, 0xa7, 0xa2, 0x87, 0xa0, 0x48, 0xfe, 0x81, 0xb6, 0xd7, 0x5e, 0x0a, 0xbe, - 0x19, 0xd2, 0x12, 0xf5, 0x69, 0x19, 0x45, 0x2f, 0x26, 0xe7, 0xf1, 0xfd, 0xde, 0xbc, 0xcf, 0x99, - 0xf7, 0x64, 0xd8, 0x79, 0x45, 0xb8, 0x69, 0x9d, 0x9b, 0xae, 0x57, 0xc6, 0x37, 0xea, 0x93, 0xb2, - 0xe5, 0x53, 0xc6, 0x04, 0x8d, 0x77, 0x4b, 0x2d, 0x9f, 0x72, 0xaa, 0x6e, 0x46, 0x7c, 0xa5, 0x90, - 0xaf, 0x74, 0xc5, 0xa7, 0xad, 0x38, 0xd4, 0xa1, 0xc8, 0x59, 0x0e, 0xde, 0x04, 0x48, 0x7b, 0x7f, - 0x88, 0xf0, 0xd6, 0x85, 0x53, 0x46, 0x12, 0x93, 0x0f, 0xc9, 0xbb, 0x33, 0x8a, 0x97, 0xba, 0x1e, - 0xfe, 0x99, 0x20, 0xb3, 0xe5, 0x53, 0x7a, 0xc6, 0xe4, 0x43, 0xf2, 0x3e, 0x1a, 0x6f, 0x9c, 0x6f, - 0x72, 0x62, 0x34, 0xdc, 0xa6, 0xcb, 0x89, 0x6f, 0x9c, 0x35, 0x4c, 0x27, 0xc4, 0x55, 0xc6, 0xe3, - 0xf0, 0xd5, 0xc0, 0x77, 0x23, 0x74, 0x50, 0xf1, 0x77, 0x0a, 0xa8, 0x35, 0xe6, 0xd4, 0x5c, 0x27, - 0x10, 0x7b, 0xca, 0xd8, 0x93, 0xb6, 0x67, 0x33, 0x35, 0x0f, 0xf3, 0x96, 0x4f, 0x4c, 0x4e, 0xfd, - 0xbc, 0xb2, 0xad, 0xec, 0xa6, 0xf5, 0x70, 0xa9, 0xae, 0x43, 0x4a, 0x88, 0x70, 0xed, 0xfc, 0x3b, - 0xdb, 0xca, 0xee, 0x6d, 0x7d, 0x1e, 0xd7, 0xc7, 0xb6, 0x7a, 0x04, 0x49, 0xb3, 0x49, 0xdb, 0x1e, - 0xcf, 0xdf, 0x0e, 0x30, 0x87, 0xe5, 0xaf, 0x5e, 0x6f, 0xdd, 0xfa, 0xfb, 0xeb, 0xad, 0x6f, 0x3a, - 0x2e, 0x3f, 0x6f, 0xd7, 0x4b, 0x16, 0x6d, 0x96, 0x2d, 0xca, 0x9a, 0x94, 0xc9, 0xc7, 0x1e, 0xb3, - 0x2f, 0xca, 0xfc, 0xb2, 0x45, 0x58, 0xe9, 0xa5, 0xeb, 0x71, 0x5d, 0xc2, 0x8b, 0xef, 0x81, 0x36, - 0xa8, 0x93, 0x4e, 0x58, 0x8b, 0x7a, 0x8c, 0x14, 0x9f, 0xc1, 0xbb, 0x35, 0xe6, 0xbc, 0x6c, 0xd9, - 0xe2, 0xe3, 0x63, 0xdb, 0xf6, 0x09, 0x1b, 0xa7, 0xf2, 0x26, 0x00, 0x67, 0xcc, 0x68, 0xb5, 0xeb, - 0x17, 0xe4, 0x12, 0x95, 0x4e, 0xeb, 0x69, 0xce, 0xd8, 0x09, 0x12, 0x8a, 0x9b, 0xb0, 0x31, 0x44, - 0x5e, 0xb4, 0xdd, 0x1f, 0xde, 0x81, 0x95, 0x1a, 0x73, 0x1e, 0xdb, 0xf6, 0xb1, 0x57, 0xa7, 0x6d, - 0xcf, 0x3e, 0xf5, 0x4d, 0xeb, 0x82, 0xf8, 0xb3, 0xf9, 0x68, 0x0d, 0xe6, 0x79, 0xd7, 0x38, 0x37, - 0xd9, 0xb9, 0x70, 0x92, 0x9e, 0xe4, 0xdd, 0xcf, 0x4c, 0x76, 0xae, 0x1e, 0x42, 0x3a, 0x48, 0x17, - 0x23, 0x70, 0x47, 0x3e, 0xb1, 0xad, 0xec, 0xe6, 0x2a, 0xf7, 0x4b, 0x43, 0xb2, 0xb7, 0x75, 0xe1, - 0x94, 0x30, 0xaf, 0xaa, 0xd4, 0xf5, 0x4e, 0x2f, 0x5b, 0x44, 0x4f, 0x59, 0xf2, 0x4d, 0x3d, 0x80, - 0x39, 0x4c, 0xa4, 0xfc, 0xdc, 0xb6, 0xb2, 0x9b, 0xa9, 0x7c, 0x63, 0x14, 0x5e, 0x66, 0xdb, 0x49, - 0xf0, 0xd0, 0x05, 0x24, 0x70, 0x52, 0xbd, 0x41, 0xad, 0x0b, 0xa1, 0x5b, 0x52, 0x38, 0x09, 0x29, - 0xa8, 0xde, 0x3a, 0xa4, 0x78, 0xd7, 0x70, 0x3d, 0x9b, 0x74, 0xf3, 0xf3, 0xc2, 0x24, 0xde, 0x3d, - 0x0e, 0x96, 0xc5, 0x02, 0xbc, 0x37, 0xcc, 0x3f, 0x91, 0x03, 0xff, 0xaa, 0xc0, 0x72, 0x8d, 0x39, - 0x3f, 0x3a, 0x77, 0x39, 0x69, 0xb8, 0x8c, 0x7f, 0xaa, 0x57, 0x2b, 0xfb, 0x63, 0xbc, 0x77, 0x0f, - 0xb2, 0xc4, 0xb7, 0x2a, 0xfb, 0x86, 0x29, 0x22, 0x21, 0x23, 0xb6, 0x80, 0xc4, 0x30, 0xda, 0xbd, - 0x2e, 0xbe, 0xdd, 0xef, 0x62, 0x15, 0x12, 0x9e, 0xd9, 0x14, 0x4e, 0x4c, 0xeb, 0xf8, 0xae, 0xae, - 0x42, 0x92, 0x5d, 0x36, 0xeb, 0xb4, 0x81, 0xae, 0x49, 0xeb, 0x72, 0xa5, 0x6a, 0x90, 0xb2, 0x89, - 0xe5, 0x36, 0xcd, 0x06, 0x43, 0x9b, 0xb3, 0x7a, 0xb4, 0x56, 0x37, 0x20, 0xed, 0x98, 0x4c, 0x54, - 0x9a, 0xb4, 0x39, 0xe5, 0x98, 0xec, 0x69, 0xb0, 0x2e, 0x1a, 0xb0, 0x3e, 0x60, 0x53, 0x68, 0x71, - 0x60, 0xc1, 0xab, 0x3e, 0x0b, 0x84, 0x85, 0x0b, 0xaf, 0x7a, 0x2d, 0xd8, 0x04, 0xb0, 0xac, 0xc8, - 0xa7, 0x32, 0x2b, 0x03, 0x8a, 0xf0, 0xea, 0xbf, 0x14, 0xb8, 0x23, 0xdc, 0xfa, 0xbc, 0xcd, 0x6f, - 0x9e, 0x77, 0x2b, 0x30, 0xe7, 0x51, 0xcf, 0x22, 0xe8, 0xac, 0x84, 0x2e, 0x16, 0xbd, 0xd9, 0x98, - 0xe8, 0xcb, 0xc6, 0xff, 0x4f, 0x26, 0x7d, 0x1f, 0x36, 0x87, 0x9a, 0x1c, 0x39, 0x76, 0x13, 0xc0, - 0x65, 0x86, 0x4f, 0x9a, 0xb4, 0x43, 0x6c, 0xb4, 0x3e, 0xa5, 0xa7, 0x5d, 0xa6, 0x0b, 0x42, 0x91, - 0x40, 0xbe, 0xc6, 0x1c, 0xb1, 0xfa, 0xdf, 0x79, 0xad, 0x58, 0x84, 0xed, 0x51, 0xdb, 0x44, 0x49, - 0xff, 0x67, 0x05, 0x16, 0x6b, 0xcc, 0xf9, 0x9c, 0x72, 0x72, 0x64, 0xb2, 0x13, 0xdf, 0xb5, 0xc8, - 0xcc, 0x2a, 0xb4, 0x02, 0x74, 0xa8, 0x02, 0x2e, 0xd4, 0xbb, 0xb0, 0xd0, 0xf2, 0x5d, 0xea, 0xbb, - 0xfc, 0xd2, 0x38, 0x23, 0x04, 0xbd, 0x9c, 0xd0, 0x33, 0x21, 0xed, 0x09, 0x41, 0x16, 0x11, 0x06, - 0xaf, 0xdd, 0xac, 0x13, 0x1f, 0x03, 0x9c, 0xd0, 0x33, 0x48, 0x7b, 0x86, 0xa4, 0x1f, 0x26, 0x52, - 0x73, 0x4b, 0xc9, 0xe2, 0x3a, 0xac, 0xc5, 0x34, 0x8d, 0xac, 0xf8, 0x53, 0x32, 0xb2, 0x22, 0x34, - 0x74, 0x8c, 0x15, 0x1b, 0x80, 0xf9, 0x2b, 0xe2, 0x2e, 0x12, 0x3a, 0x15, 0x10, 0x30, 0xec, 0x1f, - 0xc0, 0x2a, 0xad, 0x33, 0xe2, 0x77, 0x88, 0x6d, 0x50, 0x29, 0xab, 0xf7, 0x1c, 0x5c, 0x09, 0xbf, - 0x86, 0x1b, 0x21, 0xaa, 0x0a, 0x85, 0x41, 0x94, 0xcc, 0x2e, 0xe2, 0x3a, 0xe7, 0x5c, 0x9a, 0xb5, - 0x11, 0x47, 0x1f, 0x62, 0xbe, 0x21, 0x8b, 0xfa, 0x11, 0x68, 0x83, 0x42, 0x82, 0xd2, 0x6e, 0x33, - 0x62, 0xe7, 0x01, 0x05, 0xac, 0xc5, 0x05, 0x1c, 0x99, 0xec, 0x25, 0x23, 0xb6, 0xfa, 0x0b, 0x05, - 0xee, 0x0f, 0xa2, 0xc9, 0xd9, 0x19, 0xb1, 0xb8, 0xdb, 0x21, 0x28, 0x47, 0x04, 0x28, 0x83, 0x97, - 0x5e, 0x49, 0x5e, 0x7a, 0x3b, 0x53, 0x5c, 0x7a, 0xc7, 0x1e, 0xd7, 0xef, 0xc6, 0x37, 0xfe, 0x34, - 0x14, 0x1d, 0xe5, 0xcd, 0xc9, 0x64, 0x0d, 0xc4, 0x21, 0xb5, 0x80, 0xa6, 0x8c, 0x95, 0x88, 0xa7, - 0x97, 0x4a, 0x21, 0xd7, 0x31, 0x1b, 0x6d, 0x62, 0xf8, 0xc4, 0x22, 0x6e, 0x50, 0x4b, 0x78, 0x2c, - 0x1e, 0x7e, 0x76, 0xcd, 0x1b, 0xfb, 0xdf, 0xaf, 0xb7, 0xee, 0x5c, 0x9a, 0xcd, 0xc6, 0x41, 0xb1, - 0x5f, 0x5c, 0x51, 0xcf, 0x22, 0x41, 0x97, 0x6b, 0xf5, 0x13, 0x48, 0x32, 0x6e, 0xf2, 0xb6, 0x38, - 0x65, 0x73, 0x95, 0x07, 0x23, 0xaf, 0x36, 0xd1, 0x5c, 0x49, 0xe0, 0x0b, 0xc4, 0xe8, 0x12, 0xab, - 0xde, 0x87, 0x5c, 0x64, 0x3f, 0x32, 0xca, 0x03, 0x24, 0x1b, 0x52, 0xab, 0x01, 0x51, 0x7d, 0x00, - 0x6a, 0xc4, 0x16, 0x5c, 0xfc, 0xa2, 0x84, 0x53, 0xe8, 0x9c, 0xa5, 0xf0, 0xcb, 0x29, 0x63, 0xcf, - 0xf0, 0x0c, 0xec, 0xbb, 0x78, 0xd3, 0x33, 0x5d, 0xbc, 0x3d, 0x25, 0x14, 0xfa, 0x3c, 0x2a, 0xa1, - 0x3f, 0x26, 0x21, 0x27, 0xbf, 0xc9, 0xfb, 0x71, 0x4c, 0x05, 0x05, 0xd7, 0x14, 0xf1, 0x6c, 0xe2, - 0xcb, 0xf2, 0x91, 0x2b, 0x75, 0x07, 0x16, 0xc5, 0x9b, 0x11, 0xbb, 0xf4, 0xb2, 0x82, 0x5c, 0x95, - 0x87, 0x85, 0x06, 0x29, 0x19, 0x02, 0x5f, 0x1e, 0xe8, 0xd1, 0x3a, 0x70, 0x5e, 0xf8, 0x2e, 0x9d, - 0x37, 0x27, 0x44, 0x84, 0x54, 0xe1, 0xbc, 0xab, 0x26, 0x2e, 0x79, 0xa3, 0x26, 0x2e, 0xb0, 0xb2, - 0x49, 0x18, 0x33, 0x1d, 0xe1, 0xfa, 0xb4, 0x1e, 0x2e, 0x83, 0x93, 0xc9, 0xf5, 0x7a, 0x0e, 0x80, - 0x34, 0x7e, 0xce, 0x48, 0x1a, 0xd6, 0xfd, 0x3e, 0xac, 0x84, 0x2c, 0x7d, 0xd5, 0x2e, 0x8a, 0x55, - 0x95, 0xdf, 0x7a, 0x8b, 0xfc, 0x05, 0x2c, 0x58, 0x66, 0xa3, 0x61, 0xd0, 0x16, 0x77, 0xa9, 0xc7, - 0xb0, 0x1a, 0x33, 0x95, 0xf7, 0x4b, 0x63, 0x07, 0x80, 0x52, 0xd5, 0x6c, 0x34, 0x9e, 0x0b, 0xc4, - 0x61, 0x22, 0xb0, 0x54, 0xcf, 0x58, 0x57, 0xa4, 0xfe, 0xdc, 0x58, 0x98, 0xad, 0x29, 0xdb, 0x80, - 0x34, 0xef, 0x1a, 0xd4, 0x77, 0x1d, 0xd7, 0xcb, 0x67, 0x45, 0x50, 0x78, 0xf7, 0x39, 0xae, 0x83, - 0xd3, 0xdd, 0x64, 0x8c, 0xf0, 0x7c, 0x0e, 0x3f, 0x88, 0x85, 0xba, 0x05, 0x19, 0xd2, 0x21, 0x1e, - 0x97, 0xb7, 0xe4, 0x22, 0x1a, 0x0d, 0x48, 0xc2, 0x8b, 0x52, 0xf5, 0x61, 0x1d, 0xdb, 0x77, 0x8b, - 0x36, 0x0c, 0x8b, 0x7a, 0xdc, 0x37, 0x2d, 0x6e, 0x74, 0x88, 0xcf, 0x5c, 0xea, 0xe5, 0x97, 0x50, - 0xcf, 0x47, 0x13, 0x2c, 0x3f, 0x91, 0xf8, 0xaa, 0x84, 0x7f, 0x2e, 0xd0, 0xfa, 0x5a, 0x6b, 0xf8, - 0x07, 0xf5, 0x27, 0x41, 0xfe, 0x74, 0x88, 0xcf, 0x23, 0x17, 0x2f, 0xa3, 0x8b, 0x1f, 0x4c, 0xd8, - 0x48, 0x47, 0x50, 0xbf, 0x93, 0xb3, 0x7e, 0x2f, 0xb1, 0x98, 0x87, 0xd5, 0xfe, 0x12, 0x89, 0xaa, - 0xe7, 0x29, 0xb6, 0x8e, 0x8f, 0xeb, 0xd4, 0xe7, 0x2f, 0x78, 0xdb, 0xba, 0xa8, 0x56, 0x4f, 0x7f, - 0x3c, 0xbe, 0xd3, 0x1f, 0xd7, 0x53, 0x6d, 0x60, 0xd3, 0xd6, 0x2f, 0x2d, 0xda, 0xaa, 0x83, 0x6d, - 0xbe, 0x4e, 0xce, 0xda, 0x9e, 0x8d, 0x2c, 0xc4, 0xbe, 0xd1, 0x6e, 0xa2, 0xe0, 0x02, 0x69, 0x51, - 0x1b, 0x28, 0x6e, 0xba, 0xac, 0xa0, 0xca, 0x3e, 0x50, 0xb6, 0xcf, 0x03, 0xfb, 0x46, 0x7a, 0x7d, - 0xa9, 0xa0, 0xd6, 0x62, 0x3e, 0xd1, 0x4d, 0x4e, 0x9e, 0x8a, 0xd1, 0xef, 0x49, 0x30, 0xf9, 0x8d, - 0xd1, 0xce, 0x02, 0x75, 0x70, 0x52, 0x44, 0x2d, 0x33, 0x95, 0xf2, 0xa4, 0x98, 0xc5, 0xb6, 0x91, - 0x61, 0x5b, 0xf2, 0x63, 0xf4, 0xe2, 0x3d, 0xb8, 0x3b, 0x52, 0xb7, 0xc8, 0x82, 0x7f, 0x2a, 0x38, - 0x61, 0xc9, 0x79, 0x0e, 0x5b, 0xe5, 0x6a, 0x9b, 0x71, 0x6a, 0x5f, 0xde, 0x60, 0xd8, 0x2c, 0xc1, - 0xbb, 0x1e, 0xf9, 0xc2, 0xb0, 0x84, 0xa0, 0x98, 0x8b, 0x97, 0x3d, 0xf2, 0x85, 0xdc, 0x22, 0x6c, - 0xb7, 0x07, 0xa6, 0x8a, 0xc4, 0x90, 0xa9, 0xe2, 0xea, 0xf0, 0x9b, 0xbb, 0xd9, 0x04, 0xfb, 0x09, - 0xdc, 0x1b, 0x63, 0x71, 0x6f, 0x3f, 0xdb, 0x93, 0x41, 0x4a, 0x3c, 0x5f, 0x9b, 0xd8, 0x68, 0x0a, - 0xef, 0xf6, 0x0a, 0x39, 0x31, 0xdb, 0x4c, 0xde, 0x8d, 0xb3, 0x37, 0x95, 0x81, 0x0c, 0x74, 0x57, - 0x4a, 0x17, 0x8b, 0xe2, 0x31, 0xec, 0x4e, 0xda, 0x6e, 0x4a, 0xcd, 0x2b, 0xff, 0xc9, 0xc1, 0xed, - 0x1a, 0x73, 0xd4, 0x5f, 0x2b, 0xa0, 0x0e, 0x19, 0x61, 0x3e, 0x98, 0x90, 0x7f, 0x43, 0xa7, 0x00, - 0xed, 0x7b, 0xb3, 0xa0, 0x22, 0x8d, 0x7f, 0xa5, 0xc0, 0xf2, 0xe0, 0x10, 0xff, 0x70, 0x2a, 0x99, - 0xfd, 0x20, 0xed, 0xa3, 0x19, 0x40, 0x91, 0x1e, 0xbf, 0x55, 0xe0, 0xce, 0xf0, 0x11, 0xe5, 0x3b, - 0x93, 0xc5, 0x0e, 0x05, 0x6a, 0x1f, 0xcf, 0x08, 0x8c, 0x74, 0xea, 0xc0, 0x42, 0xdf, 0xa4, 0x52, - 0x9a, 0x2c, 0xb0, 0x97, 0x5f, 0x7b, 0x74, 0x3d, 0xfe, 0xf8, 0xbe, 0xd1, 0x6c, 0x31, 0xe5, 0xbe, - 0x21, 0xff, 0xb4, 0xfb, 0xc6, 0x9b, 0x32, 0x95, 0x41, 0xa6, 0xb7, 0x21, 0xdb, 0x9b, 0x4e, 0x8c, - 0x64, 0xd7, 0xbe, 0x7d, 0x2d, 0xf6, 0x68, 0xd3, 0x9f, 0x41, 0x2e, 0xf6, 0x1b, 0xc8, 0xfe, 0x64, - 0x41, 0xfd, 0x08, 0xed, 0xc3, 0xeb, 0x22, 0xa2, 0xdd, 0x7f, 0xa9, 0xc0, 0xd2, 0xc0, 0x6f, 0x66, - 0x95, 0xc9, 0xe2, 0xe2, 0x18, 0xed, 0xe0, 0xfa, 0x98, 0x48, 0x89, 0x9f, 0xc3, 0x62, 0xfc, 0x97, - 0xc6, 0x6f, 0x4d, 0x16, 0x17, 0x83, 0x68, 0xdf, 0xbd, 0x36, 0xa4, 0x37, 0x06, 0xb1, 0x66, 0x62, - 0x8a, 0x18, 0xf4, 0x23, 0xa6, 0x89, 0xc1, 0xf0, 0x16, 0x03, 0x8f, 0xa0, 0xc1, 0x06, 0xe3, 0xe1, - 0x34, 0xd5, 0x1b, 0x03, 0x4d, 0x73, 0x04, 0x8d, 0x6c, 0x29, 0xd4, 0xdf, 0x2b, 0xb0, 0x3a, 0xa2, - 0x9f, 0xf8, 0x70, 0xda, 0xe8, 0xc6, 0x91, 0xda, 0x0f, 0x66, 0x45, 0x46, 0x6a, 0x7d, 0xa9, 0x40, - 0x7e, 0x64, 0x93, 0x70, 0x30, 0x75, 0xd0, 0x07, 0xb0, 0xda, 0xe1, 0xec, 0xd8, 0x48, 0xb9, 0xbf, - 0x28, 0xb0, 0x39, 0xfe, 0x26, 0xfe, 0x78, 0x5a, 0x07, 0x8c, 0x10, 0xa0, 0x1d, 0xdd, 0x50, 0x40, - 0xa8, 0xeb, 0xe1, 0xd1, 0x57, 0x6f, 0x0a, 0xca, 0xd7, 0x6f, 0x0a, 0xca, 0x3f, 0xde, 0x14, 0x94, - 0xdf, 0xbc, 0x2d, 0xdc, 0xfa, 0xfa, 0x6d, 0xe1, 0xd6, 0xdf, 0xde, 0x16, 0x6e, 0xfd, 0x74, 0xaf, - 0xa7, 0x91, 0x09, 0xb6, 0xd8, 0x13, 0xff, 0x1a, 0xf0, 0xa8, 0x4d, 0xca, 0xdd, 0xbe, 0xff, 0xa0, - 0x04, 0x3d, 0x4d, 0x3d, 0x89, 0xc3, 0xc0, 0xc3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x07, 0x78, - 0x5b, 0x4b, 0x6f, 0x19, 0x00, 0x00, + // 1807 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x6f, 0x23, 0x49, + 0x15, 0x4f, 0x6f, 0x1c, 0xc7, 0x7e, 0x4e, 0x9c, 0xa4, 0x37, 0x93, 0x38, 0x9d, 0x8d, 0x93, 0xf1, + 0x30, 0x21, 0x5a, 0x4d, 0xec, 0xe0, 0x59, 0x86, 0x25, 0x8b, 0x58, 0x26, 0xde, 0x9d, 0x6c, 0xd0, + 0x78, 0x26, 0xea, 0xcd, 0x2c, 0x7f, 0x2e, 0xad, 0x76, 0x77, 0xa5, 0xd3, 0x8a, 0xdd, 0x65, 0x75, + 0x95, 0xbd, 0xce, 0x08, 0x09, 0x84, 0x84, 0xc4, 0x11, 0x10, 0xa7, 0x3d, 0x70, 0x43, 0x82, 0x6f, + 0xc0, 0x47, 0xd8, 0xe3, 0x88, 0x13, 0xe2, 0x30, 0x42, 0x33, 0x5f, 0x00, 0xb8, 0x72, 0x41, 0xfd, + 0xaa, 0xba, 0x63, 0xb7, 0xff, 0xc6, 0x11, 0xe2, 0x92, 0xee, 0x7a, 0xfd, 0x7e, 0xef, 0x5f, 0xbd, + 0xaa, 0xf7, 0x9e, 0x03, 0xbb, 0x2f, 0x09, 0x37, 0xad, 0x0b, 0xd3, 0xf5, 0x4a, 0xf8, 0x46, 0x7d, + 0x52, 0xb2, 0x7c, 0xca, 0x98, 0xa0, 0xf1, 0x4e, 0xb1, 0xe9, 0x53, 0x4e, 0xd5, 0xad, 0x88, 0xaf, + 0x18, 0xf2, 0x15, 0xaf, 0xf9, 0xb4, 0x55, 0x87, 0x3a, 0x14, 0x39, 0x4b, 0xc1, 0x9b, 0x00, 0x69, + 0xef, 0x0f, 0x10, 0xde, 0xbc, 0x74, 0x4a, 0x48, 0x62, 0xf2, 0x21, 0x79, 0x77, 0x87, 0xf1, 0x52, + 0xd7, 0xc3, 0x3f, 0x63, 0x64, 0x36, 0x7d, 0x4a, 0xcf, 0x99, 0x7c, 0x48, 0xde, 0x47, 0xa3, 0x9d, + 0xf3, 0x4d, 0x4e, 0x8c, 0xba, 0xdb, 0x70, 0x39, 0xf1, 0x8d, 0xf3, 0xba, 0xe9, 0x84, 0xb8, 0xf2, + 0x68, 0x1c, 0xbe, 0x1a, 0xf8, 0x6e, 0x84, 0x01, 0x2a, 0xfc, 0x4e, 0x01, 0xb5, 0xca, 0x9c, 0xaa, + 0xeb, 0x04, 0x62, 0xcf, 0x18, 0x7b, 0xd2, 0xf2, 0x6c, 0xa6, 0xe6, 0x60, 0xde, 0xf2, 0x89, 0xc9, + 0xa9, 0x9f, 0x53, 0x76, 0x94, 0xbd, 0xb4, 0x1e, 0x2e, 0xd5, 0x0d, 0x48, 0x09, 0x11, 0xae, 0x9d, + 0x7b, 0x67, 0x47, 0xd9, 0x9b, 0xd5, 0xe7, 0x71, 0x7d, 0x62, 0xab, 0xc7, 0x90, 0x34, 0x1b, 0xb4, + 0xe5, 0xf1, 0xdc, 0x6c, 0x80, 0x39, 0x2a, 0x7d, 0xfd, 0x7a, 0x7b, 0xe6, 0xef, 0xaf, 0xb7, 0xbf, + 0xe9, 0xb8, 0xfc, 0xa2, 0x55, 0x2b, 0x5a, 0xb4, 0x51, 0xb2, 0x28, 0x6b, 0x50, 0x26, 0x1f, 0xfb, + 0xcc, 0xbe, 0x2c, 0xf1, 0xab, 0x26, 0x61, 0xc5, 0x17, 0xae, 0xc7, 0x75, 0x09, 0x2f, 0xbc, 0x07, + 0x5a, 0xbf, 0x4d, 0x3a, 0x61, 0x4d, 0xea, 0x31, 0x52, 0x78, 0x06, 0xef, 0x56, 0x99, 0xf3, 0xa2, + 0x69, 0x8b, 0x8f, 0x8f, 0x6d, 0xdb, 0x27, 0x6c, 0x94, 0xc9, 0x5b, 0x00, 0x9c, 0x31, 0xa3, 0xd9, + 0xaa, 0x5d, 0x92, 0x2b, 0x34, 0x3a, 0xad, 0xa7, 0x39, 0x63, 0xa7, 0x48, 0x28, 0x6c, 0xc1, 0xe6, + 0x00, 0x79, 0x91, 0xba, 0x3f, 0xbc, 0x03, 0xab, 0x55, 0xe6, 0x3c, 0xb6, 0xed, 0x13, 0xaf, 0x46, + 0x5b, 0x9e, 0x7d, 0xe6, 0x9b, 0xd6, 0x25, 0xf1, 0xa7, 0x8b, 0xd1, 0x3a, 0xcc, 0xf3, 0x8e, 0x71, + 0x61, 0xb2, 0x0b, 0x11, 0x24, 0x3d, 0xc9, 0x3b, 0x9f, 0x99, 0xec, 0x42, 0x3d, 0x82, 0x74, 0x90, + 0x2e, 0x46, 0x10, 0x8e, 0x5c, 0x62, 0x47, 0xd9, 0xcb, 0x96, 0xef, 0x17, 0x07, 0x64, 0x6f, 0xf3, + 0xd2, 0x29, 0x62, 0x5e, 0x55, 0xa8, 0xeb, 0x9d, 0x5d, 0x35, 0x89, 0x9e, 0xb2, 0xe4, 0x9b, 0x7a, + 0x08, 0x73, 0x98, 0x48, 0xb9, 0xb9, 0x1d, 0x65, 0x2f, 0x53, 0xfe, 0xc6, 0x30, 0xbc, 0xcc, 0xb6, + 0xd3, 0xe0, 0xa1, 0x0b, 0x48, 0x10, 0xa4, 0x5a, 0x9d, 0x5a, 0x97, 0xc2, 0xb6, 0xa4, 0x08, 0x12, + 0x52, 0xd0, 0xbc, 0x0d, 0x48, 0xf1, 0x8e, 0xe1, 0x7a, 0x36, 0xe9, 0xe4, 0xe6, 0x85, 0x4b, 0xbc, + 0x73, 0x12, 0x2c, 0x0b, 0x79, 0x78, 0x6f, 0x50, 0x7c, 0xa2, 0x00, 0xfe, 0x55, 0x81, 0x95, 0x2a, + 0x73, 0x7e, 0x74, 0xe1, 0x72, 0x52, 0x77, 0x19, 0xff, 0x54, 0xaf, 0x94, 0x0f, 0x46, 0x44, 0xef, + 0x1e, 0x2c, 0x12, 0xdf, 0x2a, 0x1f, 0x18, 0xa6, 0xd8, 0x09, 0xb9, 0x63, 0x0b, 0x48, 0x0c, 0x77, + 0xbb, 0x3b, 0xc4, 0xb3, 0xbd, 0x21, 0x56, 0x21, 0xe1, 0x99, 0x0d, 0x11, 0xc4, 0xb4, 0x8e, 0xef, + 0xea, 0x1a, 0x24, 0xd9, 0x55, 0xa3, 0x46, 0xeb, 0x18, 0x9a, 0xb4, 0x2e, 0x57, 0xaa, 0x06, 0x29, + 0x9b, 0x58, 0x6e, 0xc3, 0xac, 0x33, 0xf4, 0x79, 0x51, 0x8f, 0xd6, 0xea, 0x26, 0xa4, 0x1d, 0x93, + 0x89, 0x93, 0x26, 0x7d, 0x4e, 0x39, 0x26, 0x7b, 0x1a, 0xac, 0x0b, 0x06, 0x6c, 0xf4, 0xf9, 0x14, + 0x7a, 0x1c, 0x78, 0xf0, 0xb2, 0xc7, 0x03, 0xe1, 0xe1, 0xc2, 0xcb, 0x6e, 0x0f, 0xb6, 0x00, 0x2c, + 0x2b, 0x8a, 0xa9, 0xcc, 0xca, 0x80, 0x22, 0xa2, 0xfa, 0x2f, 0x05, 0xee, 0x88, 0xb0, 0x3e, 0x6f, + 0xf1, 0xdb, 0xe7, 0xdd, 0x2a, 0xcc, 0x79, 0xd4, 0xb3, 0x08, 0x06, 0x2b, 0xa1, 0x8b, 0x45, 0x77, + 0x36, 0x26, 0x7a, 0xb2, 0xf1, 0xff, 0x93, 0x49, 0xdf, 0x87, 0xad, 0x81, 0x2e, 0x47, 0x81, 0xdd, + 0x02, 0x70, 0x99, 0xe1, 0x93, 0x06, 0x6d, 0x13, 0x1b, 0xbd, 0x4f, 0xe9, 0x69, 0x97, 0xe9, 0x82, + 0x50, 0x20, 0x90, 0xab, 0x32, 0x47, 0xac, 0xfe, 0x77, 0x51, 0x2b, 0x14, 0x60, 0x67, 0x98, 0x9a, + 0x28, 0xe9, 0xff, 0xa4, 0xc0, 0x52, 0x95, 0x39, 0x5f, 0x50, 0x4e, 0x8e, 0x4d, 0x76, 0xea, 0xbb, + 0x16, 0x99, 0xda, 0x84, 0x66, 0x80, 0x0e, 0x4d, 0xc0, 0x85, 0x7a, 0x17, 0x16, 0x9a, 0xbe, 0x4b, + 0x7d, 0x97, 0x5f, 0x19, 0xe7, 0x84, 0x60, 0x94, 0x13, 0x7a, 0x26, 0xa4, 0x3d, 0x21, 0xc8, 0x22, + 0xb6, 0xc1, 0x6b, 0x35, 0x6a, 0xc4, 0xc7, 0x0d, 0x4e, 0xe8, 0x19, 0xa4, 0x3d, 0x43, 0xd2, 0x0f, + 0x13, 0xa9, 0xb9, 0xe5, 0x64, 0x61, 0x03, 0xd6, 0x63, 0x96, 0x46, 0x5e, 0xfc, 0x31, 0x19, 0x79, + 0x11, 0x3a, 0x3a, 0xc2, 0x8b, 0x4d, 0xc0, 0xfc, 0x15, 0xfb, 0x2e, 0x12, 0x3a, 0x15, 0x10, 0x70, + 0xdb, 0x3f, 0x80, 0x35, 0x5a, 0x63, 0xc4, 0x6f, 0x13, 0xdb, 0xa0, 0x52, 0x56, 0xf7, 0x3d, 0xb8, + 0x1a, 0x7e, 0x0d, 0x15, 0x21, 0xaa, 0x02, 0xf9, 0x7e, 0x94, 0xcc, 0x2e, 0xe2, 0x3a, 0x17, 0x5c, + 0xba, 0xb5, 0x19, 0x47, 0x1f, 0x61, 0xbe, 0x21, 0x8b, 0xfa, 0x11, 0x68, 0xfd, 0x42, 0x82, 0xa3, + 0xdd, 0x62, 0xc4, 0xce, 0x01, 0x0a, 0x58, 0x8f, 0x0b, 0x38, 0x36, 0xd9, 0x0b, 0x46, 0x6c, 0xf5, + 0x17, 0x0a, 0xdc, 0xef, 0x47, 0x93, 0xf3, 0x73, 0x62, 0x71, 0xb7, 0x4d, 0x50, 0x8e, 0xd8, 0xa0, + 0x0c, 0x16, 0xbd, 0xa2, 0x2c, 0x7a, 0xbb, 0x13, 0x14, 0xbd, 0x13, 0x8f, 0xeb, 0x77, 0xe3, 0x8a, + 0x3f, 0x0d, 0x45, 0x47, 0x79, 0x73, 0x3a, 0xde, 0x02, 0x71, 0x49, 0x2d, 0xa0, 0x2b, 0x23, 0x25, + 0xe2, 0xed, 0xa5, 0x52, 0xc8, 0xb6, 0xcd, 0x7a, 0x8b, 0x18, 0x3e, 0xb1, 0x88, 0x1b, 0x9c, 0x25, + 0xbc, 0x16, 0x8f, 0x3e, 0xbb, 0x61, 0xc5, 0xfe, 0xf7, 0xeb, 0xed, 0x3b, 0x57, 0x66, 0xa3, 0x7e, + 0x58, 0xe8, 0x15, 0x57, 0xd0, 0x17, 0x91, 0xa0, 0xcb, 0xb5, 0xfa, 0x09, 0x24, 0x19, 0x37, 0x79, + 0x4b, 0xdc, 0xb2, 0xd9, 0xf2, 0x83, 0xa1, 0xa5, 0x4d, 0x34, 0x57, 0x12, 0xf8, 0x39, 0x62, 0x74, + 0x89, 0x55, 0xef, 0x43, 0x36, 0xf2, 0x1f, 0x19, 0xe5, 0x05, 0xb2, 0x18, 0x52, 0x2b, 0x01, 0x51, + 0x7d, 0x00, 0x6a, 0xc4, 0x16, 0x14, 0x7e, 0x71, 0x84, 0x53, 0x18, 0x9c, 0xe5, 0xf0, 0xcb, 0x19, + 0x63, 0xcf, 0xf0, 0x0e, 0xec, 0x29, 0xbc, 0xe9, 0xa9, 0x0a, 0x6f, 0xd7, 0x11, 0x0a, 0x63, 0x1e, + 0x1d, 0xa1, 0xbf, 0x24, 0x21, 0x2b, 0xbf, 0xc9, 0xfa, 0x38, 0xe2, 0x04, 0x05, 0x65, 0x8a, 0x78, + 0x36, 0xf1, 0xe5, 0xf1, 0x91, 0x2b, 0x75, 0x17, 0x96, 0xc4, 0x9b, 0x11, 0x2b, 0x7a, 0x8b, 0x82, + 0x5c, 0x91, 0x97, 0x85, 0x06, 0x29, 0xb9, 0x05, 0xbe, 0xbc, 0xd0, 0xa3, 0x75, 0x10, 0xbc, 0xf0, + 0x5d, 0x06, 0x6f, 0x4e, 0x88, 0x08, 0xa9, 0x22, 0x78, 0xd7, 0x4d, 0x5c, 0xf2, 0x56, 0x4d, 0x5c, + 0xe0, 0x65, 0x83, 0x30, 0x66, 0x3a, 0x22, 0xf4, 0x69, 0x3d, 0x5c, 0x06, 0x37, 0x93, 0xeb, 0x75, + 0x5d, 0x00, 0x69, 0xfc, 0x9c, 0x91, 0x34, 0x3c, 0xf7, 0x07, 0xb0, 0x1a, 0xb2, 0xf4, 0x9c, 0x76, + 0x71, 0x58, 0x55, 0xf9, 0xad, 0xfb, 0x90, 0xf7, 0x54, 0xeb, 0x0c, 0xb2, 0x45, 0xd5, 0xba, 0x77, + 0x8f, 0x17, 0xa6, 0x6b, 0xae, 0x36, 0x21, 0xcd, 0x3b, 0x06, 0xf5, 0x5d, 0xc7, 0xf5, 0x72, 0x8b, + 0x22, 0xb8, 0xbc, 0xf3, 0x1c, 0xd7, 0xc1, 0x2d, 0x6d, 0x32, 0x46, 0x78, 0x2e, 0x8b, 0x1f, 0xc4, + 0x42, 0xdd, 0x86, 0x0c, 0x69, 0x13, 0x8f, 0xcb, 0x6a, 0xb7, 0x84, 0x56, 0x01, 0x92, 0xb0, 0xe0, + 0xa9, 0x3e, 0x6c, 0x60, 0x1b, 0x6e, 0xd1, 0xba, 0x61, 0x51, 0x8f, 0xfb, 0xa6, 0xc5, 0x8d, 0x36, + 0xf1, 0x99, 0x4b, 0xbd, 0xdc, 0x32, 0xda, 0xf9, 0xa8, 0x38, 0x72, 0x84, 0x09, 0x4a, 0x2f, 0xe2, + 0x2b, 0x12, 0xfe, 0x85, 0x40, 0xeb, 0xeb, 0xcd, 0xc1, 0x1f, 0xd4, 0x9f, 0x04, 0x79, 0xd0, 0x26, + 0x3e, 0x37, 0x68, 0x93, 0xbb, 0xd4, 0x63, 0xb9, 0x15, 0xac, 0xf1, 0x0f, 0xc6, 0x28, 0xd2, 0x11, + 0xf4, 0x5c, 0x60, 0x8e, 0x12, 0x41, 0x5a, 0x04, 0xb9, 0xd3, 0x45, 0x54, 0xab, 0xb0, 0x60, 0x99, + 0xf5, 0x7a, 0x24, 0x58, 0x45, 0xc1, 0xef, 0x8f, 0x11, 0x5c, 0x31, 0xeb, 0x75, 0x29, 0x41, 0xcf, + 0x58, 0xd7, 0x8b, 0x42, 0x0e, 0xd6, 0x7a, 0x4f, 0x4e, 0x74, 0xa8, 0x9e, 0x62, 0x47, 0xf9, 0xb8, + 0x46, 0x7d, 0xfe, 0x39, 0x6f, 0x59, 0x97, 0x95, 0xca, 0xd9, 0x8f, 0x47, 0x0f, 0x00, 0xa3, 0x5a, + 0xad, 0x4d, 0xec, 0xe5, 0x7a, 0xa5, 0x45, 0xaa, 0xda, 0xd8, 0xfd, 0xeb, 0xe4, 0xbc, 0xe5, 0xd9, + 0xc8, 0x42, 0xec, 0x5b, 0x69, 0x13, 0xe7, 0x30, 0x90, 0x16, 0x75, 0x87, 0xa2, 0x00, 0x2e, 0x0a, + 0xaa, 0x6c, 0x0f, 0x65, 0x57, 0xdd, 0xa7, 0x37, 0xb2, 0xeb, 0x2b, 0x05, 0xad, 0x16, 0x63, 0x8b, + 0x6e, 0x72, 0xf2, 0x54, 0x4c, 0x84, 0x4f, 0x82, 0x81, 0x70, 0x84, 0x75, 0x16, 0xa8, 0xfd, 0x03, + 0x24, 0x5a, 0x99, 0x29, 0x97, 0xc6, 0xa5, 0x40, 0x4c, 0x8d, 0xcc, 0x82, 0x65, 0x3f, 0x46, 0x2f, + 0xdc, 0x83, 0xbb, 0x43, 0x6d, 0x8b, 0x3c, 0xf8, 0xa7, 0x82, 0x83, 0x97, 0x1c, 0xf3, 0xb0, 0x83, + 0xae, 0xb4, 0x18, 0xa7, 0xf6, 0xd5, 0x2d, 0x66, 0xd0, 0x22, 0xbc, 0xeb, 0x91, 0x2f, 0x0d, 0x4b, + 0x08, 0x8a, 0x85, 0x78, 0xc5, 0x23, 0x5f, 0x4a, 0x15, 0x61, 0x17, 0xde, 0x37, 0x6c, 0x24, 0x06, + 0x0c, 0x1b, 0xd7, 0x77, 0xe2, 0xdc, 0xed, 0x06, 0xdb, 0x4f, 0xe0, 0xde, 0x08, 0x8f, 0xbb, 0xdb, + 0xdc, 0xae, 0x0c, 0x52, 0xe2, 0xf9, 0xda, 0xc0, 0xfe, 0x53, 0x44, 0xb7, 0x5b, 0xc8, 0xa9, 0xd9, + 0x62, 0xb2, 0x64, 0x4e, 0xdf, 0x6b, 0x06, 0x32, 0x30, 0x5c, 0x29, 0x5d, 0x2c, 0x0a, 0x27, 0xb0, + 0x37, 0x4e, 0xdd, 0x84, 0x96, 0x97, 0xff, 0x93, 0x85, 0xd9, 0x2a, 0x73, 0xd4, 0x5f, 0x2b, 0xa0, + 0x0e, 0x98, 0x6c, 0x3e, 0x18, 0x93, 0x7f, 0x03, 0x87, 0x03, 0xed, 0x7b, 0xd3, 0xa0, 0x22, 0x8b, + 0x7f, 0xa5, 0xc0, 0x4a, 0xff, 0x6c, 0xff, 0x70, 0x22, 0x99, 0xbd, 0x20, 0xed, 0xa3, 0x29, 0x40, + 0x91, 0x1d, 0xbf, 0x55, 0xe0, 0xce, 0xe0, 0xc9, 0xe5, 0x3b, 0xe3, 0xc5, 0x0e, 0x04, 0x6a, 0x1f, + 0x4f, 0x09, 0x8c, 0x6c, 0x6a, 0xc3, 0x42, 0xcf, 0x00, 0x53, 0x1c, 0x2f, 0xb0, 0x9b, 0x5f, 0x7b, + 0x74, 0x33, 0xfe, 0xb8, 0xde, 0x68, 0xe4, 0x98, 0x50, 0x6f, 0xc8, 0x3f, 0xa9, 0xde, 0x78, 0xaf, + 0xa6, 0x32, 0xc8, 0x74, 0xf7, 0x69, 0xfb, 0x93, 0x89, 0x91, 0xec, 0xda, 0xb7, 0x6f, 0xc4, 0x1e, + 0x29, 0xfd, 0x19, 0x64, 0x63, 0x3f, 0x8d, 0x1c, 0x8c, 0x17, 0xd4, 0x8b, 0xd0, 0x3e, 0xbc, 0x29, + 0x22, 0xd2, 0xfe, 0x4b, 0x05, 0x96, 0xfb, 0x7e, 0x4a, 0x2b, 0x8f, 0x17, 0x17, 0xc7, 0x68, 0x87, + 0x37, 0xc7, 0x44, 0x46, 0xfc, 0x1c, 0x96, 0xe2, 0x3f, 0x40, 0x7e, 0x6b, 0xbc, 0xb8, 0x18, 0x44, + 0xfb, 0xee, 0x8d, 0x21, 0xdd, 0x7b, 0x10, 0x6b, 0x26, 0x26, 0xd8, 0x83, 0x5e, 0xc4, 0x24, 0x7b, + 0x30, 0xb8, 0xc5, 0xc0, 0x2b, 0xa8, 0xbf, 0xc1, 0x78, 0x38, 0xc9, 0xe9, 0x8d, 0x81, 0x26, 0xb9, + 0x82, 0x86, 0xb6, 0x14, 0xea, 0xef, 0x15, 0x58, 0x1b, 0xd2, 0x4f, 0x7c, 0x38, 0xe9, 0xee, 0xc6, + 0x91, 0xda, 0x0f, 0xa6, 0x45, 0x46, 0x66, 0x7d, 0xa5, 0x40, 0x6e, 0x68, 0x93, 0x70, 0x38, 0xf1, + 0xa6, 0xf7, 0x61, 0xb5, 0xa3, 0xe9, 0xb1, 0x91, 0x71, 0x7f, 0x56, 0x60, 0x6b, 0x74, 0x25, 0xfe, + 0x78, 0xd2, 0x00, 0x0c, 0x11, 0xa0, 0x1d, 0xdf, 0x52, 0x40, 0x68, 0xeb, 0xd1, 0xf1, 0xd7, 0x6f, + 0xf2, 0xca, 0xab, 0x37, 0x79, 0xe5, 0x1f, 0x6f, 0xf2, 0xca, 0x6f, 0xde, 0xe6, 0x67, 0x5e, 0xbd, + 0xcd, 0xcf, 0xfc, 0xed, 0x6d, 0x7e, 0xe6, 0xa7, 0xfb, 0x5d, 0x8d, 0x4c, 0xa0, 0x62, 0x5f, 0xfc, + 0xc7, 0xc0, 0xa3, 0x36, 0x29, 0x75, 0x7a, 0xfe, 0xb1, 0x12, 0xf4, 0x34, 0xb5, 0x24, 0xce, 0x16, + 0x0f, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x3f, 0x68, 0xfd, 0xc9, 0x86, 0x19, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3077,6 +3086,20 @@ func (m *MsgVoteInbound) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.CallOptions != nil { + { + size, err := m.CallOptions.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } { size, err := m.RevertOptions.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -3120,16 +3143,11 @@ func (m *MsgVoteInbound) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x60 } - { - size, err := m.CallOptions.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) + if m.GasLimit != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.GasLimit)) + i-- + dAtA[i] = 0x58 } - i-- - dAtA[i] = 0x5a if m.InboundBlockHeight != 0 { i = encodeVarintTx(dAtA, i, uint64(m.InboundBlockHeight)) i-- @@ -3928,8 +3946,9 @@ func (m *MsgVoteInbound) Size() (n int) { if m.InboundBlockHeight != 0 { n += 1 + sovTx(uint64(m.InboundBlockHeight)) } - l = m.CallOptions.Size() - n += 1 + l + sovTx(uint64(l)) + if m.GasLimit != 0 { + n += 1 + sovTx(uint64(m.GasLimit)) + } if m.CoinType != 0 { n += 1 + sovTx(uint64(m.CoinType)) } @@ -3949,6 +3968,10 @@ func (m *MsgVoteInbound) Size() (n int) { } l = m.RevertOptions.Size() n += 2 + l + sovTx(uint64(l)) + if m.CallOptions != nil { + l = m.CallOptions.Size() + n += 2 + l + sovTx(uint64(l)) + } return n } @@ -6470,10 +6493,10 @@ func (m *MsgVoteInbound) Unmarshal(dAtA []byte) error { } } case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CallOptions", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field GasLimit", wireType) } - var msglen int + m.GasLimit = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -6483,25 +6506,11 @@ func (m *MsgVoteInbound) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.GasLimit |= uint64(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 err := m.CallOptions.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 12: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field CoinType", wireType) @@ -6656,6 +6665,42 @@ func (m *MsgVoteInbound) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CallOptions", 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.CallOptions == nil { + m.CallOptions = &CallOptions{} + } + if err := m.CallOptions.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/zetaclient/testdata/cctx/chain_1337_cctx_14.go b/zetaclient/testdata/cctx/chain_1337_cctx_14.go index 07bbe3c8ce..785c5496e9 100644 --- a/zetaclient/testdata/cctx/chain_1337_cctx_14.go +++ b/zetaclient/testdata/cctx/chain_1337_cctx_14.go @@ -34,7 +34,7 @@ var chain_1337_cctx_14 = &crosschaintypes.CrossChainTx{ ReceiverChainId: 1337, Amount: sdkmath.NewUintFromString("7999999999995486459"), TssNonce: 13, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 250000, }, GasPrice: "18", @@ -51,7 +51,7 @@ var chain_1337_cctx_14 = &crosschaintypes.CrossChainTx{ ReceiverChainId: 1337, Amount: sdkmath.NewUintFromString("5999999999990972918"), TssNonce: 14, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 250000, }, GasPrice: "18", diff --git a/zetaclient/testdata/cctx/chain_1_cctx_6270.go b/zetaclient/testdata/cctx/chain_1_cctx_6270.go index 566e5137e9..fbfd4a8c0c 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_6270.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_6270.go @@ -39,7 +39,7 @@ var chain_1_cctx_6270 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_Gas, Amount: sdkmath.NewUint(9831832641427386), TssNonce: 6270, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 21000, }, GasPrice: "69197693654", diff --git a/zetaclient/testdata/cctx/chain_1_cctx_7260.go b/zetaclient/testdata/cctx/chain_1_cctx_7260.go index 14fa67c796..777645a4b1 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_7260.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_7260.go @@ -39,7 +39,7 @@ var chain_1_cctx_7260 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_Gas, Amount: sdkmath.NewUint(42635427434588308), TssNonce: 7260, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 21000, }, GasPrice: "236882693686", diff --git a/zetaclient/testdata/cctx/chain_1_cctx_8014.go b/zetaclient/testdata/cctx/chain_1_cctx_8014.go index 0829035147..71f8912b81 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_8014.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_8014.go @@ -39,7 +39,7 @@ var chain_1_cctx_8014 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_ERC20, Amount: sdkmath.NewUint(23726342442), TssNonce: 8014, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 100000, }, GasPrice: "58619665744", diff --git a/zetaclient/testdata/cctx/chain_1_cctx_9718.go b/zetaclient/testdata/cctx/chain_1_cctx_9718.go index b4fbbba3e7..eb68fcf58a 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_9718.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_9718.go @@ -39,7 +39,7 @@ var chain_1_cctx_9718 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_Zeta, Amount: sdkmath.NewUint(474493998697236392), TssNonce: 9718, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 90000, }, GasPrice: "112217884384", diff --git a/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go b/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go index 6b2647ed72..8fb1fb9cd9 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go @@ -28,7 +28,7 @@ var chain_1_cctx_inbound_ERC20_0x4ea69a0 = &crosschaintypes.CrossChainTx{ Amount: sdkmath.NewUintFromString("9992000000"), ObservedHash: "0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da", ObservedExternalHeight: 19320188, - BallotIndex: "0xbeab1dbbc21156e2aac914a276f7e40d31c5c27047fafb163c85e3eedf5deb31", + BallotIndex: "0x97101937e3927e124dffcaed1349af2599a8420ff34315288e96eac7f0033048", FinalizedZetaHeight: 1944675, TxFinalizationStatus: crosschaintypes.TxFinalizationStatus_Executed, }, @@ -39,7 +39,7 @@ var chain_1_cctx_inbound_ERC20_0x4ea69a0 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_ERC20, Amount: sdkmath.NewUintFromString("0"), TssNonce: 0, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 1500000, }, GasPrice: "", diff --git a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go index 9272910488..53a736b228 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go @@ -28,7 +28,7 @@ var chain_1_cctx_inbound_Gas_0xeaec67d = &crosschaintypes.CrossChainTx{ Amount: sdkmath.NewUintFromString("4000000000000000"), ObservedHash: "0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532", ObservedExternalHeight: 19330473, - BallotIndex: "0xb68c75e560539bcd78a9a89ae85d12b083625c7c3942ed9675e537e0865b1726", + BallotIndex: "0xdb5daf6a8471bc5a8f17c7e717dc6532719a89f082bd80694aebd654b7069609", FinalizedZetaHeight: 1965579, TxFinalizationStatus: crosschaintypes.TxFinalizationStatus_Executed, }, @@ -39,7 +39,7 @@ var chain_1_cctx_inbound_Gas_0xeaec67d = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_Gas, Amount: sdkmath.NewUint(0), TssNonce: 0, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 90000, }, GasPrice: "", diff --git a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go index 8fc904e506..7a39dcd3a7 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go @@ -28,7 +28,7 @@ var chain_1_cctx_inbound_Zeta_0xf393520 = &crosschaintypes.CrossChainTx{ Amount: sdkmath.NewUintFromString("20000000000000000000"), ObservedHash: "0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76", ObservedExternalHeight: 19273702, - BallotIndex: "0xfb4aa9c7769b059de5055d325c753ec8f6345ac558761570b4a8890f1c7d69a0", + BallotIndex: "0x611f8fea15d26d318c06b04e41bcc16ef212048eddbbf62641c1e3e42b376009", FinalizedZetaHeight: 1851403, TxFinalizationStatus: crosschaintypes.TxFinalizationStatus_Executed, }, @@ -39,7 +39,7 @@ var chain_1_cctx_inbound_Zeta_0xf393520 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_Zeta, Amount: sdkmath.ZeroUint(), TssNonce: 0, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 100000, }, GasPrice: "", diff --git a/zetaclient/testdata/cctx/chain_56_cctx_68270.go b/zetaclient/testdata/cctx/chain_56_cctx_68270.go index a3d166114d..3693774c9b 100644 --- a/zetaclient/testdata/cctx/chain_56_cctx_68270.go +++ b/zetaclient/testdata/cctx/chain_56_cctx_68270.go @@ -39,7 +39,7 @@ var chain_56_cctx_68270 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_Gas, Amount: sdkmath.NewUint(657177295293237048), TssNonce: 68270, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 21000, }, GasPrice: "6000000000", diff --git a/zetaclient/testdata/cctx/chain_8332_cctx_148.go b/zetaclient/testdata/cctx/chain_8332_cctx_148.go index 1527b77838..7b084b9a28 100644 --- a/zetaclient/testdata/cctx/chain_8332_cctx_148.go +++ b/zetaclient/testdata/cctx/chain_8332_cctx_148.go @@ -39,7 +39,7 @@ var chain_8332_cctx_148 = &crosschaintypes.CrossChainTx{ CoinType: coin.CoinType_Gas, Amount: sdkmath.NewUint(12000), TssNonce: 148, - CallOptions: crosschaintypes.CallOptions{ + CallOptions: &crosschaintypes.CallOptions{ GasLimit: 254, }, GasPrice: "46", diff --git a/zetaclient/zetacore/tx_test.go b/zetaclient/zetacore/tx_test.go index e5162eece1..b58981f67b 100644 --- a/zetaclient/zetacore/tx_test.go +++ b/zetaclient/zetacore/tx_test.go @@ -426,7 +426,7 @@ func TestZetacore_PostVoteInbound(t *testing.T) { expectedOutput := observertypes.QueryHasVotedResponse{HasVoted: false} input := observertypes.QueryHasVotedRequest{ - BallotIdentifier: "0x79967c1c93c668323c5f817ef54298c93b073b08a4b7681583fd45b8b1b31775", + BallotIdentifier: "0xd204175fc8500bcea563049cce918fa55134bd2d415d3fe137144f55e572b5ff", VoterAddress: address.String(), } method := "/zetachain.zetacore.observer.Query/HasVoted"