Skip to content

Commit 35a14d5

Browse files
mergify[bot]czarcas7ic
mergify[bot]
and
czarcas7ic
authored
fix: fast nodes module whitelist config parse (backport #7737) (#7738)
* fix: fast nodes module whitelist config parse (#7737) * fix config parse * changelog * tidy * duplicate changelog entry (cherry picked from commit a4f3ece) # Conflicts: # go.mod # go.sum # osmomath/go.mod # osmoutils/go.mod # x/epochs/go.mod # x/ibc-hooks/go.mod * fix conflicts --------- Co-authored-by: Adam Tucker <[email protected]> Co-authored-by: Adam Tucker <[email protected]>
1 parent 7482d8d commit 35a14d5

File tree

8 files changed

+24
-25
lines changed

8 files changed

+24
-25
lines changed

‎CHANGELOG.md

+4-7
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,14 @@ 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.5 & v23.0.5-iavl-v1
66-
67-
* [#7716](https://github.com/osmosis-labs/osmosis/pull/7716) Unblock WW Pools
68-
* [#7726](https://github.com/osmosis-labs/osmosis/pull/7726) Bump comet for improved P2P logic
69-
70-
## v23.0.4-iavl-v1 (contains everything in v23.0.4)
65+
## v23.0.6-iavl-v1 (contains everything in v23.0.6)
7166

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

74-
## v23.0.4
69+
## v23.0.6
7570

71+
* [#7716](https://github.com/osmosis-labs/osmosis/pull/7716) Unblock WW Pools
72+
* [#7726](https://github.com/osmosis-labs/osmosis/pull/7726) Bump comet for improved P2P logic
7673
* [#7599](https://github.com/osmosis-labs/osmosis/pull/7599) Reduce sqrt calls in TickToSqrtPrice
7774
* [#7692](https://github.com/osmosis-labs/osmosis/pull/7692) Make CL operation mutative
7875
* [#530](https://github.com/osmosis-labs/cosmos-sdk/pull/530) Bump sdk fork Go to 1.20

‎cmd/osmosisd/cmd/root.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,8 @@ func newApp(logger log.Logger, db cometbftdb.DB, traceStore io.Writer, appOpts s
837837
wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer))
838838
}
839839

840+
fastNodeModuleWhitelist := server.ParseModuleWhitelist(appOpts)
841+
840842
baseAppOptions := []func(*baseapp.BaseApp){
841843
baseapp.SetPruning(pruningOpts),
842844
baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))),
@@ -850,7 +852,7 @@ func newApp(logger log.Logger, db cometbftdb.DB, traceStore io.Writer, appOpts s
850852
baseapp.SetSnapshot(snapshotStore, snapshotOptions),
851853
baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
852854
baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))),
853-
baseapp.SetIAVLFastNodeModuleWhitelist(cast.ToStringSlice(appOpts.Get(server.FlagIAVLFastNodeModuleWhitelist))),
855+
baseapp.SetIAVLFastNodeModuleWhitelist(fastNodeModuleWhitelist),
854856
baseapp.SetChainID(chainID),
855857
}
856858

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ replace (
392392
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
393393
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
394394

395-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/0c4bec37ba951bb3aaf31cf96abad1e973234bd2
396-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-3
397-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-3
395+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/eb40aefa29227875dfd8e9c3679450d652cc1ff3
396+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5
397+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-4
398398
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
399399
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
400400

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1510,8 +1510,8 @@ github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4a
15101510
github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
15111511
github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-3 h1:HJItohXCYHMTd1x938+zpxswkzdKFikHPz9xkHFtpBk=
15121512
github.com/osmosis-labs/cometbft v0.37.4-v23-osmo-3/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8=
1513-
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-3 h1:d+0id4sMX9yiP5iMHK8rkv15MP12T+UfQn4XuBWzK/8=
1514-
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-3/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo=
1513+
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-4 h1:3BxMc6zxf1EF4WB0CxmnOkXuNQE4zxuZINcsWaOLNrA=
1514+
github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-4/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo=
15151515
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY=
15161516
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI=
15171517
github.com/osmosis-labs/osmosis/osmomath v0.0.10-0.20240312200410-a7cc6376cdec h1:dro5fZ+cgvw1DTvMPDTe/vc6KVe3Rgk7RR0ghjoPRUw=

‎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, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/0c4bec37ba951bb3aaf31cf96abad1e973234bd2
104-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-3
105-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-3
103+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/eb40aefa29227875dfd8e9c3679450d652cc1ff3
104+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5
105+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-4
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
@@ -176,9 +176,9 @@ replace (
176176
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
177177
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
178178

179-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/0c4bec37ba951bb3aaf31cf96abad1e973234bd2
180-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-3
181-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-3
179+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/eb40aefa29227875dfd8e9c3679450d652cc1ff3
180+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5
181+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-4
182182
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
183183
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
184184

‎x/epochs/go.mod

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

216-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/0c4bec37ba951bb3aaf31cf96abad1e973234bd2
217-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-3
218-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-3
216+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/eb40aefa29227875dfd8e9c3679450d652cc1ff3
217+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5
218+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-4
219219
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
220220
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
221221

‎x/ibc-hooks/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ replace (
204204

205205
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
206206
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
207-
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/0c4bec37ba951bb3aaf31cf96abad1e973234bd2
208-
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-3
209-
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-3
207+
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v23/v0.47.5, current branch: osmo-v23/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/eb40aefa29227875dfd8e9c3679450d652cc1ff3
208+
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-5
209+
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v23-osmo-4
210210
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
211211
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
212212

0 commit comments

Comments
 (0)