txscript: Optimize GetSigOpCount.
This converts the GetSigOpCount function to make use of the new tokenizer instead of the far less efficient parseScript thereby significantly optimizing the function. A new function named countSigOpsV0 which accepts the raw script is introduced to perform the bulk of the work so it can be reused for precise signature operation counting as well in a later commit. It retains the same semantics in terms of counting the number of signature operations either up to the first parse error or the end of the script in the case it parses successfully as required by consensus. Finally, this also deprecates the getSigOpCount function that requires opcodes in favor of the new function and modifies the comment on GetSigOpCount to explicitly call out the script version semantics. The following is a before and after comparison of analyzing a large script: benchmark old ns/op new ns/op delta BenchmarkGetSigOpCount-8 61051 677 -98.89% benchmark old allocs new allocs delta BenchmarkGetSigOpCount-8 1 0 -100.00% benchmark old bytes new bytes delta BenchmarkGetSigOpCount-8 311299 0 -100.00%
This commit is contained in:
parent
8316a06a0e
commit
4d5c0b2529
1 changed files with 62 additions and 4 deletions
|
@ -741,6 +741,8 @@ func asSmallInt(op byte) int {
|
||||||
// signature operations in the script provided by pops. If precise mode is
|
// signature operations in the script provided by pops. If precise mode is
|
||||||
// requested then we attempt to count the number of operations for a multisig
|
// requested then we attempt to count the number of operations for a multisig
|
||||||
// op. Otherwise we use the maximum.
|
// op. Otherwise we use the maximum.
|
||||||
|
//
|
||||||
|
// DEPRECATED. Use countSigOpsV0 instead.
|
||||||
func getSigOpCount(pops []parsedOpcode, precise bool) int {
|
func getSigOpCount(pops []parsedOpcode, precise bool) int {
|
||||||
nSigs := 0
|
nSigs := 0
|
||||||
for i, pop := range pops {
|
for i, pop := range pops {
|
||||||
|
@ -771,15 +773,71 @@ func getSigOpCount(pops []parsedOpcode, precise bool) int {
|
||||||
return nSigs
|
return nSigs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// countSigOpsV0 returns the number of signature operations in the provided
|
||||||
|
// script up to the point of the first parse failure or the entire script when
|
||||||
|
// there are no parse failures. The precise flag attempts to accurately count
|
||||||
|
// the number of operations for a multisig operation versus using the maximum
|
||||||
|
// allowed.
|
||||||
|
//
|
||||||
|
// WARNING: This function always treats the passed script as version 0. Great
|
||||||
|
// care must be taken if introducing a new script version because it is used in
|
||||||
|
// consensus which, unfortunately as of the time of this writing, does not check
|
||||||
|
// script versions before counting their signature operations which means nodes
|
||||||
|
// on existing rules will count new version scripts as if they were version 0.
|
||||||
|
func countSigOpsV0(script []byte, precise bool) int {
|
||||||
|
const scriptVersion = 0
|
||||||
|
|
||||||
|
numSigOps := 0
|
||||||
|
tokenizer := MakeScriptTokenizer(scriptVersion, script)
|
||||||
|
prevOp := byte(OP_INVALIDOPCODE)
|
||||||
|
for tokenizer.Next() {
|
||||||
|
switch tokenizer.Opcode() {
|
||||||
|
case OP_CHECKSIG, OP_CHECKSIGVERIFY:
|
||||||
|
numSigOps++
|
||||||
|
|
||||||
|
case OP_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY:
|
||||||
|
// Note that OP_0 is treated as the max number of sigops here in
|
||||||
|
// precise mode despite it being a valid small integer in order to
|
||||||
|
// highly discourage multisigs with zero pubkeys.
|
||||||
|
//
|
||||||
|
// Also, even though this is referred to as "precise" counting, it's
|
||||||
|
// not really precise at all due to the small int opcodes only
|
||||||
|
// covering 1 through 16 pubkeys, which means this will count any
|
||||||
|
// more than that value (e.g. 17, 18 19) as the maximum number of
|
||||||
|
// allowed pubkeys. This is, unfortunately, now part of
|
||||||
|
// the Bitcion consensus rules, due to historical
|
||||||
|
// reasons. This could be made more correct with a new
|
||||||
|
// script version, however, ideally all multisignaure
|
||||||
|
// operations in new script versions should move to
|
||||||
|
// aggregated schemes such as Schnorr instead.
|
||||||
|
if precise && prevOp >= OP_1 && prevOp <= OP_16 {
|
||||||
|
numSigOps += asSmallInt(prevOp)
|
||||||
|
} else {
|
||||||
|
numSigOps += MaxPubKeysPerMultiSig
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
// Not a sigop.
|
||||||
|
}
|
||||||
|
|
||||||
|
prevOp = tokenizer.Opcode()
|
||||||
|
}
|
||||||
|
|
||||||
|
return numSigOps
|
||||||
|
}
|
||||||
|
|
||||||
// GetSigOpCount provides a quick count of the number of signature operations
|
// GetSigOpCount provides a quick count of the number of signature operations
|
||||||
// in a script. a CHECKSIG operations counts for 1, and a CHECK_MULTISIG for 20.
|
// in a script. a CHECKSIG operations counts for 1, and a CHECK_MULTISIG for 20.
|
||||||
// If the script fails to parse, then the count up to the point of failure is
|
// If the script fails to parse, then the count up to the point of failure is
|
||||||
// returned.
|
// returned.
|
||||||
|
//
|
||||||
|
// WARNING: This function always treats the passed script as version 0. Great
|
||||||
|
// care must be taken if introducing a new script version because it is used in
|
||||||
|
// consensus which, unfortunately as of the time of this writing, does not check
|
||||||
|
// script versions before counting their signature operations which means nodes
|
||||||
|
// on existing rules will count new version scripts as if they were version 0.
|
||||||
func GetSigOpCount(script []byte) int {
|
func GetSigOpCount(script []byte) int {
|
||||||
// Don't check error since parseScript returns the parsed-up-to-error
|
return countSigOpsV0(script, false)
|
||||||
// list of pops.
|
|
||||||
pops, _ := parseScript(script)
|
|
||||||
return getSigOpCount(pops, false)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// finalOpcodeData returns the data associated with the final opcode in the
|
// finalOpcodeData returns the data associated with the final opcode in the
|
||||||
|
|
Loading…
Reference in a new issue