Skip to content

Commit eef6b0b

Browse files
RogerKSIRogerKSI
committed
bump
2 parents 1eee0a6 + d264e4b commit eef6b0b

File tree

9 files changed

+497
-847
lines changed

9 files changed

+497
-847
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
## Unreleased
44

5-
- (bump) Use cosmos-sdk package v0.47.5 / ibc-go v7.2.1
6-
- (bump) replace github.com/tendermint/tendermint by github.com/cometbft/cometbft v0.37.2
5+
- (bump) Use cosmos-sdk package v0.47.8 / ibc-go v7.2.3
6+
- (bump) replace github.com/tendermint/tendermint by github.com/cometbft/cometbft v0.37.4
77
- (bump) migrated from gogo/protobuf to cosmos/gogoproto
88
- (chain) Remove disablefeeless flag
99
- (chain) Remove old oracle ante

‎client/grpc/oracle/proof/abi.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ var relayFormat = []byte(`
1616
},
1717
{
1818
"internalType": "bytes32",
19-
"name": "paramsToSlashingStoresMerkleHash",
19+
"name": "ibcToIcahostStoresMerkleHash",
2020
"type": "bytes32"
2121
},
2222
{
2323
"internalType": "bytes32",
24-
"name": "govToIcahostStoresMerkleHash",
24+
"name": "feegrantToGroupStoresMerkleHash",
2525
"type": "bytes32"
2626
},
2727
{
2828
"internalType": "bytes32",
29-
"name": "authToFeegrantStoresMerkleHash",
29+
"name": "authToEvidenceStoresMerkleHash",
3030
"type": "bytes32"
3131
},
3232
{
3333
"internalType": "bytes32",
34-
"name": "stakingToUpgradeStoresMerkleHash",
34+
"name": "paramsToUpgradeStoresMerkleHash",
3535
"type": "bytes32"
3636
}
3737
],

‎client/grpc/oracle/proof/multi_store.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ import (
88

99
// MultiStoreProofEthereum is an Ethereum version of MultiStoreProof for solidity ABI-encoding.
1010
type MultiStoreProofEthereum struct {
11-
OracleIAVLStateHash common.Hash
12-
MintStoreMerkleHash common.Hash
13-
ParamsToSlashingStoresMerkleHash common.Hash
14-
GovToIcahostStoresMerkleHash common.Hash
15-
AuthToFeegrantStoresMerkleHash common.Hash
16-
StakingToUpgradeStoresMerkleHash common.Hash
11+
OracleIAVLStateHash common.Hash
12+
MintStoreMerkleHash common.Hash
13+
IbcToIcahostStoresMerkleHash common.Hash
14+
FeegrantToGroupStoresMerkleHash common.Hash
15+
AuthToEvidenceStoresMerkleHash common.Hash
16+
ParamsToUpgradeStoresMerkleHash common.Hash
1717
}
1818

1919
func (m *MultiStoreProof) encodeToEthFormat() MultiStoreProofEthereum {
2020
return MultiStoreProofEthereum{
21-
OracleIAVLStateHash: common.BytesToHash(m.OracleIAVLStateHash),
22-
MintStoreMerkleHash: common.BytesToHash(m.MintStoreMerkleHash),
23-
ParamsToSlashingStoresMerkleHash: common.BytesToHash(m.ParamsToSlashingStoresMerkleHash),
24-
GovToIcahostStoresMerkleHash: common.BytesToHash(m.GovToIcahostStoresMerkleHash),
25-
AuthToFeegrantStoresMerkleHash: common.BytesToHash(m.AuthToFeegrantStoresMerkleHash),
26-
StakingToUpgradeStoresMerkleHash: common.BytesToHash(m.StakingToUpgradeStoresMerkleHash),
21+
OracleIAVLStateHash: common.BytesToHash(m.OracleIAVLStateHash),
22+
MintStoreMerkleHash: common.BytesToHash(m.MintStoreMerkleHash),
23+
IbcToIcahostStoresMerkleHash: common.BytesToHash(m.IbcToIcahostStoresMerkleHash),
24+
FeegrantToGroupStoresMerkleHash: common.BytesToHash(m.FeegrantToGroupStoresMerkleHash),
25+
AuthToEvidenceStoresMerkleHash: common.BytesToHash(m.AuthToEvidenceStoresMerkleHash),
26+
ParamsToUpgradeStoresMerkleHash: common.BytesToHash(m.ParamsToUpgradeStoresMerkleHash),
2727
}
2828
}
2929

3030
// GetMultiStoreProof compacts Multi store proof from Tendermint to MultiStoreProof version.
3131
func GetMultiStoreProof(multiStoreEp *ics23.ExistenceProof) MultiStoreProof {
3232
return MultiStoreProof{
33-
OracleIAVLStateHash: tmbytes.HexBytes(multiStoreEp.Value),
34-
MintStoreMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[0].Prefix[1:]),
35-
ParamsToSlashingStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[1].Suffix),
36-
GovToIcahostStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[2].Prefix[1:]),
37-
AuthToFeegrantStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[3].Prefix[1:]),
38-
StakingToUpgradeStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[4].Suffix),
33+
OracleIAVLStateHash: tmbytes.HexBytes(multiStoreEp.Value),
34+
MintStoreMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[0].Prefix[1:]),
35+
IbcToIcahostStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[1].Prefix[1:]),
36+
FeegrantToGroupStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[2].Prefix[1:]),
37+
AuthToEvidenceStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[3].Prefix[1:]),
38+
ParamsToUpgradeStoresMerkleHash: tmbytes.HexBytes(multiStoreEp.Path[4].Suffix),
3939
}
4040
}

‎client/grpc/oracle/proof/multi_store_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ query at localhost:26657/abci_query?path="/store/oracle/key"&data=0xc00000000000
2727
{
2828
"type": "ics23:iavl",
2929
"key": "wAAAAAAAAAA=",
30-
"data": "EsMDCgjAAAAAAAAAABLpAQoVBQ1eS8RW3fDH5wAMd46Ih4w7Tw0SEhAIARIMCPLi8Z8GEMDCo+ABGgwIARgBIAEqBAAC+CUiKggBEiYCBPglIMOXtvsiuUKm461Mtf/w7SDhGVqba09R5L1VU2Y2HGeOICIsCAESBQQI5CYgGiEgubs5NRGOw8xaesuOPr7hPvlY1LNxamfQ5qwMMKn8l80iKggBEiYGDOQmIAqGoK3PW8B0zAWNvdrvKtLMf9f2nUvJ/8HUfbG+mLCDICIqCAESJgga+isgwVjErYVeGYGfWDSJS9zW6U1GPMLdybMMGp3k+lT5x+ggGsoBCgHwEgZvcmFjbGUaCwgBGAEgASoDAAICIiwIARIFAgTkJiAaISCUHaTOnLkieD5s4z9auzNnWGOptSWVA3As2DTxLWzmZyIqCAESJgQI5CYg5zZMcUYFSwmSAmz9ub37BrR2v3mWJNOfELL/z1YSFJggIioIARImBgzkJiAKhqCtz1vAdMwFjb3a7yrSzH/X9p1Lyf/B1H2xvpiwgyAiKggBEiYIGvorIMFYxK2FXhmBn1g0iUvc1ulNRjzC3cmzDBqd5PpU+cfoIA=="
30+
"data": "EtsCCgjAAAAAAAAAABKyAQoBBhIdCBAQEBiAAiCABChkMNCGA0ADSEZQgOCllrsRWAEaCwgBGAEgASoDAAICIisIARIEAgQCIBohIOtzm7IvSLfzBTqQuiuk/gf6smLK34ZkSJVlxQ/1Bbi9IikIARIlBAgEIAXcsCtAWTDFinCgKJK8wl81ZbWfgSdKDpbP2Wf47EO4ICIpCAESJQYQBCCKaIo830SxbCL1Qk0rvRoWDuKiCxVidDRpX7yqJwZ6YCAamQEKAfASBm9yYWNsZRoLCAEYASABKgMAAgIiKQgBEiUCBAIgYBmyUcOTZvAWUCIP0D+9tkdWu05jYdT58XI1aiWJin0gIikIARIlBAgEIAXcsCtAWTDFinCgKJK8wl81ZbWfgSdKDpbP2Wf47EO4ICIpCAESJQYQBCCKaIo830SxbCL1Qk0rvRoWDuKiCxVidDRpX7yqJwZ6YCA="
3131
},
3232
{
3333
"type": "ics23:simple",
3434
"key": "b3JhY2xl",
35-
"data": "CvwBCgZvcmFjbGUSIIM4YL+a7OkzwrQJ6EwUJEt+FIGnboCro+OQiGZs9UAFGgkIARgBIAEqAQAiJQgBEiEBCdlpWuQ2tdx5sWp9VcTA+Y2NRuM1L8YtFLgJeZsaDxUiJwgBEgEBGiCwlrc6YwUsF2ydIB3k9PiBO3bBHhoP0IHOJtO2nDIVPyIlCAESIQFjiuPaA6L1DtVd8DXecpB+lu/MQBzkzCZ6M7j3fc3/8iIlCAESIQGDasyPrY+cK/pMuiQihLx69Ek6gZUDJ+b6v80jTKvZfiInCAESAQEaIP3tTGQiclpWi3Qerkck9TntQJo1rBxSoN6oEp1iFuNJ"
35+
"data": "CvoBCgZvcmFjbGUSIKPQ574oserr40+EoLhlrRgTGdrpgYViYEujG7W9rVBXGgkIARgBIAEqAQAiJQgBEiEBszziiEyGhp8/QWWNpdXqtweFbE6u087DWf5LXq0L+TIiJQgBEiEB3e3II3T8dhCPmDUxvJ1pJX5rydODMevJMyFcgoCkKOoiJQgBEiEBFpkM5/i+rVeuJ7iT04lRhhji55+3UobQFAvRoy5bAaIiJQgBEiEBTbPwtCi+YzaPpM9Zk+1Z73qE27/GXJESOD/JanvndjYiJwgBEgEBGiD3/25dJyNfa+hHLtAoLdyt2kECqzbUMTuiMuTW8f/kbA=="
3636
}
3737
]
3838
},
@@ -46,7 +46,7 @@ query at localhost:26657/abci_query?path="/store/oracle/key"&data=0xc00000000000
4646
func TestGetMultiStoreProof(t *testing.T) {
4747
key := []byte("oracle")
4848
data := base64ToBytes(
49-
"CvwBCgZvcmFjbGUSIIM4YL+a7OkzwrQJ6EwUJEt+FIGnboCro+OQiGZs9UAFGgkIARgBIAEqAQAiJQgBEiEBCdlpWuQ2tdx5sWp9VcTA+Y2NRuM1L8YtFLgJeZsaDxUiJwgBEgEBGiCwlrc6YwUsF2ydIB3k9PiBO3bBHhoP0IHOJtO2nDIVPyIlCAESIQFjiuPaA6L1DtVd8DXecpB+lu/MQBzkzCZ6M7j3fc3/8iIlCAESIQGDasyPrY+cK/pMuiQihLx69Ek6gZUDJ+b6v80jTKvZfiInCAESAQEaIP3tTGQiclpWi3Qerkck9TntQJo1rBxSoN6oEp1iFuNJ",
49+
"CvoBCgZvcmFjbGUSIKPQ574oserr40+EoLhlrRgTGdrpgYViYEujG7W9rVBXGgkIARgBIAEqAQAiJQgBEiEBszziiEyGhp8/QWWNpdXqtweFbE6u087DWf5LXq0L+TIiJQgBEiEB3e3II3T8dhCPmDUxvJ1pJX5rydODMevJMyFcgoCkKOoiJQgBEiEBFpkM5/i+rVeuJ7iT04lRhhji55+3UobQFAvRoy5bAaIiJQgBEiEBTbPwtCi+YzaPpM9Zk+1Z73qE27/GXJESOD/JanvndjYiJwgBEgEBGiD3/25dJyNfa+hHLtAoLdyt2kECqzbUMTuiMuTW8f/kbA==",
5050
)
5151

5252
var multistoreOps storetypes.CommitmentOp
@@ -72,19 +72,19 @@ func TestGetMultiStoreProof(t *testing.T) {
7272

7373
apphash := innerHash(
7474
innerHash(
75-
m.AuthToFeegrantStoresMerkleHash,
75+
m.AuthToEvidenceStoresMerkleHash,
7676
innerHash(
77-
m.GovToIcahostStoresMerkleHash,
77+
m.FeegrantToGroupStoresMerkleHash,
7878
innerHash(
79+
m.IbcToIcahostStoresMerkleHash,
7980
innerHash(
8081
m.MintStoreMerkleHash,
8182
leafHash(append(prefix, tmhash.Sum(m.OracleIAVLStateHash)...)),
8283
),
83-
m.ParamsToSlashingStoresMerkleHash,
8484
),
8585
),
8686
),
87-
m.StakingToUpgradeStoresMerkleHash,
87+
m.ParamsToUpgradeStoresMerkleHash,
8888
)
8989

9090
require.Equal(t, expectAppHash, apphash)

0 commit comments

Comments
 (0)