From 98dd6a900f3a1f997ffab68651e49f2772b25d5e Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 19 Apr 2019 00:50:54 -0700
Subject: [PATCH] txscript/engine: Check ps2h push before parsing script

This moves the check for non push-only pay-to-script-hash signature
scripts before the script parsing logic when creating a new engine
instance to avoid the extra overhead in the error case.
---
 txscript/engine.go | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/txscript/engine.go b/txscript/engine.go
index 703baef7..576adc71 100644
--- a/txscript/engine.go
+++ b/txscript/engine.go
@@ -918,6 +918,21 @@ func NewEngine(scriptPubKey []byte, tx *wire.MsgTx, txIdx int, flags ScriptFlags
 			"signature script is not push only")
 	}
 
+	// The signature script must only contain data pushes for PS2H which is
+	// determined based on the form of the public key script.
+	if vm.hasFlag(ScriptBip16) && isScriptHashScript(scriptPubKey) {
+		// Only accept input scripts that push data for P2SH.
+		// Notice that the push only checks have already been done when
+		// the flag to verify signature scripts are push only is set
+		// above, so avoid checking again.
+		alreadyChecked := vm.hasFlag(ScriptVerifySigPushOnly)
+		if !alreadyChecked && !IsPushOnlyScript(scriptSig) {
+			return nil, scriptError(ErrNotPushOnly,
+				"pay to script hash is not push only")
+		}
+		vm.bip16 = true
+	}
+
 	// The engine stores the scripts in parsed form using a slice.  This
 	// allows multiple scripts to be executed in sequence.  For example,
 	// with a pay-to-script-hash transaction, there will be ultimately be
@@ -943,19 +958,6 @@ func NewEngine(scriptPubKey []byte, tx *wire.MsgTx, txIdx int, flags ScriptFlags
 	if len(scripts[0]) == 0 {
 		vm.scriptIdx++
 	}
-
-	if vm.hasFlag(ScriptBip16) && isScriptHashScript(scriptPubKey) {
-		// Only accept input scripts that push data for P2SH.
-		// Notice that the push only checks have already been done when
-		// the flag to verify signature scripts are push only is set
-		// above, so avoid checking again.
-		alreadyChecked := vm.hasFlag(ScriptVerifySigPushOnly)
-		if !alreadyChecked && !IsPushOnlyScript(scriptSig) {
-			return nil, scriptError(ErrNotPushOnly,
-				"pay to script hash is not push only")
-		}
-		vm.bip16 = true
-	}
 	if vm.hasFlag(ScriptVerifyMinimalData) {
 		vm.dstack.verifyMinimalData = true
 		vm.astack.verifyMinimalData = true