diff --git a/cats/cats.py b/cats/cats.py index 5c78402..ab7d335 100644 --- a/cats/cats.py +++ b/cats/cats.py @@ -13,12 +13,10 @@ from chia.rpc.wallet_request_types import PushTX from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import decode_puzzle_hash from chia.util.byte_types import hexstr_to_bytes from chia.util.config import load_config from chia.util.default_root import DEFAULT_ROOT_PATH -from chia.util.ints import uint64 from chia.wallet.cat_wallet.cat_utils import ( CAT_MOD, SpendableCAT, @@ -30,6 +28,8 @@ from chia.wallet.vc_wallet.cr_cat_drivers import ProofsChecker, construct_cr_layer from chia.wallet.wallet_spend_bundle import WalletSpendBundle from chia_rs import AugSchemeMPL, G2Element +from chia_rs.sized_bytes import bytes32 +from chia_rs.sized_ints import uint64 from clvm_tools.binutils import assemble from clvm_tools.clvmc import compile_clvm_text diff --git a/cats/secure_the_bag.py b/cats/secure_the_bag.py index 8f0b7f0..b4dab74 100644 --- a/cats/secure_the_bag.py +++ b/cats/secure_the_bag.py @@ -8,13 +8,13 @@ import click from chia.types.blockchain_format.coin import Coin from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import CoinSpend, make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.util.bech32m import encode_puzzle_hash from chia.util.byte_types import hexstr_to_bytes -from chia.util.ints import uint64 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle +from chia_rs.sized_bytes import bytes32 +from chia_rs.sized_ints import uint64 from clvm_tools.binutils import assemble from clvm_tools.clvmc import compile_clvm_text diff --git a/setup.py b/setup.py index c09d53e..d80b230 100644 --- a/setup.py +++ b/setup.py @@ -8,12 +8,13 @@ long_description = fh.read() dependencies = [ - "chia-blockchain==2.5.1", + "chia-rs==0.21.2", + "chia-blockchain==2.5.3", ] dev_dependencies = [ "pytest", - "pytest-asyncio", + "pytest-asyncio>=0.26.0", "pytest-env", "pre-commit==4.1.0; python_version >= '3.9'", "mypy==1.15.0", diff --git a/tests/cats/test_cat_command.py b/tests/cats/test_cat_command.py index 048fe73..50da704 100644 --- a/tests/cats/test_cat_command.py +++ b/tests/cats/test_cat_command.py @@ -6,10 +6,10 @@ import pytest from chia._tests.util.setup_nodes import SimulatorsAndWalletsServices from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.bech32m import encode_puzzle_hash -from chia.util.ints import uint16, uint64 +from chia_rs.sized_bytes import bytes32 +from chia_rs.sized_ints import uint16, uint64 from cats.cats import cmd_func diff --git a/tests/cats/test_secure_the_bag.py b/tests/cats/test_secure_the_bag.py index ce99de2..d65c01c 100644 --- a/tests/cats/test_secure_the_bag.py +++ b/tests/cats/test_secure_the_bag.py @@ -2,11 +2,11 @@ import pytest from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.condition_opcodes import ConditionOpcode from chia.util.hash import std_hash -from chia.util.ints import uint64 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle +from chia_rs.sized_bytes import bytes32 +from chia_rs.sized_ints import uint64 from clvm.casts import int_to_bytes from cats.secure_the_bag import (