Skip to content

Commit 68e9f49

Browse files
AbdulboisAbdulbois
committed
#303 Upgrade Cosmos-SDK to v0.47.3
Change package names Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com> Signed-off-by: Abdulbois <abdulbois123@gmail.com>
1 parent 1ecf542 commit 68e9f49

File tree

221 files changed

+4294
-6924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+4294
-6924
lines changed

‎app/app.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ func New(
394394
keys[dclauthmoduletypes.MemStoreKey],
395395
)
396396

397-
dclauthModule := dclauthmodule.NewAppModule(appCodec, app.DclauthKeeper)
397+
dclauthModule := dclauthmodule.NewAppModule(appCodec, app.DclauthKeeper, app.BaseauthKeeper)
398398

399399
app.ValidatorKeeper = *validatormodulekeeper.NewKeeper(
400400
appCodec,

‎buf.work.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version: v1
2+
directories:
3+
- proto

‎cmd/dcld/cmd/root.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,16 @@ func NewRootCmd() (*cobra.Command, appparams.EncodingConfig) {
110110
// set the default command outputs
111111
cmd.SetOut(cmd.OutOrStdout())
112112
cmd.SetErr(cmd.ErrOrStderr())
113-
initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags())
113+
clientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags())
114114
if err != nil {
115115
return err
116116
}
117-
initClientCtx, err = config.ReadFromClientConfig(initClientCtx)
117+
clientCtx, err = config.ReadFromClientConfig(clientCtx)
118118
if err != nil {
119119
return err
120120
}
121121

122-
if err := client.SetCmdClientContextHandler(initClientCtx, cmd); err != nil {
122+
if err := client.SetCmdClientContextHandler(clientCtx, cmd); err != nil {
123123
return err
124124
}
125125

@@ -304,15 +304,15 @@ func (a appCreator) newApp(
304304
)
305305

306306
homeDir := cast.ToString(appOpts.Get(flags.FlagHome))
307-
chainID := cast.ToString(appOpts.Get(flags.FlagChainID))
308-
if chainID == "" {
307+
chainID_ := cast.ToString(appOpts.Get(flags.FlagChainID))
308+
if chainID_ == "" {
309309
// fallback to genesis chain-id
310310
appGenesis, err := tmtypes.GenesisDocFromFile(filepath.Join(homeDir, "config", "genesis.json"))
311311
if err != nil {
312312
panic(err)
313313
}
314314

315-
chainID = appGenesis.ChainID
315+
chainID_ = appGenesis.ChainID
316316
}
317317

318318
return app.New(
@@ -335,7 +335,7 @@ func (a appCreator) newApp(
335335
baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))),
336336
baseapp.SetSnapshot(snapshotStore, snapshotOptions),
337337
baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
338-
baseapp.SetChainID(chainID),
338+
baseapp.SetChainID(chainID_),
339339
)
340340
}
341341

‎config.yml

+26-30
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
1-
---
2-
# Copyright 2022
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
1+
version: 1
2+
build:
3+
main: app
4+
proto:
5+
path: proto
6+
third_party_paths:
7+
- third_party/proto
8+
- proto_vendor
169
accounts:
17-
- name: alice
18-
coins: ["20000token", "200000000stake"]
19-
- name: bob
20-
coins: ["10000token", "100000000stake"]
21-
validator:
22-
name: alice
23-
staked: "100000000stake"
24-
client:
25-
# openapi:
26-
# path: "docs/static/openapi.yml"
27-
vuex:
28-
path: "vue/src/store"
10+
- name: alice
11+
coins:
12+
- 20000token
13+
- 200000000stake
14+
- name: bob
15+
coins:
16+
- 10000token
17+
- 100000000stake
2918
faucet:
3019
name: bob
31-
coins: ["5token", "100000stake"]
32-
build:
33-
main: "app"
20+
coins:
21+
- 5token
22+
- 100000stake
23+
host: 0.0.0.0:4500
24+
client:
25+
vuex:
26+
path: vue/src/store
27+
validators:
28+
- name: alice
29+
bonded: 100000000stake

‎go.mod

+187-4
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,211 @@ go 1.20
44

