Skip to content

Commit b17361e

Browse files
committed
chore(common): sync with main
2 parents f3edc7c + fadd8c1 commit b17361e

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

.github/workflows/test-suite-e2e-tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ jobs:
214214
run: |
215215
./fhevm-cli test delegate-user-decryption
216216
217+
- name: Random operators test (subset)
218+
working-directory: test-suite/fhevm
219+
run: |
220+
./fhevm-cli test random-subset
221+
217222
- name: Show logs on test failure
218223
working-directory: test-suite/fhevm
219224
if: always()

protocol-contracts/governance/README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ And select `gateway-testnet` network then enter the `GovernanceOAppReceiver` scr
1919
npx hardhat lz:oapp:wire --oapp-config layerzero.config.testnet.ts
2020
```
2121

22-
5/ Verify contracts:
22+
5/ After the Safe and AdminModule have been deployed, run:
23+
```bash
24+
npx hardhat task:setAdminSafeModule --module <ADMIN_MODULE_ADDRESS> --network gateway-testnet
25+
```
26+
27+
6/ Verify contracts:
2328
```bash
2429
pnpm verify:etherscan:ethereum:testnet
2530
pnpm verify:etherscan:gateway:testnet

test-suite/fhevm/docker-compose/gateway-sc-docker-compose.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,11 @@ services:
7272
- type=gha,mode=max
7373
env_file:
7474
- ../env/staging/.env.gateway-sc.local
75+
# Using test parameters (--params-type 1) is currently not possible at it can make the random
76+
# tests fail with a high probability (1/2 chance), so we instead use default parameters (--params-type 0).
77+
# See https://github.com/zama-ai/fhevm-internal/issues/685
7578
command:
76-
- npx hardhat task:triggerKeygen --params-type 1
79+
- npx hardhat task:triggerKeygen --params-type 0
7780
depends_on:
7881
gateway-sc-add-pausers:
7982
condition: service_completed_successfully
@@ -94,8 +97,11 @@ services:
9497
- type=gha,mode=max
9598
env_file:
9699
- ../env/staging/.env.gateway-sc.local
100+
# Using test parameters (--params-type 1) is currently not possible for keygen (see above), and
101+
# CRS parameters must be of the same type as the keygen parameters.
102+
# See https://github.com/zama-ai/fhevm-internal/issues/685
97103
command:
98-
- npx hardhat task:triggerCrsgen --params-type 1 --max-bit-length 2048
104+
- npx hardhat task:triggerCrsgen --params-type 0 --max-bit-length 2048
99105
depends_on:
100106
gateway-sc-trigger-keygen:
101107
condition: service_completed_successfully

test-suite/fhevm/fhevm-cli

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function usage {
6060
echo -e " ${YELLOW}deploy${RESET} ${CYAN}[--build]${RESET} WIP: Deploy the full fhevm stack (optionally rebuild images)"
6161
echo -e " ${YELLOW}pause${RESET} ${CYAN}[CONTRACTS]${RESET} Pause specific contracts (host|gateway)"
6262
echo -e " ${YELLOW}unpause${RESET} ${CYAN}[CONTRACTS]${RESET} Unpause specific contracts (host|gateway)"
63-
echo -e " ${YELLOW}test${RESET} ${CYAN}[TYPE]${RESET} Run tests (input-proof|user-decryption|public-decryption|erc20|debug)"
63+
echo -e " ${YELLOW}test${RESET} ${CYAN}[TYPE]${RESET} Run tests (input-proof|user-decryption|public-decryption|delegate-user-decryption|random|random-subset|operators|erc20|debug)"
6464
echo -e " ${YELLOW}upgrade${RESET} ${CYAN}[SERVICE]${RESET} Upgrade specific service (host|gateway|connector|coprocessor|relayer|test-suite)"
6565
echo -e " ${YELLOW}clean${RESET} Remove all containers and volumes"
6666
echo -e " ${YELLOW}logs${RESET} ${CYAN}[SERVICE]${RESET} View logs for a specific service"
@@ -264,6 +264,10 @@ case $COMMAND in
264264
log_message="${LIGHT_BLUE}${BOLD}[TEST] RANDOM OPERATORS${RESET}"
265265
docker_args+=("-g" "generate and decrypt|generating rand in reverting sub-call|upper bound and decrypt")
266266
;;
267+
random-subset)
268+
log_message="${LIGHT_BLUE}${BOLD}[TEST] RANDOM OPERATORS (SUBSET)${RESET}"
269+
docker_args+=("-g" "64 bits generate and decrypt|generating rand in reverting sub-call|64 bits generate with upper bound and decrypt")
270+
;;
267271
debug)
268272
echo -e "${LIGHT_BLUE}${BOLD}[DEBUG] Starting debug session...${RESET}"
269273
docker exec -it fhevm-test-suite-e2e-debug bash

0 commit comments

Comments
 (0)