Sync upstream v11.1.0 (merge conflicts) by JOY · Pull Request #71 · DOS/DOScan

JOY (JOY) · 2026-05-25T11:42:49Z

Upstream Sync - v11.1.0

Auto-merge with upstream v11.1.0 failed. Version/workflow conflicts were auto-resolved,
but the following files have code conflicts that need manual resolution:

docker-compose/envs/common-blockscout.env

To resolve:

Check out this branch locally
Resolve remaining conflicts
Push and merge this PR
Then create tag v11.1.0 to trigger Docker build

Upstream release notes

Co-authored-by: Alexander Kolotov <alexander.kolotov@gmail.com> Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com> Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com> Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>

…oints (blockscout#14227) Co-authored-by: Alexander Kolotov <alexander.kolotov@gmail.com> Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com> Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com> Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>

…ut#14251) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alexander Kolotov <alexander.kolotov@gmail.com> Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nikita Pozdniakov <nikitosing4@mail.ru> Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com> Co-authored-by: Qwerty5Uiop <alex000010@bk.ru> Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#14350) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ut#14359)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

…14385) Co-authored-by: Cursor <cursoragent@cursor.com>

…CY (blockscout#14390) Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

…14396) Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>

chatgpt-codex-connector · 2026-05-25T11:42:54Z

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

gemini-code-assist

Code Review

This pull request introduces a comprehensive OpenAPI specification framework, including a new openapi-spec skill, detailed reference guides, and automated spec generation scripts. It also applies these standards to the AdvancedFilter and Arbitrum controllers by integrating OpenApiSpex and CastAndValidate. The review feedback identifies critical issues where existing pagination helpers in both controllers still use string keys; since CastAndValidate now casts parameters to atom keys, these helpers will fail to match or return empty cursors, breaking pagination. Additionally, a pattern match in AdvancedFilterController.paging_options/1 was flagged as too strict for optional query parameters.

gemini-code-assist · 2026-05-25T11:47:27Z


    next_page_params =
-      next_page |> next_page_params(advanced_filters, Map.take(params, ["items_count"]), false, &paging_params/1)
+      next_page |> next_page_params(advanced_filters, Map.take(params, [:items_count]), false, &paging_params/1)


The paging_params/1 callback (defined at line 608) needs to be updated to use atom keys. Since CastAndValidate is now active, the items in advanced_filters (which are passed to this callback by next_page_params/5) will have atom keys. The current implementation of paging_params/1 uses string keys ("block_number", etc.), which will result in an empty cursor and broken pagination links in the response.

gemini-code-assist · 2026-05-25T11:47:27Z

  defp paging_options(%{
-         "block_number" => block_number_string,
-         "transaction_index" => transaction_index_string,
-         "internal_transaction_index" => internal_transaction_index_string,
-         "token_transfer_index" => token_transfer_index_string,
-         "token_transfer_batch_index" => token_transfer_batch_index_string
+         block_number: block_number_string,
+         transaction_index: transaction_index_string,
+         internal_transaction_index: internal_transaction_index_string,
+         token_transfer_index: token_transfer_index_string,
+         token_transfer_batch_index: token_transfer_batch_index_string
       }) do


The pattern match in paging_options/1 is too strict. It requires all five keys (block_number, transaction_index, etc.) to be present in the map. Since these are optional query parameters, CastAndValidate will only include the ones provided by the client. If any are missing, this clause will fail to match, causing the controller to fall back to default paging options (line 635) and ignore the user's cursor. Consider using Map.get/2 or individual assignments to handle optional parameters.

gemini-code-assist · 2026-05-25T11:47:27Z

-  def messages(conn, %{"direction" => direction} = params) do
+  def messages(conn, %{direction: direction} = params) do
    options =
      params


The paging_options/1 function (called here) needs to be updated to handle atom keys. With CastAndValidate active, params will contain atom keys (e.g., :id), but the implementation at line 588 still expects string keys ("id"). This will cause pagination options to be ignored for cross-chain messages.

gemini-code-assist · 2026-05-25T11:47:27Z

+  """
+  @spec batch_by_anytrust_da_info(Plug.Conn.t(), map()) :: Plug.Conn.t() | {:error, :not_found}
+  # For AnyTrust, data_key is the hash of the data itself
+  def batch_by_anytrust_da_info(conn, %{data_hash: data_hash} = params) do


The batches/2 action (called indirectly via all_batches_by_data_availability_info) relies on paging_options/1 and paging_params/1 which still use string keys (lines 592 and 605). Since CastAndValidate is now active, these helpers must be updated to use atom keys (:number) to avoid breaking pagination for batches.

Alexander Kolotov (akolotov) and others added 30 commits May 8, 2026 18:45

doc: add verification websocket subscription guide (blockscout#14259)

da94a97

chore(deps): bump decimal from 2.3.0 to 2.4.1 (blockscout#14357)

9f26983

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump cldr_utils from 2.29.5 to 2.29.7 (blockscout#14355)

e6eddc1

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump phoenix_live_view from 1.1.28 to 1.1.30 (blockscout…

efbea35

…#14350) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump absinthe_phoenix from 2.0.4 to 2.0.5 (blockscout#14345

768bf56

) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps-dev): bump ex_doc from 0.40.1 to 0.40.2 (blockscout#14341)

2252565

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump open_api_spex from 3.22.2 to 3.22.3 (blockscout#14353)

4261212

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump ex_cldr_units from 3.20.3 to 3.20.4 (blockscout#14340)

81b3d9d

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump ex_json_schema from 0.11.2 to 0.11.3 (blockscout#14356

b59af08

) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump postgrex from 0.22.0 to 0.22.1 (blockscout#14354)

1b51b4d

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore: Eliminate horizontal scroll in the main LICENSE file (blocksco…

8c56356

…ut#14359)

chore: Add SPDX attribution (blockscout#14360)

34f4dcf

chore(deps): bump mint from 1.7.1 to 1.8.0 (blockscout#14351)

d9edfc3

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump postgrex from 0.22.1 to 0.22.2 (blockscout#14376)

a695ecc

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps-dev): bump cowboy from 2.14.2 to 2.15.0 (blockscout#14377)

bc75c8e

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump floki from 0.38.1 to 0.38.2 (blockscout#14378)

7c162ce

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump tesla from 1.17.0 to 1.18.2 (blockscout#14375)

4673c5f

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore: Partial async import (blockscout#14277)

2a7db0b

Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>

11.1.0

b0017f0

fix: Return repo replica to indexer (blockscout#14383)

d38b2ef

chore: Close linked issues when PRs merge into dev (blockscout#14384)

2a3dc18

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: Parse GitHub issue URLs in dev-merge close workflow (blockscout#…

b53c1ac

…14385) Co-authored-by: Cursor <cursoragent@cursor.com>

Update CHANGELOG

7982962

feat: Forward new BENS fields to search (blockscout#14389)

c77f6fe

Update CHANGELOG

69c3102

chore: Add MIGRATION_FILL_INTERNAL_TRANSACTIONS_ADDRESS_IDS_CONCURREN…

6075b61

…CY (blockscout#14390) Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>

chore: publish OpenAPI specs on dev branch pushes (blockscout#14391)

ec21659

Co-authored-by: Cursor <cursoragent@cursor.com>

Qwerty5Uiop and others added 2 commits May 25, 2026 12:34

fix: Properly start VersionUpgrade on application launch (blockscout#…

b3e8064

…14396) Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>

WIP: Merge upstream v11.1.0 (has conflicts)

a61e175

gemini-code-assist Bot reviewed May 25, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync upstream v11.1.0 (merge conflicts)#71

Sync upstream v11.1.0 (merge conflicts)#71
JOY (JOY) wants to merge 32 commits into
mainfrom
sync-upstream-v11.1.0

JOY (JOY) commented May 25, 2026

Uh oh!

chatgpt-codex-connector Bot commented May 25, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot May 25, 2026

Uh oh!

gemini-code-assist Bot May 25, 2026

Uh oh!

gemini-code-assist Bot May 25, 2026

Uh oh!

gemini-code-assist Bot May 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

JOY (JOY) commented May 25, 2026

Upstream Sync - v11.1.0

Uh oh!

chatgpt-codex-connector Bot commented May 25, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants