Preserve tx replacement flag
This commit is contained in:
parent
c2f52ac1f3
commit
a8fd2ac9dc
@ -231,7 +231,7 @@ export class Common {
|
|||||||
if (tx.descendants?.length) {
|
if (tx.descendants?.length) {
|
||||||
flags |= TransactionFlags.cpfp_parent;
|
flags |= TransactionFlags.cpfp_parent;
|
||||||
}
|
}
|
||||||
if (rbfCache.getRbfTree(tx.txid)) {
|
if (tx.replacement) {
|
||||||
flags |= TransactionFlags.replacement;
|
flags |= TransactionFlags.replacement;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -256,6 +256,7 @@ class DiskCache {
|
|||||||
txs: rbfData.rbf.txs.map(([txid, entry]) => ({ value: entry })),
|
txs: rbfData.rbf.txs.map(([txid, entry]) => ({ value: entry })),
|
||||||
trees: rbfData.rbf.trees,
|
trees: rbfData.rbf.trees,
|
||||||
expiring: rbfData.rbf.expiring.map(([txid, value]) => ({ key: txid, value })),
|
expiring: rbfData.rbf.expiring.map(([txid, value]) => ({ key: txid, value })),
|
||||||
|
mempool: memPool.getMempool(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -97,6 +97,8 @@ class RbfCache {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
newTxExtended.replacement = true;
|
||||||
|
|
||||||
const newTx = Common.stripTransaction(newTxExtended) as RbfTransaction;
|
const newTx = Common.stripTransaction(newTxExtended) as RbfTransaction;
|
||||||
const newTime = newTxExtended.firstSeen || (Date.now() / 1000);
|
const newTime = newTxExtended.firstSeen || (Date.now() / 1000);
|
||||||
newTx.rbf = newTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
|
newTx.rbf = newTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
|
||||||
@ -368,14 +370,14 @@ class RbfCache {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public async load({ txs, trees, expiring }): Promise<void> {
|
public async load({ txs, trees, expiring, mempool }): Promise<void> {
|
||||||
try {
|
try {
|
||||||
txs.forEach(txEntry => {
|
txs.forEach(txEntry => {
|
||||||
this.txs.set(txEntry.value.txid, txEntry.value);
|
this.txs.set(txEntry.value.txid, txEntry.value);
|
||||||
});
|
});
|
||||||
this.staleCount = 0;
|
this.staleCount = 0;
|
||||||
for (const deflatedTree of trees) {
|
for (const deflatedTree of trees) {
|
||||||
await this.importTree(deflatedTree.root, deflatedTree.root, deflatedTree, this.txs);
|
await this.importTree(mempool, deflatedTree.root, deflatedTree.root, deflatedTree, this.txs);
|
||||||
}
|
}
|
||||||
expiring.forEach(expiringEntry => {
|
expiring.forEach(expiringEntry => {
|
||||||
if (this.txs.has(expiringEntry.key)) {
|
if (this.txs.has(expiringEntry.key)) {
|
||||||
@ -413,7 +415,7 @@ class RbfCache {
|
|||||||
return deflated;
|
return deflated;
|
||||||
}
|
}
|
||||||
|
|
||||||
async importTree(root, txid, deflated, txs: Map<string, MempoolTransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
|
async importTree(mempool, root, txid, deflated, txs: Map<string, MempoolTransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
|
||||||
const treeInfo = deflated[txid];
|
const treeInfo = deflated[txid];
|
||||||
const replaces: RbfTree[] = [];
|
const replaces: RbfTree[] = [];
|
||||||
|
|
||||||
@ -426,9 +428,12 @@ class RbfCache {
|
|||||||
|
|
||||||
// recursively reconstruct child trees
|
// recursively reconstruct child trees
|
||||||
for (const childId of treeInfo.replaces) {
|
for (const childId of treeInfo.replaces) {
|
||||||
const replaced = await this.importTree(root, childId, deflated, txs, mined);
|
const replaced = await this.importTree(mempool, root, childId, deflated, txs, mined);
|
||||||
if (replaced) {
|
if (replaced) {
|
||||||
this.replacedBy.set(replaced.tx.txid, txid);
|
this.replacedBy.set(replaced.tx.txid, txid);
|
||||||
|
if (mempool[replaced.tx.txid]) {
|
||||||
|
mempool[replaced.tx.txid].replacement = true;
|
||||||
|
}
|
||||||
replaces.push(replaced);
|
replaces.push(replaced);
|
||||||
if (replaced.mined) {
|
if (replaced.mined) {
|
||||||
mined = true;
|
mined = true;
|
||||||
|
@ -222,6 +222,7 @@ class RedisCache {
|
|||||||
txs: rbfTxs,
|
txs: rbfTxs,
|
||||||
trees: rbfTrees.map(loadedTree => { loadedTree.value.key = loadedTree.key; return loadedTree.value; }),
|
trees: rbfTrees.map(loadedTree => { loadedTree.value.key = loadedTree.key; return loadedTree.value; }),
|
||||||
expiring: rbfExpirations,
|
expiring: rbfExpirations,
|
||||||
|
mempool: memPool.getMempool(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,6 +94,7 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
|
|||||||
vsize: number,
|
vsize: number,
|
||||||
};
|
};
|
||||||
acceleration?: boolean;
|
acceleration?: boolean;
|
||||||
|
replacement?: boolean;
|
||||||
uid?: number;
|
uid?: number;
|
||||||
flags?: number;
|
flags?: number;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user