The code treated a broadcast as final: money moved on-chain and the DB was updated on the assumption it would either confirm or be fee-bumped until it did. Neither is guaranteed, and every way that assumption broke was permanent (BUGS.md B-02, B-03, B-04, B-07, B-08, B-20, B-21). Persist before broadcasting. place_bet and request_withdrawal now write their rows in a "building" state and commit, then broadcast, then promote to broadcast/pending in a second commit. Before, a failure or crash between the broadcast and the commit left the coins irreversibly spent with no trace: no participant (so no entry in the draw), no pending row (so no RBF and no confirmation tracking), and the UTXOs not even marked spent, so the next bet would try to double-spend them. A refused broadcast now releases the reserved UTXOs, restores the balance, removes the participant (or marks the withdrawal failed), audit-logs it, and answers a translatable broadcast_failed — as 502, since the network refused it, not the caller, where it used to be an opaque 500. Reconcile what's in flight against the chain. New PendingTransactionReconciler (app/tx/reconcile.py, every 120s and once at startup) asks whether each non-terminal tx exists: present -> promote, gone -> mark failed with a reason, release the inputs, roll the domain row back, audit-log it. Grace periods differ by state (120s for "building", 6h for "pending", so the RBF bumper gets its attempts first). It is deliberately biased to inaction: only a server that positively doesn't know the tx counts as absent, and a transport failure never abandons anything, because releasing a UTXO whose tx is actually alive would invite a double-spend. Verified against the live server, which answers "No such mempool or blockchain transaction" for an unknown txid. Stop keying on a value that changes. An RBF bump changes the txid, and _on_bet_confirmed looked the participant up by bet_txid — so a bumped bet confirmed under a txid no participant carried, the row stayed "broadcast" forever, and the scheduler waited on it forever: the round could never close and the lottery stopped. Handlers now resolve by immutable ids (round_id/user_id, withdrawal_id), and bump_fee retargets every stored txid — bet_txid, Withdrawal.txid, Round.payout_txid and UtxoEvent.spent_txid — plus records the previous one in replaced_by_txid, which was never written at all. One bad row no longer blocks the rest. The confirmation poller's per-tx lookup is guarded: a txid the server can't resolve used to abort the whole pass, so nothing confirmed again until an operator intervened. It also selects plain columns instead of hydrating entities that outlive their session. Tests: 6 reconciler cases including "a broken connection must not release coins"; the bet-ordering test probes committed state from an independent session during the broadcast, and caught a real mistake in the first draft of this change (the _pending_transaction helper still hardcoded status="pending", so rows were born already-broadcast and would have got the 6-hour grace instead of 120s). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
174 lines
7.2 KiB
Python
174 lines
7.2 KiB
Python
import pytest
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
|
|
|
|
import app.bets.confirmation # noqa: F401 (registers the "bet" handler)
|
|
import app.rounds.confirmation # noqa: F401 (registers the "payout" handler)
|
|
from app.db.base import Base
|
|
from app.db.models import PendingTransaction, Round, RoundParticipant
|
|
from app.tx.confirmation import poll_once
|
|
|
|
|
|
class FakeClient:
|
|
def __init__(self, confirmations_by_txid: dict[str, int]):
|
|
self._confirmations = confirmations_by_txid
|
|
|
|
async def get_transaction(self, txid: str, verbose: bool = False) -> dict:
|
|
return {"confirmations": self._confirmations.get(txid, 0)}
|
|
|
|
|
|
@pytest.fixture
|
|
async def session_factory():
|
|
engine = create_async_engine("sqlite+aiosqlite:///:memory:")
|
|
async with engine.begin() as conn:
|
|
await conn.run_sync(Base.metadata.create_all)
|
|
yield async_sessionmaker(engine, expire_on_commit=False)
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_bet_confirmation_marks_participant_confirmed(session_factory):
|
|
async with session_factory() as session:
|
|
session.add(Round(id=1, status="open"))
|
|
session.add(
|
|
RoundParticipant(
|
|
round_id=1, user_id=1, bet_amount_sats=1_000, bet_txid="tx1", status="broadcast"
|
|
)
|
|
)
|
|
session.add(
|
|
PendingTransaction(kind="bet", round_id=1, user_id=1, current_txid="tx1", fee_rate_sat_vb=1, raw_tx_hex="00", status="pending")
|
|
)
|
|
await session.commit()
|
|
|
|
client = FakeClient({"tx1": 1})
|
|
confirmed = await poll_once(session_factory, client)
|
|
assert confirmed == 1
|
|
|
|
async with session_factory() as session:
|
|
participant = (await session.scalars(select(RoundParticipant))).one()
|
|
assert participant.status == "confirmed"
|
|
assert participant.confirmed_at is not None
|
|
pending = (await session.scalars(select(PendingTransaction))).one()
|
|
assert pending.status == "confirmed"
|
|
|
|
|
|
async def test_unconfirmed_tx_is_left_pending(session_factory):
|
|
async with session_factory() as session:
|
|
session.add(Round(id=2, status="open"))
|
|
session.add(RoundParticipant(round_id=2, user_id=1, bet_amount_sats=1_000, bet_txid="tx2", status="broadcast"))
|
|
session.add(PendingTransaction(kind="bet", round_id=2, user_id=1, current_txid="tx2", fee_rate_sat_vb=1, raw_tx_hex="00", status="pending"))
|
|
await session.commit()
|
|
|
|
client = FakeClient({"tx2": 0})
|
|
confirmed = await poll_once(session_factory, client)
|
|
assert confirmed == 0
|
|
|
|
async with session_factory() as session:
|
|
participant = (await session.scalars(select(RoundParticipant))).one()
|
|
assert participant.status == "broadcast"
|
|
|
|
|
|
async def test_payout_confirmation_closes_round(session_factory):
|
|
async with session_factory() as session:
|
|
session.add(Round(id=3, status="paying_out", payout_txid="tx3"))
|
|
session.add(PendingTransaction(kind="payout", round_id=3, current_txid="tx3", fee_rate_sat_vb=1, raw_tx_hex="00", status="pending"))
|
|
await session.commit()
|
|
|
|
client = FakeClient({"tx3": 2})
|
|
confirmed = await poll_once(session_factory, client)
|
|
assert confirmed == 1
|
|
|
|
async with session_factory() as session:
|
|
round_ = await session.get(Round, 3)
|
|
assert round_.status == "closed"
|
|
|
|
|
|
class ExplodingClient:
|
|
"""Answers for one txid and raises for the other — a tx the server no longer
|
|
knows (dropped from the mempool, replaced by a bump)."""
|
|
|
|
def __init__(self, known: dict[str, int], exploding_txid: str):
|
|
self._known = known
|
|
self._exploding = exploding_txid
|
|
|
|
async def get_transaction(self, txid: str, verbose: bool = False) -> dict:
|
|
if txid == self._exploding:
|
|
raise RuntimeError("missing transaction")
|
|
return {"confirmations": self._known.get(txid, 0)}
|
|
|
|
|
|
async def test_one_unresolvable_txid_does_not_block_the_others(session_factory):
|
|
"""B-03: the lookup used to be unguarded, so a single unknown txid aborted the
|
|
whole pass — nothing confirmed again until an operator intervened, which in turn
|
|
meant no round could ever close."""
|
|
async with session_factory() as session:
|
|
session.add(Round(id=10, status="open"))
|
|
session.add(
|
|
RoundParticipant(round_id=10, user_id=1, bet_amount_sats=1_000, bet_txid="good", status="broadcast")
|
|
)
|
|
session.add(
|
|
PendingTransaction(
|
|
kind="bet", round_id=10, user_id=2, current_txid="gone", fee_rate_sat_vb=1, raw_tx_hex="00",
|
|
status="pending",
|
|
)
|
|
)
|
|
session.add(
|
|
PendingTransaction(
|
|
kind="bet", round_id=10, user_id=1, current_txid="good", fee_rate_sat_vb=1, raw_tx_hex="00",
|
|
status="pending",
|
|
)
|
|
)
|
|
await session.commit()
|
|
|
|
confirmed = await poll_once(session_factory, ExplodingClient({"good": 1}, exploding_txid="gone"))
|
|
assert confirmed == 1 # the healthy one still got processed
|
|
|
|
async with session_factory() as session:
|
|
participant = (await session.scalars(select(RoundParticipant).where(RoundParticipant.round_id == 10))).one()
|
|
assert participant.status == "confirmed"
|
|
rows = {p.current_txid: p.status for p in (await session.scalars(select(PendingTransaction))).all()}
|
|
assert rows["good"] == "confirmed"
|
|
assert rows["gone"] == "pending" # left for the reconciler to judge, not abandoned here
|
|
|
|
|
|
async def test_bet_confirms_after_an_rbf_bump_changed_the_txid(session_factory):
|
|
"""B-02: the handler used to match on bet_txid, so a bumped bet confirmed under
|
|
a txid no participant carried — the participant stayed "broadcast" forever and
|
|
the round could never close. It now resolves by (round_id, user_id)."""
|
|
async with session_factory() as session:
|
|
session.add(Round(id=11, status="open"))
|
|
session.add(
|
|
RoundParticipant(
|
|
round_id=11, user_id=7, bet_amount_sats=1_000, bet_txid="old-txid", status="broadcast"
|
|
)
|
|
)
|
|
session.add(
|
|
PendingTransaction(
|
|
kind="bet", round_id=11, user_id=7, current_txid="bumped-txid", fee_rate_sat_vb=2,
|
|
raw_tx_hex="00", status="pending", replaced_by_txid="old-txid",
|
|
)
|
|
)
|
|
await session.commit()
|
|
|
|
assert await poll_once(session_factory, FakeClient({"bumped-txid": 1})) == 1
|
|
|
|
async with session_factory() as session:
|
|
participant = (await session.scalars(select(RoundParticipant).where(RoundParticipant.round_id == 11))).one()
|
|
assert participant.status == "confirmed"
|
|
|
|
|
|
async def test_payout_confirms_after_an_rbf_bump_changed_the_txid(session_factory):
|
|
async with session_factory() as session:
|
|
session.add(Round(id=12, status="paying_out", payout_txid="old-payout"))
|
|
session.add(
|
|
PendingTransaction(
|
|
kind="payout", round_id=12, current_txid="bumped-payout", fee_rate_sat_vb=2,
|
|
raw_tx_hex="00", status="pending",
|
|
)
|
|
)
|
|
await session.commit()
|
|
|
|
assert await poll_once(session_factory, FakeClient({"bumped-payout": 1})) == 1
|
|
|
|
async with session_factory() as session:
|
|
assert (await session.get(Round, 12)).status == "closed"
|