From a171113fc8b8c90f489bee7fddb5fb74a2b7d3e0 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 9 Dec 2024 16:40:37 +0100 Subject: [PATCH] remove the block fill rate limit of 70% when farming a block --- chia/_tests/core/mempool/test_mempool_manager.py | 2 +- chia/full_node/mempool_manager.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/chia/_tests/core/mempool/test_mempool_manager.py b/chia/_tests/core/mempool/test_mempool_manager.py index 4164d635dbc9..cf7aab4da9b0 100644 --- a/chia/_tests/core/mempool/test_mempool_manager.py +++ b/chia/_tests/core/mempool/test_mempool_manager.py @@ -1081,7 +1081,7 @@ async def make_and_send_big_cost_sb(coin: Coin) -> None: g1 = sk.get_g1() sig = AugSchemeMPL.sign(sk, IDENTITY_PUZZLE_HASH, g1) aggsig = G2Element() - for _ in range(169): + for _ in range(242): conditions.append([ConditionOpcode.AGG_SIG_UNSAFE, g1, IDENTITY_PUZZLE_HASH]) aggsig += sig conditions.append([ConditionOpcode.CREATE_COIN, IDENTITY_PUZZLE_HASH, coin.amount - 10_000_000]) diff --git a/chia/full_node/mempool_manager.py b/chia/full_node/mempool_manager.py index d8f5cf19cab3..3e1b135b3cd3 100644 --- a/chia/full_node/mempool_manager.py +++ b/chia/full_node/mempool_manager.py @@ -162,12 +162,11 @@ def __init__( # spends. self.nonzero_fee_minimum_fpc = 5 - BLOCK_SIZE_LIMIT_FACTOR = 0.7 # We need to deduct the block overhead, which consists of the wrapping # quote opcode's bytes cost as well as its execution cost. BLOCK_OVERHEAD = QUOTE_BYTES * self.constants.COST_PER_BYTE + QUOTE_EXECUTION_COST - self.max_block_clvm_cost = uint64(self.constants.MAX_BLOCK_COST_CLVM * BLOCK_SIZE_LIMIT_FACTOR - BLOCK_OVERHEAD) + self.max_block_clvm_cost = uint64(self.constants.MAX_BLOCK_COST_CLVM - BLOCK_OVERHEAD) self.max_tx_clvm_cost = ( max_tx_clvm_cost if max_tx_clvm_cost is not None else uint64(self.constants.MAX_BLOCK_COST_CLVM // 2) )