From e00e219ec421f09bc37f44c15603e65c8e708d2b Mon Sep 17 00:00:00 2001 From: Aleksandr Pismenskiy Date: Wed, 3 Sep 2025 11:24:35 +0300 Subject: [PATCH 1/4] update cosmos-sdk for async pruning --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 282dde846..a77c4417e 100644 --- a/go.mod +++ b/go.mod @@ -227,7 +227,7 @@ replace ( github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.54.1-neutron github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.3 - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250512094026-b5afd837c4de + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250808012539-4561deb913c6 // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 625e4b283..0f60f9a2a 100644 --- a/go.sum +++ b/go.sum @@ -839,8 +839,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neutron-org/admin-module/v2 v2.0.3 h1:zTME5kRRMB4uE/DbCEU84mGn3EKDNXZEw5+XMO8+Q7A= github.com/neutron-org/admin-module/v2 v2.0.3/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= -github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250512094026-b5afd837c4de h1:WDOQ4cvcF99BY2O1c6UYvnY2Y+Bd31kJf5abFQCuMGA= -github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250512094026-b5afd837c4de/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw= +github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250808012539-4561deb913c6 h1:kg5up1YNO/0UwPvfJw6Lzd1DhC6Gz41H4ej1jjgh7Bk= +github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250808012539-4561deb913c6/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw= github.com/neutron-org/feemarket v0.0.0-20250127141246-4ffcf3d43464 h1:5mbzd7sqp8pPYWzIhIYKFovMRBL0ru24N2E6dIWjL0o= github.com/neutron-org/feemarket v0.0.0-20250127141246-4ffcf3d43464/go.mod h1:DUa6djUsTeMOrbrcIZqWSVxU9IZNCXp96ruaojyBNpc= github.com/neutron-org/wasmd v0.54.1-neutron h1:aIEOBz00VJmt49azOobu/OnKeHEj/Pm6oGPnQ8Ju1LI= From f22e522223eb6739db4bad43a18aca30cbd0c010 Mon Sep 17 00:00:00 2001 From: Mikhail Mozhaev Date: Mon, 6 Oct 2025 17:39:33 +0300 Subject: [PATCH 2/4] upd store --- go.mod | 1 + go.sum | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index a77c4417e..e725f5b51 100644 --- a/go.mod +++ b/go.mod @@ -223,6 +223,7 @@ require ( ) replace ( + cosmossdk.io/store => github.com/neutron-org/cosmos-sdk/store v1.1.1-async-pruning github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.54.1-neutron github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2 diff --git a/go.sum b/go.sum index 0f60f9a2a..8d94dc0c2 100644 --- a/go.sum +++ b/go.sum @@ -204,8 +204,6 @@ cosmossdk.io/log v1.6.1 h1:YXNwAgbDwMEKwDlCdH8vPcoggma48MgZrTQXCfmMBeI= cosmossdk.io/log v1.6.1/go.mod h1:gMwsWyyDBjpdG9u2avCFdysXqxq28WJapJvu+vF1y+E= cosmossdk.io/math v1.5.3 h1:WH6tu6Z3AUCeHbeOSHg2mt9rnoiUWVWaQ2t6Gkll96U= cosmossdk.io/math v1.5.3/go.mod h1:uqcZv7vexnhMFJF+6zh9EWdm/+Ylyln34IvPnBauPCQ= -cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= -cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ= cosmossdk.io/x/circuit v0.1.1/go.mod h1:B6f/urRuQH8gjt4eLIXfZJucrbreuYrKh5CSjaOxr+Q= cosmossdk.io/x/evidence v0.1.1 h1:Ks+BLTa3uftFpElLTDp9L76t2b58htjVbSZ86aoK/E4= @@ -841,6 +839,8 @@ github.com/neutron-org/admin-module/v2 v2.0.3 h1:zTME5kRRMB4uE/DbCEU84mGn3EKDNXZ github.com/neutron-org/admin-module/v2 v2.0.3/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250808012539-4561deb913c6 h1:kg5up1YNO/0UwPvfJw6Lzd1DhC6Gz41H4ej1jjgh7Bk= github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250808012539-4561deb913c6/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw= +github.com/neutron-org/cosmos-sdk/store v1.1.1-async-pruning h1:UoxlwEd09GKt42E5pFuFQgaIAJYGZmMInMxjRFTzwUc= +github.com/neutron-org/cosmos-sdk/store v1.1.1-async-pruning/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= github.com/neutron-org/feemarket v0.0.0-20250127141246-4ffcf3d43464 h1:5mbzd7sqp8pPYWzIhIYKFovMRBL0ru24N2E6dIWjL0o= github.com/neutron-org/feemarket v0.0.0-20250127141246-4ffcf3d43464/go.mod h1:DUa6djUsTeMOrbrcIZqWSVxU9IZNCXp96ruaojyBNpc= github.com/neutron-org/wasmd v0.54.1-neutron h1:aIEOBz00VJmt49azOobu/OnKeHEj/Pm6oGPnQ8Ju1LI= From 5f5f7c767d6e9a75a2e4c5a504371dc4cba0c682 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 8 Oct 2025 16:43:44 +0300 Subject: [PATCH 3/4] bump iavl to v1.2.6 --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index e725f5b51..41f0b6ff3 100644 --- a/go.mod +++ b/go.mod @@ -229,8 +229,8 @@ replace ( github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.3 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20250808012539-4561deb913c6 - // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version - github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0 + // explicitely replace iavl to v1.2.6 cause sometimes go mod tidy uses not right version + github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.6 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/prometheus/procfs => github.com/prometheus/procfs v0.12.0 github.com/skip-mev/feemarket => github.com/neutron-org/feemarket v0.0.0-20250127141246-4ffcf3d43464 diff --git a/go.sum b/go.sum index 8d94dc0c2..c0f628b4b 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,8 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro= github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0= -github.com/cosmos/iavl v1.2.0 h1:kVxTmjTh4k0Dh1VNL046v6BXqKziqMDzxo93oh3kOfM= -github.com/cosmos/iavl v1.2.0/go.mod h1:HidWWLVAtODJqFD6Hbne2Y0q3SdxByJepHUOeoH4LiI= +github.com/cosmos/iavl v1.2.6 h1:Hs3LndJbkIB+rEvToKJFXZvKo6Vy0Ex1SJ54hhtioIs= +github.com/cosmos/iavl v1.2.6/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0 h1:rM+S14DFiqmu6Rc3PuhvWqwywPsnt/CbIslSnBftPFs= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0/go.mod h1:O5H9Ic3Pe6cmJn1eqlj5N48sLb8WQ1VWmDP4/11g/4E= github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI= From e3bdd0fab8b78ba8255c27da685435afb68f276c Mon Sep 17 00:00:00 2001 From: Aleksandr Pismenskiy Date: Thu, 9 Oct 2025 03:01:41 +0300 Subject: [PATCH 4/4] fix lint --- app/upgrades/v8.1.0/upgrades.go | 4 ++-- x/dex/types/price_test.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/upgrades/v8.1.0/upgrades.go b/app/upgrades/v8.1.0/upgrades.go index 0f62eb4ca..518173c98 100644 --- a/app/upgrades/v8.1.0/upgrades.go +++ b/app/upgrades/v8.1.0/upgrades.go @@ -15,9 +15,9 @@ import ( func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, - keepers *upgrades.UpgradeKeepers, + _ *upgrades.UpgradeKeepers, _ upgrades.StoreKeys, - cdc codec.Codec, + _ codec.Codec, ) upgradetypes.UpgradeHandler { return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { ctx := sdk.UnwrapSDKContext(c) diff --git a/x/dex/types/price_test.go b/x/dex/types/price_test.go index 6e7ee1927..b89b5b93a 100644 --- a/x/dex/types/price_test.go +++ b/x/dex/types/price_test.go @@ -77,6 +77,7 @@ func TestCalcTickIndexFromPrice(t *testing.T) { }) } } + func TestPriceDups(t *testing.T) { prevPrice := math_utils.ZeroPrecDec() for i := 0; i >= int(types.MaxTickExp)*-1; i-- {