Skip to content

Commit aedb41b

Browse files
committed
add logging to restore-versiondb
1 parent 3750450 commit aedb41b

File tree

2 files changed

+99
-88
lines changed

2 files changed

+99
-88
lines changed

protocol/go.mod

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
cosmossdk.io/api v0.7.6
99
cosmossdk.io/math v1.4.0
1010
github.com/Shopify/sarama v1.37.2
11-
github.com/cometbft/cometbft v0.38.15
11+
github.com/cometbft/cometbft v0.38.17
1212
github.com/cometbft/cometbft-db v0.15.0 // indirect
1313
github.com/cosmos/cosmos-proto v1.0.0-beta.5
1414
github.com/cosmos/cosmos-sdk v0.50.11
@@ -29,14 +29,14 @@ require (
2929
github.com/pkg/errors v0.9.1
3030
github.com/rakyll/statik v0.1.7
3131
github.com/spf13/cast v1.7.0
32-
github.com/spf13/cobra v1.8.1
33-
github.com/spf13/pflag v1.0.5
32+
github.com/spf13/cobra v1.9.1
33+
github.com/spf13/pflag v1.0.6
3434
github.com/stretchr/testify v1.10.0
3535
github.com/vektra/mockery/v2 v2.50.0
3636
github.com/zyedidia/generic v1.0.0
3737
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
3838
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
39-
google.golang.org/grpc v1.68.1
39+
google.golang.org/grpc v1.70.0
4040
gopkg.in/DataDog/dd-trace-go.v1 v1.48.0
4141
gopkg.in/typ.v4 v4.1.0
4242
)
@@ -72,8 +72,8 @@ require (
7272
github.com/shopspring/decimal v1.3.1
7373
github.com/spf13/viper v1.19.0
7474
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
75-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
76-
google.golang.org/protobuf v1.35.2
75+
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a
76+
google.golang.org/protobuf v1.36.5
7777
gotest.tools/v3 v3.5.1
7878
)
7979

