Skip to content

Commit e19452b

Browse files
kocubinskikocubinski
authored
Merge branch 'main' into kocu/rm-stf-run-with-ctx
2 parents 28016f6 + f1dd03f commit e19452b

Some content is hidden

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

103 files changed

+326
-235
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
/server/v2/stf/ @testinginprod @kocubinski @cosmos/sdk-core-dev
3030
/server/v2/appmanager/ @testinginprod @facundomedica @cosmos/sdk-core-dev
3131
/server/v2/cometbft/ @facundomedica @sontrinh16 @cosmos/sdk-core-dev
32+
/simsx @alpe @facundomedica @kocubinski @cosmos/sdk-core-dev
3233
/simapp/ @facundomedica @julienrbrt @cosmos/sdk-core-dev
3334
/simapp/v2/ @kocubinski @julienrbrt @cosmos/sdk-core-dev
3435
/store/ @cool-develope @kocubinski @cosmos/sdk-core-dev
@@ -37,6 +38,7 @@
3738
/tools/hubl @julienrbrt @JulianToledano @cosmos/sdk-core-dev
3839
/tools/cosmovisor @julienrbrt @facundomedica @cosmos/sdk-core-dev
3940
/tools/confix @julienrbrt @akhilkumarpilli @cosmos/sdk-core-dev
41+
/tests/integration/aminojson @kocubinski @cosmos/sdk-core-dev
4042

4143
# x modules
4244

‎.github/ISSUE_TEMPLATE/qa.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,20 @@ v without deliberation
2525
* [ ] Audit x/auth
2626
* [ ] Audit x/authz
2727
* [ ] Audit x/bank
28+
* [ ] Audit x/bank/v2
2829
* [ ] Audit x/circuit
2930
* [ ] Audit x/consensus
3031
* [ ] Audit x/crisis
3132
* [ ] Audit x/distribution
3233
* [ ] Audit x/evidence
34+
* [ ] Audit x/epochs
3335
* [ ] Audit x/feegrant
3436
* [ ] Audit x/genutil
3537
* [ ] Audit x/gov
3638
* [ ] Audit x/group
3739
* [ ] Audit x/mint
3840
* [ ] Audit x/nft
39-
* [ ] Audit x/simulation
41+
* [ ] Audit x/protocolpool
4042
* [ ] Audit x/slashing
4143
* [ ] Audit x/staking
4244
* [ ] Audit x/tx

‎.github/pr_labeler.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
"C:Keys":
1111
- client/keys/**/*
1212
"C:Simulations":
13+
- types/simulation/**/*
1314
- x/simulation/**/*
1415
- x/*/simulation/**/*
16+
- simsx/**/*
1517
"C:Store":
1618
- store/**/*
1719
"C:collections":

‎client/v2/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
4343
* [#18626](https://github.com/cosmos/cosmos-sdk/pull/18626) Support for off-chain signing and verification of a file.
4444
* [#18461](https://github.com/cosmos/cosmos-sdk/pull/18461) Support governance proposals.
4545

46+
### Improvements
47+
48+
* [#21712](https://github.com/cosmos/cosmos-sdk/pull/21712) Marshal `type` field as proto message url in queries instead of amino name.
49+
4650
### API Breaking Changes
4751

4852
* [#17709](https://github.com/cosmos/cosmos-sdk/pull/17709) Address codecs have been removed from `autocli.AppOptions` and `flag.Builder`. Instead client/v2 uses the address codecs present in the context (introduced in [#17503](https://github.com/cosmos/cosmos-sdk/pull/17503)).

‎client/v2/autocli/query.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,12 @@ func (b *Builder) BuildQueryMethodCommand(ctx context.Context, descriptor protor
119119
methodName := fmt.Sprintf("/%s/%s", serviceDescriptor.FullName(), descriptor.Name())
120120
outputType := util.ResolveMessageType(b.TypeResolver, descriptor.Output())
121121
encoderOptions := aminojson.EncoderOptions{
122-
Indent: " ",
123-
EnumAsString: true,
124-
DoNotSortFields: true,
125-
TypeResolver: b.TypeResolver,
126-
FileResolver: b.FileResolver,
122+
Indent: " ",
123+
EnumAsString: true,
124+
DoNotSortFields: true,
125+
AminoNameAsTypeURL: true,
126+
TypeResolver: b.TypeResolver,
127+
FileResolver: b.FileResolver,
127128
}
128129

129130
cmd, err := b.buildMethodCommandCommon(descriptor, options, func(cmd *cobra.Command, input protoreflect.Message) error {

‎client/v2/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ require (
124124
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
125125
github.com/pkg/errors v0.9.1 // indirect
126126
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
127-
github.com/prometheus/client_golang v1.20.3 // indirect
127+
github.com/prometheus/client_golang v1.20.4 // indirect
128128
github.com/prometheus/client_model v0.6.1 // indirect
129129
github.com/prometheus/common v0.59.1 // indirect
130130
github.com/prometheus/procfs v0.15.1 // indirect

‎client/v2/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
412412
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
413413
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
414414
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
415-
github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4=
416-
github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
415+
github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
416+
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
417417
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
418418
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
419419
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

‎core/CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
3636

3737
## [Unreleased]
3838

39+
## [v1.0.0-alpha.3](https://github.com/cosmos/cosmos-sdk/releases/tag/core%2Fv1.0.0-alpha.3)
40+
3941
### Features
4042

4143
* [#21719](https://github.com/cosmos/cosmos-sdk/pull/21719) Make `core/event` as a type alias of `schema/appdata`.
4244

43-
<!-- ## [v1.0.0](https://github.com/cosmos/cosmos-sdk/releases/tag/core%2Fv1.0.0) -->
4445
## [v1.0.0-alpha.2](https://github.com/cosmos/cosmos-sdk/releases/tag/core%2Fv1.0.0-alpha.2)
4546

4647
### Features

‎core/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module cosmossdk.io/core
22

3-
// Core is meant to have zero dependencies, so we can use it as a dependency
3+
// Core is meant to have only a dependency on cosmossdk.io/schema, so we can use it as a dependency
44
// in other modules without having to worry about circular dependencies.
55

66
go 1.23
77

8+
require cosmossdk.io/schema v0.3.0
9+
810
// Version tagged too early and incompatible with v0.50 (latest at the time of tagging)
911
retract v0.12.0
10-
11-
require cosmossdk.io/schema v0.2.0

‎core/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
cosmossdk.io/schema v0.2.0 h1:UH5CR1DqUq8yP+5Np8PbvG4YX0zAUsTN2Qk6yThmfMk=
2-
cosmossdk.io/schema v0.2.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
1+
cosmossdk.io/schema v0.3.0 h1:01lcaM4trhzZ1HQTfTV8z6Ma1GziOZ/YmdzBN3F720c=
2+
cosmossdk.io/schema v0.3.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=

0 commit comments

Comments
 (0)