Chia-Network/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2024-11-10 12:29:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add the expected offer ID to some RPCs that take offer blobs (#14366)

Browse Source 
* Add the exected offer ID to some RPCs that take offer blobs

* Add ID to client too

* black
This commit is contained in:
Matt Hauff 2023-01-20 10:58:23 -07:00 committed by GitHub
parent 902f99e047
commit 8e0cabad7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chia/rpc/wallet_rpc_api.py
View File

@ -1532,10 +1532,14 @@ class WalletRpcApi:
if request.get("advanced", False):
return {
"summary": {"offered": offered, "requested": requested, "fees": offer.bundle.fees(), "infos": infos}
"summary": {"offered": offered, "requested": requested, "fees": offer.bundle.fees(), "infos": infos},
"id": offer.name(),
}
else:
return {"summary": await self.service.wallet_state_manager.trade_manager.get_offer_summary(offer)}
return {
"summary": await self.service.wallet_state_manager.trade_manager.get_offer_summary(offer),
"id": offer.name(),
}
async def check_offer_validity(self, request) -> EndpointResult:
offer_hex: str = request["offer"]
@ -1543,7 +1547,10 @@ class WalletRpcApi:
peer: Optional[WSChiaConnection] = self.service.get_full_node_peer()
if peer is None:
raise ValueError("No peer connected")
return {"valid": (await self.service.wallet_state_manager.trade_manager.check_offer_validity(offer, peer))}
return {
"valid": (await self.service.wallet_state_manager.trade_manager.check_offer_validity(offer, peer)),
"id": offer.name(),
}
async def take_offer(self, request) -> EndpointResult:
offer_hex: str = request["offer"]

10
chia/rpc/wallet_rpc_client.py
View File

@ -689,13 +689,15 @@ class WalletRpcClient(RpcClient):
offer_str: str = "" if offer is None else bytes(offer).hex()
return offer, TradeRecord.from_json_dict_convenience(res["trade_record"], offer_str)
async def get_offer_summary(self, offer: Offer, advanced: bool = False) -> Dict[str, Dict[str, int]]:
async def get_offer_summary(
self, offer: Offer, advanced: bool = False
) -> Tuple[bytes32, Dict[str, Dict[str, int]]]:
res = await self.fetch("get_offer_summary", {"offer": offer.to_bech32(), "advanced": advanced})
return res["summary"]
return bytes32.from_hexstr(res["id"]), res["summary"]
async def check_offer_validity(self, offer: Offer) -> bool:
async def check_offer_validity(self, offer: Offer) -> Tuple[bytes32, bool]:
res = await self.fetch("check_offer_validity", {"offer": offer.to_bech32()})
return res["valid"]
return bytes32.from_hexstr(res["id"]), res["valid"]
async def take_offer(
self, offer: Offer, solver: Dict[str, Any] = None, fee=uint64(0), min_coin_amount: uint64 = uint64(0)

10
tests/core/data_layer/test_data_rpc.py
View File

@ -126,7 +126,7 @@ async def check_singleton_confirmed(dl: DataLayer, tree_id: bytes32) -> bool:
async def process_block_and_check_offer_validity(offer: TradingOffer, offer_setup: OfferSetup) -> bool:
await offer_setup.full_node_api.farm_blocks_to_puzzlehash(count=1, guarantee_transaction_blocks=True)
return await offer_setup.maker.data_layer.wallet_rpc.check_offer_validity(offer=offer)
return (await offer_setup.maker.data_layer.wallet_rpc.check_offer_validity(offer=offer))[1]
@pytest.mark.asyncio
@ -1609,9 +1609,11 @@ async def test_make_and_cancel_offer(offer_setup: OfferSetup, reference: MakeAnd
await offer_setup.maker.api.cancel_offer(request=cancel_request)
for _ in range(10):
if not await offer_setup.maker.data_layer.wallet_rpc.check_offer_validity(
offer=TradingOffer.from_bytes(hexstr_to_bytes(reference.make_offer_response["offer"])),
):
if not (
await offer_setup.maker.data_layer.wallet_rpc.check_offer_validity(
offer=TradingOffer.from_bytes(hexstr_to_bytes(reference.make_offer_response["offer"])),
)
)[1]:
break
await offer_setup.full_node_api.farm_blocks_to_puzzlehash(count=1, guarantee_transaction_blocks=True)
await asyncio.sleep(0.5)

9
tests/wallet/rpc/test_wallet_rpc.py
View File

@ -779,12 +779,15 @@ async def test_offer_endpoints(wallet_rpc_environment: WalletRpcTestEnvironment)
)
assert offer is not None
summary = await wallet_1_rpc.get_offer_summary(offer)
advanced_summary = await wallet_1_rpc.get_offer_summary(offer, advanced=True)
id, summary = await wallet_1_rpc.get_offer_summary(offer)
assert id == offer.name()
id, advanced_summary = await wallet_1_rpc.get_offer_summary(offer, advanced=True)
assert id == offer.name()
assert summary == {"offered": {"xch": 5}, "requested": {cat_asset_id.hex(): 1}, "infos": driver_dict, "fees": 1}
assert advanced_summary == summary
assert await wallet_1_rpc.check_offer_validity(offer)
id, valid = await wallet_1_rpc.check_offer_validity(offer)
assert id == offer.name()
all_offers = await wallet_1_rpc.get_all_offers(file_contents=True)
assert len(all_offers) == 1