diff --git a/tests/test_get_puzzle_and_solution.py b/tests/test_get_puzzle_and_solution.py index fa557ebc9..5b5bf81b7 100644 --- a/tests/test_get_puzzle_and_solution.py +++ b/tests/test_get_puzzle_and_solution.py @@ -102,7 +102,7 @@ def test_get_puzzle_and_solution_for_coin(input_file: str) -> None: assert arg.pair is not None amount = arg.pair[0].atom assert amount is not None - addition = (ph, int.from_bytes(amount, byteorder="big")) + addition = (bytes32(ph), int.from_bytes(amount, byteorder="big")) assert addition in expected_additions expected_additions.remove(addition) diff --git a/tests/test_streamable.py b/tests/test_streamable.py index e0940ce19..798e1787f 100644 --- a/tests/test_streamable.py +++ b/tests/test_streamable.py @@ -17,10 +17,10 @@ sk = AugSchemeMPL.key_gen(bytes32.random(rng)) pk = sk.get_g1() -coin = b"bcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbc" -parent = b"edededededededededededededededed" -ph = b"abababababababababababababababab" -ph2 = b"cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd" +coin = bytes32(b"bcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbc") +parent = bytes32(b"edededededededededededededededed") +ph = bytes32(b"abababababababababababababababab") +ph2 = bytes32(b"cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd") def test_hash_spend() -> None: diff --git a/wheel/generate_type_stubs.py b/wheel/generate_type_stubs.py index 967aeb067..8b4ecb7b3 100644 --- a/wheel/generate_type_stubs.py +++ b/wheel/generate_type_stubs.py @@ -538,9 +538,9 @@ def make_v2(s: int) -> PlotSize: ... file, "SpendConditions", [ - "coin_id: bytes", - "parent_id: bytes", - "puzzle_hash: bytes", + "coin_id: bytes32", + "parent_id: bytes32", + "puzzle_hash: bytes32", "coin_amount: int", "height_relative: Optional[int]", "seconds_relative: Optional[int]", @@ -548,7 +548,7 @@ def make_v2(s: int) -> PlotSize: ... "before_seconds_relative: Optional[int]", "birth_height: Optional[int]", "birth_seconds: Optional[int]", - "create_coin: list[tuple[bytes, int, Optional[bytes]]]", + "create_coin: list[tuple[bytes32, int, Optional[bytes]]]", "agg_sig_me: list[tuple[G1Element, bytes]]", "agg_sig_parent: list[tuple[G1Element, bytes]]", "agg_sig_puzzle: list[tuple[G1Element, bytes]]", diff --git a/wheel/python/chia_rs/chia_rs.pyi b/wheel/python/chia_rs/chia_rs.pyi index f8cf9e73a..e3c9b211f 100644 --- a/wheel/python/chia_rs/chia_rs.pyi +++ b/wheel/python/chia_rs/chia_rs.pyi @@ -318,9 +318,9 @@ class PrivateKey: @final class SpendConditions: - coin_id: bytes - parent_id: bytes - puzzle_hash: bytes + coin_id: bytes32 + parent_id: bytes32 + puzzle_hash: bytes32 coin_amount: int height_relative: Optional[int] seconds_relative: Optional[int] @@ -328,7 +328,7 @@ class SpendConditions: before_seconds_relative: Optional[int] birth_height: Optional[int] birth_seconds: Optional[int] - create_coin: list[tuple[bytes, int, Optional[bytes]]] + create_coin: list[tuple[bytes32, int, Optional[bytes]]] agg_sig_me: list[tuple[G1Element, bytes]] agg_sig_parent: list[tuple[G1Element, bytes]] agg_sig_puzzle: list[tuple[G1Element, bytes]] @@ -351,7 +351,7 @@ class SpendConditions: before_seconds_relative: Optional[int], birth_height: Optional[int], birth_seconds: Optional[int], - create_coin: Sequence[tuple[bytes, int, Optional[bytes]]], + create_coin: Sequence[tuple[bytes32, int, Optional[bytes]]], agg_sig_me: Sequence[tuple[G1Element, bytes]], agg_sig_parent: Sequence[tuple[G1Element, bytes]], agg_sig_puzzle: Sequence[tuple[G1Element, bytes]], @@ -380,9 +380,9 @@ class SpendConditions: def to_json_dict(self) -> dict[str, Any]: ... @classmethod def from_json_dict(cls, json_dict: dict[str, Any]) -> Self: ... - def replace(self, *, coin_id: Union[ bytes, _Unspec] = _Unspec(), - parent_id: Union[ bytes, _Unspec] = _Unspec(), - puzzle_hash: Union[ bytes, _Unspec] = _Unspec(), + def replace(self, *, coin_id: Union[ bytes32, _Unspec] = _Unspec(), + parent_id: Union[ bytes32, _Unspec] = _Unspec(), + puzzle_hash: Union[ bytes32, _Unspec] = _Unspec(), coin_amount: Union[ int, _Unspec] = _Unspec(), height_relative: Union[ Optional[int], _Unspec] = _Unspec(), seconds_relative: Union[ Optional[int], _Unspec] = _Unspec(), @@ -390,7 +390,7 @@ class SpendConditions: before_seconds_relative: Union[ Optional[int], _Unspec] = _Unspec(), birth_height: Union[ Optional[int], _Unspec] = _Unspec(), birth_seconds: Union[ Optional[int], _Unspec] = _Unspec(), - create_coin: Union[ list[tuple[bytes, int, Optional[bytes]]], _Unspec] = _Unspec(), + create_coin: Union[ list[tuple[bytes32, int, Optional[bytes]]], _Unspec] = _Unspec(), agg_sig_me: Union[ list[tuple[G1Element, bytes]], _Unspec] = _Unspec(), agg_sig_parent: Union[ list[tuple[G1Element, bytes]], _Unspec] = _Unspec(), agg_sig_puzzle: Union[ list[tuple[G1Element, bytes]], _Unspec] = _Unspec(),