From 09fa5a3f4f56b536a33ab6accfdfc48bb24c67d5 Mon Sep 17 00:00:00 2001 From: yihuang Date: Mon, 25 Mar 2024 11:45:24 +0800 Subject: [PATCH] Problem: dependencies in store is not consistent (#235) * Revert "build(deps): Bump github.com/cosmos/iavl from 1.0.1 to 1.1.1 in store (#19770)" This reverts commit ff30f6e0a4463f6de19678581e8d1114646cb1c7. * Problem: store package has dependency issues Solution: - revert the iavl bump, v1.0.2 is the version referenced by outer packages --- go.mod | 1 + go.sum | 2 -- simapp/go.mod | 1 + simapp/go.sum | 2 -- store/CHANGELOG.md | 4 ---- store/iavl/tree.go | 1 + 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index d33aee3f7fa2..66db0475cb2c 100644 --- a/go.mod +++ b/go.mod @@ -171,6 +171,7 @@ require ( // Below are the long-lived replace of the Cosmos SDK replace ( + cosmossdk.io/store => ./store // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // dgrijalva/jwt-go is deprecated and doesn't receive security updates. diff --git a/go.sum b/go.sum index 4fade3f7951b..8d978ccc6388 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,6 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= -cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= -cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871 h1:+lRwWQRVvB3jgRgdqrgeFUJ45BoXZh/UeeAV5f/m2Gk= cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= diff --git a/simapp/go.mod b/simapp/go.mod index 5d5080e57160..26cef4efdd58 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -207,6 +207,7 @@ require ( // Below are the long-lived replace of the SimApp replace ( + cosmossdk.io/store => ../store // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Simapp always use the latest version of the cosmos-sdk diff --git a/simapp/go.sum b/simapp/go.sum index d4b619cb2096..a638eded9b45 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -198,8 +198,6 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= -cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= -cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= cosmossdk.io/tools/confix v0.1.1 h1:aexyRv9+y15veH3Qw16lxQwo+ki7r2I+g0yNTEFEQM8= cosmossdk.io/tools/confix v0.1.1/go.mod h1:nQVvP1tHsGXS83PonPVWJtSbddIqyjEw99L4M3rPJyQ= cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ= diff --git a/store/CHANGELOG.md b/store/CHANGELOG.md index 25154cae464e..a0aa40c8add5 100644 --- a/store/CHANGELOG.md +++ b/store/CHANGELOG.md @@ -31,10 +31,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## v1.1.0 (March 20, 2024) -### Improvements - -* [#19770](https://github.com/cosmos/cosmos-sdk/pull/19770) Upgrade IAVL to IAVL v1.1.1. - ## v1.0.2 (January 10, 2024) ### Bug Fixes diff --git a/store/iavl/tree.go b/store/iavl/tree.go index 889fc1d5a07f..4995dd39d996 100644 --- a/store/iavl/tree.go +++ b/store/iavl/tree.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/cosmos/iavl" + idb "github.com/cosmos/iavl/db" )