Add VMConfig

app/app.go

@@ -646,6 +646,7 @@ func NewWasmApp(
 		app.GRPCQueryRouter(),
 		wasmDir,
 		nodeConfig,
+		wasmtypes.VMConfig{},
 		wasmkeeper.BuiltInCapabilities(),
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		wasmOpts...,

x/wasm/keeper/bench_test.go

@@ -52,7 +52,7 @@ func BenchmarkInstantiationOverhead(b *testing.B) {
 	for name, spec := range specs {
 		b.Run(name, func(b *testing.B) {
 			nodeConfig := types.NodeConfig{MemoryCacheSize: 0}
-			ctx, keepers := createTestInput(b, false, AvailableCapabilities, nodeConfig, spec.db())
+			ctx, keepers := createTestInput(b, false, AvailableCapabilities, nodeConfig, types.VMConfig{}, spec.db())
 			example := InstantiateHackatomExampleContract(b, ctx, keepers)
 			if spec.pinned {
 				require.NoError(b, keepers.ContractKeeper.PinCode(ctx, example.CodeID))
@@ -87,7 +87,7 @@ func BenchmarkCompilation(b *testing.B) {
 		b.Run(name, func(b *testing.B) {
 			nodeConfig := types.NodeConfig{MemoryCacheSize: 0}
 			db := dbm.NewMemDB()
-			ctx, keepers := createTestInput(b, false, AvailableCapabilities, nodeConfig, db)
+			ctx, keepers := createTestInput(b, false, AvailableCapabilities, nodeConfig, types.VMConfig{}, db)
 
 			// print out code size for comparisons
 			code, err := os.ReadFile(spec.wasmFile)

x/wasm/keeper/genesis_test.go

@@ -33,6 +33,7 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
 	"github.com/CosmWasm/wasmd/x/wasm/types"
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 func TestGenesisExportImport(t *testing.T) {
@@ -698,6 +699,7 @@ func setupKeeper(t *testing.T) (*Keeper, sdk.Context) {
 		nil,
 		tempDir,
 		nodeConfig,
+		wasmtypes.VMConfig{},
 		AvailableCapabilities,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)

x/wasm/keeper/keeper_cgo.go

@@ -34,6 +34,7 @@ func NewKeeper(
 	_ GRPCQueryRouter,
 	homeDir string,
 	nodeConfig types.NodeConfig,
+	vmConfig types.VMConfig,
 	availableCapabilities []string,
 	authority string,
 	opts ...Option,
@@ -58,7 +59,7 @@ func NewKeeper(
 			types.AuthZActionInstantiate: {},
 		},
 		authority:  authority,
-		wasmLimits: nodeConfig.WasmLimits,
+		wasmLimits: vmConfig.WasmLimits,
 	}
 	keeper.messenger = NewDefaultMessageHandler(keeper, router, ics4Wrapper, channelKeeper, capabilityKeeper, bankKeeper, cdc, portSource)
 	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distrKeeper, channelKeeper, keeper)
@@ -79,7 +80,7 @@ func NewKeeper(
 				MemoryCacheSize:       wasmvmtypes.NewSizeMebi(contractMemoryLimit),
 				InstanceMemoryLimit:   wasmvmtypes.NewSizeMebi(nodeConfig.MemoryCacheSize),
 			},
-			WasmLimits: nodeConfig.WasmLimits,
+			WasmLimits: vmConfig.WasmLimits,
 		}, nodeConfig.ContractDebugMode)
 		if err != nil {
 			panic(err)

x/wasm/keeper/keeper_no_cgo.go

@@ -28,6 +28,7 @@ func NewKeeper(
 	_ GRPCQueryRouter,
 	homeDir string,
 	nodeConfig types.NodeConfig,
+	vmConfig types.VMConfig,
 	availableCapabilities string,
 	authority string,
 	opts ...Option,

x/wasm/keeper/keeper_test.go

@@ -89,10 +89,11 @@ func TestCreateNilCreatorAddress(t *testing.T) {
 func TestWasmLimits(t *testing.T) {
 	one := uint32(1)
 	cfg := types.DefaultNodeConfig()
-	cfg.WasmLimits = wasmvmtypes.WasmLimits{
-		MaxImports: &one, // very low limit that every contract will fail
-	}
-	ctx, keepers := createTestInput(t, false, AvailableCapabilities, cfg, dbm.NewMemDB())
+	ctx, keepers := createTestInput(t, false, AvailableCapabilities, cfg, types.VMConfig{
+		WasmLimits: wasmvmtypes.WasmLimits{
+			MaxImports: &one, // very low limit that every contract will fail
+		},
+	}, dbm.NewMemDB())
 	keeper := keepers.ContractKeeper
 
 	deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 1))

x/wasm/keeper/options_test.go

@@ -155,7 +155,7 @@ func TestConstructorOptions(t *testing.T) {
 			opt := spec.srcOpt
 			_, gotPostOptMarker := opt.(postOptsFn)
 			require.Equal(t, spec.isPostOpt, gotPostOptMarker)
-			k := NewKeeper(codec, runtime.NewKVStoreService(storeKey), authkeeper.AccountKeeper{}, &bankkeeper.BaseKeeper{}, stakingkeeper.Keeper{}, nil, nil, nil, nil, nil, nil, nil, nil, tempDir, types.DefaultNodeConfig(), AvailableCapabilities, "", spec.srcOpt)
+			k := NewKeeper(codec, runtime.NewKVStoreService(storeKey), authkeeper.AccountKeeper{}, &bankkeeper.BaseKeeper{}, stakingkeeper.Keeper{}, nil, nil, nil, nil, nil, nil, nil, nil, tempDir, types.DefaultNodeConfig(), types.VMConfig{}, AvailableCapabilities, "", spec.srcOpt)
 			spec.verify(t, k)
 		})
 	}

x/wasm/keeper/querier_test.go

@@ -688,7 +688,7 @@ func TestQueryContractInfo(t *testing.T) {
 }
 
 func TestQueryWasmLimitsConfig(t *testing.T) {
-	cfg := types.DefaultNodeConfig()
+	cfg := types.VMConfig{}
 
 	fifteen := uint32(15)
 
@@ -718,7 +718,7 @@ func TestQueryWasmLimitsConfig(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			cfg.WasmLimits = spec.limits
 
-			ctx, keepers := createTestInput(t, false, AvailableCapabilities, cfg, dbm.NewMemDB())
+			ctx, keepers := createTestInput(t, false, AvailableCapabilities, types.DefaultNodeConfig(), cfg, dbm.NewMemDB())
 			keeper := keepers.WasmKeeper
 
 			q := Querier(keeper)

x/wasm/keeper/test_common.go

@@ -212,7 +212,7 @@ func CreateDefaultTestInput(t testing.TB) (sdk.Context, TestKeepers) {
 // CreateTestInput encoders can be nil to accept the defaults, or set it to override some of the message handlers (like default)
 func CreateTestInput(t testing.TB, isCheckTx bool, availableCapabilities []string, opts ...Option) (sdk.Context, TestKeepers) {
 	// Load default wasm config
-	return createTestInput(t, isCheckTx, availableCapabilities, types.DefaultNodeConfig(), dbm.NewMemDB(), opts...)
+	return createTestInput(t, isCheckTx, availableCapabilities, types.DefaultNodeConfig(), types.VMConfig{}, dbm.NewMemDB(), opts...)
 }
 
 // encoders can be nil to accept the defaults, or set it to override some of the message handlers (like default)
@@ -221,6 +221,7 @@ func createTestInput(
 	isCheckTx bool,
 	availableCapabilities []string,
 	nodeConfig types.NodeConfig,
+	vmConfig types.VMConfig,
 	db dbm.DB,
 	opts ...Option,
 ) (sdk.Context, TestKeepers) {
@@ -359,7 +360,7 @@ func createTestInput(
 
 	faucet := NewTestFaucet(t, ctx, bankKeeper, minttypes.ModuleName, sdk.NewCoin("stake", sdkmath.NewInt(100_000_000_000)))
 
-	// set some funds ot pay out validatores, based on code from:
+	// set some funds to pay out validators, based on code from:
 	// https://github.com/cosmos/cosmos-sdk/blob/fea231556aee4d549d7551a6190389c4328194eb/x/distribution/keeper/keeper_test.go#L50-L57
 	distrAcc := distKeeper.GetDistributionAccount(ctx)
 	faucet.Fund(ctx, distrAcc.GetAddress(), sdk.NewCoin("stake", sdkmath.NewInt(2000000)))
@@ -406,6 +407,7 @@ func createTestInput(
 		querier,
 		tempDir,
 		nodeConfig,
+		vmConfig,
 		availableCapabilities,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		opts...,

x/wasm/types/types.go

@@ -315,6 +315,12 @@ func NewWasmCoins(cosmosCoins sdk.Coins) (wasmCoins []wasmvmtypes.Coin) {
 	return wasmCoins
 }
 
+// VMConfig contains configurations that are passed on to CosmWasm VM.
+type VMConfig struct {
+	// WasmLimits are the limits that are used for static validation of Wasm binaries.
+	WasmLimits wasmvmtypes.WasmLimits
+}
+
 // NodeConfig is the extra config required for wasm
 type NodeConfig struct {
 	// SimulationGasLimit is the max gas to be used in a tx simulation call.