Decouple the RBF abandon clock from the bump clock (B-27)
bump_fee (tx/broadcast.py) used to overwrite PendingTransaction. broadcast_at on every fee bump, but reconcile.py's abandon-after-N- hours grace period is measured from that same column. A transaction successfully bumped every rbf_timeout_seconds (900s by default) but never mined reset that clock before it could ever reach the 6-hour abandon window, so it was never abandoned: its UTXOs never returned to the user, and if it was a bet the round stayed in "closing" indefinitely. PendingTransaction gains a last_broadcast_at column (migration 861e76aaf34c, backfilled from broadcast_at for existing rows before the NOT NULL constraint is applied). broadcast_at is now never rewritten after creation, so reconcile.py's _is_due keeps measuring from the first broadcast unchanged. bump_fee updates last_broadcast_at instead, and should_bump now reads last_broadcast_at rather than broadcast_at — correct, since whether another bump is due should reset after every bump, unlike the reconciler's abandon check, which must not. BUGS.md moves B-27 to "Previously fixed" with the fix description; the suite grows from 148 to 151 tests, including a direct proof that a tx bumped a minute ago but first broadcast 7 hours ago still gets abandoned. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
50a43ae3ca
commit
933760e948
7 files changed
+208
-29
No files matched your search
@@ -0,0 +1,41 @@
|
||||
"""add last_broadcast_at to pending_transactions
|
||||
|
||||
Fixes B-27: bump_fee used to overwrite broadcast_at on every RBF bump, but
|
||||
tx/reconcile.py's abandon-after-N-hours grace period is measured from that same
|
||||
column — so a transaction bumped repeatedly but never mined reset that clock on
|
||||
every bump and was never abandoned. broadcast_at now stays the *first* broadcast
|
||||
(what the reconciler measures from); last_broadcast_at is the new column bump_fee
|
||||
updates and should_bump reads to decide whether another bump is due.
|
||||
|
||||
Backfilled from the existing broadcast_at (the best available approximation for
|
||||
rows written before this column existed — for a row never bumped it's exact)
|
||||
before the NOT NULL constraint is applied, so this is safe against any existing
|
||||
data.
|
||||
|
||||
Revision ID: 861e76aaf34c
|
||||
Revises: 8a1c4e7b2d90
|
||||
Create Date: 2026-07-27
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = '861e76aaf34c'
|
||||
down_revision: Union[str, Sequence[str], None] = '8a1c4e7b2d90'
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.add_column('pending_transactions', sa.Column('last_broadcast_at', sa.DateTime(), nullable=True))
|
||||
op.execute('UPDATE pending_transactions SET last_broadcast_at = broadcast_at')
|
||||
with op.batch_alter_table('pending_transactions') as batch_op:
|
||||
batch_op.alter_column('last_broadcast_at', nullable=False)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.drop_column('pending_transactions', 'last_broadcast_at')
|
||||
Reference in new issue
Block a user