Skip to content

fix(platform): point PLATFORM_V15 at query versions V2 after v4.2 merge - #5212

Merged
QuantumExplorer merged 2 commits into
v5.1-devfrom
fix/v15-query-versions-after-forward-merge
Oct 2, 2026
Merged

QuantumExplorer merged 2 commits into
v5.1-devfrom
fix/v15-query-versions-after-forward-merge

Conversation

@PastaPastaPasta

@PastaPastaPasta PastaPastaPasta commented Sep 29, 2026 •

Copy link
Copy Markdown
Member

Update: v4.3-dev was renamed to v5.1-dev. The break is still there after the v5.0-dev → v5.1-dev merge (218cb89f1): v15.rs still imports drive_abci_query_versions::v3. This PR still applies cleanly and fixes it.

Issue being fixed or feature implemented

v4.3-dev doesn't compile after the v4.2-dev forward-merge (704307e):

error[E0432]: unresolved import `crate::version::drive_abci_versions::drive_abci_query_versions::v3`
  --> packages/rs-platform-version/src/version/v15.rs:19:69
error: could not compile `platform-version` (lib)

The cause: #5043 (v4.3) defined PLATFORM_V15 as a copy of PLATFORM_V14 pointing at DRIVE_ABCI_QUERY_VERSIONS_V3. On v4.2-dev, #5057 folded V3 into V2 and deleted drive_abci_query_versions/v3.rs. The two changes touch different files, so git merged them without a conflict. Every crate that depends on platform-version is broken on v4.3-dev until this lands.

What was done?

How Has This Been Tested?

Run at v4.3-dev 704307eaf plus this commit:

  • cargo check --tests -p platform-version -p platform-wallet -p platform-wallet-ffi -p dash-sdk -p rs-unified-sdk-jni -p drive -p drive-abci -p wasm-sdk: passes. Before the fix, platform-version failed with E0432.
  • cargo clippy --tests -p platform-wallet -p platform-version: no warnings.
  • cargo test --lib -p platform-version -p platform-wallet: 23 + 1185 passed.
  • rustfmt --check on both files: clean.

This PR doesn't fix the two drive structure::tests failures on v4.3-dev (snapshot still at protocol 14). #5154 fixes those separately.

Breaking Changes

None. PV15 is unchanged from what #5043 defined (identical to PV14).

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

🤖 Generated with Claude Code

PR Hygiene · 6b02f15

  • Bots — coderabbitai skipped after the window · thepastaclaw ✓
  • Self-review — post /self-reviewed
  • Within your 5 open PRs — this one is beyond the limit; it waits until one merges
  • Build failed
  • Approvals
    • files with no dedicated owner (packages/rs-platform-version/src/version/v15.rs) — approved by QuantumExplorer
    • rs-platform-wallet (packages/rs-platform-wallet/src/wallet/identity/network/dpns.rs) — HashEngineering or ZocoLini or llbartekll or romchornyi

When every box is checked the PR Hygiene check passes and this can merge.

…v4.2 merge

The v4.2-dev forward-merge (704307e) left v4.3-dev failing to compile:

  error[E0432]: unresolved import
    `crate::version::drive_abci_versions::drive_abci_query_versions::v3`
    --> packages/rs-platform-version/src/version/v15.rs:19

#5043 (v4.3) defined PLATFORM_V15 as a copy of PLATFORM_V14 using
DRIVE_ABCI_QUERY_VERSIONS_V3. #5057 (v4.2) folded V3 into V2 and deleted
v3.rs, and git merged both without a conflict. Point v15 at V2. Its
component tables then match PLATFORM_V14 exactly again, as #5043 intends.

Also clean up the dpns.rs import block from the same merge: drop the
IdentityGettersV0 import, unused since #4764 (and flagged as an
unused-import warning), and the doubled blank lines the conflict
resolution left.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@PastaPastaPasta

Copy link
Copy Markdown
Member Author

@QuantumExplorer, this is the follow-up to your v4.2-dev → v4.3-dev merge (704307e). v15.rs still referenced DRIVE_ABCI_QUERY_VERSIONS_V3, which #5057 removed on v4.2-dev, so platform-version no longer compiles on v4.3-dev. It's the same semantic break I'd flagged when resolving #5151. Pointing v15 at V2 makes PV15 identical to PV14 again. This PR also tidies the dpns.rs import block from the same merge.


🤖 Posted autonomously by Codex on behalf of pasta.

@coderabbitai

coderabbitai Bot commented Sep 29, 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: cc8070bd-7c5d-41ef-bc50-6be89cd54d0c

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

Autopilot is currently an internal CodeRabbit preview.


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 the waiting-bots Waiting for the review bots to report on this head label Sep 29, 2026
@github-actions github-actions Bot added this to the v4.3.0 milestone Sep 29, 2026
@thepastaclaw

