Merge remote-tracking branch 'origin/main' into quex.deprecate_payment

Chia-Network · Jan 21, 2025 · 80eb252 · 80eb252
2 parents 98f916f + 8bb8a1b
commit 80eb252
Show file tree

Hide file tree

Showing 211 changed files with 2,883 additions and 7,298 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -57,13 +57,6 @@ repos:
       - id: check-merge-conflict
       - id: check-ast
       - id: debug-statements
-  - repo: local
-    hooks:
-      - id: clvm_hex
-        name: .clsp.hex files
-        entry: ./activated.py python tools/manage_clvm.py check
-        language: system
-        pass_filenames: false
   - repo: local
     hooks:
       - id: chialispp

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -726,7 +726,7 @@ macOS 11 (Big Sur) is deprecated. This release (2.4.0) will be the last release
 - Only subscribe to inner wallet puzzle hashes
 - Rpc: Fix and test `WalletRpcApi.get_coin_records_by_names`
 - Full_node: `uint32.MAXIMUM_EXCLUSIVE` -> `uint32.MAXIMUM`
-- Full_node: Don't send duplicates in `register_interest_in_puzzle_hash`
+- Full_node: Don't send duplicates in `register_for_ph_updates`
 - Wallet: Deduplicate coin states from peers
 - Build: include `puzzles` packages (#15508)
 - Handle VC syncing exceptions better

diff --git a/chia/_tests/blockchain/blockchain_test_utils.py b/chia/_tests/blockchain/blockchain_test_utils.py
@@ -77,7 +77,7 @@ async def _validate_and_add_block(
             conds = None
         else:
             # fake the signature validation. Just say True here.
-            conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True)
+            conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0)
         results = PreValidationResult(None, uint64(1), conds, uint32(0))
     else:
         future = await pre_validate_block(

diff --git a/chia/_tests/clvm/test_chialisp_deserialization.py b/chia/_tests/clvm/test_chialisp_deserialization.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import pytest
+from chia_puzzles_py.programs import CHIALISP_DESERIALISATION
 
 from chia.types.blockchain_format.program import INFINITE_COST, Program
 from chia.util.byte_types import hexstr_to_bytes
-from chia.wallet.puzzles.load_clvm import load_clvm
 
-DESERIALIZE_MOD = load_clvm("chialisp_deserialisation.clsp", package_or_requirement="chia.consensus.puzzles")
+DESERIALIZE_MOD = Program.from_bytes(CHIALISP_DESERIALISATION)
 
 
 def serialized_atom_overflow(size):

diff --git a/chia/_tests/clvm/test_condition_codes.py b/chia/_tests/clvm/test_condition_codes.py