Skip to content

chore!: forward-merge v4.2-dev into v5.0-dev - #5149

Merged
ktechmidas merged 382 commits into
dashpay:v5.0-devfrom
infraclaw-dash:merge/v4.2-into-v5.0-20260928
Sep 28, 2026
Merged

ktechmidas merged 382 commits into
dashpay:v5.0-devfrom
infraclaw-dash:merge/v4.2-into-v5.0-20260928

Conversation

@infraclaw-dash

Copy link
Copy Markdown
Contributor

Issue being fixed or feature implemented

Forward-merge v4.2-dev into v5.0-dev so the newer development branch receives the already-merged fixes, including the runner-image/workflow changes required by the current self-hosted CI environment.

The branch retains the same legacy Kotlin setup path responsible for the failure on the other newer branch, #5146: android-actions/setup-android@v3 attempts to install into the deliberately root-owned, prebaked /opt/android-sdk.

The compatible ordinary-CI workflow is already on v4.2-dev via #4702: select/verify the pinned runner image and use its prebaked SDK instead of mutating it. #5141 fixes a separate release-workflow NDK-path issue and is not, by itself, a repair for ordinary Kotlin PR CI.

What was done?

  • Opened the requested full branch forward merge, head infraclaw-dash:merge/v4.2-into-v5.0-20260928, base dashpay:v5.0-dev.
  • The head is an exact snapshot of upstream v4.2-dev at the source SHA below, with no additional commits. A dedicated fork branch is used because the author does not have upstream collaborator permission; the protected source/target branches remain untouched.
  • This is a direct v4.2-dev → v5.0-dev merge, not a v4.3-dev → v5.0-dev merge.
  • This brings the complete upstream branch history, not only CI changes. Application, SDK, protocol and dependency changes already merged into v4.2-dev are also in scope for review.
  • No new source changes or conflict resolutions were authored for this PR. No target branch was reset, force-pushed or merged.
  • Preserve v5.0-dev-specific changes when resolving conflicts. Prefer an ancestry-preserving merge for branch synchronization rather than squash/rebase, subject to repository policy. Do not resolve target-specific conflicts by changing the shared v4.2-dev branch.

Preflight snapshot:

  • Source: 1464314a7a0a543fccda21bed6bcd4521f0eda69
  • Target: 172e168e9ed972ec5df69684b6c355d09416ba32
  • GitHub comparison: 382 source-only commits, 16 target-only commits; histories have diverged.

How Has This Been Tested?

  • Read the linked failure log and compared the affected workflow path with the current v5.0-dev workflow; both use the legacy Android setup action.
  • Read-only inspection of the failing runner confirmed UID 1001, root-owned SDK directories and non-writable command-line-tools installation paths.
  • Verified the compatible ordinary Kotlin workflow is on v4.2-dev.
  • Verified branch direction and checked that no duplicate open forward-merge PR exists.
  • Fork-origin self-hosted jobs may be skipped by repository policy; skipped is not a successful build. A maintainer-controlled trusted validation path is needed before claiming the merged workflow works.
  • The combined merge result has not been built or tested. Conflict review and fresh CI against the resulting merge are required. This PR is not a claim that every CI or application failure is resolved; rerunning an old captured workflow is not proof of the new one.

Breaking Changes

This full forward merge includes existing upstream breaking changes; it is not a CI-only patch. Review protocol/version-specific behavior against the intended v5.0-dev release line. The PR title is marked accordingly.

Checklist

  • Verified source/target direction and the legacy workflow gap
  • Reviewed the complete combined application/protocol diff
  • Resolved any integration conflicts while preserving target-specific changes
  • Fresh CI passes on the proposed merge result
  • Maintainer approval to merge

Opened by infraclaw at latte's request. Leave unmerged for review.

QuantumExplorer and others added 30 commits September 18, 2026 21:11
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ashpay#4817)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…side and writer gate (dashpay#4816)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…example apps (dashpay#4820)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…y#4800)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…t on iOS (dashpay#4824)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…p on iOS (dashpay#4825)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…al distribution (dashpay#4836)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ument actions (dashpay#4826)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
… apps (dashpay#4829)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…pdate (dashpay#4834)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…he token payment is left out (dashpay#4828)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…y#4838)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ared release-time tree once (dashpay#4837)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…hpay#4835)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…y#4839)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ructure (dashpay#4846)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…DB structure (dashpay#4847)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…on keys under the purpose subtree (dashpay#4843)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Quantum Explorer <quantum@dash.org>
…list (dashpay#4830)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…hpay#4848)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…y#4850)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…moderators, with a fee claim state transition (dashpay#4851)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…f a referenced document (dashpay#4852)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…y the pots, and claim them from the wasm and JavaScript SDKs (dashpay#4856)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…s admitted under meta-schema v0 (dashpay#4855)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
llbartekll and others added 25 commits September 28, 2026 15:13
dashpay#4973)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…shpay#5128)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…roperty (PV14) (dashpay#5127)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…use (dashpay#5137)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…urns the vote (dashpay#5138)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…and (dashpay#5136)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…y#5140)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…plete (dashpay#5103)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#5105)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…variants (dashpay#5125)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(PV14) (dashpay#5104)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@github-actions github-actions Bot added this to the v5.0.0 milestone Sep 28, 2026
@coderabbitai

coderabbitai Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: dashpay/platform/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: aa1b97ca-699f-4b15-8323-beaa83a6a67e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@thepastaclaw

thepastaclaw commented Sep 28, 2026 •

Copy link
Copy Markdown
Collaborator

🕓 Queued for automated review — 6th in line, estimated start in ~30 min (commit 1464314)
Estimated review time once started: ~1.0 h (two-phase automated review; median of recent runs).

  • Request priority review — click to move this review to the front of the queue.

@ktechmidas
ktechmidas merged commit 4f59f36 into dashpay:v5.0-dev Sep 28, 2026
101 of 104 checks passed

This branch was successfully deployed

1 active deployment
github-pages — 1464314a Deployed Sep 28, 2026 by QuantumExplorer via Deploy to GitHub Pages #965
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants