chia-blockchain 2.4.4__tar.gz → 2.4.4rc1__tar.gz

{chia_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia-blockchain
-Version: 2.4.4
+Version: 2.4.4rc1
 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.4)
+Requires-Dist: aiohttp (==3.10.2)
 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.4 → chia_blockchain-2.4.4rc1}/chia/_tests/cmds/wallet/test_coins.py

@@ -67,7 +67,6 @@ 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",
@@ -75,7 +74,7 @@ def test_coins_combine(capsys: object, get_test_cli_clients: Tuple[TestRpcClient
         FINGERPRINT_ARG,
         "-i1",
         "--largest-first",
-        "-m0.5",
+        "-m0.001",
         "--min-amount",
         "0.1",
         "--max-amount",
@@ -92,13 +91,11 @@ 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 + ["--override"], assert_list)
+    run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
     expected_tx_config = TXConfig(
         min_coin_amount=uint64(100_000_000_000),
         max_coin_amount=uint64(200_000_000_000),
@@ -112,18 +109,13 @@ 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(500_000_000_000),
+        fee=uint64(1_000_000_000),
         push=False,
     )
     expected_calls: logType = {
-        "get_wallets": [(None,)] * 2,
-        "get_synced": [()] * 2,
+        "get_wallets": [(None,)],
+        "get_synced": [()],
         "combine_coins": [
-            (
-                expected_request,
-                expected_tx_config,
-                test_condition_valid_times,
-            ),
             (
                 expected_request,
                 expected_tx_config,

{chia_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/chia/_tests/core/data_layer/test_data_layer_util.py

@@ -159,13 +159,6 @@ 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()
@@ -176,14 +169,12 @@ def test_leaf_hash(seeded_random: Random) -> None:
             length = 0
         else:
             length = seeded_random.randrange(100)
-
-        key = get_random_bytes(length=length, r=seeded_random)
-
+        key = seeded_random.getrandbits(length * 8).to_bytes(length, "big")
         if cycle in (1, 2):
             length = 0
         else:
             length = seeded_random.randrange(100)
-        value = get_random_bytes(length=length, r=seeded_random)
+        value = seeded_random.getrandbits(length * 8).to_bytes(length, "big")
         reference = definition(key=key, value=value)
         data.append((key, value, reference))
 
@@ -206,7 +197,7 @@ def test_key_hash(seeded_random: Random) -> None:
             length = 0
         else:
             length = seeded_random.randrange(100)
-        key = get_random_bytes(length=length, r=seeded_random)
+        key = seeded_random.getrandbits(length * 8).to_bytes(length, "big")
         reference = definition(key=key)
         data.append((key, reference))
 

{chia_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/chia/_tests/wallet/rpc/test_wallet_rpc.py

@@ -3022,85 +3022,3 @@ 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_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/chia/cmds/coin_funcs.py

@@ -128,7 +128,6 @@ 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:
@@ -168,14 +167,6 @@ 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_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/chia/cmds/coins.py

@@ -108,7 +108,6 @@ 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],
@@ -126,7 +125,6 @@ def combine_cmd(
     reuse: bool,
     push: bool,
     condition_valid_times: ConditionValidTimes,
-    override: bool,
 ) -> List[TransactionRecord]:
     from .coin_funcs import async_combine
 
@@ -147,7 +145,6 @@ def combine_cmd(
             largest_first=largest_first,
             push=push,
             condition_valid_times=condition_valid_times,
-            override=override,
         )
     )
 

{chia_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/chia/rpc/wallet_rpc_api.py

@@ -1204,22 +1204,18 @@ 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 + 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
+        # 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
+                    )
                 )
-            )
-
-        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:
@@ -1247,7 +1243,6 @@ 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_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/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, WebSocketError, WSCloseCode, WSMessage, WSMsgType
+from aiohttp import ClientSession, 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 isinstance(message.data, WebSocketError) and message.data.code == WSCloseCode.MESSAGE_TOO_BIG:
+            if message.data.code == WSCloseCode.MESSAGE_TOO_BIG:
                 asyncio.create_task(self.close(300))
             else:
                 asyncio.create_task(self.close())

{chia_blockchain-2.4.4 → chia_blockchain-2.4.4rc1}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "chia-blockchain"
 # see [tool.poetry-dynamic-versioning]
-version = "2.4.4"
+version = "2.4.4-rc1"
 description = "Chia blockchain full node, farmer, timelord, and wallet."
 authors = ["Mariano Sorgente <mariano@chia.net>"]
 license = "Apache License"
@@ -39,7 +39,7 @@ priority = "supplemental"
 [tool.poetry.dependencies]
 python = ">=3.8.10, <3.13"
 aiofiles = "24.1.0"  # Async IO for files
-aiohttp = "3.10.4"  # HTTP server for full node rpc
+aiohttp = "3.10.2"  # HTTP server for full node rpc
 aiosqlite = "0.20.0"  # asyncio wrapper for sqlite, to store blocks
 anyio = "4.3.0"
 bitstring = "4.1.4"  # Binary data management library