Skip to content

Commit 803f104

Browse files
eudelins-zamadartdart26zmalatraxmanoranjith
authored
feat(common): simple acl (#2072)
* refactor(coprocessor): remove ACL propagate ops (#1825) * chore(gateway-contracts): remove MultichainACL contract (#1904) * chore(gateway-contracts): remove MultichainACL from gateway-contracts * chore(coprocessor): remove multichainACL contract from coprocessor * chore(gateway-contracts): remove unused param from internal Decryption.sol function * chore(gateway-contracts): remove multichainACL checks from Decryption.sol tests * chore(gateway-contracts): update rust bindings * chore(gateway-contracts): make conformance * chore(gateway-contracts): remove multichainACL test from delegated user decrypt * chore(gateway-contracts): update bindings with foundry v1.3.1 as in CI * chore(gateway-contracts): bump Decryption.sol upgradeable version * chore(gateway-contracts): fix lint * refactor: remove arbitrum expiration date constraint from host ACL * refactor: remove unused params from isUserDecryptionReady & isDelegatedUserDecryptionReady * chore: fix comments * fix: fix ci upgrade contract flag * fix: remove test related to legacy expiry-too-soon constraint * chore: make conformance * chore(test-suite): use acl relayer (#2064) * chore(test-suite): update copro params * chore(test-suite): update contract addresses * chore(gateway-contracts): pauser task minor fix * chore(test-suite): update relayer * chore(test-suite): update relayer-sdk v0.4.1 * chore(test-suite): draft add negative acl tests * chore(test-suite): fix expired delegation, acl not allow tests (#2060) * chore(test-suite): update acl failure test for delegated user decr - Previously: negative delegated user decryption tests asserted on raw Solidity selector 0x0190c506 and was using relayer-sdk v0.4.1 that was not handling the label 'now_allowed_on_host_acl' from relayer. - Now: bump relayer-sdk to v0.4.2 that handles the label and asserts on relayer-sdk error label not_allowed_on_host_acl, matching the structured error returned by the relayer on HTTP 400 * chore(test-suite): fix expired delegation test - Issue: setting pastExpiration=1 reverted at the contract level (ExpirationDateBeforeOneHour) so the test never reached the decryption step - Fix: delegate with a valid expiration (now + 1h1m), then use evm_increaseTime to fast-forward past it before attempting decryption * chore(common): update package-lock.json --------- Co-authored-by: Simon Eudeline <simon.eudeline@zama.ai> * fix(test-suite): relayer and copro config update * chore(test-suite): update test-suite versions --------- Co-authored-by: Manoranjith <manoranjith.ponnuraj@zama.ai> * chore(coprocessor): versions bump * chore(gateway-contracts): remove acl from upgrade manifest * tests(coprocessor): fix stop_retrying_verify_proof_on_gw_config_error() --------- Co-authored-by: Petar Ivanov <29689712+dartdart26@users.noreply.github.com> Co-authored-by: malatrax <71888134+zmalatrax@users.noreply.github.com> Co-authored-by: Manoranjith <manoranjith.ponnuraj@zama.ai>
1 parent da92795 commit 803f104

File tree

83 files changed

+471
-25700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+471
-25700
lines changed

charts/coprocessor/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: coprocessor
22
description: A helm chart to distribute and deploy Zama fhevm Co-Processor services
3-
version: 0.8.3
3+
version: 0.8.4
44
apiVersion: v2
55
keywords:
66
- fhevm

charts/coprocessor/values.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -903,17 +903,11 @@ txSender:
903903
configMapKeyRef:
904904
name: gateway-sc-addresses
905905
key: ciphertext_commits.address
906-
- name: MULTICHAIN_ACL_ADDRESS
907-
valueFrom:
908-
configMapKeyRef:
909-
name: gw-sc-addresses
910-
key: multichain_acl.address
911906

912907
# Command line arguments for transaction sender
913908
args:
914909
- --input-verification-address=$(INPUT_VERIFICATION_ADDRESS)
915910
- --ciphertext-commits-address=$(CIPHERTEXT_COMMITS_ADDRESS)
916-
- --multichain-acl-address=$(MULTICHAIN_ACL_ADDRESS)
917911
- --gateway-url=ws://gateway-rpc-node:8548
918912
- --signer-type=private-key
919913
- --private-key=$(TX_SENDER_PRIVATE_KEY)
@@ -943,16 +937,9 @@ txSender:
943937
- --gas-limit-overprovision-percent=120
944938
- --graceful-shutdown-timeout=8s
945939
- --service-name=txn-sender
946-
# New in 0.10
947940
- --metric-host-txn-latency=0.1:60.0:0.1
948941
- --metric-zkproof-txn-latency=0.1:60.0:0.1
949942
- --gauge-update-interval-secs=10
950-
- --host-chain-url=$(ETHEREUM_RPC_URL)
951-
- --delegation-block-delay=10 # not applied immediately to avoid reorg
952-
- --delegation-clear-after-n_blocks=648000 # ~3 months at 12s block time, only on successful delegations
953-
- --delegation-fallback-polling=30 # polling fallback in seconds when notification are not received
954-
- --delegation-max-retry=100000 # does not include immediate retry on transient error which are infinite
955-
- --retry-immediately-on-nonce-error=0 # Deprecated. To be removed in a future release.
956943

957944
# Service ports configuration
958945
ports:

coprocessor/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,13 @@ Options:
182182

183183
```bash
184184
$ transaction_sender --help
185-
Usage: transaction_sender [OPTIONS] --input-verification-address <INPUT_VERIFICATION_ADDRESS> --ciphertext-commits-address <CIPHERTEXT_COMMITS_ADDRESS> --multichain-acl-address <MULTICHAIN_ACL_ADDRESS> --gateway-url <GATEWAY_URL>
185+
Usage: transaction_sender [OPTIONS] --input-verification-address <INPUT_VERIFICATION_ADDRESS> --ciphertext-commits-address <CIPHERTEXT_COMMITS_ADDRESS> --gateway-url <GATEWAY_URL>
186186

187187
Options:
188188
-i, --input-verification-address <INPUT_VERIFICATION_ADDRESS>
189189

190190
-c, --ciphertext-commits-address <CIPHERTEXT_COMMITS_ADDRESS>
191191

192-
-m, --multichain-acl-address <MULTICHAIN_ACL_ADDRESS>
193-
194192
-g, --gateway-url <GATEWAY_URL>
195193

196194
-s, --signer-type <SIGNER_TYPE>

coprocessor/fhevm-engine/.sqlx/query-10def5a2f26013276ec18c931b01a04c823c85500da03c35c1c8c127453002dd.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

coprocessor/fhevm-engine/.sqlx/query-419270adb3a13e9e491adf9611a564b908ee87b1e43211ac6ba5bf60753e1940.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

coprocessor/fhevm-engine/.sqlx/query-49df3987b4d6dd11618ff2654434c824fcb9be9a0ca96d4db4712fce6888dfbd.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

coprocessor/fhevm-engine/.sqlx/query-4d3ad8176c68cea2ecca904e52c7e3abf2c8ea6e0eca45a42132549661fa4e54.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

coprocessor/fhevm-engine/.sqlx/query-700ee9670044f6fe2de11f3a037a33e38befd319ebcf7720e2b51b00d03b34fa.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

coprocessor/fhevm-engine/.sqlx/query-7baf37d2fc7d679f43113aaca360cabb4213aa8bb3572f521e7f37d5224c3759.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

coprocessor/fhevm-engine/.sqlx/query-7e3b4b5ffff3f85023b73f02422e6d584ce7aaf1026dd890b2b2d9913093550a.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)