Merge remote-tracking branch 'origin/main' into ducnt/fix-ictest

app/upgrades/v4/upgrade.go

@@ -1,6 +1,7 @@
 package v4
 
 import (
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
@@ -20,6 +21,12 @@ func CreateUpgradeHandler(
 		transmiddlewareParams := tfmdtypes.DefaultParams()
 		keepers.TransferMiddlewareKeeper.SetParams(ctx, transmiddlewareParams)
 
+		// Add params for wasmd
+		var wasmdParams wasmtypes.Params
+		wasmdParams.CodeUploadAccess = wasmtypes.AccessConfig{Permission: wasmtypes.AccessTypeNobody}
+		wasmdParams.InstantiateDefaultPermission = wasmtypes.AccessTypeNobody
+		keepers.WasmKeeper.SetParams(ctx, wasmdParams)
+
 		return mm.RunMigrations(ctx, configurator, vm)
 	}
 }

go.mod

@@ -186,7 +186,7 @@ replace (
 	// lock wasmvm so we do not break the grandpa contract
 	github.com/CosmWasm/wasmvm => github.com/CosmWasm/wasmvm v1.2.1
 	// ibc-go with wasm client
-	github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client
+	github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724095244-3e77ff01133a
 
 	github.com/strangelove-ventures/packet-forward-middleware/v7 => github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230720035542-4b1cd673ad3e
 

go.sum

@@ -770,8 +770,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01 h1:koCsoc1NGpU8TntXwM/s7Z/whsKNDVPiLim35HLBAzA=
 github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01/go.mod h1:GFQ8TsXDMTpu7kif0Dwddz6rxazy0ZJQHfN38ZmAodI=
-github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client h1:5EF/ea5DLD0QTiNCOysxe4+dQ5qCqon4+frCm+2JCYI=
-github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client/go.mod h1:ISHo/Qitjtvj2svGmttaZv03zVXmS+uqvUyF9kFqlI0=
+github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724095244-3e77ff01133a h1:1OlwO/MzbpBkoVZzYSstUzaJ7MMXJBV7TBFCKmwgrSU=
+github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724095244-3e77ff01133a/go.mod h1:ISHo/Qitjtvj2svGmttaZv03zVXmS+uqvUyF9kFqlI0=
 github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230720035542-4b1cd673ad3e h1:5Jm678g0o1NJ8TibGYVyMf62pxwcfKgbd3GEgKyMyjI=
 github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230720035542-4b1cd673ad3e/go.mod h1:3jaW2/rb+utcdgh54fUxnvrWMFLe8OyQA0sgUOHYtCE=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=