Skip to content

Commit 0d3b5e4

Browse files
PantaniPantani
authored andcommitted
Merge remote-tracking branch 'origin/main' into feat/improve-xgenny-dry-run
# Conflicts: # ignite/cmd/scaffold_chain.go # ignite/services/scaffolder/init.go
2 parents cbf371f + 5ed9632 commit 0d3b5e4

File tree

32 files changed

+1708
-102
lines changed

32 files changed

+1708
-102
lines changed

changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
- [#3985](https://github.com/ignite/cli/pull/3985) Make some `cmd` pkg functions public
1010
- [#4001](https://github.com/ignite/cli/pull/4001) Improve `xgenny` dry run
1111
- [#3967](https://github.com/ignite/cli/issues/3967) Add HD wallet parameters `address index` and `account number` to the chain account config
12+
- [#3660](https://github.com/ignite/cli/pull/3660) Add ability to scaffold ICS consumer chain
1213
- [#4004](https://github.com/ignite/cli/pull/4004) Remove all import placeholders using the `xast` pkg
1314

1415
### Changes
1516

17+
- [#4013](https://github.com/ignite/cli/pull/4013) Bump `cosmos-sdk` to `v0.50.5`
1618
- [#3993](https://github.com/ignite/cli/pull/3993) Oracle scaffolding was deprecated and has been removed
1719
- [#3959](https://github.com/ignite/cli/pull/3959) Remove app name prefix from the `.gitignore` file
1820
- [#3962](https://github.com/ignite/cli/pull/3962) Rename all RPC endpoints and autocli commands generated for `map`/`list`/`single` types

docs/docs/08-references/02-config.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,26 @@ to describe the development environment for your blockchain.
1212
Only a default set of parameters is provided. If more nuanced configuration is
1313
required, you can add these parameters to the `config.yml` file.
1414

15+
## Validation
16+
17+
Ignite uses the `validation` field to determine the kind of validation
18+
of your blockchain. There are currently two supported kinds of validation:
19+
20+
- `sovereign` which is the standard kind of validation where your blockchain
21+
has its own validator set. This is the default value when this field is not
22+
in the config file.
23+
- `consumer` indicates your blockchain is a consumer chain, in the sense of
24+
Replicated Security. That means it doesn't have a validator set, but
25+
inherits the one of a provider chain.
26+
27+
While the `sovereign` chain is the default validation when you run the `ignite scaffold
28+
chain`, to scaffold a consumer chain, you have to run `ignite scaffold chain
29+
--consumer`.
30+
31+
This field is, at this time of writing, only used by Ignite at the genesis
32+
generation step, because the genesis of a sovereign chain and a consumer chain
33+
are different.
34+
1535
## Accounts
1636

1737
A list of user accounts created during genesis of the blockchain.

go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ replace (
1515
)
1616

1717
require (
18-
cosmossdk.io/math v1.2.0
18+
cosmossdk.io/math v1.3.0
1919
cosmossdk.io/x/evidence v0.1.0
2020
cosmossdk.io/x/feegrant v0.1.0
2121
cosmossdk.io/x/upgrade v0.1.0
@@ -33,7 +33,7 @@ require (
3333
github.com/charmbracelet/lipgloss v0.6.0
3434
github.com/cockroachdb/errors v1.11.1
3535
github.com/cometbft/cometbft v0.38.5
36-
github.com/cosmos/cosmos-sdk v0.50.4
36+
github.com/cosmos/cosmos-sdk v0.50.5
3737
github.com/cosmos/go-bip39 v1.0.0
3838
github.com/cosmos/gogoproto v1.4.11
3939
github.com/cosmos/ibc-go/modules/capability v1.0.0
@@ -72,19 +72,19 @@ require (
7272
github.com/rs/cors v1.10.1
7373
github.com/spf13/cobra v1.8.0
7474
github.com/spf13/pflag v1.0.5
75-
github.com/stretchr/testify v1.8.4
75+
github.com/stretchr/testify v1.9.0
7676
github.com/tbruyelle/mdgofmt v0.1.3
7777
github.com/vektra/mockery/v2 v2.36.1
7878
go.etcd.io/bbolt v1.3.8
79-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
79+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
8080
golang.org/x/mod v0.15.0
8181
golang.org/x/sync v0.6.0
8282
golang.org/x/term v0.17.0
8383
golang.org/x/text v0.14.0
8484
golang.org/x/tools v0.18.0
8585
golang.org/x/vuln v1.0.1
86-
google.golang.org/grpc v1.60.1
87-
google.golang.org/protobuf v1.32.0
86+
google.golang.org/grpc v1.62.0
87+
google.golang.org/protobuf v1.33.0
8888
gopkg.in/yaml.v2 v2.4.0
8989
mvdan.cc/gofumpt v0.5.0
9090
sigs.k8s.io/yaml v1.4.0
@@ -103,7 +103,7 @@ require (
103103
cosmossdk.io/errors v1.0.1 // indirect
104104
cosmossdk.io/log v1.3.1 // indirect
105105
cosmossdk.io/store v1.0.2 // indirect
106-
cosmossdk.io/x/tx v0.13.0 // indirect
106+
cosmossdk.io/x/tx v0.13.1 // indirect
107107
dario.cat/mergo v1.0.0 // indirect
108108
filippo.io/edwards25519 v1.0.0 // indirect
109109
github.com/4meepo/tagalign v1.3.3 // indirect
@@ -175,7 +175,7 @@ require (
175175
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
176176
github.com/cosiner/argv v0.1.0 // indirect
177177
github.com/cosmos/btcutil v1.0.5 // indirect
178-
github.com/cosmos/cosmos-db v1.0.0 // indirect
178+
github.com/cosmos/cosmos-db v1.0.2 // indirect
179179
github.com/cosmos/cosmos-proto v1.0.0-beta.4 // indirect
180180
github.com/cosmos/gogogateway v1.2.0 // indirect
181181
github.com/cosmos/iavl v1.0.1 // indirect
@@ -254,7 +254,7 @@ require (
254254
github.com/golang-jwt/jwt/v4 v4.1.0 // indirect
255255
github.com/golang/glog v1.2.0 // indirect
256256
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
257-
github.com/golang/protobuf v1.5.3 // indirect
257+
github.com/golang/protobuf v1.5.4 // indirect
258258
github.com/golang/snappy v0.0.4 // indirect
259259
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
260260
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
@@ -272,7 +272,7 @@ require (
272272
github.com/google/go-dap v0.9.1 // indirect
273273
github.com/google/go-querystring v1.1.0 // indirect
274274
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 // indirect
275-
github.com/google/uuid v1.4.0 // indirect
275+
github.com/google/uuid v1.6.0 // indirect
276276
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
277277
github.com/gorilla/css v1.0.0 // indirect
278278
github.com/gorilla/handlers v1.5.2 // indirect
@@ -315,7 +315,7 @@ require (
315315
github.com/kisielk/errcheck v1.6.3 // indirect
316316
github.com/kisielk/gotool v1.0.0 // indirect
317317
github.com/kkHAIKE/contextcheck v1.1.4 // indirect
318-
github.com/klauspost/compress v1.17.6 // indirect
318+
github.com/klauspost/compress v1.17.7 // indirect
319319
github.com/klauspost/pgzip v1.2.6 // indirect
320320
github.com/kr/pretty v0.3.1 // indirect
321321
github.com/kr/text v0.2.0 // indirect
@@ -418,7 +418,7 @@ require (
418418
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
419419
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
420420
github.com/stoewer/go-strcase v1.3.0 // indirect
421-
github.com/stretchr/objx v0.5.0 // indirect
421+
github.com/stretchr/objx v0.5.2 // indirect
422422
github.com/subosito/gotenv v1.6.0 // indirect
423423
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
424424
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
@@ -464,9 +464,9 @@ require (
464464
golang.org/x/net v0.21.0 // indirect
465465
golang.org/x/sys v0.17.0 // indirect
466466
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
467-
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
468-
google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect
469-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
467+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
468+
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
469+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
470470
gopkg.in/ini.v1 v1.67.0 // indirect
471471
gopkg.in/warnings.v0 v0.1.2 // indirect
472472
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)