Skip to content

Commit 2174a3d

Browse files
mergify[bot]julienrbrt
mergify[bot]
and
julienrbrt
authored
feat(client/v2): use x/tx AminoNameAsTypeURL option (backport #21712) (#21797)
Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent 02595f5 commit 2174a3d

File tree

54 files changed

+88
-87
lines changed

Some content is hidden

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

54 files changed

+88
-87
lines changed

‎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
@@ -8,7 +8,7 @@ require (
88
cosmossdk.io/depinject v1.0.0
99
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
1010
cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
11-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6 // main
11+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b // main
1212
github.com/cosmos/cosmos-proto v1.0.0-beta.5
1313
github.com/cosmos/cosmos-sdk v0.52.0
1414
github.com/spf13/cobra v1.8.1

‎client/v2/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 h1:UUW0+2UgbDwQ452o
2626
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214/go.mod h1:ct8HATr+s48YYTRXEyP3HF33v9qEVWHMxwOL8P/v4iQ=
2727
cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190 h1:XQJj9Dv9Gtze0l2TF79BU5lkP6MkUveTUuKICmxoz+o=
2828
cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190/go.mod h1:7WUGupOvmlHJoIMBz1JbObQxeo6/TDiuDBxmtod8HRg=
29-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6 h1:iOy4n9nKBKaLpPMLaxpzzfHbJKxFgpHc17noeK4dHec=
30-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6/go.mod h1:D4mjFUYiNi1/r0p1kknsWhUnXxK9Y8RV1GQUdHEaBRw=
29+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b h1:FyLcX6eZh9c4FqWla3pXubLIIVlndfQohvf+IcXg99M=
30+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b/go.mod h1:XN1aLQztqr0laTsdFRReV15H01rbnMVjbZRwt939Pf4=
3131
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
3232
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
3333
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6
1717
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
1818
cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
19-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6 // main
19+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b // main
2020
github.com/99designs/keyring v1.2.2
2121
github.com/bgentry/speakeasy v0.2.0
2222
github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ cosmossdk.io/schema v0.2.0 h1:UH5CR1DqUq8yP+5Np8PbvG4YX0zAUsTN2Qk6yThmfMk=
2424
cosmossdk.io/schema v0.2.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
2525
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 h1:UUW0+2UgbDwQ452o2aw4DrVSWmowcad7DB7Vln+N94I=
2626
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214/go.mod h1:ct8HATr+s48YYTRXEyP3HF33v9qEVWHMxwOL8P/v4iQ=
27-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6 h1:iOy4n9nKBKaLpPMLaxpzzfHbJKxFgpHc17noeK4dHec=
28-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6/go.mod h1:D4mjFUYiNi1/r0p1kknsWhUnXxK9Y8RV1GQUdHEaBRw=
27+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b h1:FyLcX6eZh9c4FqWla3pXubLIIVlndfQohvf+IcXg99M=
28+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b/go.mod h1:XN1aLQztqr0laTsdFRReV15H01rbnMVjbZRwt939Pf4=
2929
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
3030
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
3131
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=

‎server/v2/cometbft/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 // indirect
4949
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
5050
cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
51-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6 // indirect; main
51+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b // indirect; main
5252
filippo.io/edwards25519 v1.1.0 // indirect
5353
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
5454
github.com/99designs/keyring v1.2.2 // indirect

‎server/v2/cometbft/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 h1:UUW0+2UgbDwQ452o
3434
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214/go.mod h1:ct8HATr+s48YYTRXEyP3HF33v9qEVWHMxwOL8P/v4iQ=
3535
cosmossdk.io/store/v2 v2.0.0-20240916221850-7856d226038c h1:x0NX01A+QWckckb1hi9p8mYW4OXTYEzsohQK2qBtIHg=
3636
cosmossdk.io/store/v2 v2.0.0-20240916221850-7856d226038c/go.mod h1:YX8zzjSheu3YOaaYWaDlnjSAQAvgkZEC6xbywdnWYKE=
37-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6 h1:iOy4n9nKBKaLpPMLaxpzzfHbJKxFgpHc17noeK4dHec=
38-
cosmossdk.io/x/tx v0.13.4-0.20240909133312-50288938d1b6/go.mod h1:D4mjFUYiNi1/r0p1kknsWhUnXxK9Y8RV1GQUdHEaBRw=
37+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b h1:FyLcX6eZh9c4FqWla3pXubLIIVlndfQohvf+IcXg99M=
38+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b/go.mod h1:XN1aLQztqr0laTsdFRReV15H01rbnMVjbZRwt939Pf4=
3939
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
4040
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
4141
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=

‎simapp/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190
3232
cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000
3333
cosmossdk.io/x/staking v0.0.0-20240226161501-23359a0b6d91
34-
cosmossdk.io/x/tx v0.14.0 // main
34+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b // main
3535
cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
3636
github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f
3737
github.com/cometbft/cometbft/api v1.0.0-rc.1
@@ -263,8 +263,6 @@ replace (
263263
cosmossdk.io/x/protocolpool => ../x/protocolpool
264264
cosmossdk.io/x/slashing => ../x/slashing
265265
cosmossdk.io/x/staking => ../x/staking
266-
// pseudo version lower than the latest tag
267-
cosmossdk.io/x/tx => cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897 // main
268266
cosmossdk.io/x/upgrade => ../x/upgrade
269267
)
270268

‎simapp/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ cosmossdk.io/schema v0.2.0 h1:UH5CR1DqUq8yP+5Np8PbvG4YX0zAUsTN2Qk6yThmfMk=
212212
cosmossdk.io/schema v0.2.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
213213
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 h1:UUW0+2UgbDwQ452o2aw4DrVSWmowcad7DB7Vln+N94I=
214214
cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214/go.mod h1:ct8HATr+s48YYTRXEyP3HF33v9qEVWHMxwOL8P/v4iQ=
215-
cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897 h1:J3vS3G41JtTWkUX3wVKcXdy1yPUca0d3QnexCR52PeY=
216-
cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897/go.mod h1:5+Hpds6bhT6CdR7DqPh0dVOqyqL7NJkq+x+yjLdYSQU=
215+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b h1:FyLcX6eZh9c4FqWla3pXubLIIVlndfQohvf+IcXg99M=
216+
cosmossdk.io/x/tx v0.13.4-0.20240918094839-0c8ad9d2c64b/go.mod h1:XN1aLQztqr0laTsdFRReV15H01rbnMVjbZRwt939Pf4=
217217
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
218218
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
219219
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=

0 commit comments

Comments
 (0)