fix(account): server reads prev commitment pubkey from its own state - #132
Merged
Merged
Conversation
The previous fix (PR #129) attacked the symptom (wallet's local BIP-32 child-index counter desyncing from the server after a seed restore) by emitting `num_sends` from `/api/balance` so the wallet could hydrate its counter and derive `prev_commitment_pubkey` correctly. That works only when the wallet's deployed code actually syncs the counter — which the stale DEV deploy of `zk-coins/app` demonstrably did not, so `07-send.spec.ts::send-success` kept failing with `Interner Fehler: Vorheriger Public Key fehlt.` after PR #129 went live. Root cause is structural: making the client responsible for `prev_commitment_pubkey` puts a derivable lookup key on the client side that has to stay in lockstep with the server's persisted state across seed restores, app deploys, and TOCTOU windows between balance fetch and signing. Every desync surfaces as a 400. The class of bugs is not solvable by counter-syncing. This change moves the lookup to where the data lives. `Account` gains a `commitment_public_key: Option<PublicKey>` field set atomically with `proof` + `num_sends` inside `send_coins_inner`. The AccountUpdate branch reads it directly from the persisted account; the caller-supplied `prev_commitment_pubkey` is ignored. The 400 error string disappears from `map_send_coins_error` — it is unreachable as long as the field invariant (`proof.is_some() iff num_sends > 0 iff commitment_public_key.is_some()`) holds, which `send_coins_inner` is the only mutator of. Net result: a wallet that omits `prev_commitment_pubkey` entirely (or sends a stale one from a desynced counter) now succeeds. The deployed `zk-coins/app:beta` already on DEV stops 400ing without needing the app-side PR #125 to deploy first. Migration 0012 wipes `accounts` (same closed-test-env precedent as 0010 / 0011): the bincode shape is non-additive, and 0011 left post-#129 rows in the inconsistent `proof=Some, commitment_public_key=None` state that would panic the AccountUpdate branch's invariant `expect`. The legacy `SendCoinRequest::prev_commitment_pubkey` field stays on the wire so deployed wallets (including `app` PR #125, which still emits it) keep parsing. Drop it from the API once every published client has cycled off the contract. Regression coverage: - `account_node_tests::test_send_coins_second_send_succeeds_without_prev_commitment_pubkey` drives the AccountUpdate branch with `prev_commitment_pubkey = None` directly through `send_coins`. - `api_remote::second_send_succeeds_without_prev_commitment_pubkey_field` drives the same contract end-to-end against the live DEV server via the slim `ci:full` lane. - `account_node_tests::test_send_coins_twice_from_same_account_uses_update_account` pins the post-condition that all three coupled fields advance together (`proof.is_some()`, `num_sends == 2`, and `commitment_public_key == Some(pubkey_used_in_send_2)`). - The historical 400 mapping unit test (`map_send_coins_error_prev_commitment_pubkey_required_is_400`) becomes `map_send_coins_error_legacy_prev_commitment_pubkey_string_is_unmapped_500` — pinning that the string falls through to the catch-all 500 arm so any future regression that re-introduces it can't be silently re-mapped to 400 without also walking back the architecture.
TaprootFreak
marked this pull request as ready for review
May 28, 2026 07:53
This was referenced May 28, 2026
TaprootFreak
added a commit
that referenced
this pull request
May 28, 2026
…135) `State::update` previously inserted the BIP-340 message digest into the commitment SMT, which only happened to match the in-circuit `CommitmentMerkleProofs::commitment()` invariant for 32-byte canonical-digest messages (mint flow). The wallet wire format ships a 64-byte `account_state_hash || output_coins_root` concatenation, and `get_account_state_hash` returned `sha256(message)` for that shape — so the SMT leaf was sha256(asth||ocr) instead of the canonical `hash_concat(asth, ocr)`. The in-circuit SMT inclusion check rejected wallet-shaped commitments, surfacing as `prove_account_update_with_in_and_out_coins_and_sources failed` on the second send from any wallet-built account (`second_send_succeeds_without_prev_commitment_pubkey_field`, PR #132). Special-case the 64-byte message shape: split into `ash || ocr`, reinterpret each half via `digest_from_bytes`, and store `hash_concat(ash, ocr)`. The 32-byte canonical path round-trips through `digest_from_bytes` to the same canonical digest, so mint commitments keep working unchanged. Non-32/non-64 fixtures (test-only) keep the legacy sha256 fallback to avoid a tests-only refactor; production callers never produce that shape. Regression tests pin the contract that 64-byte wallet messages produce the in-circuit canonical SMT value and that the two on-the-wire shapes agree on the SMT entry over identical (ash, ocr) halves. No migration needed: stale wallet-commitment entries refer to account rows wiped by migration 0012 and are unreferenced. Signed-off-by: TaprootFreak <142087526+TaprootFreak@users.noreply.github.com>
This was referenced May 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
07-send.spec.ts::send-successstill fails on DEV after PR #129 deployed:Interner Fehler: Vorheriger Public Key fehlt.(serverprev_commitment_pubkey required for account update, 400). The wallet's local BIP-32 child-index counter (numPubkeys) cannot be kept in sync with the server's persisted state across all the edge cases (seed restore, stale-app deploy, TOCTOU between balance fetch and request signing) — every desync surfaces as a 400.Direct evidence — the failing send body captured live on dfxdev (request_log id 8132):
{ \"account_address\": \"75bf7aa9…b2a8\", \"recipient\": \"05c6…b438\", \"amount\": 1000, \"public_key\": \"03d29d65…74c1\", // pubkey at index 0 — alice's FIRST send used this \"next_public_key\": \"03cb5c61…360b\", \"signature\": \"2dea93c1…\", \"timestamp\": 1779952953 // ← no \`prev_commitment_pubkey\` field }Alice's server-side state was
proof=Some, num_sends=1, balance=99000— and the/api/balancecall 0.65s earlier did returnnum_sends: 1. So either the wallet code did not consume the field, or it consumed it and still derived the wrong index. The deployedzk-coins/app:betacontainer is from 2026-05-25 — three days before PR #129 — and predates the app-side fix.Fix
Move the lookup to where the data lives: the server stores
Account::commitment_public_key: Option<PublicKey>and the AccountUpdate branch ofsend_coins_innerreads it from there instead of from the caller-suppliedprev_commitment_pubkey.Account, set atomically withproof+num_sendsafter a successful prove.proof.is_some() iff num_sends > 0 iff commitment_public_key.is_some().prev_commitment_pubkeyrequest field stays on the wire (for backwards-compat with deployed wallets that still emit it) but is ignored.\"prev_commitment_pubkey required for account update\"is dropped frommap_send_coins_error. The string is unreachable post-refactor; if a future regression re-introduces it, it falls through to the catch-all 500 — the pinned-and-renamed unit test surfaces it loudly.accounts(same closed-test-env precedent as 0010 / 0011): the bincode shape is non-additive, AND 0011 left post-fix(account): track per-account send counter; emit via /api/balance #129 rows in the inconsistentproof=Some, commitment_public_key=Nonestate that would panic the AccountUpdate branch's invariantexpect.Why this is the structurally right fix
The class of bugs this eliminates: every "client-side lookup-key derivation must stay in lockstep with server-persisted state across [seed restore | app deploy | TOCTOU race]" failure mode that surfaced as a 400 / SMT collision. The server already has authoritative knowledge of which pubkey the last commitment used — putting the lookup there removes the only synchronization point that could go stale.
The wallet's
numPubkeyscounter still matters for choosing the next SIGNING key (the field on the request that's actually security-load-bearing). That one is fine: the server'snum_sendsis its source of truth, and a stale value just means the wallet would re-use an already-used pubkey on the SMT — which produces a different, caller-fixable error (Unable to get merkle proofs for provided public key, 422), not a 400 with no recovery path.Behavioural changes
/api/sendAccountUpdate branch (i.e.account.proof.is_some()) succeeds even when the request body omitsprev_commitment_pubkeyor sends a stale one. The deployedzk-coins/app:betaon DEV stops 400ing without needing the app-side PR hotfix(migrations): revert ce4307c SQL comment edits to restore sqlx hash #125 (or any subsequent app deploy) to land.accountstable is wiped on deploy of this PR.Test plan
cargo fmt --checkcargo clippy -p node -p shared -- -D warningscargo clippy -p node --all-features -- -D warningscargo check --workspace --all-features --testsci:fulllabel set)api_remote::second_send_succeeds_without_prev_commitment_pubkey_fieldpasses against DEV after deployaccount_node_tests::test_send_coins_second_send_succeeds_without_prev_commitment_pubkeypasses in the slim lane07-send.spec.ts::send-successpasses against DEV on the app side (no app-side change required — the deployed app'sundefinedforprev_commitment_pubkeyis now harmless)Follow-up
zk-coins/appPR hotfix(migrations): revert ce4307c SQL comment edits to restore sqlx hash #125 can stay as-is (it now does redundant-but-harmless work). It can also be reduced to just thenum_sends→numPubkeyshydration for the SIGNING pubkey — theprev_commitment_pubkeyderivation branch can be dropped.prev_commitment_pubkey, drop the field fromSendCoinRequestentirely.