Skip to content

Release: develop -> main - #133

Merged
TaprootFreak merged 3 commits into
mainfrom
develop
May 29, 2026
Merged

Release: develop -> main#133
TaprootFreak merged 3 commits into
mainfrom
develop

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Automatic Release PR

Commits: 1 new commit(s)

  • Review all changes
  • Verify CI passes
  • Merge when ready for production

fix(router): replace "error" keyword in warn/info log strings (Loki classifier workaround)
@github-actions github-actions Bot added the ci:full Trigger heavy CI jobs (Server + Shared Tests + Coverage Gate, ~60-90 min on M3 Ultra) label May 28, 2026
…132)

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.
…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>
@TaprootFreak
TaprootFreak merged commit bd7ba84 into main May 29, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci:full Trigger heavy CI jobs (Server + Shared Tests + Coverage Gate, ~60-90 min on M3 Ultra)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant