Skip to content

Commit 954b9c6

Browse files
yihuangmmsqe
authored andcommitted
Problem: dependencies in store is not consistent (cosmos#235)
* Revert "build(deps): Bump github.com/cosmos/iavl from 1.0.1 to 1.1.1 in store (cosmos#19770)" This reverts commit ff30f6e. * Problem: store package has dependency issues Solution: - revert the iavl bump, v1.0.2 is the version referenced by outer packages
1 parent ada15af commit 954b9c6

File tree

6 files changed

+3
-8
lines changed

6 files changed

+3
-8
lines changed

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ require (
171171

172172
// Below are the long-lived replace of the Cosmos SDK
173173
replace (
174+
cosmossdk.io/store => ./store
174175
// use cosmos fork of keyring
175176
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
176177
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.

go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
1414
cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
1515
cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
1616
cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
17-
cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y=
18-
cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
1917
cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871 h1:+lRwWQRVvB3jgRgdqrgeFUJ45BoXZh/UeeAV5f/m2Gk=
2018
cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
2119
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=

simapp/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ require (
207207

208208
// Below are the long-lived replace of the SimApp
209209
replace (
210+
cosmossdk.io/store => ../store
210211
// use cosmos fork of keyring
211212
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
212213
// Simapp always use the latest version of the cosmos-sdk

simapp/go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
198198
cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
199199
cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
200200
cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
201-
cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y=
202-
cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
203201
cosmossdk.io/tools/confix v0.1.1 h1:aexyRv9+y15veH3Qw16lxQwo+ki7r2I+g0yNTEFEQM8=
204202
cosmossdk.io/tools/confix v0.1.1/go.mod h1:nQVvP1tHsGXS83PonPVWJtSbddIqyjEw99L4M3rPJyQ=
205203
cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ=

store/CHANGELOG.md

-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
3131

3232
## v1.1.0 (March 20, 2024)
3333

34-
### Improvements
35-
36-
* [#19770](https://github.com/cosmos/cosmos-sdk/pull/19770) Upgrade IAVL to IAVL v1.1.1.
37-
3834
## v1.0.2 (January 10, 2024)
3935

4036
### Bug Fixes

store/iavl/tree.go

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55

66
"github.com/cosmos/iavl"
7+
78
idb "github.com/cosmos/iavl/db"
89
)
910

0 commit comments

Comments
 (0)