diff --git a/docs/api/proto-docs.md b/docs/api/proto-docs.md index 4a908bef5c..becdef3444 100644 --- a/docs/api/proto-docs.md +++ b/docs/api/proto-docs.md @@ -563,7 +563,7 @@ EthCallRequest defines EthCall request | `args` | [bytes](#bytes) | | same json format as the json rpc api. | | `gas_cap` | [uint64](#uint64) | | the default gas cap to be used | | `proposer_address` | [bytes](#bytes) | | the proposer of the requested block | -| `chain_id` | [string](#string) | | the full chain id in the requested block header | +| `chain_id` | [string](#string) | | the eip155 chain id parsed from the requested block header | @@ -794,7 +794,7 @@ QueryTraceBlockRequest defines TraceTx request | `block_hash` | [string](#string) | | block hex hash | | `block_time` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) | | block time | | `proposer_address` | [bytes](#bytes) | | the proposer of the requested block | -| `chain_id` | [string](#string) | | the full chain id in the requested block header | +| `chain_id` | [string](#string) | | the eip155 chain id parsed from the requested block header | @@ -831,7 +831,7 @@ QueryTraceTxRequest defines TraceTx request | `block_hash` | [string](#string) | | block hex hash of requested transaction | | `block_time` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) | | block time of requested transaction | | `proposer_address` | [bytes](#bytes) | | the proposer of the requested block | -| `chain_id` | [string](#string) | | the full chain id in the requested block header | +| `chain_id` | [string](#string) | | the eip155 chain id parsed from the requested block header | diff --git a/proto/ethermint/evm/v1/query.proto b/proto/ethermint/evm/v1/query.proto index 02bf825201..21f3126807 100644 --- a/proto/ethermint/evm/v1/query.proto +++ b/proto/ethermint/evm/v1/query.proto @@ -223,8 +223,8 @@ message EthCallRequest { uint64 gas_cap = 2; // the proposer of the requested block bytes proposer_address = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"]; - // the full chain id in the requested block header - string chain_id = 4; + // the eip155 chain id parsed from the requested block header + string chain_id = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; } // EstimateGasResponse defines EstimateGas response @@ -253,8 +253,8 @@ message QueryTraceTxRequest { google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // the proposer of the requested block bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"]; - // the full chain id in the requested block header - string chain_id = 9; + // the eip155 chain id parsed from the requested block header + string chain_id = 9 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; } // QueryTraceTxResponse defines TraceTx response @@ -277,8 +277,8 @@ message QueryTraceBlockRequest { google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // the proposer of the requested block bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"]; - // the full chain id in the requested block header - string chain_id = 9; + // the eip155 chain id parsed from the requested block header + string chain_id = 9 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"]; } // QueryTraceBlockResponse defines TraceBlock response diff --git a/rpc/backend/call_tx.go b/rpc/backend/call_tx.go index 3669ccbe3c..a78426148c 100644 --- a/rpc/backend/call_tx.go +++ b/rpc/backend/call_tx.go @@ -7,6 +7,8 @@ import ( "fmt" "math/big" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -305,11 +307,17 @@ func (b *Backend) EstimateGas(args evmtypes.TransactionArgs, blockNrOptional *rp return 0, errors.New("header not found") } + tmp, err := ethermint.ParseChainID(header.Block.ChainID) + if err != nil { + return 0, sdkerrors.Wrapf(err, "failed to parse chainID: %s", header.Block.ChainID) + } + chainID := sdkmath.NewIntFromBigInt(tmp) + req := evmtypes.EthCallRequest{ Args: bz, GasCap: b.RPCGasCap(), ProposerAddress: sdk.ConsAddress(header.Block.ProposerAddress), - ChainId: header.Block.ChainID, + ChainId: &chainID, } // From ContextWithHeight: if the provided height is 0, @@ -336,11 +344,18 @@ func (b *Backend) DoCall( // the error message imitates geth behavior return nil, errors.New("header not found") } + + tmp, err := ethermint.ParseChainID(header.Block.ChainID) + if err != nil { + return nil, sdkerrors.Wrapf(err, "failed to parse chainID: %s", header.Block.ChainID) + } + chainID := sdkmath.NewIntFromBigInt(tmp) + req := evmtypes.EthCallRequest{ Args: bz, GasCap: b.RPCGasCap(), ProposerAddress: sdk.ConsAddress(header.Block.ProposerAddress), - ChainId: header.Block.ChainID, + ChainId: &chainID, } // From ContextWithHeight: if the provided height is 0, diff --git a/rpc/backend/tracing.go b/rpc/backend/tracing.go index 0dde6de3ff..e616c6f092 100644 --- a/rpc/backend/tracing.go +++ b/rpc/backend/tracing.go @@ -4,9 +4,13 @@ import ( "encoding/json" "fmt" + sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" rpctypes "github.com/evmos/ethermint/rpc/types" + ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" "github.com/pkg/errors" tmrpctypes "github.com/tendermint/tendermint/rpc/core/types" @@ -77,6 +81,12 @@ func (b *Backend) TraceTransaction(hash common.Hash, config *evmtypes.TraceConfi return nil, fmt.Errorf("invalid transaction type %T", tx) } + tmp, err := ethermint.ParseChainID(blk.Block.ChainID) + if err != nil { + return nil, sdkerrors.Wrapf(err, "failed to parse chainID: %s", blk.Block.ChainID) + } + chainID := sdkmath.NewIntFromBigInt(tmp) + traceTxRequest := evmtypes.QueryTraceTxRequest{ Msg: ethMessage, Predecessors: predecessors, @@ -84,7 +94,7 @@ func (b *Backend) TraceTransaction(hash common.Hash, config *evmtypes.TraceConfi BlockTime: blk.Block.Time, BlockHash: common.Bytes2Hex(blk.BlockID.Hash), ProposerAddress: sdk.ConsAddress(blk.Block.ProposerAddress), - ChainId: blk.Block.ChainID, + ChainId: &chainID, } if config != nil { @@ -156,6 +166,12 @@ func (b *Backend) TraceBlock(height rpctypes.BlockNumber, } ctxWithHeight := rpctypes.ContextWithHeight(int64(contextHeight)) + tmp, err := ethermint.ParseChainID(block.Block.ChainID) + if err != nil { + return nil, sdkerrors.Wrapf(err, "failed to parse chainID: %s", block.Block.ChainID) + } + chainID := sdkmath.NewIntFromBigInt(tmp) + traceBlockRequest := &evmtypes.QueryTraceBlockRequest{ Txs: txsMessages, TraceConfig: config, @@ -163,7 +179,7 @@ func (b *Backend) TraceBlock(height rpctypes.BlockNumber, BlockTime: block.Block.Time, BlockHash: common.Bytes2Hex(block.BlockID.Hash), ProposerAddress: sdk.ConsAddress(block.Block.ProposerAddress), - ChainId: block.Block.ChainID, + ChainId: &chainID, } res, err := b.queryClient.TraceBlock(ctxWithHeight, traceBlockRequest) diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go index 8846958a05..bd8af94638 100644 --- a/x/evm/keeper/grpc_query.go +++ b/x/evm/keeper/grpc_query.go @@ -217,18 +217,17 @@ func (k Keeper) EthCall(c context.Context, req *types.EthCallRequest) (*types.Ms } ctx := sdk.UnwrapSDKContext(c) - if len(req.ChainId) > 0 { - ctx = ctx.WithChainID(req.ChainId) - k.WithChainID(ctx) - } var args types.TransactionArgs err := json.Unmarshal(req.Args, &args) if err != nil { return nil, status.Error(codes.InvalidArgument, err.Error()) } - - cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress)) + chainID, err := getChainID(ctx, req.ChainId.BigInt()) + if err != nil { + return nil, status.Error(codes.InvalidArgument, err.Error()) + } + cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress), chainID) if err != nil { return nil, status.Error(codes.Internal, err.Error()) } @@ -260,9 +259,9 @@ func (k Keeper) EstimateGas(c context.Context, req *types.EthCallRequest) (*type } ctx := sdk.UnwrapSDKContext(c) - if len(req.ChainId) > 0 { - ctx = ctx.WithChainID(req.ChainId) - k.WithChainID(ctx) + chainID, err := getChainID(ctx, req.ChainId.BigInt()) + if err != nil { + return nil, status.Error(codes.InvalidArgument, err.Error()) } if req.GasCap < ethparams.TxGas { @@ -270,7 +269,7 @@ func (k Keeper) EstimateGas(c context.Context, req *types.EthCallRequest) (*type } var args types.TransactionArgs - err := json.Unmarshal(req.Args, &args) + err = json.Unmarshal(req.Args, &args) if err != nil { return nil, status.Error(codes.InvalidArgument, err.Error()) } @@ -302,7 +301,7 @@ func (k Keeper) EstimateGas(c context.Context, req *types.EthCallRequest) (*type hi = req.GasCap } cap = hi - cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress)) + cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress), chainID) if err != nil { return nil, status.Error(codes.Internal, "failed to load evm config") } @@ -382,12 +381,11 @@ func (k Keeper) TraceTx(c context.Context, req *types.QueryTraceTxRequest) (*typ ctx = ctx.WithBlockHeight(contextHeight) ctx = ctx.WithBlockTime(req.BlockTime) ctx = ctx.WithHeaderHash(common.Hex2Bytes(req.BlockHash)) - if len(req.ChainId) > 0 { - ctx = ctx.WithChainID(req.ChainId) - k.WithChainID(ctx) + chainID, err := getChainID(ctx, req.ChainId.BigInt()) + if err != nil { + return nil, status.Error(codes.InvalidArgument, err.Error()) } - - cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress)) + cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress), chainID) if err != nil { return nil, status.Errorf(codes.Internal, "failed to load evm config: %s", err.Error()) } @@ -454,12 +452,12 @@ func (k Keeper) TraceBlock(c context.Context, req *types.QueryTraceBlockRequest) ctx = ctx.WithBlockHeight(contextHeight) ctx = ctx.WithBlockTime(req.BlockTime) ctx = ctx.WithHeaderHash(common.Hex2Bytes(req.BlockHash)) - if len(req.ChainId) > 0 { - ctx = ctx.WithChainID(req.ChainId) - k.WithChainID(ctx) + chainID, err := getChainID(ctx, req.ChainId.BigInt()) + if err != nil { + return nil, status.Error(codes.InvalidArgument, err.Error()) } - cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress)) + cfg, err := k.EVMConfig(ctx, GetProposerAddress(ctx, req.ProposerAddress), chainID) if err != nil { return nil, status.Error(codes.Internal, "failed to load evm config") } @@ -584,7 +582,8 @@ func (k Keeper) BaseFee(c context.Context, _ *types.QueryBaseFeeRequest) (*types ctx := sdk.UnwrapSDKContext(c) params := k.GetParams(ctx) - ethCfg := params.ChainConfig.EthereumConfig(k.eip155ChainID) + // the chainID parameter is not used in this case, just set to nil + ethCfg := params.ChainConfig.EthereumConfig(nil) baseFee := k.GetBaseFee(ctx, ethCfg) res := &types.QueryBaseFeeResponse{} @@ -595,3 +594,11 @@ func (k Keeper) BaseFee(c context.Context, _ *types.QueryBaseFeeRequest) (*types return res, nil } + +// getChainID parse chainID from current context if not provided +func getChainID(ctx sdk.Context, chainID *big.Int) (*big.Int, error) { + if chainID == nil { + return ethermint.ParseChainID(ctx.ChainID()) + } + return chainID, nil +} diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index c3b225774f..dd2ec44d07 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -39,9 +39,9 @@ func GasToRefund(availableRefund, gasConsumed, refundQuotient uint64) uint64 { } // EVMConfig creates the EVMConfig based on current state -func (k *Keeper) EVMConfig(ctx sdk.Context, proposerAddress sdk.ConsAddress) (*types.EVMConfig, error) { +func (k *Keeper) EVMConfig(ctx sdk.Context, proposerAddress sdk.ConsAddress, chainID *big.Int) (*types.EVMConfig, error) { params := k.GetParams(ctx) - ethCfg := params.ChainConfig.EthereumConfig(k.eip155ChainID) + ethCfg := params.ChainConfig.EthereumConfig(chainID) // get the coinbase address from the block proposer coinbase, err := k.GetCoinbaseAddress(ctx, proposerAddress) @@ -199,7 +199,11 @@ func (k *Keeper) ApplyTransaction(ctx sdk.Context, tx *ethtypes.Transaction) (*t bloomReceipt ethtypes.Bloom ) - cfg, err := k.EVMConfig(ctx, sdk.ConsAddress(ctx.BlockHeader().ProposerAddress)) + chainID, err := ethermint.ParseChainID(ctx.ChainID()) + if err != nil { + return nil, sdkerrors.Wrapf(err, "invalid chain-id %s", ctx.ChainID()) + } + cfg, err := k.EVMConfig(ctx, sdk.ConsAddress(ctx.BlockHeader().ProposerAddress), chainID) if err != nil { return nil, sdkerrors.Wrap(err, "failed to load evm config") } @@ -464,7 +468,12 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context, // ApplyMessage calls ApplyMessageWithConfig with default EVMConfig func (k *Keeper) ApplyMessage(ctx sdk.Context, msg core.Message, tracer vm.EVMLogger, commit bool) (*types.MsgEthereumTxResponse, error) { - cfg, err := k.EVMConfig(ctx, sdk.ConsAddress(ctx.BlockHeader().ProposerAddress)) + chainID, err := ethermint.ParseChainID(ctx.ChainID()) + if err != nil { + return nil, sdkerrors.Wrapf(err, "invalid chain-id %s", ctx.ChainID()) + } + + cfg, err := k.EVMConfig(ctx, sdk.ConsAddress(ctx.BlockHeader().ProposerAddress), chainID) if err != nil { return nil, sdkerrors.Wrap(err, "failed to load evm config") } diff --git a/x/evm/simulation/operations.go b/x/evm/simulation/operations.go index cf8b343b1f..cd5800adc4 100644 --- a/x/evm/simulation/operations.go +++ b/x/evm/simulation/operations.go @@ -244,10 +244,8 @@ func EstimateGas(ctx *simulateContext, from, to *common.Address, data *hexutil.B } res, err := ctx.keeper.EstimateGas(sdk.WrapSDKContext(ctx.context), &types.EthCallRequest{ - Args: args, - GasCap: gasCap, - ProposerAddress: ctx.context.BlockHeader().ProposerAddress, - ChainId: ctx.context.ChainID(), + Args: args, + GasCap: gasCap, }) if err != nil { return 0, err diff --git a/x/evm/types/query.pb.go b/x/evm/types/query.pb.go index 608aac1444..6f1ccc389c 100644 --- a/x/evm/types/query.pb.go +++ b/x/evm/types/query.pb.go @@ -794,8 +794,8 @@ type EthCallRequest struct { GasCap uint64 `protobuf:"varint,2,opt,name=gas_cap,json=gasCap,proto3" json:"gas_cap,omitempty"` // the proposer of the requested block ProposerAddress github_com_cosmos_cosmos_sdk_types.ConsAddress `protobuf:"bytes,3,opt,name=proposer_address,json=proposerAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ConsAddress" json:"proposer_address,omitempty"` - // the full chain id in the requested block header - ChainId string `protobuf:"bytes,4,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + // the eip155 chain id parsed from the requested block header + ChainId *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=chain_id,json=chainId,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"chain_id,omitempty"` } func (m *EthCallRequest) Reset() { *m = EthCallRequest{} } @@ -852,13 +852,6 @@ func (m *EthCallRequest) GetProposerAddress() github_com_cosmos_cosmos_sdk_types return nil } -func (m *EthCallRequest) GetChainId() string { - if m != nil { - return m.ChainId - } - return "" -} - // EstimateGasResponse defines EstimateGas response type EstimateGasResponse struct { // the estimated gas @@ -922,8 +915,8 @@ type QueryTraceTxRequest struct { BlockTime time.Time `protobuf:"bytes,7,opt,name=block_time,json=blockTime,proto3,stdtime" json:"block_time"` // the proposer of the requested block ProposerAddress github_com_cosmos_cosmos_sdk_types.ConsAddress `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ConsAddress" json:"proposer_address,omitempty"` - // the full chain id in the requested block header - ChainId string `protobuf:"bytes,9,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + // the eip155 chain id parsed from the requested block header + ChainId *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=chain_id,json=chainId,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"chain_id,omitempty"` } func (m *QueryTraceTxRequest) Reset() { *m = QueryTraceTxRequest{} } @@ -1008,13 +1001,6 @@ func (m *QueryTraceTxRequest) GetProposerAddress() github_com_cosmos_cosmos_sdk_ return nil } -func (m *QueryTraceTxRequest) GetChainId() string { - if m != nil { - return m.ChainId - } - return "" -} - // QueryTraceTxResponse defines TraceTx response type QueryTraceTxResponse struct { // response serialized in bytes @@ -1075,8 +1061,8 @@ type QueryTraceBlockRequest struct { BlockTime time.Time `protobuf:"bytes,7,opt,name=block_time,json=blockTime,proto3,stdtime" json:"block_time"` // the proposer of the requested block ProposerAddress github_com_cosmos_cosmos_sdk_types.ConsAddress `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ConsAddress" json:"proposer_address,omitempty"` - // the full chain id in the requested block header - ChainId string `protobuf:"bytes,9,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + // the eip155 chain id parsed from the requested block header + ChainId *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=chain_id,json=chainId,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"chain_id,omitempty"` } func (m *QueryTraceBlockRequest) Reset() { *m = QueryTraceBlockRequest{} } @@ -1154,13 +1140,6 @@ func (m *QueryTraceBlockRequest) GetProposerAddress() github_com_cosmos_cosmos_s return nil } -func (m *QueryTraceBlockRequest) GetChainId() string { - if m != nil { - return m.ChainId - } - return "" -} - // QueryTraceBlockResponse defines TraceBlock response type QueryTraceBlockResponse struct { Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` @@ -1312,97 +1291,97 @@ func init() { func init() { proto.RegisterFile("ethermint/evm/v1/query.proto", fileDescriptor_e15a877459347994) } var fileDescriptor_e15a877459347994 = []byte{ - // 1432 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x56, 0xcd, 0x6f, 0x13, 0x47, - 0x14, 0xcf, 0xc6, 0x4e, 0xec, 0x3c, 0x07, 0x70, 0x87, 0x50, 0xcc, 0x36, 0xb1, 0xc3, 0x42, 0x3e, - 0x09, 0xbb, 0x8d, 0x5b, 0x21, 0x95, 0x4b, 0xc1, 0x56, 0xa0, 0x14, 0xa8, 0xa8, 0x1b, 0xf5, 0x50, - 0x09, 0x59, 0xe3, 0xf5, 0xb0, 0xb6, 0x62, 0xef, 0x9a, 0x9d, 0xb1, 0xeb, 0x40, 0xe9, 0xa1, 0x52, - 0x11, 0x15, 0x52, 0x85, 0xd4, 0x7b, 0xc5, 0x7f, 0xd0, 0x63, 0xff, 0x05, 0x8e, 0x48, 0xbd, 0x54, - 0x3d, 0x50, 0x44, 0x7a, 0xe8, 0xad, 0xf7, 0x9e, 0xaa, 0xf9, 0x58, 0x7f, 0xad, 0x3f, 0x42, 0x45, - 0x4f, 0x3d, 0xed, 0xce, 0xcc, 0x9b, 0xf7, 0x7e, 0xef, 0x63, 0xde, 0xfb, 0xc1, 0x22, 0x61, 0x15, - 0xe2, 0xd7, 0xab, 0x2e, 0xb3, 0x48, 0xab, 0x6e, 0xb5, 0xb6, 0xad, 0xbb, 0x4d, 0xe2, 0xef, 0x9b, - 0x0d, 0xdf, 0x63, 0x1e, 0x4a, 0x76, 0x4e, 0x4d, 0xd2, 0xaa, 0x9b, 0xad, 0x6d, 0x7d, 0xc1, 0xf1, - 0x1c, 0x4f, 0x1c, 0x5a, 0xfc, 0x4f, 0xca, 0xe9, 0x9b, 0xb6, 0x47, 0xeb, 0x1e, 0xb5, 0x4a, 0x98, - 0x12, 0xa9, 0xc0, 0x6a, 0x6d, 0x97, 0x08, 0xc3, 0xdb, 0x56, 0x03, 0x3b, 0x55, 0x17, 0xb3, 0xaa, - 0xe7, 0x2a, 0xd9, 0x45, 0xc7, 0xf3, 0x9c, 0x1a, 0xb1, 0x70, 0xa3, 0x6a, 0x61, 0xd7, 0xf5, 0x98, - 0x38, 0xa4, 0xea, 0x54, 0x0f, 0xe1, 0xe1, 0x86, 0xe5, 0xd9, 0xa9, 0xd0, 0x19, 0x6b, 0xab, 0xa3, - 0x8c, 0x52, 0x2a, 0x56, 0xa5, 0xe6, 0x1d, 0x8b, 0x55, 0xeb, 0x84, 0x32, 0x5c, 0x6f, 0x48, 0x01, - 0xe3, 0x03, 0x38, 0xfe, 0x29, 0xc7, 0x75, 0xd9, 0xb6, 0xbd, 0xa6, 0xcb, 0x0a, 0xe4, 0x6e, 0x93, - 0x50, 0x86, 0x52, 0x10, 0xc3, 0xe5, 0xb2, 0x4f, 0x28, 0x4d, 0x69, 0xcb, 0xda, 0xfa, 0x5c, 0x21, - 0x58, 0x5e, 0x8c, 0x3f, 0x7a, 0x9a, 0x99, 0xfa, 0xf3, 0x69, 0x66, 0xca, 0xb0, 0x61, 0xa1, 0xff, - 0x2a, 0x6d, 0x78, 0x2e, 0x25, 0xfc, 0x6e, 0x09, 0xd7, 0xb0, 0x6b, 0x93, 0xe0, 0xae, 0x5a, 0xa2, - 0x77, 0x60, 0xce, 0xf6, 0xca, 0xa4, 0x58, 0xc1, 0xb4, 0x92, 0x9a, 0x16, 0x67, 0x71, 0xbe, 0xf1, - 0x11, 0xa6, 0x15, 0xb4, 0x00, 0x33, 0xae, 0xc7, 0x2f, 0x45, 0x96, 0xb5, 0xf5, 0x68, 0x41, 0x2e, - 0x8c, 0x0f, 0xe1, 0x94, 0x30, 0x92, 0x17, 0x81, 0xfc, 0x17, 0x28, 0x1f, 0x6a, 0xa0, 0x0f, 0xd3, - 0xa0, 0xc0, 0xae, 0xc0, 0x51, 0x99, 0xa3, 0x62, 0xbf, 0xa6, 0x23, 0x72, 0xf7, 0xb2, 0xdc, 0x44, - 0x3a, 0xc4, 0x29, 0x37, 0xca, 0xf1, 0x4d, 0x0b, 0x7c, 0x9d, 0x35, 0x57, 0x81, 0xa5, 0xd6, 0xa2, - 0xdb, 0xac, 0x97, 0x88, 0xaf, 0x3c, 0x38, 0xa2, 0x76, 0x3f, 0x11, 0x9b, 0xc6, 0x75, 0x58, 0x14, - 0x38, 0x3e, 0xc7, 0xb5, 0x6a, 0x19, 0x33, 0xcf, 0x1f, 0x70, 0xe6, 0x34, 0xcc, 0xdb, 0x9e, 0x3b, - 0x88, 0x23, 0xc1, 0xf7, 0x2e, 0x87, 0xbc, 0x7a, 0xac, 0xc1, 0xd2, 0x08, 0x6d, 0xca, 0xb1, 0x35, - 0x38, 0x16, 0xa0, 0xea, 0xd7, 0x18, 0x80, 0x7d, 0x83, 0xae, 0x05, 0x45, 0x94, 0x93, 0x79, 0x7e, - 0x9d, 0xf4, 0xbc, 0xab, 0x8a, 0xa8, 0x73, 0x75, 0x52, 0x11, 0x19, 0xd7, 0x95, 0xb1, 0xcf, 0x98, - 0xe7, 0x63, 0x67, 0xb2, 0x31, 0x94, 0x84, 0xc8, 0x1e, 0xd9, 0x57, 0xf5, 0xc6, 0x7f, 0x7b, 0xcc, - 0x6f, 0x29, 0xf3, 0x1d, 0x65, 0xca, 0xfc, 0x02, 0xcc, 0xb4, 0x70, 0xad, 0x19, 0x18, 0x97, 0x0b, - 0xe3, 0x02, 0x24, 0x55, 0x29, 0x95, 0x5f, 0xcb, 0xc9, 0x35, 0x78, 0xab, 0xe7, 0x9e, 0x32, 0x81, - 0x20, 0xca, 0x6b, 0x5f, 0xdc, 0x9a, 0x2f, 0x88, 0x7f, 0xe3, 0x1e, 0x20, 0x21, 0xb8, 0xdb, 0xbe, - 0xe1, 0x39, 0x34, 0x30, 0x81, 0x20, 0x2a, 0x5e, 0x8c, 0xd4, 0x2f, 0xfe, 0xd1, 0x15, 0x80, 0x6e, - 0x07, 0x11, 0xbe, 0x25, 0xb2, 0xab, 0xa6, 0x2c, 0x5a, 0x93, 0xb7, 0x1b, 0x53, 0xf6, 0x2b, 0xd5, - 0x6e, 0xcc, 0x5b, 0xdd, 0x50, 0x15, 0x7a, 0x6e, 0xf6, 0x80, 0xfc, 0x4e, 0x53, 0x81, 0x0d, 0x8c, - 0x2b, 0x9c, 0x1b, 0x10, 0xad, 0x79, 0x0e, 0xf7, 0x2e, 0xb2, 0x9e, 0xc8, 0x9e, 0x30, 0x07, 0x5b, - 0x9f, 0x79, 0xc3, 0x73, 0x0a, 0x42, 0x04, 0x5d, 0x1d, 0x02, 0x6a, 0x6d, 0x22, 0x28, 0x69, 0xa7, - 0x17, 0x95, 0xb1, 0xa0, 0xe2, 0x70, 0x0b, 0xfb, 0xb8, 0x1e, 0xc4, 0xc1, 0xb8, 0xa9, 0x00, 0x06, - 0xbb, 0x0a, 0xe0, 0x05, 0x98, 0x6d, 0x88, 0x1d, 0x11, 0xa0, 0x44, 0x36, 0x15, 0x86, 0x28, 0x6f, - 0xe4, 0xa2, 0xcf, 0x5e, 0x64, 0xa6, 0x0a, 0x4a, 0xda, 0xf8, 0x59, 0x83, 0xa3, 0x3b, 0xac, 0x92, - 0xc7, 0xb5, 0x5a, 0x4f, 0xa4, 0xb1, 0xef, 0xd0, 0x20, 0x27, 0xfc, 0x1f, 0x9d, 0x84, 0x98, 0x83, - 0x69, 0xd1, 0xc6, 0x0d, 0xf5, 0x3c, 0x66, 0x1d, 0x4c, 0xf3, 0xb8, 0x81, 0x6e, 0x43, 0xb2, 0xe1, - 0x7b, 0x0d, 0x8f, 0x12, 0xbf, 0xf3, 0xc4, 0xf8, 0xf3, 0x98, 0xcf, 0x65, 0xff, 0x7e, 0x91, 0x31, - 0x9d, 0x2a, 0xab, 0x34, 0x4b, 0xa6, 0xed, 0xd5, 0x2d, 0x35, 0x05, 0xe4, 0xe7, 0x3c, 0x2d, 0xef, - 0x59, 0x6c, 0xbf, 0x41, 0xa8, 0x99, 0xef, 0xbe, 0xed, 0xc2, 0xb1, 0x40, 0x57, 0xf0, 0x2e, 0x4f, - 0x41, 0xdc, 0xae, 0xe0, 0xaa, 0x5b, 0xac, 0x96, 0x53, 0x51, 0x59, 0x59, 0x62, 0x7d, 0xad, 0x6c, - 0xac, 0xc1, 0xf1, 0x1d, 0xca, 0xaa, 0x75, 0xcc, 0xc8, 0x55, 0xdc, 0x0d, 0x44, 0x12, 0x22, 0x0e, - 0x96, 0xe0, 0xa3, 0x05, 0xfe, 0x6b, 0xbc, 0x8c, 0x04, 0x39, 0xf5, 0xb1, 0x4d, 0x76, 0xdb, 0x81, - 0x9f, 0xdb, 0x10, 0xa9, 0x53, 0x47, 0xc5, 0x2b, 0x13, 0x8e, 0xd7, 0x4d, 0xea, 0xec, 0xf0, 0x3d, - 0xd2, 0xac, 0xef, 0xb6, 0x0b, 0x5c, 0x16, 0x5d, 0x82, 0x79, 0xc6, 0x95, 0x14, 0x6d, 0xcf, 0xbd, - 0x53, 0x75, 0x84, 0xa7, 0x89, 0xec, 0x52, 0xf8, 0xae, 0x30, 0x95, 0x17, 0x42, 0x85, 0x04, 0xeb, - 0x2e, 0x50, 0x1e, 0xe6, 0x1b, 0x3e, 0x29, 0x13, 0x9b, 0x50, 0xea, 0xf9, 0x34, 0x15, 0x15, 0x05, - 0x35, 0xd1, 0x7a, 0xdf, 0x25, 0xde, 0x25, 0x4b, 0x35, 0xcf, 0xde, 0x0b, 0xfa, 0xd1, 0xcc, 0xb2, - 0xb6, 0x1e, 0x29, 0x24, 0xc4, 0x9e, 0xec, 0x46, 0x68, 0x09, 0x40, 0x8a, 0x88, 0x47, 0x33, 0x2b, - 0x42, 0x37, 0x27, 0x76, 0xc4, 0x9c, 0xc9, 0x07, 0xc7, 0x7c, 0x14, 0xa6, 0x62, 0xc2, 0x0d, 0xdd, - 0x94, 0x73, 0xd2, 0x0c, 0xe6, 0xa4, 0xb9, 0x1b, 0xcc, 0xc9, 0x5c, 0x9c, 0x17, 0xcd, 0x93, 0xdf, - 0x33, 0x9a, 0x52, 0xc2, 0x4f, 0x86, 0xe6, 0x3e, 0xfe, 0xdf, 0xe4, 0x7e, 0xae, 0x2f, 0xf7, 0x1f, - 0x47, 0xe3, 0xd3, 0xc9, 0x48, 0x21, 0xce, 0xda, 0xc5, 0xaa, 0x5b, 0x26, 0x6d, 0x63, 0x53, 0x75, - 0xb0, 0x4e, 0x86, 0xbb, 0xed, 0xa5, 0x8c, 0x19, 0x0e, 0x4a, 0x99, 0xff, 0x1b, 0xdf, 0x47, 0xe0, - 0xed, 0xae, 0x70, 0x8e, 0x7b, 0xd3, 0x53, 0x11, 0xac, 0x1d, 0x3c, 0xf2, 0xc9, 0x15, 0xc1, 0xda, - 0xf4, 0x0d, 0x54, 0xc4, 0xff, 0x3d, 0x99, 0xc6, 0x79, 0x38, 0x19, 0xca, 0xc7, 0x98, 0xfc, 0x9d, - 0xe8, 0xcc, 0x59, 0x4a, 0xae, 0x90, 0xa0, 0x9f, 0x1b, 0xb7, 0x3b, 0x33, 0x54, 0x6d, 0x2b, 0x15, - 0x3b, 0x10, 0xe7, 0x4d, 0xb7, 0x78, 0x87, 0xa8, 0x39, 0x96, 0xdb, 0xfc, 0xed, 0x45, 0x66, 0xf5, - 0x10, 0xfe, 0x5c, 0x73, 0x19, 0x1f, 0xb8, 0x42, 0x5d, 0xf6, 0xaf, 0x79, 0x98, 0x11, 0xfa, 0xd1, - 0xb7, 0x1a, 0xc4, 0x14, 0xcf, 0x40, 0x2b, 0xe1, 0x3c, 0x0f, 0x21, 0x92, 0xfa, 0xea, 0x24, 0x31, - 0x89, 0xd5, 0x38, 0xf7, 0xcd, 0x2f, 0x7f, 0xfc, 0x30, 0xbd, 0x82, 0xce, 0x58, 0x21, 0x32, 0xab, - 0xb8, 0x86, 0x75, 0x5f, 0xe5, 0xe6, 0x01, 0xfa, 0x51, 0x83, 0x23, 0x7d, 0x74, 0x0e, 0x9d, 0x1b, - 0x61, 0x66, 0x18, 0x6d, 0xd4, 0xb7, 0x0e, 0x27, 0xac, 0x90, 0x65, 0x05, 0xb2, 0x2d, 0xb4, 0x19, - 0x46, 0x16, 0x30, 0xc7, 0x10, 0xc0, 0x9f, 0x34, 0x48, 0x0e, 0x32, 0x33, 0x64, 0x8e, 0x30, 0x3b, - 0x82, 0x10, 0xea, 0xd6, 0xa1, 0xe5, 0x15, 0xd2, 0x8b, 0x02, 0xe9, 0xfb, 0x28, 0x1b, 0x46, 0xda, - 0x0a, 0xee, 0x74, 0xc1, 0xf6, 0x92, 0xcd, 0x07, 0xe8, 0xa1, 0x06, 0x31, 0xc5, 0xc1, 0x46, 0xa6, - 0xb6, 0x9f, 0xde, 0x8d, 0x4c, 0xed, 0x00, 0x95, 0x33, 0xb6, 0x04, 0xac, 0x55, 0x74, 0x36, 0x0c, - 0x4b, 0x71, 0x3a, 0xda, 0x13, 0xba, 0xc7, 0x1a, 0xc4, 0x14, 0x1b, 0x1b, 0x09, 0xa4, 0x9f, 0xfa, - 0x8d, 0x04, 0x32, 0x40, 0xea, 0x8c, 0x6d, 0x01, 0xe4, 0x1c, 0xda, 0x08, 0x03, 0xa1, 0x52, 0xb4, - 0x8b, 0xc3, 0xba, 0xbf, 0x47, 0xf6, 0x1f, 0xa0, 0x7b, 0x10, 0xe5, 0xa4, 0x0d, 0x19, 0x23, 0x4b, - 0xa6, 0xc3, 0x04, 0xf5, 0x33, 0x63, 0x65, 0x14, 0x86, 0x0d, 0x81, 0xe1, 0x0c, 0x3a, 0x3d, 0xac, - 0x9a, 0xca, 0x7d, 0x91, 0xf8, 0x12, 0x66, 0x25, 0x6f, 0x41, 0x67, 0x47, 0x68, 0xee, 0xa3, 0x47, - 0xfa, 0xca, 0x04, 0x29, 0x85, 0x60, 0x59, 0x20, 0xd0, 0x51, 0x2a, 0x8c, 0x40, 0x12, 0x23, 0xd4, - 0x86, 0x98, 0xe2, 0x45, 0x68, 0x39, 0xac, 0xb3, 0x9f, 0x32, 0xe9, 0x6b, 0x93, 0x66, 0x45, 0x60, - 0xd7, 0x10, 0x76, 0x17, 0x91, 0x1e, 0xb6, 0x4b, 0x58, 0xa5, 0x68, 0x73, 0x73, 0x5f, 0x43, 0xa2, - 0x87, 0xd8, 0x1c, 0xc2, 0xfa, 0x10, 0x9f, 0x87, 0x30, 0x23, 0x63, 0x55, 0xd8, 0x5e, 0x46, 0xe9, - 0x21, 0xb6, 0x95, 0x78, 0xd1, 0xc1, 0x14, 0x7d, 0x05, 0x31, 0x35, 0x47, 0x47, 0xd6, 0x5e, 0x3f, - 0x93, 0x1a, 0x59, 0x7b, 0x03, 0xe3, 0x78, 0x9c, 0xf7, 0x72, 0x88, 0xb2, 0x36, 0x7a, 0xa4, 0x01, - 0x74, 0x27, 0x01, 0x5a, 0x1f, 0xa7, 0xba, 0x77, 0x78, 0xeb, 0x1b, 0x87, 0x90, 0x54, 0x38, 0x56, - 0x04, 0x8e, 0x0c, 0x5a, 0x1a, 0x85, 0x43, 0x8c, 0x45, 0x1e, 0x08, 0x35, 0x4d, 0xc6, 0x74, 0x83, - 0xde, 0x21, 0x34, 0xa6, 0x1b, 0xf4, 0x0d, 0xa5, 0x71, 0x81, 0x08, 0x86, 0x55, 0xee, 0xd2, 0xb3, - 0x57, 0x69, 0xed, 0xf9, 0xab, 0xb4, 0xf6, 0xf2, 0x55, 0x5a, 0x7b, 0x72, 0x90, 0x9e, 0x7a, 0x7e, - 0x90, 0x9e, 0xfa, 0xf5, 0x20, 0x3d, 0xf5, 0x45, 0xef, 0xf0, 0x22, 0x2d, 0x3e, 0xbb, 0xba, 0x5a, - 0xda, 0x42, 0x8f, 0x18, 0x60, 0xa5, 0x59, 0x31, 0xfb, 0xdf, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, - 0xfa, 0x16, 0xab, 0x5d, 0xc7, 0x11, 0x00, 0x00, + // 1440 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcd, 0x6f, 0x13, 0x47, + 0x1b, 0xcf, 0xc6, 0x4e, 0xec, 0x8c, 0x03, 0xf8, 0x1d, 0xc2, 0x8b, 0xd9, 0x37, 0xb1, 0xc3, 0x42, + 0x3e, 0x09, 0xbb, 0x6f, 0xdc, 0x0a, 0xa9, 0x5c, 0x0a, 0xb6, 0x02, 0xa5, 0x40, 0x45, 0xb7, 0x51, + 0x0f, 0x95, 0x90, 0x35, 0x5e, 0x0f, 0x6b, 0x2b, 0xf6, 0xae, 0xd9, 0x19, 0xbb, 0x0e, 0x94, 0x1e, + 0x2a, 0x15, 0x51, 0xd1, 0x03, 0x52, 0xef, 0x15, 0xff, 0x41, 0xef, 0xfd, 0x0b, 0x38, 0x22, 0xf5, + 0x52, 0xf5, 0x40, 0x2b, 0xd2, 0x43, 0x6f, 0xbd, 0xf7, 0x54, 0xcd, 0x97, 0xbf, 0xd6, 0x6b, 0x27, + 0x88, 0xde, 0x7a, 0xda, 0x9d, 0x99, 0xe7, 0xe3, 0xf7, 0x3c, 0xf3, 0xcc, 0xf3, 0xfc, 0xc0, 0x22, + 0xa6, 0x55, 0x1c, 0x34, 0x6a, 0x1e, 0xb5, 0x70, 0xbb, 0x61, 0xb5, 0xb7, 0xad, 0xfb, 0x2d, 0x1c, + 0xec, 0x9b, 0xcd, 0xc0, 0xa7, 0x3e, 0x4c, 0x77, 0x4f, 0x4d, 0xdc, 0x6e, 0x98, 0xed, 0x6d, 0x7d, + 0xc1, 0xf5, 0x5d, 0x9f, 0x1f, 0x5a, 0xec, 0x4f, 0xc8, 0xe9, 0x9b, 0x8e, 0x4f, 0x1a, 0x3e, 0xb1, + 0xca, 0x88, 0x60, 0x61, 0xc0, 0x6a, 0x6f, 0x97, 0x31, 0x45, 0xdb, 0x56, 0x13, 0xb9, 0x35, 0x0f, + 0xd1, 0x9a, 0xef, 0x49, 0xd9, 0x45, 0xd7, 0xf7, 0xdd, 0x3a, 0xb6, 0x50, 0xb3, 0x66, 0x21, 0xcf, + 0xf3, 0x29, 0x3f, 0x24, 0xf2, 0x54, 0x0f, 0xe1, 0x61, 0x8e, 0xc5, 0xd9, 0x99, 0xd0, 0x19, 0xed, + 0xc8, 0xa3, 0x9c, 0x34, 0xca, 0x57, 0xe5, 0xd6, 0x3d, 0x8b, 0xd6, 0x1a, 0x98, 0x50, 0xd4, 0x68, + 0x0a, 0x01, 0xe3, 0x3d, 0x70, 0xf2, 0x63, 0x86, 0xeb, 0xaa, 0xe3, 0xf8, 0x2d, 0x8f, 0xda, 0xf8, + 0x7e, 0x0b, 0x13, 0x0a, 0x33, 0x20, 0x81, 0x2a, 0x95, 0x00, 0x13, 0x92, 0xd1, 0x96, 0xb5, 0xf5, + 0x39, 0x5b, 0x2d, 0x2f, 0x27, 0x9f, 0x3c, 0xcf, 0x4d, 0xfd, 0xf1, 0x3c, 0x37, 0x65, 0x38, 0x60, + 0x61, 0x50, 0x95, 0x34, 0x7d, 0x8f, 0x60, 0xa6, 0x5b, 0x46, 0x75, 0xe4, 0x39, 0x58, 0xe9, 0xca, + 0x25, 0xfc, 0x1f, 0x98, 0x73, 0xfc, 0x0a, 0x2e, 0x55, 0x11, 0xa9, 0x66, 0xa6, 0xf9, 0x59, 0x92, + 0x6d, 0x7c, 0x80, 0x48, 0x15, 0x2e, 0x80, 0x19, 0xcf, 0x67, 0x4a, 0xb1, 0x65, 0x6d, 0x3d, 0x6e, + 0x8b, 0x85, 0xf1, 0x3e, 0x38, 0xc3, 0x9d, 0x14, 0x79, 0x22, 0xdf, 0x00, 0xe5, 0x63, 0x0d, 0xe8, + 0xa3, 0x2c, 0x48, 0xb0, 0x2b, 0xe0, 0xb8, 0xb8, 0xa3, 0xd2, 0xa0, 0xa5, 0x63, 0x62, 0xf7, 0xaa, + 0xd8, 0x84, 0x3a, 0x48, 0x12, 0xe6, 0x94, 0xe1, 0x9b, 0xe6, 0xf8, 0xba, 0x6b, 0x66, 0x02, 0x09, + 0xab, 0x25, 0xaf, 0xd5, 0x28, 0xe3, 0x40, 0x46, 0x70, 0x4c, 0xee, 0x7e, 0xc4, 0x37, 0x8d, 0x9b, + 0x60, 0x91, 0xe3, 0xf8, 0x14, 0xd5, 0x6b, 0x15, 0x44, 0xfd, 0x60, 0x28, 0x98, 0xb3, 0x60, 0xde, + 0xf1, 0xbd, 0x61, 0x1c, 0x29, 0xb6, 0x77, 0x35, 0x14, 0xd5, 0x53, 0x0d, 0x2c, 0x45, 0x58, 0x93, + 0x81, 0xad, 0x81, 0x13, 0x0a, 0xd5, 0xa0, 0x45, 0x05, 0xf6, 0x2d, 0x86, 0xa6, 0x8a, 0xa8, 0x20, + 0xee, 0xf9, 0x28, 0xd7, 0xf3, 0x7f, 0x59, 0x44, 0x5d, 0xd5, 0x49, 0x45, 0x64, 0xdc, 0x94, 0xce, + 0x3e, 0xa1, 0x7e, 0x80, 0xdc, 0xc9, 0xce, 0x60, 0x1a, 0xc4, 0xf6, 0xf0, 0xbe, 0xac, 0x37, 0xf6, + 0xdb, 0xe7, 0x7e, 0x4b, 0xba, 0xef, 0x1a, 0x93, 0xee, 0x17, 0xc0, 0x4c, 0x1b, 0xd5, 0x5b, 0xca, + 0xb9, 0x58, 0x18, 0x97, 0x40, 0x5a, 0x96, 0x52, 0xe5, 0x48, 0x41, 0xae, 0x81, 0xff, 0xf4, 0xe9, + 0x49, 0x17, 0x10, 0xc4, 0x59, 0xed, 0x73, 0xad, 0x79, 0x9b, 0xff, 0x1b, 0x0f, 0x00, 0xe4, 0x82, + 0xbb, 0x9d, 0x5b, 0xbe, 0x4b, 0x94, 0x0b, 0x08, 0xe2, 0xfc, 0xc5, 0x08, 0xfb, 0xfc, 0x1f, 0x5e, + 0x03, 0xa0, 0xd7, 0x41, 0x78, 0x6c, 0xa9, 0xfc, 0xaa, 0x29, 0x8a, 0xd6, 0x64, 0xed, 0xc6, 0x14, + 0xfd, 0x4a, 0xb6, 0x1b, 0xf3, 0x4e, 0x2f, 0x55, 0x76, 0x9f, 0x66, 0x1f, 0xc8, 0x6f, 0x34, 0x99, + 0x58, 0xe5, 0x5c, 0xe2, 0xdc, 0x00, 0xf1, 0xba, 0xef, 0xb2, 0xe8, 0x62, 0xeb, 0xa9, 0xfc, 0x29, + 0x73, 0xb8, 0xf5, 0x99, 0xb7, 0x7c, 0xd7, 0xe6, 0x22, 0xf0, 0xfa, 0x08, 0x50, 0x6b, 0x13, 0x41, + 0x09, 0x3f, 0xfd, 0xa8, 0x8c, 0x05, 0x99, 0x87, 0x3b, 0x28, 0x40, 0x0d, 0x95, 0x07, 0xe3, 0xb6, + 0x04, 0xa8, 0x76, 0x25, 0xc0, 0x4b, 0x60, 0xb6, 0xc9, 0x77, 0x78, 0x82, 0x52, 0xf9, 0x4c, 0x18, + 0xa2, 0xd0, 0x28, 0xc4, 0x5f, 0xbc, 0xca, 0x4d, 0xd9, 0x52, 0xda, 0x38, 0xd0, 0xc0, 0xf1, 0x1d, + 0x5a, 0x2d, 0xa2, 0x7a, 0xbd, 0x2f, 0xd3, 0x28, 0x70, 0x89, 0xba, 0x13, 0xf6, 0x0f, 0x4f, 0x83, + 0x84, 0x8b, 0x48, 0xc9, 0x41, 0x4d, 0xf9, 0x3c, 0x66, 0x5d, 0x44, 0x8a, 0xa8, 0x09, 0xef, 0x82, + 0x74, 0x33, 0xf0, 0x9b, 0x3e, 0xc1, 0x41, 0xf7, 0x89, 0xb1, 0xe7, 0x31, 0x5f, 0xc8, 0xff, 0xf5, + 0x2a, 0x67, 0xba, 0x35, 0x5a, 0x6d, 0x95, 0x4d, 0xc7, 0x6f, 0x58, 0x72, 0x0a, 0x88, 0xcf, 0x45, + 0x52, 0xd9, 0xb3, 0xe8, 0x7e, 0x13, 0x13, 0xb3, 0xd8, 0x7b, 0xdb, 0xf6, 0x09, 0x65, 0x4b, 0xbd, + 0xcb, 0x1d, 0x90, 0x74, 0xaa, 0xa8, 0xe6, 0x95, 0x6a, 0x95, 0x4c, 0x9c, 0xdd, 0x7c, 0x61, 0xf3, + 0x97, 0x57, 0xb9, 0xd5, 0x43, 0x98, 0xbd, 0xe1, 0x51, 0x3b, 0xc1, 0x75, 0x6f, 0x54, 0x8c, 0x35, + 0x70, 0x72, 0x87, 0xd0, 0x5a, 0x03, 0x51, 0x7c, 0x1d, 0xf5, 0x92, 0x96, 0x06, 0x31, 0x17, 0x89, + 0x40, 0xe3, 0x36, 0xfb, 0x35, 0xbe, 0x8d, 0xab, 0xfb, 0x0f, 0x90, 0x83, 0x77, 0x3b, 0x2a, 0x27, + 0xdb, 0x20, 0xd6, 0x20, 0xae, 0xcc, 0x6d, 0x2e, 0x9c, 0xdb, 0xdb, 0xc4, 0xdd, 0x61, 0x7b, 0xb8, + 0xd5, 0xd8, 0xed, 0xd8, 0x4c, 0x16, 0x5e, 0x01, 0xf3, 0x94, 0x19, 0x29, 0x39, 0xbe, 0x77, 0xaf, + 0xe6, 0xf2, 0xac, 0xa4, 0xf2, 0x4b, 0x61, 0x5d, 0xee, 0xaa, 0xc8, 0x85, 0xec, 0x14, 0xed, 0x2d, + 0x60, 0x11, 0xcc, 0x37, 0x03, 0x5c, 0xc1, 0x0e, 0x26, 0xc4, 0x0f, 0x48, 0x26, 0xce, 0x8b, 0x6f, + 0xa2, 0xf7, 0x01, 0x25, 0xd6, 0x51, 0xcb, 0x75, 0xdf, 0xd9, 0x53, 0xbd, 0x6b, 0x66, 0x59, 0x5b, + 0x8f, 0xd9, 0x29, 0xbe, 0x27, 0x3a, 0x17, 0x5c, 0x02, 0x40, 0x88, 0xf0, 0x07, 0x36, 0xcb, 0x1f, + 0xd8, 0x1c, 0xdf, 0xe1, 0x33, 0xa9, 0xa8, 0x8e, 0xd9, 0xd8, 0xcc, 0x24, 0x78, 0x18, 0xba, 0x29, + 0x66, 0xaa, 0xa9, 0x66, 0xaa, 0xb9, 0xab, 0x66, 0x6a, 0x21, 0xc9, 0x0a, 0xec, 0xd9, 0xaf, 0x39, + 0x4d, 0x1a, 0x61, 0x27, 0x23, 0xeb, 0x24, 0xf9, 0xcf, 0xd4, 0xc9, 0xdc, 0x1b, 0xd7, 0xc9, 0x87, + 0xf1, 0xe4, 0x74, 0x3a, 0x66, 0x27, 0x69, 0xa7, 0x54, 0xf3, 0x2a, 0xb8, 0x63, 0x6c, 0xca, 0xce, + 0xd8, 0xad, 0x86, 0x5e, 0xdb, 0xaa, 0x20, 0x8a, 0xd4, 0x13, 0x61, 0xff, 0xc6, 0x8f, 0x31, 0xf0, + 0xdf, 0x9e, 0x70, 0x81, 0x45, 0xde, 0x57, 0x3d, 0xb4, 0xa3, 0x9a, 0xc7, 0xe4, 0xea, 0xa1, 0x1d, + 0xf2, 0x16, 0xaa, 0xe7, 0xdf, 0x8b, 0x3f, 0x42, 0x83, 0xb8, 0x08, 0x4e, 0x87, 0xee, 0x6e, 0xcc, + 0x5d, 0x9f, 0xea, 0xce, 0x7a, 0x82, 0xaf, 0x61, 0x35, 0x53, 0x8c, 0xbb, 0xdd, 0x39, 0x2e, 0xb7, + 0xa5, 0x89, 0x1d, 0x90, 0x64, 0x8d, 0xbf, 0x74, 0x0f, 0xcb, 0x59, 0x7a, 0x34, 0x90, 0x65, 0x61, + 0x2e, 0xff, 0xe7, 0x3c, 0x98, 0xe1, 0xf6, 0xe1, 0xd7, 0x1a, 0x48, 0x48, 0xae, 0x03, 0x57, 0xc2, + 0x35, 0x31, 0x82, 0xcc, 0xea, 0xab, 0x93, 0xc4, 0x04, 0x56, 0xe3, 0xc2, 0x57, 0x3f, 0xfd, 0xfe, + 0xdd, 0xf4, 0x0a, 0x3c, 0x67, 0x85, 0x08, 0xb5, 0xe4, 0x3b, 0xd6, 0x43, 0x79, 0x8f, 0x8f, 0xe0, + 0xf7, 0x1a, 0x38, 0x36, 0x40, 0x29, 0xe1, 0x85, 0x08, 0x37, 0xa3, 0xa8, 0xab, 0xbe, 0x75, 0x38, + 0x61, 0x89, 0x2c, 0xcf, 0x91, 0x6d, 0xc1, 0xcd, 0x30, 0x32, 0xc5, 0x5e, 0x43, 0x00, 0x7f, 0xd0, + 0x40, 0x7a, 0x98, 0x1d, 0x42, 0x33, 0xc2, 0x6d, 0x04, 0x29, 0xd5, 0xad, 0x43, 0xcb, 0x4b, 0xa4, + 0x97, 0x39, 0xd2, 0x77, 0x61, 0x3e, 0x8c, 0xb4, 0xad, 0x74, 0x7a, 0x60, 0xfb, 0x09, 0xef, 0x23, + 0xf8, 0x58, 0x03, 0x09, 0xc9, 0x03, 0x23, 0xaf, 0x76, 0x90, 0x62, 0x46, 0x5e, 0xed, 0x10, 0x9d, + 0x34, 0xb6, 0x38, 0xac, 0x55, 0x78, 0x3e, 0x0c, 0x4b, 0xf2, 0x4a, 0xd2, 0x97, 0xba, 0xa7, 0x1a, + 0x48, 0x48, 0x46, 0x18, 0x09, 0x64, 0x90, 0x7e, 0x46, 0x02, 0x19, 0x22, 0x96, 0xc6, 0x36, 0x07, + 0x72, 0x01, 0x6e, 0x84, 0x81, 0x10, 0x21, 0xda, 0xc3, 0x61, 0x3d, 0xdc, 0xc3, 0xfb, 0x8f, 0xe0, + 0x03, 0x10, 0x67, 0xc4, 0x11, 0x1a, 0x91, 0x25, 0xd3, 0x65, 0xa3, 0xfa, 0xb9, 0xb1, 0x32, 0x12, + 0xc3, 0x06, 0xc7, 0x70, 0x0e, 0x9e, 0x1d, 0x55, 0x4d, 0x95, 0x81, 0x4c, 0x7c, 0x0e, 0x66, 0x05, + 0x77, 0x82, 0xe7, 0x23, 0x2c, 0x0f, 0x50, 0x34, 0x7d, 0x65, 0x82, 0x94, 0x44, 0xb0, 0xcc, 0x11, + 0xe8, 0x30, 0x13, 0x46, 0x20, 0xc8, 0x19, 0xec, 0x80, 0x84, 0xe4, 0x66, 0x70, 0x39, 0x6c, 0x73, + 0x90, 0xb6, 0xe9, 0x6b, 0x93, 0xe6, 0x8a, 0xf2, 0x6b, 0x70, 0xbf, 0x8b, 0x50, 0x0f, 0xfb, 0xc5, + 0xb4, 0x5a, 0x72, 0x98, 0xbb, 0x2f, 0x41, 0xaa, 0x8f, 0x30, 0x1d, 0xc2, 0xfb, 0x88, 0x98, 0x47, + 0x30, 0x2e, 0x63, 0x95, 0xfb, 0x5e, 0x86, 0xd9, 0x11, 0xbe, 0xa5, 0x78, 0xc9, 0x45, 0x04, 0x7e, + 0x01, 0x12, 0x72, 0xe6, 0x46, 0xd6, 0xde, 0x20, 0x43, 0x8b, 0xac, 0xbd, 0xa1, 0xd1, 0x3d, 0x2e, + 0x7a, 0x31, 0x70, 0x69, 0x07, 0x3e, 0xd1, 0x00, 0xe8, 0x4d, 0x02, 0xb8, 0x3e, 0xce, 0x74, 0xff, + 0xa0, 0xd7, 0x37, 0x0e, 0x21, 0x29, 0x71, 0xac, 0x70, 0x1c, 0x39, 0xb8, 0x14, 0x85, 0x83, 0x8f, + 0x50, 0x96, 0x08, 0x39, 0x4d, 0xc6, 0x74, 0x83, 0xfe, 0x21, 0x34, 0xa6, 0x1b, 0x0c, 0x0c, 0xa5, + 0x71, 0x89, 0x50, 0xc3, 0xaa, 0x70, 0xe5, 0xc5, 0xeb, 0xac, 0xf6, 0xf2, 0x75, 0x56, 0xfb, 0xed, + 0x75, 0x56, 0x7b, 0x76, 0x90, 0x9d, 0x7a, 0x79, 0x90, 0x9d, 0xfa, 0xf9, 0x20, 0x3b, 0xf5, 0x59, + 0xff, 0xf0, 0xc2, 0x6d, 0x36, 0xbb, 0x7a, 0x56, 0x3a, 0xdc, 0x0e, 0x1f, 0x60, 0xe5, 0x59, 0xce, + 0x13, 0xde, 0xf9, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x67, 0xc4, 0x4b, 0x95, 0x4b, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2477,10 +2456,15 @@ func (m *EthCallRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ChainId))) + if m.ChainId != nil { + { + size := m.ChainId.Size() + i -= size + if _, err := m.ChainId.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x22 } @@ -2554,10 +2538,15 @@ func (m *QueryTraceTxRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ChainId))) + if m.ChainId != nil { + { + size := m.ChainId.Size() + i -= size + if _, err := m.ChainId.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x4a } @@ -2679,10 +2668,15 @@ func (m *QueryTraceBlockRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ChainId))) + if m.ChainId != nil { + { + size := m.ChainId.Size() + i -= size + if _, err := m.ChainId.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x4a } @@ -3093,8 +3087,8 @@ func (m *EthCallRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - l = len(m.ChainId) - if l > 0 { + if m.ChainId != nil { + l = m.ChainId.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3145,8 +3139,8 @@ func (m *QueryTraceTxRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - l = len(m.ChainId) - if l > 0 { + if m.ChainId != nil { + l = m.ChainId.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3194,8 +3188,8 @@ func (m *QueryTraceBlockRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - l = len(m.ChainId) - if l > 0 { + if m.ChainId != nil { + l = m.ChainId.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -4904,7 +4898,11 @@ func (m *EthCallRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) + var v github_com_cosmos_cosmos_sdk_types.Int + m.ChainId = &v + if err := m.ChainId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -5279,7 +5277,11 @@ func (m *QueryTraceTxRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) + var v github_com_cosmos_cosmos_sdk_types.Int + m.ChainId = &v + if err := m.ChainId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -5633,7 +5635,11 @@ func (m *QueryTraceBlockRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) + var v github_com_cosmos_cosmos_sdk_types.Int + m.ChainId = &v + if err := m.ChainId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex