From d264e4bcca11a303871eeb60386658d51a6ba286 Mon Sep 17 00:00:00 2001 From: Kitipong Sirirueangsakul Date: Thu, 15 Feb 2024 22:17:23 +0700 Subject: [PATCH] Update proof oracle path for Cosmos 0.47 (#333) * fix proof path * fix space --- client/grpc/oracle/proof/abi.go | 8 +- client/grpc/oracle/proof/multi_store.go | 36 +- client/grpc/oracle/proof/multi_store_test.go | 14 +- client/grpc/oracle/proof/proof.pb.go | 329 ++++++++++--------- client/grpc/oracle/proof/proof_test.go | 8 +- proto/bandchain/v1/oracle/proof.proto | 67 ++-- 6 files changed, 232 insertions(+), 230 deletions(-) diff --git a/client/grpc/oracle/proof/abi.go b/client/grpc/oracle/proof/abi.go index abe6450c1..c85b5c366 100644 --- a/client/grpc/oracle/proof/abi.go +++ b/client/grpc/oracle/proof/abi.go @@ -16,22 +16,22 @@ var relayFormat = []byte(` }, { "internalType": "bytes32", - "name": "paramsToSlashingStoresMerkleHash", + "name": "ibcToIcahostStoresMerkleHash", "type": "bytes32" }, { "internalType": "bytes32", - "name": "govToIcahostStoresMerkleHash", + "name": "feegrantToGroupStoresMerkleHash", "type": "bytes32" }, { "internalType": "bytes32", - "name": "authToFeegrantStoresMerkleHash", + "name": "authToEvidenceStoresMerkleHash", "type": "bytes32" }, { "internalType": "bytes32", - "name": "stakingToUpgradeStoresMerkleHash", + "name": "paramsToUpgradeStoresMerkleHash", "type": "bytes32" } ], diff --git a/client/grpc/oracle/proof/multi_store.go b/client/grpc/oracle/proof/multi_store.go index e55f86458..8d1efc380 100644 --- a/client/grpc/oracle/proof/multi_store.go +++ b/client/grpc/oracle/proof/multi_store.go @@ -8,33 +8,33 @@ import ( // MultiStoreProofEthereum is an Ethereum version of MultiStoreProof for solidity ABI-encoding. type MultiStoreProofEthereum struct { - OracleIAVLStateHash common.Hash - MintStoreMerkleHash common.Hash - ParamsToSlashingStoresMerkleHash common.Hash - GovToIcahostStoresMerkleHash common.Hash - AuthToFeegrantStoresMerkleHash common.Hash - StakingToUpgradeStoresMerkleHash common.Hash + OracleIAVLStateHash common.Hash + MintStoreMerkleHash common.Hash + IbcToIcahostStoresMerkleHash common.Hash + FeegrantToGroupStoresMerkleHash common.Hash + AuthToEvidenceStoresMerkleHash common.Hash + ParamsToUpgradeStoresMerkleHash common.Hash } func (m *MultiStoreProof) encodeToEthFormat() MultiStoreProofEthereum { return MultiStoreProofEthereum{ - OracleIAVLStateHash: common.BytesToHash(m.OracleIAVLStateHash), - MintStoreMerkleHash: common.BytesToHash(m.MintStoreMerkleHash), - ParamsToSlashingStoresMerkleHash: common.BytesToHash(m.ParamsToSlashingStoresMerkleHash), - GovToIcahostStoresMerkleHash: common.BytesToHash(m.GovToIcahostStoresMerkleHash), - AuthToFeegrantStoresMerkleHash: common.BytesToHash(m.AuthToFeegrantStoresMerkleHash), - StakingToUpgradeStoresMerkleHash: common.BytesToHash(m.StakingToUpgradeStoresMerkleHash), + OracleIAVLStateHash: common.BytesToHash(m.OracleIAVLStateHash), + MintStoreMerkleHash: common.BytesToHash(m.MintStoreMerkleHash), + IbcToIcahostStoresMerkleHash: common.BytesToHash(m.IbcToIcahostStoresMerkleHash), + FeegrantToGroupStoresMerkleHash: common.BytesToHash(m.FeegrantToGroupStoresMerkleHash), + AuthToEvidenceStoresMerkleHash: common.BytesToHash(m.AuthToEvidenceStoresMerkleHash), + ParamsToUpgradeStoresMerkleHash: common.BytesToHash(m.ParamsToUpgradeStoresMerkleHash), } } // GetMultiStoreProof compacts Multi store proof from Tendermint to MultiStoreProof version. func GetMultiStoreProof(multiStoreEp *ics23.ExistenceProof) MultiStoreProof { return MultiStoreProof{ - OracleIAVLStateHash: tmbytes.HexBytes(multiStoreEp.Value), - MintStoreMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[0].Prefix[1:]), - ParamsToSlashingStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[1].Suffix), - GovToIcahostStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[2].Prefix[1:]), - AuthToFeegrantStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[3].Prefix[1:]), - StakingToUpgradeStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[4].Suffix), + OracleIAVLStateHash: tmbytes.HexBytes(multiStoreEp.Value), + MintStoreMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[0].Prefix[1:]), + IbcToIcahostStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[1].Prefix[1:]), + FeegrantToGroupStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[2].Prefix[1:]), + AuthToEvidenceStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[3].Prefix[1:]), + ParamsToUpgradeStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[4].Suffix), } } diff --git a/client/grpc/oracle/proof/multi_store_test.go b/client/grpc/oracle/proof/multi_store_test.go index 6f6467f9c..3cf2b67fb 100644 --- a/client/grpc/oracle/proof/multi_store_test.go +++ b/client/grpc/oracle/proof/multi_store_test.go @@ -27,12 +27,12 @@ query at localhost:26657/abci_query?path="/store/oracle/key"&data=0xc00000000000 { "type": "ics23:iavl", "key": "wAAAAAAAAAA=", - "data": "EsMDCgjAAAAAAAAAABLpAQoVBQ1eS8RW3fDH5wAMd46Ih4w7Tw0SEhAIARIMCPLi8Z8GEMDCo+ABGgwIARgBIAEqBAAC+CUiKggBEiYCBPglIMOXtvsiuUKm461Mtf/w7SDhGVqba09R5L1VU2Y2HGeOICIsCAESBQQI5CYgGiEgubs5NRGOw8xaesuOPr7hPvlY1LNxamfQ5qwMMKn8l80iKggBEiYGDOQmIAqGoK3PW8B0zAWNvdrvKtLMf9f2nUvJ/8HUfbG+mLCDICIqCAESJgga+isgwVjErYVeGYGfWDSJS9zW6U1GPMLdybMMGp3k+lT5x+ggGsoBCgHwEgZvcmFjbGUaCwgBGAEgASoDAAICIiwIARIFAgTkJiAaISCUHaTOnLkieD5s4z9auzNnWGOptSWVA3As2DTxLWzmZyIqCAESJgQI5CYg5zZMcUYFSwmSAmz9ub37BrR2v3mWJNOfELL/z1YSFJggIioIARImBgzkJiAKhqCtz1vAdMwFjb3a7yrSzH/X9p1Lyf/B1H2xvpiwgyAiKggBEiYIGvorIMFYxK2FXhmBn1g0iUvc1ulNRjzC3cmzDBqd5PpU+cfoIA==" + "data": "EtsCCgjAAAAAAAAAABKyAQoBBhIdCBAQEBiAAiCABChkMNCGA0ADSEZQgOCllrsRWAEaCwgBGAEgASoDAAICIisIARIEAgQCIBohIOtzm7IvSLfzBTqQuiuk/gf6smLK34ZkSJVlxQ/1Bbi9IikIARIlBAgEIAXcsCtAWTDFinCgKJK8wl81ZbWfgSdKDpbP2Wf47EO4ICIpCAESJQYQBCCKaIo830SxbCL1Qk0rvRoWDuKiCxVidDRpX7yqJwZ6YCAamQEKAfASBm9yYWNsZRoLCAEYASABKgMAAgIiKQgBEiUCBAIgYBmyUcOTZvAWUCIP0D+9tkdWu05jYdT58XI1aiWJin0gIikIARIlBAgEIAXcsCtAWTDFinCgKJK8wl81ZbWfgSdKDpbP2Wf47EO4ICIpCAESJQYQBCCKaIo830SxbCL1Qk0rvRoWDuKiCxVidDRpX7yqJwZ6YCA=" }, { "type": "ics23:simple", "key": "b3JhY2xl", - "data": "CvwBCgZvcmFjbGUSIIM4YL+a7OkzwrQJ6EwUJEt+FIGnboCro+OQiGZs9UAFGgkIARgBIAEqAQAiJQgBEiEBCdlpWuQ2tdx5sWp9VcTA+Y2NRuM1L8YtFLgJeZsaDxUiJwgBEgEBGiCwlrc6YwUsF2ydIB3k9PiBO3bBHhoP0IHOJtO2nDIVPyIlCAESIQFjiuPaA6L1DtVd8DXecpB+lu/MQBzkzCZ6M7j3fc3/8iIlCAESIQGDasyPrY+cK/pMuiQihLx69Ek6gZUDJ+b6v80jTKvZfiInCAESAQEaIP3tTGQiclpWi3Qerkck9TntQJo1rBxSoN6oEp1iFuNJ" + "data": "CvoBCgZvcmFjbGUSIKPQ574oserr40+EoLhlrRgTGdrpgYViYEujG7W9rVBXGgkIARgBIAEqAQAiJQgBEiEBszziiEyGhp8/QWWNpdXqtweFbE6u087DWf5LXq0L+TIiJQgBEiEB3e3II3T8dhCPmDUxvJ1pJX5rydODMevJMyFcgoCkKOoiJQgBEiEBFpkM5/i+rVeuJ7iT04lRhhji55+3UobQFAvRoy5bAaIiJQgBEiEBTbPwtCi+YzaPpM9Zk+1Z73qE27/GXJESOD/JanvndjYiJwgBEgEBGiD3/25dJyNfa+hHLtAoLdyt2kECqzbUMTuiMuTW8f/kbA==" } ] }, @@ -46,7 +46,7 @@ query at localhost:26657/abci_query?path="/store/oracle/key"&data=0xc00000000000 func TestGetMultiStoreProof(t *testing.T) { key := []byte("oracle") data := base64ToBytes( - "CvwBCgZvcmFjbGUSIIM4YL+a7OkzwrQJ6EwUJEt+FIGnboCro+OQiGZs9UAFGgkIARgBIAEqAQAiJQgBEiEBCdlpWuQ2tdx5sWp9VcTA+Y2NRuM1L8YtFLgJeZsaDxUiJwgBEgEBGiCwlrc6YwUsF2ydIB3k9PiBO3bBHhoP0IHOJtO2nDIVPyIlCAESIQFjiuPaA6L1DtVd8DXecpB+lu/MQBzkzCZ6M7j3fc3/8iIlCAESIQGDasyPrY+cK/pMuiQihLx69Ek6gZUDJ+b6v80jTKvZfiInCAESAQEaIP3tTGQiclpWi3Qerkck9TntQJo1rBxSoN6oEp1iFuNJ", + "CvoBCgZvcmFjbGUSIKPQ574oserr40+EoLhlrRgTGdrpgYViYEujG7W9rVBXGgkIARgBIAEqAQAiJQgBEiEBszziiEyGhp8/QWWNpdXqtweFbE6u087DWf5LXq0L+TIiJQgBEiEB3e3II3T8dhCPmDUxvJ1pJX5rydODMevJMyFcgoCkKOoiJQgBEiEBFpkM5/i+rVeuJ7iT04lRhhji55+3UobQFAvRoy5bAaIiJQgBEiEBTbPwtCi+YzaPpM9Zk+1Z73qE27/GXJESOD/JanvndjYiJwgBEgEBGiD3/25dJyNfa+hHLtAoLdyt2kECqzbUMTuiMuTW8f/kbA==", ) var multistoreOps storetypes.CommitmentOp @@ -72,19 +72,19 @@ func TestGetMultiStoreProof(t *testing.T) { apphash := innerHash( innerHash( - m.AuthToFeegrantStoresMerkleHash, + m.AuthToEvidenceStoresMerkleHash, innerHash( - m.GovToIcahostStoresMerkleHash, + m.FeegrantToGroupStoresMerkleHash, innerHash( + m.IbcToIcahostStoresMerkleHash, innerHash( m.MintStoreMerkleHash, leafHash(append(prefix, tmhash.Sum(m.OracleIAVLStateHash)...)), ), - m.ParamsToSlashingStoresMerkleHash, ), ), ), - m.StakingToUpgradeStoresMerkleHash, + m.ParamsToUpgradeStoresMerkleHash, ) require.Equal(t, expectAppHash, apphash) diff --git a/client/grpc/oracle/proof/proof.pb.go b/client/grpc/oracle/proof/proof.pb.go index 869f2a590..b6a0ff449 100644 --- a/client/grpc/oracle/proof/proof.pb.go +++ b/client/grpc/oracle/proof/proof.pb.go @@ -882,32 +882,33 @@ func (m *BlockRelayProof) GetSignatures() []TMSignature { // MultiStoreProof stores a compact of other Cosmos-SDK modules' storage hash in multistore to // compute (in combination with oracle store hash) Tendermint's application state hash at a given block. // -// ________________[AppHash]_________________________ -// / \ -// _________________[N15]_________________ __[N16]___ -// / \ / \ -// _______[N12]______ _______[N13]________ [N14] [I] -// / \ / \ / \ -// __[N8]__ __[N9]__ __[N10]__ __[N11]__ [G] [H] -// / \ / \ / \ / \ -// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] -// / \ / \ / \ / \ / \ / \ / \ / \ +// ____________________[AppHash]____________________ +// / \ +// ___________[N19]____________ ____[N20]_____ +// / \ / \ +// _____[N15]_____ ____[N16]______ __[N17]__ [K] +// / \ / \ / \ +// __[N8]_ __[N9]_ _[N10]_ _[N11]_ [N12] [N13] +// / \ / \ / \ / \ / \ / \ +// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [G] [H] [I] [J] +// / \ / \ / \ / \ / \ / \ / \ / \ +// [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] [C] [D] [E] [F] // -// [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] [C] [D] [E] [F] +// [0] - acc (auth) [1] - authz [2] - bank [3] - capability [4] - consensus [5] - crisis +// [6] - dist [7] - evidence [8] - feegrant [9] - globalfee [A] - gov [B] - group +// [C] - ibccore [D] - icahost [E] - mint [F] - oracle [G] - params [H] - slashing +// [I] - staking [J] - transfer [K] - upgrade // -// [0] - acc (auth) [1] - authz [2] - bank [3] - capability [4] - crisis [5] - dist -// [6] - evidence [7] - feegrant [8] - gov [9] - group [A] - ibccore [B] - icahost -// [C] - mint [D] - oracle [E] - params [F] - slashing [G] - staking [H] - transfer [I] - 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 [D] In fact, only -// [C], [N7], [N10], [N12], and [N16] are needed in order to compute [AppHash]. +// root hash, since we only want to validate the correctness of [F] In fact, only +// [E], [N6], [N10], [N15], and [N20] 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"` - 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"` - ParamsToSlashingStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=params_to_slashing_stores_merkle_hash,json=paramsToSlashingStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"params_to_slashing_stores_merkle_hash,omitempty"` - GovToIcahostStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,4,opt,name=gov_to_icahost_stores_merkle_hash,json=govToIcahostStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"gov_to_icahost_stores_merkle_hash,omitempty"` - AuthToFeegrantStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,5,opt,name=auth_to_feegrant_stores_merkle_hash,json=authToFeegrantStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"auth_to_feegrant_stores_merkle_hash,omitempty"` - StakingToUpgradeStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,6,opt,name=staking_to_upgrade_stores_merkle_hash,json=stakingToUpgradeStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"staking_to_upgrade_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"` + IbcToIcahostStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=ibc_to_icahost_stores_merkle_hash,json=ibcToIcahostStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"ibc_to_icahost_stores_merkle_hash,omitempty"` + FeegrantToGroupStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,4,opt,name=feegrant_to_group_stores_merkle_hash,json=feegrantToGroupStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"feegrant_to_group_stores_merkle_hash,omitempty"` + AuthToEvidenceStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,5,opt,name=auth_to_evidence_stores_merkle_hash,json=authToEvidenceStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"auth_to_evidence_stores_merkle_hash,omitempty"` + ParamsToUpgradeStoresMerkleHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,6,opt,name=params_to_upgrade_stores_merkle_hash,json=paramsToUpgradeStoresMerkleHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"params_to_upgrade_stores_merkle_hash,omitempty"` } func (m *MultiStoreProof) Reset() { *m = MultiStoreProof{} } @@ -957,30 +958,30 @@ func (m *MultiStoreProof) GetMintStoreMerkleHash() github_com_cometbft_cometbft_ return nil } -func (m *MultiStoreProof) GetParamsToSlashingStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetIbcToIcahostStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.ParamsToSlashingStoresMerkleHash + return m.IbcToIcahostStoresMerkleHash } return nil } -func (m *MultiStoreProof) GetGovToIcahostStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetFeegrantToGroupStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.GovToIcahostStoresMerkleHash + return m.FeegrantToGroupStoresMerkleHash } return nil } -func (m *MultiStoreProof) GetAuthToFeegrantStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetAuthToEvidenceStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.AuthToFeegrantStoresMerkleHash + return m.AuthToEvidenceStoresMerkleHash } return nil } -func (m *MultiStoreProof) GetStakingToUpgradeStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { +func (m *MultiStoreProof) GetParamsToUpgradeStoresMerkleHash() github_com_cometbft_cometbft_libs_bytes.HexBytes { if m != nil { - return m.StakingToUpgradeStoresMerkleHash + return m.ParamsToUpgradeStoresMerkleHash } return nil } @@ -1324,105 +1325,105 @@ func init() { func init() { proto.RegisterFile("bandchain/v1/oracle/proof.proto", fileDescriptor_ae72765f9c902173) } var fileDescriptor_ae72765f9c902173 = []byte{ - // 1558 bytes of a gzipped FileDescriptorProto + // 1553 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcb, 0x6e, 0x1b, 0x47, - 0x16, 0x55, 0x8b, 0x94, 0xec, 0xb9, 0x94, 0x2c, 0xa9, 0x64, 0x4b, 0xb4, 0x60, 0x93, 0x12, 0xfd, - 0x90, 0x3c, 0x1e, 0x90, 0x23, 0x79, 0x36, 0xc6, 0xcc, 0x46, 0xf2, 0xd8, 0x90, 0x66, 0xfc, 0x1a, - 0x52, 0xa3, 0x00, 0x41, 0x80, 0x4e, 0xb1, 0xbb, 0x44, 0x76, 0xdc, 0xac, 0xa2, 0xbb, 0x8a, 0x0d, - 0xd9, 0x81, 0x91, 0x07, 0xe0, 0x04, 0xc9, 0x2a, 0x71, 0xfe, 0x22, 0x1b, 0x23, 0x9b, 0x7c, 0x83, - 0x97, 0x06, 0xb2, 0x48, 0x80, 0x00, 0x8e, 0x21, 0x67, 0x95, 0x4f, 0xc8, 0x2a, 0xa8, 0x47, 0x93, - 0x4d, 0xb2, 0x19, 0xc9, 0xa6, 0xed, 0x15, 0xbb, 0x8b, 0xb7, 0xce, 0x39, 0xf7, 0x51, 0xb7, 0xab, - 0x0a, 0xf2, 0x55, 0x4c, 0x5d, 0xa7, 0x8e, 0x3d, 0x5a, 0x0a, 0x57, 0x4b, 0x2c, 0xc0, 0x8e, 0x4f, - 0x4a, 0xcd, 0x80, 0xb1, 0xdd, 0x62, 0x33, 0x60, 0x82, 0xa1, 0xd9, 0xb6, 0x41, 0x31, 0x5c, 0x2d, - 0x6a, 0x83, 0x85, 0x53, 0x35, 0xc6, 0x6a, 0x3e, 0x29, 0xe1, 0xa6, 0x57, 0xc2, 0x94, 0x32, 0x81, - 0x85, 0xc7, 0x28, 0xd7, 0x53, 0x16, 0x8e, 0xd7, 0x58, 0x8d, 0xa9, 0xc7, 0x92, 0x7c, 0x32, 0xa3, - 0x73, 0x06, 0xbc, 0x4d, 0xa3, 0xc7, 0x0b, 0xff, 0x81, 0x99, 0xff, 0xb5, 0x48, 0x70, 0xef, 0xb6, - 0x24, 0x2d, 0x93, 0xbb, 0x2d, 0xc2, 0x05, 0x3a, 0x0d, 0x10, 0xe8, 0x47, 0xdb, 0x73, 0xb3, 0xd6, - 0xa2, 0xb5, 0x92, 0x2e, 0xff, 0xc5, 0x8c, 0x6c, 0xb9, 0x68, 0x0e, 0xc6, 0xeb, 0xc4, 0xab, 0xd5, - 0x45, 0x76, 0x74, 0xd1, 0x5a, 0x49, 0x95, 0xcd, 0x5b, 0x41, 0x00, 0x8a, 0x63, 0xf1, 0x26, 0xa3, - 0x9c, 0xc4, 0xac, 0xad, 0xb8, 0x35, 0xba, 0x06, 0xe3, 0x01, 0xe1, 0x2d, 0x5f, 0xa3, 0x64, 0xd6, - 0x56, 0x8a, 0x09, 0xbe, 0x16, 0x2b, 0x1e, 0xad, 0xf9, 0xa4, 0x0b, 0x71, 0x23, 0xfd, 0xe4, 0x59, - 0x7e, 0xa4, 0x6c, 0x66, 0x17, 0x2e, 0xc3, 0x9c, 0x62, 0xbd, 0xd1, 0xf2, 0x85, 0xd7, 0xe5, 0x46, - 0x1e, 0x32, 0x1d, 0x37, 0x78, 0xd6, 0x5a, 0x4c, 0xad, 0xa4, 0xcb, 0xd0, 0xf6, 0x83, 0x17, 0xf6, - 0x60, 0xbe, 0x6f, 0xea, 0x01, 0xaa, 0xaf, 0xf6, 0xa8, 0x5e, 0x4e, 0x54, 0xdd, 0x0f, 0xd8, 0x23, - 0x3a, 0x0f, 0xa7, 0x15, 0xb3, 0x91, 0x7a, 0x85, 0xb5, 0xa8, 0x88, 0x6b, 0x2f, 0x7c, 0x04, 0xb9, - 0x41, 0x06, 0xaf, 0x45, 0x61, 0x3f, 0x60, 0x8f, 0xc2, 0xef, 0x2c, 0x98, 0x4d, 0x08, 0x3e, 0xfa, - 0x17, 0x8c, 0xa9, 0x02, 0x55, 0xac, 0x99, 0xb5, 0xc5, 0x83, 0xb2, 0x66, 0x60, 0xf5, 0x24, 0xf4, - 0x1e, 0x4c, 0x91, 0xb0, 0x61, 0xab, 0x17, 0xbb, 0x7a, 0x4f, 0x10, 0xae, 0x54, 0x4e, 0x6c, 0xfc, - 0xe3, 0xf7, 0x67, 0xf9, 0xbf, 0xd7, 0x3c, 0x51, 0x6f, 0x55, 0x8b, 0x0e, 0x6b, 0x94, 0x1c, 0xd6, - 0x20, 0xa2, 0xba, 0x2b, 0x3a, 0x0f, 0xbe, 0x57, 0xe5, 0x25, 0x35, 0xa5, 0xb8, 0x49, 0xf6, 0x36, - 0xe4, 0x43, 0x79, 0x92, 0x84, 0x0d, 0xcd, 0x22, 0x5f, 0x0b, 0x8f, 0x2d, 0x40, 0x09, 0xb9, 0xfc, - 0x67, 0xb7, 0xe4, 0xfc, 0x01, 0x29, 0x7b, 0xdb, 0x8a, 0x13, 0x72, 0x7b, 0x28, 0xc5, 0x9d, 0x79, - 0x6f, 0x53, 0xf1, 0x73, 0x0b, 0x32, 0xb1, 0xf4, 0xa2, 0x25, 0x98, 0xa8, 0xfa, 0xcc, 0xb9, 0x63, - 0xc7, 0x8a, 0x31, 0x5d, 0xce, 0xa8, 0xb1, 0x4d, 0x5d, 0x91, 0x3b, 0x30, 0xa3, 0x25, 0xdb, 0x2e, - 0x16, 0x58, 0x0b, 0x33, 0xc5, 0x79, 0x36, 0xd1, 0xb3, 0x5b, 0xea, 0xe7, 0xdf, 0x58, 0xe0, 0xb8, - 0x7b, 0x53, 0xac, 0x7b, 0x58, 0xe2, 0x6a, 0xea, 0x80, 0xf8, 0xf8, 0x9e, 0xc1, 0x4d, 0xfd, 0x09, - 0xee, 0x86, 0xb4, 0x2e, 0x4b, 0xe3, 0x2e, 0xdc, 0x6a, 0xf7, 0x70, 0xe1, 0x37, 0x0b, 0xa0, 0x53, - 0x0e, 0x87, 0xf1, 0x10, 0xc3, 0x7c, 0xdc, 0xc3, 0x86, 0x9c, 0xdc, 0xf6, 0x33, 0xf5, 0x92, 0x7e, - 0x1e, 0xef, 0xf8, 0x19, 0x53, 0xf1, 0xa6, 0x9c, 0xfd, 0xd1, 0x02, 0xe8, 0x54, 0xd2, 0x61, 0x9c, - 0xbd, 0x09, 0x19, 0x47, 0x4e, 0xe8, 0x4a, 0x64, 0x72, 0x97, 0x31, 0xdd, 0x8b, 0xf7, 0x95, 0x2a, - 0x38, 0x1d, 0xca, 0x37, 0xe5, 0xd9, 0xb7, 0x16, 0x4c, 0xf5, 0x44, 0x18, 0x95, 0xda, 0xcd, 0x51, - 0xaf, 0xac, 0x99, 0x08, 0x33, 0x5c, 0x2d, 0x96, 0xd5, 0x1f, 0xdd, 0x6d, 0x10, 0x65, 0xe1, 0x48, - 0x48, 0x02, 0xee, 0x31, 0xaa, 0x1c, 0x4d, 0x97, 0xa3, 0x57, 0x74, 0x1d, 0x26, 0x1a, 0x24, 0xb8, - 0xe3, 0x13, 0xbb, 0x89, 0x45, 0x9d, 0x67, 0x53, 0x2a, 0xd1, 0x67, 0x12, 0x15, 0x6f, 0xad, 0xef, - 0x5c, 0xbf, 0xa1, 0x8c, 0x6f, 0x63, 0x51, 0x37, 0x14, 0x99, 0x46, 0x7b, 0x84, 0x17, 0x1e, 0x8e, - 0xc2, 0xb1, 0x6e, 0x2b, 0xb4, 0x0c, 0xd3, 0x1e, 0xd7, 0x05, 0xc5, 0xa8, 0x1d, 0xb4, 0xd3, 0x71, - 0xb4, 0x3c, 0xe9, 0x71, 0xe9, 0xd2, 0x2d, 0x5a, 0x56, 0x09, 0x39, 0x07, 0xc7, 0x78, 0xab, 0x2a, - 0x02, 0x42, 0xec, 0xd8, 0x77, 0x79, 0xb2, 0x3c, 0x69, 0x46, 0x4d, 0xde, 0x96, 0x60, 0x22, 0x32, - 0xe3, 0xde, 0x7d, 0xa2, 0x42, 0x9c, 0x2e, 0x67, 0xcc, 0x58, 0xc5, 0xbb, 0x4f, 0xd0, 0x32, 0x4c, - 0x45, 0x26, 0x91, 0xd7, 0x69, 0x65, 0x15, 0x11, 0xec, 0x18, 0xe7, 0xdf, 0x81, 0x09, 0xee, 0x55, - 0x7d, 0x8f, 0xd6, 0xec, 0x3a, 0xe6, 0xf5, 0xec, 0xd8, 0x10, 0x0d, 0x26, 0x63, 0x90, 0x36, 0x31, - 0xaf, 0x17, 0xbe, 0x4c, 0xc1, 0x54, 0x4f, 0x7e, 0x65, 0x81, 0xe8, 0x15, 0xc5, 0x05, 0x0b, 0x88, - 0x1d, 0xef, 0x8c, 0x67, 0x07, 0xf7, 0xf2, 0x8a, 0x34, 0xee, 0x2a, 0x90, 0x46, 0xf7, 0x30, 0xf2, - 0xe1, 0x64, 0x54, 0xeb, 0xd8, 0x25, 0x81, 0xdd, 0x4e, 0x67, 0x20, 0xb8, 0x29, 0xeb, 0x8b, 0x83, - 0x0b, 0x70, 0x53, 0x4d, 0x8a, 0xf2, 0x15, 0x08, 0x6e, 0x68, 0xe6, 0xaa, 0x89, 0xff, 0x22, 0x0f, - 0xb2, 0x0e, 0x6b, 0x34, 0x18, 0xb5, 0x09, 0x75, 0x98, 0x4b, 0x5c, 0x3b, 0x64, 0x42, 0xb3, 0x99, - 0x6a, 0xff, 0xeb, 0x80, 0x36, 0x2f, 0x27, 0x5d, 0xd5, 0x73, 0x76, 0x98, 0x50, 0x70, 0x86, 0xeb, - 0x84, 0x93, 0xf4, 0x27, 0xba, 0x06, 0xc0, 0xbd, 0x1a, 0xc5, 0xa2, 0x15, 0x10, 0x9e, 0x4d, 0xab, - 0xc2, 0x4c, 0xfe, 0x50, 0x6f, 0xdf, 0xa8, 0x44, 0x86, 0xd1, 0xca, 0xec, 0xcc, 0x2c, 0x3c, 0x1a, - 0x87, 0xa9, 0x9e, 0x58, 0xa2, 0x8f, 0x2d, 0x30, 0x7b, 0x49, 0xdb, 0xc3, 0xa1, 0x6f, 0x73, 0x81, - 0x05, 0xd1, 0x45, 0x60, 0xa9, 0x22, 0xf8, 0xef, 0xfe, 0xb3, 0xfc, 0xac, 0x5e, 0x77, 0xb2, 0xa0, - 0x2b, 0xf2, 0x7f, 0x99, 0xda, 0x57, 0xaa, 0x8d, 0x59, 0x4d, 0xb5, 0x85, 0x43, 0xbf, 0x0d, 0x84, - 0x3c, 0x98, 0x6b, 0x78, 0x54, 0x98, 0x72, 0x30, 0x59, 0x53, 0x0a, 0x86, 0xf9, 0xce, 0xcd, 0x4a, - 0x4c, 0xe5, 0xa8, 0xce, 0x9a, 0xa2, 0x7a, 0x68, 0xc1, 0xb9, 0x26, 0x0e, 0x70, 0x83, 0xdb, 0x82, - 0xd9, 0xdc, 0xc7, 0xbc, 0x2e, 0x6b, 0x5e, 0x31, 0xf3, 0x2e, 0xea, 0xd4, 0x10, 0xd4, 0x8b, 0x9a, - 0x62, 0x9b, 0x55, 0x0c, 0x81, 0x92, 0xc1, 0x63, 0x3a, 0x1e, 0xc0, 0x52, 0x8d, 0x85, 0x52, 0x83, - 0xe7, 0xe0, 0x3a, 0xe3, 0x22, 0x49, 0x42, 0x7a, 0x08, 0x09, 0xa7, 0x6a, 0x2c, 0xdc, 0x66, 0x5b, - 0x1a, 0xbc, 0x8f, 0xfe, 0x13, 0x0b, 0xce, 0xe0, 0x96, 0xa8, 0x4b, 0x01, 0xbb, 0x84, 0xd4, 0x02, - 0x4c, 0x13, 0x15, 0x0c, 0xd3, 0x06, 0x72, 0x92, 0x60, 0x9b, 0x5d, 0x33, 0xf0, 0x7d, 0x1a, 0x64, - 0x2a, 0xb8, 0xc0, 0x77, 0x64, 0xfc, 0x05, 0xb3, 0x5b, 0xcd, 0x5a, 0x80, 0x5d, 0x92, 0xa4, 0x62, - 0x7c, 0x98, 0x54, 0x18, 0x8a, 0x6d, 0xf6, 0x7f, 0x4d, 0xd0, 0xab, 0xa3, 0xf0, 0xfd, 0x18, 0xcc, - 0x25, 0x37, 0x00, 0x44, 0xe1, 0xa4, 0x69, 0x9b, 0x36, 0xa6, 0xae, 0xad, 0x16, 0x9b, 0xed, 0xb9, - 0xf1, 0xd5, 0xf1, 0x6a, 0xaa, 0x4e, 0x18, 0xd8, 0x75, 0xea, 0x5e, 0x91, 0xa0, 0x5b, 0xae, 0x0a, - 0x49, 0xf7, 0x41, 0x2c, 0xdd, 0x3e, 0x02, 0xe4, 0x21, 0x23, 0xbc, 0x06, 0xb1, 0x39, 0x71, 0x18, - 0x75, 0x4d, 0xa3, 0x07, 0x39, 0x54, 0x51, 0x23, 0x68, 0x05, 0xa6, 0x95, 0x01, 0xc5, 0x94, 0x45, - 0x56, 0x69, 0xf5, 0xcd, 0x38, 0x26, 0xc7, 0x6f, 0x62, 0xca, 0x8c, 0xe5, 0x07, 0x30, 0xef, 0x63, - 0x2e, 0x6c, 0xdd, 0x28, 0x3d, 0x57, 0x39, 0xc6, 0x44, 0x9d, 0x04, 0x43, 0x25, 0x7b, 0x56, 0x82, - 0xaa, 0x28, 0x6e, 0xb9, 0xeb, 0xd4, 0xbd, 0x25, 0x01, 0xd1, 0xe7, 0x16, 0x9c, 0xa7, 0x64, 0x4f, - 0xd8, 0x21, 0xf6, 0x3d, 0x17, 0x0b, 0x16, 0xa8, 0xc8, 0xe9, 0x58, 0xca, 0x7d, 0x31, 0xe5, 0x2d, - 0x3e, 0x7c, 0x8a, 0x97, 0x24, 0xc7, 0x4e, 0x44, 0x21, 0x03, 0x29, 0xc3, 0x1a, 0xe1, 0xab, 0xc0, - 0xbe, 0x0f, 0x33, 0xca, 0x6b, 0xbd, 0x09, 0x30, 0x9c, 0x47, 0x86, 0xe0, 0x9c, 0x92, 0x70, 0x7a, - 0x83, 0xa1, 0x19, 0xee, 0xc2, 0x02, 0x09, 0x3d, 0x97, 0x50, 0x87, 0x28, 0xff, 0x9a, 0x01, 0x6b, - 0x32, 0x4e, 0xb4, 0xc7, 0xd9, 0xa3, 0x43, 0x50, 0xcd, 0x47, 0xb8, 0xeb, 0xd4, 0xbd, 0x6d, 0x50, - 0x55, 0xe1, 0xfe, 0x62, 0xc1, 0x89, 0xc4, 0x8f, 0x09, 0xaa, 0x02, 0x92, 0x5d, 0x9f, 0xb8, 0xd1, - 0x06, 0x9d, 0xec, 0x7a, 0x7b, 0x43, 0x15, 0xec, 0xb4, 0xc6, 0xd3, 0x1b, 0x2f, 0x89, 0xd6, 0xcb, - 0xc1, 0x5b, 0xbb, 0x92, 0x63, 0xf4, 0xf5, 0x70, 0x54, 0x14, 0x5a, 0xe1, 0xb3, 0x51, 0xc8, 0xc4, - 0xbe, 0x68, 0x68, 0x03, 0xac, 0x60, 0x28, 0x37, 0xac, 0x40, 0x62, 0x0c, 0x77, 0x7e, 0xb2, 0x38, - 0x9a, 0x00, 0x2b, 0x54, 0xab, 0x70, 0xb2, 0x6c, 0x85, 0x08, 0xc3, 0x4c, 0xb4, 0x03, 0x90, 0x8b, - 0x8d, 0x0b, 0xdc, 0x68, 0x0e, 0xd5, 0xbb, 0xa7, 0x0d, 0xdc, 0x76, 0x84, 0x56, 0x78, 0x64, 0x01, - 0xea, 0xdf, 0x7b, 0xa3, 0xe3, 0x30, 0xa6, 0xf6, 0xdd, 0x66, 0x57, 0xaf, 0x5f, 0xde, 0xd6, 0x16, - 0x77, 0xed, 0xe7, 0x14, 0x1c, 0xa9, 0x90, 0x20, 0xf4, 0x1c, 0x82, 0xbe, 0xb0, 0x60, 0x4c, 0x6b, - 0x3a, 0x9f, 0x88, 0xd6, 0x77, 0x27, 0xb5, 0xb0, 0x7c, 0xa0, 0x9d, 0x3e, 0x3b, 0x17, 0x4a, 0x9f, - 0xfe, 0xf0, 0xeb, 0x37, 0xa3, 0x17, 0xd0, 0x72, 0x69, 0xe0, 0xe5, 0x5a, 0xe9, 0xc3, 0xce, 0xbd, - 0xd0, 0x03, 0xf4, 0x75, 0xf7, 0x71, 0xef, 0xe2, 0x60, 0xa2, 0xbe, 0x2b, 0xa6, 0x85, 0xbf, 0x1d, - 0xce, 0xd8, 0x48, 0x5b, 0x51, 0xd2, 0x0a, 0x68, 0x31, 0x51, 0x5a, 0xec, 0xd4, 0x88, 0x1e, 0x5b, - 0x30, 0xd3, 0x77, 0xf5, 0x83, 0xd6, 0x06, 0xb3, 0x0d, 0xba, 0x48, 0x5a, 0xb8, 0xf4, 0x52, 0x73, - 0x8c, 0xd0, 0x55, 0x25, 0xf4, 0x22, 0xba, 0x90, 0x28, 0xd4, 0x04, 0x8f, 0xdb, 0xb1, 0x63, 0xe0, - 0x46, 0xe5, 0xc9, 0x7e, 0xce, 0x7a, 0xba, 0x9f, 0xb3, 0x9e, 0xef, 0xe7, 0xac, 0xaf, 0x5e, 0xe4, - 0x46, 0x9e, 0xbe, 0xc8, 0x8d, 0xfc, 0xf4, 0x22, 0x37, 0xf2, 0xee, 0xe5, 0x58, 0x41, 0x4b, 0x38, - 0x75, 0xf1, 0xe8, 0x30, 0xbf, 0x64, 0x70, 0xd7, 0x4a, 0x8e, 0xef, 0x11, 0x2a, 0x4a, 0xb5, 0xa0, - 0xe9, 0x74, 0xe5, 0xa9, 0x3a, 0xae, 0x6c, 0x2f, 0xfd, 0x11, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xab, - 0x58, 0x02, 0x28, 0x15, 0x00, 0x00, + 0x16, 0x55, 0x8b, 0x94, 0xec, 0xb9, 0x94, 0x2c, 0xa9, 0x64, 0x4b, 0xb4, 0x60, 0x93, 0x12, 0xed, + 0xb1, 0xe4, 0xf1, 0x80, 0x1c, 0xc9, 0xb3, 0x31, 0x66, 0x36, 0x92, 0xc7, 0x1e, 0x69, 0xc6, 0xaf, + 0x90, 0x8a, 0x02, 0x04, 0x01, 0x3a, 0xc5, 0xee, 0x12, 0x59, 0x71, 0xb3, 0x8b, 0xee, 0x2a, 0x12, + 0xb2, 0x03, 0x23, 0x2f, 0x24, 0x41, 0xb2, 0x08, 0xf2, 0xf8, 0x8b, 0x6c, 0x8c, 0x6c, 0xf2, 0x0d, + 0x5e, 0x1a, 0xc8, 0x22, 0x01, 0x02, 0x38, 0x86, 0x9c, 0x55, 0x3e, 0x21, 0xab, 0xa0, 0x1e, 0x4d, + 0x76, 0x93, 0xcd, 0x48, 0x36, 0x6d, 0xaf, 0xd8, 0x5d, 0xbc, 0x75, 0xce, 0xb9, 0x8f, 0xba, 0x55, + 0x5d, 0x90, 0xaf, 0x62, 0xdf, 0x75, 0xea, 0x98, 0xfa, 0xa5, 0xf6, 0x6a, 0x89, 0x05, 0xd8, 0xf1, + 0x48, 0xa9, 0x19, 0x30, 0xb6, 0x5b, 0x6c, 0x06, 0x4c, 0x30, 0x34, 0xdb, 0x31, 0x28, 0xb6, 0x57, + 0x8b, 0xda, 0x60, 0xe1, 0x54, 0x8d, 0xb1, 0x9a, 0x47, 0x4a, 0xb8, 0x49, 0x4b, 0xd8, 0xf7, 0x99, + 0xc0, 0x82, 0x32, 0x9f, 0xeb, 0x29, 0x0b, 0xc7, 0x6b, 0xac, 0xc6, 0xd4, 0x63, 0x49, 0x3e, 0x99, + 0xd1, 0x39, 0x03, 0xde, 0xa1, 0xd1, 0xe3, 0x85, 0xff, 0xc1, 0xcc, 0x6b, 0x2d, 0x12, 0xdc, 0xbd, + 0x25, 0x49, 0xcb, 0xe4, 0x4e, 0x8b, 0x70, 0x81, 0x4e, 0x03, 0x04, 0xfa, 0xd1, 0xa6, 0x6e, 0xd6, + 0x5a, 0xb4, 0x56, 0xd2, 0xe5, 0xbf, 0x98, 0x91, 0x2d, 0x17, 0xcd, 0xc1, 0x78, 0x9d, 0xd0, 0x5a, + 0x5d, 0x64, 0x47, 0x17, 0xad, 0x95, 0x54, 0xd9, 0xbc, 0x15, 0x04, 0xa0, 0x28, 0x16, 0x6f, 0x32, + 0x9f, 0x93, 0x88, 0xb5, 0x15, 0xb5, 0x46, 0x57, 0x61, 0x3c, 0x20, 0xbc, 0xe5, 0x69, 0x94, 0xcc, + 0xda, 0x4a, 0x31, 0xc1, 0xd7, 0x62, 0x85, 0xfa, 0x35, 0x8f, 0xc4, 0x10, 0x37, 0xd2, 0x0f, 0x1f, + 0xe7, 0x47, 0xca, 0x66, 0x76, 0xe1, 0x12, 0xcc, 0x29, 0xd6, 0xeb, 0x2d, 0x4f, 0xd0, 0x98, 0x1b, + 0x79, 0xc8, 0x74, 0xdd, 0xe0, 0x59, 0x6b, 0x31, 0xb5, 0x92, 0x2e, 0x43, 0xc7, 0x0f, 0x5e, 0xd8, + 0x83, 0xf9, 0xbe, 0xa9, 0x07, 0xa8, 0xbe, 0xd2, 0xa3, 0x7a, 0x39, 0x51, 0x75, 0x3f, 0x60, 0x8f, + 0xe8, 0x3c, 0x9c, 0x56, 0xcc, 0x46, 0xea, 0x65, 0xd6, 0xf2, 0x45, 0x54, 0x7b, 0xe1, 0x3d, 0xc8, + 0x0d, 0x32, 0x78, 0x21, 0x0a, 0xfb, 0x01, 0x7b, 0x14, 0x7e, 0x67, 0xc1, 0x6c, 0x42, 0xf0, 0xd1, + 0xbf, 0x61, 0x4c, 0x15, 0xa8, 0x62, 0xcd, 0xac, 0x2d, 0x1e, 0x94, 0x35, 0x03, 0xab, 0x27, 0xa1, + 0xb7, 0x60, 0x8a, 0xb4, 0x1b, 0xb6, 0x7a, 0xb1, 0xab, 0x77, 0x05, 0xe1, 0x4a, 0xe5, 0xc4, 0xc6, + 0x3f, 0x7f, 0x7f, 0x9c, 0xff, 0x47, 0x8d, 0x8a, 0x7a, 0xab, 0x5a, 0x74, 0x58, 0xa3, 0xe4, 0xb0, + 0x06, 0x11, 0xd5, 0x5d, 0xd1, 0x7d, 0xf0, 0x68, 0x95, 0x97, 0xd4, 0x94, 0xe2, 0x26, 0xd9, 0xdb, + 0x90, 0x0f, 0xe5, 0x49, 0xd2, 0x6e, 0x68, 0x16, 0xf9, 0x5a, 0x78, 0x60, 0x01, 0x4a, 0xc8, 0xe5, + 0xbf, 0xe2, 0x92, 0xf3, 0x07, 0xa4, 0xec, 0x55, 0x2b, 0x4e, 0xc8, 0xed, 0xa1, 0x14, 0x77, 0xe7, + 0xbd, 0x4a, 0xc5, 0x4f, 0x2c, 0xc8, 0x44, 0xd2, 0x8b, 0x96, 0x60, 0xa2, 0xea, 0x31, 0xe7, 0xb6, + 0x1d, 0x29, 0xc6, 0x74, 0x39, 0xa3, 0xc6, 0x36, 0x75, 0x45, 0xee, 0xc0, 0x8c, 0x96, 0x6c, 0xbb, + 0x58, 0x60, 0x2d, 0xcc, 0x14, 0xe7, 0xd9, 0x44, 0xcf, 0x6e, 0xaa, 0x9f, 0xff, 0x60, 0x81, 0xa3, + 0xee, 0x4d, 0xb1, 0xf8, 0xb0, 0xc4, 0xd5, 0xd4, 0x01, 0xf1, 0xf0, 0x5d, 0x83, 0x9b, 0xfa, 0x13, + 0xdc, 0x0d, 0x69, 0x5d, 0x96, 0xc6, 0x31, 0xdc, 0x6a, 0x7c, 0xb8, 0xf0, 0x9b, 0x05, 0xd0, 0x2d, + 0x87, 0xc3, 0x78, 0x88, 0x61, 0x3e, 0xea, 0x61, 0x43, 0x4e, 0xee, 0xf8, 0x99, 0x7a, 0x46, 0x3f, + 0x8f, 0x77, 0xfd, 0x8c, 0xa8, 0x78, 0x59, 0xce, 0xfe, 0x68, 0x01, 0x74, 0x2b, 0xe9, 0x30, 0xce, + 0xde, 0x80, 0x8c, 0x23, 0x27, 0xc4, 0x12, 0x99, 0xdc, 0x65, 0x4c, 0xf7, 0xe2, 0x7d, 0xa5, 0x0a, + 0x4e, 0x97, 0xf2, 0x65, 0x79, 0xf6, 0xad, 0x05, 0x53, 0x3d, 0x11, 0x46, 0xa5, 0x4e, 0x73, 0xd4, + 0x2b, 0x6b, 0x26, 0xc4, 0x6c, 0xaf, 0x16, 0xcb, 0xea, 0x8f, 0x78, 0x1b, 0x44, 0x59, 0x38, 0xd2, + 0x26, 0x01, 0xa7, 0xcc, 0x57, 0x8e, 0xa6, 0xcb, 0xe1, 0x2b, 0xba, 0x06, 0x13, 0x0d, 0x12, 0xdc, + 0xf6, 0x88, 0xdd, 0xc4, 0xa2, 0xce, 0xb3, 0x29, 0x95, 0xe8, 0x33, 0x89, 0x8a, 0xb7, 0xd6, 0x77, + 0xae, 0x5d, 0x57, 0xc6, 0xb7, 0xb0, 0xa8, 0x1b, 0x8a, 0x4c, 0xa3, 0x33, 0xc2, 0x0b, 0x1f, 0x8f, + 0xc2, 0xb1, 0xb8, 0x15, 0x5a, 0x86, 0x69, 0xca, 0x75, 0x41, 0x31, 0xdf, 0x0e, 0x3a, 0xe9, 0x38, + 0x5a, 0x9e, 0xa4, 0x5c, 0xba, 0x74, 0xd3, 0x2f, 0xab, 0x84, 0xfc, 0x15, 0x8e, 0xf1, 0x56, 0x55, + 0x04, 0x84, 0xd8, 0x91, 0x7d, 0x79, 0xb2, 0x3c, 0x69, 0x46, 0x4d, 0xde, 0x96, 0x60, 0x22, 0x34, + 0xe3, 0xf4, 0x1e, 0x51, 0x21, 0x4e, 0x97, 0x33, 0x66, 0xac, 0x42, 0xef, 0x11, 0xb4, 0x0c, 0x53, + 0xa1, 0x49, 0xe8, 0x75, 0x5a, 0x59, 0x85, 0x04, 0x3b, 0xc6, 0xf9, 0x37, 0x60, 0x82, 0xd3, 0xaa, + 0x47, 0xfd, 0x9a, 0x5d, 0xc7, 0xbc, 0x9e, 0x1d, 0x1b, 0xa2, 0xc1, 0x64, 0x0c, 0xd2, 0x26, 0xe6, + 0xf5, 0xc2, 0xe7, 0x29, 0x98, 0xea, 0xc9, 0xaf, 0x2c, 0x10, 0xbd, 0xa2, 0xb8, 0x60, 0x01, 0xb1, + 0xa3, 0x9d, 0xf1, 0xec, 0xe0, 0x5e, 0x5e, 0x91, 0xc6, 0xb1, 0x02, 0x69, 0xc4, 0x87, 0x91, 0x07, + 0x27, 0xc3, 0x5a, 0xc7, 0x2e, 0x09, 0xec, 0x4e, 0x3a, 0x03, 0xc1, 0x4d, 0x59, 0x5f, 0x18, 0x5c, + 0x80, 0x9b, 0x6a, 0x52, 0x98, 0xaf, 0x40, 0x70, 0x43, 0x33, 0x57, 0x4d, 0xfc, 0x17, 0x51, 0xc8, + 0x3a, 0xac, 0xd1, 0x60, 0xbe, 0x4d, 0x7c, 0x87, 0xb9, 0xc4, 0xb5, 0xdb, 0x4c, 0x68, 0x36, 0x53, + 0xed, 0x7f, 0x1b, 0xd0, 0xe6, 0xe5, 0xa4, 0x2b, 0x7a, 0xce, 0x0e, 0x13, 0x0a, 0xce, 0x70, 0x9d, + 0x70, 0x92, 0xfe, 0x44, 0x57, 0x01, 0x38, 0xad, 0xf9, 0x58, 0xb4, 0x02, 0xc2, 0xb3, 0x69, 0x55, + 0x98, 0xc9, 0x1b, 0xf5, 0xf6, 0xf5, 0x4a, 0x68, 0x18, 0xae, 0xcc, 0xee, 0xcc, 0xc2, 0x17, 0xe3, + 0x30, 0xd5, 0x13, 0x4b, 0xf4, 0xbe, 0x05, 0xe6, 0x2c, 0x69, 0x53, 0xdc, 0xf6, 0x6c, 0x2e, 0xb0, + 0x20, 0xba, 0x08, 0x2c, 0x55, 0x04, 0xff, 0xdf, 0x7f, 0x9c, 0x9f, 0xd5, 0xeb, 0x4e, 0x16, 0x74, + 0x45, 0xfe, 0x2f, 0x53, 0xfb, 0x5c, 0xb5, 0x31, 0xab, 0xa9, 0xb6, 0x70, 0xdb, 0xeb, 0x00, 0x21, + 0x0a, 0x73, 0x0d, 0xea, 0x0b, 0x53, 0x0e, 0x26, 0x6b, 0x4a, 0xc1, 0x30, 0xfb, 0xdc, 0xac, 0xc4, + 0x54, 0x8e, 0xea, 0xac, 0x29, 0xaa, 0xfb, 0xb0, 0x44, 0xab, 0x8e, 0x2d, 0x98, 0x4d, 0x1d, 0x5c, + 0x67, 0xdc, 0x90, 0xf2, 0x18, 0x6b, 0x6a, 0x08, 0xd6, 0x53, 0xb4, 0xea, 0x6c, 0xb3, 0x2d, 0x0d, + 0xae, 0xd8, 0x79, 0x84, 0xfe, 0x23, 0x0b, 0xce, 0xee, 0x12, 0x52, 0x0b, 0xb0, 0x2f, 0xa4, 0x88, + 0x5a, 0xc0, 0x5a, 0xcd, 0x24, 0x09, 0xe9, 0x21, 0x24, 0xe4, 0x43, 0x86, 0x6d, 0xf6, 0x5f, 0x89, + 0xdf, 0xa7, 0xe2, 0x03, 0x0b, 0xce, 0xe0, 0x96, 0xa8, 0x4b, 0x05, 0xa4, 0x4d, 0x5d, 0xe2, 0x3b, + 0x24, 0x49, 0xc4, 0x30, 0x4d, 0x20, 0x27, 0x09, 0xb6, 0xd9, 0x15, 0x03, 0x9f, 0x18, 0x89, 0x26, + 0x0e, 0x70, 0x83, 0x4b, 0x15, 0xad, 0x66, 0x2d, 0xc0, 0x6e, 0xa2, 0x88, 0xf1, 0x61, 0x22, 0xa1, + 0x19, 0xb6, 0xd9, 0xeb, 0x1a, 0xbf, 0x57, 0x45, 0xe1, 0xfb, 0x31, 0x98, 0x4b, 0x5e, 0xfc, 0xc8, + 0x87, 0x93, 0xa6, 0x65, 0xda, 0xd8, 0x77, 0x6d, 0xb5, 0xd0, 0x6c, 0xea, 0x46, 0x57, 0xc6, 0xf3, + 0x89, 0x3a, 0x61, 0x60, 0xd7, 0x7d, 0xf7, 0xb2, 0x04, 0xdd, 0x72, 0x55, 0x40, 0xe2, 0x1f, 0x61, + 0xe9, 0xce, 0xf1, 0x3f, 0x0f, 0x19, 0x41, 0x1b, 0xc4, 0xe6, 0xc4, 0x61, 0xbe, 0x6b, 0x9a, 0x3c, + 0xc8, 0xa1, 0x8a, 0x1a, 0x41, 0x2b, 0x30, 0xad, 0x0c, 0x7c, 0xec, 0xb3, 0xd0, 0x2a, 0xad, 0xf6, + 0x8b, 0x63, 0x72, 0xfc, 0x06, 0xf6, 0x99, 0xb1, 0x7c, 0x07, 0xe6, 0x3d, 0xcc, 0x85, 0xad, 0x9b, + 0x24, 0x75, 0x95, 0x63, 0x4c, 0xd4, 0x49, 0x30, 0x54, 0xaa, 0x67, 0x25, 0xa8, 0x8a, 0xe2, 0x96, + 0xbb, 0xee, 0xbb, 0x37, 0x25, 0x20, 0xfa, 0xd4, 0x82, 0x73, 0x3e, 0xd9, 0x13, 0x76, 0x1b, 0x7b, + 0xd4, 0xc5, 0x82, 0x05, 0x2a, 0x72, 0x3a, 0x96, 0xf2, 0x4c, 0xec, 0xf3, 0x16, 0x1f, 0x3e, 0xc3, + 0x4b, 0x92, 0x63, 0x27, 0xa4, 0x90, 0x81, 0x94, 0x61, 0x0d, 0xf1, 0x55, 0x60, 0xdf, 0x86, 0x19, + 0xe5, 0xb5, 0x3e, 0x00, 0x18, 0xce, 0x23, 0x43, 0x70, 0x4e, 0x49, 0x38, 0x7d, 0xb8, 0xd0, 0x0c, + 0x77, 0x60, 0xa1, 0xb3, 0x8c, 0xa4, 0x7f, 0xcd, 0x80, 0x35, 0x19, 0x27, 0xda, 0xe3, 0xec, 0xd1, + 0x21, 0xa8, 0xe6, 0x43, 0xdc, 0x75, 0xdf, 0xbd, 0x65, 0x50, 0x55, 0xe1, 0xfe, 0x62, 0xc1, 0x89, + 0xc4, 0x8d, 0x04, 0x55, 0x01, 0xc9, 0x8e, 0x4f, 0xdc, 0xf0, 0x70, 0x4e, 0x76, 0xe9, 0xde, 0x50, + 0x05, 0x3b, 0xad, 0xf1, 0xf4, 0xa1, 0x4b, 0xa2, 0xf5, 0x72, 0xf0, 0xd6, 0xae, 0xe4, 0x18, 0x7d, + 0x31, 0x1c, 0x15, 0x85, 0x56, 0xf8, 0x64, 0x14, 0x32, 0x91, 0xdd, 0x0c, 0x6d, 0x80, 0x15, 0x0c, + 0xe5, 0x86, 0x15, 0x48, 0x8c, 0xe1, 0xbe, 0x9d, 0x2c, 0x8e, 0x26, 0xc0, 0x6a, 0xab, 0x55, 0x38, + 0x59, 0xb6, 0xda, 0x08, 0xc3, 0x4c, 0xb8, 0xfb, 0xcb, 0xc5, 0xc6, 0x05, 0x6e, 0x34, 0x87, 0x6a, + 0xde, 0xd3, 0x06, 0x6e, 0x3b, 0x44, 0x2b, 0x7c, 0x6d, 0x01, 0xea, 0x3f, 0x77, 0xa3, 0xe3, 0x30, + 0xa6, 0xce, 0xdc, 0xe6, 0x44, 0xaf, 0x5f, 0x5e, 0xd5, 0xf1, 0x76, 0xed, 0xe7, 0x14, 0x1c, 0xa9, + 0x90, 0xa0, 0x4d, 0x1d, 0x82, 0x3e, 0xb3, 0x60, 0x4c, 0x6b, 0x3a, 0x97, 0x88, 0xd6, 0x77, 0x1f, + 0xb5, 0xb0, 0x7c, 0xa0, 0x9d, 0xfe, 0x6e, 0x2e, 0x94, 0x3e, 0xfc, 0xe1, 0xd7, 0x6f, 0x46, 0xcf, + 0xa3, 0xe5, 0xd2, 0xc0, 0x8b, 0xb5, 0xd2, 0xbb, 0xdd, 0x3b, 0xa1, 0xfb, 0xe8, 0xab, 0xf8, 0xa7, + 0xde, 0x85, 0xc1, 0x44, 0x7d, 0xd7, 0x4b, 0x0b, 0x7f, 0x3f, 0x9c, 0xb1, 0x91, 0xb6, 0xa2, 0xa4, + 0x15, 0xd0, 0x62, 0xa2, 0xb4, 0xc8, 0x17, 0x23, 0x7a, 0x60, 0xc1, 0x4c, 0xdf, 0xb5, 0x0f, 0x5a, + 0x1b, 0xcc, 0x36, 0xe8, 0x12, 0x69, 0xe1, 0xe2, 0x33, 0xcd, 0x31, 0x42, 0x57, 0x95, 0xd0, 0x0b, + 0xe8, 0x7c, 0xa2, 0x50, 0x13, 0x3c, 0x6e, 0x47, 0x3e, 0x01, 0x37, 0x2a, 0x0f, 0xf7, 0x73, 0xd6, + 0xa3, 0xfd, 0x9c, 0xf5, 0x64, 0x3f, 0x67, 0x7d, 0xf9, 0x34, 0x37, 0xf2, 0xe8, 0x69, 0x6e, 0xe4, + 0xa7, 0xa7, 0xb9, 0x91, 0x37, 0x2f, 0x45, 0x0a, 0x5a, 0xc2, 0xa9, 0x4b, 0x47, 0x87, 0x79, 0x25, + 0x83, 0xbb, 0x56, 0x72, 0x3c, 0x4a, 0x7c, 0x51, 0xaa, 0x05, 0x4d, 0x27, 0x96, 0xa7, 0xea, 0xb8, + 0xb2, 0xbd, 0xf8, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x6f, 0x30, 0x2a, 0x24, 0x15, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2256,31 +2257,31 @@ func (m *MultiStoreProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.StakingToUpgradeStoresMerkleHash) > 0 { - i -= len(m.StakingToUpgradeStoresMerkleHash) - copy(dAtA[i:], m.StakingToUpgradeStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.StakingToUpgradeStoresMerkleHash))) + if len(m.ParamsToUpgradeStoresMerkleHash) > 0 { + i -= len(m.ParamsToUpgradeStoresMerkleHash) + copy(dAtA[i:], m.ParamsToUpgradeStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.ParamsToUpgradeStoresMerkleHash))) i-- dAtA[i] = 0x32 } - if len(m.AuthToFeegrantStoresMerkleHash) > 0 { - i -= len(m.AuthToFeegrantStoresMerkleHash) - copy(dAtA[i:], m.AuthToFeegrantStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.AuthToFeegrantStoresMerkleHash))) + if len(m.AuthToEvidenceStoresMerkleHash) > 0 { + i -= len(m.AuthToEvidenceStoresMerkleHash) + copy(dAtA[i:], m.AuthToEvidenceStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.AuthToEvidenceStoresMerkleHash))) i-- dAtA[i] = 0x2a } - if len(m.GovToIcahostStoresMerkleHash) > 0 { - i -= len(m.GovToIcahostStoresMerkleHash) - copy(dAtA[i:], m.GovToIcahostStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.GovToIcahostStoresMerkleHash))) + if len(m.FeegrantToGroupStoresMerkleHash) > 0 { + i -= len(m.FeegrantToGroupStoresMerkleHash) + copy(dAtA[i:], m.FeegrantToGroupStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.FeegrantToGroupStoresMerkleHash))) i-- dAtA[i] = 0x22 } - if len(m.ParamsToSlashingStoresMerkleHash) > 0 { - i -= len(m.ParamsToSlashingStoresMerkleHash) - copy(dAtA[i:], m.ParamsToSlashingStoresMerkleHash) - i = encodeVarintProof(dAtA, i, uint64(len(m.ParamsToSlashingStoresMerkleHash))) + if len(m.IbcToIcahostStoresMerkleHash) > 0 { + i -= len(m.IbcToIcahostStoresMerkleHash) + copy(dAtA[i:], m.IbcToIcahostStoresMerkleHash) + i = encodeVarintProof(dAtA, i, uint64(len(m.IbcToIcahostStoresMerkleHash))) i-- dAtA[i] = 0x1a } @@ -2777,19 +2778,19 @@ func (m *MultiStoreProof) Size() (n int) { if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.ParamsToSlashingStoresMerkleHash) + l = len(m.IbcToIcahostStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.GovToIcahostStoresMerkleHash) + l = len(m.FeegrantToGroupStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.AuthToFeegrantStoresMerkleHash) + l = len(m.AuthToEvidenceStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } - l = len(m.StakingToUpgradeStoresMerkleHash) + l = len(m.ParamsToUpgradeStoresMerkleHash) if l > 0 { n += 1 + l + sovProof(uint64(l)) } @@ -4808,7 +4809,7 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ParamsToSlashingStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field IbcToIcahostStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4835,14 +4836,14 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ParamsToSlashingStoresMerkleHash = append(m.ParamsToSlashingStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.ParamsToSlashingStoresMerkleHash == nil { - m.ParamsToSlashingStoresMerkleHash = []byte{} + m.IbcToIcahostStoresMerkleHash = append(m.IbcToIcahostStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.IbcToIcahostStoresMerkleHash == nil { + m.IbcToIcahostStoresMerkleHash = []byte{} } iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GovToIcahostStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FeegrantToGroupStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4869,14 +4870,14 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.GovToIcahostStoresMerkleHash = append(m.GovToIcahostStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.GovToIcahostStoresMerkleHash == nil { - m.GovToIcahostStoresMerkleHash = []byte{} + m.FeegrantToGroupStoresMerkleHash = append(m.FeegrantToGroupStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.FeegrantToGroupStoresMerkleHash == nil { + m.FeegrantToGroupStoresMerkleHash = []byte{} } iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AuthToFeegrantStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AuthToEvidenceStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4903,14 +4904,14 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.AuthToFeegrantStoresMerkleHash = append(m.AuthToFeegrantStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.AuthToFeegrantStoresMerkleHash == nil { - m.AuthToFeegrantStoresMerkleHash = []byte{} + m.AuthToEvidenceStoresMerkleHash = append(m.AuthToEvidenceStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.AuthToEvidenceStoresMerkleHash == nil { + m.AuthToEvidenceStoresMerkleHash = []byte{} } iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StakingToUpgradeStoresMerkleHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ParamsToUpgradeStoresMerkleHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4937,9 +4938,9 @@ func (m *MultiStoreProof) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.StakingToUpgradeStoresMerkleHash = append(m.StakingToUpgradeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) - if m.StakingToUpgradeStoresMerkleHash == nil { - m.StakingToUpgradeStoresMerkleHash = []byte{} + m.ParamsToUpgradeStoresMerkleHash = append(m.ParamsToUpgradeStoresMerkleHash[:0], dAtA[iNdEx:postIndex]...) + if m.ParamsToUpgradeStoresMerkleHash == nil { + m.ParamsToUpgradeStoresMerkleHash = []byte{} } iNdEx = postIndex default: diff --git a/client/grpc/oracle/proof/proof_test.go b/client/grpc/oracle/proof/proof_test.go index e325c77c5..38ac53a65 100644 --- a/client/grpc/oracle/proof/proof_test.go +++ b/client/grpc/oracle/proof/proof_test.go @@ -37,16 +37,16 @@ func TestEncodeRelay(t *testing.T) { MintStoreMerkleHash: hexToBytes( "7FD5F5C7C2920C187618542901CDC5717BE8204F24BE856E80902A1BB04737E4", ), - ParamsToSlashingStoresMerkleHash: hexToBytes( + IbcToIcahostStoresMerkleHash: hexToBytes( "F981716562A49DE06E3DCAFBFB6388C294BAA4FA9D45777E25740A92F81CF65E", ), - GovToIcahostStoresMerkleHash: hexToBytes( + FeegrantToGroupStoresMerkleHash: hexToBytes( "E8E27CBB44BB654F64EEEF4667868AD48667CEB28E3DB5C4DF7A4B4B87F0C04B", ), - AuthToFeegrantStoresMerkleHash: hexToBytes( + AuthToEvidenceStoresMerkleHash: hexToBytes( "FC96CFFD30E5B8979EA66F9D0DA1CBAB16F69669E8B2A1FB2E1BEB457C9726E8", ), - StakingToUpgradeStoresMerkleHash: hexToBytes( + ParamsToUpgradeStoresMerkleHash: hexToBytes( "C9C8849ED125CC7681329C4D27B83B1FC8ACF7A865C9D1D1DF575CCA56F48DBE", ), }, diff --git a/proto/bandchain/v1/oracle/proof.proto b/proto/bandchain/v1/oracle/proof.proto index 5b666e2da..7559af646 100644 --- a/proto/bandchain/v1/oracle/proof.proto +++ b/proto/bandchain/v1/oracle/proof.proto @@ -128,38 +128,39 @@ message BlockRelayProof { // MultiStoreProof stores a compact of other Cosmos-SDK modules' storage hash in multistore to // compute (in combination with oracle store hash) Tendermint's application state hash at a given block. // -// ________________[AppHash]_________________________ -// / \ -// _________________[N15]_________________ __[N16]___ -// / \ / \ -// _______[N12]______ _______[N13]________ [N14] [I] -// / \ / \ / \ -// __[N8]__ __[N9]__ __[N10]__ __[N11]__ [G] [H] -// / \ / \ / \ / \ -// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] -// / \ / \ / \ / \ / \ / \ / \ / \ +// ____________________[AppHash]____________________ +// / \ +// ___________[N19]____________ ____[N20]_____ +// / \ / \ +// _____[N15]_____ ____[N16]______ __[N17]__ [K] +// / \ / \ / \ +// __[N8]_ __[N9]_ _[N10]_ _[N11]_ [N12] [N13] +// / \ / \ / \ / \ / \ / \ +// [N0] [N1] [N2] [N3] [N4] [N5] [N6] [N7] [G] [H] [I] [J] +// / \ / \ / \ / \ / \ / \ / \ / \ +// [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] [C] [D] [E] [F] // -// [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] [C] [D] [E] [F] +// [0] - acc (auth) [1] - authz [2] - bank [3] - capability [4] - consensus [5] - crisis +// [6] - dist [7] - evidence [8] - feegrant [9] - globalfee [A] - gov [B] - group +// [C] - ibccore [D] - icahost [E] - mint [F] - oracle [G] - params [H] - slashing +// [I] - staking [J] - transfer [K] - upgrade // -// [0] - acc (auth) [1] - authz [2] - bank [3] - capability [4] - crisis [5] - dist -// [6] - evidence [7] - feegrant [8] - gov [9] - group [A] - ibccore [B] - icahost -// [C] - mint [D] - oracle [E] - params [F] - slashing [G] - staking [H] - transfer [I] - 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 [D] In fact, only -// [C], [N7], [N10], [N12], and [N16] are needed in order to compute [AppHash]. +// root hash, since we only want to validate the correctness of [F] In fact, only +// [E], [N6], [N10], [N15], and [N20] 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 mint_store_merkle_hash = 2 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes params_to_slashing_stores_merkle_hash = 3 + bytes ibc_to_icahost_stores_merkle_hash = 3 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes gov_to_icahost_stores_merkle_hash = 4 + bytes feegrant_to_group_stores_merkle_hash = 4 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes auth_to_feegrant_stores_merkle_hash = 5 + bytes auth_to_evidence_stores_merkle_hash = 5 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; - bytes staking_to_upgrade_stores_merkle_hash = 6 + bytes params_to_upgrade_stores_merkle_hash = 6 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; } @@ -171,20 +172,20 @@ message MultiStoreProof { // [2] height. All data pieces are combined into one 32-byte hash to be signed // by block validators. The structure of the Merkle tree is shown below. // -// [BlockHeader] -// / \ -// [3A] [3B] -// / \ / \ -// [2A] [2B] [2C] [2D] -// / \ / \ / \ / \ -// [1A] [1B] [1C] [1D] [1E] [1F] [C] [D] -// / \ / \ / \ / \ / \ / \ -// [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] +// [BlockHeader] +// / \ +// [3A] [3B] +// / \ / \ +// [2A] [2B] [2C] [2D] +// / \ / \ / \ / \ +// [1A] [1B] [1C] [1D] [1E] [1F] [C] [D] +// / \ / \ / \ / \ / \ / \ +// [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [A] [B] // -// [0] - version [1] - chain_id [2] - height [3] - time -// [4] - last_block_id [5] - last_commit_hash [6] - data_hash [7] - validators_hash -// [8] - next_validators_hash [9] - consensus_hash [A] - app_hash [B] - last_results_hash -// [C] - evidence_hash [D] - proposer_address +// [0] - version [1] - chain_id [2] - height [3] - time +// [4] - last_block_id [5] - last_commit_hash [6] - data_hash [7] - validators_hash +// [8] - next_validators_hash [9] - consensus_hash [A] - app_hash [B] - last_results_hash +// [C] - evidence_hash [D] - proposer_address // // 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 [2], [3], and [A]. In fact, only