Skip to content

Commit 2552f31

Browse files
committed
#303 Upgrade Cosmos-SDK to v0.47.3
- Fix unit tests - Update versions of deps Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com> Signed-off-by: Abdulbois <abdulbois123@gmail.com>
1 parent f0b559f commit 2552f31

File tree

7 files changed

+147
-105
lines changed

7 files changed

+147
-105
lines changed

Dockerfile-build

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ COPY docs/static ./docs/static/
4747

4848
ARG DCL_VERSION
4949
ARG DCL_COMMIT
50-
RUN LEDGER_ENABLED=true make
50+
RUN LEDGER_ENABLED=false make

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endif
2828

2929

3030
### Process build tags
31-
build_tags = netgo cgo
31+
build_tags = netgo
3232
ifeq ($(LEDGER_ENABLED),true)
3333
ifeq ($(OS),Windows_NT)
3434
GCCEXE = $(shell where gcc.exe 2> NUL)

cmd/dcld/cmd/root.go

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/spf13/cobra"
1111
"github.com/spf13/pflag"
1212

13-
rosettaCmd "cosmossdk.io/tools/rosetta/cmd"
1413
dbm "github.com/cometbft/cometbft-db"
1514
tmcfg "github.com/cometbft/cometbft/config"
1615
"github.com/cometbft/cometbft/libs/log"
@@ -186,7 +185,6 @@ func initRootCmd(
186185
keys.Commands(app.DefaultNodeHome),
187186
)
188187

189-
rootCmd.AddCommand(rosettaCmd.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Codec))
190188
}
191189

192190
// queryCommand returns the sub-command to send queries to the app.

go.mod

