chia-blockchain 2.3.0__tar.gz → 2.3.0rc2__tar.gz

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/.github/workflows/pre-commit.yml

@@ -30,7 +30,7 @@ jobs:
           - name: macOS
             matrix: macos
             runs-on:
-              intel: macos-12
+              intel: macos-latest
               arm: [macos, arm64]
           - name: Windows
             matrix: windows

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/.github/workflows/test-install-scripts.yml

@@ -31,7 +31,7 @@ jobs:
         python:
           - major-dot-minor: "3.10"
         os:
-          - runs-on: macos-12
+          - runs-on: macos-latest
             matrix: macos
           - runs-on: ubuntu-latest
             matrix: linux

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/.github/workflows/test.yml

@@ -60,7 +60,7 @@ jobs:
       concurrency_name: macos
       configuration: ${{ needs.configure.outputs.configuration }}
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
-      runs-on: macos-12
+      runs-on: macos-latest
       collect-junit: false
   ubuntu:
     uses: ./.github/workflows/test-single.yml

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/.github/workflows/upload-pypi-source.yml

@@ -44,7 +44,7 @@ jobs:
             matrix: macos
             emoji: 🍎
             runs-on:
-              intel: macos-12
+              intel: macos-latest
               arm: [macos, arm64]
           - name: Windows
             matrix: windows

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/CHANGELOG.md

@@ -6,78 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project does not yet adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 for setuptools_scm/PEP 440 reasons.
 
