chia-blockchain 2.5.2rc2__py3-none-any.whl → 2.5.3rc2__py3-none-any.whl

chia/wallet/trading/offer.py

@@ -3,23 +3,25 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from typing import Any, BinaryIO, Optional, Union
 
+from chia_puzzles_py.programs import SETTLEMENT_PAYMENT, SETTLEMENT_PAYMENT_HASH
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from clvm_tools.binutils import disassemble
 
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.coin import Coin, coin_as_list
 from chia.types.blockchain_format.program import INFINITE_COST, Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend, make_spend
 from chia.util.bech32m import bech32_decode, bech32_encode, convertbits
 from chia.util.errors import Err, ValidationError
-from chia.util.ints import uint64
 from chia.util.streamable import parse_rust
 from chia.wallet.conditions import (
     AssertCoinAnnouncement,
     AssertPuzzleAnnouncement,
     Condition,
     ConditionValidTimes,
+    CreateCoin,
     parse_conditions_non_consensus,
     parse_timelock_info,
 )
@@ -31,9 +33,7 @@ from chia.wallet.outer_puzzles import (
     match_puzzle,
     solve_puzzle,
 )
-from chia.wallet.payment import Payment
 from chia.wallet.puzzle_drivers import PuzzleInfo, Solver
-from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 from chia.wallet.uncurried_puzzle import UncurriedPuzzle, uncurry_puzzle
 from chia.wallet.util.compute_hints import compute_spend_hints_and_additions
 from chia.wallet.util.puzzle_compression import (
@@ -43,8 +43,8 @@ from chia.wallet.util.puzzle_compression import (
 )
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
-OFFER_MOD = load_clvm_maybe_recompile("settlement_payments.clsp")
-OFFER_MOD_HASH = OFFER_MOD.get_tree_hash()
+OFFER_MOD = Program.from_bytes(SETTLEMENT_PAYMENT)
+OFFER_MOD_HASH = bytes32(SETTLEMENT_PAYMENT_HASH)
 
 
 def detect_dependent_coin(
@@ -61,15 +61,17 @@ def detect_dependent_coin(
 
 
 @dataclass(frozen=True)
-class NotarizedPayment(Payment):
+class NotarizedPayment(CreateCoin):
     nonce: bytes32 = bytes32.zeros
 
     @classmethod
     def from_condition_and_nonce(cls, condition: Program, nonce: bytes32) -> NotarizedPayment:
         with_opcode: Program = Program.to((51, condition))  # Gotta do this because the super class is expecting it
-        p = Payment.from_condition(with_opcode)
-        puzzle_hash, amount, memos = tuple(p.as_condition_args())
-        return cls(puzzle_hash, amount, memos, nonce)
+        p = CreateCoin.from_program(with_opcode)
+        return cls(p.puzzle_hash, p.amount, p.memos, nonce)
+
+    def name(self) -> bytes32:
+        return self.to_program().get_tree_hash()
 
 
 @dataclass(frozen=True, eq=False)
@@ -94,7 +96,7 @@ class Offer:
 
     @staticmethod
     def notarize_payments(
-        requested_payments: dict[Optional[bytes32], list[Payment]],  # `None` means you are requesting XCH
+        requested_payments: dict[Optional[bytes32], list[CreateCoin]],  # `None` means you are requesting XCH
         coins: list[Coin],
     ) -> dict[Optional[bytes32], list[NotarizedPayment]]:
         # This sort should be reproducible in CLVM with `>s`
@@ -106,8 +108,7 @@ class Offer:
         for asset_id, payments in requested_payments.items():
             notarized_payments[asset_id] = []
             for p in payments:
-                puzzle_hash, amount, memos = tuple(p.as_condition_args())
-                notarized_payments[asset_id].append(NotarizedPayment(puzzle_hash, amount, memos, nonce))
+                notarized_payments[asset_id].append(NotarizedPayment(p.puzzle_hash, p.amount, p.memos, nonce))
 
         return notarized_payments
 

chia/wallet/trading/trade_store.py

@@ -5,12 +5,12 @@ from time import perf_counter
 from typing import Optional
 
 import aiosqlite
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.db_wrapper import DBWrapper2
 from chia.util.errors import Err
-from chia.util.ints import uint8, uint32
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.trade_record import TradeRecord, TradeRecordOld
 from chia.wallet.trading.offer import Offer
@@ -412,8 +412,7 @@ class TradeStore:
         # Create an ORDER BY clause according to the desired sort type
         if sort_key is None or sort_key == "CONFIRMED_AT_HEIGHT":
             order_by_clause = (
-                f"ORDER BY confirmed_at_index {'ASC' if reverse else 'DESC'}, "
-                f"trade_id {'DESC' if reverse else 'ASC'} "
+                f"ORDER BY confirmed_at_index {'ASC' if reverse else 'DESC'}, trade_id {'DESC' if reverse else 'ASC'} "
             )
         elif sort_key == "RELEVANCE":
             # Custom sort order for statuses to separate out pending/completed offers

chia/wallet/transaction_record.py

@@ -5,14 +5,14 @@ from dataclasses import dataclass
 from typing import Any, Generic, Optional, TypeVar
 
 from chia_rs import SpendBundle
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia.consensus.coinbase import farmer_parent_id, pool_parent_id
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash
 from chia.util.errors import Err
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.util.transaction_type import TransactionType

chia/wallet/util/blind_signer_tl.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 from chia.util.streamable import Streamable
 from chia.wallet.signer_protocol import (
     KeyHints,

chia/wallet/util/compute_hints.py

@@ -3,15 +3,16 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 from chia.consensus.condition_costs import ConditionCost
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 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
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.errors import Err, ValidationError
-from chia.util.ints import uint64
 
 
 @dataclass(frozen=True)

chia/wallet/util/compute_memos.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from clvm.casts import int_from_bytes
 
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import INFINITE_COST
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend
 from chia.types.condition_opcodes import ConditionOpcode
-from chia.util.ints import uint64
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
 

chia/wallet/util/curry_and_treehash.py

@@ -4,10 +4,9 @@ from collections.abc import Sequence
 from hashlib import sha256
 from typing import Callable
 
+from chia_rs.sized_bytes import bytes32
 from clvm.casts import int_to_bytes
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-
 CurryHashFunction = Callable[..., bytes32]
 
 

chia/wallet/util/merkle_tree.py

@@ -4,9 +4,9 @@ import math
 from enum import Enum
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
 from clvm.casts import int_to_bytes
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
 
 ONE = int_to_bytes(1)

chia/wallet/util/merkle_utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import hashlib
 from typing import Any
 
-from chia.types.blockchain_format.sized_bytes import bytes32
+from chia_rs.sized_bytes import bytes32
 
 TupleTree = Any  # Union[bytes32, tuple["TupleTree", "TupleTree"]]
 Proof_Tree_Type = Any  # Union[bytes32, tuple[bytes32, "Proof_Tree_Type"]]

chia/wallet/util/new_peak_queue.py

@@ -5,9 +5,10 @@ import dataclasses
 from enum import IntEnum
 from typing import Any
 
+from chia_rs.sized_bytes import bytes32
+
 from chia.protocols.wallet_protocol import CoinStateUpdate, NewPeakWallet
 from chia.server.ws_connection import WSChiaConnection
-from chia.types.blockchain_format.sized_bytes import bytes32
 
 
 class NewPeakQueueTypes(IntEnum):

chia/wallet/util/notifications.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+from chia_puzzles_py.programs import NOTIFICATION
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
-from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 
-NOTIFICATION_MOD = load_clvm_maybe_recompile("notification.clsp")
+NOTIFICATION_MOD = Program.from_bytes(NOTIFICATION)
 
 
 def construct_notification(target: bytes32, amount: uint64) -> Program:

chia/wallet/util/peer_request_cache.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 import asyncio
 from typing import Any, Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
+
 from chia.protocols.wallet_protocol import CoinState
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.header_block import HeaderBlock
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
 from chia.util.lru_cache import LRUCache
 
 

chia/wallet/util/puzzle_compression.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 import zlib
 
+from chia_puzzles_py.programs import SETTLEMENT_PAYMENT
+
 from chia.types.blockchain_format.program import Program
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD
 from chia.wallet.nft_wallet.nft_puzzles import (
@@ -9,10 +11,11 @@ from chia.wallet.nft_wallet.nft_puzzles import (
     NFT_OWNERSHIP_LAYER,
     NFT_STATE_LAYER_MOD,
     NFT_TRANSFER_PROGRAM_DEFAULT,
-    SINGLETON_TOP_LAYER_MOD,
 )
 from chia.wallet.puzzles import p2_delegated_puzzle_or_hidden_puzzle as standard_puzzle
-from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
+from chia.wallet.singleton import (
+    SINGLETON_TOP_LAYER_MOD,
+)
 
 # Need the legacy CAT mod for zlib backwards compatibility
 LEGACY_CAT_MOD = Program.fromhex(
@@ -22,7 +25,6 @@ LEGACY_CAT_MOD = Program.fromhex(
 OFFER_MOD_OLD = Program.fromhex(
     "ff02ffff01ff02ff0affff04ff02ffff04ff03ff80808080ffff04ffff01ffff333effff02ffff03ff05ffff01ff04ffff04ff0cffff04ffff02ff1effff04ff02ffff04ff09ff80808080ff808080ffff02ff16ffff04ff02ffff04ff19ffff04ffff02ff0affff04ff02ffff04ff0dff80808080ff808080808080ff8080ff0180ffff02ffff03ff05ffff01ff04ffff04ff08ff0980ffff02ff16ffff04ff02ffff04ff0dffff04ff0bff808080808080ffff010b80ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff1effff04ff02ffff04ff09ff80808080ffff02ff1effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080"
 )
-OFFER_MOD = load_clvm_maybe_recompile("settlement_payments.clsp")
 
 # For backwards compatibility to work, we must assume that these mods (already deployed) will not change
 # In the case that they do change and we don't support the old asset then we need to keep around the legacy module
@@ -35,7 +37,7 @@ ZDICT = [
     + bytes(NFT_METADATA_UPDATER)
     + bytes(NFT_TRANSFER_PROGRAM_DEFAULT),
     bytes(CAT_MOD),
-    bytes(OFFER_MOD),
+    SETTLEMENT_PAYMENT,
     b"",  # purposefully break compatibility with older versions
     # more dictionaries go here
 ]

chia/wallet/util/puzzle_decorator.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 import logging
 from typing import Any
 
+from chia_rs.sized_bytes import bytes32
 from typing_extensions import Protocol
 
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.wallet.payment import Payment
+from chia.wallet.conditions import CreateCoin
 from chia.wallet.puzzles.clawback.puzzle_decorator import ClawbackPuzzleDecorator
 from chia.wallet.util.puzzle_decorator_type import PuzzleDecoratorType
 
@@ -26,7 +26,9 @@ class PuzzleDecoratorProtocol(Protocol):
         self, inner_puzzle: Program, target_puzzle_hash: bytes32, memos: list[bytes]
     ) -> tuple[Program, list[bytes]]: ...
 
-    def solve(self, puzzle: Program, primaries: list[Payment], inner_solution: Program) -> tuple[Program, Program]: ...
+    def solve(
+        self, puzzle: Program, primaries: list[CreateCoin], inner_solution: Program
+    ) -> tuple[Program, Program]: ...
 
 
 class PuzzleDecoratorManager:
@@ -75,7 +77,7 @@ class PuzzleDecoratorManager:
             inner_puzzle, target_puzzle_hash = decorator.decorate_target_puzzle_hash(inner_puzzle, target_puzzle_hash)
         return target_puzzle_hash
 
-    def solve(self, inner_puzzle: Program, primaries: list[Payment], inner_solution: Program) -> Program:
+    def solve(self, inner_puzzle: Program, primaries: list[CreateCoin], inner_solution: Program) -> Program:
         """
         Generate the solution of the puzzle
         :param inner_puzzle: Inner puzzle

chia/wallet/util/query_filter.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 from dataclasses import dataclass
 from enum import IntEnum
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint8, uint64
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint64
+
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.util.transaction_type import TransactionType
 

chia/wallet/util/tx_config.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import dataclasses
 from typing import Any, Optional, TypeVar
 
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from typing_extensions import NotRequired, TypedDict, Unpack
 
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.util.streamable import Streamable, streamable
 
 

chia/wallet/util/wallet_sync_utils.py

@@ -6,6 +6,8 @@ import random
 from typing import Any, Optional, Union
 
 from chia_rs import compute_merkle_set_root, confirm_included_already_hashed, confirm_not_included_already_hashed
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.protocols.shared_protocol import Capability
@@ -32,10 +34,8 @@ from chia.protocols.wallet_protocol import (
 )
 from chia.server.ws_connection import WSChiaConnection
 from chia.types.blockchain_format.coin import Coin, hash_coin_ids
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend, make_spend
 from chia.types.header_block import HeaderBlock
-from chia.util.ints import uint32
 from chia.util.task_referencer import create_referenced_task
 from chia.wallet.util.peer_request_cache import PeerRequestCache
 

chia/wallet/util/wallet_types.py

@@ -4,7 +4,8 @@ from dataclasses import dataclass
 from enum import IntEnum
 from typing import TYPE_CHECKING, TypeVar
 
-from chia.util.ints import uint8, uint32
+from chia_rs.sized_ints import uint8, uint32
+
 from chia.util.streamable import Streamable, streamable
 
 if TYPE_CHECKING:
@@ -26,8 +27,6 @@ class WalletType(IntEnum):
     DATA_LAYER = 11
     DATA_LAYER_OFFER = 12
     VC = 13
-    DAO = 14
-    DAO_CAT = 15
     CRCAT = 57
 
     def to_json_dict(self) -> str:

chia/wallet/vc_wallet/cr_cat_drivers.py

@@ -6,20 +6,28 @@ from dataclasses import dataclass, replace
 from enum import IntEnum
 from typing import Optional, TypeVar
 
+from chia_puzzles_py.programs import (
+    CONDITIONS_W_FEE_ANNOUNCE,
+    FLAG_PROOFS_CHECKER,
+)
+from chia_puzzles_py.programs import (
+    CREDENTIAL_RESTRICTION as CREDENTIAL_RESTRICTION_BYTES,
+)
+from chia_puzzles_py.programs import (
+    CREDENTIAL_RESTRICTION_HASH as CREDENTIAL_RESTRICTION_HASH_BYTES,
+)
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16, uint64
 from clvm.casts import int_to_bytes
 
 from chia.types.blockchain_format.coin import Coin, coin_as_list
 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.util.hash import std_hash
-from chia.util.ints import uint16, uint64
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle
-from chia.wallet.conditions import AssertCoinAnnouncement
+from chia.wallet.conditions import AssertCoinAnnouncement, CreateCoin
 from chia.wallet.lineage_proof import LineageProof, LineageProofField
-from chia.wallet.payment import Payment
-from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 from chia.wallet.puzzles.singleton_top_layer_v1_1 import SINGLETON_LAUNCHER_HASH, SINGLETON_MOD_HASH
 from chia.wallet.uncurried_puzzle import UncurriedPuzzle, uncurry_puzzle
 from chia.wallet.util.curry_and_treehash import curry_and_treehash
@@ -35,22 +43,10 @@ from chia.wallet.vc_wallet.vc_drivers import (
 
 # Mods
 
-CREDENTIAL_RESTRICTION: Program = load_clvm_maybe_recompile(
-    "credential_restriction.clsp",
-    package_or_requirement="chia.wallet.vc_wallet.cr_puzzles",
-    include_standard_libraries=True,
-)
-CREDENTIAL_RESTRICTION_HASH: bytes32 = CREDENTIAL_RESTRICTION.get_tree_hash()
-PROOF_FLAGS_CHECKER: Program = load_clvm_maybe_recompile(
-    "flag_proofs_checker.clsp",
-    package_or_requirement="chia.wallet.vc_wallet.cr_puzzles",
-    include_standard_libraries=True,
-)
-PENDING_VC_ANNOUNCEMENT: Program = load_clvm_maybe_recompile(
-    "conditions_w_fee_announce.clsp",
-    package_or_requirement="chia.wallet.vc_wallet.cr_puzzles",
-    include_standard_libraries=True,
-)
+CREDENTIAL_RESTRICTION: Program = Program.from_bytes(CREDENTIAL_RESTRICTION_BYTES)
+CREDENTIAL_RESTRICTION_HASH: bytes32 = bytes32(CREDENTIAL_RESTRICTION_HASH_BYTES)
+PROOF_FLAGS_CHECKER: Program = Program.from_bytes(FLAG_PROOFS_CHECKER)
+PENDING_VC_ANNOUNCEMENT: Program = Program.from_bytes(CONDITIONS_W_FEE_ANNOUNCE)
 CREDENTIAL_STRUCT: Program = Program.to(
     (
         (
@@ -186,7 +182,7 @@ class CRCAT:
         cls: type[_T_CRCAT],
         # General CAT launching info
         origin_coin: Coin,
-        payment: Payment,
+        payment: CreateCoin,
         tail: Program,
         tail_solution: Program,
         # CR Layer params

chia/wallet/vc_wallet/cr_cat_wallet.py

@@ -6,16 +6,16 @@ import traceback
 from typing import TYPE_CHECKING, Any, Optional
 
 from chia_rs import G1Element, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64, uint128
 from typing_extensions import Unpack
 
 from chia.server.ws_connection import WSChiaConnection
 from chia.types.blockchain_format.coin import Coin, coin_as_list
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend
 from chia.util.byte_types import hexstr_to_bytes
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64, uint128
 from chia.util.streamable import VersionedBlob
 from chia.wallet.cat_wallet.cat_info import CATCoinData, CRCATInfo
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD_HASH, CAT_MOD_HASH_HASH, construct_cat_puzzle
@@ -24,6 +24,7 @@ from chia.wallet.coin_selection import select_coins
 from chia.wallet.conditions import (
     Condition,
     ConditionValidTimes,
+    CreateCoin,
     CreateCoinAnnouncement,
     CreatePuzzleAnnouncement,
     UnknownCondition,
@@ -31,7 +32,6 @@ from chia.wallet.conditions import (
 )
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.outer_puzzles import AssetType
-from chia.wallet.payment import Payment
 from chia.wallet.puzzle_drivers import PuzzleInfo
 from chia.wallet.trading.offer import Offer
 from chia.wallet.transaction_record import TransactionRecord
@@ -397,7 +397,7 @@ class CRCATWallet(CATWallet):
 
     async def _generate_unsigned_spendbundle(
         self,
-        payments: list[Payment],
+        payments: list[CreateCoin],
         action_scope: WalletActionScope,
         fee: uint64 = uint64(0),
         cat_discrepancy: Optional[tuple[int, Program, Program]] = None,  # (extra_delta, tail_reveal, tail_solution)
@@ -438,7 +438,7 @@ class CRCATWallet(CATWallet):
 
         # Calculate standard puzzle solutions
         change = selected_cat_amount - starting_amount
-        primaries: list[Payment] = []
+        primaries: list[CreateCoin] = []
         for payment in payments:
             primaries.append(payment)
 
@@ -462,7 +462,7 @@ class CRCATWallet(CATWallet):
                         break
             else:
                 change_puzhash = await self.standard_wallet.get_puzzle_hash(new=True)
-            primaries.append(Payment(change_puzhash, uint64(change), [change_puzhash]))
+            primaries.append(CreateCoin(change_puzhash, uint64(change), [change_puzhash]))
 
         # Find the VC Wallet
         vc_wallet: VCWallet
@@ -585,8 +585,10 @@ class CRCATWallet(CATWallet):
         )
         if add_authorizations_to_cr_cats:
             await vc_wallet.generate_signed_transaction(
-                vc.launcher_id,
+                [uint64(1)],
+                [await self.standard_wallet.get_puzzle_hash(new=not action_scope.config.tx_config.reuse_puzhash)],
                 action_scope,
+                vc_id=vc.launcher_id,
                 extra_conditions=(
                     *expected_announcements,
                     announcement,
@@ -622,7 +624,7 @@ class CRCATWallet(CATWallet):
             memos_with_hint.extend(memo_list)
             # Force wrap the outgoing coins in the pending state if not going to us
             payments.append(
-                Payment(
+                CreateCoin(
                     (
                         construct_pending_approval_state(puzhash, amount).get_tree_hash()
                         if puzhash != Offer.ph()
@@ -667,7 +669,7 @@ class CRCATWallet(CATWallet):
                     sent_to=[],
                     trade_id=None,
                     type=uint32(TransactionType.OUTGOING_TX.value),
-                    name=spend_bundle.name() if i == 0 else payment.as_condition().get_tree_hash(),
+                    name=spend_bundle.name() if i == 0 else payment.to_program().get_tree_hash(),
                     memos=list(compute_memos(spend_bundle).items()),
                     valid_times=parse_timelock_info(extra_conditions),
                 )
@@ -766,8 +768,10 @@ class CRCATWallet(CATWallet):
 
         # Make the VC TX
         await vc_wallet.generate_signed_transaction(
-            vc.launcher_id,
+            [uint64(1)],
+            [await self.standard_wallet.get_puzzle_hash(new=not action_scope.config.tx_config.reuse_puzhash)],
             action_scope,
+            vc_id=vc.launcher_id,
             extra_conditions=(
                 *extra_conditions,
                 *expected_announcements,

chia/wallet/vc_wallet/cr_outer_puzzle.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any, Callable, Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from clvm_tools.binutils import disassemble
 
 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.util.ints import uint64
 from chia.wallet.puzzle_drivers import PuzzleInfo, Solver
 from chia.wallet.uncurried_puzzle import UncurriedPuzzle, uncurry_puzzle
 from chia.wallet.vc_wallet.cr_cat_drivers import PROOF_FLAGS_CHECKER, construct_cr_layer, match_cr_layer, solve_cr_layer