Skip to content

Commit 7f20b83

Browse files
yihuangmmsqe
yihuang
and
mmsqe
authored
Problem: local state-sync commands are not integrated (#1027)
* Problem: local state-sync commands are not integrated * Update CHANGELOG.md Signed-off-by: yihuang <huang@crypto.com> * integration test * Update integration_tests/test_basic.py Signed-off-by: yihuang <huang@crypto.com> * fix integration test * rename * fix lint * Update integration_tests/cosmoscli.py Co-authored-by: mmsqe <tqd0800210105@gmail.com> Signed-off-by: yihuang <huang@crypto.com> * fix goleveldb * mod tidy for f in $(find . -name go.mod) do (cd $(dirname $f); go mod tidy) done * parse list_snapshots * fix test * fix py lint * fix integration test --------- Signed-off-by: yihuang <huang@crypto.com> Co-authored-by: mmsqe <tqd0800210105@gmail.com> Co-authored-by: mmsqe <mavis@crypto.com>
1 parent 0d5bf68 commit 7f20b83

16 files changed

Lines changed: 299 additions & 154 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
- [#985](https://github.com/crypto-org-chain/cronos/pull/985) Fix versiondb verify command on older versions
3333
- [#998](https://github.com/crypto-org-chain/cronos/pull/998) Bump grocksdb to v1.7.16 and rocksdb to v7.10.2
3434
- [#1028](https://github.com/crypto-org-chain/cronos/pull/1028) Add memiavl configs into app.toml
35-
35+
- [#1027](https://github.com/crypto-org-chain/cronos/pull/1027) Integrate local state-sync commands.
3636

3737
*April 13, 2023*
3838

‎app/memiavl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func SetupMemIAVL(logger log.Logger, homePath string, appOpts servertypes.AppOpt
2323
// cms must be overridden before the other options, because they may use the cms,
2424
// make sure the cms aren't be overridden by the other options later on.
2525
cms := rootmulti.NewStore(filepath.Join(homePath, "data", "memiavl.db"), logger)
26-
cms.SetAsyncWAL(cast.ToBool(appOpts.Get(FlagAsyncCommit)))
26+
cms.SetAsyncCommit(cast.ToBool(appOpts.Get(FlagAsyncCommit)))
2727
cms.SetZeroCopy(cast.ToBool(appOpts.Get(FlagZeroCopy)))
2828
baseAppOptions = append([]func(*baseapp.BaseApp){setCMS(cms)}, baseAppOptions...)
2929
}

‎cmd/cronosd/cmd/root.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/cosmos/cosmos-sdk/client/flags"
2424
"github.com/cosmos/cosmos-sdk/client/pruning"
2525
"github.com/cosmos/cosmos-sdk/client/rpc"
26+
"github.com/cosmos/cosmos-sdk/client/snapshot"
2627
"github.com/cosmos/cosmos-sdk/server"
2728
servertypes "github.com/cosmos/cosmos-sdk/server/types"
2829
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -124,6 +125,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
124125
debug.Cmd(),
125126
config.Cmd(),
126127
pruning.PruningCmd(a.newApp),
128+
snapshot.Cmd(a.newApp),
127129
// this line is used by starport scaffolding # stargate/root/commands
128130
)
129131

‎go.mod‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.20
44

55
require (
66
cosmossdk.io/errors v1.0.0-beta.7
7-
cosmossdk.io/math v1.0.0-beta.4
7+
cosmossdk.io/math v1.0.0-rc.0
88
github.com/armon/go-metrics v0.4.1
9-
github.com/cosmos/cosmos-sdk v0.46.12
9+
github.com/cosmos/cosmos-sdk v0.46.13-0.20230513091001-5472fb5995a0
1010
github.com/cosmos/gogoproto v1.4.7
1111
github.com/cosmos/ibc-go/v5 v5.2.0
1212
github.com/crypto-org-chain/cronos/store v0.0.0
@@ -24,9 +24,9 @@ require (
2424
github.com/spf13/cobra v1.6.1
2525
github.com/spf13/pflag v1.0.5
2626
github.com/stretchr/testify v1.8.2
27-
github.com/tendermint/tendermint v0.34.27
27+
github.com/tendermint/tendermint v0.34.28
2828
github.com/tendermint/tm-db v0.6.7
29-
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
29+
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0
3030
google.golang.org/genproto v0.0.0-20230323212658-478b75c54725
3131
google.golang.org/grpc v1.54.0
3232
google.golang.org/protobuf v1.30.0
@@ -42,7 +42,7 @@ require (
4242
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
4343
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
4444
github.com/99designs/keyring v1.2.1 // indirect
45-
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
45+
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
4646
github.com/DataDog/zstd v1.5.0 // indirect
4747
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
4848
github.com/StackExchange/wmi v1.2.1 // indirect
@@ -83,7 +83,7 @@ require (
8383
github.com/danieljoos/wincred v1.1.2 // indirect
8484
github.com/davecgh/go-spew v1.1.1 // indirect
8585
github.com/deckarep/golang-set v1.8.0 // indirect
86-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
86+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
8787
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
8888
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
8989
github.com/dgraph-io/ristretto v0.1.0 // indirect
@@ -136,19 +136,19 @@ require (
136136
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
137137
github.com/jmespath/go-jmespath v0.4.0 // indirect
138138
github.com/jmhodges/levigo v1.0.0 // indirect
139-
github.com/klauspost/compress v1.15.15 // indirect
140-
github.com/kr/pretty v0.3.0 // indirect
139+
github.com/klauspost/compress v1.16.0 // indirect
140+
github.com/kr/pretty v0.3.1 // indirect
141141
github.com/kr/text v0.2.0 // indirect
142142
github.com/ledgerwatch/erigon-lib v0.0.0-20230210071639-db0e7ed11263 // indirect
143143
github.com/ledgerwatch/log/v3 v3.7.0 // indirect
144-
github.com/lib/pq v1.10.6 // indirect
144+
github.com/lib/pq v1.10.7 // indirect
145145
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
146146
github.com/magiconair/properties v1.8.6 // indirect
147147
github.com/manifoldco/promptui v0.9.0 // indirect
148148
github.com/mattn/go-colorable v0.1.13 // indirect
149-
github.com/mattn/go-isatty v0.0.17 // indirect
149+
github.com/mattn/go-isatty v0.0.18 // indirect
150150
github.com/mattn/go-runewidth v0.0.9 // indirect
151-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
151+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
152152
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
153153
github.com/minio/highwayhash v1.0.2 // indirect
154154
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -157,21 +157,21 @@ require (
157157
github.com/mtibben/percent v0.2.1 // indirect
158158
github.com/olekukonko/tablewriter v0.0.5 // indirect
159159
github.com/pelletier/go-toml v1.9.5 // indirect
160-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
161-
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
160+
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
161+
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
162162
github.com/pkg/errors v0.9.1 // indirect
163163
github.com/pmezard/go-difflib v1.0.0 // indirect
164164
github.com/prometheus/client_golang v1.14.0 // indirect
165165
github.com/prometheus/client_model v0.3.0 // indirect
166-
github.com/prometheus/common v0.37.0 // indirect
167-
github.com/prometheus/procfs v0.8.0 // indirect
166+
github.com/prometheus/common v0.42.0 // indirect
167+
github.com/prometheus/procfs v0.9.0 // indirect
168168
github.com/prometheus/tsdb v0.7.1 // indirect
169169
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
170170
github.com/regen-network/cosmos-proto v0.3.1 // indirect
171171
github.com/rjeczalik/notify v0.9.1 // indirect
172-
github.com/rogpeppe/go-internal v1.8.1 // indirect
172+
github.com/rogpeppe/go-internal v1.9.0 // indirect
173173
github.com/rs/cors v1.8.2 // indirect
174-
github.com/rs/zerolog v1.27.0 // indirect
174+
github.com/rs/zerolog v1.29.1 // indirect
175175
github.com/sasha-s/go-deadlock v0.3.1 // indirect
176176
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
177177
github.com/spaolacci/murmur3 v1.1.0 // indirect
@@ -180,7 +180,7 @@ require (
180180
github.com/spf13/viper v1.14.0 // indirect
181181
github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969 // indirect
182182
github.com/subosito/gotenv v1.4.1 // indirect
183-
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
183+
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
184184
github.com/tendermint/go-amino v0.16.0 // indirect
185185
github.com/tidwall/btree v1.5.0 // indirect
186186
github.com/tidwall/gjson v1.14.0 // indirect
@@ -201,12 +201,12 @@ require (
201201
go.opencensus.io v0.24.0 // indirect
202202
go.uber.org/atomic v1.10.0 // indirect
203203
golang.org/x/crypto v0.7.0 // indirect
204-
golang.org/x/net v0.8.0 // indirect
204+
golang.org/x/net v0.9.0 // indirect
205205
golang.org/x/oauth2 v0.6.0 // indirect
206206
golang.org/x/sync v0.1.0 // indirect
207-
golang.org/x/sys v0.6.0 // indirect
208-
golang.org/x/term v0.6.0 // indirect
209-
golang.org/x/text v0.8.0 // indirect
207+
golang.org/x/sys v0.7.0 // indirect
208+
golang.org/x/term v0.7.0 // indirect
209+
golang.org/x/text v0.9.0 // indirect
210210
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
211211
google.golang.org/api v0.114.0 // indirect
212212
google.golang.org/appengine v1.6.7 // indirect
@@ -223,21 +223,22 @@ replace (
223223
github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6
224224
// Ref: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702
225225
github.com/confio/ics23/go => github.com/confio/ics23/go v0.9.0
226-
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.12
226+
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.13-0.20230513091001-5472fb5995a0
227227
github.com/crypto-org-chain/cronos/memiavl => ./memiavl
228228
github.com/crypto-org-chain/cronos/store => ./store
229229
github.com/crypto-org-chain/cronos/versiondb => ./versiondb
230230
github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable
231-
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.10-cronos
231+
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.10-cronos.0.20230515032938-bad31ab4475d
232232
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
233233
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
234234
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
235235
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
236236
github.com/miguelmota/go-ethereum-hdwallet => github.com/crypto-org-chain/go-ethereum-hdwallet v0.1.2
237237

238238
github.com/peggyjv/gravity-bridge/module/v2 => github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230126051749-d984b1562242
239+
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
239240
// use cometbft
240-
github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27
241+
github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.28
241242
// https://github.com/crypto-org-chain/tm-db/tree/release/v0.6.x
242243
github.com/tendermint/tm-db => github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61
243244

0 commit comments

Comments
 (0)