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

JOY (JOY) · 2026-06-02T17:58:49Z

Upstream Sync - v11.1.3

Auto-merge with upstream v11.1.3 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.3 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>

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>

JOY (JOY) force-pushed the sync-upstream-v11.1.3 branch 28 times, most recently from 3c39edc to 3153c69 Compare June 16, 2026 12:45

WIP: Merge upstream v11.1.3 (has conflicts)

916e1c1

JOY (JOY) force-pushed the sync-upstream-v11.1.3 branch from 3153c69 to 916e1c1 Compare June 16, 2026 18:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync upstream v11.1.3 (merge conflicts)#74

Sync upstream v11.1.3 (merge conflicts)#74
JOY (JOY) wants to merge 47 commits into
mainfrom
sync-upstream-v11.1.3

JOY (JOY) commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

JOY (JOY) commented Jun 2, 2026

Upstream Sync - v11.1.3

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants