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

Lint

Browse Source
This commit is contained in:
Matt Hauff 2022-06-16 10:46:23 -07:00
parent c05f4896d4
commit 60e3983490
No known key found for this signature in database
GPG Key ID: 3CBA6CFC81A00E46
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chia/wallet/nft_wallet/nft_wallet.py
View File

@ -29,7 +29,7 @@ from chia.wallet.nft_wallet.nft_puzzles import (
get_metadata_and_phs,
)
from chia.wallet.nft_wallet.uncurry_nft import UncurriedNFT
from chia.wallet.outer_puzzles import AssetType, match_puzzle
from chia.wallet.outer_puzzles import AssetType, construct_puzzle, match_puzzle
from chia.wallet.payment import Payment
from chia.wallet.puzzle_drivers import PuzzleInfo
from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import (
@ -39,7 +39,7 @@ from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import (
solution_for_conditions,
)
from chia.wallet.puzzles.puzzle_utils import make_create_coin_condition
from chia.wallet.trading.offer import NotarizedPayment, Offer, OFFER_MOD
from chia.wallet.trading.offer import OFFER_MOD, NotarizedPayment, Offer
from chia.wallet.transaction_record import TransactionRecord
from chia.wallet.util.compute_memos import compute_memos
from chia.wallet.util.debug_spend_bundle import disassemble
@ -894,7 +894,14 @@ class NFTWallet:
if requested_asset_id is None:
trade_prices = Program.to([[uint64(requested_amount), OFFER_MOD.get_tree_hash()]])
else:
trade_prices = Program.to([[uint64(requested_amount), construct_puzzle(driver_dict[requested_asset_id], OFFER_MOD).get_tree_hash()]])
trade_prices = Program.to(
[
[
uint64(requested_amount),
construct_puzzle(driver_dict[requested_asset_id], OFFER_MOD).get_tree_hash(),
]
]
)
notarized_payments: Dict[Optional[bytes32], List[NotarizedPayment]] = Offer.notarize_payments(
{requested_asset_id: [Payment(p2_ph, uint64(requested_amount), [p2_ph])]}, [offered_coin]
)
@ -990,7 +997,7 @@ class NFTWallet:
offer_puzzle: Program = OFFER_MOD
else:
offer_puzzle = construct_puzzle(driver_dict[offered_asset_id], OFFER_MOD)
royalty_spend = SpendBundle([CoinSpend(royalty_coin, OFFER_MOD, royalty_sol)], G2Element())
royalty_spend = SpendBundle([CoinSpend(royalty_coin, offer_puzzle, royalty_sol)], G2Element())
total_spend_bundle = SpendBundle.aggregate([txn_spend_bundle, royalty_spend])
offer = Offer(notarized_payments, total_spend_bundle, driver_dict)

10
tests/wallet/nft_wallet/test_nft_puzzles.py
View File

@ -120,9 +120,13 @@ def make_a_new_solution() -> Tuple[Program, Program]:
[-10, new_did, trade_prices_list, new_did_inner_hash],
]
solution = Program.to(
[[], [], [
[solution_for_conditions(condition_list)],
]]
[
[],
[],
[
[solution_for_conditions(condition_list)],
],
]
)
return p2_puzzle, solution