Skip to content

Commit cedcea9

Browse files
julienrbrtmergify[bot]
julienrbrt
authored and
mergify[bot]
committed
chore: sync changelog to main + clean-up replaces (#22846)
(cherry picked from commit 5705850) # Conflicts: # client/v2/go.mod # client/v2/go.sum # go.mod # go.sum # runtime/v2/go.mod # runtime/v2/go.sum # server/v2/cometbft/go.mod # server/v2/cometbft/go.sum # server/v2/go.mod # server/v2/go.sum # simapp/go.mod # simapp/go.sum # simapp/v2/go.mod # simapp/v2/go.sum # tests/go.mod # tests/go.sum # tools/benchmark/go.mod # tools/benchmark/go.sum # x/accounts/defaults/base/go.mod # x/accounts/defaults/base/go.sum # x/accounts/defaults/lockup/go.mod # x/accounts/defaults/lockup/go.sum # x/accounts/defaults/multisig/go.mod # x/accounts/defaults/multisig/go.sum # x/accounts/go.mod # x/accounts/go.sum # x/authz/go.mod # x/authz/go.sum # x/bank/go.mod # x/bank/go.sum # x/circuit/go.mod # x/circuit/go.sum # x/consensus/go.mod # x/consensus/go.sum # x/distribution/go.mod # x/distribution/go.sum # x/epochs/go.mod # x/epochs/go.sum # x/evidence/go.mod # x/evidence/go.sum # x/feegrant/go.mod # x/feegrant/go.sum # x/gov/go.mod # x/gov/go.sum # x/group/go.mod # x/group/go.sum # x/mint/go.mod # x/mint/go.sum # x/nft/go.mod # x/nft/go.sum # x/params/go.mod # x/params/go.sum # x/protocolpool/go.mod # x/protocolpool/go.sum # x/slashing/go.mod # x/slashing/go.sum # x/staking/go.mod # x/staking/go.sum # x/tx/CHANGELOG.md # x/upgrade/go.mod # x/upgrade/go.sum
1 parent 1fbc003 commit cedcea9

62 files changed

Lines changed: 2022 additions & 4 deletions

File tree

Some content is hidden

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

‎client/v2/CHANGELOG.md‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
4949

5050
### Improvements
5151

52-
* [#22443](https://github.com/cosmos/cosmos-sdk/pull/22443) Add keyring flags in query commands.
53-
* [#21936](https://github.com/cosmos/cosmos-sdk/pull/21936) Print possible enum values in error message after an invalid input was provided.
54-
5552
### API Breaking Changes
5653

5754
* [#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)).
@@ -60,9 +57,25 @@ Ref: https://keepachangelog.com/en/1.0.0/
6057
### Bug Fixes
6158

6259
* [#21853](https://github.com/cosmos/cosmos-sdk/pull/21853) Fix `*big.Int` unmarshalling in txs.
63-
* [#22576](https://github.com/cosmos/cosmos-sdk/pull/22576) Fix duplicate command addition in `autocli` when custom enhanced command has a different name than module name
60+
61+
## [v2.0.0-beta.7] - 2024-12-10
62+
63+
### Bug Fixes
64+
6465
* [#22817](https://github.com/cosmos/cosmos-sdk/pull/22817) Add DecCoin support in autocli flag builder.
6566

67+
## [v2.0.0-beta.6] - 2024-11-21
68+
69+
### Improvements
70+
71+
* [#22443](https://github.com/cosmos/cosmos-sdk/pull/22443) Add keyring flags in query commands.
72+
* [#21936](https://github.com/cosmos/cosmos-sdk/pull/21936) Print possible enum values in error message after an invalid input was provided.
73+
74+
### Bug Fixes
75+
76+
* [#21809](https://github.com/cosmos/cosmos-sdk/pull/21809) Correctly handle enhanced sub commands.
77+
* [#22576](https://github.com/cosmos/cosmos-sdk/pull/22576) Fix duplicate command addition in `autocli` when custom enhanced command has a different name than module name
78+
6679
## [v2.0.0-beta.5] - 2024-09-18
6780

6881
### Improvements

‎client/v2/go.mod‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,21 @@ module cosmossdk.io/client/v2
33
go 1.23.3
44

55
require (
6+
<<<<<<< HEAD
67
cosmossdk.io/api v0.8.0
78
cosmossdk.io/core v1.0.0-alpha.6 // main
89
cosmossdk.io/depinject v1.1.0
910
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
1011
cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
1112
cosmossdk.io/x/tx v1.0.0-alpha.2 // main
13+
=======
14+
cosmossdk.io/api v0.8.0-rc.2
15+
cosmossdk.io/core v1.0.0-alpha.6
16+
cosmossdk.io/depinject v1.1.0
17+
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
18+
cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
19+
cosmossdk.io/x/tx v1.0.0-alpha.2
20+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
1221
github.com/cosmos/cosmos-proto v1.0.0-beta.5
1322
github.com/cosmos/cosmos-sdk v0.52.0
1423
github.com/spf13/cobra v1.8.1
@@ -181,10 +190,14 @@ replace github.com/cosmos/cosmos-sdk => ./../../
181190

182191
// TODO remove post spinning out all modules
183192
replace (
193+
<<<<<<< HEAD
184194
// pseudo version lower than the latest tag
185195
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240924065902-eb7653cfecdf // main
186196
// pseudo version lower than the latest tag
187197
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20241204123127-eb3bf8b0469d // main
198+
=======
199+
cosmossdk.io/store => ./../../store
200+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
188201
cosmossdk.io/x/bank => ./../../x/bank
189202
cosmossdk.io/x/gov => ./../../x/gov
190203
cosmossdk.io/x/staking => ./../../x/staking

‎client/v2/go.sum‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@ buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.2-20240130113600-88e
44
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.2-20240130113600-88ef6483f90f.1/go.mod h1:17Ax38yd8pg56din4ecwSDBRCSX0qLcif5Cdf8ayto4=
55
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
66
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
7+
<<<<<<< HEAD
78
cosmossdk.io/api v0.7.3-0.20240924065902-eb7653cfecdf h1:CttA/mEIxGm4E7vwrjUpju7/Iespns08d9bOza70cIc=
89
cosmossdk.io/api v0.7.3-0.20240924065902-eb7653cfecdf/go.mod h1:YMfx2ATpgITsoydD3hIBa8IkDHtyXp/14rmG0d3sEew=
910
cosmossdk.io/collections v0.4.1-0.20241209183624-332d0b106d1b h1:smupoVhpdK+5pztIylyIGkCc+0QaAaGLEvnM7Wnrq18=
1011
cosmossdk.io/collections v0.4.1-0.20241209183624-332d0b106d1b/go.mod h1:uf12i1yKvzEIHt2ok7poNqFDQTb71O00RQLitSynmrg=
12+
=======
13+
cosmossdk.io/api v0.8.0-rc.2 h1:7DQjVnYz7sTy47bZMzahfOANbhxLmPtgQvvru9kA2R0=
14+
cosmossdk.io/api v0.8.0-rc.2/go.mod h1:edvI8tMINqCH75EgkOEMnCZEQ3iKJgOlZ+ZxOu4gmXU=
15+
cosmossdk.io/collections v0.4.1-0.20241128094659-bd76b47e1d8b h1:MgU4EDOo/pXgepHCUFQFnIfUCxk/JO0AJGDTUQhhEhg=
16+
cosmossdk.io/collections v0.4.1-0.20241128094659-bd76b47e1d8b/go.mod h1:uf12i1yKvzEIHt2ok7poNqFDQTb71O00RQLitSynmrg=
17+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
1118
cosmossdk.io/core v1.0.0-alpha.6 h1:5ukC4JcQKmemLQXcAgu/QoOvJI50hpBkIIg4ZT2EN8E=
1219
cosmossdk.io/core v1.0.0-alpha.6/go.mod h1:3u9cWq1FAVtiiCrDPpo4LhR+9V6k/ycSG4/Y/tREWCY=
1320
cosmossdk.io/core/testing v0.0.0-20241108153815-606544c7be7e h1:F+ScucYxwrrDJU8guJXQXpGhdpziYSbxW6HMP2wCNxs=

‎go.mod‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ go 1.23.2
33
module github.com/cosmos/cosmos-sdk
44

55
require (
6+
<<<<<<< HEAD
67
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.35.2-20241120201313-68e42a58b301.1 // indirect
78
cosmossdk.io/api v0.8.0 // main
89
cosmossdk.io/collections v0.4.1-0.20241209183624-332d0b106d1b // main
10+
=======
11+
cosmossdk.io/api v0.8.0-rc.2
12+
cosmossdk.io/collections v0.4.1-0.20241128094659-bd76b47e1d8b
13+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
914
cosmossdk.io/core v1.0.0-alpha.6
1015
cosmossdk.io/core/testing v0.0.0-20241108153815-606544c7be7e // main
1116
cosmossdk.io/depinject v1.1.0
@@ -16,7 +21,11 @@ require (
1621
cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6
1722
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
1823
cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
24+
<<<<<<< HEAD
1925
cosmossdk.io/x/tx v1.0.0-alpha.2 // main
26+
=======
27+
cosmossdk.io/x/tx v1.0.0-alpha.2
28+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
2029
github.com/99designs/keyring v1.2.2
2130
github.com/bgentry/speakeasy v0.2.0
2231
github.com/cometbft/cometbft v1.0.0-rc2.0.20241127125717-4ce33b646ac9
@@ -184,10 +193,14 @@ require (
184193
// )
185194
// TODO remove after all modules have their own go.mods
186195
replace (
196+
<<<<<<< HEAD
187197
// pseudo version lower than the latest tag
188198
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20241127063259-f296a5005ce8 // main
189199
// pseudo version lower than the latest tag
190200
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20241204123127-eb3bf8b0469d // main
201+
=======
202+
cosmossdk.io/store => ./store
203+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
191204
cosmossdk.io/x/bank => ./x/bank
192205
cosmossdk.io/x/staking => ./x/staking
193206
)

‎go.sum‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@ buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.2-20240130113600-88e
44
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.2-20240130113600-88ef6483f90f.1/go.mod h1:17Ax38yd8pg56din4ecwSDBRCSX0qLcif5Cdf8ayto4=
55
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
66
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
7+
<<<<<<< HEAD
78
cosmossdk.io/api v0.7.3-0.20241127063259-f296a5005ce8 h1:KCi0Wq5M0JST0I01HebEDHt7//tZMx2bW4tmlc4IRnI=
89
cosmossdk.io/api v0.7.3-0.20241127063259-f296a5005ce8/go.mod h1:vZy0Ev95gwANXt5ssiDui4L5nlMYO5bzqR77hCjIz9s=
910
cosmossdk.io/collections v0.4.1-0.20241209183624-332d0b106d1b h1:smupoVhpdK+5pztIylyIGkCc+0QaAaGLEvnM7Wnrq18=
1011
cosmossdk.io/collections v0.4.1-0.20241209183624-332d0b106d1b/go.mod h1:uf12i1yKvzEIHt2ok7poNqFDQTb71O00RQLitSynmrg=
12+
=======
13+
cosmossdk.io/api v0.8.0-rc.2 h1:7DQjVnYz7sTy47bZMzahfOANbhxLmPtgQvvru9kA2R0=
14+
cosmossdk.io/api v0.8.0-rc.2/go.mod h1:edvI8tMINqCH75EgkOEMnCZEQ3iKJgOlZ+ZxOu4gmXU=
15+
cosmossdk.io/collections v0.4.1-0.20241128094659-bd76b47e1d8b h1:MgU4EDOo/pXgepHCUFQFnIfUCxk/JO0AJGDTUQhhEhg=
16+
cosmossdk.io/collections v0.4.1-0.20241128094659-bd76b47e1d8b/go.mod h1:uf12i1yKvzEIHt2ok7poNqFDQTb71O00RQLitSynmrg=
17+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
1118
cosmossdk.io/core v1.0.0-alpha.6 h1:5ukC4JcQKmemLQXcAgu/QoOvJI50hpBkIIg4ZT2EN8E=
1219
cosmossdk.io/core v1.0.0-alpha.6/go.mod h1:3u9cWq1FAVtiiCrDPpo4LhR+9V6k/ycSG4/Y/tREWCY=
1320
cosmossdk.io/core/testing v0.0.0-20241108153815-606544c7be7e h1:F+ScucYxwrrDJU8guJXQXpGhdpziYSbxW6HMP2wCNxs=
@@ -22,8 +29,11 @@ cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
2229
cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
2330
cosmossdk.io/schema v0.4.0 h1:TrBs5BUnGqniAwEBVsjiisrAk3h3DK/zHLU1O8fRnO0=
2431
cosmossdk.io/schema v0.4.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
32+
<<<<<<< HEAD
2533
cosmossdk.io/store v1.0.0-rc.0.0.20241204123127-eb3bf8b0469d h1:KQM4Q6kjwlM4HuDZRV8/ZDXX3whjfStndYNTsRrbboQ=
2634
cosmossdk.io/store v1.0.0-rc.0.0.20241204123127-eb3bf8b0469d/go.mod h1:oZBBY4BrkYnghr6MFL0MP5mGqpkPedHcWkXwXddd6tU=
35+
=======
36+
>>>>>>> 570585090 (chore: sync changelog to main + clean-up replaces (#22846))
2737
cosmossdk.io/x/tx v1.0.0-alpha.2 h1:UW80FMm7B0fiAMsrfe5+HabSJ3XBg+tQa6/GK9prqWk=
2838
cosmossdk.io/x/tx v1.0.0-alpha.2/go.mod h1:r4yTKSJ7ZCCR95YbBfY3nfvbgNw6m9F6f25efWYYQWo=
2939
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=

‎runtime/v2/go.mod‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
module cosmossdk.io/runtime/v2
2+
3+
go 1.23
4+
5+
// server v2 integration
6+
replace (
7+
cosmossdk.io/core/testing => ../../core/testing
8+
cosmossdk.io/server/v2/appmanager => ../../server/v2/appmanager
9+
cosmossdk.io/server/v2/stf => ../../server/v2/stf
10+
cosmossdk.io/store/v2 => ../../store/v2
11+
)
12+
13+
require (
14+
cosmossdk.io/api v0.8.0-rc.1
15+
cosmossdk.io/core v1.0.0-alpha.6
16+
cosmossdk.io/depinject v1.1.0
17+
cosmossdk.io/log v1.5.0
18+
cosmossdk.io/schema v0.4.0
19+
cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000
20+
cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000
21+
cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000
22+
cosmossdk.io/x/tx v1.0.0-alpha.2
23+
github.com/cosmos/gogoproto v1.7.0
24+
github.com/stretchr/testify v1.10.0
25+
google.golang.org/grpc v1.68.1
26+
google.golang.org/protobuf v1.35.2
27+
)
28+
29+
require (
30+
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.35.2-20241120201313-68e42a58b301.1 // indirect
31+
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.2-20240130113600-88ef6483f90f.1 // indirect
32+
cosmossdk.io/core/testing v0.0.0 // indirect
33+
cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect
34+
github.com/DataDog/zstd v1.5.5 // indirect
35+
github.com/beorn7/perks v1.0.1 // indirect
36+
github.com/bytedance/sonic v1.12.4 // indirect
37+
github.com/bytedance/sonic/loader v0.2.1 // indirect
38+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
39+
github.com/cloudwego/base64x v0.1.4 // indirect
40+
github.com/cloudwego/iasm v0.2.0 // indirect
41+
github.com/cockroachdb/errors v1.11.1 // indirect
42+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
43+
github.com/cockroachdb/pebble v1.1.0 // indirect
44+
github.com/cockroachdb/redact v1.1.5 // indirect
45+
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
46+
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
47+
github.com/cosmos/iavl v1.3.1 // indirect
48+
github.com/cosmos/ics23/go v0.11.0 // indirect
49+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
50+
github.com/emicklei/dot v1.6.2 // indirect
51+
github.com/getsentry/sentry-go v0.27.0 // indirect
52+
github.com/gogo/protobuf v1.3.2 // indirect
53+
github.com/golang/snappy v0.0.4 // indirect
54+
github.com/google/btree v1.1.3 // indirect
55+
github.com/google/go-cmp v0.6.0 // indirect
56+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
57+
github.com/hashicorp/go-metrics v0.5.3 // indirect
58+
github.com/hashicorp/golang-lru v1.0.2 // indirect
59+
github.com/klauspost/compress v1.17.9 // indirect
60+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
61+
github.com/kr/pretty v0.3.1 // indirect
62+
github.com/kr/text v0.2.0 // indirect
63+
github.com/linxGnu/grocksdb v1.9.3 // indirect
64+
github.com/mattn/go-colorable v0.1.13 // indirect
65+
github.com/mattn/go-isatty v0.0.20 // indirect
66+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
67+
github.com/onsi/gomega v1.28.1 // indirect
68+
github.com/pkg/errors v0.9.1 // indirect
69+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
70+
github.com/prometheus/client_golang v1.20.5 // indirect
71+
github.com/prometheus/client_model v0.6.1 // indirect
72+
github.com/prometheus/common v0.61.0 // indirect
73+
github.com/prometheus/procfs v0.15.1 // indirect
74+
github.com/rogpeppe/go-internal v1.12.0 // indirect
75+
github.com/rs/zerolog v1.33.0 // indirect
76+
github.com/spf13/cast v1.7.0 // indirect
77+
github.com/stretchr/objx v0.5.2 // indirect
78+
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
79+
github.com/tendermint/go-amino v0.16.0 // indirect
80+
github.com/tidwall/btree v1.7.0 // indirect
81+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
82+
golang.org/x/arch v0.12.0 // indirect
83+
golang.org/x/crypto v0.31.0 // indirect
84+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
85+
golang.org/x/net v0.32.0 // indirect
86+
golang.org/x/sync v0.10.0 // indirect
87+
golang.org/x/sys v0.28.0 // indirect
88+
golang.org/x/text v0.21.0 // indirect
89+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
90+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
91+
gopkg.in/yaml.v3 v3.0.1 // indirect
92+
sigs.k8s.io/yaml v1.4.0 // indirect
93+
)

0 commit comments

Comments
 (0)