Merge pull request #125 from HorizenOfficial/as/multi_app_impl_exec_mgr

As/multi app impl exec mgr

Author: alsala

app/simple/integration_test.go

@@ -74,7 +74,7 @@ func TestSimpleAppIntegration(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
 
 	// Create a new wasmtime runtime
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -212,7 +212,7 @@ func TestSimpleAppIntegration_NullPayload(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
 
 	// Create a new wasmtime runtime
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -234,7 +234,7 @@ func TestSimpleAppIntegration_NegativeScenarios(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
 
 	// Create a new wasmtime runtime
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -344,7 +344,7 @@ func TestSimpleAppIntegration_NilData(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
 
 	// Create a new wasmtime runtime
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -376,7 +376,7 @@ func TestSimpleAppIntegration_NilData(t *testing.T) {
 }
 
 func TestSimpleAppIntegration_InvalidWasm(t *testing.T) {
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -415,7 +415,7 @@ func TestSimpleAppIntegration_InvalidState(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
 
 	// Create a new wasmtime runtime
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -440,7 +440,7 @@ func TestSimpleAppIntegration_MemoryStress(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
 
 	// Create a new wasmtime runtime with limited memory to make leaks surface faster.
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -544,7 +544,7 @@ func requireMemoryClean(t *testing.T, runtime *vela_wasm.WasmtimeRuntime, wasmBy
 // round-trip that cannot be unit-tested in native 64-bit Go.
 func TestSimpleAppIntegration_MemoryCleanBetweenOps(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -611,7 +611,7 @@ func TestSimpleAppIntegration_MemoryCleanBetweenOps(t *testing.T) {
 // (which still use SerializeAndWriteResult -> BytesToPtr) do not leak memory.
 func TestSimpleAppIntegration_ErrorPathMemory(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()
@@ -656,7 +656,7 @@ func TestSimpleAppIntegration_ErrorPathMemory(t *testing.T) {
 // result that stresses the allocate -> BytesToPtr -> extractResultBytes -> deallocate pipeline.
 func TestSimpleAppIntegration_LargeResultRoundTrip(t *testing.T) {
 	wasmBytes := buildAndLoadWasmModule(t)
-	runtime := vela_wasm.NewWasmtimeRuntime(testLogger)
+	runtime := vela_wasm.NewWasmtimeRuntime(testLogger, 0)
 	defer runtime.Close()
 
 	ctx := context.Background()

cmd/admincli/README.md

@@ -36,7 +36,9 @@ Commands:
   2) Get Log Level
   3) Set Log Level
   4) Key Attestation
-  5) Quit
+  5) Get WASM Cache Size
+  6) Set WASM Cache Size
+  7) Quit
 Select command>
 ```
 
@@ -84,7 +86,7 @@ contains the new level from each:
 }
 ```
 
-### 4) Key Attestation
+### 4) Key Attestation (executor only)
 
 Requests an AWS Nitro Enclave attestation document from the Executor. The
 attestation document cryptographically binds the Executor's keyset (P521
@@ -96,6 +98,29 @@ structure returned as base64.
 This command only works when the Executor is running inside a Nitro Enclave
 (requires `/dev/nsm`). Outside of an enclave it returns an error.
 
+### 5) Get WASM Cache Size (executor only)
+
+Returns the current WASM module LRU cache limit from the Executor. A value of
+`0` means unlimited (all modules stay in memory). Always targets the executor.
+
+```json
+{"maxCachedModules": 0}
+```
+
+### 6) Set WASM Cache Size (executor only)
+
+Changes the WASM module LRU cache limit at runtime. If the new limit is lower
+than the current number of cached modules, excess modules are evicted lazily
+when the next module is loaded (least recently used first). A value of `0`
+means unlimited. Always targets the executor.
+
+```json
+{"maxCachedModules": 5}
+```
+
+The initial value is set via the `EXECUTOR_MAX_CACHED_MODULES` environment
+variable (default `0`).
+
 ### Targets
 
 | Value      | Behaviour                                              |
@@ -146,8 +171,9 @@ cross-checks every duplicated value:
 - **Valid log levels** — the local list is compared against
   `admin.SupportedLogLevels` (parsed from the canonical comma-separated string).
 - **JSON field names** — both local and upstream structs (`setLogLevelReq` vs
-  `admin.SetLogLevelRequest`, etc.) are marshaled and the resulting JSON keys
-  are compared to catch renamed or missing fields.
+  `admin.SetLogLevelRequest`, `setWasmCacheSizeReq` vs
+  `admin.SetWasmCacheSizeRequest`, etc.) are marshaled and the resulting JSON
+  keys are compared to catch renamed or missing fields.
 
 These tests run in milliseconds with no network or servers required:
 

cmd/admincli/main.go

@@ -17,12 +17,14 @@ import (
 // can be distributed as a standalone tool. Tests import pkg/admin to guard
 // against drift.
 const (
-	adminResponseMessage  = "response"
-	adminErrorMessage     = "error"
-	keyAttestationRequest = "key_attestation"
-	getVersionRequest     = "get_version"
-	setLogLevelRequest    = "set_log_level"
-	getLogLevelRequest    = "get_log_level"
+	adminResponseMessage     = "response"
+	adminErrorMessage        = "error"
+	keyAttestationRequest    = "key_attestation"
+	getVersionRequest        = "get_version"
+	setLogLevelRequest       = "set_log_level"
+	getLogLevelRequest       = "get_log_level"
+	setWasmCacheSizeRequest  = "set_wasm_cache_size"
+	getWasmCacheSizeRequest  = "get_wasm_cache_size"
 )
 
 var validLogLevels = []string{
@@ -46,6 +48,10 @@ type setLogLevelReq struct {
 	Level string `json:"level"`
 }
 
+type setWasmCacheSizeReq struct {
+	MaxCachedModules int `json:"maxCachedModules"`
+}
+
 var (
 	useColors bool
 	errBack   = fmt.Errorf("back")
@@ -96,8 +102,12 @@ func main() {
 		case "3":
 			msg, err = buildSetLogLevel(scanner)
 		case "4":
-			msg = buildKeyAttestation()
-		case "5", "q", "Q":
+			msg, err = buildKeyAttestation()
+		case "5":
+			msg, err = buildGetWasmCacheSize()
+		case "6":
+			msg, err = buildSetWasmCacheSize(scanner)
+		case "7", "q", "Q":
 			fmt.Println("Bye.")
 			return
 		default:
@@ -123,7 +133,9 @@ func printMenu() {
 	fmt.Println("  2) Get Log Level")
 	fmt.Println("  3) Set Log Level")
 	fmt.Println("  4) Key Attestation")
-	fmt.Println("  5) Quit")
+	fmt.Println("  5) Get WASM Cache Size")
+	fmt.Println("  6) Set WASM Cache Size")
+	fmt.Println("  7) Quit")
 }
 
 func prompt(scanner *bufio.Scanner, label string) string {
@@ -198,8 +210,28 @@ func buildSetLogLevel(scanner *bufio.Scanner) (*adminMessage, error) {
 	return &adminMessage{Type: setLogLevelRequest, Target: target, Data: raw}, nil
 }
 
-func buildKeyAttestation() *adminMessage {
-	return &adminMessage{Type: keyAttestationRequest, Target: "executor"}
+func buildKeyAttestation() (*adminMessage, error) {
+	return &adminMessage{Type: keyAttestationRequest, Target: "executor"}, nil
+}
+
+func buildGetWasmCacheSize() (*adminMessage, error) {
+	return &adminMessage{Type: getWasmCacheSizeRequest, Target: "executor"}, nil
+}
+
+func buildSetWasmCacheSize(scanner *bufio.Scanner) (*adminMessage, error) {
+	raw := prompt(scanner, "Max cached modules (0 = unlimited)")
+	if strings.EqualFold(raw, "b") || strings.EqualFold(raw, "back") {
+		return nil, errBack
+	}
+	n, err := strconv.Atoi(raw)
+	if err != nil || n < 0 {
+		return nil, fmt.Errorf("invalid value %q: must be a non-negative integer", raw)
+	}
+	data, err := json.Marshal(setWasmCacheSizeReq{MaxCachedModules: n})
+	if err != nil {
+		return nil, fmt.Errorf("marshal request: %w", err)
+	}
+	return &adminMessage{Type: setWasmCacheSizeRequest, Target: "executor", Data: json.RawMessage(data)}, nil
 }
 
 // --- send / receive ---

cmd/admincli/main_test.go

@@ -25,6 +25,8 @@ func TestMessageTypeConstants(t *testing.T) {
 		{"GetVersionRequestMessage", getVersionRequest, string(admin.GetVersionRequestMessage)},
 		{"SetLogLevelRequestMessage", setLogLevelRequest, string(admin.SetLogLevelRequestMessage)},
 		{"GetLogLevelRequestMessage", getLogLevelRequest, string(admin.GetLogLevelRequestMessage)},
+		{"SetWasmCacheSizeRequestMessage", setWasmCacheSizeRequest, string(admin.SetWasmCacheSizeRequestMessage)},
+		{"GetWasmCacheSizeRequestMessage", getWasmCacheSizeRequest, string(admin.GetWasmCacheSizeRequestMessage)},
 	}
 	for _, c := range checks {
 		if c.local != c.upstream {
@@ -95,6 +97,23 @@ func TestAdminMessageJSONShape(t *testing.T) {
 	}
 }
 
+// TestSetWasmCacheSizeReqJSONShape verifies that the local setWasmCacheSizeReq
+// produces the same JSON field names as admin.SetWasmCacheSizeRequest.
+func TestSetWasmCacheSizeReqJSONShape(t *testing.T) {
+	local, err := json.Marshal(setWasmCacheSizeReq{MaxCachedModules: 5})
+	require.NoError(t, err)
+	upstream, err := json.Marshal(admin.SetWasmCacheSizeRequest{MaxCachedModules: 5})
+	require.NoError(t, err)
+
+	var localMap, upstreamMap map[string]any
+	require.NoError(t, json.Unmarshal(local, &localMap))
+	require.NoError(t, json.Unmarshal(upstream, &upstreamMap))
+
+	if !reflect.DeepEqual(localMap, upstreamMap) {
+		t.Errorf("SetWasmCacheSizeReq JSON mismatch:\n  admincli:  %s\n  pkg/admin: %s", local, upstream)
+	}
+}
+
 // TestErrorDataJSONShape verifies that the local errorData produces the same
 // JSON field names as communication.ErrorData.
 func TestErrorDataJSONShape(t *testing.T) {

cmd/executor/main.go

@@ -60,7 +60,7 @@ func main() {
 	}()
 
 	// Create the WASM runtime
-	runtime := wasm.NewWasmtimeRuntime(log)
+	runtime := wasm.NewWasmtimeRuntime(log, config.MaxCachedModules)
 
 	// Create the appropriate server based on configuration
 	var server communication.ExecutorServer

dockerfiles/.env.template

@@ -10,6 +10,7 @@ EXECUTOR_IP_HOST='10.10.40.10'
 EXECUTOR_PORT='4000'
 EXECUTOR_FUEL_PRICE_PER_UNIT='1'
 EXECUTOR_MIN_FEE_PER_REQUEST='10'
+EXECUTOR_MAX_CACHED_MODULES='0'
 EXECUTOR_KEYSET_RECOVERY_TYPE='1'
 EXECUTOR_KMS_KEY_ARN='arn:aws:kms:eu-west-1:215705706013:key/7be0593e-72e9-46f2-9a9f-9a85a0e719e4'
 EXECUTOR_KMS_REGION='eu-west-1'

dockerfiles/docker-compose.yml

@@ -58,6 +58,7 @@ services:
       - EXECUTOR_KEYSET_RECOVERY_TYPE
       - EXECUTOR_FUEL_PRICE_PER_UNIT
       - EXECUTOR_MIN_FEE_PER_REQUEST
+      - EXECUTOR_MAX_CACHED_MODULES
       - EXECUTOR_LOG_KIND
       - EXECUTOR_LOG_CONSOLE
       - EXECUTOR_LOG_CONSOLE_LEVEL

pkg/admin/admin_interface.go

@@ -73,6 +73,12 @@ const (
 
 	// GetLogLevelRequestMessage represents a request to get the current log level
 	GetLogLevelRequestMessage AdminMessageType = "get_log_level"
+
+	// SetWasmCacheSizeRequestMessage represents a request to change the WASM module cache size (executor only)
+	SetWasmCacheSizeRequestMessage AdminMessageType = "set_wasm_cache_size"
+
+	// GetWasmCacheSizeRequestMessage represents a request to get the WASM module cache size (executor only)
+	GetWasmCacheSizeRequestMessage AdminMessageType = "get_wasm_cache_size"
 )
 
 // Admin command type constants for ForwardAdminCommand dispatching through the
@@ -82,7 +88,9 @@ const (
 	AdminCmdKeyAttestation = "key_attestation"
 	AdminCmdGetVersion     = "get_version"
 	AdminCmdSetLogLevel    = "set_log_level"
-	AdminCmdGetLogLevel    = "get_log_level"
+	AdminCmdGetLogLevel       = "get_log_level"
+	AdminCmdSetWasmCacheSize  = "set_wasm_cache_size"
+	AdminCmdGetWasmCacheSize  = "get_wasm_cache_size"
 )
 
 // SupportedLogLevels lists all valid log level strings accepted by SetLogLevel.
@@ -152,6 +160,21 @@ func HandleGetLogLevel(log logger.Logger, componentName string) (string, error)
 	return log.GetLevel(), nil
 }
 
+// SetWasmCacheSizeRequest is the payload for SetWasmCacheSizeRequestMessage.
+type SetWasmCacheSizeRequest struct {
+	MaxCachedModules int `json:"maxCachedModules"`
+}
+
+// SetWasmCacheSizeResponse is the response for SetWasmCacheSizeRequestMessage.
+type SetWasmCacheSizeResponse struct {
+	MaxCachedModules int `json:"maxCachedModules"`
+}
+
+// GetWasmCacheSizeResponse is the response for GetWasmCacheSizeRequestMessage.
+type GetWasmCacheSizeResponse struct {
+	MaxCachedModules int `json:"maxCachedModules"`
+}
+
 // AdminMessage represents an admin command message.
 // Target controls routing: "manager", "executor", "all", or "" (defaults to "all").
 type AdminMessage struct {

pkg/blockchain/mock_client.go

@@ -40,7 +40,7 @@ type MockClient struct {
 	reports          map[common.RequestIdType]*common.DeanonymizationReport
 	updatePayloads   map[common.RequestIdType]*common.UpdatePayload
 	eventSubscribers []chan<- interface{}
-	stateRoot        [32]byte
+	stateRoots       map[common.ApplicationIdType][32]byte   // per-app state roots (mirrors contract's applicationStateRoots)
 	chainID          *big.Int
 	blockNumber      uint64
 	*testutil.MockFunctions
@@ -56,6 +56,7 @@ func NewMockClient() *MockClient {
 		withdrawals:     make(map[common.ApplicationIdType]*[]common.Withdrawal),
 		reports:         make(map[common.RequestIdType]*common.DeanonymizationReport),
 		updatePayloads:  make(map[common.RequestIdType]*common.UpdatePayload),
+		stateRoots:      make(map[common.ApplicationIdType][32]byte),
 		MockFunctions:   testutil.NewMockFunctions(),
 	}
 }
@@ -189,12 +190,12 @@ func (c *MockClient) GetNextPendingRequest(ctx context.Context) (*common.Request
 	if f, ok := c.GetMockedFunc("GetNextPendingRequest"); ok {
 		return f.(func(context.Context) (*common.Request, [32]byte, error))(ctx)
 	}
-	var req *common.Request
 	if c.pendingRequests.Len() > 0 {
-		req = c.pendingRequests.Front().Value
+		req := c.pendingRequests.Front().Value
+		return req, c.stateRoots[req.ApplicationID], nil
 	}
 
-	return req, c.stateRoot, nil
+	return nil, [32]byte{}, nil // no pending request — return zero root (matches contract behavior)
 
 }
 
@@ -279,7 +280,7 @@ func (c *MockClient) SubmitStateUpdate(ctx context.Context, update *common.Updat
 		EncryptedState: nil, // State is stored separately in the data layer
 	}
 
-	c.stateRoot = update.NewStateRoot
+	c.stateRoots[update.ApplicationID] = update.NewStateRoot
 
 	// Emit events
 	c.emitEvents(update.Events)
@@ -430,7 +431,7 @@ func (c *MockClient) ClearAllData() {
 	c.reports = make(map[common.RequestIdType]*common.DeanonymizationReport)
 	c.failedRequests = orderedmap.NewOrderedMap[common.RequestIdType, *common.Request]()
 	c.updatePayloads = make(map[common.RequestIdType]*common.UpdatePayload)
-	c.stateRoot = [32]byte{}
+	c.stateRoots = make(map[common.ApplicationIdType][32]byte)
 	c.MockedFunctions = make(map[string]interface{})
 }