test(test-suite): fix pauser tasks and test host cleanup (#985)

melanciani · web-flow · commit 18898aa10463 · 2025-10-03T19:45:05.000+02:00
* chore(library-solidity): update relayer-sdk version
diff --git a/gateway-contracts/.env.example b/gateway-contracts/.env.example
@@ -135,12 +135,14 @@ PAUSER_ADDRESS_0="0x6591319B97979Acc59b7191A8B4Ec381375bFc92" # accounts[23] (ad
 # Pauser 2
 PAUSER_ADDRESS_1="0xb19e21437c47A541842bB84b018d3955462B35De" # accounts[24] (address)
 
-# GatewayConfig contract address
-# This address is required during the production deployment, at which point this environment variable
-# is dynamically set after contracts are deployed.
-# For tests, this address is read directly from the addresses/.env.gateway file, so the value in this file is ignored.
+# Gateway contract address
+# These addresses are required during the production deployment, at which point these environment 
+# variables are dynamically set after contracts are deployed.
+# For tests, these addresses are read directly from the addresses/.env.gateway file, so the following 
+# values are ignored
 GATEWAY_CONFIG_ADDRESS="0xa50F5243C70c80a8309e3D39d8c9d958cDa83979" # (address)
 KMS_GENERATION_ADDRESS="0x87A5b1152AA51728258dbc1AA54B6a83DCd1d3dd" # (address)
+PAUSER_SET_ADDRESS="0xc1D733116990ce3D9e54F9eCf48a1cdD441Af4f9" # (address)
 
 # The first pauser's private key
 # This is required for local tests and running the pausing task. It must correspond to one of the pauser's private key
diff --git a/gateway-contracts/docker-compose.yml b/gateway-contracts/docker-compose.yml
@@ -65,6 +65,29 @@ services:
     volumes:
       - addresses-volume:/app/addresses
 
+  add-pausers:
+    container_name: add-pausers
+    build:
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+      - ./.env
+    environment:
+      - HARDHAT_NETWORK=staging
+      - CHAIN_ID_GATEWAY=54321
+      - RPC_URL=http://anvil-node:8546
+    command:
+      - npx hardhat task:addGatewayPausers --use-internal-proxy-address true
+    depends_on:
+      anvil-node:
+        condition: service_started
+      deploy-gateway-contracts:
+        condition: service_completed_successfully
+    # Addresses needs to be mounted even though we don't use them in the task because all contracts
+    # are compiled, and most of them import these addresses.
+    volumes:
+      - addresses-volume:/app/addresses
+
   trigger-keygen:
     container_name: trigger-keygen
     build:
diff --git a/gateway-contracts/docs/getting-started/deployment/env_variables.md b/gateway-contracts/docs/getting-started/deployment/env_variables.md
@@ -212,3 +212,11 @@ GATEWAY_CONFIG_ADDRESS="0xC7D45661a345eC5cA0e8521CFEF7e32FDA0Daa68" # (address)
 ```
 
 This (static) address is needed for adding host chains to the GatewayConfig contract separately. In a proper production setting, this environment variable needs to be dynamically set after deploying the contracts.
+
+- PauserSet address
+
+```bash
+PAUSER_SET_ADDRESS="0xc1D733116990ce3D9e54F9eCf48a1cdD441Af4f9" # (address)
+```
+
+This (static) address is needed for managing pausers in the PauserSet contract separately. In a proper production setting, this environment variable needs to be dynamically set after deploying the contracts.
diff --git a/host-contracts/.env.example b/host-contracts/.env.example
@@ -29,6 +29,13 @@ PAUSER_ADDRESS_0="0xa44366bAA26296c1409AD1e284264212029F02f1" # accounts[2] (add
 # Pauser 2
 PAUSER_ADDRESS_1="0xc1d91b49A1B3D1324E93F86778C44a03f1063f1b" # accounts[3] (address)
 
+# Host contract address
+# These addresses are required during the production deployment, at which point these environment 
+# variables are dynamically set after contracts are deployed.
+# For tests, these addresses are read directly from the addresses/.env.gateway file, so the following 
+# values are ignored
+PAUSER_SET_CONTRACT_ADDRESS="0x44aA028fd264C76BF4A8f8B4d8A5272f6AE25CAc" # (address)
+
 # The first pauser's private key
 # This is required for local tests and running the pausing task. It must correspond to one of the pauser's private key
 PAUSER_PRIVATE_KEY="0x7ae52cf0d3011ef7fecbe22d9537aeda1a9e42a0596e8def5d49970eb59e7a40" # accounts[2], private key (bytes32)
diff --git a/host-contracts/Dockerfile b/host-contracts/Dockerfile
@@ -40,6 +40,8 @@ COPY --chown=fhevm:fhevm host-contracts/tasks ./tasks/
 COPY --chown=fhevm:fhevm host-contracts/lib ./lib/
 COPY --chown=fhevm:fhevm host-contracts/decryptionOracle ./decryptionOracle/
 
+# Create addresses directory for storing proxy contract addresses
+RUN mkdir -p ./addresses && chown fhevm:fhevm ./addresses
 
 # Pre-compile proxy contracts
 RUN npx hardhat clean && \
diff --git a/host-contracts/docker-compose.yml b/host-contracts/docker-compose.yml
@@ -35,3 +35,28 @@ services:
       - CHAIN_ID_GATEWAY=54321
     command:
       - npx hardhat task:deployAllHostContracts
+    volumes:
+      - addresses-volume:/app/host-contracts/addresses
+
+  fhevm-sc-add-pausers:
+    container_name: fhevm-sc-add-pausers
+    build:
+      context: ../
+      dockerfile: host-contracts/Dockerfile
+    env_file:
+      - ./.env
+    environment:
+      - HARDHAT_NETWORK=${HARDHAT_NETWORK:-staging}
+      - CHAIN_ID_GATEWAY=54321
+    command:
+      - npx hardhat task:addHostPausers --use-internal-pauser-set-address true
+    depends_on:
+      fhevm-sc-deploy:
+        condition: service_completed_successfully
+    # Addresses needs to be mounted even though we don't use them in the task because the PauserSet
+    # contract is compiled, and it imports these addresses.
+    volumes:
+      - addresses-volume:/app/host-contracts/addresses
+
+volumes:
+  addresses-volume:
diff --git a/test-suite/e2e/contracts/E2ECoprocessorConfigLocal.sol b/test-suite/e2e/contracts/E2ECoprocessorConfigLocal.sol
@@ -8,9 +8,9 @@ library DefaultCoprocessorConfig {
         return
             CoprocessorConfig({
                 ACLAddress: 0x05fD9B5EFE0a996095f42Ed7e77c390810CF660c,
-                CoprocessorAddress: 0x12B064FB845C1cc05e9493856a1D637a73e944bE,
-                DecryptionOracleAddress: 0xAb30999D17FAAB8c95B2eCD500cFeFc8f658f15d,
-                KMSVerifierAddress: 0xcCAe95fF1d11656358E782570dF0418F59fA40e1
+                CoprocessorAddress: 0xcCAe95fF1d11656358E782570dF0418F59fA40e1,
+                DecryptionOracleAddress: 0xD0fA6194Db6cfCDF733c64F1F272AeA66e968D3C,
+                KMSVerifierAddress: 0xa1880e99d86F081E8D3868A8C4732C8f65dfdB11
             });
     }
 }
diff --git a/test-suite/fhevm/docker-compose/gateway-sc-docker-compose.yml b/test-suite/fhevm/docker-compose/gateway-sc-docker-compose.yml
@@ -14,7 +14,7 @@ services:
     command:
       - npx hardhat task:deployAllGatewayContracts
     volumes:
-      - addresses-volume:/app/addresses
+      - addresses-volume:/app/addresses  # workdir in host's Dockerfile is /app
 
   gateway-sc-add-network:
     container_name: gateway-sc-add-network
@@ -36,7 +36,7 @@ services:
     # Addresses needs to be mounted even though we don't use them in the task because all contracts
     # are compiled, and most of them import these addresses.
     volumes:
-      - addresses-volume:/app/addresses
+      - addresses-volume:/app/addresses  # workdir in host's Dockerfile is /app
 
   gateway-sc-add-pausers:
     container_name: gateway-sc-add-pausers
@@ -53,8 +53,12 @@ services:
     command:
       - npx hardhat task:addGatewayPausers
     depends_on:
-      gateway-sc-deploy:
+      gateway-sc-add-network:
         condition: service_completed_successfully
+    # Addresses needs to be mounted even though we don't use them in the task because the PauserSet
+    # contract is compiled, and it imports these addresses.
+    volumes:
+      - addresses-volume:/app/addresses  # workdir in host's Dockerfile is /app
 
   gateway-sc-trigger-keygen:
     container_name: gateway-sc-trigger-keygen
@@ -71,12 +75,12 @@ services:
     command:
       - npx hardhat task:triggerKeygen --params-type 1
     depends_on:
-      gateway-sc-add-network:
+      gateway-sc-add-pausers:
         condition: service_completed_successfully
     # Addresses needs to be mounted even though we don't use them in the task because all contracts
     # are compiled, and most of them import these addresses.
     volumes:
-      - addresses-volume:/app/addresses
+      - addresses-volume:/app/addresses  # workdir in host's Dockerfile is /app
 
   gateway-sc-trigger-crsgen:
     container_name: gateway-sc-trigger-crsgen
@@ -98,7 +102,7 @@ services:
     # Addresses needs to be mounted even though we don't use them in the task because all contracts
     # are compiled, and most of them import these addresses.
     volumes:
-      - addresses-volume:/app/addresses
+      - addresses-volume:/app/addresses  # workdir in host's Dockerfile is /app
 
 volumes:
   addresses-volume:
diff --git a/test-suite/fhevm/docker-compose/host-sc-docker-compose.yml b/test-suite/fhevm/docker-compose/host-sc-docker-compose.yml
@@ -13,9 +13,11 @@ services:
       - ../env/staging/.env.host-sc.local
     command:
       - npx hardhat task:deployAllHostContracts
+    volumes:
+      - addresses-volume:/app/host-contracts/addresses  # workdir in host's Dockerfile is /app/host-contracts
 
   host-sc-add-pausers:
-    container_name: host-add-pausers
+    container_name: host-sc-add-pausers
     image: ghcr.io/zama-ai/fhevm/host-contracts:${HOST_VERSION}
     build:
       context: ../../../host-contracts
@@ -31,3 +33,10 @@ services:
     depends_on:
       host-sc-deploy:
         condition: service_completed_successfully
+    # Addresses needs to be mounted even though we don't use them in the task because the PauserSet
+    # contract is compiled, and it imports these addresses.
+    volumes:
+      - addresses-volume:/app/host-contracts/addresses  # workdir in host's Dockerfile is /app/host-contracts
+
+volumes:
+  addresses-volume:
diff --git a/test-suite/fhevm/docker-compose/relayer-docker-compose.yml b/test-suite/fhevm/docker-compose/relayer-docker-compose.yml
@@ -1,6 +1,7 @@
 services:
   relayer:
     container_name: fhevm-relayer
+    platform: linux/amd64
     image: ghcr.io/zama-ai/console/relayer:${RELAYER_VERSION}
     env_file:
       - ../env/staging/.env.relayer.local
diff --git a/test-suite/fhevm/env/staging/.env.coprocessor b/test-suite/fhevm/env/staging/.env.coprocessor
@@ -36,8 +36,8 @@ FHE_KEY_ID=421c8116661b2150a46badd3956564ad8d4981718d30fa66a36342bee1b13dbf
 RPC_URL=ws://host-node:8545
 CHAIN_ID=12345
 ACL_CONTRACT_ADDRESS=0x05fD9B5EFE0a996095f42Ed7e77c390810CF660c
-INPUT_VERIFIER_ADDRESS=0xa1880e99d86F081E8D3868A8C4732C8f65dfdB11
-FHEVM_EXECUTOR_CONTRACT_ADDRESS=0x12B064FB845C1cc05e9493856a1D637a73e944bE
+INPUT_VERIFIER_ADDRESS=0x857Ca72A957920Fa0FB138602995839866Bd4005
+FHEVM_EXECUTOR_CONTRACT_ADDRESS=0xcCAe95fF1d11656358E782570dF0418F59fA40e1
 
 # =============================================================================
 # GATEWAY NETWORK CONFIGURATION - SENSITIVE
diff --git a/test-suite/fhevm/env/staging/.env.gateway-sc b/test-suite/fhevm/env/staging/.env.gateway-sc
@@ -6,6 +6,7 @@ RPC_URL=http://gateway-node:8546
 CHAIN_ID_GATEWAY=54321
 GATEWAY_CONFIG_ADDRESS=0x812b06e1CDCE800494b79fFE4f925A504a9A9810
 KMS_GENERATION_ADDRESS=0x35760912360E875DA50D40a74305575c23D55783
+PAUSER_SET_ADDRESS=0x1ceFA8E3F3271358218B52c33929Cf76078004c1
 
 # =============================================================================
 # WALLET CONFIGURATION - SENSITIVE
@@ -70,7 +71,7 @@ NUM_HOST_CHAINS=1
 
 # Host chain 1
 HOST_CHAIN_CHAIN_ID_0=12345
-HOST_CHAIN_FHEVM_EXECUTOR_ADDRESS_0=0x12B064FB845C1cc05e9493856a1D637a73e944bE
+HOST_CHAIN_FHEVM_EXECUTOR_ADDRESS_0=0xcCAe95fF1d11656358E782570dF0418F59fA40e1
 HOST_CHAIN_ACL_ADDRESS_0=0x05fD9B5EFE0a996095f42Ed7e77c390810CF660c
 HOST_CHAIN_NAME_0=
 HOST_CHAIN_WEBSITE_0=
diff --git a/test-suite/fhevm/env/staging/.env.host-sc b/test-suite/fhevm/env/staging/.env.host-sc
@@ -4,6 +4,7 @@
 HARDHAT_NETWORK=staging
 RPC_URL=http://host-node:8545
 CHAIN_ID_GATEWAY=54321
+PAUSER_SET_CONTRACT_ADDRESS=0x52054F36036811ca418be59e41Fc6DD1b9e4F4c8
 
 # =============================================================================
 # WALLET CONFIGURATION - SENSITIVE
diff --git a/test-suite/fhevm/env/staging/.env.relayer b/test-suite/fhevm/env/staging/.env.relayer
@@ -28,7 +28,7 @@ APP_NETWORKS__GATEWAY__MAX_RECONNECTION_ATTEMPTS=3
 
 
 # Contract addresses
-APP_CONTRACTS__DECRYPTION_ORACLE_ADDRESS=0xAb30999D17FAAB8c95B2eCD500cFeFc8f658f15d
+APP_CONTRACTS__DECRYPTION_ORACLE_ADDRESS=0xD0fA6194Db6cfCDF733c64F1F272AeA66e968D3C
 APP_CONTRACTS__DECRYPTION_ADDRESS=0xF0bFB159C7381F7CB332586004d8247252C5b816
 APP_CONTRACTS__INPUT_VERIFICATION_ADDRESS=0x3b12Fc766Eb598b285998877e8E90F3e43a1F8d2
 APP_CONTRACTS__USER_DECRYPT_SHARES_THRESHOLD=1
diff --git a/test-suite/fhevm/env/staging/.env.test-suite b/test-suite/fhevm/env/staging/.env.test-suite
@@ -18,13 +18,13 @@ DECRYPTION_ADDRESS=0xF0bFB159C7381F7CB332586004d8247252C5b816
 INPUT_VERIFICATION_ADDRESS=0x3b12Fc766Eb598b285998877e8E90F3e43a1F8d2
 
 ## Oracle
-DECRYPTION_ORACLE_ADDRESS=0xAb30999D17FAAB8c95B2eCD500cFeFc8f658f15d
+DECRYPTION_ORACLE_ADDRESS=0xD0fA6194Db6cfCDF733c64F1F272AeA66e968D3C
 
 ## Host
-KMS_VERIFIER_CONTRACT_ADDRESS=0xcCAe95fF1d11656358E782570dF0418F59fA40e1
+KMS_VERIFIER_CONTRACT_ADDRESS=0xa1880e99d86F081E8D3868A8C4732C8f65dfdB11
 ACL_CONTRACT_ADDRESS=0x05fD9B5EFE0a996095f42Ed7e77c390810CF660c
-INPUT_VERIFIER_CONTRACT_ADDRESS=0xa1880e99d86F081E8D3868A8C4732C8f65dfdB11
-FHEVM_EXECUTOR_CONTRACT_ADDRESS=0x12B064FB845C1cc05e9493856a1D637a73e944bE
+INPUT_VERIFIER_CONTRACT_ADDRESS=0x857Ca72A957920Fa0FB138602995839866Bd4005
+FHEVM_EXECUTOR_CONTRACT_ADDRESS=0xcCAe95fF1d11656358E782570dF0418F59fA40e1
 
 # =============================================================================
 # SERVICE ENDPOINTS
diff --git a/test-suite/fhevm/fhevm-cli b/test-suite/fhevm/fhevm-cli
@@ -25,20 +25,20 @@ export CONNECTOR_TX_SENDER_VERSION=${CONNECTOR_TX_SENDER_VERSION:-"v0.9.0-3"}
 # Coprocessor services.
 export DB_MIGRATION_VERSION=${DB_MIGRATION_VERSION:-"v0.9.0-3"}
 export GW_LISTENER_VERSION=${GW_LISTENER_VERSION:-"v0.9.0-3"}
-export HOST_LISTENER_VERSION=${HOST_LISTENER_VERSION:-"v0.9.0-3"}
+export HOST_LISTENER_VERSION=${HOST_LISTENER_VERSION:-"d33e050"}
 export TX_SENDER_VERSION=${TX_SENDER_VERSION:-"v0.9.0-3"}
 export TFHE_WORKER_VERSION=${TFHE_WORKER_VERSION:-"v0.9.0-3"}
 export SNS_WORKER_VERSION=${SNS_WORKER_VERSION:-"v0.9.0-3"}
 export ZKPROOF_WORKER_VERSION=${ZKPROOF_WORKER_VERSION:-"v0.9.0-3"}
 
 # Gateway and Host contracts.
 export GATEWAY_VERSION=${GATEWAY_VERSION:-"v0.9.0-3"}
-export HOST_VERSION=${HOST_VERSION:-"v0.9.0-3"}
+export HOST_VERSION=${HOST_VERSION:-"d33e050"}
 
 # Other services.
 export CORE_VERSION=${CORE_VERSION:-"v0.12.0"}
 export RELAYER_VERSION=${RELAYER_VERSION:-"v0.5.0-2"}
-export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"v0.9.0-3"}
+export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"4097cde"}
 
 
 function print_logo() {
@@ -225,7 +225,7 @@ case $COMMAND in
   upgrade)
     print_logo
     SERVICE=$1
-    if [[ ! $SERVICE =~ ^(minio|core|gateway|host|connector|coprocessor|relayer|test-suite)$ ]]; then
+    if [[ ! $SERVICE =~ ^(minio|core|gateway-node|gateway-sc|host-node|host-sc|kms-connector|coprocessor|relayer|test-suite)$ ]]; then
       echo -e "${RED}[ERROR]${RESET} ${BOLD}Unknown service: $SERVICE${RESET}"
       usage
       exit 1
diff --git a/test-suite/fhevm/scripts/deploy-fhevm-stack.sh b/test-suite/fhevm/scripts/deploy-fhevm-stack.sh
@@ -338,10 +338,11 @@ ${RUN_COMPOSE} "gateway-sc" "Gateway contracts" \
     "gateway-sc-deploy:complete" \
     "gateway-sc-add-network:complete" \
     "gateway-sc-trigger-keygen:complete" \
-    "gateway-sc-trigger-crsgen:complete"
+    "gateway-sc-trigger-crsgen:complete" \
+    "gateway-sc-add-pausers:complete"
 
 # Setup Host contracts
-${RUN_COMPOSE} "host-sc" "Host contracts" "host-sc-deploy:complete"
+${RUN_COMPOSE} "host-sc" "Host contracts" "host-sc-deploy:complete" "host-sc-add-pausers:complete"
 
 # Run Relayer (External dependency)
 ${RUN_COMPOSE} "relayer" "Relayer Services" \

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ library DefaultCoprocessorConfig {`
`8`	`8`	`return`
`9`	`9`	`CoprocessorConfig({`
`10`	`10`	`ACLAddress: 0x05fD9B5EFE0a996095f42Ed7e77c390810CF660c,`
`11`		`- CoprocessorAddress: 0x12B064FB845C1cc05e9493856a1D637a73e944bE,`
`12`		`- DecryptionOracleAddress: 0xAb30999D17FAAB8c95B2eCD500cFeFc8f658f15d,`
`13`		`- KMSVerifierAddress: 0xcCAe95fF1d11656358E782570dF0418F59fA40e1`
	`11`	`+ CoprocessorAddress: 0xcCAe95fF1d11656358E782570dF0418F59fA40e1,`
	`12`	`+ DecryptionOracleAddress: 0xD0fA6194Db6cfCDF733c64F1F272AeA66e968D3C,`
	`13`	`+ KMSVerifierAddress: 0xa1880e99d86F081E8D3868A8C4732C8f65dfdB11`
`14`	`14`	`});`
`15`	`15`	`}`
`16`	`16`	`}`