chia-blockchain 1.8.0rc4__tar.gz → 1.8.1__tar.gz

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/CHANGELOG.md

@@ -6,6 +6,72 @@ 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.
 
+## 1.8.1 Chia blockchain 2023-05-17
+
+### Changed
+- Updated testnet softfork height so softfork rules take effect on testnet immediately
+- Move to Discord in docs and install scripts (#15193)
+- Optimize compact proofs
+
+### Fixed
+- Issue where CLI only listed first 50 NFTs by hardcoding `num` param when listing NFTs from CLI
+- Issue where wallet might display `RuntimeError: dictionary changed size during iteration` by avoiding dict changes while iterating in `handle_nft`
+- Issue where node had trouble keeping peers with `assert self.peak is not None` error by not adding transactions to the mempool before it has a valid peak (fixes #15217)
+
+## 1.8.0 Chia blockchain 2023-05-03
+
+### Added
+- Added `chia completion` command
+- Added wallet_removed to `state_changes` messages to support wallet removal in GUI
+- Add support to `cat_spend` RPC for running TAIL
+- Expose NFT coin info's latest_height to RPCs requesting NFT info
+- Make `python -m chia` work
+- DataLayer plugin support and infrastructure
+
+### Changed
+- Fix soft fork to 60 days
+- Don't subscribe to all coin ids in the DB
+- Handle trade coins in the `try` block of `new_coin_state`
+- Add benchmark that tests the mempool over a long time
+- Enable soft-fork2 conditions (incl. ASSERT_BEFORE)
+- Update condition codes constants in clvm include file
+- Improve coin state retry wait logic and retry store test
+- Improve balance caching
+- Update Wallet command line help for key fingerprints
+- Optimize Mempool.add_to_pool()
+- Change self peer connection error to info, remove traceback
+- Reduce DB lookups in `handle_did` and `handle_nft`
+- Limit expiring transactions
+- Return fee estimates as integer mojos
+- Activate the soft-fork and soft-fork2 earlier on testnet10
+- Bump chia_rs to 0.2.7
+- Lower MAX_FUTURE_TIME to 2 minutes with the 1.8.0 soft-fork activation
+- List the columns for `INSERT` into `coin_record`
+
+### Fixed
+- Disconnect untrusted peers if we find a trusted synced one
+- Only compile CLVM if source newer than hex
+- Fixed windows issues with passphrase prompt on CLI by flushing prompt (Fixes #14889)
+- Fix removal while iterating over connections set
+- Fix the mempool fee rate calculation
+- Assert_before_height, assert_before_seconds fields in MempoolItem
+- Correct SQLite logging when using db_wrapper.manage_connection()
+- Case-insensitive DNS label matching to support bit 0x20 use
+- Check hint length in notification manager to avoid raise
+- Mempool insertion order
+- Drop leaking weight proof validation cache
+- Windows fix of memory profiler
+- Small improvements to trusted peer check to include IPv6 addresses and add tests
+- Close daemon client even for a BaseException in acquire_connection_to_daemon()
+- Rework config peer resolving and connection handling
+- Fix, simplify, and test `TransactionRecord.is_valid`
+- Check for directory existence before creating offer
+- Fix manage_clvm.py hash building and std libraries
+- Resolve introducer right before the connection attempt (Fixed #14888)
+- Async DNS lookups
+- Move assignments of `WalletStateManager._sync_target`
+- Lock `WalletStateManager.lock` while populating balances initially
+
 ## 1.7.1 Chia blockchain 2023-03-22
 
 ### Added

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/CONTRIBUTING.md

@@ -19,7 +19,7 @@ You can visit our [Trello project board](https://trello.com/b/ZuNx7sET) to get a
 Generally, things to the left are in progress or done. Some things go through "Coming up soon", but some will come directly out of other columns.
 Usually, the things closer to the top of each column are the ones that will be worked on soonest.
 If you are interested in cryptography, math, or just like hacking in python, there are many interesting problems to work on.
-Contact any of the team members on [Keybase](https://keybase.io/team/chia_network.public), which we use as the main communication method. You can also comment on any Trello card.
+Contact any of the team members on [Discord](https://discord.gg/chia), which we use as the main communication method. You can also comment on any Trello card.
 
 We ask that external contributors create a fork of the `main` branch for any feature work they wish to take on.
 

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/Install.ps1

@@ -119,8 +119,8 @@ if ($p)
 
 Write-Output ""
 Write-Output "Chia blockchain .\Install.ps1 complete."
-Write-Output "For assistance join us on Keybase in the #support chat channel:"
-Write-Output "https://keybase.io/team/chia_network.public"
+Write-Output "For assistance join us on Discord in the #support chat channel:"
+Write-Output "https://discord.gg/chia"
 Write-Output ""
 Write-Output "Try the Quick Start Guide to running chia-blockchain:"
 Write-Output "https://github.com/Chia-Network/chia-blockchain/wiki/Quick-Start-Guide"

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/PKG-INFO

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

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/consensus/default_constants.py

@@ -57,7 +57,7 @@ default_kwargs = {
     "MAX_GENERATOR_REF_LIST_SIZE": 512,  # Number of references allowed in the block generator ref list
     "POOL_SUB_SLOT_ITERS": 37600000000,  # iters limit * NUM_SPS
     "SOFT_FORK_HEIGHT": 3630000,
-    "SOFT_FORK2_HEIGHT": 4000000,
+    "SOFT_FORK2_HEIGHT": 3886635,
 }
 
 

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/full_node/full_node.py

@@ -2211,8 +2211,9 @@ class FullNode:
             return MempoolInclusionStatus.FAILED, Err.ALREADY_INCLUDING_TRANSACTION
         self.mempool_manager.add_and_maybe_pop_seen(spend_name)
         self.log.debug(f"Processing transaction: {spend_name}")
-        # Ignore if syncing
-        if self.sync_store.get_sync_mode():
+        # Ignore if syncing or if we have not yet received a block
+        # the mempool must have a peak to validate transactions
+        if self.sync_store.get_sync_mode() or self.mempool_manager.peak is None:
             status = MempoolInclusionStatus.FAILED
             error: Optional[Err] = Err.NO_TRANSACTIONS_WHILE_SYNCING
             self.mempool_manager.remove_seen(spend_name)
@@ -2404,6 +2405,11 @@ class FullNode:
                 raise
 
     async def add_compact_proof_of_time(self, request: timelord_protocol.RespondCompactProofOfTime) -> None:
+        peak = self.blockchain.get_peak()
+        if peak is None or peak.height - request.height < 5:
+            self.log.info(f"Ignoring add_compact_proof_of_time, height {request.height} too recent.")
+            return None
+
         field_vdf = CompressibleVDFField(int(request.field_vdf))
         if not await self._can_accept_compact_proof(
             request.vdf_info, request.vdf_proof, request.height, request.header_hash, field_vdf
@@ -2423,6 +2429,10 @@ class FullNode:
             await self.server.send_to_all([msg], NodeType.FULL_NODE)
 
     async def new_compact_vdf(self, request: full_node_protocol.NewCompactVDF, peer: WSChiaConnection) -> None:
+        peak = self.blockchain.get_peak()
+        if peak is None or peak.height - request.height < 5:
+            self.log.info(f"Ignoring new_compact_vdf, height {request.height} too recent.")
+            return None
         is_fully_compactified = await self.block_store.is_fully_compactified(request.header_hash)
         if is_fully_compactified is None or is_fully_compactified:
             return None

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/full_node/full_node_api.py

@@ -1401,11 +1401,30 @@ class FullNodeAPI:
         )
         return msg
 
-    @api_request()
-    async def respond_compact_proof_of_time(self, request: timelord_protocol.RespondCompactProofOfTime) -> None:
+    @api_request(bytes_required=True, execute_task=True)
+    async def respond_compact_proof_of_time(
+        self, request: timelord_protocol.RespondCompactProofOfTime, request_bytes: bytes = b""
+    ) -> None:
         if self.full_node.sync_store.get_sync_mode():
             return None
-        await self.full_node.add_compact_proof_of_time(request)
+        name = std_hash(request_bytes)
+        if name in self.full_node.compact_vdf_requests:
+            self.log.debug(f"Ignoring CompactProofOfTime: {request}, already requested")
+            return None
+
+        self.full_node.compact_vdf_requests.add(name)
+
+        # this semaphore will only allow a limited number of tasks call
+        # new_compact_vdf() at a time, since it can be expensive
+        try:
+            async with self.full_node.compact_vdf_sem.acquire():
+                try:
+                    await self.full_node.add_compact_proof_of_time(request)
+                finally:
+                    self.full_node.compact_vdf_requests.remove(name)
+        except LimitedSemaphoreFullError:
+            self.log.debug(f"Ignoring CompactProofOfTime: {request}, _waiters")
+
         return None
 
     @api_request(peer_required=True, bytes_required=True, execute_task=True)

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/rpc/wallet_rpc_client.py

@@ -914,7 +914,7 @@ class WalletRpcClient(RpcClient):
         return response
 
     async def list_nfts(self, wallet_id):
-        request: Dict[str, Any] = {"wallet_id": wallet_id}
+        request: Dict[str, Any] = {"wallet_id": wallet_id, "num": 100_000}
         response = await self.fetch("nft_get_nfts", request)
         return response
 

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/server/start_full_node.py

@@ -74,12 +74,11 @@ async def async_main(service_config: Dict[str, Any]) -> int:
     network_id = service_config["selected_network"]
     overrides = service_config["network_overrides"]["constants"][network_id]
     if network_id == "testnet10":
-        # testnet10 is 1031258 blocks behind mainnet
-        testnet10_offset = 1031258
+        # activate softforks immediately on testnet
         if "SOFT_FORK2_HEIGHT" not in overrides:
-            overrides["SOFT_FORK2_HEIGHT"] = 4000000 - testnet10_offset
+            overrides["SOFT_FORK2_HEIGHT"] = 0
         if "SOFT_FORK_HEIGHT" not in overrides:
-            overrides["SOFT_FORK_HEIGHT"] = 3630000 - testnet10_offset
+            overrides["SOFT_FORK_HEIGHT"] = 0
     updated_constants = DEFAULT_CONSTANTS.replace_str_to_bytes(**overrides)
     initialize_service_logging(service_name=SERVICE_NAME, config=config)
     service = create_full_node_service(DEFAULT_ROOT_PATH, config, updated_constants)

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/util/initial-config.yaml

@@ -71,8 +71,8 @@ network_overrides: &network_overrides
       GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc
       MEMPOOL_BLOCK_BUFFER: 10
       MIN_PLOT_SIZE: 18
-      SOFT_FORK_HEIGHT: 2598742
-      SOFT_FORK2_HEIGHT: 2968742
+      SOFT_FORK_HEIGHT: 0
+      SOFT_FORK2_HEIGHT: 0
   config:
     mainnet:
       address_prefix: "xch"

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/wallet/util/wallet_types.py

@@ -29,11 +29,6 @@ class WalletType(IntEnum):
     DATA_LAYER_OFFER = 12
 
 
-class CoinType(IntEnum):
-    NORMAL = 0
-    CLAWBACK = 1
-
-
 class AmountWithPuzzlehash(TypedDict):
     amount: uint64
     puzzlehash: bytes32

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/wallet/wallet_coin_record.py

@@ -1,14 +1,12 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
-from typing import Optional
+from dataclasses import dataclass
 
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.util.ints import uint32, uint64
-from chia.util.misc import VersionedBlob
-from chia.wallet.util.wallet_types import CoinType, WalletType
+from chia.wallet.util.wallet_types import WalletType
 
 
 @dataclass(frozen=True)
@@ -25,11 +23,6 @@ class WalletCoinRecord:
     coinbase: bool
     wallet_type: WalletType
     wallet_id: int
-    # Cannot include new attributes in the hash since they will change the coin order in a set.
-    # The launcher coin ID will change and will break all hardcode offer tests in CAT/NFT/DL, etc.
-    # TODO Change hardcode offer in unit tests
-    coin_type: CoinType = field(default=CoinType.NORMAL, hash=False)
-    metadata: Optional[VersionedBlob] = field(default=None, hash=False)
 
     def name(self) -> bytes32:
         return self.coin.name()

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/wallet/wallet_coin_store.py

@@ -7,8 +7,7 @@ from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.db_wrapper import DBWrapper2, execute_fetchone
 from chia.util.ints import uint32, uint64
-from chia.util.misc import VersionedBlob
-from chia.wallet.util.wallet_types import CoinType, WalletType
+from chia.wallet.util.wallet_types import WalletType
 from chia.wallet.wallet_coin_record import WalletCoinRecord
 
 
@@ -55,21 +54,13 @@ class WalletCoinStore:
 
             await conn.execute("CREATE INDEX IF NOT EXISTS coin_amount on coin_record(amount)")
 
-            try:
-                await conn.execute("ALTER TABLE coin_record ADD COLUMN coin_type int DEFAULT 0")
-                await conn.execute("ALTER TABLE coin_record ADD COLUMN metadata blob")
-                await conn.execute("CREATE INDEX IF NOT EXISTS coin_record_coin_type on coin_record(coin_type)")
-            except sqlite3.OperationalError:
-                pass
         return self
 
-    async def count_small_unspent(self, cutoff: int, coin_type: CoinType = CoinType.NORMAL) -> int:
+    async def count_small_unspent(self, cutoff: int) -> int:
         amount_bytes = bytes(uint64(cutoff))
         async with self.db_wrapper.reader_no_transaction() as conn:
             row = await execute_fetchone(
-                conn,
-                "SELECT COUNT(*) FROM coin_record WHERE coin_type=? AND amount < ? AND spent=0",
-                (coin_type, amount_bytes),
+                conn, "SELECT COUNT(*) FROM coin_record WHERE amount < ? AND spent=0", (amount_bytes,)
             )
             return int(0 if row is None else row[0])
 
@@ -80,7 +71,9 @@ class WalletCoinStore:
         assert record.spent == (record.spent_block_height != 0)
         async with self.db_wrapper.writer_maybe_transaction() as conn:
             await conn.execute_insert(
-                "INSERT OR REPLACE INTO coin_record VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                "INSERT OR REPLACE INTO coin_record ("
+                "coin_name, confirmed_height, spent_height, spent, coinbase, puzzle_hash, coin_parent, amount, "
+                "wallet_type, wallet_id) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                 (
                     name.hex(),
                     record.confirmed_block_height,
@@ -92,8 +85,6 @@ class WalletCoinStore:
                     bytes(uint64(record.coin.amount)),
                     record.wallet_type,
                     record.wallet_id,
-                    record.coin_type,
-                    None if record.metadata is None else bytes(record.metadata),
                 ),
             )
 
@@ -117,15 +108,7 @@ class WalletCoinStore:
     def coin_record_from_row(self, row: sqlite3.Row) -> WalletCoinRecord:
         coin = Coin(bytes32.fromhex(row[6]), bytes32.fromhex(row[5]), uint64.from_bytes(row[7]))
         return WalletCoinRecord(
-            coin,
-            uint32(row[1]),
-            uint32(row[2]),
-            bool(row[3]),
-            bool(row[4]),
-            WalletType(row[8]),
-            row[9],
-            CoinType(row[10]),
-            None if row[11] is None else VersionedBlob.from_bytes(row[11]),
+            coin, uint32(row[1]), uint32(row[2]), bool(row[3]), bool(row[4]), WalletType(row[8]), row[9]
         )
 
     async def get_coin_record(self, coin_name: bytes32) -> Optional[WalletCoinRecord]:
@@ -163,23 +146,6 @@ class WalletCoinStore:
 
         return ret
 
-    async def get_coin_records_between(
-        self, wallet_id: int, start: int, end: int, reverse: bool = False, coin_type: CoinType = CoinType.NORMAL
-    ) -> List[WalletCoinRecord]:
-        """Return a list of coins between start and end index. List is in reverse chronological order.
-        start = 0 is most recent transaction
-        """
-        limit = end - start
-        query_str = "ORDER BY confirmed_height " + ("DESC" if reverse else "ASC")
-
-        async with self.db_wrapper.reader_no_transaction() as conn:
-            rows = await conn.execute_fetchall(
-                f"SELECT * FROM coin_record WHERE coin_type=? AND"
-                f" wallet_id=? {query_str}, rowid LIMIT {start}, {limit}",
-                (coin_type, wallet_id),
-            )
-        return [self.coin_record_from_row(row) for row in rows]
-
     async def get_first_coin_height(self) -> Optional[uint32]:
         """Returns height of first confirmed coin"""
         async with self.db_wrapper.reader_no_transaction() as conn:
@@ -190,23 +156,18 @@ class WalletCoinStore:
 
         return None
 
-    async def get_unspent_coins_for_wallet(
-        self, wallet_id: int, coin_type: CoinType = CoinType.NORMAL
-    ) -> Set[WalletCoinRecord]:
+    async def get_unspent_coins_for_wallet(self, wallet_id: int) -> Set[WalletCoinRecord]:
         """Returns set of CoinRecords that have not been spent yet for a wallet."""
         async with self.db_wrapper.reader_no_transaction() as conn:
             rows = await conn.execute_fetchall(
-                "SELECT * FROM coin_record WHERE coin_type=? AND wallet_id=? AND spent_height=0",
-                (coin_type, wallet_id),
+                "SELECT * FROM coin_record WHERE wallet_id=? AND spent_height=0", (wallet_id,)
             )
         return set(self.coin_record_from_row(row) for row in rows)
 
-    async def get_all_unspent_coins(self, coin_type: CoinType = CoinType.NORMAL) -> Set[WalletCoinRecord]:
+    async def get_all_unspent_coins(self) -> Set[WalletCoinRecord]:
         """Returns set of CoinRecords that have not been spent yet for a wallet."""
         async with self.db_wrapper.reader_no_transaction() as conn:
-            rows = await conn.execute_fetchall(
-                "SELECT * FROM coin_record WHERE coin_type=? AND spent_height=0", (coin_type,)
-            )
+            rows = await conn.execute_fetchall("SELECT * FROM coin_record WHERE spent_height=0")
         return set(self.coin_record_from_row(row) for row in rows)
 
     # Checks DB and DiffStores for CoinRecords with puzzle_hash and returns them

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia/wallet/wallet_state_manager.py

@@ -916,7 +916,7 @@ class WalletStateManager:
                 uncurried_nft.singleton_launcher_id.hex(),
             )
             return wallet_identifier
-        for nft_wallet in self.wallets.values():
+        for nft_wallet in self.wallets.copy().values():
             if not isinstance(nft_wallet, NFTWallet):
                 continue
             if nft_wallet.nft_wallet_info.did_id == old_did_id and old_derivation_record is not None:
@@ -1463,7 +1463,6 @@ class WalletStateManager:
             if tx_record.amount > 0:
                 await self.tx_store.add_transaction_record(tx_record)
 
-        # We only add normal coins here
         coin_record: WalletCoinRecord = WalletCoinRecord(
             coin, height, uint32(0), False, coinbase, wallet_type, wallet_id
         )

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/chia_blockchain.egg-info/PKG-INFO

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

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/install.sh

@@ -356,8 +356,8 @@ fi
 
 echo ""
 echo "Chia blockchain install.sh complete."
-echo "For assistance join us on Keybase in the #support chat channel:"
-echo "https://keybase.io/team/chia_network.public"
+echo "For assistance join us on Discord in the #support chat channel:"
+echo "https://discord.gg/chia"
 echo ""
 echo "Try the Quick Start Guide to running chia-blockchain:"
 echo "https://github.com/Chia-Network/chia-blockchain/wiki/Quick-Start-Guide"

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/tests/clvm/coin_store.py

@@ -59,7 +59,7 @@ class CoinStore:
 
         program = simple_solution_generator(spend_bundle)
         # always use the post soft-fork2 semantics
-        result: NPCResult = get_name_puzzle_conditions(program, max_cost, mempool_mode=True, height=uint32(4000000))
+        result: NPCResult = get_name_puzzle_conditions(program, max_cost, mempool_mode=True, height=uint32(3886635))
         if result.error is not None:
             raise BadSpendBundleError(f"condition validation failure {Err(result.error)}")
 

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/tests/conftest.py

@@ -133,7 +133,7 @@ def db_version(request) -> int:
     return request.param
 
 
-@pytest.fixture(scope="function", params=[1000000, 3630000, 4000000])
+@pytest.fixture(scope="function", params=[1000000, 3630000, 3886635])
 def softfork_height(request) -> int:
     return request.param
 

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/tests/core/full_node/test_full_node.py

@@ -46,6 +46,7 @@ from chia.types.unfinished_block import UnfinishedBlock
 from chia.util.errors import ConsensusError, Err
 from chia.util.hash import std_hash
 from chia.util.ints import uint8, uint16, uint32, uint64
+from chia.util.limited_semaphore import LimitedSemaphore
 from chia.util.recursive_replace import recursive_replace
 from chia.util.vdf_prover import get_vdf_info_and_proof
 from chia.wallet.transaction_record import TransactionRecord
@@ -1903,6 +1904,61 @@ class TestFullNodeProtocol:
                 assert not block.challenge_chain_sp_proof.normalized_to_identity
             assert not block.challenge_chain_ip_proof.normalized_to_identity
 
+    @pytest.mark.asyncio
+    async def test_respond_compact_proof_message_limit(self, setup_two_nodes_fixture):
+        nodes, _, bt = setup_two_nodes_fixture
+        full_node_1 = nodes[0]
+        full_node_2 = nodes[1]
+        NUM_BLOCKS = 20
+        # We don't compactify the last 5 blocks.
+        EXPECTED_COMPACTIFIED = NUM_BLOCKS - 5
+        blocks = bt.get_consecutive_blocks(num_blocks=NUM_BLOCKS)
+        finished_compact_proofs = []
+        for block in blocks:
+            await full_node_1.full_node.add_block(block)
+            await full_node_2.full_node.add_block(block)
+            vdf_info, vdf_proof = get_vdf_info_and_proof(
+                test_constants,
+                ClassgroupElement.get_default_element(),
+                block.reward_chain_block.challenge_chain_ip_vdf.challenge,
+                block.reward_chain_block.challenge_chain_ip_vdf.number_of_iterations,
+                True,
+            )
+            finished_compact_proofs.append(
+                timelord_protocol.RespondCompactProofOfTime(
+                    vdf_info,
+                    vdf_proof,
+                    block.header_hash,
+                    block.height,
+                    CompressibleVDFField.CC_IP_VDF,
+                )
+            )
+
+        async def coro(full_node, compact_proof):
+            await full_node.respond_compact_proof_of_time(compact_proof)
+
+        full_node_1.full_node._compact_vdf_sem = LimitedSemaphore.create(active_limit=1, waiting_limit=2)
+        tasks = asyncio.gather(
+            *[coro(full_node_1, respond_compact_proof) for respond_compact_proof in finished_compact_proofs]
+        )
+        await tasks
+        stored_blocks = await full_node_1.get_all_full_blocks()
+        compactified = 0
+        for block in stored_blocks:
+            if block.challenge_chain_ip_proof.normalized_to_identity:
+                compactified += 1
+        assert compactified == 3
+
+        # The other full node receives the compact messages one at a time.
+        for respond_compact_proof in finished_compact_proofs:
+            await full_node_2.full_node.add_compact_proof_of_time(respond_compact_proof)
+        stored_blocks = await full_node_2.get_all_full_blocks()
+        compactified = 0
+        for block in stored_blocks:
+            if block.challenge_chain_ip_proof.normalized_to_identity:
+                compactified += 1
+        assert compactified == EXPECTED_COMPACTIFIED
+
     @pytest.mark.parametrize(
         argnames=["custom_capabilities", "expect_success"],
         argvalues=[

{chia-blockchain-1.8.0rc4 → chia-blockchain-1.8.1}/tests/wallet/test_wallet_coin_store.py

@@ -5,9 +5,8 @@ from secrets import token_bytes
 import pytest
 
 from chia.types.blockchain_format.coin import Coin
-from chia.util.ints import uint16, uint32, uint64
-from chia.util.misc import VersionedBlob
-from chia.wallet.util.wallet_types import CoinType, WalletType
+from chia.util.ints import uint32, uint64
+from chia.wallet.util.wallet_types import WalletType
 from chia.wallet.wallet_coin_record import WalletCoinRecord
 from chia.wallet.wallet_coin_store import WalletCoinStore
 from tests.util.db_connection import DBConnection
@@ -19,7 +18,6 @@ coin_4 = Coin(token_bytes(32), token_bytes(32), uint64(12312))
 coin_5 = Coin(token_bytes(32), token_bytes(32), uint64(12312))
 coin_6 = Coin(token_bytes(32), coin_4.puzzle_hash, uint64(12312))
 coin_7 = Coin(token_bytes(32), token_bytes(32), uint64(12312))
-coin_8 = Coin(token_bytes(32), token_bytes(32), uint64(2))
 record_replaced = WalletCoinRecord(coin_1, uint32(8), uint32(0), False, True, WalletType.STANDARD_WALLET, 0)
 record_1 = WalletCoinRecord(coin_1, uint32(4), uint32(0), False, True, WalletType.STANDARD_WALLET, 0)
 record_2 = WalletCoinRecord(coin_2, uint32(5), uint32(0), False, True, WalletType.STANDARD_WALLET, 0)
@@ -68,17 +66,6 @@ record_7 = WalletCoinRecord(
     WalletType.POOLING_WALLET,
     2,
 )
-record_8 = WalletCoinRecord(
-    coin_8,
-    uint32(1),
-    uint32(0),
-    False,
-    False,
-    WalletType.STANDARD_WALLET,
-    1,
-    CoinType.CLAWBACK,
-    VersionedBlob(uint16(1), b"TEST"),
-)
 
 
 @pytest.mark.asyncio
@@ -116,7 +103,6 @@ async def test_bulk_get() -> None:
         await store.add_coin_record(record_2)
         await store.add_coin_record(record_3)
         await store.add_coin_record(record_4)
-        await store.add_coin_record(record_8)
 
         store = await WalletCoinStore.create(db_wrapper)
         records = await store.get_coin_records([coin_1.name(), coin_2.name(), token_bytes(32), coin_4.name()])
@@ -165,7 +151,6 @@ async def test_get_unspent_coins_for_wallet() -> None:
         await store.add_coin_record(record_5)  # wallet 1
         await store.add_coin_record(record_6)  # this is spent and wallet 2
         await store.add_coin_record(record_7)  # wallet 2
-        await store.add_coin_record(record_8)
 
         assert await store.get_unspent_coins_for_wallet(1) == set([record_5])
         assert await store.get_unspent_coins_for_wallet(2) == set([record_7])
@@ -189,8 +174,6 @@ async def test_get_unspent_coins_for_wallet() -> None:
         assert await store.get_unspent_coins_for_wallet(2) == set()
         assert await store.get_unspent_coins_for_wallet(3) == set()
 
-        assert await store.get_unspent_coins_for_wallet(1, coin_type=CoinType.CLAWBACK) == set([record_8])
-
 
 @pytest.mark.asyncio
 async def test_get_all_unspent_coins() -> None:
@@ -202,7 +185,6 @@ async def test_get_all_unspent_coins() -> None:
         await store.add_coin_record(record_1)  # not spent
         await store.add_coin_record(record_2)  # not spent
         await store.add_coin_record(record_3)  # spent
-        await store.add_coin_record(record_8)  # spent
         assert await store.get_all_unspent_coins() == set([record_1, record_2])
 
         await store.add_coin_record(record_4)  # spent
@@ -226,8 +208,6 @@ async def test_get_all_unspent_coins() -> None:
         await store.set_spent(coin_1.name(), uint32(12))
         assert await store.get_all_unspent_coins() == set()
 
-        assert await store.get_all_unspent_coins(coin_type=CoinType.CLAWBACK) == set([record_8])
-
 
 @pytest.mark.asyncio
 async def test_get_records_by_parent_id() -> None:
@@ -398,43 +378,17 @@ async def test_count_small_unspent() -> None:
         await store.add_coin_record(r1)
         await store.add_coin_record(r2)
         await store.add_coin_record(r3)
-        await store.add_coin_record(record_8)
 
         assert await store.count_small_unspent(5) == 3
         assert await store.count_small_unspent(4) == 2
         assert await store.count_small_unspent(3) == 2
         assert await store.count_small_unspent(2) == 1
         assert await store.count_small_unspent(1) == 0
-        assert await store.count_small_unspent(3, coin_type=CoinType.CLAWBACK) == 1
 
         await store.set_spent(coin_2.name(), uint32(12))
-        await store.set_spent(coin_8.name(), uint32(12))
 
         assert await store.count_small_unspent(5) == 2
         assert await store.count_small_unspent(4) == 1
         assert await store.count_small_unspent(3) == 1
         assert await store.count_small_unspent(2) == 1
-        assert await store.count_small_unspent(3, coin_type=CoinType.CLAWBACK) == 0
         assert await store.count_small_unspent(1) == 0
-
-
-@pytest.mark.asyncio
-async def test_get_coin_records_between() -> None:
-    async with DBConnection(1) as db_wrapper:
-        store = await WalletCoinStore.create(db_wrapper)
-
-        assert await store.get_all_unspent_coins() == set()
-
-        await store.add_coin_record(record_1)  # not spent
-        await store.add_coin_record(record_2)  # not spent
-        await store.add_coin_record(record_5)  # spent
-        await store.add_coin_record(record_8)  # spent
-
-        records = await store.get_coin_records_between(1, 0, 0)
-        assert len(records) == 0
-        records = await store.get_coin_records_between(1, 0, 3)
-        assert len(records) == 1
-        assert records[0] == record_5
-        records = await store.get_coin_records_between(1, 0, 4, coin_type=CoinType.CLAWBACK)
-        assert len(records) == 1
-        assert records[0] == record_8