55
require (
66
cosmossdk.io/api v0.3.1
7+
cosmossdk.io/core v0.5.1
8+
cosmossdk.io/math v1.0.1
9+
cosmossdk.io/tools/rosetta v0.2.1
10+
github.com/bufbuild/buf v1.7.0
711
github.com/cometbft/cometbft v0.37.1
812
github.com/cometbft/cometbft-db v0.7.0
13+
github.com/cosmos/cosmos-proto v1.0.0-beta.2
914
github.com/cosmos/cosmos-sdk v0.47.3
15+
github.com/cosmos/go-bip39 v1.0.0
1016
github.com/cosmos/gogoproto v1.4.10
1117
github.com/go-playground/locales v0.14.0
1218
github.com/go-playground/universal-translator v0.18.0
1319
github.com/go-playground/validator/v10 v10.9.0
20+
github.com/golang/protobuf v1.5.3
1421
github.com/gorilla/mux v1.8.0
1522
github.com/grpc-ecosystem/grpc-gateway v1.16.0
23+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0
1624
github.com/pkg/errors v0.9.1
1725
github.com/spf13/cast v1.5.0
1826
github.com/spf13/cobra v1.6.1
1927
github.com/spf13/pflag v1.0.5
2028
github.com/spf13/viper v1.14.0
21-
github.com/stretchr/testify v1.8.2
22-
google.golang.org/grpc v1.56.2
29+
github.com/stretchr/testify v1.8.4
30+
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917
31+
google.golang.org/grpc v1.60.1
32+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
33+
google.golang.org/protobuf v1.32.0
2334
sigs.k8s.io/yaml v1.3.0
2435
)
2536

