d0947f7e50
When postponing the delivery time of an already signed/sent will, the user was asked to sign the on-chain invalidation transaction twice before the new (postponed) will could be built. Root cause: after the invalidation tx was broadcast, on_success_invalidate restarted task_phase1 to rebuild the will, but the old will items were still marked COMPLETE/PUSHED with their original tx.locktime (the on-chain invalidation did not update the in-memory status). The postpone check therefore fired WillPostponedException a second time, requesting another invalidation. Fix: - Add Will.mark_invalidated_by_tx(will, tx): marks INVALIDATED every valid will item that spends a prevout consumed by the just-broadcast invalidation tx. Setting INVALIDATED clears the VALID flag, removing those items from only_valid_list so the postpone/expire check no longer fires. - Call it from loop_broadcast_invalidating after a successful broadcast (txid obtained) and persist via save_willitems. On the phase-1 restart the old will is no longer VALID, so the will is rebuilt directly: a single invalidation signature followed by the new will. Tests: add test_will_mark_invalidated_by_tx and test_will_mark_invalidated_by_tx_no_match plus the WillPostponedException hierarchy assertion. 184 tests pass; smoke and external-zip OK; ruff clean. Bump version to 0.3.1.
38 lines
1.8 KiB
Python
38 lines
1.8 KiB
Python
"""BAL - Bitcoin After Life Electrum plugin.
|
|
|
|
Free and decentralized Bitcoin inheritance support for the Electrum wallet.
|
|
|
|
This package was reorganized (Approach A: conservative, behavior-preserving)
|
|
to cleanly separate logic from presentation. The original monolithic plugin
|
|
mixed the business logic with the PyQt GUI; here the two concerns live in
|
|
distinct sub-packages:
|
|
|
|
bal/
|
|
core/ GUI-free business logic (importable without Qt)
|
|
util.py Generic helpers (encoding, validation, ...)
|
|
plugin_base.py BasePlugin subclass, config, timestamp handling
|
|
heirs.py Heir list model + transaction building
|
|
will.py Will / WillItem domain model
|
|
willexecutors.py Will-executor (dead-man's switch) networking
|
|
gui/
|
|
qt/ PyQt6 presentation layer
|
|
theme.py Colors / status -> color mapping (status_color)
|
|
common.py Shared imports and small GUI helpers
|
|
widgets.py Leaf widgets (editors, labels, checkboxes, ...)
|
|
calendar.py BalCalendar widget
|
|
dialogs.py Dialog windows (wizard, build-will, detail, ...)
|
|
lists.py Tree/list views (heirs, preview, will-executors)
|
|
window.py BalWindow controller (per-wallet GUI state)
|
|
plugin.py Plugin class wiring Electrum @hooks to the GUI
|
|
qt.py Thin loader shim re-exporting `Plugin` for Electrum
|
|
|
|
Electrum discovers the plugin through ``manifest.json`` and loads the GUI
|
|
entry point from ``qt.py`` (the shim), which imports the real ``Plugin``
|
|
from ``gui.qt.plugin``.
|
|
|
|
The plugin targets Electrum 4.7.2 (the last stable release exposing
|
|
``json_db.register_dict``) and PyQt6.
|
|
"""
|
|
|
|
__version__ = "0.3.1"
|