From 57b98b2368c8106a9c215d73e40e1a7ae39042f3 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Wed, 30 Aug 2017 10:14:51 -0700
Subject: [PATCH] tx: refactor hasStandardWitness.

---
 lib/primitives/tx.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/primitives/tx.js b/lib/primitives/tx.js
index 04795cb1..2849e039 100644
--- a/lib/primitives/tx.js
+++ b/lib/primitives/tx.js
@@ -1629,14 +1629,14 @@ TX.prototype.hasStandardWitness = function hasStandardWitness(view) {
           return false;
       }
 
-      const redeem = witness.items[witness.items.length - 1];
+      const raw = witness.items[witness.items.length - 1];
 
-      if (redeem.length > policy.MAX_P2WSH_SIZE)
+      if (raw.length > policy.MAX_P2WSH_SIZE)
         return false;
 
-      prev = new Script(redeem);
+      const redeem = Script.fromRaw(raw);
 
-      if (prev.isPubkey()) {
+      if (redeem.isPubkey()) {
         if (witness.items.length - 1 !== 1)
           return false;
 
@@ -1646,7 +1646,7 @@ TX.prototype.hasStandardWitness = function hasStandardWitness(view) {
         continue;
       }
 
-      if (prev.isPubkeyhash()) {
+      if (redeem.isPubkeyhash()) {
         if (input.witness.items.length - 1 !== 2)
           return false;
 
@@ -1659,7 +1659,7 @@ TX.prototype.hasStandardWitness = function hasStandardWitness(view) {
         continue;
       }
 
-      const [m] = prev.getMultisig();
+      const [m] = redeem.getMultisig();
 
       if (m !== -1) {
         if (witness.items.length - 1 !== m + 1)