From 8ca3bc75171817cb1d17ca6037f38679e2d2d22d Mon Sep 17 00:00:00 2001 From: colmazia Date: Fri, 29 Nov 2024 11:15:31 +0700 Subject: [PATCH 1/2] remove group module from app --- CHANGELOG.md | 1 - app/genesis.go | 3 --- app/keepers/keepers.go | 12 ------------ app/keepers/keys.go | 2 -- app/modules.go | 7 ------- app/upgrades/v3/constants.go | 17 ----------------- scripts/group/create_group.sh | 18 ------------------ scripts/group/create_policy.sh | 18 ------------------ scripts/group/group_members.json | 14 -------------- scripts/group/threshold_policy.json | 8 -------- 10 files changed, 100 deletions(-) delete mode 100755 scripts/group/create_group.sh delete mode 100755 scripts/group/create_policy.sh delete mode 100644 scripts/group/group_members.json delete mode 100644 scripts/group/threshold_policy.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 16f293f1a..62f89fd70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ * (chain) Remove `gogoproto.goproto_stringer` option on param * (chain) Return error on AllocationToken at beginblock instead of panic * (chain) Migrate REST Endpoint to GRPC -* (chain) Add group module from cosmos-sdk * (chain) Change the allocation of remaining tokens from the community pool to the Proposer * (chain) Add consensus module to handle managing Tendermint consensus parameters * (chain) Add autocli for oracle module diff --git a/app/genesis.go b/app/genesis.go index e32be407c..d534f5b32 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -37,8 +37,6 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/cosmos-sdk/x/group" - groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -124,7 +122,6 @@ func NewDefaultGenesisState(cdc codec.Codec) GenesisState { evidencetypes.ModuleName: evidence.AppModuleBasic{}.DefaultGenesis(cdc), authz.ModuleName: authzmodule.AppModuleBasic{}.DefaultGenesis(cdc), feegrant.ModuleName: feegrantmodule.AppModuleBasic{}.DefaultGenesis(cdc), - group.ModuleName: groupmodule.AppModuleBasic{}.DefaultGenesis(cdc), ibctransafertypes.ModuleName: ibctransfer.AppModuleBasic{}.DefaultGenesis(cdc), icatypes.ModuleName: cdc.MustMarshalJSON(icaGenesis), ibcfeetypes.ModuleName: ibcfee.AppModuleBasic{}.DefaultGenesis(cdc), diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index f2a3e82eb..38e65be40 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -53,8 +53,6 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/cosmos/cosmos-sdk/x/group" - groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/params" @@ -113,7 +111,6 @@ type AppKeepers struct { FeeGrantKeeper feegrantkeeper.Keeper EvidenceKeeper evidencekeeper.Keeper AuthzKeeper authzkeeper.Keeper - GroupKeeper groupkeeper.Keeper RollingseedKeeper rollingseedkeeper.Keeper OracleKeeper oraclekeeper.Keeper TSSKeeper *tsskeeper.Keeper @@ -336,15 +333,6 @@ func NewAppKeeper( authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) - groupConfig := group.DefaultConfig() - appKeepers.GroupKeeper = groupkeeper.NewKeeper( - appKeepers.keys[group.StoreKey], - appCodec, - bApp.MsgServiceRouter(), - appKeepers.AccountKeeper, - groupConfig, - ) - govConfig := govtypes.DefaultConfig() // set the MaxMetadataLen for proposals to the same value as it was pre-sdk v0.47.x govConfig.MaxMetadataLen = 10200 diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 7633d790a..640c0e9a3 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -19,7 +19,6 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/group" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" @@ -57,7 +56,6 @@ func (appKeepers *AppKeepers) GenerateKeys() { feegrant.StoreKey, authzkeeper.StoreKey, icahosttypes.StoreKey, - group.StoreKey, oracletypes.StoreKey, globalfeetypes.StoreKey, ibcfeetypes.StoreKey, diff --git a/app/modules.go b/app/modules.go index d1208fdb5..8e7409127 100644 --- a/app/modules.go +++ b/app/modules.go @@ -41,8 +41,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/group" - groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" "github.com/cosmos/cosmos-sdk/x/mint" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" sdkparams "github.com/cosmos/cosmos-sdk/x/params" @@ -152,7 +150,6 @@ func appModules( ibctm.NewAppModule(), sdkparams.NewAppModule(app.ParamsKeeper), consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), - groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), oracle.NewAppModule( appCodec, app.OracleKeeper, @@ -256,7 +253,6 @@ func simulationModules( sdkparams.NewAppModule(app.ParamsKeeper), evidence.NewAppModule(app.EvidenceKeeper), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), oracle.NewAppModule( appCodec, app.OracleKeeper, @@ -296,7 +292,6 @@ func orderBeginBlockers() []string { genutiltypes.ModuleName, authz.ModuleName, feegrant.ModuleName, - group.ModuleName, paramstypes.ModuleName, vestingtypes.ModuleName, consensusparamtypes.ModuleName, @@ -338,7 +333,6 @@ func orderEndBlockers() []string { evidencetypes.ModuleName, authz.ModuleName, feegrant.ModuleName, - group.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, @@ -374,7 +368,6 @@ func orderInitBlockers() []string { evidencetypes.ModuleName, authz.ModuleName, feegrant.ModuleName, - group.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index 8c64adb41..416683972 100644 --- a/app/upgrades/v3/constants.go +++ b/app/upgrades/v3/constants.go @@ -15,7 +15,6 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/cosmos/cosmos-sdk/x/group" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/bandprotocol/chain/v3/app/upgrades" @@ -45,7 +44,6 @@ var Upgrade = upgrades.Upgrade{ CreateUpgradeHandler: CreateUpgradeHandler, StoreUpgrades: storetypes.StoreUpgrades{ Added: []string{ - group.StoreKey, globalfeetypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, @@ -77,21 +75,6 @@ var ICAAllowMessages = []string{ sdk.MsgTypeURL(&govv1beta1.MsgSubmitProposal{}), sdk.MsgTypeURL(&govv1beta1.MsgDeposit{}), sdk.MsgTypeURL(&govv1beta1.MsgVote{}), - // Change: add messages from Group module - sdk.MsgTypeURL(&group.MsgCreateGroupPolicy{}), - sdk.MsgTypeURL(&group.MsgCreateGroupWithPolicy{}), - sdk.MsgTypeURL(&group.MsgCreateGroup{}), - sdk.MsgTypeURL(&group.MsgExec{}), - sdk.MsgTypeURL(&group.MsgLeaveGroup{}), - sdk.MsgTypeURL(&group.MsgSubmitProposal{}), - sdk.MsgTypeURL(&group.MsgUpdateGroupAdmin{}), - sdk.MsgTypeURL(&group.MsgUpdateGroupMembers{}), - sdk.MsgTypeURL(&group.MsgUpdateGroupMetadata{}), - sdk.MsgTypeURL(&group.MsgUpdateGroupPolicyAdmin{}), - sdk.MsgTypeURL(&group.MsgUpdateGroupPolicyDecisionPolicy{}), - sdk.MsgTypeURL(&group.MsgUpdateGroupPolicyMetadata{}), - sdk.MsgTypeURL(&group.MsgVote{}), - sdk.MsgTypeURL(&group.MsgWithdrawProposal{}), // Change: add messages from Oracle module sdk.MsgTypeURL(&oracletypes.MsgActivate{}), sdk.MsgTypeURL(&oracletypes.MsgCreateDataSource{}), diff --git a/scripts/group/create_group.sh b/scripts/group/create_group.sh deleted file mode 100755 index 78d3d8ecd..000000000 --- a/scripts/group/create_group.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -export WALLET_NAME=account1 -export ENDPOINT=http://localhost:26657 - -BASEDIR=$(dirname "$0") - -TX_HASH=$(bandd tx group create-group $(bandd keys show $WALLET_NAME --address --keyring-backend test) "ipfs://" $BASEDIR/group_members.json \ - --from $WALLET_NAME \ - --node $ENDPOINT \ - -y --keyring-backend test --gas-prices 0.0025uband -b sync --output json | jq '.txhash'| tr -d '"') -echo "TX_HASH: $TX_HASH" - -sleep 3 - -GROUP_ID=$(bandd query tx $TX_HASH --node $ENDPOINT --output json | jq '.events' | jq -r '.[] | select(.type == "cosmos.group.v1.EventCreateGroup") | .attributes[0].value' | jq -r '.') -echo "GROUP_ID: $GROUP_ID" - diff --git a/scripts/group/create_policy.sh b/scripts/group/create_policy.sh deleted file mode 100755 index 88c58489a..000000000 --- a/scripts/group/create_policy.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -export WALLET_NAME=account1 -export GROUP_ID=1 -export ENDPOINT=http://localhost:26657 - -BASEDIR=$(dirname "$0") - -TX_HASH=$(bandd tx group create-group-policy $(bandd keys show $WALLET_NAME --address --keyring-backend test) $GROUP_ID "{\"name\":\"policy 1\",\"description\":\"\"}" $BASEDIR/threshold_policy.json \ - --from $WALLET_NAME \ - --node $ENDPOINT \ - -y --keyring-backend test --gas-prices 0.0025uband -b sync --output json | jq '.txhash'| tr -d '"') -echo "TX_HASH: $TX_HASH" - -sleep 3 - -GROUP_POLICY_ADDRESS=$(bandd query tx $TX_HASH --node $ENDPOINT --output json | jq '.events' | jq -r '.[] | select(.type == "cosmos.group.v1.EventCreateGroupPolicy") | .attributes[0].value' | jq -r '.') -echo "GROUP_POLICY_ADDRESS: $GROUP_POLICY_ADDRESS" diff --git a/scripts/group/group_members.json b/scripts/group/group_members.json deleted file mode 100644 index 9b8b15560..000000000 --- a/scripts/group/group_members.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "members": [ - { - "address": "band1w8yurh6naeqg4mjx4zcs7hsu3fppwu0f4q4l7f", - "weight": "1", - "metadata": "account1" - }, - { - "address": "band1ph8tcg7ncxxx5vndfc9h6ffsn4st4whq3rn260", - "weight": "1", - "metadata": "account2" - } - ] -} diff --git a/scripts/group/threshold_policy.json b/scripts/group/threshold_policy.json deleted file mode 100644 index 570c10ecb..000000000 --- a/scripts/group/threshold_policy.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@type": "/cosmos.group.v1.ThresholdDecisionPolicy", - "threshold": "2", - "windows": { - "voting_period": "1m", - "min_execution_period": "0s" - } -} From 60cff90ff6714f34cbbf1e6303cecdd9ea45e073 Mon Sep 17 00:00:00 2001 From: colmazia Date: Fri, 29 Nov 2024 11:42:18 +0700 Subject: [PATCH 2/2] update oracle proof --- api/band/base/oracle/v1/proof.pulsar.go | 611 ++++++++++--------- client/grpc/oracle/proof/abi.go | 10 +- client/grpc/oracle/proof/multi_store.go | 36 +- client/grpc/oracle/proof/multi_store_test.go | 18 +- client/grpc/oracle/proof/proof.pb.go | 340 +++++------ client/grpc/oracle/proof/proof_test.go | 10 +- proto/band/base/oracle/v1/proof.proto | 31 +- 7 files changed, 529 insertions(+), 527 deletions(-) diff --git a/api/band/base/oracle/v1/proof.pulsar.go b/api/band/base/oracle/v1/proof.pulsar.go index b9e45a3ae..613669d56 100644 --- a/api/band/base/oracle/v1/proof.pulsar.go +++ b/api/band/base/oracle/v1/proof.pulsar.go @@ -8029,24 +8029,24 @@ func (x *fastReflection_BlockRelayProof) ProtoMethods() *protoiface.Methods { } var ( - md_MultiStoreProof protoreflect.MessageDescriptor - fd_MultiStoreProof_oracle_iavl_state_hash protoreflect.FieldDescriptor - fd_MultiStoreProof_params_store_merkle_hash protoreflect.FieldDescriptor - fd_MultiStoreProof_icahost_to_mint_stores_merkle_hash protoreflect.FieldDescriptor - fd_MultiStoreProof_restake_to_staking_stores_merkle_hash protoreflect.FieldDescriptor - fd_MultiStoreProof_transfer_to_upgrade_stores_merkle_hash protoreflect.FieldDescriptor - fd_MultiStoreProof_auth_to_ibc_stores_merkle_hash protoreflect.FieldDescriptor + md_MultiStoreProof protoreflect.MessageDescriptor + fd_MultiStoreProof_oracle_iavl_state_hash protoreflect.FieldDescriptor + fd_MultiStoreProof_mint_store_merkle_hash protoreflect.FieldDescriptor + fd_MultiStoreProof_params_to_restake_stores_merkle_hash protoreflect.FieldDescriptor + fd_MultiStoreProof_rollingseed_to_transfer_stores_merkle_hash protoreflect.FieldDescriptor + fd_MultiStoreProof_tss_to_upgrade_stores_merkle_hash protoreflect.FieldDescriptor + fd_MultiStoreProof_auth_to_icahost_stores_merkle_hash protoreflect.FieldDescriptor ) func init() { file_band_base_oracle_v1_proof_proto_init() md_MultiStoreProof = File_band_base_oracle_v1_proof_proto.Messages().ByName("MultiStoreProof") fd_MultiStoreProof_oracle_iavl_state_hash = md_MultiStoreProof.Fields().ByName("oracle_iavl_state_hash") - fd_MultiStoreProof_params_store_merkle_hash = md_MultiStoreProof.Fields().ByName("params_store_merkle_hash") - fd_MultiStoreProof_icahost_to_mint_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("icahost_to_mint_stores_merkle_hash") - fd_MultiStoreProof_restake_to_staking_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("restake_to_staking_stores_merkle_hash") - fd_MultiStoreProof_transfer_to_upgrade_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("transfer_to_upgrade_stores_merkle_hash") - fd_MultiStoreProof_auth_to_ibc_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("auth_to_ibc_stores_merkle_hash") + fd_MultiStoreProof_mint_store_merkle_hash = md_MultiStoreProof.Fields().ByName("mint_store_merkle_hash") + fd_MultiStoreProof_params_to_restake_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("params_to_restake_stores_merkle_hash") + fd_MultiStoreProof_rollingseed_to_transfer_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("rollingseed_to_transfer_stores_merkle_hash") + fd_MultiStoreProof_tss_to_upgrade_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("tss_to_upgrade_stores_merkle_hash") + fd_MultiStoreProof_auth_to_icahost_stores_merkle_hash = md_MultiStoreProof.Fields().ByName("auth_to_icahost_stores_merkle_hash") } var _ protoreflect.Message = (*fastReflection_MultiStoreProof)(nil) @@ -8120,33 +8120,33 @@ func (x *fastReflection_MultiStoreProof) Range(f func(protoreflect.FieldDescript return } } - if len(x.ParamsStoreMerkleHash) != 0 { - value := protoreflect.ValueOfBytes(x.ParamsStoreMerkleHash) - if !f(fd_MultiStoreProof_params_store_merkle_hash, value) { + if len(x.MintStoreMerkleHash) != 0 { + value := protoreflect.ValueOfBytes(x.MintStoreMerkleHash) + if !f(fd_MultiStoreProof_mint_store_merkle_hash, value) { return } } - if len(x.IcahostToMintStoresMerkleHash) != 0 { - value := protoreflect.ValueOfBytes(x.IcahostToMintStoresMerkleHash) - if !f(fd_MultiStoreProof_icahost_to_mint_stores_merkle_hash, value) { + if len(x.ParamsToRestakeStoresMerkleHash) != 0 { + value := protoreflect.ValueOfBytes(x.ParamsToRestakeStoresMerkleHash) + if !f(fd_MultiStoreProof_params_to_restake_stores_merkle_hash, value) { return } } - if len(x.RestakeToStakingStoresMerkleHash) != 0 { - value := protoreflect.ValueOfBytes(x.RestakeToStakingStoresMerkleHash) - if !f(fd_MultiStoreProof_restake_to_staking_stores_merkle_hash, value) { + if len(x.RollingseedToTransferStoresMerkleHash) != 0 { + value := protoreflect.ValueOfBytes(x.RollingseedToTransferStoresMerkleHash) + if !f(fd_MultiStoreProof_rollingseed_to_transfer_stores_merkle_hash, value) { return } } - if len(x.TransferToUpgradeStoresMerkleHash) != 0 { - value := protoreflect.ValueOfBytes(x.TransferToUpgradeStoresMerkleHash) - if !f(fd_MultiStoreProof_transfer_to_upgrade_stores_merkle_hash, value) { + if len(x.TssToUpgradeStoresMerkleHash) != 0 { + value := protoreflect.ValueOfBytes(x.TssToUpgradeStoresMerkleHash) + if !f(fd_MultiStoreProof_tss_to_upgrade_stores_merkle_hash, value) { return } } - if len(x.AuthToIbcStoresMerkleHash) != 0 { - value := protoreflect.ValueOfBytes(x.AuthToIbcStoresMerkleHash) - if !f(fd_MultiStoreProof_auth_to_ibc_stores_merkle_hash, value) { + if len(x.AuthToIcahostStoresMerkleHash) != 0 { + value := protoreflect.ValueOfBytes(x.AuthToIcahostStoresMerkleHash) + if !f(fd_MultiStoreProof_auth_to_icahost_stores_merkle_hash, value) { return } } @@ -8167,16 +8167,16 @@ func (x *fastReflection_MultiStoreProof) Has(fd protoreflect.FieldDescriptor) bo switch fd.FullName() { case "band.base.oracle.v1.MultiStoreProof.oracle_iavl_state_hash": return len(x.OracleIavlStateHash) != 0 - case "band.base.oracle.v1.MultiStoreProof.params_store_merkle_hash": - return len(x.ParamsStoreMerkleHash) != 0 - case "band.base.oracle.v1.MultiStoreProof.icahost_to_mint_stores_merkle_hash": - return len(x.IcahostToMintStoresMerkleHash) != 0 - case "band.base.oracle.v1.MultiStoreProof.restake_to_staking_stores_merkle_hash": - return len(x.RestakeToStakingStoresMerkleHash) != 0 - case "band.base.oracle.v1.MultiStoreProof.transfer_to_upgrade_stores_merkle_hash": - return len(x.TransferToUpgradeStoresMerkleHash) != 0 - case "band.base.oracle.v1.MultiStoreProof.auth_to_ibc_stores_merkle_hash": - return len(x.AuthToIbcStoresMerkleHash) != 0 + case "band.base.oracle.v1.MultiStoreProof.mint_store_merkle_hash": + return len(x.MintStoreMerkleHash) != 0 + case "band.base.oracle.v1.MultiStoreProof.params_to_restake_stores_merkle_hash": + return len(x.ParamsToRestakeStoresMerkleHash) != 0 + case "band.base.oracle.v1.MultiStoreProof.rollingseed_to_transfer_stores_merkle_hash": + return len(x.RollingseedToTransferStoresMerkleHash) != 0 + case "band.base.oracle.v1.MultiStoreProof.tss_to_upgrade_stores_merkle_hash": + return len(x.TssToUpgradeStoresMerkleHash) != 0 + case "band.base.oracle.v1.MultiStoreProof.auth_to_icahost_stores_merkle_hash": + return len(x.AuthToIcahostStoresMerkleHash) != 0 default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: band.base.oracle.v1.MultiStoreProof")) @@ -8195,16 +8195,16 @@ func (x *fastReflection_MultiStoreProof) Clear(fd protoreflect.FieldDescriptor) switch fd.FullName() { case "band.base.oracle.v1.MultiStoreProof.oracle_iavl_state_hash": x.OracleIavlStateHash = nil - case "band.base.oracle.v1.MultiStoreProof.params_store_merkle_hash": - x.ParamsStoreMerkleHash = nil - case "band.base.oracle.v1.MultiStoreProof.icahost_to_mint_stores_merkle_hash": - x.IcahostToMintStoresMerkleHash = nil - case "band.base.oracle.v1.MultiStoreProof.restake_to_staking_stores_merkle_hash": - x.RestakeToStakingStoresMerkleHash = nil - case "band.base.oracle.v1.MultiStoreProof.transfer_to_upgrade_stores_merkle_hash": - x.TransferToUpgradeStoresMerkleHash = nil - case "band.base.oracle.v1.MultiStoreProof.auth_to_ibc_stores_merkle_hash": - x.AuthToIbcStoresMerkleHash = nil + case "band.base.oracle.v1.MultiStoreProof.mint_store_merkle_hash": + x.MintStoreMerkleHash = nil + case "band.base.oracle.v1.MultiStoreProof.params_to_restake_stores_merkle_hash": + x.ParamsToRestakeStoresMerkleHash = nil + case "band.base.oracle.v1.MultiStoreProof.rollingseed_to_transfer_stores_merkle_hash": + x.RollingseedToTransferStoresMerkleHash = nil + case "band.base.oracle.v1.MultiStoreProof.tss_to_upgrade_stores_merkle_hash": + x.TssToUpgradeStoresMerkleHash = nil + case "band.base.oracle.v1.MultiStoreProof.auth_to_icahost_stores_merkle_hash": + x.AuthToIcahostStoresMerkleHash = nil default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: band.base.oracle.v1.MultiStoreProof")) @@ -8224,20 +8224,20 @@ func (x *fastReflection_MultiStoreProof) Get(descriptor protoreflect.FieldDescri case "band.base.oracle.v1.MultiStoreProof.oracle_iavl_state_hash": value := x.OracleIavlStateHash return protoreflect.ValueOfBytes(value) - case "band.base.oracle.v1.MultiStoreProof.params_store_merkle_hash": - value := x.ParamsStoreMerkleHash + case "band.base.oracle.v1.MultiStoreProof.mint_store_merkle_hash": + value := x.MintStoreMerkleHash return protoreflect.ValueOfBytes(value) - case "band.base.oracle.v1.MultiStoreProof.icahost_to_mint_stores_merkle_hash": - value := x.IcahostToMintStoresMerkleHash + case "band.base.oracle.v1.MultiStoreProof.params_to_restake_stores_merkle_hash": + value := x.ParamsToRestakeStoresMerkleHash return protoreflect.ValueOfBytes(value) - case "band.base.oracle.v1.MultiStoreProof.restake_to_staking_stores_merkle_hash": - value := x.RestakeToStakingStoresMerkleHash + case "band.base.oracle.v1.MultiStoreProof.rollingseed_to_transfer_stores_merkle_hash": + value := x.RollingseedToTransferStoresMerkleHash return protoreflect.ValueOfBytes(value) - case "band.base.oracle.v1.MultiStoreProof.transfer_to_upgrade_stores_merkle_hash": - value := x.TransferToUpgradeStoresMerkleHash + case "band.base.oracle.v1.MultiStoreProof.tss_to_upgrade_stores_merkle_hash": + value := x.TssToUpgradeStoresMerkleHash return protoreflect.ValueOfBytes(value) - case "band.base.oracle.v1.MultiStoreProof.auth_to_ibc_stores_merkle_hash": - value := x.AuthToIbcStoresMerkleHash + case "band.base.oracle.v1.MultiStoreProof.auth_to_icahost_stores_merkle_hash": + value := x.AuthToIcahostStoresMerkleHash return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { @@ -8261,16 +8261,16 @@ func (x *fastReflection_MultiStoreProof) Set(fd protoreflect.FieldDescriptor, va switch fd.FullName() { case "band.base.oracle.v1.MultiStoreProof.oracle_iavl_state_hash": x.OracleIavlStateHash = value.Bytes() - case "band.base.oracle.v1.MultiStoreProof.params_store_merkle_hash": - x.ParamsStoreMerkleHash = value.Bytes() - case "band.base.oracle.v1.MultiStoreProof.icahost_to_mint_stores_merkle_hash": - x.IcahostToMintStoresMerkleHash = value.Bytes() - case "band.base.oracle.v1.MultiStoreProof.restake_to_staking_stores_merkle_hash": - x.RestakeToStakingStoresMerkleHash = value.Bytes() - case "band.base.oracle.v1.MultiStoreProof.transfer_to_upgrade_stores_merkle_hash": - x.TransferToUpgradeStoresMerkleHash = value.Bytes() - case "band.base.oracle.v1.MultiStoreProof.auth_to_ibc_stores_merkle_hash": - x.AuthToIbcStoresMerkleHash = value.Bytes() + case "band.base.oracle.v1.MultiStoreProof.mint_store_merkle_hash": + x.MintStoreMerkleHash = value.Bytes() + case "band.base.oracle.v1.MultiStoreProof.params_to_restake_stores_merkle_hash": + x.ParamsToRestakeStoresMerkleHash = value.Bytes() + case "band.base.oracle.v1.MultiStoreProof.rollingseed_to_transfer_stores_merkle_hash": + x.RollingseedToTransferStoresMerkleHash = value.Bytes() + case "band.base.oracle.v1.MultiStoreProof.tss_to_upgrade_stores_merkle_hash": + x.TssToUpgradeStoresMerkleHash = value.Bytes() + case "band.base.oracle.v1.MultiStoreProof.auth_to_icahost_stores_merkle_hash": + x.AuthToIcahostStoresMerkleHash = value.Bytes() default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: band.base.oracle.v1.MultiStoreProof")) @@ -8293,16 +8293,16 @@ func (x *fastReflection_MultiStoreProof) Mutable(fd protoreflect.FieldDescriptor switch fd.FullName() { case "band.base.oracle.v1.MultiStoreProof.oracle_iavl_state_hash": panic(fmt.Errorf("field oracle_iavl_state_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) - case "band.base.oracle.v1.MultiStoreProof.params_store_merkle_hash": - panic(fmt.Errorf("field params_store_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) - case "band.base.oracle.v1.MultiStoreProof.icahost_to_mint_stores_merkle_hash": - panic(fmt.Errorf("field icahost_to_mint_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) - case "band.base.oracle.v1.MultiStoreProof.restake_to_staking_stores_merkle_hash": - panic(fmt.Errorf("field restake_to_staking_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) - case "band.base.oracle.v1.MultiStoreProof.transfer_to_upgrade_stores_merkle_hash": - panic(fmt.Errorf("field transfer_to_upgrade_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) - case "band.base.oracle.v1.MultiStoreProof.auth_to_ibc_stores_merkle_hash": - panic(fmt.Errorf("field auth_to_ibc_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) + case "band.base.oracle.v1.MultiStoreProof.mint_store_merkle_hash": + panic(fmt.Errorf("field mint_store_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) + case "band.base.oracle.v1.MultiStoreProof.params_to_restake_stores_merkle_hash": + panic(fmt.Errorf("field params_to_restake_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) + case "band.base.oracle.v1.MultiStoreProof.rollingseed_to_transfer_stores_merkle_hash": + panic(fmt.Errorf("field rollingseed_to_transfer_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) + case "band.base.oracle.v1.MultiStoreProof.tss_to_upgrade_stores_merkle_hash": + panic(fmt.Errorf("field tss_to_upgrade_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) + case "band.base.oracle.v1.MultiStoreProof.auth_to_icahost_stores_merkle_hash": + panic(fmt.Errorf("field auth_to_icahost_stores_merkle_hash of message band.base.oracle.v1.MultiStoreProof is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: band.base.oracle.v1.MultiStoreProof")) @@ -8318,15 +8318,15 @@ func (x *fastReflection_MultiStoreProof) NewField(fd protoreflect.FieldDescripto switch fd.FullName() { case "band.base.oracle.v1.MultiStoreProof.oracle_iavl_state_hash": return protoreflect.ValueOfBytes(nil) - case "band.base.oracle.v1.MultiStoreProof.params_store_merkle_hash": + case "band.base.oracle.v1.MultiStoreProof.mint_store_merkle_hash": return protoreflect.ValueOfBytes(nil) - case "band.base.oracle.v1.MultiStoreProof.icahost_to_mint_stores_merkle_hash": + case "band.base.oracle.v1.MultiStoreProof.params_to_restake_stores_merkle_hash": return protoreflect.ValueOfBytes(nil) - case "band.base.oracle.v1.MultiStoreProof.restake_to_staking_stores_merkle_hash": + case "band.base.oracle.v1.MultiStoreProof.rollingseed_to_transfer_stores_merkle_hash": return protoreflect.ValueOfBytes(nil) - case "band.base.oracle.v1.MultiStoreProof.transfer_to_upgrade_stores_merkle_hash": + case "band.base.oracle.v1.MultiStoreProof.tss_to_upgrade_stores_merkle_hash": return protoreflect.ValueOfBytes(nil) - case "band.base.oracle.v1.MultiStoreProof.auth_to_ibc_stores_merkle_hash": + case "band.base.oracle.v1.MultiStoreProof.auth_to_icahost_stores_merkle_hash": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { @@ -8401,23 +8401,23 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.ParamsStoreMerkleHash) + l = len(x.MintStoreMerkleHash) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.IcahostToMintStoresMerkleHash) + l = len(x.ParamsToRestakeStoresMerkleHash) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.RestakeToStakingStoresMerkleHash) + l = len(x.RollingseedToTransferStoresMerkleHash) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.TransferToUpgradeStoresMerkleHash) + l = len(x.TssToUpgradeStoresMerkleHash) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.AuthToIbcStoresMerkleHash) + l = len(x.AuthToIcahostStoresMerkleHash) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -8450,38 +8450,38 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } - if len(x.AuthToIbcStoresMerkleHash) > 0 { - i -= len(x.AuthToIbcStoresMerkleHash) - copy(dAtA[i:], x.AuthToIbcStoresMerkleHash) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.AuthToIbcStoresMerkleHash))) + if len(x.AuthToIcahostStoresMerkleHash) > 0 { + i -= len(x.AuthToIcahostStoresMerkleHash) + copy(dAtA[i:], x.AuthToIcahostStoresMerkleHash) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.AuthToIcahostStoresMerkleHash))) i-- dAtA[i] = 0x32 } - if len(x.TransferToUpgradeStoresMerkleHash) > 0 { - i -= len(x.TransferToUpgradeStoresMerkleHash) - copy(dAtA[i:], x.TransferToUpgradeStoresMerkleHash) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.TransferToUpgradeStoresMerkleHash))) + if len(x.TssToUpgradeStoresMerkleHash) > 0 { + i -= len(x.TssToUpgradeStoresMerkleHash) + copy(dAtA[i:], x.TssToUpgradeStoresMerkleHash) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.TssToUpgradeStoresMerkleHash))) i-- dAtA[i] = 0x2a } - if len(x.RestakeToStakingStoresMerkleHash) > 0 { - i -= len(x.RestakeToStakingStoresMerkleHash) - copy(dAtA[i:], x.RestakeToStakingStoresMerkleHash) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.RestakeToStakingStoresMerkleHash))) + if len(x.RollingseedToTransferStoresMerkleHash) > 0 { + i -= len(x.RollingseedToTransferStoresMerkleHash) + copy(dAtA[i:], x.RollingseedToTransferStoresMerkleHash) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.RollingseedToTransferStoresMerkleHash))) i-- dAtA[i] = 0x22 } - if len(x.IcahostToMintStoresMerkleHash) > 0 { - i -= len(x.IcahostToMintStoresMerkleHash) - copy(dAtA[i:], x.IcahostToMintStoresMerkleHash) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.IcahostToMintStoresMerkleHash))) + if len(x.ParamsToRestakeStoresMerkleHash) > 0 { + i -= len(x.ParamsToRestakeStoresMerkleHash) + copy(dAtA[i:], x.ParamsToRestakeStoresMerkleHash) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.ParamsToRestakeStoresMerkleHash))) i-- dAtA[i] = 0x1a } - if len(x.ParamsStoreMerkleHash) > 0 { - i -= len(x.ParamsStoreMerkleHash) - copy(dAtA[i:], x.ParamsStoreMerkleHash) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.ParamsStoreMerkleHash))) + if len(x.MintStoreMerkleHash) > 0 { + i -= len(x.MintStoreMerkleHash) + copy(dAtA[i:], x.MintStoreMerkleHash) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.MintStoreMerkleHash))) i-- dAtA[i] = 0x12 } @@ -8577,7 +8577,7 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { iNdEx = postIndex case 2: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ParamsStoreMerkleHash", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field MintStoreMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -8604,14 +8604,14 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.ParamsStoreMerkleHash = append(x.ParamsStoreMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if x.ParamsStoreMerkleHash == nil { - x.ParamsStoreMerkleHash = []byte{} + x.MintStoreMerkleHash = append(x.MintStoreMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if x.MintStoreMerkleHash == nil { + x.MintStoreMerkleHash = []byte{} } iNdEx = postIndex case 3: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field IcahostToMintStoresMerkleHash", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ParamsToRestakeStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -8638,14 +8638,14 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.IcahostToMintStoresMerkleHash = append(x.IcahostToMintStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if x.IcahostToMintStoresMerkleHash == nil { - x.IcahostToMintStoresMerkleHash = []byte{} + x.ParamsToRestakeStoresMerkleHash = append(x.ParamsToRestakeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if x.ParamsToRestakeStoresMerkleHash == nil { + x.ParamsToRestakeStoresMerkleHash = []byte{} } iNdEx = postIndex case 4: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RestakeToStakingStoresMerkleHash", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RollingseedToTransferStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -8672,14 +8672,14 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.RestakeToStakingStoresMerkleHash = append(x.RestakeToStakingStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if x.RestakeToStakingStoresMerkleHash == nil { - x.RestakeToStakingStoresMerkleHash = []byte{} + x.RollingseedToTransferStoresMerkleHash = append(x.RollingseedToTransferStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if x.RollingseedToTransferStoresMerkleHash == nil { + x.RollingseedToTransferStoresMerkleHash = []byte{} } iNdEx = postIndex case 5: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field TransferToUpgradeStoresMerkleHash", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field TssToUpgradeStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -8706,14 +8706,14 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.TransferToUpgradeStoresMerkleHash = append(x.TransferToUpgradeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if x.TransferToUpgradeStoresMerkleHash == nil { - x.TransferToUpgradeStoresMerkleHash = []byte{} + x.TssToUpgradeStoresMerkleHash = append(x.TssToUpgradeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if x.TssToUpgradeStoresMerkleHash == nil { + x.TssToUpgradeStoresMerkleHash = []byte{} } iNdEx = postIndex case 6: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field AuthToIbcStoresMerkleHash", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field AuthToIcahostStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -8740,9 +8740,9 @@ func (x *fastReflection_MultiStoreProof) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.AuthToIbcStoresMerkleHash = append(x.AuthToIbcStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if x.AuthToIbcStoresMerkleHash == nil { - x.AuthToIbcStoresMerkleHash = []byte{} + x.AuthToIcahostStoresMerkleHash = append(x.AuthToIcahostStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if x.AuthToIcahostStoresMerkleHash == nil { + x.AuthToIcahostStoresMerkleHash = []byte{} } iNdEx = postIndex default: @@ -12024,32 +12024,32 @@ func (x *BlockRelayProof) GetSignatures() []*TMSignature { // / \ / \ // _____[N20]_____ ____[N21]______ ____[N22]______ _[N23]_ // / \ / \ / \ / \ -// _[N12]_ _[N13]_ _[N14]_ _[N15]_ _[N16]_ _[N17]_ [N18] [N19] -// / \ / \ / \ / \ / \ / \ / \ / \ -// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [N8] [N9] [N10] [N11] [O] [P] [Q] [R] +// _[N12]_ _[N13]_ _[N14]_ _[N15]_ _[N16]_ _[N17]_ [N18] [Q] +// / \ / \ / \ / \ / \ / \ / \ +// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [N8] [N9] [N10] [N11] [O] [P] // / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ // [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] [C] [D] [E] [F] [G] [H] [I] [J] [K] [L] [M] [N] // -// [0] - acc (auth) [1] - authz [2] - bandtss [3] - bank [4] - capability [5] - consensus -// [6] - crisis [7] - distribution [8] - evidence [9] - feeds [A] - feegrant [B] - feeibc -// [C] - globalfee [D] - gov [E] - group [F] - ibc [G] - icahost [H] - mint -// [I] - oracle [J] - params [K] - restake [L] - rollingseed [M] - slashing [N] - staking -// [O] - transfer [P] - tss [Q] - tunnel [R] - upgrade +// [0] - acc (auth) [1] - authz [2] - bandtss [3] - bank [4] - capability [5] - consensus +// [6] - crisis [7] - distribution [8] - evidence [9] - feeds [A] - feegrant [B] - feeibc +// [C] - globalfee [D] - gov [E] - ibc [F] - icahost [G] - mint [H] - oracle +// [I] - params [J] - restake [K] - rollingseed [L] - slashing [M] - staking [N] - transfer +// [O] - tss [P] - tunnel [Q] - upgrade // // Notice that NOT all leaves of the Merkle tree are needed in order to compute the Merkle -// root hash, since we only want to validate the correctness of [I] In fact, only -// [J], [N8], [N17], [N23], and [N24] are needed in order to compute [AppHash]. +// root hash, since we only want to validate the correctness of [H] In fact, only +// [G], [N9], [N17], [N23], and [N24] are needed in order to compute [AppHash]. type MultiStoreProof struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - OracleIavlStateHash []byte `protobuf:"bytes,1,opt,name=oracle_iavl_state_hash,json=oracleIavlStateHash,proto3" json:"oracle_iavl_state_hash,omitempty"` - ParamsStoreMerkleHash []byte `protobuf:"bytes,2,opt,name=params_store_merkle_hash,json=paramsStoreMerkleHash,proto3" json:"params_store_merkle_hash,omitempty"` - IcahostToMintStoresMerkleHash []byte `protobuf:"bytes,3,opt,name=icahost_to_mint_stores_merkle_hash,json=icahostToMintStoresMerkleHash,proto3" json:"icahost_to_mint_stores_merkle_hash,omitempty"` - RestakeToStakingStoresMerkleHash []byte `protobuf:"bytes,4,opt,name=restake_to_staking_stores_merkle_hash,json=restakeToStakingStoresMerkleHash,proto3" json:"restake_to_staking_stores_merkle_hash,omitempty"` - TransferToUpgradeStoresMerkleHash []byte `protobuf:"bytes,5,opt,name=transfer_to_upgrade_stores_merkle_hash,json=transferToUpgradeStoresMerkleHash,proto3" json:"transfer_to_upgrade_stores_merkle_hash,omitempty"` - AuthToIbcStoresMerkleHash []byte `protobuf:"bytes,6,opt,name=auth_to_ibc_stores_merkle_hash,json=authToIbcStoresMerkleHash,proto3" json:"auth_to_ibc_stores_merkle_hash,omitempty"` + OracleIavlStateHash []byte `protobuf:"bytes,1,opt,name=oracle_iavl_state_hash,json=oracleIavlStateHash,proto3" json:"oracle_iavl_state_hash,omitempty"` + MintStoreMerkleHash []byte `protobuf:"bytes,2,opt,name=mint_store_merkle_hash,json=mintStoreMerkleHash,proto3" json:"mint_store_merkle_hash,omitempty"` + ParamsToRestakeStoresMerkleHash []byte `protobuf:"bytes,3,opt,name=params_to_restake_stores_merkle_hash,json=paramsToRestakeStoresMerkleHash,proto3" json:"params_to_restake_stores_merkle_hash,omitempty"` + RollingseedToTransferStoresMerkleHash []byte `protobuf:"bytes,4,opt,name=rollingseed_to_transfer_stores_merkle_hash,json=rollingseedToTransferStoresMerkleHash,proto3" json:"rollingseed_to_transfer_stores_merkle_hash,omitempty"` + TssToUpgradeStoresMerkleHash []byte `protobuf:"bytes,5,opt,name=tss_to_upgrade_stores_merkle_hash,json=tssToUpgradeStoresMerkleHash,proto3" json:"tss_to_upgrade_stores_merkle_hash,omitempty"` + AuthToIcahostStoresMerkleHash []byte `protobuf:"bytes,6,opt,name=auth_to_icahost_stores_merkle_hash,json=authToIcahostStoresMerkleHash,proto3" json:"auth_to_icahost_stores_merkle_hash,omitempty"` } func (x *MultiStoreProof) Reset() { @@ -12079,37 +12079,37 @@ func (x *MultiStoreProof) GetOracleIavlStateHash() []byte { return nil } -func (x *MultiStoreProof) GetParamsStoreMerkleHash() []byte { +func (x *MultiStoreProof) GetMintStoreMerkleHash() []byte { if x != nil { - return x.ParamsStoreMerkleHash + return x.MintStoreMerkleHash } return nil } -func (x *MultiStoreProof) GetIcahostToMintStoresMerkleHash() []byte { +func (x *MultiStoreProof) GetParamsToRestakeStoresMerkleHash() []byte { if x != nil { - return x.IcahostToMintStoresMerkleHash + return x.ParamsToRestakeStoresMerkleHash } return nil } -func (x *MultiStoreProof) GetRestakeToStakingStoresMerkleHash() []byte { +func (x *MultiStoreProof) GetRollingseedToTransferStoresMerkleHash() []byte { if x != nil { - return x.RestakeToStakingStoresMerkleHash + return x.RollingseedToTransferStoresMerkleHash } return nil } -func (x *MultiStoreProof) GetTransferToUpgradeStoresMerkleHash() []byte { +func (x *MultiStoreProof) GetTssToUpgradeStoresMerkleHash() []byte { if x != nil { - return x.TransferToUpgradeStoresMerkleHash + return x.TssToUpgradeStoresMerkleHash } return nil } -func (x *MultiStoreProof) GetAuthToIbcStoresMerkleHash() []byte { +func (x *MultiStoreProof) GetAuthToIcahostStoresMerkleHash() []byte { if x != nil { - return x.AuthToIbcStoresMerkleHash + return x.AuthToIcahostStoresMerkleHash } return nil } @@ -12562,7 +12562,7 @@ var file_band_base_oracle_v1_proof_proto_rawDesc = []byte{ 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x4d, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, - 0x8f, 0x06, 0x0a, 0x0f, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x50, 0x72, + 0x97, 0x06, 0x0a, 0x0f, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x80, 0x01, 0x0a, 0x16, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x5f, 0x69, 0x61, 0x76, 0x6c, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x4b, 0xe2, 0xde, 0x1f, 0x13, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, @@ -12571,172 +12571,173 @@ var file_band_base_oracle_v1_proof_proto_rawDesc = []byte{ 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x13, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x49, 0x61, 0x76, 0x6c, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x6d, 0x0a, 0x18, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, - 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, - 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, - 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x15, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4d, 0x65, 0x72, 0x6b, 0x6c, - 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x7f, 0x0a, 0x22, 0x69, 0x63, 0x61, 0x68, 0x6f, 0x73, 0x74, - 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x69, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x5f, - 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, - 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x1d, 0x69, 0x63, 0x61, 0x68, 0x6f, 0x73, 0x74, - 0x54, 0x6f, 0x4d, 0x69, 0x6e, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x4d, 0x65, 0x72, 0x6b, - 0x6c, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x85, 0x01, 0x0a, 0x25, 0x72, 0x65, 0x73, 0x74, 0x61, - 0x6b, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, - 0x6f, 0x72, 0x65, 0x73, 0x5f, 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, + 0x74, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x69, 0x0a, 0x16, 0x6d, 0x69, 0x6e, 0x74, 0x5f, 0x73, + 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, - 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x20, 0x72, 0x65, - 0x73, 0x74, 0x61, 0x6b, 0x65, 0x54, 0x6f, 0x53, 0x74, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, - 0x6f, 0x72, 0x65, 0x73, 0x4d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x87, - 0x01, 0x0a, 0x26, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x5f, 0x74, 0x6f, 0x5f, 0x75, - 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x5f, 0x6d, 0x65, - 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x42, - 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x21, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x54, - 0x6f, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x4d, 0x65, - 0x72, 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x77, 0x0a, 0x1e, 0x61, 0x75, 0x74, 0x68, - 0x5f, 0x74, 0x6f, 0x5f, 0x69, 0x62, 0x63, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x5f, 0x6d, - 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, + 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x13, 0x6d, 0x69, + 0x6e, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, + 0x68, 0x12, 0x83, 0x01, 0x0a, 0x24, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x5f, 0x74, 0x6f, 0x5f, + 0x72, 0x65, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x5f, 0x6d, + 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, - 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x19, 0x61, 0x75, 0x74, 0x68, 0x54, 0x6f, 0x49, 0x62, - 0x63, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x4d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, - 0x68, 0x22, 0xb6, 0x05, 0x0a, 0x16, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x4d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x50, 0x61, 0x72, 0x74, 0x73, 0x12, 0x6e, 0x0a, 0x19, - 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x63, 0x68, 0x61, 0x69, - 0x6e, 0x5f, 0x69, 0x64, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, - 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x15, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x6e, - 0x64, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x48, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x63, - 0x6f, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x53, - 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6e, 0x61, - 0x6e, 0x6f, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x61, 0x6e, 0x6f, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x12, - 0x6a, 0x0a, 0x17, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, - 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, - 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, - 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x13, 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, - 0x6b, 0x49, 0x64, 0x41, 0x6e, 0x64, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x12, 0x87, 0x01, 0x0a, 0x26, - 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x68, - 0x61, 0x73, 0x68, 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, - 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, + 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x1f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x54, 0x6f, + 0x52, 0x65, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x4d, 0x65, 0x72, + 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x8f, 0x01, 0x0a, 0x2a, 0x72, 0x6f, 0x6c, 0x6c, + 0x69, 0x6e, 0x67, 0x73, 0x65, 0x65, 0x64, 0x5f, 0x74, 0x6f, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x66, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x5f, 0x6d, 0x65, 0x72, 0x6b, 0x6c, + 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, - 0x65, 0x73, 0x52, 0x21, 0x6e, 0x65, 0x78, 0x74, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, - 0x72, 0x48, 0x61, 0x73, 0x68, 0x41, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, - 0x73, 0x48, 0x61, 0x73, 0x68, 0x12, 0x60, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x65, - 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, - 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, - 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x73, 0x75, - 0x6c, 0x74, 0x73, 0x48, 0x61, 0x73, 0x68, 0x12, 0x71, 0x0a, 0x1a, 0x65, 0x76, 0x69, 0x64, 0x65, - 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, - 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, - 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, - 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, - 0x73, 0x52, 0x17, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x41, 0x6e, 0x64, 0x50, 0x72, - 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x22, 0xdf, 0x01, 0x0a, 0x15, 0x43, - 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x56, 0x6f, 0x74, 0x65, - 0x50, 0x61, 0x72, 0x74, 0x12, 0x62, 0x0a, 0x12, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x64, - 0x61, 0x74, 0x61, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, - 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, - 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x10, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x44, 0x61, - 0x74, 0x61, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x62, 0x0a, 0x12, 0x73, 0x69, 0x67, 0x6e, - 0x65, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x18, 0x02, + 0x65, 0x73, 0x52, 0x25, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x73, 0x65, 0x65, 0x64, 0x54, + 0x6f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x4d, + 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x7d, 0x0a, 0x21, 0x74, 0x73, 0x73, + 0x5f, 0x74, 0x6f, 0x5f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, + 0x65, 0x73, 0x5f, 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, + 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x1c, 0x74, 0x73, 0x73, 0x54, + 0x6f, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x4d, 0x65, + 0x72, 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x7f, 0x0a, 0x22, 0x61, 0x75, 0x74, 0x68, + 0x5f, 0x74, 0x6f, 0x5f, 0x69, 0x63, 0x61, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, + 0x65, 0x73, 0x5f, 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, - 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x10, 0x73, 0x69, 0x67, 0x6e, - 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x22, 0x86, 0x02, 0x0a, - 0x0b, 0x54, 0x4d, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x42, 0x0a, 0x01, - 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, + 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x1d, 0x61, 0x75, 0x74, 0x68, + 0x54, 0x6f, 0x49, 0x63, 0x61, 0x68, 0x6f, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x73, 0x4d, + 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x48, 0x61, 0x73, 0x68, 0x22, 0xb6, 0x05, 0x0a, 0x16, 0x42, 0x6c, + 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x50, + 0x61, 0x72, 0x74, 0x73, 0x12, 0x6e, 0x0a, 0x19, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, + 0x61, 0x6e, 0x64, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x5f, 0x68, 0x61, 0x73, + 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, - 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x01, 0x72, - 0x12, 0x42, 0x0a, 0x01, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, - 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, - 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, - 0x73, 0x52, 0x01, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x01, 0x76, 0x12, 0x61, 0x0a, 0x11, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, - 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, - 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, - 0x74, 0x65, 0x73, 0x52, 0x10, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x92, 0x01, 0x0a, 0x12, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x4c, 0x0a, 0x0c, - 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, - 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x41, 0x56, 0x4c, 0x4d, 0x65, 0x72, - 0x6b, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x6d, - 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x73, 0x32, 0xbc, 0x03, 0x0a, 0x07, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7f, 0x0a, 0x05, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, - 0x21, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, - 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, - 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, - 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x72, - 0x61, 0x63, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x2f, 0x7b, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x4d, 0x75, 0x6c, 0x74, - 0x69, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x26, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, - 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, - 0x74, 0x69, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, + 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x15, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, + 0x48, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1f, 0x0a, 0x0b, + 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x12, 0x28, 0x0a, + 0x10, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, + 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x61, 0x6e, + 0x6f, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x12, 0x6a, 0x0a, 0x17, 0x6c, 0x61, 0x73, 0x74, 0x5f, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x6f, 0x74, 0x68, + 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, + 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x13, + 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x41, 0x6e, 0x64, 0x4f, 0x74, + 0x68, 0x65, 0x72, 0x12, 0x87, 0x01, 0x0a, 0x26, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x76, 0x61, 0x6c, + 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x61, 0x6e, 0x64, 0x5f, + 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, + 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x21, 0x6e, 0x65, 0x78, 0x74, + 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x48, 0x61, 0x73, 0x68, 0x41, 0x6e, 0x64, + 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x48, 0x61, 0x73, 0x68, 0x12, 0x60, 0x0a, + 0x11, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f, 0x68, 0x61, + 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, + 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x0f, + 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x48, 0x61, 0x73, 0x68, 0x12, + 0x71, 0x0a, 0x1a, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x6e, 0x64, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x17, 0x65, 0x76, 0x69, 0x64, 0x65, + 0x6e, 0x63, 0x65, 0x41, 0x6e, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x48, 0x61, + 0x73, 0x68, 0x22, 0xdf, 0x01, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x45, 0x6e, 0x63, + 0x6f, 0x64, 0x65, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x50, 0x61, 0x72, 0x74, 0x12, 0x62, 0x0a, 0x12, + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x72, 0x65, 0x66, + 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, + 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x10, + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, + 0x12, 0x62, 0x0a, 0x12, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, + 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, + 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, + 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, + 0x65, 0x73, 0x52, 0x10, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x53, 0x75, + 0x66, 0x66, 0x69, 0x78, 0x22, 0x86, 0x02, 0x0a, 0x0b, 0x54, 0x4d, 0x53, 0x69, 0x67, 0x6e, 0x61, + 0x74, 0x75, 0x72, 0x65, 0x12, 0x42, 0x0a, 0x01, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, + 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, + 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x01, 0x72, 0x12, 0x42, 0x0a, 0x01, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x01, 0x73, 0x12, 0x0c, 0x0a, 0x01, + 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x01, 0x76, 0x12, 0x61, 0x0a, 0x11, 0x65, 0x6e, + 0x63, 0x6f, 0x64, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x34, 0xfa, 0xde, 0x1f, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x6c, 0x69, 0x62, 0x73, 0x2f, 0x62, 0x79, 0x74, + 0x65, 0x73, 0x2e, 0x48, 0x65, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x52, 0x10, 0x65, 0x6e, 0x63, + 0x6f, 0x64, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x92, 0x01, + 0x0a, 0x12, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x50, + 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x4c, 0x0a, 0x0c, 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x5f, 0x70, + 0x61, 0x74, 0x68, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x62, 0x61, 0x6e, + 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x49, 0x41, 0x56, 0x4c, 0x4d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x42, + 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x6d, 0x65, 0x72, 0x6b, 0x6c, 0x65, 0x50, 0x61, 0x74, + 0x68, 0x73, 0x32, 0xbc, 0x03, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7f, + 0x0a, 0x05, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x21, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, + 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, + 0x6f, 0x6f, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x62, 0x61, 0x6e, + 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x63, 0x68, 0x61, + 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, + 0x6f, 0x66, 0x2f, 0x7b, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x7d, 0x12, + 0x87, 0x01, 0x0a, 0x0a, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x26, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, - 0x20, 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6f, - 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x70, 0x72, 0x6f, 0x6f, - 0x66, 0x12, 0xa5, 0x01, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x2d, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, - 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, - 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x12, 0x29, - 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x72, - 0x61, 0x63, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x42, 0xd7, 0x01, 0x0a, 0x17, 0x63, 0x6f, - 0x6d, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, - 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x50, 0x01, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x62, 0x61, 0x6e, 0x64, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x63, 0x68, 0x61, - 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x2f, 0x62, - 0x61, 0x73, 0x65, 0x2f, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6f, 0x72, - 0x61, 0x63, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x42, 0x42, 0x4f, 0xaa, 0x02, 0x13, 0x42, - 0x61, 0x6e, 0x64, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, - 0x56, 0x31, 0xca, 0x02, 0x13, 0x42, 0x61, 0x6e, 0x64, 0x5c, 0x42, 0x61, 0x73, 0x65, 0x5c, 0x4f, - 0x72, 0x61, 0x63, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1f, 0x42, 0x61, 0x6e, 0x64, 0x5c, - 0x42, 0x61, 0x73, 0x65, 0x5c, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, - 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x42, 0x61, 0x6e, - 0x64, 0x3a, 0x3a, 0x42, 0x61, 0x73, 0x65, 0x3a, 0x3a, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x3a, - 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, + 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x75, 0x6c, + 0x74, 0x69, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x63, 0x68, + 0x61, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2f, 0x6d, 0x75, + 0x6c, 0x74, 0x69, 0x5f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0xa5, 0x01, 0x0a, 0x11, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, + 0x2d, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, + 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, + 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x12, 0x29, 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x63, 0x68, 0x61, + 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x6f, + 0x66, 0x42, 0xd7, 0x01, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x62, 0x61, 0x6e, 0x64, 0x2e, 0x62, + 0x61, 0x73, 0x65, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x50, + 0x72, 0x6f, 0x6f, 0x66, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x41, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x62, 0x61, 0x6e, 0x64, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x6f, 0x72, 0x61, 0x63, + 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, + 0x03, 0x42, 0x42, 0x4f, 0xaa, 0x02, 0x13, 0x42, 0x61, 0x6e, 0x64, 0x2e, 0x42, 0x61, 0x73, 0x65, + 0x2e, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x13, 0x42, 0x61, 0x6e, + 0x64, 0x5c, 0x42, 0x61, 0x73, 0x65, 0x5c, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x5c, 0x56, 0x31, + 0xe2, 0x02, 0x1f, 0x42, 0x61, 0x6e, 0x64, 0x5c, 0x42, 0x61, 0x73, 0x65, 0x5c, 0x4f, 0x72, 0x61, + 0x63, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x16, 0x42, 0x61, 0x6e, 0x64, 0x3a, 0x3a, 0x42, 0x61, 0x73, 0x65, 0x3a, + 0x3a, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/client/grpc/oracle/proof/abi.go b/client/grpc/oracle/proof/abi.go index d7aa4700d..ecb5bc8c3 100644 --- a/client/grpc/oracle/proof/abi.go +++ b/client/grpc/oracle/proof/abi.go @@ -11,27 +11,27 @@ var relayFormat = []byte(` }, { "internalType": "bytes32", - "name": "paramsStoreMerkleHash", + "name": "mintStoreMerkleHash", "type": "bytes32" }, { "internalType": "bytes32", - "name": "icahostToMintStoresMerkleHash", + "name": "paramsToRestakeStoresMerkleHash", "type": "bytes32" }, { "internalType": "bytes32", - "name": "restakeToStakingStoresMerkleHash", + "name": "rollingseedToTransferStoresMerkleHash", "type": "bytes32" }, { "internalType": "bytes32", - "name": "transferToUpgradeStoresMerkleHash", + "name": "tssToUpgradeStoresMerkleHash", "type": "bytes32" }, { "internalType": "bytes32", - "name": "authToIbcStoresMerkleHash", + "name": "authToIcahostStoresMerkleHash", "type": "bytes32" } ], diff --git a/client/grpc/oracle/proof/multi_store.go b/client/grpc/oracle/proof/multi_store.go index 0b25f1d8c..d239b562f 100644 --- a/client/grpc/oracle/proof/multi_store.go +++ b/client/grpc/oracle/proof/multi_store.go @@ -10,33 +10,33 @@ import ( // MultiStoreProofEthereum is an Ethereum version of MultiStoreProof for solidity ABI-encoding. type MultiStoreProofEthereum struct { - OracleIAVLStateHash common.Hash - ParamsStoreMerkleHash common.Hash - IcahostToMintStoresMerkleHash common.Hash - RestakeToStakingStoresMerkleHash common.Hash - TransferToUpgradeStoresMerkleHash common.Hash - AuthToIbcStoresMerkleHash common.Hash + OracleIAVLStateHash common.Hash + MintStoreMerkleHash common.Hash + ParamsToRestakeStoresMerkleHash common.Hash + RollingseedToTransferStoresMerkleHash common.Hash + TssToUpgradeStoresMerkleHash common.Hash + AuthToIcahostStoresMerkleHash common.Hash } func (m *MultiStoreProof) encodeToEthFormat() MultiStoreProofEthereum { return MultiStoreProofEthereum{ - OracleIAVLStateHash: common.BytesToHash(m.OracleIAVLStateHash), - ParamsStoreMerkleHash: common.BytesToHash(m.ParamsStoreMerkleHash), - IcahostToMintStoresMerkleHash: common.BytesToHash(m.IcahostToMintStoresMerkleHash), - RestakeToStakingStoresMerkleHash: common.BytesToHash(m.RestakeToStakingStoresMerkleHash), - TransferToUpgradeStoresMerkleHash: common.BytesToHash(m.TransferToUpgradeStoresMerkleHash), - AuthToIbcStoresMerkleHash: common.BytesToHash(m.AuthToIbcStoresMerkleHash), + OracleIAVLStateHash: common.BytesToHash(m.OracleIAVLStateHash), + MintStoreMerkleHash: common.BytesToHash(m.MintStoreMerkleHash), + ParamsToRestakeStoresMerkleHash: common.BytesToHash(m.ParamsToRestakeStoresMerkleHash), + RollingseedToTransferStoresMerkleHash: common.BytesToHash(m.RollingseedToTransferStoresMerkleHash), + TssToUpgradeStoresMerkleHash: common.BytesToHash(m.TssToUpgradeStoresMerkleHash), + AuthToIcahostStoresMerkleHash: common.BytesToHash(m.AuthToIcahostStoresMerkleHash), } } // GetMultiStoreProof compacts Multi store proof from Tendermint to MultiStoreProof version. func GetMultiStoreProof(multiStoreEp *ics23.ExistenceProof) MultiStoreProof { return MultiStoreProof{ - OracleIAVLStateHash: tmbytes.HexBytes(multiStoreEp.Value), - ParamsStoreMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[0].Suffix), - IcahostToMintStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[1].Prefix[1:]), - RestakeToStakingStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[2].Suffix), - TransferToUpgradeStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[3].Suffix), - AuthToIbcStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[4].Prefix[1:]), + OracleIAVLStateHash: tmbytes.HexBytes(multiStoreEp.Value), + MintStoreMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[0].Prefix[1:]), + ParamsToRestakeStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[1].Suffix), + RollingseedToTransferStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[2].Suffix), + TssToUpgradeStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[3].Suffix), + AuthToIcahostStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[4].Prefix[1:]), } } diff --git a/client/grpc/oracle/proof/multi_store_test.go b/client/grpc/oracle/proof/multi_store_test.go index 2c407f243..0866c5f2f 100644 --- a/client/grpc/oracle/proof/multi_store_test.go +++ b/client/grpc/oracle/proof/multi_store_test.go @@ -30,16 +30,16 @@ query at localhost:26657/abci_query?path="/store/oracle/key"&data=0xc00000000000 { "type": "ics23:iavl", "key": "wAAAAAAAAAA=", - "data": "EpADCgjAAAAAAAAAABK2AQoBBhIdCBAQEBiAAiCABChkMNCGA0ADSEZQgOCllrsRWAEaDAgBGAEgASoEAAKYASIsCAESBQQG7hAgGiEgL9OKizGo0Z4tLP9KaLTbPfPi2jAZVEgXXK18Znu4V9EiKggBEiYGCu4QIGlHkf33ommIkdMfhPuQ14UG07Xp7lKmlq9ZNJSfVOlzICIqCAESJggY0GcgWmuKQaZpAh5otqBxJfSoJWrASawo/qPB1V5shwYbbgYgGsoBCgHwEgZvcmFjbGUaCwgBGAEgASoDAAICIiwIARIFAgTuECAaISAeDSwCB2vKaX7NoctkSGZ+6OCwUOgp6yg4Ye20FyJXSiIqCAESJgQG7hAgzL3GBeV7EMxT1yR/MzvVQdVSa8kOaTp4k0AkbuqN7XcgIioIARImBgruECBpR5H996JpiJHTH4T7kNeFBtO16e5SppavWTSUn1TpcyAiKggBEiYIGNBnIFprikGmaQIeaLagcSX0qCVqwEmsKP6jwdVebIcGG24GIA==" + "data": "Eo8DCgjAAAAAAAAAABK1AQoBBhIdCBAQEBiAAiCABChkMNCGA0ADSEZQgOCllrsRWAEaCwgBGAEgASoDAAICIiwIARIFBAaIAiAaISBtvVJ2ZZMSBA4nAMaNXfsRtGLoznC27KcRDwrP60ri1iIqCAESJgYOiAIgwO31fJMlSzouPSDyx4iA998Nt4loM7tLOEWgMKbocKcgIioIARImCBaWAiCrrKlcH2vL7Ylz/D9VqneIhV5LIB9F77VaZ4vPuA2oRCAaygEKAfASBm9yYWNsZRoLCAEYASABKgMAAgIiLAgBEgUCBIgCIBohIIAGWiNcyyPZ8yTKukJcK2Mn8OmpQ6uNjsa8Zp1P07WUIioIARImBAaIAiBgGbJRw5Nm8BZQIg/QP722R1a7TmNh1PnxcjVqJYmKfSAiKggBEiYGDogCIMDt9XyTJUs6Lj0g8seIgPffDbeJaDO7SzhFoDCm6HCnICIqCAESJggWlgIgq6ypXB9ry+2Jc/w/Vap3iIVeSyAfRe+1WmeLz7gNqEQg" }, { "type": "ics23:simple", "key": "b3JhY2xl", - "data": "Cv4BCgZvcmFjbGUSIKlGw34VS+Fki9oMhwxL5Augva71DvOvN6SD4WqsMjAjGgkIARgBIAEqAQAiJwgBEgEBGiCI0bT8lYEcR7qf3dcswRSJQN0ZgJdSo0ioy2uIsi/bZSIlCAESIQFjDp0uLX5qOZ6OLF4/FVCnrviBSSHovSU4TVjJiaS2myInCAESAQEaICjBhguC1q2OSs82GtyruVNh5egqJ15XXOcnOk6HMuJcIicIARIBARogaTJx7rOygthReqj7mtQImvchyp0oRDKbBMhhEN/zjpUiJQgBEiEB8dVwesb0WvvZh6/6bec9nDEIE+ms2MlXWKvAFKRT3fs=" + "data": "Cv4BCgZvcmFjbGUSILWuAqi7QA1Y943STZKRzdhqI/oM/3sihXiy0WvbYyjtGgkIARgBIAEqAQAiJQgBEiEBXVOth1oJa51+x41GKsXabapY7uL7OJssOImGEiPT298iJwgBEgEBGiDAh+1I3Z5vtDdvCoqbjqdXtDqMS2OQUuNb9RLtMehqtiInCAESAQEaIDqK5Rpdb442lPE4nvtBIBBC+gc6duYo7pQ4EWrTGTZjIicIARIBARogxinvyHFSBjSggcRdbDRvGaaNqaNLpwZ36rA6wxPCgW8iJQgBEiEBPO/QdDCqwo6da1w04OySSpstZJxfeGYlKuwfwmlBFOI=" } ] }, - "height": "6632", + "height": "139", "codespace": "" } } @@ -49,7 +49,7 @@ query at localhost:26657/abci_query?path="/store/oracle/key"&data=0xc00000000000 func TestGetMultiStoreProof(t *testing.T) { key := []byte("oracle") data := base64ToBytes( - "Cv4BCgZvcmFjbGUSIKlGw34VS+Fki9oMhwxL5Augva71DvOvN6SD4WqsMjAjGgkIARgBIAEqAQAiJwgBEgEBGiCI0bT8lYEcR7qf3dcswRSJQN0ZgJdSo0ioy2uIsi/bZSIlCAESIQFjDp0uLX5qOZ6OLF4/FVCnrviBSSHovSU4TVjJiaS2myInCAESAQEaICjBhguC1q2OSs82GtyruVNh5egqJ15XXOcnOk6HMuJcIicIARIBARogaTJx7rOygthReqj7mtQImvchyp0oRDKbBMhhEN/zjpUiJQgBEiEB8dVwesb0WvvZh6/6bec9nDEIE+ms2MlXWKvAFKRT3fs=", + "Cv4BCgZvcmFjbGUSILWuAqi7QA1Y943STZKRzdhqI/oM/3sihXiy0WvbYyjtGgkIARgBIAEqAQAiJQgBEiEBXVOth1oJa51+x41GKsXabapY7uL7OJssOImGEiPT298iJwgBEgEBGiDAh+1I3Z5vtDdvCoqbjqdXtDqMS2OQUuNb9RLtMehqtiInCAESAQEaIDqK5Rpdb442lPE4nvtBIBBC+gc6duYo7pQ4EWrTGTZjIicIARIBARogxinvyHFSBjSggcRdbDRvGaaNqaNLpwZ36rA6wxPCgW8iJQgBEiEBPO/QdDCqwo6da1w04OySSpstZJxfeGYlKuwfwmlBFOI=", ) var multistoreOps storetypes.CommitmentOp @@ -74,19 +74,19 @@ func TestGetMultiStoreProof(t *testing.T) { prefix = append(prefix, 32) // size of result hash must be 32 apphash := innerHash( - m.AuthToIbcStoresMerkleHash, + m.AuthToIcahostStoresMerkleHash, innerHash( innerHash( innerHash( - m.IcahostToMintStoresMerkleHash, innerHash( + m.MintStoreMerkleHash, leafHash(append(prefix, tmhash.Sum(m.OracleIAVLStateHash)...)), - m.ParamsStoreMerkleHash, ), + m.ParamsToRestakeStoresMerkleHash, ), - m.RestakeToStakingStoresMerkleHash, + m.RollingseedToTransferStoresMerkleHash, ), - m.TransferToUpgradeStoresMerkleHash, + m.TssToUpgradeStoresMerkleHash, ), ) diff --git a/client/grpc/oracle/proof/proof.pb.go b/client/grpc/oracle/proof/proof.pb.go index 6c3129176..0660cbb2a 100644 --- a/client/grpc/oracle/proof/proof.pb.go +++ b/client/grpc/oracle/proof/proof.pb.go @@ -888,28 +888,28 @@ func (m *BlockRelayProof) GetSignatures() []TMSignature { // / \ / \ // _____[N20]_____ ____[N21]______ ____[N22]______ _[N23]_ // / \ / \ / \ / \ -// _[N12]_ _[N13]_ _[N14]_ _[N15]_ _[N16]_ _[N17]_ [N18] [N19] -// / \ / \ / \ / \ / \ / \ / \ / \ -// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [N8] [N9] [N10] [N11] [O] [P] [Q] [R] +// _[N12]_ _[N13]_ _[N14]_ _[N15]_ _[N16]_ _[N17]_ [N18] [Q] +// / \ / \ / \ / \ / \ / \ / \ +// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [N8] [N9] [N10] [N11] [O] [P] // / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ // [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] [C] [D] [E] [F] [G] [H] [I] [J] [K] [L] [M] [N] // -// [0] - acc (auth) [1] - authz [2] - bandtss [3] - bank [4] - capability [5] - consensus -// [6] - crisis [7] - distribution [8] - evidence [9] - feeds [A] - feegrant [B] - feeibc -// [C] - globalfee [D] - gov [E] - group [F] - ibc [G] - icahost [H] - mint -// [I] - oracle [J] - params [K] - restake [L] - rollingseed [M] - slashing [N] - staking -// [O] - transfer [P] - tss [Q] - tunnel [R] - upgrade +// [0] - acc (auth) [1] - authz [2] - bandtss [3] - bank [4] - capability [5] - consensus +// [6] - crisis [7] - distribution [8] - evidence [9] - feeds [A] - feegrant [B] - feeibc +// [C] - globalfee [D] - gov [E] - ibc [F] - icahost [G] - mint [H] - oracle +// [I] - params [J] - restake [K] - rollingseed [L] - slashing [M] - staking [N] - transfer +// [O] - tss [P] - tunnel [Q] - upgrade // // Notice that NOT all leaves of the Merkle tree are needed in order to compute the Merkle -// root hash, since we only want to validate the correctness of [I] In fact, only -// [J], [N8], [N17], [N23], and [N24] are needed in order to compute [AppHash]. +// root hash, since we only want to validate the correctness of [H] In fact, only +// [G], [N9], [N17], [N23], and [N24] are needed in order to compute [AppHash]. type MultiStoreProof struct { - OracleIAVLStateHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,1,opt,name=oracle_iavl_state_hash,json=oracleIavlStateHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"oracle_iavl_state_hash,omitempty"` - ParamsStoreMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,2,opt,name=params_store_merkle_hash,json=paramsStoreMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"params_store_merkle_hash,omitempty"` - IcahostToMintStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=icahost_to_mint_stores_merkle_hash,json=icahostToMintStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"icahost_to_mint_stores_merkle_hash,omitempty"` - RestakeToStakingStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,4,opt,name=restake_to_staking_stores_merkle_hash,json=restakeToStakingStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"restake_to_staking_stores_merkle_hash,omitempty"` - TransferToUpgradeStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,5,opt,name=transfer_to_upgrade_stores_merkle_hash,json=transferToUpgradeStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"transfer_to_upgrade_stores_merkle_hash,omitempty"` - AuthToIbcStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,6,opt,name=auth_to_ibc_stores_merkle_hash,json=authToIbcStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"auth_to_ibc_stores_merkle_hash,omitempty"` + OracleIAVLStateHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,1,opt,name=oracle_iavl_state_hash,json=oracleIavlStateHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"oracle_iavl_state_hash,omitempty"` + MintStoreMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,2,opt,name=mint_store_merkle_hash,json=mintStoreMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"mint_store_merkle_hash,omitempty"` + ParamsToRestakeStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=params_to_restake_stores_merkle_hash,json=paramsToRestakeStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"params_to_restake_stores_merkle_hash,omitempty"` + RollingseedToTransferStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,4,opt,name=rollingseed_to_transfer_stores_merkle_hash,json=rollingseedToTransferStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"rollingseed_to_transfer_stores_merkle_hash,omitempty"` + TssToUpgradeStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,5,opt,name=tss_to_upgrade_stores_merkle_hash,json=tssToUpgradeStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"tss_to_upgrade_stores_merkle_hash,omitempty"` + AuthToIcahostStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,6,opt,name=auth_to_icahost_stores_merkle_hash,json=authToIcahostStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"auth_to_icahost_stores_merkle_hash,omitempty"` } func (m *MultiStoreProof) Reset() { *m = MultiStoreProof{} } @@ -952,37 +952,37 @@ func (m *MultiStoreProof) GetOracleIAVLStateHash() github_com_cometbft_cometbft_ return nil } -func (m *MultiStoreProof) GetParamsStoreMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetMintStoreMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.ParamsStoreMerkleHash + return m.MintStoreMerkleHash } return nil } -func (m *MultiStoreProof) GetIcahostToMintStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetParamsToRestakeStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.IcahostToMintStoresMerkleHash + return m.ParamsToRestakeStoresMerkleHash } return nil } -func (m *MultiStoreProof) GetRestakeToStakingStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetRollingseedToTransferStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.RestakeToStakingStoresMerkleHash + return m.RollingseedToTransferStoresMerkleHash } return nil } -func (m *MultiStoreProof) GetTransferToUpgradeStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetTssToUpgradeStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.TransferToUpgradeStoresMerkleHash + return m.TssToUpgradeStoresMerkleHash } return nil } -func (m *MultiStoreProof) GetAuthToIbcStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetAuthToIcahostStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.AuthToIbcStoresMerkleHash + return m.AuthToIcahostStoresMerkleHash } return nil } @@ -1326,105 +1326,105 @@ func init() { func init() { proto.RegisterFile("band/base/oracle/v1/proof.proto", fileDescriptor_9deb752797273b09) } var fileDescriptor_9deb752797273b09 = []byte{ - // 1558 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x14, 0x47, - 0x16, 0x77, 0x7b, 0xc6, 0x86, 0x7d, 0x63, 0x63, 0xbb, 0x0c, 0x66, 0xec, 0x5d, 0xfc, 0xd1, 0x0b, - 0xd8, 0x2c, 0xda, 0x99, 0xe5, 0xe3, 0xb2, 0xda, 0xbd, 0xd8, 0xc0, 0xca, 0xd6, 0x62, 0x40, 0x33, - 0x5e, 0xaf, 0xb4, 0x5a, 0xa9, 0xb7, 0xa6, 0xbb, 0x3c, 0x53, 0x4b, 0x77, 0xd5, 0xd0, 0x55, 0x33, - 0x31, 0x44, 0x11, 0x51, 0x24, 0x12, 0x29, 0x97, 0x44, 0xc9, 0xdf, 0x90, 0x63, 0xc4, 0x2d, 0xa7, - 0xfc, 0x01, 0x1c, 0x91, 0x72, 0x48, 0x4e, 0x04, 0x99, 0x9c, 0xf2, 0x27, 0xe4, 0x14, 0xd5, 0x47, - 0xcf, 0xf4, 0xcc, 0x34, 0xd8, 0x61, 0x80, 0x5b, 0x75, 0xf5, 0xab, 0xdf, 0xef, 0xf7, 0xea, 0xbd, - 0x7a, 0xf5, 0x01, 0x4b, 0x35, 0xcc, 0x82, 0x72, 0x0d, 0x0b, 0x52, 0xe6, 0x31, 0xf6, 0x43, 0x52, - 0x6e, 0x5f, 0x2a, 0x37, 0x63, 0xce, 0xf7, 0x4a, 0xcd, 0x98, 0x4b, 0x8e, 0x66, 0x95, 0x41, 0x49, - 0x19, 0x94, 0x8c, 0x41, 0xa9, 0x7d, 0x69, 0xe1, 0x0f, 0x75, 0xce, 0xeb, 0x21, 0x29, 0xe3, 0x26, - 0x2d, 0x63, 0xc6, 0xb8, 0xc4, 0x92, 0x72, 0x26, 0xcc, 0x90, 0x85, 0x93, 0x75, 0x5e, 0xe7, 0xba, - 0x59, 0x56, 0x2d, 0xdb, 0xfb, 0x7b, 0xcd, 0xd4, 0x25, 0xb1, 0x68, 0xfa, 0xa7, 0x7b, 0x03, 0x26, - 0xee, 0x28, 0xd2, 0x0a, 0xb9, 0xd7, 0x22, 0x42, 0xa2, 0x33, 0x00, 0xb1, 0x69, 0x7a, 0x34, 0x28, - 0x3a, 0xcb, 0xce, 0x5a, 0xbe, 0xf2, 0x3b, 0xdb, 0xb3, 0x15, 0xa0, 0x39, 0x18, 0x6f, 0x10, 0x5a, - 0x6f, 0xc8, 0xe2, 0xe8, 0xb2, 0xb3, 0x96, 0xab, 0xd8, 0x2f, 0x37, 0x82, 0x49, 0x0b, 0x23, 0x9a, - 0x9c, 0x09, 0x92, 0x32, 0x74, 0xd2, 0x86, 0xe8, 0x3a, 0x8c, 0xc7, 0x44, 0xb4, 0x42, 0x03, 0x50, - 0xb8, 0x7c, 0xbe, 0x94, 0xe1, 0x66, 0xa9, 0x4a, 0x59, 0x3d, 0x24, 0x09, 0x62, 0x2b, 0x94, 0x1b, - 0xf9, 0x27, 0xcf, 0x96, 0x46, 0x2a, 0x76, 0xac, 0x7b, 0x15, 0x66, 0xb6, 0x5b, 0xa1, 0xa4, 0x3d, - 0xd2, 0x97, 0xa0, 0xd0, 0x95, 0x2e, 0x8a, 0xce, 0x72, 0x6e, 0x2d, 0x5f, 0x81, 0x8e, 0x76, 0xe1, - 0xde, 0x03, 0x94, 0x1e, 0x75, 0x88, 0xd2, 0x6b, 0x7d, 0x4a, 0xcf, 0x65, 0x2a, 0xed, 0x01, 0x1c, - 0x14, 0xba, 0x00, 0x45, 0x2b, 0xef, 0x1a, 0x6f, 0x31, 0x99, 0xd6, 0xeb, 0xee, 0xc3, 0x7c, 0xc6, - 0xbf, 0x37, 0xa2, 0xaa, 0x07, 0x70, 0x50, 0xd5, 0x63, 0x07, 0x66, 0x06, 0xa6, 0x18, 0xfd, 0x1d, - 0xc6, 0x74, 0xfe, 0x69, 0xc6, 0xc2, 0xe5, 0xe5, 0xc3, 0x22, 0x63, 0x41, 0xcd, 0x20, 0xf4, 0x5f, - 0x98, 0x22, 0xed, 0xc8, 0xd3, 0x1f, 0x5e, 0xed, 0xbe, 0x24, 0x42, 0x2b, 0x9c, 0xd8, 0xb8, 0xfa, - 0xcb, 0xb3, 0xa5, 0xbf, 0xd4, 0xa9, 0x6c, 0xb4, 0x6a, 0x25, 0x9f, 0x47, 0x65, 0x9f, 0x47, 0x44, - 0xd6, 0xf6, 0x64, 0xb7, 0x11, 0xd2, 0x9a, 0x28, 0xeb, 0x21, 0xa5, 0x4d, 0xb2, 0xbf, 0xa1, 0x1a, - 0x95, 0x49, 0xd2, 0x8e, 0x0c, 0x8b, 0xfa, 0x74, 0xbf, 0x76, 0x60, 0xba, 0x7f, 0xaa, 0xd1, 0xdf, - 0x7a, 0x05, 0x2f, 0x1d, 0x12, 0xa0, 0x77, 0xad, 0xb7, 0x3f, 0x08, 0x47, 0xd3, 0xdb, 0x1d, 0xf5, - 0x2e, 0xf5, 0x3e, 0x77, 0xa0, 0x90, 0x0a, 0x2d, 0x5a, 0x81, 0x89, 0x5a, 0xc8, 0xfd, 0xbb, 0x5e, - 0x2a, 0x09, 0xf3, 0x95, 0x82, 0xee, 0xdb, 0x34, 0x99, 0xb8, 0x0b, 0x33, 0x46, 0xb5, 0x17, 0x60, - 0x89, 0x8d, 0x30, 0x9b, 0x94, 0x67, 0x33, 0x3d, 0xbb, 0xad, 0x5b, 0xd7, 0xb1, 0xc4, 0x69, 0xf7, - 0xa6, 0x78, 0x6f, 0xb7, 0xc2, 0x35, 0xd4, 0x31, 0x09, 0xf1, 0x7d, 0x8b, 0x9b, 0x7b, 0x05, 0xee, - 0x86, 0xb2, 0xae, 0x28, 0xe3, 0x1e, 0xdc, 0x5a, 0x6f, 0xb7, 0xfb, 0xb3, 0x03, 0xd0, 0x4d, 0x86, - 0xa3, 0x78, 0x88, 0xe1, 0x74, 0xda, 0xc3, 0x48, 0x0d, 0xee, 0xf8, 0x99, 0xfb, 0x8d, 0x7e, 0x9e, - 0xec, 0xfa, 0x99, 0x52, 0xf1, 0xb6, 0x9c, 0xfd, 0xde, 0x01, 0xe8, 0x66, 0xd2, 0x51, 0x9c, 0xbd, - 0x05, 0x05, 0x5f, 0x0d, 0xe8, 0x09, 0xe4, 0x6a, 0xa6, 0x06, 0x5b, 0xb5, 0xc4, 0x40, 0xaa, 0x82, - 0xdf, 0xa5, 0x7c, 0x5b, 0x9e, 0x3d, 0x76, 0x60, 0xaa, 0x6f, 0x86, 0xd1, 0xd5, 0x4e, 0x51, 0x34, - 0x2b, 0x6b, 0xce, 0x10, 0xa4, 0x15, 0x0f, 0x56, 0x41, 0x54, 0x84, 0x63, 0x6d, 0x12, 0x0b, 0xca, - 0x99, 0xf6, 0x36, 0x5f, 0x49, 0x3e, 0xd1, 0x4d, 0x98, 0x88, 0x48, 0x7c, 0x37, 0x24, 0x5e, 0x13, - 0xcb, 0x86, 0x28, 0xe6, 0x74, 0xb4, 0xff, 0x98, 0x29, 0x7b, 0x6b, 0x7d, 0xf7, 0xe6, 0xb6, 0x36, - 0xbe, 0x83, 0x65, 0xc3, 0x52, 0x14, 0xa2, 0x4e, 0x8f, 0x70, 0x1f, 0x8d, 0xc2, 0x89, 0x5e, 0x2b, - 0xb4, 0x0a, 0xd3, 0x54, 0x98, 0xac, 0xe2, 0xcc, 0x8b, 0x3b, 0x31, 0x39, 0x5e, 0x99, 0xa4, 0x42, - 0xf9, 0x75, 0x9b, 0x55, 0x74, 0x54, 0xce, 0xc1, 0x09, 0xd1, 0xaa, 0xc9, 0x98, 0x10, 0x2f, 0xb5, - 0xef, 0x4e, 0x56, 0x26, 0x6d, 0xaf, 0x0d, 0xde, 0x0a, 0x4c, 0x24, 0x66, 0x82, 0x3e, 0x20, 0x7a, - 0x9e, 0xf3, 0x95, 0x82, 0xed, 0xab, 0xd2, 0x07, 0x04, 0xad, 0xc2, 0x54, 0x62, 0x92, 0x78, 0x9d, - 0xd7, 0x56, 0x09, 0xc1, 0xae, 0x75, 0xfe, 0xdf, 0x30, 0x21, 0x68, 0x2d, 0xa4, 0xac, 0xee, 0x35, - 0xb0, 0x68, 0x14, 0xc7, 0x86, 0xa8, 0x32, 0x05, 0x8b, 0xb4, 0x89, 0x45, 0xc3, 0xfd, 0x34, 0x07, - 0x53, 0x7d, 0x41, 0x56, 0x59, 0x62, 0x96, 0x95, 0x90, 0x3c, 0x26, 0x5e, 0xba, 0x3c, 0x9e, 0x7d, - 0x79, 0x39, 0xaf, 0x2a, 0xe3, 0x9e, 0x2c, 0x89, 0x7a, 0xbb, 0x51, 0x08, 0xf3, 0x49, 0xc2, 0xe3, - 0x80, 0xc4, 0x5e, 0x27, 0x9c, 0xb1, 0x14, 0x36, 0xb7, 0x2f, 0xbe, 0x3c, 0x0b, 0x37, 0xf5, 0xa0, - 0x24, 0x5e, 0xb1, 0x14, 0x96, 0x66, 0xae, 0x96, 0xf9, 0x17, 0x51, 0x28, 0xfa, 0x3c, 0x8a, 0x38, - 0xf3, 0x08, 0xf3, 0x79, 0x40, 0x02, 0xaf, 0xcd, 0xa5, 0x61, 0xb3, 0x29, 0xff, 0xa7, 0x97, 0xd4, - 0x7a, 0x35, 0xe8, 0x86, 0x19, 0xb3, 0xcb, 0xa5, 0x86, 0xb3, 0x5c, 0xa7, 0xfc, 0xac, 0x9f, 0xe8, - 0x1f, 0x00, 0x82, 0xd6, 0x19, 0x96, 0xad, 0x98, 0x88, 0x62, 0x5e, 0x27, 0x66, 0xf6, 0x4e, 0xbd, - 0xb3, 0x5d, 0x4d, 0x0c, 0x93, 0xe5, 0xd9, 0x1d, 0xe9, 0x7e, 0x36, 0x0e, 0x53, 0x7d, 0x73, 0x89, - 0x3e, 0x74, 0x60, 0xce, 0x16, 0x3c, 0x8a, 0xdb, 0xa1, 0x27, 0x24, 0x96, 0xc4, 0x24, 0x81, 0xa3, - 0x93, 0xe0, 0x9f, 0x07, 0xcf, 0x96, 0x66, 0xcd, 0xe2, 0x53, 0x09, 0x5d, 0x55, 0xff, 0x55, 0x68, - 0x5f, 0x2b, 0x37, 0x66, 0x0d, 0xd5, 0x16, 0x6e, 0x87, 0x1d, 0x20, 0x14, 0x41, 0xb1, 0x89, 0x63, - 0x1c, 0x09, 0x9b, 0x10, 0x36, 0x6e, 0x5a, 0xc3, 0x30, 0xdb, 0xdd, 0x29, 0x83, 0xaa, 0x9d, 0x35, - 0x91, 0xd3, 0x74, 0x0f, 0xc1, 0xa5, 0x3e, 0x6e, 0x70, 0x21, 0x3d, 0xc9, 0xbd, 0x88, 0x32, 0x69, - 0x78, 0x45, 0x0f, 0x71, 0x6e, 0x08, 0xe2, 0x33, 0x16, 0x7f, 0x87, 0x6f, 0x53, 0x26, 0x35, 0xbf, - 0x48, 0x09, 0x78, 0xe4, 0xc0, 0xb9, 0x98, 0x08, 0x89, 0xef, 0x12, 0xa5, 0x40, 0x35, 0xd4, 0xc2, - 0xcb, 0x10, 0x91, 0x1f, 0x42, 0xc4, 0xb2, 0xa5, 0xd8, 0xe1, 0x55, 0x43, 0x30, 0xa0, 0xe3, 0x13, - 0x07, 0xce, 0xcb, 0x18, 0x33, 0xb1, 0x47, 0x62, 0x25, 0xa4, 0xd5, 0xac, 0xc7, 0x38, 0x20, 0x59, - 0x42, 0x86, 0xa9, 0x07, 0x2b, 0x09, 0xc7, 0x0e, 0xff, 0x97, 0x61, 0x18, 0x50, 0xf2, 0x1e, 0x2c, - 0xe2, 0x96, 0x6c, 0x28, 0x11, 0xb4, 0xe6, 0x67, 0x09, 0x18, 0x1f, 0x42, 0xc0, 0xbc, 0xc2, 0xde, - 0xe1, 0x5b, 0x35, 0xbf, 0x9f, 0xd8, 0xfd, 0x66, 0x0c, 0xe6, 0xb2, 0x57, 0x3f, 0x62, 0x30, 0x6f, - 0x6b, 0xa6, 0x87, 0x59, 0xe0, 0xf9, 0x0d, 0x4c, 0x99, 0x47, 0x83, 0xf4, 0xd2, 0x78, 0xcd, 0xb4, - 0xb4, 0xb0, 0xeb, 0x2c, 0xb8, 0xa6, 0x40, 0xb7, 0x02, 0x3d, 0x07, 0xbd, 0xb7, 0xac, 0x7c, 0xe7, - 0xf0, 0xbf, 0x04, 0x05, 0x49, 0x23, 0xe2, 0x09, 0xe2, 0x73, 0x16, 0xd8, 0x2a, 0x0f, 0xaa, 0xab, - 0xaa, 0x7b, 0xd0, 0x1a, 0x4c, 0x6b, 0x03, 0x86, 0x19, 0x4f, 0xac, 0xf2, 0x7a, 0xc3, 0x38, 0xa1, - 0xfa, 0x6f, 0x61, 0xc6, 0xad, 0xe5, 0xff, 0xe1, 0x74, 0x88, 0x85, 0xf4, 0x4c, 0x95, 0xa4, 0x81, - 0x76, 0x8c, 0xcb, 0x06, 0x89, 0x87, 0x0a, 0xf0, 0xac, 0x02, 0xd5, 0xb3, 0xb8, 0x15, 0xac, 0xb3, - 0xe0, 0xb6, 0x02, 0xd4, 0xc9, 0xc5, 0xc8, 0xbe, 0xf4, 0xda, 0x38, 0xa4, 0x01, 0x96, 0x3c, 0xd6, - 0x33, 0x67, 0xe6, 0x52, 0xdd, 0x76, 0x98, 0x68, 0x89, 0xe1, 0x63, 0xbb, 0xa2, 0x38, 0x76, 0x13, - 0x0a, 0x35, 0x91, 0x6a, 0x5a, 0x13, 0x7c, 0x3d, 0xb1, 0xff, 0x83, 0x19, 0xed, 0xb5, 0x39, 0x01, - 0x58, 0xce, 0x63, 0x43, 0x70, 0x4e, 0x29, 0x38, 0x73, 0xba, 0x30, 0x0c, 0xf7, 0x60, 0x81, 0xb4, - 0x69, 0x40, 0x98, 0x4f, 0xb4, 0x7f, 0xcd, 0x98, 0x37, 0xb9, 0x20, 0xc6, 0xe3, 0xe2, 0xf1, 0x21, - 0xa8, 0x4e, 0x27, 0xb8, 0xeb, 0x2c, 0xb8, 0x63, 0x51, 0x75, 0xe2, 0xfe, 0xe8, 0xc0, 0xa9, 0xcc, - 0x9d, 0x04, 0xd5, 0x00, 0xa9, 0x92, 0x4f, 0x82, 0xe4, 0x88, 0x4e, 0xf6, 0xe8, 0xfe, 0x50, 0x09, - 0x3b, 0x6d, 0xf0, 0xcc, 0xd1, 0x4b, 0xa1, 0xf5, 0x73, 0x88, 0xd6, 0x9e, 0xe2, 0x18, 0x7d, 0x33, - 0x1c, 0x55, 0x8d, 0xe6, 0x7e, 0x3c, 0x0a, 0x85, 0xd4, 0x76, 0x86, 0x36, 0xc0, 0x89, 0x87, 0x72, - 0xc3, 0x89, 0x15, 0xc6, 0x70, 0x37, 0x28, 0x47, 0xa0, 0x09, 0x70, 0xda, 0x7a, 0x15, 0x4e, 0x56, - 0x9c, 0x36, 0xc2, 0x30, 0x93, 0x6c, 0xff, 0x6a, 0xb1, 0x09, 0x89, 0xa3, 0xe6, 0x50, 0x65, 0x7b, - 0xda, 0xc2, 0xed, 0x24, 0x68, 0xee, 0x17, 0x0e, 0xa0, 0xc1, 0xd3, 0x37, 0x3a, 0x09, 0x63, 0xfa, - 0xe4, 0x6d, 0xcf, 0xf5, 0xe6, 0xe3, 0x5d, 0x9d, 0x6f, 0x2f, 0x7f, 0x9b, 0x83, 0x63, 0x55, 0x12, - 0xb7, 0xa9, 0x4f, 0xd0, 0x43, 0x18, 0xb3, 0x37, 0x8e, 0x4c, 0xb0, 0xf4, 0xfb, 0xc7, 0x82, 0xfb, - 0x2a, 0x13, 0xf3, 0x0c, 0xe2, 0x96, 0x3f, 0xfa, 0xee, 0xa7, 0x2f, 0x47, 0x2f, 0xa0, 0xd5, 0xb2, - 0xb2, 0xd5, 0x85, 0xb7, 0xfb, 0x84, 0x65, 0x9e, 0xcb, 0xca, 0xef, 0x77, 0x5f, 0x7d, 0x3e, 0x50, - 0xb5, 0x26, 0x7d, 0xcb, 0x3b, 0x7f, 0xe8, 0xa3, 0x8d, 0xd1, 0xb2, 0x7a, 0xf8, 0xe3, 0x8e, 0x11, - 0xb4, 0xa6, 0x05, 0xb9, 0x68, 0x39, 0x53, 0x50, 0xea, 0x8a, 0x88, 0xbe, 0x72, 0x60, 0x66, 0xe0, - 0x7d, 0x07, 0xfd, 0xf9, 0x55, 0x37, 0xaa, 0x81, 0x37, 0xa2, 0x85, 0xd2, 0x51, 0xcd, 0xad, 0xbc, - 0x4b, 0x5a, 0xde, 0x45, 0x74, 0x21, 0x53, 0x9e, 0x9d, 0x28, 0xe1, 0xa5, 0x6e, 0x7a, 0x1b, 0xd5, - 0x27, 0x07, 0x8b, 0xce, 0xd3, 0x83, 0x45, 0xe7, 0xf9, 0xc1, 0xa2, 0xf3, 0xf9, 0x8b, 0xc5, 0x91, - 0xa7, 0x2f, 0x16, 0x47, 0x7e, 0x78, 0xb1, 0x38, 0xf2, 0x9f, 0xbf, 0xa6, 0x32, 0x56, 0xc1, 0xe9, - 0x17, 0x43, 0x9f, 0x87, 0x65, 0x8b, 0x7b, 0xa5, 0xec, 0x87, 0x94, 0x30, 0x59, 0xae, 0xc7, 0x4d, - 0xbf, 0x27, 0x26, 0xb5, 0x71, 0x6d, 0x7b, 0xe5, 0xd7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4f, 0xce, - 0xcb, 0x2b, 0xe6, 0x14, 0x00, 0x00, + // 1562 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5d, 0x6f, 0x13, 0xc7, + 0x1a, 0xce, 0xc6, 0x4e, 0xe0, 0xbc, 0x4e, 0x48, 0x32, 0x81, 0x60, 0x72, 0x20, 0x4e, 0xf6, 0x00, + 0x09, 0xa0, 0x63, 0x1f, 0x3e, 0x6e, 0x8e, 0xce, 0xb9, 0x49, 0x80, 0x2a, 0x51, 0xf9, 0x92, 0x9d, + 0xa6, 0x52, 0x55, 0x69, 0x3b, 0xde, 0x9d, 0xd8, 0x53, 0xd6, 0x33, 0x66, 0x67, 0x6c, 0x05, 0x2a, + 0x44, 0xd5, 0xaa, 0xad, 0xd4, 0x9b, 0x56, 0xed, 0x45, 0x7f, 0x41, 0x2f, 0x2b, 0xee, 0x7a, 0xd5, + 0x1f, 0xc0, 0x25, 0x52, 0x2f, 0xda, 0x2b, 0x8a, 0x42, 0xaf, 0xfa, 0x13, 0x7a, 0x55, 0xcd, 0xc7, + 0xda, 0x6b, 0x7b, 0x21, 0x29, 0x06, 0xee, 0x76, 0x67, 0xdf, 0x79, 0x9e, 0xe7, 0xfd, 0x98, 0x77, + 0x67, 0x06, 0x0a, 0x55, 0xcc, 0x82, 0x52, 0x15, 0x0b, 0x52, 0xe2, 0x11, 0xf6, 0x43, 0x52, 0x6a, + 0x9f, 0x2f, 0x35, 0x23, 0xce, 0xb7, 0x8b, 0xcd, 0x88, 0x4b, 0x8e, 0x66, 0x95, 0x41, 0x51, 0x19, + 0x14, 0x8d, 0x41, 0xb1, 0x7d, 0x7e, 0xfe, 0x78, 0x8d, 0xf3, 0x5a, 0x48, 0x4a, 0xb8, 0x49, 0x4b, + 0x98, 0x31, 0x2e, 0xb1, 0xa4, 0x9c, 0x09, 0x33, 0x65, 0xfe, 0x70, 0x8d, 0xd7, 0xb8, 0x7e, 0x2c, + 0xa9, 0x27, 0x3b, 0xfa, 0x4f, 0xcd, 0xd4, 0x25, 0xb1, 0x68, 0xfa, 0xa3, 0x7b, 0x15, 0x26, 0x6e, + 0x29, 0xd2, 0x32, 0xb9, 0xd3, 0x22, 0x42, 0xa2, 0x13, 0x00, 0x91, 0x79, 0xf4, 0x68, 0x90, 0x77, + 0x16, 0x9d, 0x95, 0x6c, 0xf9, 0x1f, 0x76, 0x64, 0x23, 0x40, 0x73, 0x30, 0x5e, 0x27, 0xb4, 0x56, + 0x97, 0xf9, 0xd1, 0x45, 0x67, 0x25, 0x53, 0xb6, 0x6f, 0x6e, 0x03, 0x26, 0x2d, 0x8c, 0x68, 0x72, + 0x26, 0x48, 0xc2, 0xd0, 0x49, 0x1a, 0xa2, 0x2b, 0x30, 0x1e, 0x11, 0xd1, 0x0a, 0x0d, 0x40, 0xee, + 0xc2, 0xe9, 0x62, 0x8a, 0x9b, 0xc5, 0x0a, 0x65, 0xb5, 0x90, 0xc4, 0x88, 0xad, 0x50, 0xae, 0x65, + 0x1f, 0x3d, 0x29, 0x8c, 0x94, 0xed, 0x5c, 0xf7, 0x12, 0xcc, 0x5c, 0x6f, 0x85, 0x92, 0xf6, 0x48, + 0x2f, 0x40, 0xae, 0x2b, 0x5d, 0xe4, 0x9d, 0xc5, 0xcc, 0x4a, 0xb6, 0x0c, 0x1d, 0xed, 0xc2, 0xbd, + 0x03, 0x28, 0x39, 0x6b, 0x0f, 0xa5, 0x97, 0xfb, 0x94, 0x9e, 0x4a, 0x55, 0xda, 0x03, 0x38, 0x28, + 0x74, 0x1e, 0xf2, 0x56, 0xde, 0x65, 0xde, 0x62, 0x32, 0xa9, 0xd7, 0xdd, 0x81, 0x63, 0x29, 0xdf, + 0x5e, 0x89, 0xaa, 0x1e, 0xc0, 0x41, 0x55, 0x0f, 0x1d, 0x98, 0x19, 0x08, 0x31, 0xfa, 0x3f, 0x8c, + 0xe9, 0xfa, 0xd3, 0x8c, 0xb9, 0x0b, 0x8b, 0x7b, 0x65, 0xc6, 0x82, 0x9a, 0x49, 0xe8, 0x7d, 0x98, + 0x22, 0xed, 0x86, 0xa7, 0x5f, 0xbc, 0xea, 0x5d, 0x49, 0x84, 0x56, 0x38, 0xb1, 0x76, 0xe9, 0xcf, + 0x27, 0x85, 0xff, 0xd4, 0xa8, 0xac, 0xb7, 0xaa, 0x45, 0x9f, 0x37, 0x4a, 0x3e, 0x6f, 0x10, 0x59, + 0xdd, 0x96, 0xdd, 0x87, 0x90, 0x56, 0x45, 0x49, 0x4f, 0x29, 0xae, 0x93, 0x9d, 0x35, 0xf5, 0x50, + 0x9e, 0x24, 0xed, 0x86, 0x61, 0x51, 0xaf, 0xee, 0x0f, 0x0e, 0x4c, 0xf7, 0x87, 0x1a, 0xfd, 0xaf, + 0x57, 0x70, 0x61, 0x8f, 0x04, 0xbd, 0x69, 0xbd, 0xfd, 0x49, 0xd8, 0x9f, 0xde, 0xee, 0xac, 0x37, + 0xa9, 0xf7, 0xa9, 0x03, 0xb9, 0x44, 0x6a, 0xd1, 0x12, 0x4c, 0x54, 0x43, 0xee, 0xdf, 0xf6, 0x12, + 0x45, 0x98, 0x2d, 0xe7, 0xf4, 0xd8, 0xba, 0xa9, 0xc4, 0x2d, 0x98, 0x31, 0xaa, 0xbd, 0x00, 0x4b, + 0x6c, 0x84, 0xd9, 0xa2, 0x3c, 0x99, 0xea, 0xd9, 0x4d, 0xfd, 0x74, 0x05, 0x4b, 0x9c, 0x74, 0x6f, + 0x8a, 0xf7, 0x0e, 0x2b, 0x5c, 0x43, 0x1d, 0x91, 0x10, 0xdf, 0xb5, 0xb8, 0x99, 0x17, 0xe0, 0xae, + 0x29, 0xeb, 0xb2, 0x32, 0xee, 0xc1, 0xad, 0xf6, 0x0e, 0xbb, 0x7f, 0x38, 0x00, 0xdd, 0x62, 0xd8, + 0x8f, 0x87, 0x18, 0x8e, 0x26, 0x3d, 0x6c, 0xa8, 0xc9, 0x1d, 0x3f, 0x33, 0x7f, 0xd3, 0xcf, 0xc3, + 0x5d, 0x3f, 0x13, 0x2a, 0x5e, 0x97, 0xb3, 0xbf, 0x38, 0x00, 0xdd, 0x4a, 0xda, 0x8f, 0xb3, 0x37, + 0x20, 0xe7, 0xab, 0x09, 0x3d, 0x89, 0x5c, 0x4e, 0xd5, 0x60, 0xbb, 0x96, 0x18, 0x28, 0x55, 0xf0, + 0xbb, 0x94, 0xaf, 0xcb, 0xb3, 0x87, 0x0e, 0x4c, 0xf5, 0x45, 0x18, 0x5d, 0xea, 0x34, 0x45, 0xb3, + 0xb2, 0xe6, 0x0c, 0x41, 0x52, 0xf1, 0x60, 0x17, 0x44, 0x79, 0x38, 0xd0, 0x26, 0x91, 0xa0, 0x9c, + 0x69, 0x6f, 0xb3, 0xe5, 0xf8, 0x15, 0x5d, 0x83, 0x89, 0x06, 0x89, 0x6e, 0x87, 0xc4, 0x6b, 0x62, + 0x59, 0x17, 0xf9, 0x8c, 0xce, 0xf6, 0xbf, 0x52, 0x65, 0x6f, 0xac, 0x6e, 0x5d, 0xbb, 0xae, 0x8d, + 0x6f, 0x61, 0x59, 0xb7, 0x14, 0xb9, 0x46, 0x67, 0x44, 0xb8, 0x9f, 0x8d, 0xc2, 0xa1, 0x5e, 0x2b, + 0xb4, 0x0c, 0xd3, 0x54, 0x98, 0xaa, 0xe2, 0xcc, 0x8b, 0x3a, 0x39, 0x39, 0x58, 0x9e, 0xa4, 0x42, + 0xf9, 0x75, 0x93, 0x95, 0x75, 0x56, 0x4e, 0xc1, 0x21, 0xd1, 0xaa, 0xca, 0x88, 0x10, 0x2f, 0xf1, + 0xdf, 0x9d, 0x2c, 0x4f, 0xda, 0x51, 0x9b, 0xbc, 0x25, 0x98, 0x88, 0xcd, 0x04, 0xbd, 0x47, 0x74, + 0x9c, 0xb3, 0xe5, 0x9c, 0x1d, 0xab, 0xd0, 0x7b, 0x04, 0x2d, 0xc3, 0x54, 0x6c, 0x12, 0x7b, 0x9d, + 0xd5, 0x56, 0x31, 0xc1, 0x96, 0x75, 0xfe, 0x5d, 0x98, 0x10, 0xb4, 0x1a, 0x52, 0x56, 0xf3, 0xea, + 0x58, 0xd4, 0xf3, 0x63, 0x43, 0x74, 0x99, 0x9c, 0x45, 0x5a, 0xc7, 0xa2, 0xee, 0x7e, 0x99, 0x81, + 0xa9, 0xbe, 0x24, 0xab, 0x2a, 0x31, 0xcb, 0x4a, 0x48, 0x1e, 0x11, 0x2f, 0xd9, 0x1e, 0x4f, 0x3e, + 0xbf, 0x9d, 0x57, 0x94, 0x71, 0x4f, 0x95, 0x34, 0x7a, 0x87, 0x51, 0x08, 0xc7, 0xe2, 0x82, 0xc7, + 0x01, 0x89, 0xbc, 0x4e, 0x3a, 0x23, 0x29, 0x6c, 0x6d, 0x9f, 0x7b, 0x7e, 0x15, 0xae, 0xeb, 0x49, + 0x71, 0xbe, 0x22, 0x29, 0x2c, 0xcd, 0x5c, 0x35, 0xf5, 0x2b, 0xa2, 0x90, 0xf7, 0x79, 0xa3, 0xc1, + 0x99, 0x47, 0x98, 0xcf, 0x03, 0x12, 0x78, 0x6d, 0x2e, 0x0d, 0x9b, 0x2d, 0xf9, 0xb3, 0xcf, 0xe9, + 0xf5, 0x6a, 0xd2, 0x55, 0x33, 0x67, 0x8b, 0x4b, 0x0d, 0x67, 0xb9, 0x8e, 0xf8, 0x69, 0x1f, 0xd1, + 0x5b, 0x00, 0x82, 0xd6, 0x18, 0x96, 0xad, 0x88, 0x88, 0x7c, 0x56, 0x17, 0x66, 0xfa, 0x9f, 0x7a, + 0xf3, 0x7a, 0x25, 0x36, 0x8c, 0x97, 0x67, 0x77, 0xa6, 0xfb, 0xdd, 0x38, 0x4c, 0xf5, 0xc5, 0x12, + 0x7d, 0xec, 0xc0, 0x9c, 0x6d, 0x78, 0x14, 0xb7, 0x43, 0x4f, 0x48, 0x2c, 0x89, 0x29, 0x02, 0x47, + 0x17, 0xc1, 0xdb, 0xbb, 0x4f, 0x0a, 0xb3, 0x66, 0xf1, 0xa9, 0x82, 0xae, 0xa8, 0xef, 0x2a, 0xb5, + 0x2f, 0x55, 0x1b, 0xb3, 0x86, 0x6a, 0x03, 0xb7, 0xc3, 0x0e, 0x10, 0xa2, 0x30, 0xd7, 0xa0, 0x4c, + 0xda, 0x72, 0xb0, 0x59, 0xd3, 0x0a, 0x86, 0xf9, 0xd9, 0xcd, 0x2a, 0x4c, 0xed, 0xa8, 0xc9, 0x9a, + 0xa6, 0xfa, 0xd4, 0x81, 0x93, 0x4d, 0x1c, 0xe1, 0x86, 0xf0, 0x24, 0xf7, 0x22, 0x22, 0x24, 0xbe, + 0x4d, 0x0c, 0xb1, 0xe8, 0x61, 0xce, 0x0c, 0xc1, 0x5c, 0x30, 0x0c, 0x9b, 0xbc, 0x6c, 0xf0, 0xb5, + 0x08, 0x91, 0x50, 0xf1, 0x95, 0x03, 0x67, 0x23, 0x1e, 0xaa, 0x45, 0x22, 0x08, 0x09, 0x94, 0x14, + 0x19, 0x61, 0x26, 0xb6, 0x49, 0x94, 0xa6, 0x25, 0x3b, 0x84, 0x96, 0x53, 0x09, 0x9e, 0x4d, 0xbe, + 0x69, 0x59, 0x06, 0x14, 0xdd, 0x87, 0x25, 0x29, 0x74, 0x4c, 0x5a, 0xcd, 0x5a, 0x84, 0x83, 0xd4, + 0x98, 0x0c, 0xd3, 0x14, 0x8e, 0x4b, 0x21, 0x36, 0xf9, 0x3b, 0x06, 0x7c, 0x80, 0xfe, 0x01, 0xb8, + 0xb8, 0x25, 0xeb, 0x8a, 0x9f, 0xfa, 0xb8, 0xce, 0x85, 0x4c, 0xe3, 0x1f, 0x1f, 0x82, 0xff, 0x84, + 0xc2, 0xdf, 0xe4, 0x1b, 0x06, 0xbd, 0x5f, 0x80, 0xfb, 0xe3, 0x18, 0xcc, 0xa5, 0x77, 0x01, 0xc4, + 0xe0, 0x98, 0xed, 0x9d, 0x1e, 0x66, 0x81, 0xe7, 0xd7, 0x31, 0x65, 0x1e, 0x0d, 0x92, 0x4b, 0xe4, + 0xe5, 0x24, 0x1d, 0xb1, 0xb0, 0xab, 0x2c, 0xb8, 0xac, 0x40, 0x37, 0x02, 0x1d, 0x8b, 0xde, 0xd3, + 0x56, 0xb6, 0x73, 0x08, 0x28, 0x40, 0x4e, 0xd2, 0x06, 0xf1, 0x04, 0xf1, 0x39, 0x0b, 0x6c, 0xb7, + 0x07, 0x35, 0x54, 0xd1, 0x23, 0x68, 0x05, 0xa6, 0xb5, 0x01, 0xc3, 0x8c, 0xc7, 0x56, 0x59, 0xfd, + 0xe3, 0x38, 0xa4, 0xc6, 0x6f, 0x60, 0xc6, 0xad, 0xe5, 0x87, 0x70, 0x34, 0xc4, 0x42, 0x7a, 0xa6, + 0x5b, 0xd2, 0x40, 0x3b, 0xc6, 0x65, 0x9d, 0x44, 0x43, 0xe5, 0x78, 0x56, 0x81, 0xea, 0x28, 0x6e, + 0x04, 0xab, 0x2c, 0xb8, 0xa9, 0x00, 0xd1, 0x17, 0x0e, 0x9c, 0x66, 0x64, 0x47, 0x7a, 0x6d, 0x1c, + 0xd2, 0x00, 0x4b, 0x1e, 0xe9, 0xc8, 0x99, 0x58, 0xaa, 0x53, 0x0f, 0x13, 0x2d, 0x31, 0x7c, 0x7e, + 0x97, 0x14, 0xc7, 0x56, 0x4c, 0xa1, 0x02, 0xa9, 0xc2, 0x1a, 0xe3, 0xeb, 0xc0, 0x7e, 0x00, 0x33, + 0xda, 0x6b, 0xb3, 0x13, 0xb0, 0x9c, 0x07, 0x86, 0xe0, 0x9c, 0x52, 0x70, 0x66, 0x97, 0x61, 0x18, + 0xee, 0xc0, 0x3c, 0x69, 0xd3, 0x80, 0x30, 0x9f, 0x68, 0xff, 0x9a, 0x11, 0x6f, 0x72, 0x41, 0x8c, + 0xc7, 0xf9, 0x83, 0x43, 0x50, 0x1d, 0x8d, 0x71, 0x57, 0x59, 0x70, 0xcb, 0xa2, 0xea, 0xc2, 0xfd, + 0xcd, 0x81, 0x23, 0xa9, 0x7f, 0x14, 0x54, 0x05, 0xa4, 0x5a, 0x3f, 0x09, 0xe2, 0xad, 0x3a, 0xd9, + 0xa6, 0x3b, 0x43, 0x15, 0xec, 0xb4, 0xc1, 0x33, 0x5b, 0x30, 0x85, 0xd6, 0xcf, 0x21, 0x5a, 0xdb, + 0x8a, 0x63, 0xf4, 0xd5, 0x70, 0x54, 0x34, 0x9a, 0xfb, 0xf9, 0x28, 0xe4, 0x12, 0xbf, 0x35, 0xb4, + 0x06, 0x4e, 0x34, 0x94, 0x1b, 0x4e, 0xa4, 0x30, 0x86, 0x3b, 0x49, 0x39, 0x02, 0x4d, 0x80, 0xd3, + 0xd6, 0xab, 0x70, 0xb2, 0xec, 0xb4, 0x11, 0x86, 0x99, 0x78, 0x1b, 0xa0, 0x16, 0x9b, 0x90, 0xb8, + 0xd1, 0x1c, 0xaa, 0x71, 0x4f, 0x5b, 0xb8, 0xcd, 0x18, 0xcd, 0xfd, 0xc6, 0x01, 0x34, 0xb8, 0x0b, + 0x47, 0x87, 0x61, 0x4c, 0xef, 0xc0, 0xed, 0xfe, 0xde, 0xbc, 0xbc, 0xa9, 0x7d, 0xee, 0x85, 0x9f, + 0x32, 0x70, 0xa0, 0x42, 0xa2, 0x36, 0xf5, 0x09, 0x7a, 0x00, 0x63, 0xf6, 0xe4, 0x91, 0x0a, 0x96, + 0xbc, 0x07, 0x99, 0x77, 0x5f, 0x64, 0x62, 0xae, 0x43, 0xdc, 0xd2, 0x27, 0x3f, 0xff, 0xfe, 0xed, + 0xe8, 0x19, 0xb4, 0x5c, 0x52, 0xb6, 0xba, 0xf1, 0x76, 0xaf, 0xb2, 0xcc, 0xb5, 0x59, 0xe9, 0xa3, + 0xee, 0xed, 0xcf, 0x7d, 0xd5, 0x6b, 0x92, 0xa7, 0xbd, 0xd3, 0x7b, 0x5e, 0xde, 0x18, 0x2d, 0xcb, + 0x7b, 0x5f, 0xf2, 0x18, 0x41, 0x2b, 0x5a, 0x90, 0x8b, 0x16, 0x53, 0x05, 0x25, 0x8e, 0x8a, 0xe8, + 0x7b, 0x07, 0x66, 0x06, 0xee, 0x79, 0xd0, 0xbf, 0x5f, 0x74, 0xb2, 0x1a, 0xb8, 0x2b, 0x9a, 0x2f, + 0xee, 0xd7, 0xdc, 0xca, 0x3b, 0xaf, 0xe5, 0x9d, 0x43, 0x67, 0x52, 0xe5, 0xd9, 0x40, 0x09, 0x2f, + 0x71, 0xe2, 0x5b, 0xab, 0x3c, 0xda, 0x5d, 0x70, 0x1e, 0xef, 0x2e, 0x38, 0x4f, 0x77, 0x17, 0x9c, + 0xaf, 0x9f, 0x2d, 0x8c, 0x3c, 0x7e, 0xb6, 0x30, 0xf2, 0xeb, 0xb3, 0x85, 0x91, 0xf7, 0xfe, 0x9b, + 0xa8, 0x58, 0x05, 0xa7, 0x6f, 0x0e, 0x7d, 0x1e, 0x96, 0x2c, 0xee, 0xc5, 0x92, 0x1f, 0x52, 0xc2, + 0x64, 0xa9, 0x16, 0x35, 0xfd, 0x9e, 0x9c, 0x54, 0xc7, 0xb5, 0xed, 0xc5, 0xbf, 0x02, 0x00, 0x00, + 0xff, 0xff, 0x00, 0xff, 0x2e, 0xa3, 0xee, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2258,38 +2258,38 @@ func (m *MultiStoreProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.AuthToIbcStoresMerkleHash) > 0 { - i -= len(m.AuthToIbcStoresMerkleHash) - copy(dAtA[i:], m.AuthToIbcStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.AuthToIbcStoresMerkleHash))) + if len(m.AuthToIcahostStoresMerkleHash) > 0 { + i -= len(m.AuthToIcahostStoresMerkleHash) + copy(dAtA[i:], m.AuthToIcahostStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.AuthToIcahostStoresMerkleHash))) i-- dAtA[i] = 0x32 } - if len(m.TransferToUpgradeStoresMerkleHash) > 0 { - i -= len(m.TransferToUpgradeStoresMerkleHash) - copy(dAtA[i:], m.TransferToUpgradeStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.TransferToUpgradeStoresMerkleHash))) + if len(m.TssToUpgradeStoresMerkleHash) > 0 { + i -= len(m.TssToUpgradeStoresMerkleHash) + copy(dAtA[i:], m.TssToUpgradeStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.TssToUpgradeStoresMerkleHash))) i-- dAtA[i] = 0x2a } - if len(m.RestakeToStakingStoresMerkleHash) > 0 { - i -= len(m.RestakeToStakingStoresMerkleHash) - copy(dAtA[i:], m.RestakeToStakingStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.RestakeToStakingStoresMerkleHash))) + if len(m.RollingseedToTransferStoresMerkleHash) > 0 { + i -= len(m.RollingseedToTransferStoresMerkleHash) + copy(dAtA[i:], m.RollingseedToTransferStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.RollingseedToTransferStoresMerkleHash))) i-- dAtA[i] = 0x22 } - if len(m.IcahostToMintStoresMerkleHash) > 0 { - i -= len(m.IcahostToMintStoresMerkleHash) - copy(dAtA[i:], m.IcahostToMintStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.IcahostToMintStoresMerkleHash))) + if len(m.ParamsToRestakeStoresMerkleHash) > 0 { + i -= len(m.ParamsToRestakeStoresMerkleHash) + copy(dAtA[i:], m.ParamsToRestakeStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.ParamsToRestakeStoresMerkleHash))) i-- dAtA[i] = 0x1a } - if len(m.ParamsStoreMerkleHash) > 0 { - i -= len(m.ParamsStoreMerkleHash) - copy(dAtA[i:], m.ParamsStoreMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.ParamsStoreMerkleHash))) + if len(m.MintStoreMerkleHash) > 0 { + i -= len(m.MintStoreMerkleHash) + copy(dAtA[i:], m.MintStoreMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.MintStoreMerkleHash))) i-- dAtA[i] = 0x12 } @@ -2775,23 +2775,23 @@ func (m *MultiStoreProof) Size() (n int) { if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.ParamsStoreMerkleHash) + l = len(m.MintStoreMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.IcahostToMintStoresMerkleHash) + l = len(m.ParamsToRestakeStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.RestakeToStakingStoresMerkleHash) + l = len(m.RollingseedToTransferStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.TransferToUpgradeStoresMerkleHash) + l = len(m.TssToUpgradeStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.AuthToIbcStoresMerkleHash) + l = len(m.AuthToIcahostStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } @@ -4776,7 +4776,7 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ParamsStoreMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MintStoreMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4803,14 +4803,14 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ParamsStoreMerkleHash = append(m.ParamsStoreMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.ParamsStoreMerkleHash == nil { - m.ParamsStoreMerkleHash = []byte{} + m.MintStoreMerkleHash = append(m.MintStoreMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.MintStoreMerkleHash == nil { + m.MintStoreMerkleHash = []byte{} } iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IcahostToMintStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ParamsToRestakeStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4837,14 +4837,14 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.IcahostToMintStoresMerkleHash = append(m.IcahostToMintStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.IcahostToMintStoresMerkleHash == nil { - m.IcahostToMintStoresMerkleHash = []byte{} + m.ParamsToRestakeStoresMerkleHash = append(m.ParamsToRestakeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.ParamsToRestakeStoresMerkleHash == nil { + m.ParamsToRestakeStoresMerkleHash = []byte{} } iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RestakeToStakingStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field RollingseedToTransferStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4871,14 +4871,14 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RestakeToStakingStoresMerkleHash = append(m.RestakeToStakingStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.RestakeToStakingStoresMerkleHash == nil { - m.RestakeToStakingStoresMerkleHash = []byte{} + m.RollingseedToTransferStoresMerkleHash = append(m.RollingseedToTransferStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.RollingseedToTransferStoresMerkleHash == nil { + m.RollingseedToTransferStoresMerkleHash = []byte{} } iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TransferToUpgradeStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TssToUpgradeStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4905,14 +4905,14 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TransferToUpgradeStoresMerkleHash = append(m.TransferToUpgradeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.TransferToUpgradeStoresMerkleHash == nil { - m.TransferToUpgradeStoresMerkleHash = []byte{} + m.TssToUpgradeStoresMerkleHash = append(m.TssToUpgradeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.TssToUpgradeStoresMerkleHash == nil { + m.TssToUpgradeStoresMerkleHash = []byte{} } iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AuthToIbcStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AuthToIcahostStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4939,9 +4939,9 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.AuthToIbcStoresMerkleHash = append(m.AuthToIbcStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.AuthToIbcStoresMerkleHash == nil { - m.AuthToIbcStoresMerkleHash = []byte{} + m.AuthToIcahostStoresMerkleHash = append(m.AuthToIcahostStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.AuthToIcahostStoresMerkleHash == nil { + m.AuthToIcahostStoresMerkleHash = []byte{} } iNdEx = postIndex default: diff --git a/client/grpc/oracle/proof/proof_test.go b/client/grpc/oracle/proof/proof_test.go index af1f9268a..79b354d2b 100644 --- a/client/grpc/oracle/proof/proof_test.go +++ b/client/grpc/oracle/proof/proof_test.go @@ -35,19 +35,19 @@ func TestEncodeRelay(t *testing.T) { OracleIAVLStateHash: hexToBytes( "5248463E932D16F7D092E268C0DED87B23D3B0E71856F1C6AE2AA91F6C713320", ), - ParamsStoreMerkleHash: hexToBytes( + MintStoreMerkleHash: hexToBytes( "7FD5F5C7C2920C187618542901CDC5717BE8204F24BE856E80902A1BB04737E4", ), - IcahostToMintStoresMerkleHash: hexToBytes( + ParamsToRestakeStoresMerkleHash: hexToBytes( "F981716562A49DE06E3DCAFBFB6388C294BAA4FA9D45777E25740A92F81CF65E", ), - RestakeToStakingStoresMerkleHash: hexToBytes( + RollingseedToTransferStoresMerkleHash: hexToBytes( "E8E27CBB44BB654F64EEEF4667868AD48667CEB28E3DB5C4DF7A4B4B87F0C04B", ), - TransferToUpgradeStoresMerkleHash: hexToBytes( + TssToUpgradeStoresMerkleHash: hexToBytes( "FC96CFFD30E5B8979EA66F9D0DA1CBAB16F69669E8B2A1FB2E1BEB457C9726E8", ), - AuthToIbcStoresMerkleHash: hexToBytes( + AuthToIcahostStoresMerkleHash: hexToBytes( "C9C8849ED125CC7681329C4D27B83B1FC8ACF7A865C9D1D1DF575CCA56F48DBE", ), }, diff --git a/proto/band/base/oracle/v1/proof.proto b/proto/band/base/oracle/v1/proof.proto index f1bd7e58c..0ea648ea7 100644 --- a/proto/band/base/oracle/v1/proof.proto +++ b/proto/band/base/oracle/v1/proof.proto @@ -134,34 +134,35 @@ message BlockRelayProof { // / \ / \ // _____[N20]_____ ____[N21]______ ____[N22]______ _[N23]_ // / \ / \ / \ / \ -// _[N12]_ _[N13]_ _[N14]_ _[N15]_ _[N16]_ _[N17]_ [N18] [N19] -// / \ / \ / \ / \ / \ / \ / \ / \ -// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [N8] [N9] [N10] [N11] [O] [P] [Q] [R] +// _[N12]_ _[N13]_ _[N14]_ _[N15]_ _[N16]_ _[N17]_ [N18] [Q] +// / \ / \ / \ / \ / \ / \ / \ +// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [N8] [N9] [N10] [N11] [O] [P] // / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ // [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] [C] [D] [E] [F] [G] [H] [I] [J] [K] [L] [M] [N] // -// [0] - acc (auth) [1] - authz [2] - bandtss [3] - bank [4] - capability [5] - consensus -// [6] - crisis [7] - distribution [8] - evidence [9] - feeds [A] - feegrant [B] - feeibc -// [C] - globalfee [D] - gov [E] - group [F] - ibc [G] - icahost [H] - mint -// [I] - oracle [J] - params [K] - restake [L] - rollingseed [M] - slashing [N] - staking -// [O] - transfer [P] - tss [Q] - tunnel [R] - upgrade +// [0] - acc (auth) [1] - authz [2] - bandtss [3] - bank [4] - capability [5] - consensus +// [6] - crisis [7] - distribution [8] - evidence [9] - feeds [A] - feegrant [B] - feeibc +// [C] - globalfee [D] - gov [E] - ibc [F] - icahost [G] - mint [H] - oracle +// [I] - params [J] - restake [K] - rollingseed [L] - slashing [M] - staking [N] - transfer +// [O] - tss [P] - tunnel [Q] - upgrade // // Notice that NOT all leaves of the Merkle tree are needed in order to compute the Merkle -// root hash, since we only want to validate the correctness of [I] In fact, only -// [J], [N8], [N17], [N23], and [N24] are needed in order to compute [AppHash]. +// root hash, since we only want to validate the correctness of [H] In fact, only +// [G], [N9], [N17], [N23], and [N24] are needed in order to compute [AppHash]. message MultiStoreProof { bytes oracle_iavl_state_hash = 1 [ (gogoproto.customname) = "OracleIAVLStateHash", (gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes" ]; - bytes params_store_merkle_hash = 2 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes icahost_to_mint_stores_merkle_hash = 3 + bytes mint_store_merkle_hash = 2 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; + bytes params_to_restake_stores_merkle_hash = 3 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes restake_to_staking_stores_merkle_hash = 4 + bytes rollingseed_to_transfer_stores_merkle_hash = 4 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes transfer_to_upgrade_stores_merkle_hash = 5 + bytes tss_to_upgrade_stores_merkle_hash = 5 + [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; + bytes auth_to_icahost_stores_merkle_hash = 6 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes auth_to_ibc_stores_merkle_hash = 6 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; } // BlockHeaderMerkleParts stores a group of hashes using for computing Tendermint's block