Merge commit 'da20e4145fb6279d6880fd998b62456237e2f700' into catchup/long_lived_datalayer_merkle_blob_from_main_da20e4145fb6279d6880fd998b62456237e2f700

Author: altendky

.github/workflows/conflict-check.yml

@@ -22,5 +22,3 @@ jobs:
           # targeting 2 minutes of retry, longest observed window thus far is ~30 seconds
           retryIntervalSec: 5
           retryMax: 24
-          commentToAddOnConflict: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
-          commentToAddOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."

.pre-commit-config.yaml

@@ -28,6 +28,14 @@ repos:
         entry: ./activated.py ruff check --fix
         language: system
         types: [python]
+  - repo: local
+    hooks:
+      - id: tach
+        name: tach
+        entry: ./activated.py tach check
+        language: system
+        types: [python]
+        pass_filenames: false
   - repo: local
     hooks:
       - id: poetry
@@ -56,7 +64,6 @@ repos:
       - id: trailing-whitespace
       - id: check-merge-conflict
       - id: check-ast
-      - id: debug-statements
   - repo: local
     hooks:
       - id: chialispp

CHANGELOG.md

@@ -6,6 +6,28 @@ 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.5.4 Chia blockchain 2025-05-28
+
+## What's Changed
+
+### Added
+
+- Enabled Keccak support in the wallet
+- Improved logging and timing around block validation
+- Improved logging of block creation
+
+### Changed
+
+- Mempool: Optimized removal checking
+- Mempool: Optimized and hardened dedup logic
+- Mempool: Reject transactions that take too long to validate (2 seconds)
+
+### Fixed
+
+- Tighten chia_rs version to `>=0.21, <0.22` (Fixes #19613)
+- Fixed timelord peak selection to match the full node
+- Used monotonic clock for timing functions in harvester (Fixes "does not fit into uint" log errors)
+
 ## 2.5.3 Chia blockchain 2025-03-25
 
 ## What's Changed

benchmarks/block_ref.py

@@ -16,6 +16,7 @@
 from chia.consensus.blockchain import Blockchain
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.get_block_generator import get_block_generator
+from chia.full_node.block_height_map import BlockHeightMap
 from chia.full_node.block_store import BlockStore
 from chia.full_node.coin_store import CoinStore
 from chia.types.blockchain_format.serialized_program import SerializedProgram
@@ -68,7 +69,8 @@ async def main(db_path: Path) -> None:
         start_time = monotonic()
         # make configurable
         reserved_cores = 4
-        blockchain = await Blockchain.create(coin_store, block_store, DEFAULT_CONSTANTS, db_path.parent, reserved_cores)
+        height_map = await BlockHeightMap.create(db_path.parent, db_wrapper)
+        blockchain = await Blockchain.create(coin_store, block_store, height_map, DEFAULT_CONSTANTS, reserved_cores)
 
         peak = blockchain.get_peak()
         assert peak is not None

benchmarks/coin_store.py

@@ -144,12 +144,13 @@ async def run_new_block_benchmark(version: int) -> None:
 
             # add one new coins
             c = make_coin()
+            coin_id = c.name()
             additions.append(c)
             total_add += 1
 
             farmer_coin, pool_coin = rewards(uint32(height))
-            all_coins += [c.name()]
-            all_unspent += [c.name()]
+            all_coins += [coin_id]
+            all_unspent += [coin_id]
             all_unspent += [pool_coin.name(), farmer_coin.name()]
             total_add += 2
 

benchmarks/utils.py

@@ -64,7 +64,7 @@ def get_commit_hash() -> str:
         sys.exit("Failed to get the commit hash")
     try:
         if len(subprocess.run(["git", "status", "-s"], check=True, stdout=subprocess.PIPE).stdout) > 0:
-            raise Exception()
+            raise Exception
     except Exception:
         commit_hash += "-dirty"
     return commit_hash

build_scripts/npm_windows/package-lock.json

@@ -10,9 +10,9 @@
 from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
+from chia.consensus.check_time_locks import check_time_locks
 from chia.consensus.cost_calculator import NPCResult
 from chia.full_node.bundle_tools import simple_solution_generator
-from chia.full_node.mempool_check_conditions import mempool_check_time_locks
 from chia.types.blockchain_format.coin import Coin
 from chia.types.coin_record import CoinRecord
 from chia.util.errors import Err
@@ -83,7 +83,7 @@ def validate_spend_bundle(self, spend_bundle: SpendBundle, now: CoinTimestamp, m
                     uint64(now.seconds),
                 )
 
-        err = mempool_check_time_locks(
+        err = check_time_locks(
             ephemeral_db,
             result.conds,
             # TODO: this is technically not right, it's supposed to be the

chia/_tests/clvm/coin_store.py

@@ -14,7 +14,7 @@
 @pytest.mark.anyio
 async def test_farming():
     async with sim_and_client(pass_prefarm=False) as (sim, _):
-        for i in range(0, 5):
+        for i in range(5):
             await sim.farm_block()
 
         assert len(sim.blocks) == 5
@@ -25,7 +25,7 @@ async def test_farming():
 @pytest.mark.anyio
 async def test_rewind():
     async with sim_and_client() as (sim, _):
-        for i in range(0, 5):
+        for i in range(5):
             await sim.farm_block()
 
         save_height = sim.get_height()
@@ -39,11 +39,11 @@ async def test_rewind():
 @pytest.mark.anyio
 async def test_all_endpoints():
     async with sim_and_client() as (sim, sim_client):
-        for i in range(0, 5):
+        for i in range(5):
             await sim.farm_block()
         await sim.farm_block(bytes32.zeros)
         await sim.farm_block(bytes32([1] * 32))
-        for i in range(0, 5):
+        for i in range(5):
             await sim.farm_block()
 
         # get_coin_records_by_hint

chia/_tests/clvm/test_spend_sim.py

@@ -17,12 +17,10 @@
 from chia.cmds.chia import cli as chia_cli
 from chia.cmds.cmds_util import _T_RpcClient, node_config_section_names
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
-from chia.rpc.data_layer_rpc_client import DataLayerRpcClient
-from chia.rpc.farmer_rpc_client import FarmerRpcClient
-from chia.rpc.full_node_rpc_client import FullNodeRpcClient
+from chia.data_layer.data_layer_rpc_client import DataLayerRpcClient
+from chia.farmer.farmer_rpc_client import FarmerRpcClient
+from chia.full_node.full_node_rpc_client import FullNodeRpcClient
 from chia.rpc.rpc_client import RpcClient
-from chia.rpc.wallet_request_types import GetSyncStatusResponse, SendTransactionMultiResponse
-from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient
 from chia.types.coin_record import CoinRecord
 from chia.types.signing_mode import SigningMode
@@ -35,6 +33,8 @@
 from chia.wallet.util.transaction_type import TransactionType
 from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig
 from chia.wallet.util.wallet_types import WalletType
+from chia.wallet.wallet_request_types import GetSyncStatusResponse, SendTransactionMultiResponse
+from chia.wallet.wallet_rpc_client import WalletRpcClient
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
 # Any functions that are the same for every command being tested should be below.