@@ -83,7 +83,7 @@ require (
8383
cloud.google.com/go v0.115.1 // indirect
8484
cloud.google.com/go/auth v0.9.4 // indirect
8585
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
86-
cloud.google.com/go/compute/metadata v0.5.1 // indirect
86+
cloud.google.com/go/compute/metadata v0.5.2 // indirect
8787
cloud.google.com/go/iam v1.2.0 // indirect
8888
cloud.google.com/go/storage v1.43.0 // indirect
8989
cosmossdk.io/collections v0.4.0 // indirect
@@ -107,7 +107,7 @@ require (
107107
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
108108
github.com/GeertJohan/go.rice v1.0.3 // indirect
109109
github.com/IBM/sarama v1.40.1 // indirect
110-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
110+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
111111
github.com/Microsoft/go-winio v0.6.2 // indirect
112112
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
113113
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
@@ -171,12 +171,12 @@ require (
171171
github.com/daixiang0/gci v0.13.5 // indirect
172172
github.com/danieljoos/wincred v1.2.0 // indirect
173173
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
174-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
174+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
175175
github.com/denis-tingaikin/go-header v0.5.0 // indirect
176176
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
177177
github.com/dgraph-io/badger/v4 v4.3.0 // indirect
178178
github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 // indirect
179-
github.com/docker/cli v23.0.1+incompatible // indirect
179+
github.com/docker/cli v24.0.7+incompatible // indirect
180180
github.com/docker/docker v23.0.1+incompatible // indirect
181181
github.com/docker/go-connections v0.4.0 // indirect
182182
github.com/docker/go-units v0.5.0 // indirect
@@ -261,6 +261,7 @@ require (
261261
github.com/hashicorp/go-safetemp v1.0.0 // indirect
262262
github.com/hashicorp/go-uuid v1.0.3 // indirect
263263
github.com/hashicorp/golang-lru v1.0.2 // indirect
264+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
264265
github.com/hashicorp/hcl v1.0.0 // indirect
265266
github.com/hashicorp/yamux v0.1.1 // indirect
266267
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
@@ -299,7 +300,6 @@ require (
299300
github.com/leodido/go-urn v1.2.4 // indirect
300301
github.com/leonklingele/grouper v1.1.2 // indirect
301302
github.com/lib/pq v1.10.9 // indirect
302-
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
303303
github.com/linxGnu/grocksdb v1.9.3 // indirect
304304
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
305305
github.com/lovoo/goka v1.1.9 // indirect
@@ -343,9 +343,9 @@ require (
343343
github.com/pierrec/lz4/v4 v4.1.17 // indirect
344344
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
345345
github.com/polyfloyd/go-errorlint v1.7.0 // indirect
346-
github.com/prometheus/client_golang v1.20.5 // indirect
346+
github.com/prometheus/client_golang v1.21.0 // indirect
347347
github.com/prometheus/client_model v0.6.1 // indirect
348-
github.com/prometheus/common v0.60.1 // indirect
348+
github.com/prometheus/common v0.62.0 // indirect
349349
github.com/prometheus/procfs v0.15.1 // indirect
350350
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
351351
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
@@ -416,26 +416,27 @@ require (
416416
go.opencensus.io v0.24.0 // indirect
417417
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
418418
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
419-
go.opentelemetry.io/otel v1.29.0 // indirect
420-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
421-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
419+
go.opentelemetry.io/otel v1.32.0 // indirect
420+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
421+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
422+
go.uber.org/atomic v1.10.0 // indirect
422423
go.uber.org/automaxprocs v1.6.0 // indirect
423424
go.uber.org/multierr v1.11.0 // indirect
424425
go.uber.org/ratelimit v0.2.0 // indirect
425426
go.uber.org/zap v1.27.0 // indirect
426-
golang.org/x/crypto v0.31.0 // indirect
427+
golang.org/x/crypto v0.36.0 // indirect
427428
golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
428429
golang.org/x/mod v0.22.0 // indirect
429-
golang.org/x/net v0.32.0 // indirect
430-
golang.org/x/oauth2 v0.23.0 // indirect
431-
golang.org/x/sync v0.10.0 // indirect
432-
golang.org/x/sys v0.28.0 // indirect
433-
golang.org/x/term v0.27.0 // indirect
434-
golang.org/x/text v0.21.0 // indirect
430+
golang.org/x/net v0.38.0 // indirect
431+
golang.org/x/oauth2 v0.24.0 // indirect
432+
golang.org/x/sync v0.12.0 // indirect
433+
golang.org/x/sys v0.31.0 // indirect
434+
golang.org/x/term v0.30.0 // indirect
435+
golang.org/x/text v0.23.0 // indirect
435436
golang.org/x/time v0.6.0 // indirect
436437
golang.org/x/tools v0.27.0 // indirect
437438
google.golang.org/api v0.198.0 // indirect
438-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
439+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
439440
gopkg.in/ini.v1 v1.67.0 // indirect
440441
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
441442
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -460,24 +461,31 @@ replace (
460461
github.com/prometheus/common => github.com/prometheus/common v0.47.0
461462
)
462463

464+
replace (
465+
// memiavl refers to old packages so we need to replace them with the correct naming
466+
github.com/crypto-org-chain/cronos/memiavl => github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20241028093154-0f94930c27ce
467+
github.com/crypto-org-chain/cronos/store => github.com/01builders/dydx-cronos/store v0.0.5-dydx3
468+
github.com/crypto-org-chain/cronos/versiondb => github.com/01builders/dydx-cronos/versiondb v0.0.0-20251030210328-d5afd6b8a210
469+
github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.38.15
470+
)
471+
463472
replace (
464473
// TODO(DEC-2209): Ideally we rely on a released version (we don't make any changes in our cosmos-sdk fork).
465474
// In this case the latest signing mode fixes aren't tagged as a release yet.
466475
cosmossdk.io/client/v2 => github.com/cosmos/cosmos-sdk/client/v2 v2.0.0-beta.1.0.20240219091002-18ea4c520045
467476
// TODO(https://github.com/cosmos/rosetta/issues/76): Rosetta requires cosmossdk.io/core v0.12.0 erroneously but
468477
// should use v0.11.0. The Cosmos build fails with types/context.go:65:29: undefined: comet.BlockInfo otherwise.
469478
cosmossdk.io/core => cosmossdk.io/core v0.11.0
470-
// Use dYdX fork of Cosmos SDK/store
471-
cosmossdk.io/store => github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d
479+
cosmossdk.io/store => github.com/01builders/dydx-cosmos-sdk/store v0.5.6-dydx
472480
// Use dYdX fork of CometBFT
473-
github.com/cometbft/cometbft => github.com/dydxprotocol/cometbft v0.38.6-0.20251014202517-0235a938b029
481+
github.com/cometbft/cometbft => github.com/01builders/dydx-cometbft v0.38.19-dydx
474482
// Fixes the issue that `tx_search` resolves to a single entry, due to an cometbft-db interface
475483
// change in v0.13.0+.
476484
// TODO(CT-1343): Remove and fix properly by backporting upstream fix to cometbft fork.
477485
github.com/cometbft/cometbft-db => github.com/cometbft/cometbft-db v0.12.0
478486
// Use dYdX fork of Cosmos SDK
479-
github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20251014211237-3a1ba0aabac3
480-
github.com/cosmos/iavl => github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85
487+
github.com/cosmos/cosmos-sdk => github.com/01builders/dydx-cosmos-sdk v0.50.5-dydx-memiavl3
488+
//github.com/cosmos/iavl => github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85
481489
)
482490

483491
replace (

0 commit comments

Comments
 (0)