Skip to content

Commit fd80169

Browse files
faddatfaddat
authored
Merge pull request CosmosContracts#262 from CosmosContracts/juno-11-rc
Juno v10
2 parents 97a626c + 21ac0eb commit fd80169

File tree

6 files changed

+127
-483
lines changed

6 files changed

+127
-483
lines changed

‎.github/workflows/superlinter.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ jobs:
1919
uses: github/super-linter@v4
2020
env:
2121
VALIDATE_ALL_CODEBASE: false
22+
VALIDATE_GO: false
2223
DEFAULT_BRANCH: "main"
2324
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎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/v3/modules/core/ante"
11-
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
10+
ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
11+
ibckeeper "github.com/cosmos/ibc-go/v4/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: 23 additions & 17 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/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"
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"
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/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"
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"
110110

111111
encparams "github.com/CosmosContracts/juno/v10/app/params"
112112
)
@@ -839,7 +839,13 @@ func (app *App) RegisterTendermintService(clientCtx client.Context) {
839839

840840
// RegisterUpgradeHandlers returns upgrade handlers
841841

842-
func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) {}
842+
func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) {
843+
app.UpgradeKeeper.SetUpgradeHandler("MigrateTraces",
844+
func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
845+
// transfer module consensus version has been bumped to 2
846+
return app.mm.RunMigrations(ctx, cfg, fromVM)
847+
})
848+
}
843849

