From 27b88ddba96ea88e69de30f44b2c3c537fabf178 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Fri, 1 Jul 2016 02:31:27 -0700 Subject: [PATCH] do not cache redeem script. --- lib/bcoin/script.js | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/lib/bcoin/script.js b/lib/bcoin/script.js index 1b8d3c1a..99178d19 100644 --- a/lib/bcoin/script.js +++ b/lib/bcoin/script.js @@ -39,7 +39,6 @@ function Witness(options) { return new Witness(options); this.items = []; - this.redeem = null; if (options) this.fromOptions(options); @@ -247,18 +246,12 @@ Witness.prototype.test = function test(filter) { */ Witness.prototype.getRedeem = function getRedeem() { - var redeem; + var redeem = this.items[this.items.length - 1]; - if (!this.redeem) { - redeem = this.items[this.items.length - 1]; + if (!redeem) + return; - if (!redeem) - return; - - this.redeem = new Script(redeem); - } - - return this.redeem; + return new Script(redeem); }; /** @@ -1105,7 +1098,6 @@ function Script(options) { this.raw = STACK_FALSE; this.code = []; - this.redeem = null; if (options) this.fromOptions(options); @@ -2602,19 +2594,15 @@ Script.createCommitment = function createCommitment(hash, flags) { Script.prototype.getRedeem = function getRedeem() { var redeem; - if (!this.redeem) { - if (!this.isPushOnly()) - return; + if (!this.isPushOnly()) + return; - redeem = this.code[this.code.length - 1]; + redeem = this.code[this.code.length - 1]; - if (!redeem || !redeem.data) - return; + if (!redeem || !redeem.data) + return; - this.redeem = new Script(redeem.data); - } - - return this.redeem; + return new Script(redeem.data); }; /**