mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-03-15 12:20:28 +01:00
Code Issues Projects Releases Wiki Activity

Handle unmineable transactions in GBT implementations

Browse source
This commit is contained in:
Mononaut 2024-01-06 03:42:45 +00:00
parent f7e7072dbc
commit d665d2a12c
No known key found for this signature in database
GPG key ID: A3F058E41374C04E
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backend/rust-gbt/src/gbt.rs
View file

@ -127,7 +127,7 @@ pub fn gbt(mempool: &mut ThreadTransactionsMap, accelerations: &[ThreadAccelerat
let next_from_stack = next_valid_from_stack(&mut mempool_stack, &audit_pool); let next_from_stack = next_valid_from_stack(&mut mempool_stack, &audit_pool);
let next_from_queue = next_valid_from_queue(&mut modified, &audit_pool); let next_from_queue = next_valid_from_queue(&mut modified, &audit_pool);
if next_from_stack.is_none() && next_from_queue.is_none() { if next_from_stack.is_none() && next_from_queue.is_none() {
continue; break;
} }
let (next_tx, from_stack) = match (next_from_stack, next_from_queue) { let (next_tx, from_stack) = match (next_from_stack, next_from_queue) {
(Some(stack_tx), Some(queue_tx)) => match queue_tx.cmp(stack_tx) { (Some(stack_tx), Some(queue_tx)) => match queue_tx.cmp(stack_tx) {
@ -203,10 +203,13 @@ pub fn gbt(mempool: &mut ThreadTransactionsMap, accelerations: &[ThreadAccelerat
let queue_is_empty = mempool_stack.is_empty() && modified.is_empty(); let queue_is_empty = mempool_stack.is_empty() && modified.is_empty();
if (exceeded_package_tries || queue_is_empty) && blocks.len() < (MAX_BLOCKS - 1) { if (exceeded_package_tries || queue_is_empty) && blocks.len() < (MAX_BLOCKS - 1) {
// finalize this block // finalize this block
if !transactions.is_empty() { if transactions.is_empty() {
break;
}
blocks.push(transactions); blocks.push(transactions);
block_weights.push(block_weight); block_weights.push(block_weight);
}
// reset for the next block // reset for the next block
transactions = Vec::with_capacity(initial_txes_per_block); transactions = Vec::with_capacity(initial_txes_per_block);
block_weight = BLOCK_RESERVED_WEIGHT; block_weight = BLOCK_RESERVED_WEIGHT;

3
backend/src/api/tx-selection-worker.ts
View file

@ -173,10 +173,13 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
// this block is full // this block is full
const exceededPackageTries = failures > 1000 && blockWeight > (config.MEMPOOL.BLOCK_WEIGHT_UNITS - 4000); const exceededPackageTries = failures > 1000 && blockWeight > (config.MEMPOOL.BLOCK_WEIGHT_UNITS - 4000);
const queueEmpty = top >= mempoolArray.length && modified.isEmpty(); const queueEmpty = top >= mempoolArray.length && modified.isEmpty();
if ((exceededPackageTries || queueEmpty) && blocks.length < 7) { if ((exceededPackageTries || queueEmpty) && blocks.length < 7) {
// construct this block // construct this block
if (transactions.length) { if (transactions.length) {
blocks.push(transactions.map(t => t.uid)); blocks.push(transactions.map(t => t.uid));
} else {
break;
} }
// reset for the next block // reset for the next block
transactions = []; transactions = [];