Fix support for "" in PuzzleInfo/Solver

Author: Quexington

chia/_tests/cmds/wallet/test_wallet.py

@@ -29,6 +29,7 @@
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.wallet.conditions import Condition, ConditionValidTimes
+from chia.wallet.puzzle_drivers import PuzzleInfo
 from chia.wallet.trade_record import TradeRecord
 from chia.wallet.trading.offer import Offer
 from chia.wallet.trading.trade_status import TradeStatus
@@ -49,6 +50,7 @@
     CATSpend,
     CATSpendResponse,
     ClawbackPuzzleDecoratorOverride,
+    CreateOfferForIDs,
     CreateOfferForIDsResponse,
     DeleteUnconfirmedTransactions,
     ExtendDerivationIndex,
@@ -79,6 +81,29 @@
 )
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
+TEMP = PuzzleInfo(
+    {
+        "type": "singleton",
+        "launcher_id": "0x0101010101010101010101010101010101010101010101010101010101010101",
+        "launcher_ph": "0xeff07522495060c066f66f32acc2a77e3a3e737aca8baea4d1a64ea4cdc13da9",
+        "also": {
+            "type": "metadata",
+            "metadata": "",
+            "updater_hash": "0x0707070707070707070707070707070707070707070707070707070707070707",
+            "also": {
+                "type": "ownership",
+                "owner": "()",
+                "transfer_program": {
+                    "type": "royalty transfer program",
+                    "launcher_id": "0x0101010101010101010101010101010101010101010101010101010101010101",
+                    "royalty_address": "0x0303030303030303030303030303030303030303030303030303030303030303",
+                    "royalty_percentage": "1000",
+                },
+            },
+        },
+    }
+)
+
 test_offer_file_path = importlib_resources.files(__name__.rpartition(".")[0]).joinpath("test_offer.toffer")
 test_offer_file_bech32 = test_offer_file_path.read_text(encoding="utf-8")
 test_offer_id: str = "0xdfb7e8643376820ec995b0bcdb3fc1f764c16b814df5e074631263fcf1e00839"
@@ -763,17 +788,22 @@ def test_make_offer(capsys: object, get_test_cli_clients: tuple[TestRpcClients,
     class MakeOfferRpcClient(TestWalletRpcClient):
         async def create_offer_for_ids(
             self,
-            offer_dict: dict[uint32, int],
+            request: CreateOfferForIDs,
             tx_config: TXConfig,
-            driver_dict: Optional[dict[str, Any]] = None,
-            solver: Optional[dict[str, Any]] = None,
-            fee: uint64 = uint64(0),
-            validate_only: bool = False,
+            extra_conditions: tuple[Condition, ...] = tuple(),
             timelock_info: ConditionValidTimes = ConditionValidTimes(),
         ) -> CreateOfferForIDsResponse:
             self.add_to_log(
                 "create_offer_for_ids",
-                (offer_dict, tx_config, driver_dict, solver, fee, validate_only, timelock_info),
+                (
+                    request.offer,
+                    tx_config,
+                    request.driver_dict,
+                    request.solver,
+                    request.fee,
+                    request.validate_only,
+                    timelock_info,
+                ),
             )
 
             created_offer = Offer({}, WalletSpendBundle([], G2Element()), {})
@@ -866,35 +896,39 @@ async def create_offer_for_ids(
         "create_offer_for_ids": [
             (
                 {
-                    1: -10000000000000,
-                    3: -100000,
-                    "0404040404040404040404040404040404040404040404040404040404040404": -100000,
-                    "0202020202020202020202020202020202020202020202020202020202020202": 10000,
-                    "0101010101010101010101010101010101010101010101010101010101010101": 1,
+                    "1": "-10000000000000",
+                    "3": "-100000",
+                    "0404040404040404040404040404040404040404040404040404040404040404": "-100000",
+                    "0202020202020202020202020202020202020202020202020202020202020202": "10000",
+                    "0101010101010101010101010101010101010101010101010101010101010101": "1",
                 },
                 DEFAULT_TX_CONFIG.override(reuse_puzhash=True),
                 {
-                    "0101010101010101010101010101010101010101010101010101010101010101": {
-                        "type": "singleton",
-                        "launcher_id": "0x0101010101010101010101010101010101010101010101010101010101010101",
-                        "launcher_ph": "0xeff07522495060c066f66f32acc2a77e3a3e737aca8baea4d1a64ea4cdc13da9",
-                        "also": {
-                            "type": "metadata",
-                            "metadata": "",
-                            "updater_hash": "0x0707070707070707070707070707070707070707070707070707070707070707",
+                    bytes32([1] * 32): PuzzleInfo(
+                        {
+                            "type": "singleton",
+                            "launcher_id": "0x0101010101010101010101010101010101010101010101010101010101010101",
+                            "launcher_ph": "0xeff07522495060c066f66f32acc2a77e3a3e737aca8baea4d1a64ea4cdc13da9",
                             "also": {
-                                "type": "ownership",
-                                "owner": "()",
-                                "transfer_program": {
-                                    "type": "royalty transfer program",
-                                    "launcher_id": "0x0101010101010101010101010101010101010101010101010101010101010101",
-                                    "royalty_address": "0x0303030303030303030303030303030303030303030"
-                                    "303030303030303030303",
-                                    "royalty_percentage": "1000",
+                                "type": "metadata",
+                                "metadata": "",
+                                "updater_hash": "0x0707070707070707070707070707070707070707070707070707070707070707",
+                                "also": {
+                                    "type": "ownership",
+                                    "owner": "()",
+                                    "transfer_program": {
+                                        "type": "royalty transfer program",
+                                        "launcher_id": (
+                                            "0x0101010101010101010101010101010101010101010101010101010101010101"
+                                        ),
+                                        "royalty_address": "0x0303030303030303030303030303030303030303030"
+                                        "303030303030303030303",
+                                        "royalty_percentage": "1000",
+                                    },
                                 },
                             },
-                        },
-                    }
+                        }
+                    )
                 },
                 None,
                 500000000000,

chia/wallet/puzzle_drivers.py

@@ -129,7 +129,7 @@ def decode_info_value(cls: Any, value: Any) -> Any:
     elif isinstance(value, Program) and value.atom is None:
         return value
     else:
-        if value == "()":  # special case
+        if value in {"()", ""}:  # special case
             return Program.to([])
         expression: SExp = assemble(value)
         if expression.atom is None: