Browse Source

Merge pull request #1207 from maraoz/fix-p2sh-in

fix bug in recognizing p2sh input scripts
patch-2
Manuel Aráoz 10 years ago
parent
commit
47ffca7f5c
  1. 2
      lib/script/script.js
  2. 4
      test/script/script.js

2
lib/script/script.js

@ -296,7 +296,7 @@ Script.prototype.isScriptHashOut = function() {
* Note that these are frequently indistinguishable from pubkeyhashin * Note that these are frequently indistinguishable from pubkeyhashin
*/ */
Script.prototype.isScriptHashIn = function() { Script.prototype.isScriptHashIn = function() {
if (this.chunks.length === 0) { if (this.chunks.length <= 1) {
return false; return false;
} }
var redeemChunk = this.chunks[this.chunks.length - 1]; var redeemChunk = this.chunks[this.chunks.length - 1];

4
test/script/script.js

@ -322,6 +322,10 @@ describe('Script', function() {
s.isScriptHashIn().should.equal(false); s.isScriptHashIn().should.equal(false);
s2.isScriptHashIn().should.equal(false); s2.isScriptHashIn().should.equal(false);
}); });
it('identifies this other problematic non-p2sh in', function() {
var s = Script.fromString('73 0x3046022100dc7a0a812de14acc479d98ae209402cc9b5e0692bc74b9fe0a2f083e2f9964b002210087caf04a711bebe5339fd7554c4f7940dc37be216a3ae082424a5e164faf549401');
s.isScriptHashIn().should.equal(false);
});
}); });
describe('#isScripthashOut', function() { describe('#isScripthashOut', function() {

Loading…
Cancel
Save