Skip to content

Commit 2bde4a8

Browse files
mergify[bot]cool-developejulienrbrt
authored
refactor: use latest store/v2 (partial backport #22336) (#23345)
Co-authored-by: cool-developer <51834436+cool-develope@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent 947fa79 commit 2bde4a8

File tree

7 files changed

+38
-11
lines changed

7 files changed

+38
-11
lines changed

‎scripts/init-simapp-v2.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,28 @@ $SIMD_BIN config set client keyring-backend test
1111
$SIMD_BIN config set client keyring-default-keyname alice
1212
$SIMD_BIN config set app rest.enable true
1313
$SIMD_BIN config set app telemetry.prometheus-retention-time 600
14+
sed -i '' 's/timeout_commit = "5s"/timeout_commit = "1s"/' "$SIMD_HOME"/config/config.toml
15+
sed -i '' 's/prometheus = false/prometheus = true/' "$SIMD_HOME"/config/config.toml
16+
1417
$SIMD_BIN keys add alice --indiscreet
1518
$SIMD_BIN keys add bob --indiscreet
19+
aliases=""
20+
for i in $(seq 10); do
21+
alias=$(dd if=/dev/urandom bs=16 count=24 2> /dev/null | base64 | head -c 32)
22+
$SIMD_BIN keys add "$alias" --indiscreet
23+
aliases="$aliases $alias"
24+
done
25+
echo "Generated aliases: $aliases"
26+
1627
$SIMD_BIN init simapp-v2-node --chain-id simapp-v2-chain
1728
# to change the voting_period
1829
jq '.app_state.gov.params.voting_period = "600s"' $SIMD_HOME/config/genesis.json > temp.json && mv temp.json $SIMD_HOME/config/genesis.json
1930
jq '.app_state.gov.params.expedited_voting_period = "300s"' $SIMD_HOME/config/genesis.json > temp.json && mv temp.json $SIMD_HOME/config/genesis.json
2031
jq '.app_state.mint.minter.inflation = "0.300000000000000000"' $SIMD_HOME/config/genesis.json > temp.json && mv temp.json $SIMD_HOME/config/genesis.json # to change the inflation
2132
$SIMD_BIN genesis add-genesis-account alice 5000000000stake --keyring-backend test
2233
$SIMD_BIN genesis add-genesis-account bob 5000000000stake --keyring-backend test
34+
for a in $aliases; do
35+
$SIMD_BIN genesis add-genesis-account "$a" 100000000stake --keyring-backend test
36+
done
2337
$SIMD_BIN genesis gentx alice 1000000stake --chain-id simapp-v2-chain
2438
$SIMD_BIN genesis collect-gentxs

‎server/v2/cometbft/abci_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ func assertStoreLatestVersion(t *testing.T, store types.Store, target uint64) {
914914
require.Equal(t, target, version)
915915
commitInfo, err := store.GetStateCommitment().GetCommitInfo(version)
916916
require.NoError(t, err)
917-
require.Equal(t, target, commitInfo.Version)
917+
require.Equal(t, target, uint64(commitInfo.Version))
918918
}
919919

920920
func TestOptimisticExecution(t *testing.T) {

‎server/v2/cometbft/go.mod‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
cosmossdk.io/server/v2 v2.0.0-beta.1.0.20250113101424-c79e19dfc9ca // main
1616
cosmossdk.io/server/v2/appmanager v1.0.0-beta.1.0.20250109081935-cf721a654090 // main
1717
cosmossdk.io/server/v2/stf v1.0.0-beta.1.0.20250109081935-cf721a654090 // main
18-
cosmossdk.io/store/v2 v2.0.0-beta.1 // main
18+
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250113105648-064c9ba6385a // main
1919
cosmossdk.io/x/consensus v0.2.0-rc.1
2020
github.com/cometbft/cometbft v1.0.0
2121
github.com/cometbft/cometbft/api v1.0.0
@@ -45,13 +45,16 @@ require (
4545
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
4646
github.com/DataDog/zstd v1.5.6 // indirect
4747
github.com/Microsoft/go-winio v0.6.1 // indirect
48+
github.com/aybabtme/uniplot v0.0.0-20151203143629-039c559e5e7e // indirect
4849
github.com/beorn7/perks v1.0.1 // indirect
4950
github.com/bgentry/speakeasy v0.2.0 // indirect
51+
github.com/bvinc/go-sqlite-lite v0.6.1 // indirect
5052
github.com/bytedance/sonic v1.12.6 // indirect
5153
github.com/bytedance/sonic/loader v0.2.1 // indirect
5254
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5355
github.com/cloudwego/base64x v0.1.4 // indirect
5456
github.com/cloudwego/iasm v0.2.0 // indirect
57+
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
5558
github.com/cockroachdb/errors v1.11.3 // indirect
5659
github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
5760
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
@@ -64,6 +67,7 @@ require (
6467
github.com/cosmos/go-bip39 v1.0.0 // indirect
6568
github.com/cosmos/gogogateway v1.2.0 // indirect
6669
github.com/cosmos/iavl v1.3.4 // indirect
70+
github.com/cosmos/iavl/v2 v2.0.0-alpha.4 // indirect
6771
github.com/cosmos/ics23/go v0.11.0 // indirect
6872
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
6973
github.com/danieljoos/wincred v1.2.1 // indirect
@@ -112,6 +116,7 @@ require (
112116
github.com/jmhodges/levigo v1.0.0 // indirect
113117
github.com/klauspost/compress v1.17.11 // indirect
114118
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
119+
github.com/kocubinski/costor-api v1.1.1 // indirect
115120
github.com/kr/pretty v0.3.1 // indirect
116121
github.com/kr/text v0.2.0 // indirect
117122
github.com/lib/pq v1.10.9 // indirect
@@ -175,5 +180,3 @@ require (
175180
gotest.tools/v3 v3.5.1 // indirect
176181
pgregory.net/rapid v1.1.0 // indirect
177182
)
178-
179-
require github.com/cockroachdb/apd/v3 v3.2.1 // indirect

‎server/v2/cometbft/go.sum‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ cosmossdk.io/server/v2/stf v1.0.0-beta.1.0.20250109081935-cf721a654090 h1:K0HN3T
3232
cosmossdk.io/server/v2/stf v1.0.0-beta.1.0.20250109081935-cf721a654090/go.mod h1:O6Njxje0LbvC0RxdgwTmvBlbGcpKOfhbkdAguyq0ntQ=
3333
cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJYV4jzx+rn7cgUB2owHgk9o+93luz0=
3434
cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU=
35-
cosmossdk.io/store/v2 v2.0.0-beta.1 h1:p1fdZ9uNijhpXZXdqs0QS6NmXNDVPNyT4DHV4yQnF64=
36-
cosmossdk.io/store/v2 v2.0.0-beta.1/go.mod h1:qHQmf/9mnsXwo/Ypp2u2Zs6BmkYcx1R/Jrpyn9Ro13A=
35+
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250113105648-064c9ba6385a h1:/y3j4oI+b/yYoPmZaF1NOuvDLhE71+/1f9Xucos4g1g=
36+
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250113105648-064c9ba6385a/go.mod h1:RGIGNGmCeNkX7P+1eFovbvyp9kwY8AdJ0Ue096hRY/E=
3737
cosmossdk.io/x/bank v0.2.0-rc.1 h1:tLYxL2N0U19tU50euZZKdsixsQcU6V+eMfudn/Y7YyY=
3838
cosmossdk.io/x/bank v0.2.0-rc.1/go.mod h1:y1HipKOoiieb2gEZOQJPGwbwUBSYbIY+vG7XZAUstAE=
3939
cosmossdk.io/x/consensus v0.2.0-rc.1 h1:6Df5E4lR7ggmOxZsm953ZR+gA6PwZzU0vpG9dmZtwuw=
@@ -69,6 +69,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
6969
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
7070
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
7171
github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
72+
github.com/aybabtme/uniplot v0.0.0-20151203143629-039c559e5e7e h1:dSeuFcs4WAJJnswS8vXy7YY1+fdlbVPuEVmDAfqvFOQ=
73+
github.com/aybabtme/uniplot v0.0.0-20151203143629-039c559e5e7e/go.mod h1:uh71c5Vc3VNIplXOFXsnDy21T1BepgT32c5X/YPrOyc=
7274
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
7375
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
7476
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -82,6 +84,8 @@ github.com/btcsuite/btcd/btcutil v1.1.6 h1:zFL2+c3Lb9gEgqKNzowKUPQNb8jV7v5Oaodi/
8284
github.com/btcsuite/btcd/btcutil v1.1.6/go.mod h1:9dFymx8HpuLqBnsPELrImQeTQfKBQqzqGbbV3jK55aE=
8385
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
8486
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
87+
github.com/bvinc/go-sqlite-lite v0.6.1 h1:JU8Rz5YAOZQiU3WEulKF084wfXpytRiqD2IaW2QjPz4=
88+
github.com/bvinc/go-sqlite-lite v0.6.1/go.mod h1:2GiE60NUdb0aNhDdY+LXgrqAVDpi2Ijc6dB6ZMp9x6s=
8589
github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk=
8690
github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
8791
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@@ -152,6 +156,10 @@ github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fr
152156
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
153157
github.com/cosmos/iavl v1.3.4 h1:A0RUAms7TZ0L6EFrrBIPg4Dy7qD9vvD5lJKUxEXURLM=
154158
github.com/cosmos/iavl v1.3.4/go.mod h1:T6SfBcyhulVIY2G/ZtAtQm/QiJvsuhIos52V4dWYk88=
159+
github.com/cosmos/iavl-bench/bench v0.0.4 h1:J6zQPiBqF4CXMM3QBsLqZgQEBGY0taX85vLIZMhmAfQ=
160+
github.com/cosmos/iavl-bench/bench v0.0.4/go.mod h1:j2rLae77EffacWcp7mmj3Uaa4AOAmZA7ymvhsuBQKKI=
161+
github.com/cosmos/iavl/v2 v2.0.0-alpha.4 h1:PfpQt7xl4hojw2UFS2JdJppJnx8sjlmcxRQ7Hxk7Cl0=
162+
github.com/cosmos/iavl/v2 v2.0.0-alpha.4/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
155163
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
156164
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
157165
github.com/cosmos/ledger-cosmos-go v0.14.0 h1:WfCHricT3rPbkPSVKRH+L4fQGKYHuGOK9Edpel8TYpE=
@@ -355,6 +363,8 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
355363
github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
356364
github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
357365
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
366+
github.com/kocubinski/costor-api v1.1.1 h1:sgfJA7T/8IfZ59zxiMrED0xdjerAFuPNBTqyO90GiEE=
367+
github.com/kocubinski/costor-api v1.1.1/go.mod h1:ESMBMDkKfN+9vvvhhNVdKLhbOmzI3O/i16iXvRM9Tuc=
358368
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
359369
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
360370
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=

‎server/v2/cometbft/internal/mock/mock_store.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (s *MockStore) GetLatestVersion() (uint64, error) {
3737
return 0, err
3838
}
3939

40-
return lastCommitID.Version, nil
40+
return uint64(lastCommitID.Version), nil
4141
}
4242

4343
func (s *MockStore) StateLatest() (uint64, corestore.ReaderMap, error) {
@@ -99,7 +99,7 @@ func (s *MockStore) LastCommitID() (proof.CommitID, error) {
9999
v, err := s.GetStateCommitment().GetLatestVersion()
100100
bz := sha256.Sum256([]byte{})
101101
return proof.CommitID{
102-
Version: v,
102+
Version: int64(v),
103103
Hash: bz[:],
104104
}, err
105105
}

‎simapp/v2/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
cosmossdk.io/server/v2 v2.0.0-beta.1.0.20250113101424-c79e19dfc9ca // main
1616
cosmossdk.io/server/v2/appmanager v1.0.0-beta.1.0.20250109081935-cf721a654090
1717
cosmossdk.io/server/v2/cometbft v1.0.0-beta.1
18-
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250109081935-cf721a654090 // main
18+
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250113105648-064c9ba6385a // main
1919
cosmossdk.io/tools/benchmark v0.2.0-rc.1
2020
cosmossdk.io/tools/confix v0.2.0-rc.1
2121
cosmossdk.io/x/accounts v0.2.0-rc.1

‎simapp/v2/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ cosmossdk.io/server/v2/stf v1.0.0-beta.1.0.20250109081935-cf721a654090 h1:K0HN3T
226226
cosmossdk.io/server/v2/stf v1.0.0-beta.1.0.20250109081935-cf721a654090/go.mod h1:O6Njxje0LbvC0RxdgwTmvBlbGcpKOfhbkdAguyq0ntQ=
227227
cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJYV4jzx+rn7cgUB2owHgk9o+93luz0=
228228
cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU=
229-
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250109081935-cf721a654090 h1:ZXFcStI+zFuHEBvuIPaLzPUp54PCxCAmR2RUA8/1KQM=
230-
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250109081935-cf721a654090/go.mod h1:G+ZRihxC4jFhLXnYt4K16tSYtkvh7ayjSaYGWJFObAo=
229+
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250113105648-064c9ba6385a h1:/y3j4oI+b/yYoPmZaF1NOuvDLhE71+/1f9Xucos4g1g=
230+
cosmossdk.io/store/v2 v2.0.0-beta.1.0.20250113105648-064c9ba6385a/go.mod h1:RGIGNGmCeNkX7P+1eFovbvyp9kwY8AdJ0Ue096hRY/E=
231231
cosmossdk.io/tools/benchmark v0.2.0-rc.1 h1:Jgk0FLvnMQJrivrSMhKQBwaTiJz6MGq5ZbaHag7Sqq0=
232232
cosmossdk.io/tools/benchmark v0.2.0-rc.1/go.mod h1:tnGa8L7xHFMp26FbLvU5MRlS89BFrCxSOKR8jCi7kVU=
233233
cosmossdk.io/tools/confix v0.2.0-rc.1 h1:sVYXR89OKW19oCnr232m9/pE3+oJllNTZlTypWhXHNI=

0 commit comments

Comments
 (0)