844850
// GetMaccPerms returns a copy of the module account permissions
845851
func GetMaccPerms() map[string][]string {

‎app/export.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ func (app *App) ExportAppStateAndValidators(
4949

5050
// prepare for fresh start at zero height
5151
// NOTE zero height genesis is a temporary feature which will be deprecated
52-
// in favour of export at a block height
52+
//
53+
// in favour of export at a block height
5354
func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
5455
applyAllowedAddrs := false
5556

‎go.mod‎

Lines changed: 29 additions & 28 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.0
7-
github.com/cosmos/cosmos-sdk v0.45.6
8-
github.com/cosmos/ibc-go/v3 v3.0.0
6+
github.com/CosmWasm/wasmd v0.28.1-0.20220825115153-261812986e9a
7+
github.com/cosmos/cosmos-sdk v0.45.8
8+
github.com/cosmos/ibc-go/v4 v4.0.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
@@ -15,10 +15,10 @@ require (
1515
github.com/spf13/cast v1.5.0
1616
github.com/spf13/cobra v1.5.0
1717
github.com/stretchr/testify v1.8.0
18-
github.com/tendermint/tendermint v0.34.19
18+
github.com/tendermint/tendermint v0.34.21
1919
github.com/tendermint/tm-db v0.6.7
20-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd
21-
google.golang.org/grpc v1.46.2
20+
google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b
21+
google.golang.org/grpc v1.48.0
2222
gopkg.in/yaml.v2 v2.4.0
2323
)
2424

@@ -29,21 +29,21 @@ require (
2929
github.com/CosmWasm/wasmvm v1.0.0 // indirect
3030
github.com/DataDog/zstd v1.4.5 // indirect
3131
github.com/Workiva/go-datastructures v1.0.53 // indirect
32-
github.com/armon/go-metrics v0.3.10 // indirect
32+
github.com/armon/go-metrics v0.4.0 // indirect
3333
github.com/beorn7/perks v1.0.1 // indirect
3434
github.com/bgentry/speakeasy v0.1.0 // indirect
35-
github.com/btcsuite/btcd v0.22.0-beta // indirect
35+
github.com/btcsuite/btcd v0.22.1 // indirect
3636
github.com/cespare/xxhash v1.1.0 // indirect
3737
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3838
github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect
3939
github.com/confio/ics23/go v0.7.0 // indirect
40-
github.com/containerd/continuity v0.2.2 // indirect
4140
github.com/cosmos/btcutil v1.0.4 // indirect
4241
github.com/cosmos/go-bip39 v1.0.0 // indirect
4342
github.com/cosmos/gorocksdb v1.2.0 // indirect
44-
github.com/cosmos/iavl v0.17.3 // indirect
43+
github.com/cosmos/iavl v0.19.1 // indirect
4544
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
4645
github.com/cosmos/ledger-go v0.9.2 // indirect
46+
github.com/creachadair/taskgroup v0.3.2 // indirect
4747
github.com/danieljoos/wincred v1.0.2 // indirect
4848
github.com/davecgh/go-spew v1.1.1 // indirect
4949
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
@@ -53,11 +53,10 @@ require (
5353
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
5454
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
5555
github.com/felixge/httpsnoop v1.0.1 // indirect
56-
github.com/fsnotify/fsnotify v1.5.1 // indirect
56+
github.com/fsnotify/fsnotify v1.5.4 // indirect
5757
github.com/go-kit/kit v0.12.0 // indirect
58-
github.com/go-kit/log v0.2.0 // indirect
58+
github.com/go-kit/log v0.2.1 // indirect
5959
github.com/go-logfmt/logfmt v0.5.1 // indirect
60-
github.com/go-playground/validator/v10 v10.4.1 // indirect
6160
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
6261
github.com/gogo/gateway v1.1.0 // indirect
6362
github.com/golang/snappy v0.0.3 // indirect
@@ -78,19 +77,20 @@ require (
7877
github.com/inconshreveable/mousetrap v1.0.0 // indirect
7978
github.com/jmhodges/levigo v1.0.0 // indirect
8079
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
81-
github.com/klauspost/compress v1.13.6 // indirect
82-
github.com/lib/pq v1.10.4 // indirect
83-
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
80+
github.com/klauspost/compress v1.15.9 // indirect
81+
github.com/lib/pq v1.10.6 // indirect
82+
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
8483
github.com/magiconair/properties v1.8.6 // indirect
84+
github.com/mattn/go-colorable v0.1.12 // indirect
8585
github.com/mattn/go-isatty v0.0.14 // indirect
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
8989
github.com/mitchellh/go-homedir v1.1.0 // indirect
90-
github.com/mitchellh/mapstructure v1.4.3 // indirect
90+
github.com/mitchellh/mapstructure v1.5.0 // indirect
9191
github.com/mtibben/percent v0.2.1 // indirect
92-
github.com/pelletier/go-toml v1.9.4 // indirect
93-
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
92+
github.com/pelletier/go-toml v1.9.5 // indirect
93+
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
9494
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
9595
github.com/pkg/errors v0.9.1 // indirect
9696
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -101,32 +101,33 @@ require (
101101
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
102102
github.com/regen-network/cosmos-proto v0.3.1 // indirect
103103
github.com/rs/cors v1.8.2 // indirect
104-
github.com/rs/zerolog v1.26.1 // indirect
104+
github.com/rs/zerolog v1.27.0 // indirect
105105
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
106106
github.com/spf13/afero v1.8.2 // indirect
107107
github.com/spf13/jwalterweatherman v1.1.0 // indirect
108108
github.com/spf13/pflag v1.0.5 // indirect
109-
github.com/spf13/viper v1.11.0 // indirect
110-
github.com/subosito/gotenv v1.2.0 // indirect
109+
github.com/spf13/viper v1.12.0 // indirect
110+
github.com/subosito/gotenv v1.4.0 // indirect
111111
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
112112
github.com/tendermint/btcd v0.1.1 // indirect
113113
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
114114
github.com/tendermint/go-amino v0.16.0 // indirect
115115
github.com/zondax/hid v0.9.0 // indirect
116116
go.etcd.io/bbolt v1.3.6 // indirect
117-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
118-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
119-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
120-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
117+
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
118+
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
121+
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
121122
golang.org/x/text v0.3.7 // indirect
122123
google.golang.org/protobuf v1.28.1 // indirect
123-
gopkg.in/ini.v1 v1.66.4 // indirect
124+
gopkg.in/ini.v1 v1.66.6 // indirect
124125
gopkg.in/yaml.v3 v3.0.1 // indirect
125126
nhooyr.io/websocket v1.8.6 // indirect
126127
)
127128

128129
replace (
129-
github.com/cosmos/iavl => github.com/cosmos/iavl v0.17.3
130+
github.com/CosmWasm/wasmd => github.com/notional-labs/wasmd v0.25.1-0.20220825221754-0f7229d64633
130131
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
131132
google.golang.org/grpc => google.golang.org/grpc v1.33.2
132133
)

0 commit comments

Comments
 (0)