Skip to content

Commit 7fb65c7

Browse files
deps: bump SDK v0.47 (backport #3295) (#3301)
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
1 parent 4c1bd19 commit 7fb65c7

File tree

14 files changed

+113
-81
lines changed

14 files changed

+113
-81
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ write a little note why.
4343

4444
- [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting)).
4545
- [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
46-
- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md) and [Go style guide](../docs/dev/go-style-guide.md).
46+
- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/11-structure.md) and [Go style guide](../docs/dev/go-style-guide.md).
4747
- [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing).
4848
- [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`).
4949
- [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code).

CHANGELOG.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
120120

121121
### Bug Fixes
122122

123+
* (testing) [\#3295](https://github.com/cosmos/ibc-go/pull/3295) The function `SetupWithGenesisValSet` will set the baseapp chainID before running `InitChain`
123124
* (light-clients/solomachine) [#1839](https://github.com/cosmos/ibc-go/pull/1839) Fixed usage of the new diversifier in validation of changing diversifiers for the solo machine. The current diversifier must sign over the new diversifier.
124125
* (light-clients/07-tendermint) [\#1674](https://github.com/cosmos/ibc-go/pull/1674) Submitted ClientState is zeroed out before checking the proof in order to prevent the proposal from containing information governance is not actually voting on.
125126
* (modules/core/02-client)[\#1676](https://github.com/cosmos/ibc-go/pull/1676) ClientState must be zeroed out for `UpgradeProposals` to pass validation. This prevents a proposal containing information governance is not actually voting on.
@@ -166,13 +167,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
166167

167168
### State Machine Breaking
168169

169-
<<<<<<< HEAD
170-
* (apps/transfer) [\#2651](https://github.com/cosmos/ibc-go/pull/2651) Introduce `mustProtoMarshalJSON` for ics20 packet data marshalling which will skip emission (marshalling) of the memo field if unpopulated (empty).
171-
* (27-interchain-accounts) [\#2580](https://github.com/cosmos/ibc-go/issues/2580) Removing port prefix requirement from the ICA host channel handshake
172-
=======
173170
* (apps/transfer) [\#2651](https://github.com/cosmos/ibc-go/pull/2651) Introduce `mustProtoMarshalJSON` for ics20 packet data marshalling which will skip emission (marshalling) of the memo field if unpopulated (empty).
174171
* (27-interchain-accounts) [\#2590](https://github.com/cosmos/ibc-go/pull/2590) Removing port prefix requirement from the ICA host channel handshake
175-
>>>>>>> ca111395 (chore: update changelog (#3258))
176172
* (transfer) [\#2377](https://github.com/cosmos/ibc-go/pull/2377) Adding `sequence` to `MsgTransferResponse`.
177173
* (light-clients/07-tendermint) [\#2555](https://github.com/cosmos/ibc-go/pull/2555) Forbid negative values for `TrustingPeriod`, `UnbondingPeriod` and `MaxClockDrift` (as specified in ICS-07).
178174
* (core/04-channel) [#2973](https://github.com/cosmos/ibc-go/pull/2973) Write channel state before invoking app callbacks in ack and confirm channel handshake steps.
@@ -319,13 +315,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
319315

320316
### State Machine Breaking
321317

322-
<<<<<<< HEAD
323-
* (apps/transfer) [\#2651](https://github.com/cosmos/ibc-go/pull/2651) Introduce `mustProtoMarshalJSON` for ics20 packet data marshalling which will skip emission (marshalling) of the memo field if unpopulated (empty).
324-
* (27-interchain-accounts) [\#2580](https://github.com/cosmos/ibc-go/issues/2580) Removing port prefix requirement from the ICA host channel handshake
325-
=======
326318
* (apps/transfer) [\#2651](https://github.com/cosmos/ibc-go/pull/2651) Introduce `mustProtoMarshalJSON` for ics20 packet data marshalling which will skip emission (marshalling) of the memo field if unpopulated (empty).
327319
* (27-interchain-accounts) [\#2590](https://github.com/cosmos/ibc-go/pull/2590) Removing port prefix requirement from the ICA host channel handshake
328-
>>>>>>> ca111395 (chore: update changelog (#3258))
329320
* (transfer) [\#2377](https://github.com/cosmos/ibc-go/pull/2377) Adding `sequence` to `MsgTransferResponse`.
330321

331322
### Features
@@ -427,13 +418,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
427418

428419
### State Machine Breaking
429420

430-
<<<<<<< HEAD
431-
* (apps/transfer) [\#2651](https://github.com/cosmos/ibc-go/pull/2651) Introduce `mustProtoMarshalJSON` for ics20 packet data marshalling which will skip emission (marshalling) of the memo field if unpopulated (empty).
432-
* (27-interchain-accounts) [\#2580](https://github.com/cosmos/ibc-go/issues/2580) Removing port prefix requirement from the ICA host channel handshake
433-
=======
434421
* (apps/transfer) [\#2651](https://github.com/cosmos/ibc-go/pull/2651) Introduce `mustProtoMarshalJSON` for ics20 packet data marshalling which will skip emission (marshalling) of the memo field if unpopulated (empty).
435422
* (27-interchain-accounts) [\#2590](https://github.com/cosmos/ibc-go/pull/2590) Removing port prefix requirement from the ICA host channel handshake
436-
>>>>>>> ca111395 (chore: update changelog (#3258))
437423
* (transfer) [\#2377](https://github.com/cosmos/ibc-go/pull/2377) Adding `sequence` to `MsgTransferResponse`.
438424

439425
### Features

docs/dev/project-structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Project structure
22

3-
If you're not familiar with the overall module structure from the SDK modules, please check this [document](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md) as prerequisite reading.
3+
If you're not familiar with the overall module structure from the SDK modules, please check this [document](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/11-structure.md) as prerequisite reading.
44

55
Every Interchain Standard (ICS) has been developed in its own package. The development team separated the IBC TAO (Transport, Authentication, Ordering) ICS specifications from the IBC application level specification. The following sections describe the architecture of the most relevant directories that comprise this repository.
66

docs/ibc/integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func NewApp(...args) *App {
159159
160160
### Module Managers
161161
162-
In order to use IBC, we need to add the new modules to the module `Manager` and to the `SimulationManager` in case your application supports [simulations](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/13-simulator.md).
162+
In order to use IBC, we need to add the new modules to the module `Manager` and to the `SimulationManager` in case your application supports [simulations](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/14-simulator.md).
163163
164164
```go
165165
// app.go

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ module github.com/cosmos/ibc-go/v7
55
require (
66
cosmossdk.io/api v0.3.1
77
cosmossdk.io/errors v1.0.0-beta.7
8-
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4
8+
cosmossdk.io/math v1.0.0-rc.0
99
cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462
1010
cosmossdk.io/tools/rosetta v0.2.1
1111
github.com/armon/go-metrics v0.4.1
1212
github.com/cometbft/cometbft v0.37.0
1313
github.com/cometbft/cometbft-db v0.7.0
1414
github.com/cosmos/cosmos-proto v1.0.0-beta.2
15-
github.com/cosmos/cosmos-sdk v0.47.0-rc3
15+
github.com/cosmos/cosmos-sdk v0.47.0
1616
github.com/cosmos/gogoproto v1.4.6
1717
github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab
18-
github.com/golang/protobuf v1.5.2
18+
github.com/golang/protobuf v1.5.3
1919
github.com/gorilla/mux v1.8.0
2020
github.com/grpc-ecosystem/grpc-gateway v1.16.0
2121
github.com/rakyll/statik v0.1.7
@@ -25,7 +25,7 @@ require (
2525
github.com/stretchr/testify v1.8.2
2626
google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44
2727
google.golang.org/grpc v1.53.0
28-
google.golang.org/protobuf v1.28.2-0.20230208135220-49eaa78c6c9c
28+
google.golang.org/protobuf v1.29.1
2929
gopkg.in/yaml.v2 v2.4.0
3030
)
3131

@@ -56,7 +56,7 @@ require (
5656
github.com/cosmos/btcutil v1.0.5 // indirect
5757
github.com/cosmos/go-bip39 v1.0.0 // indirect
5858
github.com/cosmos/gogogateway v1.2.0 // indirect
59-
github.com/cosmos/iavl v0.20.0-alpha4 // indirect
59+
github.com/cosmos/iavl v0.20.0 // indirect
6060
github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
6161
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
6262
github.com/creachadair/taskgroup v0.4.2 // indirect
@@ -80,7 +80,7 @@ require (
8080
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
8181
github.com/gogo/googleapis v1.4.1 // indirect
8282
github.com/gogo/protobuf v1.3.2 // indirect
83-
github.com/golang/glog v1.0.0 // indirect
83+
github.com/golang/glog v1.1.0 // indirect
8484
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8585
github.com/golang/mock v1.6.0 // indirect
8686
github.com/golang/snappy v0.0.4 // indirect
@@ -110,7 +110,7 @@ require (
110110
github.com/jmespath/go-jmespath v0.4.0 // indirect
111111
github.com/jmhodges/levigo v1.0.0 // indirect
112112
github.com/json-iterator/go v1.1.12 // indirect
113-
github.com/klauspost/compress v1.15.15 // indirect
113+
github.com/klauspost/compress v1.16.3 // indirect
114114
github.com/lib/pq v1.10.7 // indirect
115115
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
116116
github.com/magiconair/properties v1.8.7 // indirect
@@ -147,15 +147,15 @@ require (
147147
github.com/ulikunitz/xz v0.5.11 // indirect
148148
github.com/zondax/hid v0.9.1 // indirect
149149
github.com/zondax/ledger-go v0.14.1 // indirect
150-
go.etcd.io/bbolt v1.3.6 // indirect
150+
go.etcd.io/bbolt v1.3.7 // indirect
151151
go.opencensus.io v0.24.0 // indirect
152-
golang.org/x/crypto v0.6.0 // indirect
153-
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
154-
golang.org/x/net v0.7.0 // indirect
152+
golang.org/x/crypto v0.7.0 // indirect
153+
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect
154+
golang.org/x/net v0.8.0 // indirect
155155
golang.org/x/oauth2 v0.5.0 // indirect
156-
golang.org/x/sys v0.5.0 // indirect
157-
golang.org/x/term v0.5.0 // indirect
158-
golang.org/x/text v0.7.0 // indirect
156+
golang.org/x/sys v0.6.0 // indirect
157+
golang.org/x/term v0.6.0 // indirect
158+
golang.org/x/text v0.8.0 // indirect
159159
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
160160
google.golang.org/api v0.110.0 // indirect
161161
google.golang.org/appengine v1.6.7 // indirect

0 commit comments

Comments
 (0)