Skip to content

chore: merge v5.0-dev into v5.1-dev - #5308

Merged
shumkov merged 13 commits into
v5.1-devfrom
chore/v5.0-to-v5.1-20261006
Oct 6, 2026
Merged

shumkov merged 13 commits into
v5.1-devfrom
chore/v5.0-to-v5.1-20261006

Conversation

@Claudius-Maginificent

@Claudius-Maginificent Claudius-Maginificent commented Oct 6, 2026 •

Copy link
Copy Markdown
Collaborator

Basic explanation

What this does: Brings v5.1-dev up to date with v5.0-dev by merging the 13 PRs that landed on v5.0-dev since the last forward merge (#5296, at 8061667).

Value: v5.1-dev gets the fixes and protocol version 14 (PV14) features already reviewed and merged on v5.0-dev, so work on the next release builds on the same code the 5.0 line ships. That includes two fixes for proofs and signatures (#5294, #5295), the shielding nullifier fix (#5014), and the Swift SDK and offline test-vector fixes that keep CI green (#5297, #5299).

Risks: Low to moderate. The merge applied without conflicts and needed no manual resolution. It does carry seven PV14 consensus changes into v5.1-dev. PLATFORM_V15 points at exactly the same sub-version tables as PLATFORM_V14 (compared after the merge, see Testing), so protocol version 15 picks up every one of them. Three files were changed on both branches and merged automatically, one of them the GroveDB structure snapshot; the rs-drive structure tests in CI are the check for it. The merge also moves the workspace version on v5.1-dev from 5.0.0-beta.1 to 5.0.0-beta.2.

Issue being fixed or feature implemented

v5.1-dev was 13 PRs behind v5.0-dev.

What was done?

Merged origin/v5.0-dev (cf8cff9) into origin/v5.1-dev (723b09e) with no conflicts. Incoming PRs:

Files changed on both branches and merged automatically (worth a look in review):

  • packages/rs-drive/grovedb-structure.json
  • packages/rs-drive/src/structure/tests.rs
  • packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/tests.rs

Other effects on v5.1-dev:

Please merge with a merge commit (not squash) so the v5.0-dev history stays shared with v5.1-dev.

How Has This Been Tested?

  • git merge applied with no conflicts. Redoing the merge with git merge-tree gives the same tree as the committed merge, so the merge commit holds no hand edits.
  • Compared the non-comment field assignments of PLATFORM_V14 and PLATFORM_V15 after the merge: they are identical apart from the protocol version number.
  • I did not run a local build or test suite. CI on this PR is the check.

Breaking Changes

None of its own. It carries the already-reviewed PV14 breaking changes listed above (#5237, #5239, #5250, #5228, #5295, #5227, #5014) into v5.1-dev.

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have added "!" to the title and described breaking changes in the corresponding section if my code contains any
  • I have made corresponding changes to the documentation if needed
  • If I added or changed GroveDB structure, I described it in the area's structure.rs, regenerated grovedb-structure.json, and checked the structure viewer link posted on this pull request

For repository code-owners and collaborators only

  • I have assigned this pull request to a milestone

🤖 Co-authored by Claudius the Magnificent AI Agent

PR Hygiene · cf8cff9

  • Bots — coderabbitai not yet · thepastaclaw not yet — /skip-bots proceeds without the ones not yet reported
  • Self-review — not asked of a bot author
  • Build running
  • Approvals
    • github (.github/actions/release-cargo-target-cache/action.yaml, .github/workflows/release-kotlin-sdk.yml, .github/workflows/release-swift-sdk.yml) — ktechmidas or shumkov
    • files with no dedicated owner (CHANGELOG.md, Cargo.lock, Cargo.toml and 163 more) — QuantumExplorer or shumkov
    • dashmate (packages/dashmate/configs/defaults/getBaseConfigFactory.js, packages/dashmate/configs/getConfigFileMigrationsFactory.js, packages/dashmate/package.json and 2 more) — ktechmidas or shumkov
    • system-contracts (packages/dashpay-contract/package.json, packages/document-history-contract/package.json, packages/dpns-contract/package.json and 5 more) — QuantumExplorer or shumkov
    • js-wasm-sdk (packages/js-dash-sdk/package.json, packages/js-evo-sdk/package.json, packages/wasm-sdk/package.json) — shumkov
    • kotlin-sdk (packages/kotlin-sdk/KotlinExampleApp/app/src/main/java/org/dashfoundation/example/ui/contracts/ContractJson.kt, packages/kotlin-sdk/KotlinExampleApp/app/src/test/java/org/dashfoundation/example/ui/contracts/IndexKeywordDescriptorsTest.kt) — HashEngineering
    • dpp (packages/rs-dpp/schema/meta_schemas/document/v3/document-meta.json, packages/rs-dpp/src/data_contract/document_type/accessors/mod.rs, packages/rs-dpp/src/data_contract/document_type/accessors/v2/mod.rs and 44 more) — QuantumExplorer or shumkov
    • rs-drive-abci (packages/rs-drive-abci/src/core/wait_for_core_to_sync/v0/mod.rs, packages/rs-drive-abci/src/execution/platform_events/block_end/update_state_cache/v0/mod.rs, packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_operator_identity/v0/mod.rs and 71 more) — QuantumExplorer or shumkov
    • rs-drive (packages/rs-drive/grovedb-structure.json, packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/v1/mod.rs, packages/rs-drive/src/drive/contract/insert/insert_contract/v0/tests/chained_query_e2e_tests.rs and 118 more) — QuantumExplorer or shumkov
    • rs-platform-wallet-ffi (packages/rs-platform-wallet-ffi/src/shielded_send.rs) — HashEngineering or ZocoLini or llbartekll or romchornyi
    • rust-sdk-ffi (packages/rs-sdk-ffi/tests/integration_tests/contested_resource.rs, packages/rs-sdk-ffi/tests/integration_tests/identity.rs, packages/rs-sdk-ffi/tests/integration_tests/token.rs) — lklimek or shumkov
    • rust-sdk (packages/rs-sdk/src/platform/documents/transitions/delete.rs, packages/rs-sdk/tests/fetch/contested_resource.rs, packages/rs-sdk/tests/fetch/contested_resource_vote_state.rs and 161 more) — lklimek or shumkov
    • swift-sdk (packages/swift-sdk/Sources/SwiftDashSDK/Core/Utils/DataContractParser.swift, packages/swift-sdk/Sources/SwiftDashSDK/Persistence/Models/PersistentIndex.swift, packages/swift-sdk/SwiftExampleApp/SwiftExampleApp/Views/DocumentTypeDetailsView.swift and 4 more) — llbartekll or romchornyi

When every merge requirement is met, the PR Hygiene check passes. Reviewer limits do not block merging; other required GitHub checks and protections still apply.

QuantumExplorer and others added 13 commits October 5, 2026 22:09
…tions (PV14) (#5014)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Ivan Shumkov <ivanshumkov@gmail.com>
…ersion 14 (#5227)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…heir tests (#5299)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…n 14 (#5228)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…WhenConsumed", PV14) (#5239)

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 6, 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: f9d529c2-85ed-42f1-828d-7f129bab0826

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
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

@github-actions github-actions Bot added this to the v5.1.0 milestone Oct 6, 2026
@github-actions

github-actions Bot commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

🌳 GroveDB structure

This pull request changes the described GroveDB structure. Open it in the structure viewer: new nodes glow, removed ones stay as ghosts, and the tour walks through each change.

Added (2 nodes)

  • withdrawals.core_credit_pool_balances

Changed (4 nodes)

  • contracts.contract.documents.document_type.index_property
  • contracts.contract.documents.document_type.index_property.value
  • contracts.contract.documents.document_type.index_property.value.next_property
  • withdrawals

Compared 8061667363 with cf8cff9a68. Updated at 2026-10-06T13:34:48.340Z

@github-actions

github-actions Bot commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

📖 Book Preview built successfully.

Download the preview from the workflow artifacts.
To view locally: download the artifact, unzip, and open index.html.

Updated at 2026-10-06T13:35:02.035Z

@lklimek
lklimek marked this pull request as ready for review October 6, 2026 13:32
@github-actions

github-actions Bot commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

Waiting for bot review — coderabbitai not yet · thepastaclaw not yet. Wait for the missing reviews, or a writer can post /skip-bots to proceed without them; blocking findings still need addressing.
Full checklist in the description.

@github-actions github-actions Bot added the waiting-bots Waiting for the review bots to report on this head label Oct 6, 2026
@lklimek
lklimek force-pushed the chore/v5.0-to-v5.1-20261006 branch from dc70012 to cf8cff9 Compare October 6, 2026 13:34
@github-actions

github-actions Bot commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

Waiting for bot review — coderabbitai not yet · thepastaclaw not yet. Wait for the missing reviews, or a writer can post /skip-bots to proceed without them; blocking findings still need addressing.
Full checklist in the description.

@thepastaclaw

thepastaclaw commented Oct 6, 2026 •

Copy link
Copy Markdown
Collaborator

🕓 Review not started yet because the new head is waiting for the 30-minute push debounce.

  • Request normal review — click when the PR is ready for review.
  • Request priority review — click to move this review to the front of the queue.

Commit cf8cff9. Normal review starts when eligible; priority review starts as soon as a slot is available.

@shumkov
shumkov merged commit c301cb6 into v5.1-dev Oct 6, 2026
112 of 114 checks passed
@shumkov
shumkov deleted the chore/v5.0-to-v5.1-20261006 branch October 6, 2026 13:38
@QuantumExplorer QuantumExplorer mentioned this pull request Oct 13, 2026
8 of 26 tasks

This branch was successfully deployed

2 active deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

waiting-bots Waiting for the review bots to report on this head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants