Skip to content

Preserve effective wallet keystore directory configuration - #2525

Open
a-shannon wants to merge 2 commits into
ergoplatform:masterfrom
a-shannon:fix/effective-wallet-secret-dir
Open

Preserve effective wallet keystore directory configuration#2525
a-shannon wants to merge 2 commits into
ergoplatform:masterfrom
a-shannon:fix/effective-wallet-secret-dir

Conversation

@a-shannon

@a-shannon a-shannon commented Sep 6, 2026

Copy link
Copy Markdown
Contributor

The wallet keystore directory respects the merged configuration priorities. A post-resolution rewrite previously replaced explicit higher-priority values whenever the user file supplied only the base directory.

The reader resolves the existing directory substitution after merging configuration layers. Explicit values keep their priority, and the default follows the effective base directory. Existing keystore files are not moved.

Review and integration

Reusable candidate fixtures and the standalone selected-header observation helper are extracted into #2535, which should merge first. This branch contains that exact prerequisite followed by the settings correction in commit 3c41051323eff25f0c6000653e47621a8745a0c1.

Review only the two settings files. These source and direct-test files are unchanged from the previous PR head. GitHub's upstream-master diff includes the common prerequisite until it merges; the incremental settings change contains no fixture edits.

Validation: all 13 ErgoSettingsSpecification tests pass. These results are reused because the two settings files are unchanged after rebasing; current-head CI has eight of eight successful checks. They cover system, user and application values, default derivation and restoration of temporary configuration properties. Current-head CI and integration tracker.

Keep synchronization scenarios with their correction in ergoplatform#2511. Reuse the spendable sorting fixture already present in ergoplatform#2480.
@a-shannon
a-shannon force-pushed the fix/effective-wallet-secret-dir branch from d1daf17 to 3c41051 Compare September 8, 2026 10:33
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