Skip to content

Commit

Permalink
ibc-go v5: cosmos-sdk 46 (#1653)
Browse files Browse the repository at this point in the history
* begin changes needed for "real 46"

* 46 updates

* 46 updates

* Delete .gitpod.yml

* 46 updates

* 46 updates

* Update genesis_test.go

* update tests

* bring back the client client

* fumpt

* genesis with val set

* fix TestRandomizedGenState

* use cosmos-sdk v0.46.0-rc2

* Revert "Merge branch 'main' into real-46-branch"

This reverts commit 4b579fa, reversing
changes made to 8e4f87e.

* goimports

* fumpt

* Update testing/simapp/app.go

Co-authored-by: Carlos Rodriguez <[email protected]>

* Update testing/simapp/simd/cmd/genaccounts.go

Co-authored-by: Carlos Rodriguez <[email protected]>

* make format

* tidy

* change import path

* remove gitpod artifact

* sdk.Int -> math.Int

* group sdk and tendermint imports

* Organize Governance Proposal Handlers

* Remove Extra line in msgs_test.go

* use test.yml from main branch

* fix fee module ibc middleware

* remove sdk_test.go and use Carlos' branch's antehandler

* various fixes

* fix assignment to addr

* revert change in misbehaviour_handle.go

* e2e go.mod

* e2e v4 module path

* fix import paths

* goimports and gofumpt

* 46 final release

* fix makefile

* update proto file to v5

* temp gitpod for protos

* work on protos

* tidy

* Delete .gitpod.yml

* finish merge

* apply review suggestions, fix imports

Fix import formatting
Change e2e import path
Remove usage of time.Now()

* remove incorrect e2e import path

* fix incorrect import moving

* refactor acknowledgement construction for SDK 0.46

* 46 upgrade

* fix ics27 changes, import fixes

* re add ibcclient proposal route

* fix for make proto-all

* now both commands work, together!

* tidy

* update swagger docs

* appease codeql

* update CONFIO_URL

Co-authored-by: vuong <[email protected]>
Co-authored-by: nghuyenthevinh2000 <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: Colin Axnér <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: khanh <[email protected]>
Co-authored-by: catShaark <[email protected]>
  • Loading branch information
8 people authored Aug 1, 2022
1 parent 6b4aa9a commit 0410963
Show file tree
Hide file tree
Showing 71 changed files with 1,402 additions and 505 deletions.
9 changes: 9 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This configuration file was automatically generated by Gitpod.
# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
# and commit this file to your remote git repository to share the goodness with others.

tasks:
- init: go get && go build ./... && go test ./... && make
command: go run


2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
tests: false
# # timeout for analysis, e.g. 30s, 5m, default is 1m
# # timeout for analysis, e.g. 30s, 5m, default is 1m
timeout: 5m

linters:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,10 @@ proto-lint:
proto-check-breaking:
@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main

TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.19/proto/tendermint
TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.20/proto/tendermint
GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/v0.6.3
SDK_PROTO_URL = https://raw.githubusercontent.com/cosmos/cosmos-sdk/v0.45.6/proto/cosmos
CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/v0.7.1
SDK_PROTO_URL = https://raw.githubusercontent.com/cosmos/cosmos-sdk/v0.46.0/proto/cosmos

TM_CRYPTO_TYPES = third_party/proto/tendermint/crypto
TM_ABCI_TYPES = third_party/proto/tendermint/abci
Expand All @@ -424,7 +424,7 @@ SDK_BASE = third_party/proto/cosmos/base/v1beta1
SDK_UPGRADE = third_party/proto/cosmos/upgrade

GOGO_PROTO_TYPES = third_party/proto/gogoproto
CONFIO_TYPES = third_party/proto/confio
CONFIO_TYPES = third_party/proto

proto-update-deps:
@mkdir -p $(GOGO_PROTO_TYPES)
Expand Down
8 changes: 4 additions & 4 deletions docs/apps/interchain-accounts/auth-modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ if err := proto.Unmarshal(ack.GetResult(), txMsgData); err != nil {
}
```

If the txMsgData.Data field is non nil, the host chain is using SDK version <= v0.45.
The auth module should interpret the txMsgData.Data as follows:
If the `txMsgData.Data` field is non nil, the host chain is using SDK version <= v0.45.
The auth module should interpret the `txMsgData.Data` as follows:

```go
switch len(txMsgData.Data) {
Expand Down Expand Up @@ -337,8 +337,8 @@ default:
}
```

If the txMsgData.Data is empty, the host chain is using SDK version > v0.45.
The auth module should interpret the txMsgData.Responses as follows:
If the `txMsgData.Data` is empty, the host chain is using SDK version > v0.45.
The auth module should interpret the `txMsgData.Responses` as follows:

```go
...
Expand Down
Loading

0 comments on commit 0410963

Please sign in to comment.