starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-08-24 10:05:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

bump farmer block fill rate to 60% (#17477)

Browse Source 
* bump farmer block fill rate to 60%

* Amine's patch to fixup test_create_bundle_from_mempool_on_max_cost
This commit is contained in:
Arvid Norberg
2024-02-05 08:44:20 -08:00
committed by GitHub
parent 63417e765a
commit cbf3d7f252
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chia-blockchain-gui
+1 -1
Submodule chia-blockchain-gui updated: 39784c2e8f...394a4f4117
chia/full_node/mempool_manager.py
+9 -3
View File
@@ -169,6 +169,8 @@ class MempoolManager:
peak: Optional[BlockRecordProtocol]
mempool: Mempool
_worker_queue_size: int
max_block_clvm_cost: uint64
max_tx_clvm_cost: uint64
def __init__(
self,
@@ -177,6 +179,7 @@ class MempoolManager:
multiprocessing_context: Optional[BaseContext] = None,
*,
single_threaded: bool = False,
max_tx_clvm_cost: Optional[uint64] = None,
):
self.constants: ConsensusConstants = consensus_constants
@@ -190,8 +193,11 @@ class MempoolManager:
# spends.
self.nonzero_fee_minimum_fpc = 5
BLOCK_SIZE_LIMIT_FACTOR = 0.5
BLOCK_SIZE_LIMIT_FACTOR = 0.6
self.max_block_clvm_cost = uint64(self.constants.MAX_BLOCK_COST_CLVM * BLOCK_SIZE_LIMIT_FACTOR)
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)
)
self.mempool_max_total_cost = int(self.constants.MAX_BLOCK_COST_CLVM * self.constants.MEMPOOL_BLOCK_BUFFER)
# Transactions that were unable to enter mempool, used for retry. (they were invalid)
@@ -306,7 +312,7 @@ class MempoolManager:
self.pool,
validate_clvm_and_signature,
new_spend_bytes,
self.max_block_clvm_cost,
self.max_tx_clvm_cost,
self.constants,
self.peak.height,
)
@@ -513,7 +519,7 @@ class MempoolManager:
if cost == 0:
return Err.UNKNOWN, None, []
if cost > self.max_block_clvm_cost:
if cost > self.max_tx_clvm_cost:
return Err.BLOCK_COST_EXCEEDS_MAX, None, []
# this is not very likely to happen, but it's here to ensure SQLite
tests/core/mempool/test_mempool_manager.py
+21 -10
View File
@@ -133,8 +133,9 @@ async def instantiate_mempool_manager(
block_height: uint32 = TEST_HEIGHT,
block_timestamp: uint64 = TEST_TIMESTAMP,
constants: ConsensusConstants = DEFAULT_CONSTANTS,
max_tx_clvm_cost: Optional[uint64] = None,
) -> MempoolManager:
mempool_manager = MempoolManager(get_coin_records, constants)
mempool_manager = MempoolManager(get_coin_records, constants, max_tx_clvm_cost=max_tx_clvm_cost)
test_block_record = create_test_block_record(height=block_height, timestamp=block_timestamp)
await mempool_manager.new_peak(test_block_record, None)
invariant_check_mempool(mempool_manager.mempool)
@@ -142,7 +143,11 @@ async def instantiate_mempool_manager(
async def setup_mempool_with_coins(
*, coin_amounts: List[int], max_block_clvm_cost: Optional[int] = None
*,
coin_amounts: List[int],
max_block_clvm_cost: Optional[int] = None,
max_tx_clvm_cost: Optional[uint64] = None,
mempool_block_buffer: Optional[int] = None,
) -> Tuple[MempoolManager, List[Coin]]:
coins = []
test_coin_records = {}
@@ -159,11 +164,14 @@ async def setup_mempool_with_coins(
ret.append(r)
return ret
constants = DEFAULT_CONSTANTS
if max_block_clvm_cost is not None:
constants = dataclasses.replace(DEFAULT_CONSTANTS, MAX_BLOCK_COST_CLVM=max_block_clvm_cost)
else:
constants = DEFAULT_CONSTANTS
mempool_manager = await instantiate_mempool_manager(get_coin_records, constants=constants)
constants = dataclasses.replace(constants, MAX_BLOCK_COST_CLVM=max_block_clvm_cost)
if mempool_block_buffer is not None:
constants = dataclasses.replace(constants, MEMPOOL_BLOCK_BUFFER=mempool_block_buffer)
mempool_manager = await instantiate_mempool_manager(
get_coin_records, constants=constants, max_tx_clvm_cost=max_tx_clvm_cost
)
return (mempool_manager, coins)
@@ -992,8 +1000,8 @@ async def test_create_bundle_from_mempool(reverse_tx_order: bool) -> None:
assert result[1] == MempoolInclusionStatus.SUCCESS
mempool_manager, coins = await setup_mempool_with_coins(coin_amounts=list(range(2000000000, 2000002200)))
high_rate_spends = await make_coin_spends(coins[0:2000])
low_rate_spends = await make_coin_spends(coins[2000:2100], high_fees=False)
high_rate_spends = await make_coin_spends(coins[0:2200])
low_rate_spends = await make_coin_spends(coins[2200:2400], high_fees=False)
spends = low_rate_spends + high_rate_spends if reverse_tx_order else high_rate_spends + low_rate_spends
await send_spends_to_mempool(spends)
assert mempool_manager.peak is not None
@@ -1022,7 +1030,7 @@ async def test_create_bundle_from_mempool_on_max_cost(num_skipped_items: int, ca
async def make_and_send_big_cost_sb(coin: Coin) -> None:
conditions = []
g1 = G1Element()
for _ in range(120):
for _ in range(144):
conditions.append([ConditionOpcode.AGG_SIG_UNSAFE, g1, IDENTITY_PUZZLE_HASH])
conditions.append([ConditionOpcode.CREATE_COIN, IDENTITY_PUZZLE_HASH, coin.amount - 10_000_000])
# Create a spend bundle with a big enough cost that gets it close to the limit
@@ -1030,7 +1038,10 @@ async def test_create_bundle_from_mempool_on_max_cost(num_skipped_items: int, ca
assert res[1] == MempoolInclusionStatus.SUCCESS
mempool_manager, coins = await setup_mempool_with_coins(
coin_amounts=list(range(1_000_000_000, 1_000_000_030)), max_block_clvm_cost=550_000_000
coin_amounts=list(range(1_000_000_000, 1_000_000_030)),
max_block_clvm_cost=550_000_000,
max_tx_clvm_cost=uint64(550_000_000 * 0.6),
mempool_block_buffer=20,
)
# Create the spend bundles with a big enough cost that they get close to the limit
for i in range(num_skipped_items):