Skip to content

Commit 70f6e3f

Browse files
mergify[bot]czarcas7ic
mergify[bot]
and
czarcas7ic
authored
chore: update iavl (backport #7750) (#7755)
* chore: update iavl (#7750) * update iavl * changelog (cherry picked from commit 0b70cb8) # Conflicts: # go.mod # go.sum # osmomath/go.mod # osmoutils/go.mod # x/epochs/go.mod # x/ibc-hooks/go.mod * update sdk tag * tidy --------- Co-authored-by: Adam Tucker <[email protected]> Co-authored-by: Adam Tucker <[email protected]>
1 parent 9d3d1c3 commit 70f6e3f

File tree

7 files changed

+24
-20
lines changed

7 files changed

+24
-20
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6262
* [#7665](https://github.com/osmosis-labs/osmosis/pull/7665) feat(x/protorev): Use Transient store to store swap backruns.
6363
* [#7503](https://github.com/osmosis-labs/osmosis/pull/7503) Add IBC wasm light clients module
6464

65+
## v23.0.7-iavl-v1
66+
67+
* [#7750](https://github.com/osmosis-labs/osmosis/pull/7750) IAVL bump to improve pruning
68+
6569
## v23.0.6-iavl-v1 (contains everything in v23.0.6)
6670

6771
* [#558](https://github.com/osmosis-labs/cosmos-sdk/pull/558) Gracefully log when there is a pruning error instead of panic

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ require (
9090
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
9191
github.com/cosmos/cosmos-db v1.0.0 // indirect
9292
github.com/cosmos/gogogateway v1.2.0 // indirect
93-
github.com/cosmos/iavl v1.0.2-0.20240221171955-e019f7411ec7 // indirect
93+
github.com/cosmos/iavl v1.1.1-0.20240314205139-ca1d22d11bbb // indirect
9494
github.com/cosmos/ics23/go v0.10.0 // indirect
9595
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
9696
github.com/creachadair/taskgroup v0.4.2 // indirect
@@ -394,9 +394,9 @@ replace (
394394
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
395395
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
396396

397-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/3eb3dd7434f8856fbe00e833aaba8b15d3dc33f5
398-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5-iavl-v1
399-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-5-iavl-v1
397+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d30b4bdebbf7f3aab2e42440f72d1d6ec9038bb3
398+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-6-iavl-v1
399+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-6-iavl-v1
400400
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
401401
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
402402

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -788,8 +788,8 @@ github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiK
788788
github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI=
789789
github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI=
790790
github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
791-
github.com/cosmos/iavl v1.0.2-0.20240221171955-e019f7411ec7 h1:RUVbQo6VsQJQWPZr0N7kTX+RlnA5NhCn8N3UqOjU+m8=
792-
github.com/cosmos/iavl v1.0.2-0.20240221171955-e019f7411ec7/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM=
791+
github.com/cosmos/iavl v1.1.1-0.20240314205139-ca1d22d11bbb h1:GxCx+R2Q2u8657rYDyHpy+MO2gl17VGMT+q4QxDn89A=
792+
github.com/cosmos/iavl v1.1.1-0.20240314205139-ca1d22d11bbb/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM=
793793
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA=
794794
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
795795
github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.1.1 h1:02RCbih5lQ8aGdDMSvxhTnk5JDLEDitn17ytEE1Qhko=
@@ -1514,8 +1514,8 @@ github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4a
15141514
github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
15151515
github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-3 h1:HJItohXCYHMTd1x938+zpxswkzdKFikHPz9xkHFtpBk=
15161516
github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-3/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8=
1517-
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-5-iavl-v1 h1:dIbAc2lC8Au+kJBqxoa4VT3Ar1gH+1r+orC8Ftou0K8=
1518-
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-5-iavl-v1/go.mod h1:4WHIpz3iRefLvpqKD9oRNWD10AQbDt0tj6MmWcuY1QI=
1517+
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-6-iavl-v1 h1:BZM2axyVzqSRFcpZ+UG48pn7RB2w3vFB0FThsn6vjwk=
1518+
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-6-iavl-v1/go.mod h1:B187MDXJDIZx8HvO2ZSlG4ZmZdHuu62koCUBFQVpsFs=
15191519
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY=
15201520
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI=
15211521
github.com/osmosis-labs/osmosis/osmomath v0.0.10-0.20240312201712-59e5f097899e h1:4bLqdUaQQjCQIlnCOngPe+YCfkvHAAL4FhUwJ9gK/u8=

‎osmomath/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ replace (
100100
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
101101
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
102102

103-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/3eb3dd7434f8856fbe00e833aaba8b15d3dc33f5
104-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5-iavl-v1
105-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-5-iavl-v1
103+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d30b4bdebbf7f3aab2e42440f72d1d6ec9038bb3
104+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-6-iavl-v1
105+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-6-iavl-v1
106106
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
107107
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
108108

‎osmoutils/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ replace (
178178
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
179179
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
180180

181-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/3eb3dd7434f8856fbe00e833aaba8b15d3dc33f5
182-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5-iavl-v1
183-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-5-iavl-v1
181+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d30b4bdebbf7f3aab2e42440f72d1d6ec9038bb3
182+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-6-iavl-v1
183+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-6-iavl-v1
184184
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
185185
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
186186

‎x/epochs/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ replace (
215215
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
216216
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
217217

218-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/3eb3dd7434f8856fbe00e833aaba8b15d3dc33f5
219-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5-iavl-v1
220-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-5-iavl-v1
218+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d30b4bdebbf7f3aab2e42440f72d1d6ec9038bb3
219+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-6-iavl-v1
220+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-6-iavl-v1
221221
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
222222
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
223223

‎x/ibc-hooks/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ replace (
206206

207207
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
208208
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
209-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/3eb3dd7434f8856fbe00e833aaba8b15d3dc33f5
210-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5-iavl-v1
211-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-5-iavl-v1
209+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5-iavl-v1, current branch: osmo-v23/v0.47.5-iavl-v1. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/d30b4bdebbf7f3aab2e42440f72d1d6ec9038bb3
210+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-6-iavl-v1
211+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-6-iavl-v1
212212
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
213213
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
214214

0 commit comments

Comments
 (0)