LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Have calcPriority determine the tx size.

Browse source
This commit is contained in:
David Hill 2015-03-04 11:46:20 -05:00
parent 436fb8203c
commit ad35a5dc48
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mempool.go
View file

@ -832,7 +832,7 @@ func minInt(a, b int) int {
// of each of its input values multiplied by their age (# of confirmations). // of each of its input values multiplied by their age (# of confirmations).
// Thus, the final formula for the priority is: // Thus, the final formula for the priority is:
// sum(inputValue * inputAge) / adjustedTxSize // sum(inputValue * inputAge) / adjustedTxSize
func calcPriority(tx *btcutil.Tx, serializedTxSize int, inputValueAge float64) float64 { func calcPriority(tx *btcutil.Tx, inputValueAge float64) float64 {
// In order to encourage spending multiple old unspent transaction // In order to encourage spending multiple old unspent transaction
// outputs thereby reducing the total set, don't count the constant // outputs thereby reducing the total set, don't count the constant
// overhead for each input as well as enough bytes of the signature // overhead for each input as well as enough bytes of the signature
@ -859,6 +859,7 @@ func calcPriority(tx *btcutil.Tx, serializedTxSize int, inputValueAge float64) f
overhead += 41 + minInt(110, len(txIn.SignatureScript)) overhead += 41 + minInt(110, len(txIn.SignatureScript))
} }
serializedTxSize := tx.MsgTx().SerializeSize()
if overhead >= serializedTxSize { if overhead >= serializedTxSize {
return 0.0 return 0.0
} }
@ -877,8 +878,7 @@ func (txD *TxDesc) StartingPriority(txStore blockchain.TxStore) float64 {
// Compute our starting priority caching the result. // Compute our starting priority caching the result.
inputAge := calcInputValueAge(txD, txStore, txD.Height) inputAge := calcInputValueAge(txD, txStore, txD.Height)
txSize := txD.Tx.MsgTx().SerializeSize() txD.startingPriority = calcPriority(txD.Tx, inputAge)
txD.startingPriority = calcPriority(txD.Tx, txSize, inputAge)
return txD.startingPriority return txD.startingPriority
} }
@ -887,8 +887,7 @@ func (txD *TxDesc) StartingPriority(txStore blockchain.TxStore) float64 {
// underlying transaction relative to the next block height. // underlying transaction relative to the next block height.
func (txD *TxDesc) CurrentPriority(txStore blockchain.TxStore, nextBlockHeight int64) float64 { func (txD *TxDesc) CurrentPriority(txStore blockchain.TxStore, nextBlockHeight int64) float64 {
inputAge := calcInputValueAge(txD, txStore, nextBlockHeight) inputAge := calcInputValueAge(txD, txStore, nextBlockHeight)
txSize := txD.Tx.MsgTx().SerializeSize() return calcPriority(txD.Tx, inputAge)
return calcPriority(txD.Tx, txSize, inputAge)
} }
// checkPoolDoubleSpend checks whether or not the passed transaction is // checkPoolDoubleSpend checks whether or not the passed transaction is