Skip to content

friglet: validate settings off the async runtime (SNB-690) - #65

Closed
setavenger wants to merge 5 commits into
integrationfrom
snb-690-async-settings-validation
Closed

setavenger wants to merge 5 commits into
integrationfrom
snb-690-async-settings-validation

Conversation

@setavenger

Copy link
Copy Markdown
Owner

Stacked on #60 (on #53); review only the commit after it.

Fixes SNB-690. Settings validation resolves the P2P hostname on a blocking worker, with a 10-second response limit, matching the tray. A slow system resolver no longer stalls a Tokio worker.

Validation receives a private config copy and only reads it. A timed-out resolver may finish later on the blocking pool; its discarded result cannot persist settings or request a restart. The existing apply lock and persist/restart sequence are unchanged, including re-preparation after concurrent settings changes.

Validation (debug build, private target directory):

  • Both regression tests fail with the old synchronous validation behavior and pass with the fix: single-worker control responsiveness and a bounded validation wait.
  • cargo check --workspace --all-targets --all-features: passed, no warnings.
  • cargo clippy --no-deps -p friglet -p friglet-ipc -p friglet-tray --all-targets -- -D warnings: passed.
  • cargo fmt -p friglet -p friglet-ipc -p friglet-tray -- --check: passed.
  • cargo test --workspace: 256 passed, 1 ignored, 0 failed.
  • cargo build -p friglet: passed.
  • Real daemon with one Tokio worker and a temporary DNS interposer: during a 2-second lookup, GetStatus/Stop/Start answered in 0.6/15.2/0.5 ms; settings then saved successfully and the daemon restarted. During a 12-second lookup, controls answered in 0.8/9.3/0.8 ms; settings returned the timeout error at 10.007 s. The config was unchanged both at the timeout and after the resolver finished. Both daemon processes shut down cleanly.
  • Independent review cleared lock ordering, late-worker isolation and error propagation.

The runtime checks used isolated config/key/state files and a local accepting oracle. The interposer was limited to these test processes; no global resolver settings were changed.

setavenger and others added 5 commits October 3, 2026 08:47
The Electrum server built the same things in several places. One copy
of each now:

- notification(): the JSON-RPC notification line (was written out four
  times); sp_subscription(): the SP subscription object and its
  notification, shared by the push task and the subscribe handler.
- invalid_param(): the -32602 answer for a missing or mistyped first
  parameter (block.header, scripthash.subscribe/get_history,
  transaction.get); the messages are unchanged.
- save_header_sidecar(): the header-sidecar write after a backfill and
  after a reorg.
- Peer::header_by_hash() takes one hash (its only caller passed a
  one-element slice) and returns only a header with that hash, so the
  two re-checks of the same hash in ChainSource::header and
  backfill_header go.
- relay: connect_settled() (connect + settle, the 2 s literal is now
  p2p::SETTLE_WAIT, also used by ChainSource::fee_filter),
  Candidate::wire_tx() and Signals::announce() replace two or three
  copies each.
- index_unconfirmed_tx: two match arms that both did nothing are one
  condition.
- Two tests build their request with call() like the others.

The bytes on the wire are unchanged: a scripted session of 52 requests
and 8 push batches gives byte-identical output before and after.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…(SNB-664)

Leftovers from the live scanner swap and from earlier refactors:

- ControlCtx keeps the Electrum index and the label addresses directly;
  the std Mutex around each was never written after the live
  rebuild-and-swap went away (#29). The Start comment that still
  described the swap is fixed.
- One-line wrappers around friglet-ipc are gone (default_config_path,
  default_key_file, write_config_file, write_key_file, replace_scan_key);
  apply() writes the key it already parsed instead of having
  replace_scan_key parse it again.
- pick_tip was `oracle.or(electrum)`; inlined, with its test.
- control's unix_now duplicated pending::now_secs.
- The key file's "first non-empty line" is read by one helper.
- ResolvedConfig no longer copies oracle_url, max_label_num, http_addr
  and electrum_addr out of `raw`.
- main no longer sets sp_start_height a second time right after
  rebuild_electrum_index_from_graph set it.
- control::run takes the ControlCtx instead of a generic handler; its
  only other user was get_status_roundtrip_over_control_socket, which
  repeated friglet-ipc's roundtrip test and every serve_ctx test.
- supervisor: stop_during_a_download_pauses_at_once repeated the
  cooperative-cancel tests and left a 30 s thread behind.
- fake_peer: the single-field Seen struct is a Vec.
- Stale comments: types.rs, the --oracle-url default, electrum::run.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…(SNB-685)

apply() took apply_lock first and then looked up a new wallet's
birthday at the oracle (up to 15 s) and resolved the P2P host name
(blocking DNS) while holding it, so a Stop or Start sent during an
ApplySettings with start_at_tip waited for both.

Both lookups now run in prepare(), before the lock. Under the lock
apply() still reads the current settings, compares, persists and
requests the restart, so a settings change still never interleaves with
Start/Stop or another apply. A SetScanKey (no config of its own) whose
settings snapshot was replaced by another apply while it waited for the
lock prepares again from the newer settings, as if the two had run one
after the other.

Tests: Stop and Start answer within a second while an apply waits on an
oracle that never answers (the old code timed out after 2 s); a
SetScanKey that waited behind another apply keeps that apply's settings.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Review: when a SetScanKey's settings snapshot had been replaced by
another apply while it waited for the lock, it prepared again (oracle
birthday lookup, blocking DNS) while holding apply_lock, so Start/Stop
could still wait behind the network in that case, and the field doc was
not true.

apply() now drops the lock, prepares again from the new settings and
takes the lock again to check; it persists only once the settings it
prepared from are the ones under the lock. Comparing and persisting
still happen under the lock only, so Start/Stop never see a half-applied
change and two applies never mix their writes.

New test: settings replaced (by a config whose preparation waits on an
oracle that never answers) while a SetScanKey waited for the lock; Stop
and Start still answer within a second, nothing is persisted. With the
re-prepare under the lock, Stop timed out after 2 s.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Move full settings validation, including the system DNS lookup, to a
blocking worker with a ten-second response deadline. The worker owns a
private config copy, so a late result cannot persist settings or restart
the daemon after the request times out.

Keep birthday lookup and both prepare paths outside apply_lock. Verify
responsiveness on a single async worker and timeout handling independently
of real DNS.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@setavenger

Copy link
Copy Markdown
Owner Author

Merged into integration through #70 on 2026-10-11 (the user live-tested the combined stack first). GitHub's stacked-PR merge rebased the stack, so this PR's commits landed with new IDs and GitHub can't mark it merged itself. The code is identical: integration now has the same tree as the tested branch friglet-deslop-live-test (08bf11d), which contains this PR's head. Closing as merged via #70.

@setavenger setavenger closed this Oct 11, 2026
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.

1 participant