-## 2.3.0 Chia blockchain 2024-05-01
-
-### Fixed
-* Fixed `Install.ps1` for PowerShell 7.4
-* Fixed readability of `Could not find parent coin` error log by printing hex and not bytes
-* Fixed some shutdown log spam by ensuring signal objects for signal handlers (fixes #17578)
-* Fixed negative plot sync durations not crashing the harvester (fixes #15027) (thanks @felixbrucker)
-* Fixed log spam by only logging warnings about protocol mismatches for farmer and harvester
-* Fixed log spam by logging rollbacks only if heights are actually deleted
-* Fixed DID update metadata issue (fixes #17412)
-* Fixed error codes and add more test coverage for message conditions
-* Fixed non-development source install
-* Fixed reorg from 0
-* Fixed (again) Datalayer download banning
-* Improved timelord skip peak logic.
-* Used click.Path for make_offer command filename (fixes #10920)
-* Handle when xch_target_address in config doesn't decode correctly (fixes #16995)
-* Delete unconfirmed Clawback TX
-* tighten up the check for duplicate UnfinishedBlocks before requesting that block
-* Optimized Datalayer `get_key_by_node`
-* Added test for observance of melted CAT balance (fixes #17727)
-* increase backwards compatibility by using default values for peer file path
-* Added `--skip-keyring` option to `chia start` and use in GUI (fixes #17848)
-
-### Added
-* Added Python 3.12 support
-* Added new subscription and wallet sync protocol support (will be used by the wallet in future releases)
-* Added Chip-25 Message Conditions support (https://github.com/Chia-Network/chips/pull/98)
-* Added support for HTTP redirect for the pool url (thanks @felixbrucker)
-* Added `use_delta_sync` option for faster wallet sync (thanks @felixbrucker)
-* Added Datalayer RPC pagination.
-* Added Datalayer multiple batch updates with `submit_on_chain` option.
-* Added `get_network_info` RPC to daemon
-* Added `new_unfinished_block2` support in Chia seeder
-* Added Hint support for SpendSim
-
-### Changed
-* Transition `FullBlock`, `BlockRecord`, `CoinSpend`, and `HeaderBlock` to rust
-* Move tests - all tests and infrastructure are now included in the chia-blockchain package under `chia/_tests`
-* Remove `Announcement` class in favor of `Condition` subclasses
-* Remove `ignore_max_send_amount`
-* Use `psutil.cpu_affinity()` instead of `os.cpu_count()`
-* Stop automatic transaction pushing by wallets
-* Unify transaction pushing
-* For testing purposes added support for non-ssl rpc clients
-* Bump `chia_rs` to `0.5.2`
-* Bump `clvm_tools` to `0.4.8`
-* Bump `aiohttp` to `3.9.2`
-* Return TXs from CATWallet and Offer creation
-* Remove all install.sh code that installs python and leave it to the user to install separately
-* Remove old `unhashable` special case in `Streamable`
-* Optimize `validate_removals()`
-* Remove support for migrating peers from legacy file format
-* Set unique peer filenames when swapping to/from testnets
-* Cleaner cli output for rpc client fetch errors
-* Optimized Datalayer subscription handling by using a `QueuedAsyncPool` for `DataLayer.periodically_manage_data()`
-* Update README.md links for wiki & faq sunset
-* Update README formatting and links (thanks @bknox83)
-* Turned concatenation of strings to f-strings (thanks @eukub)
-* Remove dead code in `multiprocess_validation`
-* Improve logging of the height-to-hash and sub-epoch-summaries cache
-* Pass full version in `Handshake` (thanks @felixbrucker)
-* Separate protocol versions for full_node, farmer, harvester, wallet
-* Optimized v1 to v2 DB upgrade
-* Datalayer: Avoid manage data loop delay for self subscriptions
-* Datalayer: Don't download DAT files that are already on disk
-* Datalayer: `get_proof` optimizations - use get_ancestors_optimized
-* Datalayer: Optimize insert/upsert/delete by using `get_node_by_key`
-* Datalayer: stop using fee config setting and remove from initial config
-* Datalayer: Optimize clean_node_table's query and speedup by leveraging relaxed foreign_keys
-* Enabled compression for cli rpm
-
 ## 2.2.1 Chia blockchain 2024-03-4
 
 ### Fixed

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia-blockchain
-Version: 2.3.0
+Version: 2.3.0rc2
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 Home-page: https://chia.net/
 Author: Mariano Sorgente

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia/_tests/conftest.py

@@ -266,7 +266,7 @@ def db_version(request) -> int:
     return request.param
 
 
-SOFTFORK_HEIGHTS = [1000000, 5496000, 5496100, 5716000]
+SOFTFORK_HEIGHTS = [1000000, 5496000, 5496100, 5650000]
 
 
 @pytest.fixture(scope="function", params=SOFTFORK_HEIGHTS)

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia/_tests/util/test_network.py

@@ -18,7 +18,7 @@ class TestNetwork:
         assert await resolve("127.0.0.1", prefer_ipv6=prefer_ipv6) == IPAddress.create("127.0.0.1")
         assert await resolve("10.11.12.13", prefer_ipv6=prefer_ipv6) == IPAddress.create("10.11.12.13")
         assert await resolve("localhost", prefer_ipv6=prefer_ipv6) == IPAddress.create("127.0.0.1")
-        assert await resolve("example.net", prefer_ipv6=prefer_ipv6) == IPAddress.create("93.184.215.14")
+        assert await resolve("example.net", prefer_ipv6=prefer_ipv6) == IPAddress.create("93.184.216.34")
 
     @pytest.mark.anyio
     @pytest.mark.skipif(
@@ -37,7 +37,7 @@ class TestNetwork:
         # assert await resolve("ip6-localhost", prefer_ipv6=prefer_ipv6) == IPAddress.create("::1")
         # assert await resolve("localhost", prefer_ipv6=prefer_ipv6) == IPAddress.create("::1")
         assert await resolve("example.net", prefer_ipv6=prefer_ipv6) == IPAddress.create(
-            "2606:2800:21f:cb07:6820:80da:af6b:8b2c"
+            "2606:2800:220:1:248:1893:25c8:1946"
         )
 
 

chia-blockchain-2.3.0rc2/chia/_tests/weight_proof/config.py

@@ -0,0 +1,3 @@
+from __future__ import annotations
+
+checkout_blocks_and_plots = True

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia/cmds/sim_funcs.py

@@ -291,7 +291,7 @@ async def async_config_wizard(
     print("Starting Simulator now...\n\n")
 
     sys.argv[0] = str(Path(sys.executable).parent / "chia")  # fix path for tests
-    await async_start(root_path, config, ("simulator",), restart=False, skip_keyring=False)
+    await async_start(root_path, config, ("simulator",), False)
 
     # now we make sure the simulator has a genesis block
     print("Please wait, generating genesis block.")

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia/cmds/start.py

@@ -8,10 +8,9 @@ from chia.util.service_groups import all_groups
 
 @click.command("start", help="Start service groups")
 @click.option("-r", "--restart", is_flag=True, type=bool, help="Restart running services")
-@click.option("-s", "--skip-keyring", is_flag=True, type=bool, help="Skip to unlock keyring")
 @click.argument("group", type=click.Choice(list(all_groups())), nargs=-1, required=True)
 @click.pass_context
-def start_cmd(ctx: click.Context, restart: bool, skip_keyring: bool, group: tuple[str, ...]) -> None:
+def start_cmd(ctx: click.Context, restart: bool, group: tuple[str, ...]) -> None:
     import asyncio
 
     from chia.cmds.beta_funcs import warn_if_beta_enabled
@@ -21,4 +20,4 @@ def start_cmd(ctx: click.Context, restart: bool, skip_keyring: bool, group: tupl
     root_path = ctx.obj["root_path"]
     config = load_config(root_path, "config.yaml")
     warn_if_beta_enabled(config)
-    asyncio.run(async_start(root_path, config, group, restart, skip_keyring=skip_keyring))
+    asyncio.run(async_start(root_path, config, group, restart))

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia/cmds/start_funcs.py

@@ -31,9 +31,7 @@ def launch_start_daemon(root_path: Path) -> subprocess.Popen:
     return process
 
 
-async def create_start_daemon_connection(
-    root_path: Path, config: Dict[str, Any], *, skip_keyring: bool
-) -> Optional[DaemonProxy]:
+async def create_start_daemon_connection(root_path: Path, config: Dict[str, Any]) -> Optional[DaemonProxy]:
     connection = await connect_to_daemon_and_validate(root_path, config)
     if connection is None:
         print("Starting daemon")
@@ -46,29 +44,24 @@ async def create_start_daemon_connection(
         # it prints "daemon: listening"
         connection = await connect_to_daemon_and_validate(root_path, config)
     if connection:
-        if skip_keyring:
-            print("Skipping to unlock keyring")
-        else:
-            passphrase = None
-            if await connection.is_keyring_locked():
-                passphrase = Keychain.get_cached_master_passphrase()
-                if passphrase is None or not Keychain.master_passphrase_is_valid(passphrase):
-                    with ThreadPoolExecutor(max_workers=1, thread_name_prefix="get_current_passphrase") as executor:
-                        passphrase = await asyncio.get_running_loop().run_in_executor(executor, get_current_passphrase)
+        passphrase = None
+        if await connection.is_keyring_locked():
+            passphrase = Keychain.get_cached_master_passphrase()
+            if passphrase is None or not Keychain.master_passphrase_is_valid(passphrase):
+                with ThreadPoolExecutor(max_workers=1, thread_name_prefix="get_current_passphrase") as executor:
+                    passphrase = await asyncio.get_running_loop().run_in_executor(executor, get_current_passphrase)
 
-            if passphrase:
-                print("Unlocking daemon keyring")
-                await connection.unlock_keyring(passphrase)
+        if passphrase:
+            print("Unlocking daemon keyring")
+            await connection.unlock_keyring(passphrase)
 
         return connection
     return None
 
 
-async def async_start(
-    root_path: Path, config: Dict[str, Any], group: tuple[str, ...], restart: bool, *, skip_keyring: bool
-) -> None:
+async def async_start(root_path: Path, config: Dict[str, Any], group: tuple[str, ...], restart: bool) -> None:
     try:
-        daemon = await create_start_daemon_connection(root_path, config, skip_keyring=skip_keyring)
+        daemon = await create_start_daemon_connection(root_path, config)
     except KeychainMaxUnlockAttempts:
         print("Failed to unlock keyring")
         return None

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia/consensus/default_constants.py

@@ -63,7 +63,7 @@ DEFAULT_CONSTANTS = ConsensusConstants(
     MAX_GENERATOR_REF_LIST_SIZE=uint32(512),  # Number of references allowed in the block generator ref list
     POOL_SUB_SLOT_ITERS=uint64(37600000000),  # iters limit * NUM_SPS
     SOFT_FORK2_HEIGHT=uint32(0),
-    SOFT_FORK4_HEIGHT=uint32(5716000),
+    SOFT_FORK4_HEIGHT=uint32(5650000),
     # June 2024
     HARD_FORK_HEIGHT=uint32(5496000),
     HARD_FORK_FIX_HEIGHT=uint32(5496000),

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia_blockchain.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia-blockchain
-Version: 2.3.0
+Version: 2.3.0rc2
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 Home-page: https://chia.net/
 Author: Mariano Sorgente

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc2}/chia_blockchain.egg-info/SOURCES.txt

@@ -169,7 +169,6 @@ chia/_tests/cmds/cmd_test_utils.py
 chia/_tests/cmds/config.py
 chia/_tests/cmds/conftest.py
 chia/_tests/cmds/test_cmds_util.py
-chia/_tests/cmds/test_daemon.py
 chia/_tests/cmds/test_farm_cmd.py
 chia/_tests/cmds/test_show.py
 chia/_tests/cmds/test_sim.py

chia_blockchain-2.3.0/chia/_tests/cmds/test_daemon.py

@@ -1,77 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-from typing import Any, Dict, Optional
-
-import pytest
-from _pytest.capture import CaptureFixture
-from click.testing import CliRunner
-from pytest_mock import MockerFixture
-
-from chia.cmds.chia import cli
-from chia.cmds.start_funcs import create_start_daemon_connection
-
-
-@pytest.mark.anyio
-@pytest.mark.parametrize("skip_keyring", [False, True])
-@pytest.mark.parametrize("unlock_keyring", [False, True])
-async def test_daemon(
-    skip_keyring: bool, unlock_keyring: bool, mocker: MockerFixture, capsys: CaptureFixture[str]
-) -> None:
-    class DummyConnection:
-        @staticmethod
-        async def is_keyring_locked() -> bool:
-            return unlock_keyring
-
-        @staticmethod
-        async def unlock_keyring(_passphrase: str) -> bool:
-            return True
-
-    async def connect_to_daemon_and_validate(_root_path: Path, _config: Dict[str, Any]) -> DummyConnection:
-        return DummyConnection()
-
-    class DummyKeychain:
-        @staticmethod
-        def get_cached_master_passphrase() -> Optional[str]:
-            return None
-
-    def get_current_passphrase() -> Optional[str]:
-        return "a-passphrase"
-
-    mocker.patch("chia.cmds.start_funcs.connect_to_daemon_and_validate", side_effect=connect_to_daemon_and_validate)
-    mocker.patch("chia.cmds.start_funcs.Keychain", new=DummyKeychain)
-    mocker.patch("chia.cmds.start_funcs.get_current_passphrase", side_effect=get_current_passphrase)
-
-    daemon = await create_start_daemon_connection(Path("/path-not-exist"), {}, skip_keyring=skip_keyring)
-    assert daemon is not None
-    captured = capsys.readouterr()
-    assert captured.err == ""
-    if skip_keyring:
-        assert captured.out.endswith("Skipping to unlock keyring\n")
-    else:
-        assert not captured.out.endswith("Skipping to unlock keyring\n")
-
-
-def test_start_daemon(tmp_path: Path, empty_keyring: Any, mocker: MockerFixture) -> None:
-    class DummyDaemon:
-        @staticmethod
-        async def close() -> None:
-            return None
-
-    async def create_start_daemon_connection_dummy(
-        root_path: Path, config: Dict[str, Any], *, skip_keyring: bool
-    ) -> DummyDaemon:
-        return DummyDaemon()
-
-    mocker.patch(
-        "chia.cmds.start_funcs.create_start_daemon_connection", side_effect=create_start_daemon_connection_dummy
-    )
-
-    runner = CliRunner()
-    result = runner.invoke(
-        cli,
-        ["--root-path", str(tmp_path), "init"],
-    )
-    assert result.exit_code == 0
-    result = runner.invoke(cli, ["--root-path", str(tmp_path), "start", "daemon", "-s"])
-    assert result.exit_code == 0

chia_blockchain-2.3.0/chia/_tests/core/util/config.py

@@ -1,4 +0,0 @@
-from __future__ import annotations
-
-checkout_blocks_and_plots = True
-parallel = False