thepastaclaw commented Sep 29, 2026 •

Copy link
Copy Markdown
Collaborator

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

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

@PastaPastaPasta PastaPastaPasta changed the title fix(platform-version): point PLATFORM_V15 at query versions V2 after v4.2 merge fix(platform): point PLATFORM_V15 at query versions V2 after v4.2 merge Sep 29, 2026

@thepastaclaw thepastaclaw left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Final validation — Phase 1 + Phase 2

The merge repair correctly selects the existing V2 query table, which preserves the deleted V3 table's values and makes PLATFORM_V15's component selections match PLATFORM_V14 apart from protocol_version. The wallet change removes only an unused import and redundant whitespace; independent validation passed all 23 platform-version tests, all 1185 platform-wallet tests, and formatting checks for both changed files. No in-scope findings remain.

Review provenance

Source: reviewer 1: glm-5.3-flash (agent: phase1-reviewer, role: general); reviewer 2: glm-5.3-flash (agent: phase1-reviewer, role: architecture-layering); reviewer 3: glm-5.3-flash (agent: phase1-reviewer, role: platform-versioning); reviewer 4: glm-5.3-flash (agent: phase1-reviewer, role: rust-quality); reviewer 5: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 6: gpt-6.1-sol (agent: phase2-reviewer, role: architecture-layering); reviewer 7: gpt-6.1-sol (agent: phase2-reviewer, role: platform-versioning); reviewer 8: gpt-6.1-sol (agent: phase2-reviewer, role: rust-quality); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)

  • Triage: low by gpt-6.1-sol (effort low) — The diff is a small, readily verifiable build fix that points PLATFORM_V15 at the existing V2 query table and removes unused import/formatting artifacts, without introducing new consensus logic or other intricate behavior.
  • Phase 1 reviewers: glm-5.3-flash — general (completed, effort high); agent phase1-reviewer, glm-5.3-flash — architecture-layering (completed, effort high); agent phase1-reviewer, glm-5.3-flash — platform-versioning (completed, effort high); agent phase1-reviewer, glm-5.3-flash — rust-quality (completed, effort high); agent phase1-reviewer
  • Phase 1 model: glm-5.3-flash — zai quota: 5h 99% left, weekly 80% left; passed over gemini-3.8-flash-high (antigravity below 15% reserve: weekly 13% left, 5h 100% left)
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — architecture-layering (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — platform-versioning (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — rust-quality (completed, effort medium); agent phase2-reviewer
Out-of-scope follow-up suggestions (1)

These are valid observations, but they are outside this PR's scope and should be handled in separate issues or author/maintainer-requested PRs rather than blocking this review.

  • The v15 == v14 table-parity invariant is pinned by no test, though this exact drift class broke the build — Out of scope — v15.rs already lacked a parity test when introduced in e38241d (#5043); this PR restores a missing table reference without introducing new behavior. Inspection of the fold in 5c8c4dd confirms that the deleted V3 and current V2 both select compute_aggregate_mode_and_check_limit = 2 and latest_versions_read = 1, with the remaining fields inherited identically. A normalized comparison also confirms that the current PV15 and PV14 initializers match except for protocol_version. The v14 tests cited by the finding pin specific feature activation boundaries, not blanket adjacent-version equality, and v15's existing documentation explicitly permits follow-ups to diverge its component selections. Adding a temporary full-parity guard is optional hardening of a pre-existing test gap, not necessary for this build repair.
    • Follow-up: Consider creating a separate issue or author/maintainer-requested PR for this.

@github-actions

Copy link
Copy Markdown
Contributor

@coderabbitai review

No review for 69627bfb yet, so PR Hygiene is asking once. If nothing arrives, the requirement is dropped for this commit and the pull request is labelled bot-review-skipped.

@github-actions

github-actions Bot commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

Bots are done — your move: post /self-reviewed.
Full checklist in the description.

@github-actions github-actions Bot added waiting-self-review Waiting for the author to post /self-reviewed bot-review-skipped A required review bot did not report; it was skipped by the window or by a person. labels Oct 2, 2026
@github-actions

github-actions Bot commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

Bots are done — your move: post /self-reviewed.
Full checklist in the description.

@QuantumExplorer
QuantumExplorer merged commit 662c1fc into v5.1-dev Oct 2, 2026
38 of 41 checks passed
@QuantumExplorer
QuantumExplorer deleted the fix/v15-query-versions-after-forward-merge branch October 2, 2026 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bot-review-skipped A required review bot did not report; it was skipped by the window or by a person. waiting-self-review Waiting for the author to post /self-reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants