merge queue: embarking main (c5bb50b), #2169, #2038, #2170 and [#2184 + #2180 + #2182] together#2189
Closed
mergify[bot] wants to merge 1778 commits intomainfrom
Closed
merge queue: embarking main (c5bb50b), #2169, #2038, #2170 and [#2184 + #2180 + #2182] together#2189mergify[bot] wants to merge 1778 commits intomainfrom
mergify[bot] wants to merge 1778 commits intomainfrom
Conversation
- Update health checks and monitor metrics to monitor both pools.
- Previously, the pool was trying in infite loop to aquire connections. - Now, reports failure after first attempt, if not able to acquire.
- Previously, these tasks were spawned in orphaned handles and not receiving the shutdown signal. - Now, integratem them into orchestrator's task manager. So that the tasks shutdown properly.
- Previously Drop-based cleanup only signaled cancellation without waiting for completion, causing PostgreSQL connections to accumulate across tests and hitting the 100 connection limit in CI. - Add async shutdown() method that waits for relayer handle completion ensuring proper connection cleanup before test finishes.
- Log block_number, block_hash, log_index logging, topic0 and topic1 for better debugging.
- Update block number repo to include instance id. This is an integer assigned at startup (0, 1, 2 and so on.). Will be used to update the corresponding row in block number store. - Add a moka based deduplicator that is used to deduplicate events from multiple listeners and update in the DB only once. It also has TTL based automatic cleanup. - Spawn multiple listenrs during startup and de-duplicate before updating to DB.
- As a preparation for app level restart of listener.
- Previously, listener reconnection was implicitly handled by the library, which was not visible / transparent at the app level. - Now, disable library level reconnection and do it in app leve.
- This is in preparation to adding long queueing support for requests. Updating the migrations, so that we don't need to do another change in near future.
- Previously, we added parallel listeners feature, but the functional tests for this were missing. - To enable these tests, extend the mock to support emitting events to specific subscriptions (based on indices: first, second, third etc.,). Adapt fhevm wrappers as well to the updated mock API. - Add new test cases to simulate different scenarios of missed events. Eg: missed by none, missed by 1/2, 1/3 or 2/3. Missed by 3/3 will lead to timeout, which is covered in timeout test. - Also, include targets for mock library and long running tests in makefile.
- Make the cron values conifgurable and update the queries to use this values. Update default settings as well. - Add tests for response timed out case by disabling mock mode and setting low values for timeout.
chore(relayer): keep full flow func
chore(relayer): removing pool from first iteration
removing useless imports
- As documented in comments, 504 errors are overidden by Cloudflare and this cannot be disabled in our setup. So, we use 503 instead while keeping the distinct labels.
Mirrors the ci/abi-compat/ structure: check.ts (CI entrypoint), lib.ts (core logic), list.ts (local multi-package report), hints.ts (domain config).
Capture exec errors with truncated output instead of swallowing them. Clean up worktrees explicitly on failure instead of relying on prune. Matches the pattern established in abi-compat/list.ts.
- Remove --force flag from forge inspect in abi-compat/lib.ts to avoid redundant recompilation (4x per side per package). - Simplify printPackageReport return in abi-compat/list.ts. - Derive valid package names from PACKAGE_CONFIG in upgrade-check parseArgs instead of hardcoding strings.
Without --force, a prior failed compilation (e.g. before address constants are generated) leaves error artifacts in forge's cache. Subsequent runs reuse the cached failure even after the source files are fixed. Reproduced by: forge clean, attempt compilation without addresses (fails), generate addresses, run check — forge returns the cached error for Decryption while other contracts work.
Forge may prepend compilation progress text to stdout on the first invocation in a clean directory. This caused Decryption (the first contract checked) to fail JSON.parse in CI while subsequent contracts succeeded from cache. Extract the JSON array from the output instead of parsing the whole string, matching the approach used by the upgrade-check bytecode extraction.
Resolve merge conflict in SUMMARY.md keeping the renamed integration-guide.md from main and the Auctions section from this branch. Add Hardhat template and OZ confidential contracts repo links to erc7984.md as requested in PR review.
- update scope
This was referenced Mar 26, 2026
Changed Lines CoverageCoverage of added/modified lines: N/A |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉
Branch main (c5bb50b), #2169, #2038, #2170 and [#2184 + #2180 + #2182] are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of [#2184 + #2180 + #2182].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
mainfor 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-testcheck-success = common-pull-request/lint (bpr)check-neutral = common-pull-request/lint (bpr)check-skipped = common-pull-request/lint (bpr)check-success = coprocessor-cargo-test/cargo-tests (bpr)check-neutral = coprocessor-cargo-test/cargo-tests (bpr)check-skipped = coprocessor-cargo-test/cargo-tests (bpr)check-success = coprocessor-dependency-analysis/dependencies-check (bpr)check-neutral = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = gateway-contracts-deployment-tests/sc-deploy (bpr)check-neutral = gateway-contracts-deployment-tests/sc-deploy (bpr)check-success = gateway-contracts-deployment-tests/sc-deploy (bpr)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:
#approved-reviews-by >= 1[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]base = mainbranch-protection-review-decision = APPROVED[🛡 GitHub branch protection]label!=do-not-mergecheck-success = common-pull-request/lint (bpr)check-neutral = common-pull-request/lint (bpr)check-skipped = common-pull-request/lint (bpr)check-neutral = coprocessor-cargo-test/cargo-tests (bpr)check-skipped = coprocessor-cargo-test/cargo-tests (bpr)check-success = coprocessor-cargo-test/cargo-tests (bpr)check-neutral = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = coprocessor-dependency-analysis/dependencies-check (bpr)check-success = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = gateway-contracts-deployment-tests/sc-deploy (bpr)check-neutral = gateway-contracts-deployment-tests/sc-deploy (bpr)check-success = gateway-contracts-deployment-tests/sc-deploy (bpr)check-skipped = kms-connector-tests/test-connector (bpr)check-neutral = kms-connector-tests/test-connector (bpr)check-success = kms-connector-tests/test-connector (bpr)