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

Merge branch 'dl_offer_hooks' into dl_clsp_mirrors

Browse Source
This commit is contained in:
Matt Hauff 2022-08-01 16:25:15 -05:00
commit 66395038f2
No known key found for this signature in database
GPG Key ID: 3CBA6CFC81A00E46
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chia/data_layer/data_layer_wallet.py
View File

@ -1156,7 +1156,7 @@ class DataLayerWallet:
}
)
async def get_coins_to_offer(self, launcher_id: bytes32, amount: uint64) -> Set[Coin]:
async def get_coins_to_offer(self, launcher_id: bytes32, amount: uint64, _: Optional[uint128]) -> Set[Coin]:
record = await self.get_latest_singleton(launcher_id)
if record is None:
raise ValueError(f"DL wallet does not know about launcher ID {launcher_id}")

20
chia/wallet/trade_manager.py
View File

@ -296,12 +296,16 @@ class TradeManager:
async def create_offer_for_ids(
self,
offer: Dict[Union[int, bytes32], int],
driver_dict: Dict[bytes32, PuzzleInfo] = {},
solver: Solver = Solver({}),
driver_dict: Optional[Dict[bytes32, PuzzleInfo]] = None,
solver: Optional[Solver] = None,
fee: uint64 = uint64(0),
validate_only: bool = False,
min_coin_amount: Optional[uint128] = None,
) -> Union[Tuple[Literal[True], TradeRecord, None], Tuple[Literal[False], None, str]]:
if driver_dict is None:
driver_dict = {}
if solver is None:
solver = Solver({})
result = await self._create_offer_for_ids(offer, driver_dict, solver, fee=fee, min_coin_amount=min_coin_amount)
if not result[0] or result[1] is None:
raise Exception(f"Error creating offer: {result[2]}")
@ -331,14 +335,18 @@ class TradeManager:
async def _create_offer_for_ids(
self,
offer_dict: Dict[Union[int, bytes32], int],
driver_dict: Dict[bytes32, PuzzleInfo] = {},
solver: Solver = Solver({}),
driver_dict: Optional[Dict[bytes32, PuzzleInfo]] = None,
solver: Optional[Solver] = None,
fee: uint64 = uint64(0),
min_coin_amount: Optional[uint128] = None,
) -> Union[Tuple[Literal[True], Offer, None], Tuple[Literal[False], None, str]]:
"""
Offer is dictionary of wallet ids and amount
"""
if driver_dict is None:
driver_dict = {}
if solver is None:
solver = Solver({})
try:
coins_to_offer: Dict[Union[int, bytes32], List[Coin]] = {}
requested_payments: Dict[Optional[bytes32], List[Payment]] = {}
@ -590,10 +598,12 @@ class TradeManager:
async def respond_to_offer(
self,
offer: Offer,
solver: Solver = Solver({}),
solver: Optional[Solver] = None,
fee=uint64(0),
min_coin_amount: Optional[uint128] = None,
) -> Union[Tuple[Literal[True], TradeRecord, None], Tuple[Literal[False], None, str]]:
if solver is None:
solver = Solver({})
take_offer_dict: Dict[Union[bytes32, int], int] = {}
arbitrage: Dict[Optional[bytes32], int] = offer.arbitrage()