davideandClaude Sonnet 5.5
fd6a91e93d
All bets of all rounds paid one address (m/84'/746'/0'/1/0), so its history grew forever, other rounds' money and stray coins mixed with a round's own, and the payout picked from everything it held. - hd.py: derive_pool_key/derive_pool_address(round_id) on branch 2 (m/84'/746'/0'/2/<round_id>); no argument is the reserve address 1/0. derive_round_pool_key checks the key against the address stored on the round, so a payout can never be signed for money its key does not control. - rounds.pool_address (migration 477bddae1a84, existing rounds backfilled with the reserve address since that is where their bets went; add_column, not a batch alter, so the expression indexes stay): written in the transaction that inserts the round, once its id exists. - place_bet pays round.pool_address; the payout reads, signs and takes change at the round's own address; own_address_for and bump_fee's _signing_context follow the round (confirmation poller and reconciler pass round_id). - Withdrawals to any round pool address, the reserve address or fee_address are refused (withdrawal_to_platform_address, 400, all seven languages). - GET /rounds/current and GET /admin/rounds expose pool_address. - RND-22/DAT-11 stay "da implementare" for B-82: the payout still spends every confirmed coin at the round's address, not only the participants' outpoints (participants carry no bet_vout yet). - tests/unit/conftest.py: every test now gets a throwaway master key. Opening a round derives an address, and tests that merely opened a round were silently reading the real key from the local .env. - Existing tests changed because the spec changed: payout fixtures give their round a pool_address; the reconciler's address-cache test uses two payouts of one round (rows of different rounds no longer share an address); own_address_for now takes the round id. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
29 lines
1.3 KiB
Python
29 lines
1.3 KiB
Python
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.db.models import Round, User
|
|
from app.wallet.hd import derive_user_address
|
|
|
|
|
|
async def own_address_for(
|
|
session: AsyncSession, kind: str, user_id: int | None, round_id: int | None = None
|
|
) -> str:
|
|
"""The address that owns every input of a PendingTransaction of this kind —
|
|
a user's own address for a bet/withdrawal, the pool address of the round for a
|
|
payout (B-80: each round has its own, stored on the round).
|
|
All our builders only ever spend one address's UTXOs per tx (see
|
|
tx/broadcast.py:_signing_context, which derives the same address alongside
|
|
the signing key it also needs).
|
|
|
|
Shared by tx/confirmation.py and tx/reconcile.py (B-41): both now check
|
|
blockchain.scripthash.get_history for this address instead of asking
|
|
blockchain.transaction.get for a verbose reply, so the two can't derive
|
|
different addresses for the same row.
|
|
"""
|
|
if kind == "payout":
|
|
round_ = await session.get(Round, round_id) if round_id is not None else None
|
|
if round_ is None or not round_.pool_address:
|
|
raise ValueError(f"payout of round {round_id}: the round has no pool address")
|
|
return round_.pool_address
|
|
user = await session.get(User, user_id)
|
|
return derive_user_address(user.derivation_index)
|