machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rust gbt cpfp cluster construction

Browse Source
This commit is contained in:
Mononaut 2023-06-26 17:37:00 -04:00
parent a66c0c88ce
commit 7873f1c26a
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/rust-gbt/src/gbt.rs
View File

@ -135,28 +135,23 @@ pub fn gbt(mempool: &mut ThreadTransactionsMap) -> Option<GbtResult> {
overflow.push(next_txid); overflow.push(next_txid);
failures += 1; failures += 1;
} else { } else {
let mut package: Vec<(u32, usize, u32)> = Vec::new(); let mut package: Vec<(u32, usize)> = Vec::new();
let mut cluster: Vec<u32> = Vec::new(); let mut cluster: Vec<u32> = Vec::new();
let is_cluster: bool = !next_tx.ancestors.is_empty(); let is_cluster: bool = !next_tx.ancestors.is_empty();
package.push((next_txid, next_tx.ancestors.len(), next_tx.weight));
cluster.push(next_txid);
for ancestor_id in &next_tx.ancestors { for ancestor_id in &next_tx.ancestors {
if let Some(ancestor) = audit_pool.get(ancestor_id) { if let Some(ancestor) = audit_pool.get(ancestor_id) {
package.push((*ancestor_id, ancestor.ancestors.len(), ancestor.weight)); package.push((*ancestor_id, ancestor.ancestors.len()));
cluster.push(*ancestor_id);
} }
} }
package.sort_unstable_by_key(|a| 0 - a.1); package.sort_unstable_by_key(|a| a.1);
package.push((next_txid, next_tx.ancestors.len()));
if is_cluster {
clusters.push(cluster);
}
let cluster_rate = next_tx let cluster_rate = next_tx
.dependency_rate .dependency_rate
.min(next_tx.ancestor_fee as f64 / (f64::from(next_tx.ancestor_weight) / 4.0)); .min(next_tx.ancestor_fee as f64 / (f64::from(next_tx.ancestor_weight) / 4.0));
for (txid, _, _) in &package { for (txid, _) in &package {
cluster.push(*txid);
if let Some(tx) = audit_pool.get_mut(txid) { if let Some(tx) = audit_pool.get_mut(txid) {
tx.used = true; tx.used = true;
if tx.effective_fee_per_vsize != cluster_rate { if tx.effective_fee_per_vsize != cluster_rate {
@ -170,6 +165,10 @@ pub fn gbt(mempool: &mut ThreadTransactionsMap) -> Option<GbtResult> {
update_descendants(*txid, &mut audit_pool, &mut modified, cluster_rate); update_descendants(*txid, &mut audit_pool, &mut modified, cluster_rate);
} }
if is_cluster {
clusters.push(cluster);
}
failures = 0; failures = 0;
} }
@ -185,6 +184,8 @@ pub fn gbt(mempool: &mut ThreadTransactionsMap) -> Option<GbtResult> {
// reset for the next block // reset for the next block
transactions = Vec::with_capacity(STARTING_CAPACITY); transactions = Vec::with_capacity(STARTING_CAPACITY);
block_weight = 4000; block_weight = 4000;
block_sigops = 0;
failures = 0;
// 'overflow' packages didn't fit in this block, but are valid candidates for the next // 'overflow' packages didn't fit in this block, but are valid candidates for the next
overflow.reverse(); overflow.reverse();
for overflowed in &overflow { for overflowed in &overflow {