chia-blockchain 2.4.4rc1__py3-none-any.whl → 2.4.4rc3__py3-none-any.whl

chia/_tests/cmds/wallet/test_coins.py

@@ -67,6 +67,7 @@ def test_coins_combine(capsys: object, get_test_cli_clients: Tuple[TestRpcClient
 
     inst_rpc_client = CoinsCombineRpcClient()  # pylint: disable=no-value-for-parameter
     test_rpc_clients.wallet_rpc_client = inst_rpc_client
+    assert sum(coin.amount for coin in STD_TX.removals) < 500_000_000_000
     command_args = [
         "wallet",
         "coins",
@@ -74,7 +75,7 @@ def test_coins_combine(capsys: object, get_test_cli_clients: Tuple[TestRpcClient
         FINGERPRINT_ARG,
         "-i1",
         "--largest-first",
-        "-m0.001",
+        "-m0.5",
         "--min-amount",
         "0.1",
         "--max-amount",
@@ -91,11 +92,13 @@ def test_coins_combine(capsys: object, get_test_cli_clients: Tuple[TestRpcClient
         "150",
     ]
     # these are various things that should be in the output
+    assert_list = ["Fee is >= the amount of coins selected. To continue, please use --override flag."]
+    run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
     assert_list = [
         "Transactions would combine up to 500 coins",
         f"To get status, use command: chia wallet get_transaction -f {FINGERPRINT} -tx 0x{STD_TX.name.hex()}",
     ]
-    run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
+    run_cli_command_and_assert(capsys, root_dir, command_args + ["--override"], assert_list)
     expected_tx_config = TXConfig(
         min_coin_amount=uint64(100_000_000_000),
         max_coin_amount=uint64(200_000_000_000),
@@ -109,13 +112,18 @@ def test_coins_combine(capsys: object, get_test_cli_clients: Tuple[TestRpcClient
         largest_first=True,
         target_coin_ids=[bytes32([0] * 32)],
         target_coin_amount=uint64(1_000_000_000_000),
-        fee=uint64(1_000_000_000),
+        fee=uint64(500_000_000_000),
         push=False,
     )
     expected_calls: logType = {
-        "get_wallets": [(None,)],
-        "get_synced": [()],
+        "get_wallets": [(None,)] * 2,
+        "get_synced": [()] * 2,
         "combine_coins": [
+            (
+                expected_request,
+                expected_tx_config,
+                test_condition_valid_times,
+            ),
             (
                 expected_request,
                 expected_tx_config,

chia/_tests/core/data_layer/test_data_layer_util.py

@@ -159,6 +159,13 @@ def test_internal_hash(seeded_random: Random) -> None:
             assert definition(left_hash=left_hash, right_hash=right_hash) == reference
 
 
+def get_random_bytes(length: int, r: Random) -> bytes:
+    if length == 0:
+        return b""
+
+    return r.getrandbits(length * 8).to_bytes(length, "big")
+
+
 def test_leaf_hash(seeded_random: Random) -> None:
     def definition(key: bytes, value: bytes) -> bytes32:
         return SerializedProgram.to((key, value)).get_tree_hash()
@@ -169,12 +176,14 @@ def test_leaf_hash(seeded_random: Random) -> None:
             length = 0
         else:
             length = seeded_random.randrange(100)
-        key = seeded_random.getrandbits(length * 8).to_bytes(length, "big")
+
+        key = get_random_bytes(length=length, r=seeded_random)
+
         if cycle in (1, 2):
             length = 0
         else:
             length = seeded_random.randrange(100)
-        value = seeded_random.getrandbits(length * 8).to_bytes(length, "big")
+        value = get_random_bytes(length=length, r=seeded_random)
         reference = definition(key=key, value=value)
         data.append((key, value, reference))
 
@@ -197,7 +206,7 @@ def test_key_hash(seeded_random: Random) -> None:
             length = 0
         else:
             length = seeded_random.randrange(100)
-        key = seeded_random.getrandbits(length * 8).to_bytes(length, "big")
+        key = get_random_bytes(length=length, r=seeded_random)
         reference = definition(key=key)
         data.append((key, reference))
 

chia/_tests/wallet/rpc/test_wallet_rpc.py

@@ -3022,3 +3022,85 @@ async def test_combine_coins(wallet_environments: WalletTestFramework) -> None:
             )
         ]
     )
+
+
+@pytest.mark.parametrize(
+    "wallet_environments",
+    [
+        {
+            "num_environments": 1,
+            "blocks_needed": [2],
+            "trusted": True,  # irrelevant
+            "reuse_puzhash": True,  # irrelevant
+        }
+    ],
+    indirect=True,
+)
+@pytest.mark.limit_consensus_modes(reason="irrelevant")
+@pytest.mark.anyio
+async def test_fee_bigger_than_selection_coin_combining(wallet_environments: WalletTestFramework) -> None:
+    """
+    This tests the case where the coins we would otherwise select are not enough to pay the fee.
+    """
+
+    env = wallet_environments.environments[0]
+    env.wallet_aliases = {
+        "xch": 1,
+        "cat": 2,
+    }
+
+    # Should have 4 coins, two 1.75 XCH, two 0.25 XCH
+
+    # Grab one of the 0.25 ones to specify
+    async with env.wallet_state_manager.new_action_scope(wallet_environments.tx_config) as action_scope:
+        target_coin = list(await env.xch_wallet.select_coins(uint64(250_000_000_000), action_scope))[0]
+        assert target_coin.amount == 250_000_000_000
+
+    fee = uint64(1_750_000_000_000)
+    # Under standard circumstances we would select the small coins, but this is not enough to pay the fee
+    # Instead, we will grab the big coin first and combine it with one of the smaller coins
+    xch_combine_request = CombineCoins(
+        wallet_id=uint32(1),
+        number_of_coins=uint16(2),
+        fee=fee,
+        largest_first=False,
+        push=True,
+    )
+
+    # First test an error where fee selection causes too many coins to be selected
+    with pytest.raises(ResponseFailureError, match="without selecting more coins than specified: 3"):
+        await env.rpc_client.combine_coins(
+            dataclasses.replace(xch_combine_request, fee=uint64(2_250_000_000_000)),
+            wallet_environments.tx_config,
+        )
+
+    await env.rpc_client.combine_coins(
+        xch_combine_request,
+        wallet_environments.tx_config,
+    )
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "unconfirmed_wallet_balance": -fee,
+                        "spendable_balance": -2_000_000_000_000,
+                        "pending_change": 250_000_000_000,
+                        "max_send_amount": -2_000_000_000_000,
+                        "pending_coin_removal_count": 2,
+                    }
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "confirmed_wallet_balance": -fee,
+                        "spendable_balance": 250_000_000_000,
+                        "pending_change": -250_000_000_000,
+                        "max_send_amount": 250_000_000_000,
+                        "pending_coin_removal_count": -2,
+                        "unspent_coin_count": -1,  # combine 2 into 1
+                    }
+                },
+            )
+        ]
+    )

chia/cmds/coin_funcs.py

@@ -128,6 +128,7 @@ async def async_combine(
     largest_first: bool,
     push: bool,
     condition_valid_times: ConditionValidTimes,
+    override: bool,
 ) -> List[TransactionRecord]:
     async with get_wallet_client(wallet_rpc_port, fingerprint) as (wallet_client, fingerprint, config):
         try:
@@ -167,6 +168,14 @@ async def async_combine(
             timelock_info=condition_valid_times,
         )
 
+        if (
+            not override
+            and wallet_id == 1
+            and fee >= sum(coin.amount for tx in resp.transactions for coin in tx.removals)
+        ):
+            print("Fee is >= the amount of coins selected. To continue, please use --override flag.")
+            return []
+
         print(f"Transactions would combine up to {number_of_coins} coins.")
         if push:
             cli_confirm("Would you like to Continue? (y/n): ")

chia/cmds/coins.py

@@ -108,6 +108,7 @@ def list_cmd(
     default=False,
     help="Sort coins from largest to smallest or smallest to largest.",
 )
+@click.option("--override", help="Submits transaction without checking for unusual values", is_flag=True, default=False)
 @tx_out_cmd()
 def combine_cmd(
     wallet_rpc_port: Optional[int],
@@ -125,6 +126,7 @@ def combine_cmd(
     reuse: bool,
     push: bool,
     condition_valid_times: ConditionValidTimes,
+    override: bool,
 ) -> List[TransactionRecord]:
     from .coin_funcs import async_combine
 
@@ -145,6 +147,7 @@ def combine_cmd(
             largest_first=largest_first,
             push=push,
             condition_valid_times=condition_valid_times,
+            override=override,
         )
     )
 

chia/rpc/wallet_rpc_api.py

@@ -1204,18 +1204,22 @@ class WalletRpcApi:
         async with action_scope.use() as interface:
             interface.side_effects.selected_coins.extend(coins)
 
-        # Next let's select enough coins to meet the target if there is one
-        if request.target_coin_amount is not None:
-            fungible_amount_needed = request.target_coin_amount
-            if isinstance(wallet, Wallet):
-                fungible_amount_needed = uint64(request.target_coin_amount + request.fee)
-            amount_selected = sum(c.amount for c in coins)
-            if amount_selected < fungible_amount_needed:
-                coins.extend(
-                    await wallet.select_coins(
-                        amount=uint64(fungible_amount_needed - amount_selected), action_scope=action_scope
-                    )
+        # Next let's select enough coins to meet the target + fee if there is one
+        fungible_amount_needed = uint64(0) if request.target_coin_amount is None else request.target_coin_amount
+        if isinstance(wallet, Wallet):
+            fungible_amount_needed = uint64(fungible_amount_needed + request.fee)
+        amount_selected = sum(c.amount for c in coins)
+        if amount_selected < fungible_amount_needed:  # implicit fungible_amount_needed > 0 here
+            coins.extend(
+                await wallet.select_coins(
+                    amount=uint64(fungible_amount_needed - amount_selected), action_scope=action_scope
                 )
+            )
+
+        if len(coins) > request.number_of_coins:
+            raise ValueError(
+                f"Options specified cannot be met without selecting more coins than specified: {len(coins)}"
+            )
 
         # Now let's select enough coins to get to the target number to combine
         if len(coins) < request.number_of_coins:
@@ -1243,6 +1247,7 @@ class WalletRpcApi:
             uint64(sum(c.amount for c in coins)) if request.target_coin_amount is None else request.target_coin_amount
         )
         if isinstance(wallet, Wallet):
+            primary_output_amount = uint64(primary_output_amount - request.fee)
             await wallet.generate_signed_transaction(
                 primary_output_amount,
                 await wallet.get_puzzle_hash(new=action_scope.config.tx_config.reuse_puzhash),

chia/server/ws_connection.py

@@ -8,7 +8,7 @@ import traceback
 from dataclasses import dataclass, field
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Set, Tuple, Union
 
-from aiohttp import ClientSession, WSCloseCode, WSMessage, WSMsgType
+from aiohttp import ClientSession, WebSocketError, WSCloseCode, WSMessage, WSMsgType
 from aiohttp.client import ClientWebSocketResponse
 from aiohttp.web import WebSocketResponse
 from packaging.version import Version
@@ -708,7 +708,7 @@ class WSChiaConnection:
             return full_message_loaded
         elif message.type == WSMsgType.ERROR:
             self.log.error(f"WebSocket Error: {message}")
-            if message.data.code == WSCloseCode.MESSAGE_TOO_BIG:
+            if isinstance(message.data, WebSocketError) and message.data.code == WSCloseCode.MESSAGE_TOO_BIG:
                 asyncio.create_task(self.close(300))
             else:
                 asyncio.create_task(self.close())

{chia_blockchain-2.4.4rc1.dist-info → chia_blockchain-2.4.4rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia-blockchain
-Version: 2.4.4rc1
+Version: 2.4.4rc3
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 Home-page: https://chia.net/
 License: Apache License
@@ -18,7 +18,7 @@ Provides-Extra: dev
 Provides-Extra: legacy-keyring
 Provides-Extra: upnp
 Requires-Dist: aiofiles (==24.1.0)
-Requires-Dist: aiohttp (==3.10.2)
+Requires-Dist: aiohttp (==3.10.4)
 Requires-Dist: aiohttp_cors (==0.7.0) ; extra == "dev"
 Requires-Dist: aiosqlite (==0.20.0)
 Requires-Dist: anyio (==4.3.0)

{chia_blockchain-2.4.4rc1.dist-info → chia_blockchain-2.4.4rc3.dist-info}/RECORD

@@ -44,7 +44,7 @@ chia/_tests/cmds/test_timelock_args.py,sha256=n0pI6YtOV7G17Ub0Q0lJJnARSbjEAJOHXQ
 chia/_tests/cmds/test_tx_config_args.py,sha256=hGEnXC52E14U_JcVusiqCmP1j0xLxmlfmvm6SRkiF48,4730
 chia/_tests/cmds/testing_classes.py,sha256=IkHerldmsrGQJCSvnLEyV0IOdr2a9XjvQKY6YrfYGjw,1810
 chia/_tests/cmds/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chia/_tests/cmds/wallet/test_coins.py,sha256=6KToxVw_mN_QT_rU5onO-wZLp_tAHdEdcGKCfCcKgl0,6595
+chia/_tests/cmds/wallet/test_coins.py,sha256=p1HF734KqBdFkaTVKPh1S3Ku4F-MdxRfWU-ce9QTxTg,7016
 chia/_tests/cmds/wallet/test_consts.py,sha256=suv54GTIHGwCjIeq-zkwWu8NqGO8AIMmxxhN1GNHfLo,1662
 chia/_tests/cmds/wallet/test_dao.py,sha256=egWxijpvOImXopxmo7Q8cFbHPsH7_9ThKpzjHJ1_alM,21017
 chia/_tests/cmds/wallet/test_did.py,sha256=S0iB3dEMxlVAxiH75qDgmWeoAsHCCt1csJVJv6L1KyY,16490
@@ -80,7 +80,7 @@ chia/_tests/core/data_layer/config.py,sha256=K2Odbop3xRSlWVsfaAZG53IRXXD3pdOpiYe
 chia/_tests/core/data_layer/conftest.py,sha256=9NPs0xVEyGD75Q5g0yQc8cE7qPnvwObmh3KHtlBTITE,3891
 chia/_tests/core/data_layer/test_data_cli.py,sha256=K2vGX0p6KdCemw7-9as85O-zffm02VGetxrSD9iSvYw,2347
 chia/_tests/core/data_layer/test_data_layer.py,sha256=NCqRfZpYCp3lLq_q8HFvycL318lOmPXPEUMvzTzfe9U,2519
-chia/_tests/core/data_layer/test_data_layer_util.py,sha256=OFkLlaLFfA5ykKqetQhWWneMr8P9LWYa00ngrzoXvd0,7439
+chia/_tests/core/data_layer/test_data_layer_util.py,sha256=rU5rOM_eE-zPsS27ZdpYZC7ET0YXB99qPDFGAf93xJs,7560
 chia/_tests/core/data_layer/test_data_rpc.py,sha256=hbDQ7Bs-JWEAehGCnm5IHrXkWttCjxwAIRVqaihMdEg,333417
 chia/_tests/core/data_layer/test_data_store.py,sha256=8YnS_fOjpOLqdB4uzJThzeDeL_bFgV7TS4a38-n6S88,93895
 chia/_tests/core/data_layer/test_data_store_schema.py,sha256=pSYRxAYsn73HeCV_OuU65RmPHWKbNws0vY4iMvQuVYU,15006
@@ -343,7 +343,7 @@ chia/_tests/wallet/nft_wallet/test_ownership_outer_puzzle.py,sha256=Dwxiw0mxO9E6
 chia/_tests/wallet/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chia/_tests/wallet/rpc/config.py,sha256=zk46Xu_ueEcDUY3PcNCD0xqHppG_bvKmwBKH5-yuJtw,86
 chia/_tests/wallet/rpc/test_dl_wallet_rpc.py,sha256=mANfG9wIzaYJ5izNArkqHZjQzRqJf-ypLqhcs3ucGbw,12880
-chia/_tests/wallet/rpc/test_wallet_rpc.py,sha256=ZvKByXW-i1YVvXnbAJRQcQ6nS_EUzMKjiT6DRrlAhdI,146361
+chia/_tests/wallet/rpc/test_wallet_rpc.py,sha256=ounbkLval_yz_gas-oSRimIu-pHWV1gEJd_8KAMEO7c,149327
 chia/_tests/wallet/simple_sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chia/_tests/wallet/simple_sync/config.py,sha256=fTDhByaME5cEDbtyTKCWUf69F4kajs75aTQewZMjxak,69
 chia/_tests/wallet/simple_sync/test_simple_sync_protocol.py,sha256=6t9_lo6Me5PshMZxZbCrxWLGrvOO01bw1pExJSnB6n4,32861
@@ -400,8 +400,8 @@ chia/cmds/check_wallet_db.py,sha256=9Fl2xgFYwwF99TCwxWk-8VeKQg_BzhqbV57FvwsqXmM,
 chia/cmds/chia.py,sha256=de76G_CbsKaN8jDKqA250dRRHD3hLzRKi_CVsX08tCs,4654
 chia/cmds/cmd_classes.py,sha256=kePzeJZ4i8njXVFQflzZNi-PJ3ieR4tHkHj_oS8Zcmw,11518
 chia/cmds/cmds_util.py,sha256=ksEBRBpPp9LW0fmRZHZ_dJBaa9sW_HLfXKYWt2OFSj0,19576
-chia/cmds/coin_funcs.py,sha256=v-W-lbfnej9Xs05M07pPUB3zkqZayD0V1vh-mcrvCgk,10334
-chia/cmds/coins.py,sha256=I1eUBbvCl4aHqo03jCjKaULnZ8xVGoS94YY9Xp53_7c,6555
+chia/cmds/coin_funcs.py,sha256=y2JYVauYnK799_rWoxD6Irv-XkmkV5Sf5trP6ESlarg,10651
+chia/cmds/coins.py,sha256=f68Vlxz7IkJjuhMTs-nAx8bWjaCnTuJo3ffL3vr0lgs,6727
 chia/cmds/completion.py,sha256=Ph1WSKtqCNO84Kw0-Ws2vVtIAg0lk5at0nnW8jKe94w,1387
 chia/cmds/configure.py,sha256=gEtnA377ADTM4yubG5eHTfbB2GIFMkM1LirmgmNYsW8,14772
 chia/cmds/dao.py,sha256=hQk8S4Y0CAgdy0oHCJegBkBjAebfMwdlKVAXa0zfyCM,30522
@@ -603,7 +603,7 @@ chia/rpc/rpc_server.py,sha256=dtV2Axb3qo4bz4jK3DSJkAZWz3E3PAf54ajNo7clV6I,17489
 chia/rpc/timelord_rpc_api.py,sha256=zGnywbUjwNGuw_z9187BOu9vQirYdpJ5HHFOHbJ7VY8,863
 chia/rpc/util.py,sha256=Risg5n2ecHKiLJBvfP47NxHiWfadflvaRxg_92DVuzo,13533
 chia/rpc/wallet_request_types.py,sha256=ZVDKxnkLn_7pDlR8TtLalKKgBcZfs7xc4uBr6RCKDQQ,16318
-chia/rpc/wallet_rpc_api.py,sha256=TT18Pg-VxQAXbDp5N4DiHz6-cShoTIA1Qnwc79QORiQ,224142
+chia/rpc/wallet_rpc_api.py,sha256=RYhe0y3yGSjmZ_4truBf34-A8EO_W184DikuAwtNUv8,224433
 chia/rpc/wallet_rpc_client.py,sha256=D9B9gGXzvnjZfLXlMRwYuw_32lgFbjDhanx7dHug_aQ,75590
 chia/seeder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chia/seeder/crawl_store.py,sha256=HgUTTGP9X1P3WNWmfoV0f6Oy8xauerQzpgBYdJOxzsE,16851
@@ -635,7 +635,7 @@ chia/server/start_service.py,sha256=QPQuxnoLEnHVNvbMRz8j7eHdG8KixCb2nnKjVwWEyBU,
 chia/server/start_timelord.py,sha256=mRap7vj0Sa9ASvtuFOZ3PwMzkqm86_OVmiQXNODp660,2802
 chia/server/start_wallet.py,sha256=wKbitcLow9XRhWCxnI0erwSqj4Yp4-7CYWxnt7_rARY,3776
 chia/server/upnp.py,sha256=h3cNKhzlLO2loAE1cVfcFbckMThXkl3owekkhfMO7Yc,3743
-chia/server/ws_connection.py,sha256=lfZ4TD6DxIfb00UwOyRMXfy63Odh6HaEhWRx_GI9qEY,32780
+chia/server/ws_connection.py,sha256=OHriGg27zpEWWH1I_fAxxz-CNYMcaIV8QNQY84HaglA,32841
 chia/simulator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chia/simulator/block_tools.py,sha256=wQQTtGpYraJ9rkshc2mXQFVnkiSLexFpIXgEySYqwGg,90940
 chia/simulator/full_node_simulator.py,sha256=fs_t7vRH78M984AEvZ7zHxPPR-r0ljb0kjsY88hlEwM,34947
@@ -1021,8 +1021,8 @@ chia/wallet/wallet_transaction_store.py,sha256=Irw8k8ZqufsIDRR_uSWRV0nEOkr7m-Iz1
 chia/wallet/wallet_user_store.py,sha256=Ce6Gg9A7LX9f7aKdVhLe6st0o-KFPI1hl9FLro6PuCk,4090
 chia/wallet/wallet_weight_proof_handler.py,sha256=XlzDsTULQPljbAN7BVLo133aEc--aq0U_k4owSj3Os8,4932
 mozilla-ca/cacert.pem,sha256=GJ089tEDGF-6BtdsGvkVJjxtQiJUgaF1noU7M6yFdUA,234847
-chia_blockchain-2.4.4rc1.dist-info/LICENSE,sha256=QsHs53_We_JTOMH_GprgI5-zMC9KC7D-Vws6Zi4efPM,11347
-chia_blockchain-2.4.4rc1.dist-info/METADATA,sha256=86PZPDJbb7hSelctGv753TPx4yxQreaFwxf--84DMUM,10942
-chia_blockchain-2.4.4rc1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-chia_blockchain-2.4.4rc1.dist-info/entry_points.txt,sha256=GL2-UvicPVdKz72IP4shnmV3XImfoD5pMzoURfoAYk4,742
-chia_blockchain-2.4.4rc1.dist-info/RECORD,,
+chia_blockchain-2.4.4rc3.dist-info/LICENSE,sha256=QsHs53_We_JTOMH_GprgI5-zMC9KC7D-Vws6Zi4efPM,11347
+chia_blockchain-2.4.4rc3.dist-info/METADATA,sha256=9HNL1P0C9WY999IeVpD8kA35a55vhV8zY10lK6jJeN8,10942
+chia_blockchain-2.4.4rc3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+chia_blockchain-2.4.4rc3.dist-info/entry_points.txt,sha256=GL2-UvicPVdKz72IP4shnmV3XImfoD5pMzoURfoAYk4,742
+chia_blockchain-2.4.4rc3.dist-info/RECORD,,