Skip to content

Commit 18b7ca5

Browse files
faddatfaddat
committed
temporarily use notional's wasmd fork so we can get about some testing
1 parent 9016ea6 commit 18b7ca5

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

‎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: 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/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
)

‎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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.19
55
require (
66
github.com/CosmWasm/wasmd v0.28.0
77
github.com/cosmos/cosmos-sdk v0.45.7
8-
github.com/cosmos/ibc-go/v3 v3.2.0
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
@@ -125,6 +125,7 @@ require (
125125
)
126126

127127
replace (
128+
github.com/CosmWasm/wasmd => github.com/notional-labs/wasmd v0.25.1-0.20220815192235-2327d5d9814b
128129
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
129130
google.golang.org/grpc => google.golang.org/grpc v1.33.2
130131
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
9191
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
9292
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
9393
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
94-
github.com/CosmWasm/wasmd v0.28.0 h1:t4AMhe6qR/JIpDv7cmKtJKtsGndMRlI2zOgqDtwNfiw=
95-
github.com/CosmWasm/wasmd v0.28.0/go.mod h1:+YFMYloXHkrMKYoIGKMzmbEtH0is99ZWl2xgh/U2Dic=
9694
github.com/CosmWasm/wasmvm v1.0.0 h1:NRmnHe3xXsKn2uEcB1F5Ha323JVAhON+BI6L177dlKc=
9795
github.com/CosmWasm/wasmvm v1.0.0/go.mod h1:ei0xpvomwSdONsxDuONzV7bL1jSET1M8brEx0FCXc+A=
9896
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
@@ -268,9 +266,9 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4
268266
github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
269267
github.com/cosmos/iavl v0.19.1 h1:3gaq9b6SjiB0KBTygRnAvEGml2pQlu1TH8uma5g63Ys=
270268
github.com/cosmos/iavl v0.19.1/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
271-
github.com/cosmos/ibc-go/v3 v3.2.0 h1:Mh+RWo5FHPMM1Xsrar3uwKufdEGdIp5LDkVk9cYKYYA=
272-
github.com/cosmos/ibc-go/v3 v3.2.0/go.mod h1:DrDYXJjWNwgv72cK1Il+BegtyGIDXcx+cnJwWGzve6o=
273-
github.com/cosmos/interchain-accounts v0.1.0 h1:QmuwNsf1Hxl3P5GSGt7Z+JeuHPiZw4Z34R/038P5T6s=
269+
github.com/cosmos/ibc-go/v4 v4.0.0 h1:kqbbRDFB9bNLVfxImZ1wIsXZKjbS5NZ5xvnv/MoX138=
270+
github.com/cosmos/ibc-go/v4 v4.0.0/go.mod h1:qxfXOjgJKDzdJeTTDFowrFxxI1KD3x1k0pZifdf9fOg=
271+
github.com/cosmos/interchain-accounts v0.1.1-0.20220801105946-a4139e927530 h1:l7BrcxQZRPLBm3zTDsYeaj+YkYIXbF2WjEeF3TRJBMA=
274272
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
275273
github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
276274
github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
@@ -378,8 +376,8 @@ github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x
378376
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
379377
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
380378
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
381-
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
382379
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
380+
github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU=
383381
github.com/go-critic/go-critic v0.6.3/go.mod h1:c6b3ZP1MQ7o6lPR7Rv3lEf7pYQUmAcx8ABHgdZCQt/k=
384382
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
385383
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -901,6 +899,8 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA
901899
github.com/nishanths/exhaustive v0.7.11/go.mod h1:gX+MP7DWMKJmNa1HfMozK+u04hQd3na9i0hyqf3/dOI=
902900
github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ=
903901
github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
902+
github.com/notional-labs/wasmd v0.25.1-0.20220815192235-2327d5d9814b h1:BSjA+iU8h/nTAEXtIRS0nDYusxJ62ejazhwFsHxp1ig=
903+
github.com/notional-labs/wasmd v0.25.1-0.20220815192235-2327d5d9814b/go.mod h1:wFRPCMfeQzs6FWBYdCy5xyM7ThvZ+NxHqeMwymUMLuw=
904904
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
905905
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
906906
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

0 commit comments

Comments
 (0)