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

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/.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.0rc1}/.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.0rc1}/.github/workflows/test-single.yml

@@ -32,10 +32,6 @@ on:
       runs-on:
         required: true
         type: string
-      collect-junit:
-        required: false
-        type: boolean
-        default: true
 
 concurrency:
   # SHA is added to the end if on `main` to let all main workflows run
@@ -233,7 +229,6 @@ jobs:
           mv notchia/ chia/
 
       - name: Publish JUnit results
-        if: inputs.collect-junit
         uses: actions/upload-artifact@v4
         with:
           name: junit-data-${{ env.JOB_FILE_NAME }}

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

@@ -60,8 +60,7 @@ jobs:
       concurrency_name: macos
       configuration: ${{ needs.configure.outputs.configuration }}
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
-      runs-on: macos-12
-      collect-junit: false
+      runs-on: macos-latest
   ubuntu:
     uses: ./.github/workflows/test-single.yml
     needs: configure
@@ -74,7 +73,6 @@ jobs:
       configuration: ${{ needs.configure.outputs.configuration }}
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: ubuntu-latest
-      collect-junit: false
   windows:
     uses: ./.github/workflows/test-single.yml
     needs: configure
@@ -87,7 +85,6 @@ jobs:
       configuration: ${{ needs.configure.outputs.configuration }}
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: windows-latest
-      collect-junit: false
 
   coverage:
     name: ${{ matrix.os.emoji }} Coverage - ${{ matrix.python.name }}
@@ -122,7 +119,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download Results
-        if: false
         uses: actions/download-artifact@v4
         with:
           merge-multiple: true
@@ -130,7 +126,6 @@ jobs:
           path: junit-data
 
       - name: Format JUnit data and prepare results
-        if: false
         run: |
           sudo snap install yq
           ls junit-data/*.xml | xargs --max-procs=10 --replace={} yq eval '.testsuites.testsuite.testcase |= sort_by(.+@classname, .+@name)' --inplace {}
@@ -141,7 +136,6 @@ jobs:
           ls junit-results/*.xml | xargs --max-procs=10 --replace={} yq eval '.testsuites.testsuite |= sort_by(.+@name) | .testsuites.testsuite[].testcase |= sort_by(.+@classname, .+@name)' --inplace {}
 
       - name: Publish formatted JUnit data
-        if: false
         uses: actions/upload-artifact@v4
         with:
           name: junit-data
@@ -168,13 +162,13 @@ jobs:
       - uses: chia-network/actions/activate-venv@main
 
       - name: Add time out assert results to workflow summary
-        if: always() && false
+        if: always()
         run: |
           python -m chia._tests.process_junit --limit 50 --type time_out_assert --xml junit-results/junit.xml --markdown --link-prefix ${{ github.event.repository.html_url }}/blob/${{ github.sha }}/ --link-line-separator \#L >> "$GITHUB_STEP_SUMMARY"
           python -m chia._tests.process_junit            --type time_out_assert --xml junit-results/junit.xml --markdown --link-prefix ${{ github.event.repository.html_url }}/blob/${{ github.sha }}/ --link-line-separator \#L >> junit-results/time_out_assert.md
 
       - name: Publish JUnit results
-        if: always() && false
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: junit-results

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/.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.0rc1}/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.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chia-blockchain
-Version: 2.3.0
+Version: 2.3.0rc1
 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.0rc1}/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]
 
 
 @pytest.fixture(scope="function", params=SOFTFORK_HEIGHTS)

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/chia/_tests/core/data_layer/test_data_rpc.py

@@ -7,12 +7,10 @@ import enum
 import json
 import os
 import random
-import sqlite3
 import sys
 import time
 from copy import deepcopy
 from dataclasses import dataclass
-from enum import IntEnum
 from pathlib import Path
 from typing import Any, AsyncIterator, Dict, List, Optional, Tuple, cast
 
@@ -45,7 +43,6 @@ from chia.data_layer.data_layer_util import (
     leaf_hash,
 )
 from chia.data_layer.data_layer_wallet import DataLayerWallet, verify_offer
-from chia.data_layer.data_store import DataStore
 from chia.data_layer.download_data import get_delta_filename, get_full_tree_filename
 from chia.rpc.data_layer_rpc_api import DataLayerRpcApi
 from chia.rpc.data_layer_rpc_client import DataLayerRpcClient
@@ -3434,93 +3431,3 @@ async def test_unsubmitted_batch_update(
 
         with pytest.raises(Exception, match="Latest root is already confirmed"):
             res = await data_rpc_api.submit_pending_root({"id": store_id.hex()})
-
-
-@pytest.mark.limit_consensus_modes(reason="does not depend on consensus rules")
-@pytest.mark.anyio
-async def test_unsubmitted_batch_db_migration(
-    self_hostname: str,
-    one_wallet_and_one_simulator_services: SimulatorsAndWalletsServices,
-    tmp_path: Path,
-    bt: BlockTools,
-    monkeypatch: Any,
-) -> None:
-    with monkeypatch.context() as m:
-
-        class OldStatus(IntEnum):
-            PENDING = 1
-            COMMITTED = 2
-            PENDING_BATCH = 3
-
-        class ModifiedStatus(IntEnum):
-            PENDING = 1
-            COMMITTED = 2
-
-        m.setattr("chia.data_layer.data_layer_util.Status", ModifiedStatus)
-        m.setattr("chia.data_layer.data_store.Status", ModifiedStatus)
-        m.setattr("chia.data_layer.data_layer.Status", ModifiedStatus)
-
-        wallet_rpc_api, full_node_api, wallet_rpc_port, ph, bt = await init_wallet_and_node(
-            self_hostname, one_wallet_and_one_simulator_services
-        )
-
-        async with init_data_layer_service(
-            wallet_rpc_port=wallet_rpc_port, bt=bt, db_path=tmp_path
-        ) as data_layer_service:
-            assert data_layer_service.rpc_server is not None
-            data_layer = data_layer_service._api.data_layer
-            data_rpc_api = DataLayerRpcApi(data_layer)
-            res = await data_rpc_api.create_data_store({})
-            assert res is not None
-
-            store_id = bytes32(hexstr_to_bytes(res["id"]))
-            await farm_block_check_singleton(data_layer, full_node_api, ph, store_id, wallet=wallet_rpc_api.service)
-
-            m.setattr("chia.data_layer.data_layer_util.Status", OldStatus)
-            m.setattr("chia.data_layer.data_store.Status", OldStatus)
-            m.setattr("chia.data_layer.data_layer.Status", OldStatus)
-
-            key = b"0000"
-            value = b"0000"
-            changelist: List[Dict[str, str]] = [{"action": "insert", "key": key.hex(), "value": value.hex()}]
-            res = await data_rpc_api.batch_update({"id": store_id.hex(), "changelist": changelist})
-            update_tx_rec0 = res["tx_id"]
-            await farm_block_with_spend(full_node_api, ph, update_tx_rec0, wallet_rpc_api)
-            keys = await data_rpc_api.get_keys({"id": store_id.hex()})
-            assert keys == {"keys": ["0x30303030"]}
-
-            key = b"0001"
-            value = b"0001"
-            changelist = [{"action": "insert", "key": key.hex(), "value": value.hex()}]
-            with pytest.raises(sqlite3.IntegrityError, match="CHECK constraint failed: status == 1 OR status == 2"):
-                await data_rpc_api.batch_update(
-                    {"id": store_id.hex(), "changelist": changelist, "submit_on_chain": False}
-                )
-
-    async with init_data_layer_service(wallet_rpc_port=wallet_rpc_port, bt=bt, db_path=tmp_path) as data_layer_service:
-        assert data_layer_service.rpc_server is not None
-        data_layer = data_layer_service._api.data_layer
-        data_rpc_api = DataLayerRpcApi(data_layer)
-        # Test we don't migrate twice.
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK constraint failed: status == 1 OR status == 2"):
-            await data_rpc_api.batch_update({"id": store_id.hex(), "changelist": changelist, "submit_on_chain": False})
-
-    # Artificially remove the first migration.
-    async with DataStore.managed(database=tmp_path.joinpath("db.sqlite")) as data_store:
-        async with data_store.db_wrapper.writer() as writer:
-            await writer.execute("DELETE FROM schema")
-
-    async with init_data_layer_service(wallet_rpc_port=wallet_rpc_port, bt=bt, db_path=tmp_path) as data_layer_service:
-        assert data_layer_service.rpc_server is not None
-        data_layer = data_layer_service._api.data_layer
-        data_rpc_api = DataLayerRpcApi(data_layer)
-        res = await data_rpc_api.batch_update(
-            {"id": store_id.hex(), "changelist": changelist, "submit_on_chain": False}
-        )
-        assert res == {}
-
-        res = await data_rpc_api.submit_pending_root({"id": store_id.hex()})
-        update_tx_rec1 = res["tx_id"]
-        await farm_block_with_spend(full_node_api, ph, update_tx_rec1, wallet_rpc_api)
-        keys = await data_rpc_api.get_keys({"id": store_id.hex()})
-        assert keys == {"keys": ["0x30303031", "0x30303030"]}

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/chia/_tests/core/data_layer/test_data_store.py

@@ -1916,16 +1916,3 @@ async def test_insert_key_already_present(data_store: DataStore, tree_id: bytes3
     )
     with pytest.raises(Exception, match=f"Key already present: {key.hex()}"):
         await data_store.insert(key=key, value=value, tree_id=tree_id, reference_node_hash=None, side=None)
-
-
-@pytest.mark.anyio
-async def test_migration_unknown_version(data_store: DataStore) -> None:
-    async with data_store.db_wrapper.writer() as writer:
-        await writer.execute(
-            "INSERT INTO schema(version_id) VALUES(:version_id)",
-            {
-                "version_id": "unknown version",
-            },
-        )
-    with pytest.raises(Exception, match="Unknown version"):
-        await data_store.migrate_db()

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/chia/_tests/core/full_node/test_conditions.py

@@ -432,34 +432,3 @@ class TestConditions:
             )
         )
         await check_conditions(bt, conditions)
-
-    @pytest.mark.anyio
-    @pytest.mark.parametrize(
-        "conds, expected",
-        [
-            ('(66 0x3f "foobar" {coin}) (67 0x3f "foobar" {coin})', None),
-            ('(66 0x3f "foobar" {coin}) (67 0x3f "foo" {coin})', Err.MESSAGE_NOT_SENT_OR_RECEIVED),
-            ('(66 0x39 "foo" {coin})', Err.COIN_AMOUNT_EXCEEDS_MAXIMUM),
-            ('(67 0x0f "foo" {coin})', Err.COIN_AMOUNT_EXCEEDS_MAXIMUM),
-            ('(66 0x3f "foo" {coin}) (67 0x27 "foo" {coin})', Err.MESSAGE_NOT_SENT_OR_RECEIVED),
-            ('(66 0x27 "foo" {coin}) (67 0x3f "foo" {coin})', Err.MESSAGE_NOT_SENT_OR_RECEIVED),
-            ('(66 0 "foo") (67 0 "foo")', None),
-            ('(66 0 "foobar") (67 0 "foo")', Err.MESSAGE_NOT_SENT_OR_RECEIVED),
-            ('(66 0x09 "foo" 1750000000000) (67 0x09 "foo" 1750000000000)', None),
-            ('(66 -1 "foo")', Err.INVALID_MESSAGE_MODE),
-            ('(67 -1 "foo")', Err.INVALID_MESSAGE_MODE),
-            ('(66 0x40 "foo")', Err.INVALID_MESSAGE_MODE),
-            ('(67 0x40 "foo")', Err.INVALID_MESSAGE_MODE),
-        ],
-    )
-    async def test_message_conditions(
-        self, bt: BlockTools, consensus_mode: ConsensusMode, conds: str, expected: Optional[Err]
-    ) -> None:
-        blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
-        conditions = Program.to(assemble("(" + conds.format(coin="0x" + coin.name().hex()) + ")"))
-        # before the softfork has activated, it's all allowed
-        if consensus_mode.value < ConsensusMode.SOFT_FORK_4.value:
-            expected = None
-
-        await check_conditions(bt, conditions, expected_err=expected)

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/chia/_tests/core/full_node/test_full_node.py

@@ -961,9 +961,7 @@ class TestFullNodeProtocol:
         new_transaction = fnp.NewTransaction(bytes32.random(seeded_random), uint64(10000000), uint64(1))
         await full_node_1.new_transaction(new_transaction, fake_peer)
         assert full_node_1.full_node.mempool_manager.mempool.at_full_capacity(10000000 * group_size)
-        await time_out_assert(
-            30, full_node_2.full_node.mempool_manager.mempool.at_full_capacity, True, 10000000 * group_size
-        )
+        assert full_node_2.full_node.mempool_manager.mempool.at_full_capacity(10000000 * group_size)
 
         await time_out_assert(10, new_transaction_not_requested, True, incoming_queue, new_transaction)
 

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/chia/_tests/core/mempool/test_mempool.py

@@ -2370,28 +2370,6 @@ class TestGeneratorConditions:
 
         assert npc_result.error == expect_error
 
-    @pytest.mark.parametrize("mempool", [True, False])
-    @pytest.mark.parametrize(
-        "condition, expect_error",
-        [
-            ('(66 0 "foo") (67 0 "bar")', Err.MESSAGE_NOT_SENT_OR_RECEIVED.value),
-            ('(66 0 "foo") (67 0 "foo")', None),
-        ],
-    )
-    def test_message_condition(
-        self, mempool: bool, condition: str, expect_error: Optional[int], softfork_height: uint32
-    ):
-        npc_result = generator_condition_tester(condition, mempool_mode=mempool, height=softfork_height)
-        print(npc_result)
-
-        # the message conditions are only activated with soft fork 4, so
-        # before then there are no errors.
-        # In mempool mode, the message conditions activated immediately.
-        if softfork_height < test_constants.SOFT_FORK4_HEIGHT and not mempool:
-            expect_error = None
-
-        assert npc_result.error == expect_error
-
 
 # the tests below are malicious generator programs
 

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/chia/_tests/util/test_async_pool.py

@@ -93,7 +93,7 @@ async def test_does_not_exceed_expected_concurrency(count: int) -> None:
 async def test_worker_id_counts() -> None:
     expected_results = [0, 1, 2, 3, 4, 5]
 
-    result_queue: asyncio.Queue[int] = asyncio.Queue()
+    result_queue = asyncio.Queue[int]()
 
     async def worker(
         worker_id: int,
@@ -128,8 +128,8 @@ async def test_worker_exception_logged(caplog: pytest.LogCaptureFixture) -> None
         def __init__(self) -> None:
             super().__init__(expected_message)
 
-    work_queue: asyncio.Queue[Optional[Exception]] = asyncio.Queue()
-    result_queue: asyncio.Queue[None] = asyncio.Queue()
+    work_queue = asyncio.Queue[Optional[Exception]]()
+    result_queue = asyncio.Queue[None]()
 
     async def worker(
         worker_id: int,
@@ -175,8 +175,8 @@ async def test_simple_queue_example() -> None:
     inputs = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     expected_results = [1, 4, 9, 16, 25, 36, 49, 64, 81, 100]
 
-    work_queue: asyncio.Queue[int] = asyncio.Queue()
-    result_queue: asyncio.Queue[int] = asyncio.Queue()
+    work_queue = asyncio.Queue[int]()
+    result_queue = asyncio.Queue[int]()
 
     async def worker(
         worker_id: int,
@@ -208,8 +208,8 @@ async def test_simple_queue_example_using_queued() -> None:
     inputs = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     expected_results = [1, 4, 9, 16, 25, 36, 49, 64, 81, 100]
 
-    work_queue: asyncio.Queue[Job[int]] = asyncio.Queue()
-    result_queue: asyncio.Queue[int] = asyncio.Queue()
+    work_queue = asyncio.Queue[Job[int]]()
+    result_queue = asyncio.Queue[int]()
 
     async def worker(
         worker_id: int,
@@ -243,8 +243,8 @@ async def test_queued_pre_cancel() -> None:
     inputs = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     expected_results = [1, 4, 9, 25, 36, 64, 81, 100]
 
-    work_queue: asyncio.Queue[Job[int]] = asyncio.Queue()
-    result_queue: asyncio.Queue[int] = asyncio.Queue()
+    work_queue = asyncio.Queue[Job[int]]()
+    result_queue = asyncio.Queue[int]()
 
     async def worker(
         worker_id: int,
@@ -281,8 +281,8 @@ async def test_queued_active_cancel() -> None:
     inputs = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     expected_results = [1, 4, 9, 25, 36, 64, 81, 100]
 
-    work_queue: asyncio.Queue[Job[int]] = asyncio.Queue()
-    result_queue: asyncio.Queue[int] = asyncio.Queue()
+    work_queue = asyncio.Queue[Job[int]]()
+    result_queue = asyncio.Queue[int]()
 
     async def worker(
         worker_id: int,
@@ -323,8 +323,8 @@ async def test_queued_raises() -> None:
     inputs = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     expected_results = [1, 4, 9, 25, 36, 64, 81, 100]
 
-    work_queue: asyncio.Queue[Job[int]] = asyncio.Queue()
-    result_queue: asyncio.Queue[int] = asyncio.Queue()
+    work_queue = asyncio.Queue[Job[int]]()
+    result_queue = asyncio.Queue[int]()
 
     async def worker(
         worker_id: int,

{chia_blockchain-2.3.0 → chia-blockchain-2.3.0rc1}/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.0rc1/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.0rc1}/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.0rc1}/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.0rc1}/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.0rc1}/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.0rc1}/chia/data_layer/data_layer.py

@@ -200,7 +200,6 @@ class DataLayer:
         async with DataStore.managed(database=self.db_path, sql_log_path=sql_log_path) as self._data_store:
             self._wallet_rpc = await self.wallet_rpc_init
 
-            await self._data_store.migrate_db()
             self.periodically_manage_data_task = asyncio.create_task(self.periodically_manage_data())
             try:
                 yield
@@ -818,7 +817,7 @@ class DataLayer:
                             f"Can't subscribe to locally stored {local_id}: {type(e)} {e} {traceback.format_exc()}"
                         )
 
-            work_queue: asyncio.Queue[Job[Subscription]] = asyncio.Queue()
+            work_queue = asyncio.Queue[Job[Subscription]]()
             async with QueuedAsyncPool.managed(
                 name="DataLayer subscription update pool",
                 worker_async_callable=self.update_subscription,