Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ibc-go v5: cosmos-sdk 46 #1653

Merged
merged 88 commits into from Aug 1, 2022
Merged
Show file tree
Hide file tree
Changes from 74 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
800d530
begin changes needed for "real 46"
faddat Jul 5, 2022
0f64e06
46 updates
faddat Jul 5, 2022
8867120
46 updates
faddat Jul 5, 2022
30f7946
Delete .gitpod.yml
faddat Jul 5, 2022
0c77eab
46 updates
faddat Jul 5, 2022
1e79e0b
46 updates
faddat Jul 5, 2022
185adee
Update genesis_test.go
faddat Jul 5, 2022
11d96cb
update tests
faddat Jul 5, 2022
bdf7cc3
Merge branch 'real-46-branch' of https://github.com/notional-labs/ibc…
faddat Jul 5, 2022
ab06157
bring back the client client
faddat Jul 5, 2022
6704daf
fumpt
faddat Jul 5, 2022
42c1eac
genesis with val set
vuong177 Jul 5, 2022
78689e1
fix TestRandomizedGenState
nghuyenthevinh2000 Jul 5, 2022
32fa306
Merge branch 'main' into real-46-branch
faddat Jul 5, 2022
e300204
Merge branch 'main' into real-46-branch
faddat Jul 7, 2022
8e4f87e
use cosmos-sdk v0.46.0-rc2
faddat Jul 7, 2022
4b579fa
Merge branch 'main' into real-46-branch
faddat Jul 9, 2022
93cd207
Revert "Merge branch 'main' into real-46-branch"
faddat Jul 14, 2022
11e336c
Merge remote-tracking branch 'upstream/main' into real-46-branch
faddat Jul 16, 2022
b0b34cf
goimports
faddat Jul 16, 2022
ee64d56
fumpt
faddat Jul 16, 2022
06b8deb
Update testing/simapp/app.go
faddat Jul 19, 2022
8c2c541
Merge branch 'main' into real-46-branch
faddat Jul 19, 2022
df546ed
Update testing/simapp/simd/cmd/genaccounts.go
faddat Jul 19, 2022
eff83e2
make format
faddat Jul 19, 2022
626480f
tidy
faddat Jul 19, 2022
496a7f3
change import path
faddat Jul 19, 2022
d6ee5c9
remove gitpod artifact
faddat Jul 19, 2022
1f290e0
sdk.Int -> math.Int
faddat Jul 19, 2022
cf0997e
group sdk and tendermint imports
faddat Jul 19, 2022
869043d
Organize Governance Proposal Handlers
faddat Jul 19, 2022
802b1bc
Remove Extra line in msgs_test.go
faddat Jul 19, 2022
232cbb6
use test.yml from main branch
faddat Jul 19, 2022
1281e74
fix fee module ibc middleware
faddat Jul 19, 2022
8769f22
remove sdk_test.go and use Carlos' branch's antehandler
faddat Jul 20, 2022
2caf65f
various fixes
faddat Jul 20, 2022
8dc9b01
fix assignment to addr
faddat Jul 20, 2022
9f95dd5
revert change in misbehaviour_handle.go
vuong177 Jul 20, 2022
0c3b31f
Merge branch 'main' into real-46-branch
faddat Jul 20, 2022
6a063fe
e2e go.mod
faddat Jul 20, 2022
21cf683
e2e v4 module path
faddat Jul 20, 2022
55b166b
Merge branch 'main' into real-46-branch
faddat Jul 20, 2022
4bd8fdb
Merge branch 'main' into real-46-branch
faddat Jul 21, 2022
859eae7
Merge branch 'main' into real-46-branch
faddat Jul 21, 2022
374e043
fix import paths
faddat Jul 21, 2022
33be3d6
Merge branch 'main' into real-46-branch
faddat Jul 21, 2022
9441c40
Merge branch 'main' into real-46-branch
faddat Jul 22, 2022
d0ae698
goimports and gofumpt
faddat Jul 22, 2022
eb12e81
Merge branch 'main' into real-46-branch
faddat Jul 22, 2022
8afece8
Merge branch 'main' into real-46-branch
faddat Jul 26, 2022
4951539
Merge branch 'main' into real-46-branch
faddat Jul 26, 2022
2233d7b
46 final release
faddat Jul 26, 2022
a2d6e01
fix makefile
faddat Jul 26, 2022
e09af23
update proto file to v5
vuong177 Jul 26, 2022
0eb3fc0
Merge remote-tracking branch 'upstream/main' into real-46-branch
faddat Jul 27, 2022
771e422
Merge remote-tracking branch 'upstream/main' into real-46-branch
faddat Jul 27, 2022
0a11156
temp gitpod for protos
faddat Jul 27, 2022
8f3943d
work on protos
faddat Jul 27, 2022
92061fc
Merge remote-tracking branch 'upstream/main' into real-46-branch
faddat Jul 27, 2022
a6e2ce3
tidy
faddat Jul 27, 2022
272b708
Delete .gitpod.yml
faddat Jul 27, 2022
6f2e6df
Merge branch 'main' into real-46-branch
faddat Jul 28, 2022
cf43ee0
Merge remote-tracking branch 'upstream/main' into real-46-branch
faddat Jul 28, 2022
527d656
finish merge
faddat Jul 28, 2022
cbebf62
Merge branch 'main' into real-46-branch
faddat Jul 28, 2022
89e53d2
apply review suggestions, fix imports
colin-axner Jul 28, 2022
76ee58d
remove incorrect e2e import path
colin-axner Jul 28, 2022
2201809
fix incorrect import moving
colin-axner Jul 28, 2022
c4ca865
Merge pull request #75 from cosmos/colin/review-suggestions
faddat Jul 28, 2022
040aca9
Merge branch 'main' into real-46-branch
faddat Jul 28, 2022
acff013
refactor acknowledgement construction for SDK 0.46
Jul 28, 2022
ad9241a
Merge branch 'main' into real-46-branch
catShaark Jul 28, 2022
e31ec28
Merge pull request #76 from crodriguezvega/carlos/refactor-acknowledg…
faddat Jul 28, 2022
db99001
46 upgrade
faddat Jul 28, 2022
148c020
fix ics27 changes, import fixes
colin-axner Jul 28, 2022
9bc1af7
Merge branch 'main' into real-46-branch
faddat Jul 28, 2022
d0b020b
Merge pull request #77 from cosmos/colin/self-review
faddat Jul 28, 2022
993ce8b
re add ibcclient proposal route
catShaark Jul 28, 2022
f300949
Merge branch 'main' into real-46-branch
catShaark Jul 28, 2022
d36576c
Merge branch 'main' into real-46-branch
catShaark Jul 29, 2022
053141f
fix for make proto-all
Jul 30, 2022
7728fa1
Merge branch 'main' into real-46-branch
faddat Jul 30, 2022
70ee541
Merge pull request #79 from crodriguezvega/carlos/proto-fix
faddat Jul 30, 2022
d48007f
now both commands work, together!
faddat Jul 30, 2022
08f60a0
tidy
faddat Jul 30, 2022
171a81e
update swagger docs
faddat Aug 1, 2022
d11a462
appease codeql
faddat Aug 1, 2022
9af421e
update CONFIO_URL
faddat Aug 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
@@ -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
6 changes: 3 additions & 3 deletions Makefile
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/014bd93b66bb57e5f250be0c9a344505f7d0fa70
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there release version of confio/ics23 that we can use here?
I think it would best to avoid using a commit hash

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like 0.7.1 is the latest stable tag https://github.com/confio/ics23/tags

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sadly, it didn't work -- the correct release though, is v0.7.1

