Skip to content

Commit 016843f

Browse files
the-freyfaddat
andauthored
Integrate wasmd 0.29.0-rc0 (CosmosContracts#279)
* Integrate latest wasmd rc * Bump all contract CI versions * Stop linter failing because it doesn't understand GH actions syntax Co-authored-by: Jacob Gadikian <[email protected]>
1 parent 9480914 commit 016843f

File tree

8 files changed

+90
-82
lines changed

8 files changed

+90
-82
lines changed

.github/workflows/gov_deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Gov Contract CI - Deploy
23

34
on:
@@ -18,7 +19,7 @@ jobs:
1819
uses: actions/checkout@v3
1920
with:
2021
repository: 'CosmosContracts/cw-unity-prop'
21-
ref: 'v0.3.2'
22+
ref: 'v0.3.3'
2223
- name: Test gov deploy
2324
run: |
2425
chmod a+x ./scripts/deploy_ci.sh

.github/workflows/gov_submit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Gov Contract CI - Submit Contract Prop
23

34
on:
@@ -18,7 +19,7 @@ jobs:
1819
uses: actions/checkout@v3
1920
with:
2021
repository: 'CosmosContracts/cw-unity-prop'
21-
ref: 'v0.3.2'
22+
ref: 'v0.3.3'
2223
- name: Test smart contract gov prop
2324
run: |
2425
chmod a+x ./scripts/submit_gov_ci.sh

.github/workflows/integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Contract CI
23

34
on:
@@ -18,7 +19,7 @@ jobs:
1819
uses: actions/checkout@v3
1920
with:
2021
repository: 'envoylabs/whoami'
21-
ref: 'v0.5.6'
22+
ref: 'v0.7.0'
2223
- name: Run deploy script
2324
run: |
2425
chmod a+x ./scripts/deploy_ci.sh

.github/workflows/superlinter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
env:
2121
VALIDATE_ALL_CODEBASE: false
2222
VALIDATE_GO: false
23+
VALIDATE_GITHUB_ACTIONS: false
2324
IGNORE_GENERATED_FILES: true
2425
FILTER_REGEX_EXCLUDE: .*.pb.go
2526
DEFAULT_BRANCH: "main"

app/ante.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"github.com/cosmos/cosmos-sdk/x/auth/ante"
88
"github.com/cosmos/cosmos-sdk/x/authz"
99
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
10-
ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
11-
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
10+
ibcante "github.com/cosmos/ibc-go/v3/modules/core/ante"
11+
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
1212

1313
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
1414
wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"

app/app.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,29 @@ import (
8484
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
8585
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
8686
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
87-
transfer "github.com/cosmos/ibc-go/v4/modules/apps/transfer"
88-
ibctransferkeeper "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper"
89-
ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
90-
ibc "github.com/cosmos/ibc-go/v4/modules/core"
91-
ibcclient "github.com/cosmos/ibc-go/v4/modules/core/02-client"
92-
ibcclientclient "github.com/cosmos/ibc-go/v4/modules/core/02-client/client"
93-
ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
94-
porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
95-
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
96-
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
87+
transfer "github.com/cosmos/ibc-go/v3/modules/apps/transfer"
88+
ibctransferkeeper "github.com/cosmos/ibc-go/v3/modules/apps/transfer/keeper"
89+
ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
90+
ibc "github.com/cosmos/ibc-go/v3/modules/core"
91+
ibcclient "github.com/cosmos/ibc-go/v3/modules/core/02-client"
92+
ibcclientclient "github.com/cosmos/ibc-go/v3/modules/core/02-client/client"
93+
ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
94+
porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
95+
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
96+
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
9797
tmjson "github.com/tendermint/tendermint/libs/json"
9898

9999
"github.com/CosmWasm/wasmd/x/wasm"
100100
wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
101101
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
102102
"github.com/prometheus/client_golang/prometheus"
103103

104-
ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
105-
icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
106-
icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host"
107-
icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper"
108-
icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
109-
icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types"
104+
ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts"
105+
icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"
106+
icahost "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host"
107+
icahostkeeper "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/keeper"
108+
icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"
109+
icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"
110110

111111
encparams "github.com/CosmosContracts/juno/v10/app/params"
112112
)

go.mod

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/CosmosContracts/juno/v10
33
go 1.18
44

55
require (
6-
github.com/CosmWasm/wasmd v0.28.1-0.20220825115153-261812986e9a
6+
github.com/CosmWasm/wasmd v0.29.0-rc0
77
github.com/cosmos/cosmos-sdk v0.45.8
8-
github.com/cosmos/ibc-go/v4 v4.0.0
8+
github.com/cosmos/ibc-go/v3 v3.2.0
99
github.com/gogo/protobuf v1.3.3
1010
github.com/golang/protobuf v1.5.2
1111
github.com/gorilla/mux v1.8.0
@@ -24,10 +24,10 @@ require (
2424

2525
require (
2626
filippo.io/edwards25519 v1.0.0-beta.2 // indirect
27-
github.com/99designs/keyring v1.1.6 // indirect
27+
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
28+
github.com/99designs/keyring v1.2.1 // indirect
2829
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
29-
github.com/CosmWasm/wasmvm v1.0.0 // indirect
30-
github.com/DataDog/zstd v1.4.5 // indirect
30+
github.com/CosmWasm/wasmvm v1.1.0 // indirect
3131
github.com/Workiva/go-datastructures v1.0.53 // indirect
3232
github.com/armon/go-metrics v0.4.0 // indirect
3333
github.com/beorn7/perks v1.0.1 // indirect
@@ -44,23 +44,24 @@ require (
4444
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
4545
github.com/cosmos/ledger-go v0.9.3 // indirect
4646
github.com/creachadair/taskgroup v0.3.2 // indirect
47-
github.com/danieljoos/wincred v1.0.2 // indirect
47+
github.com/danieljoos/wincred v1.1.2 // indirect
4848
github.com/davecgh/go-spew v1.1.1 // indirect
4949
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
50-
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
51-
github.com/dgraph-io/ristretto v0.0.3 // indirect
50+
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
51+
github.com/dgraph-io/ristretto v0.1.0 // indirect
5252
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
5353
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
54-
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
54+
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
5555
github.com/felixge/httpsnoop v1.0.1 // indirect
5656
github.com/fsnotify/fsnotify v1.5.4 // indirect
5757
github.com/go-kit/kit v0.12.0 // indirect
5858
github.com/go-kit/log v0.2.1 // indirect
5959
github.com/go-logfmt/logfmt v0.5.1 // indirect
6060
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
6161
github.com/gogo/gateway v1.1.0 // indirect
62-
github.com/golang/snappy v0.0.3 // indirect
63-
github.com/google/btree v1.0.0 // indirect
62+
github.com/golang/glog v1.0.0 // indirect
63+
github.com/golang/snappy v0.0.4 // indirect
64+
github.com/google/btree v1.1.2 // indirect
6465
github.com/google/gofuzz v1.2.0 // indirect
6566
github.com/google/orderedcode v0.0.1 // indirect
6667
github.com/gorilla/handlers v1.5.1 // indirect
@@ -76,7 +77,6 @@ require (
7677
github.com/improbable-eng/grpc-web v0.14.1 // indirect
7778
github.com/inconshreveable/mousetrap v1.0.0 // indirect
7879
github.com/jmhodges/levigo v1.0.0 // indirect
79-
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
8080
github.com/klauspost/compress v1.15.9 // indirect
8181
github.com/lib/pq v1.10.6 // indirect
8282
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
@@ -86,11 +86,10 @@ require (
8686
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
8787
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
8888
github.com/minio/highwayhash v1.0.2 // indirect
89-
github.com/mitchellh/go-homedir v1.1.0 // indirect
9089
github.com/mitchellh/mapstructure v1.5.0 // indirect
9190
github.com/mtibben/percent v0.2.1 // indirect
9291
github.com/pelletier/go-toml v1.9.5 // indirect
93-
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
92+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
9493
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
9594
github.com/pkg/errors v0.9.1 // indirect
9695
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -106,28 +105,27 @@ require (
106105
github.com/spf13/afero v1.8.2 // indirect
107106
github.com/spf13/jwalterweatherman v1.1.0 // indirect
108107
github.com/spf13/pflag v1.0.5 // indirect
109-
github.com/spf13/viper v1.12.0 // indirect
110-
github.com/subosito/gotenv v1.4.0 // indirect
108+
github.com/spf13/viper v1.13.0 // indirect
109+
github.com/subosito/gotenv v1.4.1 // indirect
111110
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
112111
github.com/tendermint/btcd v0.1.1 // indirect
113112
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
114113
github.com/tendermint/go-amino v0.16.0 // indirect
115114
github.com/zondax/hid v0.9.0 // indirect
116115
go.etcd.io/bbolt v1.3.6 // indirect
117-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
116+
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
118117
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
119-
golang.org/x/net v0.0.0-20220726230323-06994584191e // indirect
120-
golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 // indirect
118+
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
119+
golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
121120
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
122121
golang.org/x/text v0.3.7 // indirect
123122
google.golang.org/protobuf v1.28.1 // indirect
124-
gopkg.in/ini.v1 v1.66.6 // indirect
123+
gopkg.in/ini.v1 v1.67.0 // indirect
125124
gopkg.in/yaml.v3 v3.0.1 // indirect
126125
nhooyr.io/websocket v1.8.6 // indirect
127126
)
128127

129128
replace (
130-
github.com/CosmWasm/wasmd => github.com/notional-labs/wasmd v0.25.1-0.20220825221754-0f7229d64633
131129
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
132130
google.golang.org/grpc => google.golang.org/grpc v1.33.2
133131
)

0 commit comments

Comments
 (0)