Merge branch 'main' into import_check_time_locks

Author: matt-o-how

.github/dependabot.yml

@@ -8,6 +8,8 @@ updates:
     schedule:
       interval: "weekly"
       day: "tuesday"
+    cooldown:
+      default-days: 7
     open-pull-requests-limit: 10
     rebase-strategy: auto
     labels:
@@ -25,6 +27,8 @@ updates:
     schedule:
       interval: "weekly"
       day: "tuesday"
+    cooldown:
+      default-days: 7
     open-pull-requests-limit: 30
     rebase-strategy: auto
     labels:
@@ -38,6 +42,8 @@ updates:
     schedule:
       interval: "weekly"
       day: "tuesday"
+    cooldown:
+      default-days: 7
     open-pull-requests-limit: 10
     rebase-strategy: auto
     labels:
@@ -51,6 +57,8 @@ updates:
     schedule:
       interval: "weekly"
       day: "tuesday"
+    cooldown:
+      default-days: 7
     open-pull-requests-limit: 10
     rebase-strategy: auto
     labels:
@@ -64,6 +72,8 @@ updates:
     schedule:
       interval: "weekly"
       day: "tuesday"
+    cooldown:
+      default-days: 7
     open-pull-requests-limit: 10
     rebase-strategy: auto
     labels:
@@ -76,5 +86,7 @@ updates:
     schedule:
       interval: "weekly"
       day: "tuesday"
+    cooldown:
+      default-days: 7
     open-pull-requests-limit: 10
     rebase-strategy: auto

.github/workflows/check-commit-signing.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/dependency-review.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v4

chia/_tests/cmds/wallet/test_wallet.py

