Problem: latest memiavl not integrated (#1002)

* Problem: latest memiavl not integrated * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> --------- Signed-off-by: yihuang <[email protected]>
crypto-org-chain · Jul 6, 2023 · 4276950 · 4276950
1 parent 172889f
commit 4276950
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - [#991](https://github.com/crypto-org-chain/chain-main/pull/991) Update cometbft `v0.34.29` with several minor bug fixes and low-severity security-fixes.
 - [#998](https://github.com/crypto-org-chain/chain-main/pull/998) Port halt-height fix from sdk
+- [#1002](https://github.com/crypto-org-chain/chain-main/pull/1002) Update to latest memiavl version
 
 ### Bug Fixes
 

diff --git a/go.mod b/go.mod
@@ -7,9 +7,9 @@ require (
 	cosmossdk.io/math v1.0.0-rc.0
 	github.com/armon/go-metrics v0.4.1
 	github.com/cosmos/cosmos-proto v1.0.0-alpha8
-	github.com/cosmos/cosmos-sdk v0.46.14-0.20230619074511-56df2b2e33a1
+	github.com/cosmos/cosmos-sdk v0.46.14-0.20230705083228-b39cdb2e74ad
 	github.com/cosmos/ibc-go/v5 v5.2.1
-	github.com/crypto-org-chain/cronos/store v0.0.4-0.20230703124409-322bd99b54bf
+	github.com/crypto-org-chain/cronos/store v0.0.4-0.20230705094240-373719727a8a
 	// release/v1.0.x
 	github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230623043455-e162787ed0b9
 	github.com/gogo/protobuf v1.3.3
@@ -73,7 +73,7 @@ require (
 	github.com/cosmos/iavl v0.19.6 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
 	github.com/creachadair/taskgroup v0.3.2 // indirect
-	github.com/crypto-org-chain/cronos/memiavl v0.0.4-0.20230703124409-322bd99b54bf // indirect
+	github.com/crypto-org-chain/cronos/memiavl v0.0.4-0.20230705094240-373719727a8a // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect

diff --git a/go.sum b/go.sum
@@ -396,8 +396,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
 github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
 github.com/cosmos/cosmos-proto v1.0.0-alpha8 h1:d3pCRuMYYvGA5bM0ZbbjKn+AoQD4A7dyNG2wzwWalUw=
 github.com/cosmos/cosmos-proto v1.0.0-alpha8/go.mod h1:6/p+Bc4O8JKeZqe0VqUGTX31eoYqemTT4C1hLCWsO7I=
-github.com/cosmos/cosmos-sdk v0.46.14-0.20230619074511-56df2b2e33a1 h1:VZ9hSe85lY3ujue7b2l+/ac04aPhhQS40+KTBRSlVX0=
-github.com/cosmos/cosmos-sdk v0.46.14-0.20230619074511-56df2b2e33a1/go.mod h1:ABDNny0muxj03rmJcyR0mG7O9QPGktl5e30EVsHvORM=
+github.com/cosmos/cosmos-sdk v0.46.14-0.20230705083228-b39cdb2e74ad h1:8ZpO0zXy80YEFeby5ixmER6ffBYQJwyaZKVNk1ghHrM=
+github.com/cosmos/cosmos-sdk v0.46.14-0.20230705083228-b39cdb2e74ad/go.mod h1:ABDNny0muxj03rmJcyR0mG7O9QPGktl5e30EVsHvORM=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
@@ -420,10 +420,10 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 h1:d4h4Ki1UE/LF6CKwYEm3OZ+HIBCrzSmOokG1vce0O98=
 github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6/go.mod h1:hF5aclS++7WrW8USOA3zPeKI0CuzwUD2TPYug25ANlQ=
-github.com/crypto-org-chain/cronos/memiavl v0.0.4-0.20230703124409-322bd99b54bf h1:YlRY0IAC2wOVg3ZwdwO8qhazty3YOyH5xZ76DWM95BU=
-github.com/crypto-org-chain/cronos/memiavl v0.0.4-0.20230703124409-322bd99b54bf/go.mod h1:k3+p+k+HzXx+NoqULMKzai1WHm5z+9CYGO/T9EVbb4w=
-github.com/crypto-org-chain/cronos/store v0.0.4-0.20230703124409-322bd99b54bf h1:7Q6pyA8BZN28r2Em5/zcI9FuBt9Pg70GDUieNxkIoGo=
-github.com/crypto-org-chain/cronos/store v0.0.4-0.20230703124409-322bd99b54bf/go.mod h1:jpkj59pegLuibS3LRb1ieD+tZG1qc78f4623fTyBa/4=
+github.com/crypto-org-chain/cronos/memiavl v0.0.4-0.20230705094240-373719727a8a h1:pdtcEn6Ay9iikzIbQFceUHXG4GWDPG7CDJB6BB1Vxl0=
+github.com/crypto-org-chain/cronos/memiavl v0.0.4-0.20230705094240-373719727a8a/go.mod h1:pfyf3023YUm3Q6AUOhBUfoPw7+P+r0GWQIUIojgluKU=
+github.com/crypto-org-chain/cronos/store v0.0.4-0.20230705094240-373719727a8a h1:dUGsei+D6y4lPf156woo96a84YR6fg4l7TcZDqRB/eo=
+github.com/crypto-org-chain/cronos/store v0.0.4-0.20230705094240-373719727a8a/go.mod h1:9TLhCjlOLpHNE7ZtxGmBnpwHZ9nys8E8Pogra8+vV28=
 github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230623043455-e162787ed0b9 h1:kgdqW/ZIn1DmYh6795XqwNJfTSFVfFIts7XTsw09NlQ=
 github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230623043455-e162787ed0b9/go.mod h1:nJHTLUNSMpAGenR70PTAv7bZu0jCU+iIuQCe4O+r3co=
 github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61 h1:Y5OuzOkZtjCfO53Jgzl+H8re6pOU4X205a1VMkDcUdk=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -116,8 +116,8 @@ schema = 3
     version = "v1.0.0-alpha8"
     hash = "sha256-iXzXoS5Kfh5DBy+PhdFWraDWXda/3M4j7j4VECjv4CA="
   [mod."github.com/cosmos/cosmos-sdk"]
-    version = "v0.46.14-0.20230619074511-56df2b2e33a1"
-    hash = "sha256-9GDhGWyc/DW81P7uYq7H157Nl5xiERq/SzLtGiptHso="
+    version = "v0.46.14-0.20230705083228-b39cdb2e74ad"
+    hash = "sha256-6vVIkETNO/d5q8xMQALL97H08IKzsbQEME9iFAK+fGk="
   [mod."github.com/cosmos/go-bip39"]
     version = "v1.0.0"
     hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA="
@@ -137,11 +137,11 @@ schema = 3
     version = "v0.3.2"
     hash = "sha256-Y261IO/d9xjV0UScqHvo31broxvnKn4IQQC9Mu6jNkE="
   [mod."github.com/crypto-org-chain/cronos/memiavl"]
-    version = "v0.0.4-0.20230703124409-322bd99b54bf"
-    hash = "sha256-wjUReZW2cLvxzPo+2APINZL4QQioEK1y1vTe/dHnHX8="
+    version = "v0.0.4-0.20230705094240-373719727a8a"
+    hash = "sha256-lCUTaMcxp5QUjNIz+yc9fK/AUvPIepnz74MfbG0NKgE="
   [mod."github.com/crypto-org-chain/cronos/store"]
-    version = "v0.0.4-0.20230703124409-322bd99b54bf"
-    hash = "sha256-IytY+uteQGtfpD7LxwwtVQwB/8csuPtVonssAk6DXQ8="
+    version = "v0.0.4-0.20230705094240-373719727a8a"
+    hash = "sha256-jHlTaHg5C+iVLE3VnuWdX2l1fNTeB1guLWPf7gai/sI="
   [mod."github.com/crypto-org-chain/cronos/versiondb"]
     version = "v0.0.0-20230623043455-e162787ed0b9"
     hash = "sha256-Z+uXkJk9zUrR5uf7MHsaDX27suu3DJO4CBgcA8TG20I="