Add WasmLimits to WasmConfig

x/wasm/keeper/keeper.go

@@ -109,6 +109,9 @@ type Keeper struct {
 	// the address capable of executing a MsgUpdateParams message. Typically, this
 	// should be the x/gov module account.
 	authority string
+
+	// wasmLimits contains the limits sent to wasmvm on init
+	wasmLimits wasmvmtypes.WasmLimits
 }
 
 func (k Keeper) getUploadAccessConfig(ctx context.Context) types.AccessConfig {
@@ -119,6 +122,10 @@ func (k Keeper) getInstantiateAccessConfig(ctx context.Context) types.AccessType
 	return k.GetParams(ctx).InstantiateDefaultPermission
 }
 
+func (k Keeper) GetWasmLimits() wasmvmtypes.WasmLimits {
+	return k.wasmLimits
+}
+
 // GetParams returns the total set of wasm parameters.
 func (k Keeper) GetParams(ctx context.Context) types.Params {
 	p, err := k.params.Get(ctx)

x/wasm/keeper/keeper_cgo.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 
 	wasmvm "github.com/CosmWasm/wasmvm/v2"
+	wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types"
 
 	"cosmossdk.io/collections"
 	corestoretypes "cosmossdk.io/core/store"
@@ -56,7 +57,8 @@ func NewKeeper(
 		propagateGovAuthorization: map[types.AuthorizationPolicyAction]struct{}{
 			types.AuthZActionInstantiate: {},
 		},
-		authority: authority,
+		authority:  authority,
+		wasmLimits: wasmConfig.WasmLimits,
 	}
 	keeper.messenger = NewDefaultMessageHandler(keeper, router, ics4Wrapper, channelKeeper, capabilityKeeper, bankKeeper, cdc, portSource)
 	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distrKeeper, channelKeeper, keeper)
@@ -70,7 +72,15 @@ func NewKeeper(
 	// NewVM does a lot, so better not to create it and silently drop it.
 	if keeper.wasmVM == nil {
 		var err error
-		keeper.wasmVM, err = wasmvm.NewVM(filepath.Join(homeDir, "wasm"), availableCapabilities, contractMemoryLimit, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize)
+		keeper.wasmVM, err = wasmvm.NewVMWithConfig(wasmvmtypes.VMConfig{
+			Cache: wasmvmtypes.CacheOptions{
+				BaseDir:               filepath.Join(homeDir, "wasm"),
+				AvailableCapabilities: availableCapabilities,
+				MemoryCacheSize:       wasmvmtypes.NewSizeMebi(contractMemoryLimit),
+				InstanceMemoryLimit:   wasmvmtypes.NewSizeMebi(wasmConfig.MemoryCacheSize),
+			},
+			WasmLimits: wasmConfig.WasmLimits,
+		}, wasmConfig.ContractDebugMode)
 		if err != nil {
 			panic(err)
 		}

x/wasm/keeper/querier.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/binary"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"runtime/debug"
 
@@ -440,8 +441,13 @@ func ensurePaginationParams(req *query.PageRequest) (*query.PageRequest, error)
 }
 
 func (q GrpcQuerier) WasmLimitsConfig(c context.Context, req *types.QueryWasmLimitsConfigRequest) (*types.QueryWasmLimitsConfigResponse, error) {
+	json, err := json.Marshal(q.keeper.GetWasmLimits())
+	if err != nil {
+		return nil, err
+	}
+
 	return &types.QueryWasmLimitsConfigResponse{
-		Config: "{\"todo\": \"put serialized limits here\"}", // TODO: implement
+		Config: string(json),
 	}, nil
 }
 

x/wasm/types/exported_keepers.go

@@ -27,6 +27,7 @@ type ViewKeeper interface {
 	GetByteCode(ctx context.Context, codeID uint64) ([]byte, error)
 	IsPinnedCode(ctx context.Context, codeID uint64) bool
 	GetParams(ctx context.Context) Params
+	GetWasmLimits() wasmvmtypes.WasmLimits
 }
 
 // ContractOpsKeeper contains mutable operations on a contract.

x/wasm/types/types.go

@@ -326,6 +326,8 @@ type WasmConfig struct {
 	MemoryCacheSize uint32 `mapstructure:"memory_cache_size"`
 	// ContractDebugMode log what contract print
 	ContractDebugMode bool
+	// WasmLimits are the limits that are used for static validation of Wasm binaries.
+	WasmLimits wasmvmtypes.WasmLimits
 }
 
 // DefaultWasmConfig returns the default settings for WasmConfig