2637
require (
27-
github.com/kr/pretty v0.3.1 // indirect
28-
golang.org/x/net v0.12.0 // indirect
38+
cloud.google.com/go v0.111.0 // indirect
39+
cloud.google.com/go/compute v1.23.3 // indirect
40+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
41+
cloud.google.com/go/iam v1.1.5 // indirect
42+
cloud.google.com/go/storage v1.30.1 // indirect
43+
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
44+
cosmossdk.io/errors v1.0.0-beta.7 // indirect
45+
cosmossdk.io/log v1.1.0 // indirect
46+
filippo.io/edwards25519 v1.0.0 // indirect
47+
github.com/99designs/keyring v1.2.1 // indirect
48+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
49+
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
50+
github.com/Microsoft/go-winio v0.6.0 // indirect
51+
github.com/armon/go-metrics v0.4.1 // indirect
52+
github.com/aws/aws-sdk-go v1.44.203 // indirect
53+
github.com/beorn7/perks v1.0.1 // indirect
54+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
55+
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
56+
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
57+
github.com/bufbuild/connect-go v1.0.0 // indirect
58+
github.com/bufbuild/protocompile v0.4.0 // indirect
59+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
60+
github.com/cespare/xxhash v1.1.0 // indirect
61+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
62+
github.com/chzyer/readline v1.5.1 // indirect
63+
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
64+
github.com/confio/ics23/go v0.9.0 // indirect
65+
github.com/containerd/containerd v1.6.8 // indirect
66+
github.com/containerd/typeurl v1.0.2 // indirect
67+
github.com/cosmos/btcutil v1.0.5 // indirect
68+
github.com/cosmos/gogogateway v1.2.0 // indirect
69+
github.com/cosmos/iavl v0.20.0 // indirect
70+
github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
71+
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
72+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
73+
github.com/creachadair/taskgroup v0.3.2 // indirect
74+
github.com/danieljoos/wincred v1.1.2 // indirect
75+
github.com/davecgh/go-spew v1.1.1 // indirect
76+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
77+
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
78+
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
79+
github.com/dgraph-io/ristretto v0.1.1 // indirect
80+
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
81+
github.com/docker/distribution v2.8.1+incompatible // indirect
82+
github.com/docker/docker v20.10.19+incompatible // indirect
83+
github.com/docker/go-connections v0.4.0 // indirect
84+
github.com/docker/go-units v0.5.0 // indirect
85+
github.com/dustin/go-humanize v1.0.1 // indirect
86+
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
87+
github.com/felixge/httpsnoop v1.0.2 // indirect
88+
github.com/fsnotify/fsnotify v1.6.0 // indirect
89+
github.com/ghodss/yaml v1.0.0 // indirect
90+
github.com/go-chi/chi/v5 v5.0.7 // indirect
91+
github.com/go-kit/kit v0.12.0 // indirect
92+
github.com/go-kit/log v0.2.1 // indirect
93+
github.com/go-logfmt/logfmt v0.5.1 // indirect
94+
github.com/go-logr/logr v1.2.4 // indirect
95+
github.com/go-logr/stdr v1.2.2 // indirect
96+
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
97+
github.com/gofrs/flock v0.8.1 // indirect
98+
github.com/gofrs/uuid v4.3.0+incompatible // indirect
99+
github.com/gogo/googleapis v1.4.1 // indirect
100+
github.com/gogo/protobuf v1.3.2 // indirect
101+
github.com/golang/glog v1.1.2 // indirect
102+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
103+
github.com/golang/mock v1.6.0 // indirect
104+
github.com/golang/snappy v0.0.4 // indirect
105+
github.com/google/btree v1.1.2 // indirect
106+
github.com/google/go-cmp v0.6.0 // indirect
107+
github.com/google/orderedcode v0.0.1 // indirect
108+
github.com/google/s2a-go v0.1.7 // indirect
109+
github.com/google/uuid v1.4.0 // indirect
110+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
111+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
112+
github.com/gorilla/handlers v1.5.1 // indirect
113+
github.com/gorilla/websocket v1.5.0 // indirect
114+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
115+
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
116+
github.com/gtank/merlin v0.1.1 // indirect
117+
github.com/gtank/ristretto255 v0.1.2 // indirect
118+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
119+
github.com/hashicorp/go-getter v1.7.1 // indirect
120+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
121+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
122+
github.com/hashicorp/go-version v1.6.0 // indirect
123+
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
124+
github.com/hashicorp/hcl v1.0.0 // indirect
125+
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
126+
github.com/huandu/skiplist v1.2.0 // indirect
127+
github.com/improbable-eng/grpc-web v0.15.0 // indirect
128+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
129+
github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect
130+
github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f // indirect
131+
github.com/jhump/protoreflect v1.15.1 // indirect
132+
github.com/jmespath/go-jmespath v0.4.0 // indirect
133+
github.com/jmhodges/levigo v1.0.0 // indirect
134+
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
135+
github.com/klauspost/compress v1.16.3 // indirect
136+
github.com/klauspost/pgzip v1.2.5 // indirect
137+
github.com/leodido/go-urn v1.2.1 // indirect
138+
github.com/lib/pq v1.10.7 // indirect
139+
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
140+
github.com/magiconair/properties v1.8.6 // indirect
141+
github.com/manifoldco/promptui v0.9.0 // indirect
142+
github.com/mattn/go-colorable v0.1.13 // indirect
143+
github.com/mattn/go-isatty v0.0.18 // indirect
144+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
145+
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
146+
github.com/minio/highwayhash v1.0.2 // indirect
147+
github.com/mitchellh/go-homedir v1.1.0 // indirect
148+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
149+
github.com/mitchellh/mapstructure v1.5.0 // indirect
150+
github.com/moby/buildkit v0.10.4 // indirect
151+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
152+
github.com/morikuni/aec v1.0.0 // indirect
153+
github.com/mtibben/percent v0.2.1 // indirect
154+
github.com/opencontainers/go-digest v1.0.0 // indirect
155+
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
156+
github.com/pelletier/go-toml v1.9.5 // indirect
157+
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
158+
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
159+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
160+
github.com/pkg/profile v1.6.0 // indirect
161+
github.com/pmezard/go-difflib v1.0.0 // indirect
162+
github.com/prometheus/client_golang v1.14.0 // indirect
163+
github.com/prometheus/client_model v0.3.0 // indirect
164+
github.com/prometheus/common v0.42.0 // indirect
165+
github.com/prometheus/procfs v0.9.0 // indirect
166+
github.com/rakyll/statik v0.1.7 // indirect
167+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
168+
github.com/rs/cors v1.8.2 // indirect
169+
github.com/rs/zerolog v1.29.1 // indirect
170+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
171+
github.com/sasha-s/go-deadlock v0.3.1 // indirect
172+
github.com/sirupsen/logrus v1.9.0 // indirect
173+
github.com/spf13/afero v1.9.2 // indirect
174+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
175+
github.com/stretchr/objx v0.5.0 // indirect
176+
github.com/subosito/gotenv v1.4.1 // indirect
177+
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
178+
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
179+
github.com/tendermint/go-amino v0.16.0 // indirect
180+
github.com/tidwall/btree v1.6.0 // indirect
181+
github.com/ulikunitz/xz v0.5.11 // indirect
182+
github.com/zondax/hid v0.9.1 // indirect
183+
github.com/zondax/ledger-go v0.14.0 // indirect
184+
go.etcd.io/bbolt v1.3.7 // indirect
185+
go.opencensus.io v0.24.0 // indirect
186+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3 // indirect
187+
go.opentelemetry.io/otel v1.19.0 // indirect
188+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
189+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
190+
go.uber.org/atomic v1.10.0 // indirect
191+
go.uber.org/multierr v1.8.0 // indirect
192+
go.uber.org/zap v1.23.0 // indirect
193+
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
196+
golang.org/x/net v0.19.0 // indirect
197+
golang.org/x/oauth2 v0.15.0 // indirect
198+
golang.org/x/sync v0.4.0 // indirect
199+
golang.org/x/sys v0.15.0 // indirect
200+
golang.org/x/term v0.15.0 // indirect
201+
golang.org/x/text v0.14.0 // indirect
202+
golang.org/x/tools v0.6.0 // indirect
203+
google.golang.org/api v0.149.0 // indirect
204+
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
207+
gopkg.in/ini.v1 v1.67.0 // indirect
208+
gopkg.in/yaml.v2 v2.4.0 // indirect
209+
gopkg.in/yaml.v3 v3.0.1 // indirect
210+
nhooyr.io/websocket v1.8.6 // indirect
211+
pgregory.net/rapid v0.5.5 // indirect
29212
)
30213

31214
replace (

0 commit comments

Comments
 (0)