Skip to content

merge queue: embarking main (da92795) and #2072 together#2094

Closed
mergify[bot] wants to merge 7 commits intomainfrom
mergify/merge-queue/b11aed7216
Closed

merge queue: embarking main (da92795) and #2072 together#2094
mergify[bot] wants to merge 7 commits intomainfrom
mergify/merge-queue/b11aed7216

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Mar 11, 2026

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (da92795) and #2072 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #2072.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue main for merge:

  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
  • check-success = run-e2e-tests / fhevm-e2e-test
  • any of [🛡 GitHub branch protection]:
    • check-success = common-pull-request/lint (bpr)
    • check-neutral = common-pull-request/lint (bpr)
    • check-skipped = common-pull-request/lint (bpr)
  • any of [🛡 GitHub branch protection]:
    • check-skipped = coprocessor-cargo-listener-tests/cargo-tests (bpr)
    • check-neutral = coprocessor-cargo-listener-tests/cargo-tests (bpr)
    • check-success = coprocessor-cargo-listener-tests/cargo-tests (bpr)
  • any of [🛡 GitHub branch protection]:
    • check-success = coprocessor-cargo-test/cargo-tests (bpr)
    • check-neutral = coprocessor-cargo-test/cargo-tests (bpr)
    • check-skipped = coprocessor-cargo-test/cargo-tests (bpr)
  • any of [🛡 GitHub branch protection]:
    • check-success = coprocessor-dependency-analysis/dependencies-check (bpr)
    • check-neutral = coprocessor-dependency-analysis/dependencies-check (bpr)
    • check-skipped = coprocessor-dependency-analysis/dependencies-check (bpr)
  • any of [🛡 GitHub branch protection]:
    • check-success = gateway-contracts-deployment-tests/sc-deploy (bpr)
    • check-neutral = gateway-contracts-deployment-tests/sc-deploy (bpr)
    • check-skipped = gateway-contracts-deployment-tests/sc-deploy (bpr)
  • any of [🛡 GitHub branch protection]:
    • check-skipped = kms-connector-tests/test-connector (bpr)
    • check-neutral = kms-connector-tests/test-connector (bpr)
    • check-success = kms-connector-tests/test-connector (bpr)

Required conditions to stay in the queue:

---
checking_base_sha: da9279564b79624dcfc35de31fe3f3aa40b324a0
previous_failed_batches: []
pull_requests:
  - number: 2072
...

dartdart26 and others added 7 commits March 11, 2026 09:30
* 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): 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>
@cla-bot cla-bot bot added the cla-signed label Mar 11, 2026
@mergify mergify bot mentioned this pull request Mar 11, 2026
@mergify mergify bot closed this Mar 11, 2026
@mergify mergify bot deleted the mergify/merge-queue/b11aed7216 branch March 11, 2026 13:42
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Mar 11, 2026

🧪 CI Insights

Here's what we observed from your CI run for 0fd48f1.

🟢 All jobs passed!

But CI Insights is watching 👀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants