mirrors/btcd
1
0
Fork 0
mirror of https://github.com/btcsuite/btcd.git synced 2025-02-22 14:22:49 +01:00
Code Issues Projects Releases Wiki Activity

blockchain: only populate hashcache if tx is segwitty

Browse source
This commit is contained in:
Olaoluwa Osuntokun 2017-03-09 14:44:07 -08:00 • committed by Dave Collins
parent f5dec67086
commit fad0d1d56c
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
blockchain/scriptval.go
View file

@ -206,18 +206,27 @@ func ValidateTransactionScripts(tx *btcutil.Tx, utxoView *UtxoViewpoint,
flags txscript.ScriptFlags, sigCache *txscript.SigCache, flags txscript.ScriptFlags, sigCache *txscript.SigCache,
hashCache *txscript.HashCache) error { hashCache *txscript.HashCache) error {
// First determine if segwit is active according to the scriptFlags. If
// it isn't then we don't need to interact with the HashCache.
segwitActive := flags&txscript.ScriptVerifyWitness == txscript.ScriptVerifyWitness
// If the hashcache doesn't yet has the sighash midstate for this // If the hashcache doesn't yet has the sighash midstate for this
// transaction, then we'll compute them now so we can re-use them // transaction, then we'll compute them now so we can re-use them
// amongst all worker validation goroutines. // amongst all worker validation goroutines.
if !hashCache.ContainsHashes(tx.Hash()) { if segwitActive && tx.MsgTx().HasWitness() &&
!hashCache.ContainsHashes(tx.Hash()) {
hashCache.AddSigHashes(tx.MsgTx()) hashCache.AddSigHashes(tx.MsgTx())
} }
// The same pointer to the transaction's sighash midstate will be var cachedHashes *txscript.TxSigHashes
// re-used amongst all validation goroutines. By pre-computing the if segwitActive && tx.MsgTx().HasWitness() {
// sighash here instead of during validation, we ensure the sighashes // The same pointer to the transaction's sighash midstate will
// are only computed once. // be re-used amongst all validation goroutines. By
cachedHashes, _ := hashCache.GetSigHashes(tx.Hash()) // pre-computing the sighash here instead of during validation,
// we ensure the sighashes
// are only computed once.
cachedHashes, _ = hashCache.GetSigHashes(tx.Hash())
}
// Collect all of the transaction inputs and required information for // Collect all of the transaction inputs and required information for
// validation. // validation.
@ -268,14 +277,14 @@ func checkBlockScripts(block *btcutil.Block, utxoView *UtxoViewpoint,
// sighashes for the transaction. This allows us to take // sighashes for the transaction. This allows us to take
// advantage of the potential speed savings due to the new // advantage of the potential speed savings due to the new
// digest algorithm (BIP0143). // digest algorithm (BIP0143).
if segwitActive && tx.MsgTx().HasWitness() && hashCache != nil && if segwitActive && tx.HasWitness() && hashCache != nil &&
!hashCache.ContainsHashes(hash) { !hashCache.ContainsHashes(hash) {
hashCache.AddSigHashes(tx.MsgTx()) hashCache.AddSigHashes(tx.MsgTx())
} }
var cachedHashes *txscript.TxSigHashes var cachedHashes *txscript.TxSigHashes
if segwitActive && tx.MsgTx().HasWitness() { if segwitActive && tx.HasWitness() {
if hashCache != nil { if hashCache != nil {
cachedHashes, _ = hashCache.GetSigHashes(hash) cachedHashes, _ = hashCache.GetSigHashes(hash)
} else { } else {
@ -314,7 +323,9 @@ func checkBlockScripts(block *btcutil.Block, utxoView *UtxoViewpoint,
// them from the cache. // them from the cache.
if segwitActive && hashCache != nil { if segwitActive && hashCache != nil {
for _, tx := range block.Transactions() { for _, tx := range block.Transactions() {
hashCache.PurgeSigHashes(tx.Hash()) if tx.MsgTx().HasWitness() {
hashCache.PurgeSigHashes(tx.Hash())
}
} }
} }