+31-23
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@ go 1.20
55
require (
66
cosmossdk.io/api v0.3.1
77
cosmossdk.io/core v0.5.1
8-
cosmossdk.io/errors v1.0.0-beta.7
9-
cosmossdk.io/math v1.0.1
10-
cosmossdk.io/tools/rosetta v0.2.1
8+
cosmossdk.io/errors v1.0.1
9+
cosmossdk.io/math v1.2.0
1110
github.com/bufbuild/buf v1.7.0
12-
github.com/cometbft/cometbft v0.37.1
13-
github.com/cometbft/cometbft-db v0.7.0
11+
github.com/cometbft/cometbft v0.37.4
12+
github.com/cometbft/cometbft-db v0.8.0
1413
github.com/cosmos/cosmos-proto v1.0.0-beta.2
15-
github.com/cosmos/cosmos-sdk v0.47.3
14+
github.com/cosmos/cosmos-sdk v0.47.8
1615
github.com/cosmos/go-bip39 v1.0.0
1716
github.com/cosmos/gogoproto v1.4.10
18-
github.com/go-playground/locales v0.14.0
19-
github.com/go-playground/universal-translator v0.18.0
20-
github.com/go-playground/validator/v10 v10.9.0
17+
github.com/go-playground/locales v0.14.1
18+
github.com/go-playground/universal-translator v0.18.1
19+
github.com/go-playground/validator/v10 v10.11.2
2120
github.com/golang/protobuf v1.5.3
2221
github.com/gorilla/mux v1.8.0
2322
github.com/grpc-ecosystem/grpc-gateway v1.16.0
@@ -41,13 +40,14 @@ require (
4140
cloud.google.com/go/compute/metadata v0.2.3 // indirect
4241
cloud.google.com/go/iam v1.1.5 // indirect
4342
cloud.google.com/go/storage v1.30.1 // indirect
44-
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
45-
cosmossdk.io/log v1.1.0 // indirect
43+
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
44+
cosmossdk.io/log v1.3.0 // indirect
45+
cosmossdk.io/tools/rosetta v0.2.1 // indirect
4646
filippo.io/edwards25519 v1.0.0 // indirect
4747
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
4848
github.com/99designs/keyring v1.2.1 // indirect
4949
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
50-
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
50+
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
5151
github.com/Microsoft/go-winio v0.6.0 // indirect
5252
github.com/armon/go-metrics v0.4.1 // indirect
5353
github.com/aws/aws-sdk-go v1.44.203 // indirect
@@ -61,14 +61,17 @@ require (
6161
github.com/cespare/xxhash v1.1.0 // indirect
6262
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6363
github.com/chzyer/readline v1.5.1 // indirect
64+
github.com/cockroachdb/errors v1.10.0 // indirect
65+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
66+
github.com/cockroachdb/redact v1.1.5 // indirect
6467
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
6568
github.com/confio/ics23/go v0.9.0 // indirect
6669
github.com/containerd/containerd v1.6.8 // indirect
6770
github.com/containerd/typeurl v1.0.2 // indirect
6871
github.com/cosmos/btcutil v1.0.5 // indirect
6972
github.com/cosmos/gogogateway v1.2.0 // indirect
70-
github.com/cosmos/iavl v0.20.0 // indirect
71-
github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
73+
github.com/cosmos/iavl v0.20.1 // indirect
74+
github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
7275
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
7376
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
7477
github.com/creachadair/taskgroup v0.3.2 // indirect
@@ -87,6 +90,7 @@ require (
8790
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
8891
github.com/felixge/httpsnoop v1.0.2 // indirect
8992
github.com/fsnotify/fsnotify v1.6.0 // indirect
93+
github.com/getsentry/sentry-go v0.23.0 // indirect
9094
github.com/ghodss/yaml v1.0.0 // indirect
9195
github.com/go-chi/chi/v5 v5.0.7 // indirect
9296
github.com/go-kit/kit v0.12.0 // indirect
@@ -132,15 +136,18 @@ require (
132136
github.com/jhump/protoreflect v1.15.1 // indirect
133137
github.com/jmespath/go-jmespath v0.4.0 // indirect
134138
github.com/jmhodges/levigo v1.0.0 // indirect
135-
github.com/klauspost/compress v1.16.3 // indirect
139+
github.com/klauspost/compress v1.16.7 // indirect
136140
github.com/klauspost/pgzip v1.2.5 // indirect
141+
github.com/kr/pretty v0.3.1 // indirect
142+
github.com/kr/text v0.2.0 // indirect
137143
github.com/leodido/go-urn v1.2.1 // indirect
138144
github.com/lib/pq v1.10.7 // indirect
139145
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
146+
github.com/linxGnu/grocksdb v1.7.16 // indirect
140147
github.com/magiconair/properties v1.8.6 // indirect
141148
github.com/manifoldco/promptui v0.9.0 // indirect
142149
github.com/mattn/go-colorable v0.1.13 // indirect
143-
github.com/mattn/go-isatty v0.0.18 // indirect
150+
github.com/mattn/go-isatty v0.0.20 // indirect
144151
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
145152
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
146153
github.com/minio/highwayhash v1.0.2 // indirect
@@ -165,8 +172,9 @@ require (
165172
github.com/prometheus/procfs v0.9.0 // indirect
166173
github.com/rakyll/statik v0.1.7 // indirect
167174
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
175+
github.com/rogpeppe/go-internal v1.11.0 // indirect
168176
github.com/rs/cors v1.8.2 // indirect
169-
github.com/rs/zerolog v1.29.1 // indirect
177+
github.com/rs/zerolog v1.31.0 // indirect
170178
github.com/russross/blackfriday/v2 v2.1.0 // indirect
171179
github.com/sasha-s/go-deadlock v0.3.1 // indirect
172180
github.com/sirupsen/logrus v1.9.0 // indirect
@@ -175,7 +183,6 @@ require (
175183
github.com/stretchr/objx v0.5.0 // indirect
176184
github.com/subosito/gotenv v1.4.1 // indirect
177185
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
178-
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
179186
github.com/tendermint/go-amino v0.16.0 // indirect
180187
github.com/tidwall/btree v1.6.0 // indirect
181188
github.com/ulikunitz/xz v0.5.11 // indirect
@@ -191,19 +198,19 @@ require (
191198
go.uber.org/multierr v1.8.0 // indirect
192199
go.uber.org/zap v1.23.0 // indirect
193200
golang.org/x/crypto v0.16.0 // indirect
194-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
195-
golang.org/x/mod v0.8.0 // indirect
201+
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
202+
golang.org/x/mod v0.11.0 // indirect
196203
golang.org/x/net v0.19.0 // indirect
197204
golang.org/x/oauth2 v0.15.0 // indirect
198205
golang.org/x/sync v0.4.0 // indirect
199-
golang.org/x/sys v0.15.0 // indirect
206+
golang.org/x/sys v0.16.0 // indirect
200207
golang.org/x/term v0.15.0 // indirect
201208
golang.org/x/text v0.14.0 // indirect
202209
golang.org/x/tools v0.6.0 // indirect
203210
google.golang.org/api v0.149.0 // indirect
204211
google.golang.org/appengine v1.6.8 // indirect
205-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
206-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
212+
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
213+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
207214
gopkg.in/ini.v1 v1.67.0 // indirect
208215
gopkg.in/yaml.v2 v2.4.0 // indirect
209216
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -213,5 +220,6 @@ require (
213220

214221
replace (
215222
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
223+
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
216224
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
217225
)

0 commit comments

Comments
 (0)