mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-23 22:56:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do cheap checks in predicates first before more expensive ones (#2628)

Browse source
This commit is contained in:
Chris Stewart 2021-02-05 17:59:19 -06:00 • committed by GitHub
parent 0d38721b3d
commit bbd1dbc15d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala
View file

@ -1213,8 +1213,8 @@ object WitnessScriptPubKeyV0 extends ScriptFactory[WitnessScriptPubKeyV0] {
* [[https://github.com/bitcoin/bitcoin/blob/449f9b8debcceb61a92043bc7031528a53627c47/src/script/script.cpp#L215-L229]]
*/
def isValid(asm: Seq[ScriptToken]): Boolean = {
WitnessScriptPubKey.isWitnessScriptPubKey(asm) && asm.headOption.contains(
OP_0)
asm.headOption.contains(OP_0) && WitnessScriptPubKey.isWitnessScriptPubKey(
asm)
}
def apply(asm: Seq[ScriptToken]): WitnessScriptPubKeyV0 = fromAsm(asm)
@ -1256,8 +1256,8 @@ object P2WPKHWitnessSPKV0 extends ScriptFactory[P2WPKHWitnessSPKV0] {
def isValid(asm: Seq[ScriptToken]): Boolean = {
val asmBytes = BytesUtil.toByteVector(asm)
WitnessScriptPubKeyV0.isValid(asm) &&
asmBytes.size == 22
asmBytes.size == 22 && WitnessScriptPubKeyV0.isValid(asm)
}
def fromHash(hash: Sha256Hash160Digest): P2WPKHWitnessSPKV0 = {