Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions chia/_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ def blockchain_constants(consensus_mode: ConsensusMode) -> ConsensusConstants:
@pytest.fixture(scope="session", name="bt")
async def block_tools_fixture(get_keychain, blockchain_constants, anyio_backend) -> BlockTools:
# Note that this causes a lot of CPU and disk traffic - disk, DB, ports, process creation ...
_shared_block_tools = await create_block_tools_async(constants=blockchain_constants, keychain=get_keychain)
return _shared_block_tools
shared_block_tools = await create_block_tools_async(constants=blockchain_constants, keychain=get_keychain)
return shared_block_tools


# if you have a system that has an unusual hostname for localhost and you want
Expand Down
10 changes: 5 additions & 5 deletions chia/cmds/cmd_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ def _generate_command_parser(cls: type[ChiaCommand]) -> _CommandParsingStage:
needs_context: bool = False

hints = get_type_hints(cls)
_fields = fields(cls) # type: ignore[arg-type]
cls_fields = fields(cls) # type: ignore[arg-type]

for _field in _fields:
field_name = _field.name
for cls_field in cls_fields:
field_name = cls_field.name
if getattr(hints[field_name], COMMAND_HELPER_ATTRIBUTE_NAME, False):
members[field_name] = _generate_command_parser(hints[field_name])
elif field_name == "context":
Expand All @@ -193,9 +193,9 @@ def _generate_command_parser(cls: type[ChiaCommand]) -> _CommandParsingStage:
else:
needs_context = True
kwarg_names.append(field_name)
elif "option_args" in _field.metadata:
elif "option_args" in cls_field.metadata:
option_args: dict[str, Any] = {"multiple": False, "required": False}
option_args.update(_field.metadata["option_args"])
option_args.update(cls_field.metadata["option_args"])

if "type" not in option_args:
origin = get_origin(hints[field_name])
Expand Down
20 changes: 11 additions & 9 deletions chia/wallet/wallet_state_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1428,14 +1428,16 @@ async def handle_nft(
nft_data.parent_coin_spend.solution,
)
if uncurried_nft.supports_did:
_new_did_id = get_new_owner_did(uncurried_nft, Program.from_serialized(nft_data.parent_coin_spend.solution))
parsed_did_id = get_new_owner_did(
uncurried_nft, Program.from_serialized(nft_data.parent_coin_spend.solution)
)
old_did_id = uncurried_nft.owner_did
if _new_did_id is None:
if parsed_did_id is None:
new_did_id = old_did_id
elif _new_did_id == b"":
elif parsed_did_id == b"":
new_did_id = None
else:
new_did_id = _new_did_id
new_did_id = parsed_did_id
self.log.debug(
"Handling NFT: %s, old DID:%s, new DID:%s, old P2:%s, new P2:%s",
nft_data.parent_coin_spend,
Expand Down Expand Up @@ -2614,17 +2616,17 @@ async def key_hints_for_pubkeys(self, pks: list[bytes]) -> KeyHints:
async def gather_signing_info(self, coin_spends: list[Spend]) -> SigningInstructions:
pks: list[bytes] = []
signing_targets: list[SigningTarget] = []
for coin_spend in coin_spends:
_coin_spend = coin_spend.as_coin_spend()
for spend in coin_spends:
coin_spend = spend.as_coin_spend()
# Get AGG_SIG conditions
conditions_dict = conditions_dict_for_solution(
Program.from_serialized(_coin_spend.puzzle_reveal),
Program.from_serialized(_coin_spend.solution),
Program.from_serialized(coin_spend.puzzle_reveal),
Program.from_serialized(coin_spend.solution),
self.constants.MAX_BLOCK_COST_CLVM,
)
# Create signature
for pk, msg in pkm_pairs_for_conditions_dict(
conditions_dict, _coin_spend.coin, self.constants.AGG_SIG_ME_ADDITIONAL_DATA
conditions_dict, coin_spend.coin, self.constants.AGG_SIG_ME_ADDITIONAL_DATA
):
pk_bytes = bytes(pk)
pks.append(pk_bytes)
Expand Down
1 change: 0 additions & 1 deletion ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ ignore = [
"RUF056", # falsy-dict-get-fallback
# Should probably fix this
"RUF029", # unused-async
"RUF052", # used-dummy-variable

# Security linter
"S603", # subprocess-without-shell-equals-true
Expand Down
Loading