Skip to content

merge queue: embarking main (884690e), #2184, #2180, #2182 and [#2156 + #2154 + #2166] together#2192

Closed
mergify[bot] wants to merge 1785 commits intomainfrom
mergify/merge-queue/778026871b
Closed

merge queue: embarking main (884690e), #2184, #2180, #2182 and [#2156 + #2154 + #2166] together#2192
mergify[bot] wants to merge 1785 commits intomainfrom
mergify/merge-queue/778026871b

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Mar 26, 2026

✨ Pull request #2156 which was ahead in the queue has been dequeued (for the following reason: checks failed). The pull request [#2156 + #2154 + #2166] has been re-embarked. ✨

Branch main (884690e), #2184, #2180, #2182 and [#2156 + #2154 + #2166] are embarked together for merge.

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

Required conditions of queue rule main for merge:

Required conditions to stay in the queue:

---
checking_base_sha: 6b7d8d9bf24d93fc9e5fd2c5f0f91e5a19056d7e
previous_failed_batches: []
pull_requests:
  - number: 2156
    scopes: []
  - number: 2154
    scopes: []
  - number: 2166
    scopes: []
scopes: []
...

manoranjith and others added 30 commits December 17, 2025 18:49
- 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): removing pool from first iteration
- 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.
- Adding new EventProtocolError -> protocol overwhelmed.
- Settings for queue capacity and tps with validator > 0
- senders panic following die-fast principle, if channel is closed, should not happens.
- Create new failure mode when queue is full.
- WIP: 503 with protocol_overwhelmed label
Eikix and others added 23 commits March 26, 2026 13:02
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.
Co-authored-by: malatrax <71888134+zmalatrax@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
@github-actions
Copy link
Copy Markdown

Changed Lines Coverage

Coverage of added/modified lines: N/A

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.

9 participants