(no clue why it wouldn't work)

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 Down
8 changes: 4 additions & 4 deletions docs/apps/interchain-accounts/auth-modules.md
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
1 change: 0 additions & 1 deletion e2e/fee_middleware_test.go
Expand Up @@ -8,7 +8,6 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/strangelove-ventures/ibctest/broadcast"
"github.com/strangelove-ventures/ibctest/chain/cosmos"

"github.com/strangelove-ventures/ibctest/ibc"
"github.com/strangelove-ventures/ibctest/test"
"github.com/stretchr/testify/suite"
Expand Down
101 changes: 61 additions & 40 deletions go.mod
Expand Up @@ -5,9 +5,10 @@ module github.com/cosmos/ibc-go/v5
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

require (
cosmossdk.io/math v1.0.0-beta.2
github.com/armon/go-metrics v0.4.0
github.com/confio/ics23/go v0.7.0
github.com/cosmos/cosmos-sdk v0.45.6
github.com/cosmos/cosmos-sdk v0.46.0
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
github.com/gorilla/mux v1.8.0
Expand All @@ -18,95 +19,105 @@ require (
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.12.0
github.com/stretchr/testify v1.8.0
github.com/tendermint/tendermint v0.34.19
github.com/tendermint/tm-db v0.6.6
github.com/tendermint/tendermint v0.34.20
github.com/tendermint/tm-db v0.6.7
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd
google.golang.org/grpc v1.48.0
google.golang.org/protobuf v1.28.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/btcsuite/btcd v0.22.1 // indirect
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/lib/pq v1.10.6 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/common v0.34.0 // indirect
github.com/subosito/gotenv v1.4.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
)
require github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 // indirect

require (
filippo.io/edwards25519 v1.0.0-beta.2 // indirect
github.com/99designs/keyring v1.1.6 // indirect
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go/compute v1.6.1 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
cloud.google.com/go/storage v1.14.0 // indirect
cosmossdk.io/errors v1.0.0-beta.7 // indirect
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.1 // indirect
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/Workiva/go-datastructures v1.0.53 // indirect
github.com/aws/aws-sdk-go v1.40.45 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/btcsuite/btcd v0.22.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
github.com/cosmos/btcutil v1.0.4 // indirect
github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/iavl v0.17.3 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v0.19.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
github.com/cosmos/ledger-go v0.9.2 // indirect
github.com/danieljoos/wincred v1.0.2 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
github.com/dgraph-io/ristretto v0.0.3 // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/gin-gonic/gin v1.7.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/gateway v1.1.0 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/orderedcode v0.0.1 // indirect
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.6.1 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.4.0 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect
github.com/improbable-eng/grpc-web v0.14.1 // indirect
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/lib/pq v1.10.6 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.34.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/rs/cors v1.8.2 // indirect
Expand All @@ -115,15 +126,25 @@ require (
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
github.com/subosito/gotenv v1.4.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tendermint/btcd v0.1.1 // indirect
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/zondax/hid v0.9.0 // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/text v0.3.7 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
google.golang.org/api v0.81.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.6 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)