Add submitUserOp integration tests (#3619)

* add first version

* add test in ci

* Update README

* fmt

* Updated the CI configuration to include JSON-RPC and SubmitUserOp tests;

* update ts_submit_user_op_test.sh

* Update the deployment script to support outputting contract addresses

* Update CI configuration

* fix JSON-RPC mock test file

* fix jsonrpc_mock_test ci

* test contract addresses

* add logs

* Add debug logs in the user operation

* fix sh

* add gas

* Optimize the test scripts, remove redundant debugging information

* rename yml file

* fmt

* fix container_name

* Update the submission user operation test to obtain the root signer address

* Added functionality for new user operation submission testing.

* add logs

* add logs

* fix steps from aa-demo-app

* Enhance user operation submission testing

* Optimize user operation submission testing.

* Optimize the log output

* fix services name

* rename file

* fix file name one more

* fix OMNI_WORKER_ENDPOINT

Author: 0xverin

.github/workflows/ci.yml

@@ -959,6 +959,7 @@ jobs:
         include:
           - test_name: omni-account-test
           - test_name: jsonrpc-mock-tests
+          - test_name: submit-user-op-tests
           # disable it during RPC method refactoring
           # - test_name: omni-client-sdk-test
     name: ${{ matrix.test_name }}

tee-worker/omni-executor/aa-contracts/deploy-docker.sh

@@ -17,6 +17,7 @@ CHAIN_ID=31337
 DEPLOYER_ADDRESS="0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
 OMNI_EXECUTOR_SIGNER="0x90F79bf6EB2c4f870365E785982E1f101E93b906"
 OUTPUT_FILE="/shared/contract-addresses.env"
+JSON_OUTPUT_FILE="/shared/deployed-addresses.json"
 
 # Function to check if anvil is running
 check_anvil() {
@@ -100,7 +101,18 @@ deploy_contracts() {
         echo "OE_TEST_USDC_ADDRESS=$USDC_ADDRESS" >> "$OUTPUT_FILE"
         echo "OE_TEST_USDT_ADDRESS=$USDT_ADDRESS" >> "$OUTPUT_FILE"
 
-        echo "📝 Contract addresses written to $OUTPUT_FILE"
+        # Also write addresses to JSON format for test scripts
+        cat > "$JSON_OUTPUT_FILE" << EOF
+{
+  "EntryPoint": "$ENTRYPOINT_ADDRESS",
+  "OmniAccountFactory": "$FACTORY_ADDRESS",
+  "SimplePaymaster": "$PAYMASTER_ADDRESS",
+  "TestUSDC": "$USDC_ADDRESS",
+  "TestUSDT": "$USDT_ADDRESS"
+}
+EOF
+
+        echo "📝 Contract addresses written to $OUTPUT_FILE and $JSON_OUTPUT_FILE"
         echo "✅ Deployment complete!"
 
     else

tee-worker/omni-executor/cli/ts_jsonrpc_mock_test.sh

@@ -29,6 +29,6 @@ cd /ts-tests
 pnpm install --force
 
 echo "Running JSON-RPC tests"
-OMNI_WORKER_ENDPOINT=http://omni-executor:2100 pnpm --filter jsonrpc-mock-tests test jsonrpc.test.ts
+OMNI_WORKER_ENDPOINT=http://omni-executor:2100 pnpm --filter jsonrpc-mock-tests test jsonrpc_mock_test.test.ts
 
-echo "JSON-RPC tests completed successfully" 
+echo "JSON-RPC tests completed successfully"

tee-worker/omni-executor/cli/ts_submit_user_op_test.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Copyright 2020-2024 Trust Computing GmbH.
+
+# Enable strict error handling: exit on error (-e), error on undefined vars (-u), exit on pipe failures (-o pipefail)
+set -euo pipefail
+
+# Parse command line options:
+# -u: Node URL to connect to
+while getopts ":u" opt; do
+    case $opt in
+        u)
+            NODE_URL=$OPTARG
+            ;;
+        ?)
+            echo "Invalid option: -${OPTARG}."
+            exit 1
+            ;;
+    esac
+done
+
+NODE_URL=${NODE_URL:-"http://heima-node:9944"}
+echo "Using node url $NODE_URL"
+
+echo "Running SubmitUserOp integration tests"
+
+echo "Installing dependencies and building ts-tests"
+cd /ts-tests
+pnpm install --force
+
+# Set environment variables for the SubmitUserOp test
+export TEST_RPC_URL="http://ethereum-node:8545"
+export TEST_CHAIN_ID="31337"
+export TEE_WORKER_RPC_URL="http://omni-executor:2100"
+
+# Wait for contract deployment to complete
+echo "Waiting for contract deployment..."
+DEPLOYED_ADDRESSES_FILE="/shared/deployed-addresses.json"
+MAX_WAIT=120  # 2 minutes
+WAIT_COUNT=0
+
+
+while [ $WAIT_COUNT -lt $MAX_WAIT ]; do
+    if [ -f "$DEPLOYED_ADDRESSES_FILE" ]; then
+        echo "Contract deployment file found!"
+        break
+    fi
+    
+    
+    sleep 1
+    WAIT_COUNT=$((WAIT_COUNT + 1))
+    if [ $((WAIT_COUNT % 10)) -eq 0 ]; then
+        echo "Still waiting for contracts... (${WAIT_COUNT}s)"
+    fi
+done
+
+# Contract addresses should be available from the shared volume
+if [ -f "/shared/deployed-addresses.json" ]; then
+    echo "Loading deployed contract addresses..."
+    export TEST_ENTRY_POINT_ADDRESS=$(cat /shared/deployed-addresses.json | jq -r '.EntryPoint // "0x5FbDB2315678afecb367f032d93F642f64180aa3"')
+    export TEST_FACTORY_ADDRESS=$(cat /shared/deployed-addresses.json | jq -r '.OmniAccountFactory // "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"')
+    export TEST_USDC_ADDRESS=$(cat /shared/deployed-addresses.json | jq -r '.TestUSDC // "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"')
+    export TEST_USDT_ADDRESS=$(cat /shared/deployed-addresses.json | jq -r '.TestUSDT // "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"')
+    echo "Successfully loaded contract addresses from deployment file"
+else
+    echo "⚠️ Contract deployment file not found, using default addresses..."
+    # These are deterministic addresses from Anvil/Hardhat local blockchain
+    # Anvil uses CREATE2 with predictable deployer nonce, so contracts deploy to same addresses
+    # See: https://book.getfoundry.sh/reference/anvil/#deterministic-addresses
+    export TEST_ENTRY_POINT_ADDRESS="0x5FbDB2315678afecb367f032d93F642f64180aa3"  # First deployment (nonce=0)
+    export TEST_FACTORY_ADDRESS="0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"      # Second deployment (nonce=1) 
+    export TEST_USDC_ADDRESS="0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"         # Third deployment (nonce=2)
+    export TEST_USDT_ADDRESS="0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"         # Fourth deployment (nonce=3)
+fi
+
+echo "Environment configured for SubmitUserOp test"
+
+echo "Running SubmitUserOp tests"
+OMNI_WORKER_ENDPOINT=http://omni-executor:2100 PARACHAIN_ENDPOINT=ws://heima-node:9944 pnpm --filter jsonrpc-mock-tests test submitUserOp.test.ts
+
+echo "SubmitUserOp tests completed successfully"

tee-worker/omni-executor/docker/jsonrpc-mock-tests.yml

@@ -1,7 +1,7 @@
 services:
   jsonrpc-mock-tests:
     image: litentry/omni-executor:latest
-    container_name: litentry-jsonrpc-mock-tests
+    container_name: litentry-jsonrpc-mock-test
     volumes:
       - ../ts-tests:/ts-tests
       - ../../client-api:/client-api

tee-worker/omni-executor/docker/submit-user-op-tests.yml

@@ -0,0 +1,28 @@
+services:
+  submit-user-op-tests:
+    image: litentry/omni-executor:latest
+    container_name: litentry-submit-user-op-tests
+    volumes:
+      - ../ts-tests:/ts-tests
+      - ../../client-api:/client-api
+      - ../cli:/usr/local/executor-worker-cli
+      - shared-data:/shared
+    build:
+      context: ${PWD}/../../
+      dockerfile: tee-worker/omni-executor/Dockerfile
+      target: executor-worker
+    depends_on:
+      omni-executor:
+        condition: service_healthy
+        restart: true
+      aa-contracts-deploy:
+        condition: service_completed_successfully
+    networks:
+      - litentry-test-network
+    entrypoint: "sh -c '/usr/local/executor-worker-cli/ts_submit_user_op_test.sh 3>&1' "
+    restart: "no"
+volumes:
+  shared-data:
+networks:
+  litentry-test-network:
+    driver: bridge

tee-worker/omni-executor/ts-tests/jsonrpc-mock-tests/README.md

@@ -1,19 +1,59 @@
 # JSON-RPC Mock Tests
 
-This project contains TypeScript-based mock tests for the Omni Executor JSON-RPC API endpoints.
+This project contains TypeScript-based integration tests for the Omni Executor JSON-RPC API endpoints, including:
+
+-   **JSON-RPC API Tests** (`jsonrpc_mock_test`) - Basic API endpoint testing
+-   **SubmitUserOp Integration Tests** (`submitUserOp.test.ts`) - Complete Account Abstraction flow testing
 
 ## Quick Start
 
 ### Local Development Setup
 
-1. **Start the worker services:**
+1. **Start the complete development environment:**
 
     ```bash
-    make build-docker-test
-    make start-test
+    cd ../../docker
+    docker compose up
     ```
 
-2. **Run the JSON-RPC tests:**
+    This will automatically:
+
+    - Deploy all Account Abstraction contracts
+    - Start Anvil (Ethereum node) on port 8545
+    - Start Omni Executor with mock server on port 2100
+    - Start Heima node on port 9944
+    - Set up all required environment variables
+
+2. **Run all tests:**
+
     ```bash
-    pnpm --filter jsonrpc-mock-tests run test jsonrpc.test.ts
+    cd ../ts-tests/jsonrpc-mock-tests
+    pnpm install
+    pnpm test
     ```
+
+3. **Run specific tests:**
+
+    ```bash
+    # JSON-RPC API tests only
+    pnpm test jsonrpc_mock_test
+
+    # SubmitUserOp integration tests only
+    pnpm test submitUserOp.test.ts
+    ```
+
+## Available Services
+
+When running `docker compose up`, the following services are available:
+
+-   **Omni-Executor RPC**: http://localhost:2100
+-   **Mock Server**: http://localhost:3456
+-   **Ethereum Node (Anvil)**: http://localhost:8545
+
+## Contract Addresses
+
+All contracts are automatically deployed and configured. To view deployed addresses:
+
+```bash
+docker compose logs aa-contracts-deploy
+```

tee-worker/omni-executor/ts-tests/jsonrpc-mock-tests/config.ts

@@ -0,0 +1,93 @@
+// Test configuration constants
+export const TEST_CONFIG = {
+    // Network configuration
+    RPC_URL: process.env.TEST_RPC_URL || 'http://127.0.0.1:8545',
+    CHAIN_ID: process.env.TEST_CHAIN_ID ? parseInt(process.env.TEST_CHAIN_ID) : 31337,
+
+    // Test accounts from Anvil/Hardhat default test mnemonic:
+    // "test test test test test test test test test test test junk"
+    // These addresses are deterministically generated and have public private keys
+    ACCOUNTS: {
+        DEPLOYER: {
+            address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266' as const, // Account #0
+            privateKey: '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80' as const,
+        },
+        USER: {
+            address: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8' as const, // Account #1
+            privateKey: '0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d' as const,
+        },
+        TEE_WORKER: {
+            address: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC' as const, // Account #2
+            privateKey: '0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a' as const,
+        },
+    },
+
+    // Contract addresses - these are deployed by local-deploy.sh
+    CONTRACTS: {
+        ENTRY_POINT: process.env.TEST_ENTRY_POINT_ADDRESS || '0x5FbDB2315678afecb367f032d93F642f64180aa3',
+        OMNI_ACCOUNT_FACTORY: process.env.TEST_FACTORY_ADDRESS || '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
+        SIMPLE_PAYMASTER: process.env.TEST_PAYMASTER_ADDRESS || '0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0',
+        TEST_USDC: process.env.TEST_USDC_ADDRESS || '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9',
+        TEST_USDT: process.env.TEST_USDT_ADDRESS || '0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9',
+    },
+
+    // TEE Worker RPC configuration
+    TEE_WORKER: {
+        RPC_URL: process.env.TEE_WORKER_RPC_URL || 'http://localhost:2100',
+        CLIENT_ID: 'wildmeta' as const,
+        CHAIN_TYPE: 'Evm' as const,
+        SIGNER_INDEX: 0,
+    },
+
+    // Gas configuration for UserOperations
+    GAS_CONFIG: {
+        CALL_GAS_LIMIT: BigInt(2000000),
+        VERIFICATION_GAS_LIMIT: BigInt(3000000),
+        PRE_VERIFICATION_GAS: BigInt(100000),
+        MAX_FEE_PER_GAS: BigInt(20000000000), // 20 gwei
+        MAX_PRIORITY_FEE_PER_GAS: BigInt(1000000000), // 1 gwei
+    },
+
+    // Token amounts
+    AMOUNTS: {
+        FUNDING_ETH: '1', // ETH amount to fund OmniAccount
+        MINT_TOKENS: '1000', // Amount of test tokens to mint
+        TRANSFER_TOKENS: '500', // Amount to transfer to OmniAccount
+        SEND_TOKENS: '100', // Amount to send in test transaction
+    },
+
+    // UserOp signer types
+    SIGNER_TYPES: {
+        OWNER: 0x00,
+        ROOT_KEY: 0x01,
+        SESSION_KEY: 0x02,
+        PASSKEY: 0x03,
+    } as const,
+
+    // Test timeouts
+    TIMEOUTS: {
+        DEFAULT: 120000, // 2 minutes
+        TRANSACTION: 30000, // 30 seconds
+    },
+} as const;
+
+// Utility type for contract addresses
+export type ContractAddress = `0x${string}`;
+
+// Environment validation
+export function validateTestEnvironment() {
+    const requiredEnvVars = ['TEST_RPC_URL', 'TEST_ENTRY_POINT_ADDRESS', 'TEST_FACTORY_ADDRESS'];
+
+    const missing = requiredEnvVars.filter((envVar) => envVar.startsWith('TEST_') && !process.env[envVar]);
+
+    if (missing.length > 0) {
+        console.warn('⚠️  Missing environment variables (using defaults):', missing.join(', '));
+        console.warn('   Set these variables or run local-deploy.sh to deploy contracts');
+    }
+
+    return {
+        rpcUrl: TEST_CONFIG.RPC_URL,
+        chainId: TEST_CONFIG.CHAIN_ID,
+        contracts: TEST_CONFIG.CONTRACTS,
+    };
+}