@@ -42,6 +42,7 @@
 from chia.wallet.wallet_coin_store import GetCoinRecords
 from chia.wallet.wallet_request_types import (
     BalanceResponse,
+    CancelOffer,
     CancelOfferResponse,
     CATAssetIDToName,
     CATAssetIDToNameResponse,
@@ -1180,14 +1181,14 @@ async def get_offer(self, request: GetOffer) -> GetOfferResponse:
 
         async def cancel_offer(
             self,
-            trade_id: bytes32,
+            request: CancelOffer,
             tx_config: TXConfig,
-            fee: uint64 = uint64(0),
-            secure: bool = True,
-            push: bool = True,
+            extra_conditions: tuple[Condition, ...] = tuple(),
             timelock_info: ConditionValidTimes = ConditionValidTimes(),
         ) -> CancelOfferResponse:
-            self.add_to_log("cancel_offer", (trade_id, tx_config, fee, secure, push, timelock_info))
+            self.add_to_log(
+                "cancel_offer", (request.trade_id, tx_config, request.fee, request.secure, request.push, timelock_info)
+            )
             return CancelOfferResponse([STD_UTX], [STD_TX])
 
     inst_rpc_client = CancelOfferRpcClient()

chia/_tests/core/custom_types/test_proof_of_space.py

@@ -128,7 +128,7 @@ def b32(key: str) -> bytes32:
     ),
     ProofOfSpaceCase(
         id="Not passing the plot filter v2",
-        pos_challenge=b32("5706ae15c4a437399f464c64ef4f33c362d860ccd2945b76b3ebdb0505783817"),
+        pos_challenge=b32("4cfaacbd2782db64d07cf490ca938534adb07dfbd2f92b0e479e2e5b196178db"),
         plot_size=PlotParam.make_v2(32),
         pool_contract_puzzle_hash=bytes32(b"1" * 32),
         plot_public_key=g1(
@@ -180,7 +180,7 @@ def test_verify_and_get_quality_string(caplog: pytest.LogCaptureFixture, case: P
     ProofOfSpaceCase(
         id="not passing the plot filter v2",
         plot_size=PlotParam.make_v2(2),
-        pos_challenge=b32("fb1d676f0e3ce173f4e6cfb06d7059886cbc3b91cf65be0af0fc2fbe569c6597"),
+        pos_challenge=b32("aefba5c94bc9bbfe2c538b7faaaf03384ac5a6170e40b024657df6b0a27c34a7"),
         plot_public_key=g1(
             "afa3aaf09c03885154be49216ee7fb2e4581b9c4a4d7e9cc402e27280bf0cfdbdf1b9ba674e301fd1d1450234b3b1868"
         ),
@@ -291,10 +291,10 @@ def test_calculate_prefix_bits_v1(height: uint32, expected: int) -> None:
     argvalues=[
         (0, 5),
         (0xFFFFFFFA, 5),
-        (0xFFFFFFFB, 6),
-        (0xFFFFFFFC, 7),
-        (0xFFFFFFFD, 8),
-        (0xFFFFFFFF, 8),
+        (0xFFFFFFFB, 4),
+        (0xFFFFFFFC, 3),
+        (0xFFFFFFFD, 2),
+        (0xFFFFFFFF, 2),
     ],
 )
 def test_calculate_prefix_bits_v2(height: uint32, expected: int) -> None:

chia/_tests/core/data_layer/test_data_rpc.py

@@ -777,6 +777,7 @@ async def test_get_owned_stores(
             assert res is not None
             launcher_id = bytes32.from_hexstr(res["id"])
             expected_store_ids.append(launcher_id)
+            await full_node_api.wait_for_wallet_synced(wallet_node)
 
         await time_out_assert(4, check_mempool_spend_count, True, full_node_api, 3)
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))

chia/_tests/core/full_node/test_conditions.py

@@ -15,6 +15,7 @@
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
 from chia._tests.conftest import ConsensusMode
 from chia._tests.core.full_node.ram_db import create_ram_blockchain
+from chia._tests.core.full_node.test_full_node import find_reward_coin
 from chia.consensus.condition_tools import agg_sig_additional_data
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.keyring import TempKeyring
@@ -46,7 +47,6 @@ async def initial_blocks(bt: BlockTools, block_count: int = 4) -> list[FullBlock
         block_count,
         guarantee_transaction_block=True,
         farmer_reward_puzzle_hash=EASY_PUZZLE_HASH,
-        pool_reward_puzzle_hash=EASY_PUZZLE_HASH,
         genesis_timestamp=uint64(10000),
         time_per_block=10,
     )
@@ -100,7 +100,7 @@ async def check_conditions(
     aggsig: G2Element = G2Element(),
 ) -> tuple[list[CoinRecord], list[CoinRecord], FullBlock]:
     blocks = await initial_blocks(bt)
-    coin = blocks[spend_reward_index].get_included_reward_coins()[0]
+    coin = find_reward_coin(blocks[spend_reward_index], EASY_PUZZLE_HASH)
 
     coin_spend = make_spend(coin, EASY_PUZZLE, condition_solution)
     spend_bundle = SpendBundle([coin_spend], aggsig)
@@ -142,9 +142,9 @@ async def test_unknown_conditions_with_cost(
         # once the hard fork activates, blocks no longer pay the cost of the ROM
         # generator (which includes hashing all puzzles).
         if consensus_mode >= ConsensusMode.HARD_FORK_2_0:
-            block_base_cost = 756064
+            block_base_cost = 756064 - 12000
         else:
-            block_base_cost = 761056
+            block_base_cost = 761056 - 12000
         assert new_block.transactions_info is not None
         assert new_block.transactions_info.cost - block_base_cost == expected_cost
 
@@ -163,11 +163,11 @@ async def test_softfork_condition(
         _additions, _removals, new_block = await check_conditions(bt, conditions)
 
         if consensus_mode < ConsensusMode.HARD_FORK_2_0:
-            block_base_cost = 737056
+            block_base_cost = 737056 - 12000
         else:
             # once the hard fork activates, blocks no longer pay the cost of the ROM
             # generator (which includes hashing all puzzles).
-            block_base_cost = 732064
+            block_base_cost = 732064 - 12000
 
         # the block_base_cost includes the cost of the bytes for the condition
         # with 2 bytes argument. This test works as long as the conditions it's
@@ -266,7 +266,7 @@ async def test_condition(self, opcode: ConditionOpcode, value: int, expected: Er
     @pytest.mark.anyio
     async def test_invalid_my_id(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         wrong_name = bytearray(coin.name())
         wrong_name[-1] ^= 1
         conditions = Program.to(assemble(f"(({ConditionOpcode.ASSERT_MY_COIN_ID[0]} 0x{wrong_name.hex()}))"))
@@ -275,14 +275,14 @@ async def test_invalid_my_id(self, bt: BlockTools) -> None:
     @pytest.mark.anyio
     async def test_valid_my_id(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(assemble(f"(({ConditionOpcode.ASSERT_MY_COIN_ID[0]} 0x{coin.name().hex()}))"))
         await check_conditions(bt, conditions)
 
     @pytest.mark.anyio
     async def test_invalid_coin_announcement(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         announce = AssertCoinAnnouncement(asserted_id=coin.name(), asserted_msg=b"test_bad")
         conditions = Program.to(
             assemble(
@@ -295,7 +295,7 @@ async def test_invalid_coin_announcement(self, bt: BlockTools) -> None:
     @pytest.mark.anyio
     async def test_valid_coin_announcement(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         announce = AssertCoinAnnouncement(asserted_id=coin.name(), asserted_msg=b"test")
         conditions = Program.to(
             assemble(
@@ -373,7 +373,7 @@ async def test_announce_conditions_limit(
         """
 
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         coin_announcement = AssertCoinAnnouncement(asserted_id=coin.name(), asserted_msg=b"test")
         puzzle_announcement = AssertPuzzleAnnouncement(asserted_ph=EASY_PUZZLE_HASH, asserted_msg=b"test")
 
@@ -403,7 +403,7 @@ async def test_announce_conditions_limit(
     @pytest.mark.anyio
     async def test_coin_messages(self, bt: BlockTools, consensus_mode: ConsensusMode) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(
             assemble(
                 f"(({ConditionOpcode.SEND_MESSAGE[0]} 0x3f 'test' 0x{coin.name().hex()})"
@@ -415,7 +415,7 @@ async def test_coin_messages(self, bt: BlockTools, consensus_mode: ConsensusMode
     @pytest.mark.anyio
     async def test_parent_messages(self, bt: BlockTools, consensus_mode: ConsensusMode) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(
             assemble(
                 f"(({ConditionOpcode.SEND_MESSAGE[0]} 0x24 'test' 0x{coin.parent_coin_info})"
@@ -436,7 +436,7 @@ async def test_parent_messages(self, bt: BlockTools, consensus_mode: ConsensusMo
             ('(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 0x09 "foo" 250000000000) (67 0x09 "foo" 250000000000)', None),
             ('(66 -1 "foo")', Err.INVALID_MESSAGE_MODE),
             ('(67 -1 "foo")', Err.INVALID_MESSAGE_MODE),
             ('(66 0x40 "foo")', Err.INVALID_MESSAGE_MODE),
@@ -447,7 +447,7 @@ async def test_message_conditions(
         self, bt: BlockTools, consensus_mode: ConsensusMode, conds: str, expected: Err | None
     ) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(assemble("(" + conds.format(coin="0x" + coin.name().hex()) + ")"))
 
         await check_conditions(bt, conditions, expected_err=expected)
@@ -520,7 +520,7 @@ async def test_agg_sig_illegal_suffix(
 
         sk = AugSchemeMPL.key_gen(b"8" * 32)
         pubkey = sk.get_g1()
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         for msg in [
             c.AGG_SIG_ME_ADDITIONAL_DATA,
             c.AGG_SIG_PARENT_ADDITIONAL_DATA,

chia/_tests/core/full_node/test_tx_processing_queue.py

@@ -30,7 +30,7 @@ async def test_local_txs(seeded_random: random.Random) -> None:
     transaction_queue = TransactionQueue(1000, log)
     # test 1 tx
     first_tx = get_transaction_queue_entry(None, 0)
-    await transaction_queue.put(first_tx, None)
+    transaction_queue.put(first_tx, None)
 
     result1 = await transaction_queue.pop()
 
@@ -40,7 +40,7 @@ async def test_local_txs(seeded_random: random.Random) -> None:
     num_txs = 2000
     list_txs = [get_transaction_queue_entry(bytes32.random(seeded_random), i) for i in range(num_txs)]
     for tx in list_txs:
-        await transaction_queue.put(tx, None)
+        transaction_queue.put(tx, None)
 
     resulting_txs = []
     for _ in range(num_txs):
@@ -58,12 +58,12 @@ async def test_one_peer_and_await(seeded_random: random.Random) -> None:
 
     list_txs = [get_transaction_queue_entry(peer_id, i) for i in range(num_txs)]
     for tx in list_txs:
-        await transaction_queue.put(tx, peer_id)
+        transaction_queue.put(tx, peer_id)
 
     # test transaction priority
     local_txs = [get_transaction_queue_entry(None, i) for i in range(int(num_txs / 5))]  # 20 txs
     for tx in local_txs:
-        await transaction_queue.put(tx, None)
+        transaction_queue.put(tx, None)
 
     resulting_txs = []
     for _ in range(num_txs + len(local_txs)):
@@ -80,7 +80,7 @@ async def test_one_peer_and_await(seeded_random: random.Random) -> None:
     with pytest.raises(asyncio.InvalidStateError):  # task is not done, so we expect an error when getting result
         task.result()
     # add a tx to test task completion
-    await transaction_queue.put(get_transaction_queue_entry(None, 0), None)
+    transaction_queue.put(get_transaction_queue_entry(None, 0), None)
     await asyncio.wait_for(task, 1)  # we should never time out here
 
 
@@ -95,7 +95,7 @@ async def test_lots_of_peers(seeded_random: random.Random) -> None:
     # 100 txs per peer
     list_txs = [get_transaction_queue_entry(peer_id, i) for peer_id in peer_ids for i in range(num_txs)]
     for tx in list_txs:
-        await transaction_queue.put(tx, tx.peer_id)  # type: ignore[attr-defined]
+        transaction_queue.put(tx, tx.peer_id)  # type: ignore[attr-defined]
 
     resulting_txs = []
     for _ in range(total_txs):
@@ -117,11 +117,11 @@ async def test_full_queue(seeded_random: random.Random) -> None:
     # 999 txs per peer then 1 to fail later
     list_txs = [get_transaction_queue_entry(peer_id, i) for peer_id in peer_ids for i in range(num_txs)]
     for tx in list_txs:
-        await transaction_queue.put(tx, tx.peer_id)  # type: ignore[attr-defined]
+        transaction_queue.put(tx, tx.peer_id)  # type: ignore[attr-defined]
 
     # test failure case.
     with pytest.raises(TransactionQueueFull):
-        await transaction_queue.put(get_transaction_queue_entry(peer_ids[0], 1001), peer_ids[0])
+        transaction_queue.put(get_transaction_queue_entry(peer_ids[0], 1001), peer_ids[0])
 
     resulting_txs = []
     for _ in range(total_txs):
@@ -142,7 +142,7 @@ async def test_queue_cleanup_and_fairness(seeded_random: random.Random) -> None:
 
     list_txs = peer_tx_a + peer_tx_b + peer_tx_c
     for tx in list_txs:
-        await transaction_queue.put(tx, tx.peer_id)  # type: ignore[attr-defined]
+        transaction_queue.put(tx, tx.peer_id)  # type: ignore[attr-defined]
 
     resulting_ids = []
     for _ in range(3):  # we validate we get one transaction per peer