Chia-Network/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2024-09-20 16:08:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rework offer completion detection

Browse Source
This commit is contained in:
Matt Hauff 2022-07-21 10:19:27 -05:00
parent fe64274cd2
commit 99cbac8a5f
No known key found for this signature in database
GPG Key ID: 3CBA6CFC81A00E46
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chia/wallet/trade_manager.py
View File

@ -141,25 +141,24 @@ class TradeManager:
# Then let's filter the offer into coins that WE offered
offer = Offer.from_bytes(trade.offer)
primary_coin_ids = [c.name() for c in offer.get_primary_coins()]
primary_coin_ids = [c.name() for c in offer.bundle.removals()]
our_coin_records: List[WalletCoinRecord] = await self.wallet_state_manager.coin_store.get_multiple_coin_records(
primary_coin_ids
)
our_primary_coins: List[bytes32] = [cr.coin.name() for cr in our_coin_records]
all_settlement_payments: List[Coin] = [c for coins in offer.get_offered_coins().values() for c in coins]
our_settlement_payments: List[Coin] = list(
filter(lambda c: offer.get_root_removal(c).name() in our_primary_coins, all_settlement_payments)
our_primary_coins: List[bytes32] = [cr.coin for cr in our_coin_records]
our_additions: List[Coin] = list(
filter(lambda c: offer.get_root_removal(c) in our_primary_coins, offer.bundle.additions())
)
our_settlement_ids: List[bytes32] = [c.name() for c in our_settlement_payments]
our_addition_ids: List[bytes32] = [c.name() for c in our_additions]
# And get all relevant coin states
coin_states = await self.wallet_state_manager.wallet_node.get_coin_state(our_settlement_ids, fork_height)
coin_states = await self.wallet_state_manager.wallet_node.get_coin_state(our_addition_ids, fork_height)
assert coin_states is not None
coin_state_names: List[bytes32] = [cs.coin.name() for cs in coin_states]
# If any of our settlement_payments were spent, this offer was a success!
if set(our_settlement_ids) & set(coin_state_names):
height = coin_states[0].spent_height
if set(our_addition_ids) == set(coin_state_names):
height = coin_states[0].created_height
await self.trade_store.set_status(trade.trade_id, TradeStatus.CONFIRMED, True, height)
tx_records: List[TransactionRecord] = await self.calculate_tx_records_for_offer(offer, False)
for tx in tx_records:

9
tests/wallet/db_wallet/test_dl_offers.py
View File

@ -8,6 +8,8 @@ from chia.types.blockchain_format.sized_bytes import bytes32
from chia.util.ints import uint64
from chia.wallet.puzzle_drivers import Solver
from chia.wallet.trading.offer import Offer
from chia.wallet.trading.trade_status import TradeStatus
from chia.wallet.trade_record import TradeRecord
from chia.wallet.util.merkle_utils import build_merkle_tree
from tests.time_out_assert import time_out_assert
@ -185,3 +187,10 @@ async def test_dl_offers(wallets_prefarm: Any, trusted: bool) -> None:
assert taker_singleton is not None
assert maker_singleton.root == maker_root
assert taker_singleton.root == taker_root
async def get_trade_and_status(trade_manager: Any, trade: TradeRecord) -> TradeStatus:
trade_rec = await trade_manager.get_trade_by_id(trade.trade_id)
return TradeStatus(trade_rec.status)
await time_out_assert(15, get_trade_and_status, TradeStatus.CONFIRMED, trade_manager_maker, offer_maker)
await time_out_assert(15, get_trade_and_status, TradeStatus.CONFIRMED, trade_manager_taker, offer_taker)