Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert final_pubkey: G1Element from main #18063

Merged
merged 1 commit into from
May 22, 2024
Merged

Revert final_pubkey: G1Element from main #18063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions chia/_tests/wallet/test_signer_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ async def test_p2dohp_wallet_signer_protocol(wallet_environments: WalletTestFram
SumHint(
[pubkey.get_fingerprint().to_bytes(4, "big")],
calculate_synthetic_offset(pubkey, DEFAULT_HIDDEN_PUZZLE_HASH).to_bytes(32, "big"),
G1Element.from_bytes(wallet_state_manager.main_wallet.puzzle_for_pk(pubkey).uncurry()[1].at("f").as_atom()),
wallet_state_manager.main_wallet.puzzle_for_pk(pubkey).uncurry()[1].at("f").as_atom(),
)
]
assert utx.signing_instructions.key_hints.path_hints == [
Expand Down Expand Up @@ -184,7 +184,7 @@ async def test_p2dohp_wallet_signer_protocol(wallet_environments: WalletTestFram
not_our_signing_instructions.key_hints,
sum_hints=[
*not_our_signing_instructions.key_hints.sum_hints,
SumHint([bytes(not_our_pubkey)], std_hash(b"sum hint only"), G1Element()),
SumHint([bytes(not_our_pubkey)], std_hash(b"sum hint only"), bytes(G1Element())),
],
),
)
Expand Down Expand Up @@ -284,7 +284,7 @@ async def test_p2blsdohp_execute_signing_instructions(wallet_environments: Walle
sum_pk: G1Element = other_sk.get_g1() + root_pk
signing_instructions: SigningInstructions = SigningInstructions(
KeyHints(
[SumHint([root_fingerprint], test_name, sum_pk)],
[SumHint([root_fingerprint], test_name, bytes(sum_pk))],
[],
),
[SigningTarget(sum_pk.get_fingerprint().to_bytes(4, "big"), test_name, test_name)],
Expand Down Expand Up @@ -335,7 +335,7 @@ async def test_p2blsdohp_execute_signing_instructions(wallet_environments: Walle
sum_pk = child_sk.get_g1() + other_sk.get_g1()
signing_instructions = SigningInstructions(
KeyHints(
[SumHint([child_sk.get_g1().get_fingerprint().to_bytes(4, "big")], test_name, sum_pk)],
[SumHint([child_sk.get_g1().get_fingerprint().to_bytes(4, "big")], test_name, bytes(sum_pk))],
[PathHint(root_fingerprint, [uint64(1), uint64(2), uint64(3), uint64(4)])],
),
[SigningTarget(sum_pk.get_fingerprint().to_bytes(4, "big"), test_name, test_name)],
Expand Down Expand Up @@ -370,8 +370,8 @@ async def test_p2blsdohp_execute_signing_instructions(wallet_environments: Walle
SigningInstructions(
KeyHints(
[
SumHint([child_sk.get_g1().get_fingerprint().to_bytes(4, "big")], test_name, sum_pk),
SumHint([child_sk_2.get_g1().get_fingerprint().to_bytes(4, "big")], test_name_2, sum_pk_2),
SumHint([child_sk.get_g1().get_fingerprint().to_bytes(4, "big")], test_name, bytes(sum_pk)),
SumHint([child_sk_2.get_g1().get_fingerprint().to_bytes(4, "big")], test_name_2, bytes(sum_pk_2)),
],
[
PathHint(root_fingerprint, [uint64(1), uint64(2), uint64(3), uint64(4)]),
Expand Down Expand Up @@ -412,7 +412,7 @@ async def test_p2blsdohp_execute_signing_instructions(wallet_environments: Walle
)
unknown_sum_hint = SigningInstructions(
KeyHints(
[SumHint([b"unknown fingerprint"], b"", G1Element())],
[SumHint([b"unknown fingerprint"], b"", bytes(G1Element()))],
[],
),
[],
Expand All @@ -439,7 +439,7 @@ async def test_p2blsdohp_execute_signing_instructions(wallet_environments: Walle
signing_responses = await wallet.execute_signing_instructions(
SigningInstructions(
KeyHints(
[SumHint([root_fingerprint], test_name, sum_pk)],
[SumHint([root_fingerprint], test_name, bytes(sum_pk))],
[],
),
[SigningTarget(sum_pk.get_fingerprint().to_bytes(4, "big"), test_name, test_name)],
Expand Down
4 changes: 1 addition & 3 deletions chia/wallet/signer_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
from dataclasses import dataclass
from typing import List

from chia_rs import G1Element

from chia.types.blockchain_format.coin import Coin as _Coin
from chia.types.blockchain_format.program import Program
from chia.types.blockchain_format.serialized_program import SerializedProgram
Expand Down Expand Up @@ -76,7 +74,7 @@ class SigningTarget(Streamable):
class SumHint(Streamable):
fingerprints: List[bytes]
synthetic_offset: bytes
final_pubkey: G1Element
final_pubkey: bytes


@clvm_streamable
Expand Down
16 changes: 9 additions & 7 deletions chia/wallet/wallet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,10 @@ async def match_hinted_coin(self, coin: Coin, hint: bytes32) -> bool:
return True
return False

async def sum_hint_for_pubkey(self, pk: G1Element) -> Optional[SumHint]:
async def sum_hint_for_pubkey(self, pk: bytes) -> Optional[SumHint]:
pk_parsed: G1Element = G1Element.from_bytes(pk)
dr: Optional[DerivationRecord] = await self.wallet_state_manager.puzzle_store.record_for_puzzle_hash(
puzzle_hash_for_synthetic_public_key(pk)
puzzle_hash_for_synthetic_public_key(pk_parsed)
)
if dr is None:
return None
Expand All @@ -525,11 +526,12 @@ async def sum_hint_for_pubkey(self, pk: G1Element) -> Optional[SumHint]:
pk,
)

async def path_hint_for_pubkey(self, pk: G1Element) -> Optional[PathHint]:
index: Optional[uint32] = await self.wallet_state_manager.puzzle_store.index_for_pubkey(pk)
async def path_hint_for_pubkey(self, pk: bytes) -> Optional[PathHint]:
pk_parsed: G1Element = G1Element.from_bytes(pk)
index: Optional[uint32] = await self.wallet_state_manager.puzzle_store.index_for_pubkey(pk_parsed)
if index is None:
index = await self.wallet_state_manager.puzzle_store.index_for_puzzle_hash(
puzzle_hash_for_synthetic_public_key(pk)
puzzle_hash_for_synthetic_public_key(pk_parsed)
)
root_pubkey: bytes = self.wallet_state_manager.root_pubkey.get_fingerprint().to_bytes(4, "big")
if index is None:
Expand All @@ -539,7 +541,7 @@ async def path_hint_for_pubkey(self, pk: G1Element) -> Optional[PathHint]:
try_owner_sk = master_sk_to_singleton_owner_sk(
self.wallet_state_manager.private_key, uint32(pool_wallet_index)
)
if try_owner_sk.get_g1() == pk:
if try_owner_sk.get_g1() == pk_parsed:
return PathHint(
root_pubkey,
[uint64(12381), uint64(8444), uint64(5), uint64(pool_wallet_index)],
Expand Down Expand Up @@ -609,7 +611,7 @@ async def execute_signing_instructions(
offset_pk = offset_sk.get_g1()
pk_lookup[offset_pk.get_fingerprint()] = offset_pk
sk_lookup[offset_pk.get_fingerprint()] = offset_sk
final_pubkey: G1Element = sum_hint.final_pubkey
final_pubkey: G1Element = G1Element.from_bytes(sum_hint.final_pubkey)
final_fingerprint: int = final_pubkey.get_fingerprint()
pk_lookup[final_fingerprint] = final_pubkey
sum_hint_lookup[final_fingerprint] = [*fingerprints_we_have, offset_pk.get_fingerprint()]
Expand Down
13 changes: 7 additions & 6 deletions chia/wallet/wallet_state_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2588,20 +2588,20 @@ async def get_or_create_vc_wallet(self) -> VCWallet:

return vc_wallet

async def sum_hint_for_pubkey(self, pk: G1Element) -> Optional[SumHint]:
async def sum_hint_for_pubkey(self, pk: bytes) -> Optional[SumHint]:
return await self.main_wallet.sum_hint_for_pubkey(pk)

async def path_hint_for_pubkey(self, pk: G1Element) -> Optional[PathHint]:
async def path_hint_for_pubkey(self, pk: bytes) -> Optional[PathHint]:
return await self.main_wallet.path_hint_for_pubkey(pk)

async def key_hints_for_pubkeys(self, pks: List[G1Element]) -> KeyHints:
async def key_hints_for_pubkeys(self, pks: List[bytes]) -> KeyHints:
return KeyHints(
[sum_hint for pk in pks for sum_hint in (await self.sum_hint_for_pubkey(pk),) if sum_hint is not None],
[path_hint for pk in pks for path_hint in (await self.path_hint_for_pubkey(pk),) if path_hint is not None],
)

async def gather_signing_info(self, coin_spends: List[Spend]) -> SigningInstructions:
pks: List[G1Element] = []
pks: List[bytes] = []
signing_targets: List[SigningTarget] = []
for coin_spend in coin_spends:
_coin_spend = coin_spend.as_coin_spend()
Expand All @@ -2615,9 +2615,10 @@ async def gather_signing_info(self, coin_spends: List[Spend]) -> SigningInstruct
for pk, msg in pkm_pairs_for_conditions_dict(
conditions_dict, _coin_spend.coin, self.constants.AGG_SIG_ME_ADDITIONAL_DATA
):
pks.append(pk)
pk_bytes = bytes(pk)
pks.append(pk_bytes)
fingerprint: bytes = pk.get_fingerprint().to_bytes(4, "big")
signing_targets.append(SigningTarget(fingerprint, msg, std_hash(bytes(pk) + msg)))
signing_targets.append(SigningTarget(fingerprint, msg, std_hash(pk_bytes + msg)))

return SigningInstructions(
await self.key_hints_for_pubkeys(pks),
Expand Down
Loading