Skip to content

Commit

Permalink
fix Script parsing for some cases, setup ScriptInterpreter tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@maraoz
maraoz committed Mar 7, 2014
1 parent 1a9c062 commit e83590f
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 72 deletions.
24 changes: 22 additions & 2 deletions Script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,17 +271,33 @@ function spec(b) {
for (var i = 0; i < split.length; i++) {
var word = split[i];
if (word.length > 2 && word.substring(0, 2) === '0x') {
// raw hex value
//console.log('hex value');
chunks.push(new Buffer(word.substring(2, word.length), 'hex'));
} else {
var opcode = Opcode.map['OP_' + word];
if (opcode) {
// op code in string form
//console.log('opcode');
chunks.push(opcode);
} else {
var integer = parseInt(word);
if (!isNaN(integer)) {
//console.log(integer+' bits=\t'+integer.toString(2).replace('-','').length);
// integer
//console.log('integer');
var data = util.intToBuffer(integer);
chunks.push(data);
} else if (word[0] === '\'' && word[word.length-1] === '\'') {
// string
//console.log('string');
word = word.substring(1,word.length-1);
var hex = '';
for(var c=0;c<word.length;c++) {
hex += ''+word.charCodeAt(c).toString(16);
}
chunks.push(new Buffer(hex,'hex'));
} else {
throw new Error('Could not parse word from script: ' +word);
}
}
}
Expand All @@ -307,7 +323,11 @@ function spec(b) {
}

if (Buffer.isBuffer(chunk)) {
s += '0x' + util.formatBuffer(chunk, truncate ? null : 0);
if (chunk.length === 0) {
s += '\'\''
} else {
s += '0x' + util.formatBuffer(chunk, truncate ? null : 0);
}
} else {
s += Opcode.reverseMap[chunk];
}
Expand Down
122 changes: 61 additions & 61 deletions ScriptInterpreter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,22 @@ function spec(b) {
}

if (this.disableUnsafeOpcodes &&
"number" === typeof opcode &&
(opcode === OP_CAT ||
opcode === OP_SUBSTR ||
opcode === OP_LEFT ||
opcode === OP_RIGHT ||
opcode === OP_INVERT ||
opcode === OP_AND ||
opcode === OP_OR ||
opcode === OP_XOR ||
opcode === OP_2MUL ||
opcode === OP_2DIV ||
opcode === OP_MUL ||
opcode === OP_DIV ||
opcode === OP_MOD ||
opcode === OP_LSHIFT ||
opcode === OP_RSHIFT)) {
"number" === typeof opcode &&
(opcode === OP_CAT ||
opcode === OP_SUBSTR ||
opcode === OP_LEFT ||
opcode === OP_RIGHT ||
opcode === OP_INVERT ||
opcode === OP_AND ||
opcode === OP_OR ||
opcode === OP_XOR ||
opcode === OP_2MUL ||
opcode === OP_2DIV ||
opcode === OP_MUL ||
opcode === OP_DIV ||
opcode === OP_MOD ||
opcode === OP_LSHIFT ||
opcode === OP_RSHIFT)) {
throw new Error("Encountered a disabled opcode");
}

Expand Down Expand Up @@ -615,34 +615,34 @@ function spec(b) {

// Verify signature
checkSig(sig, pubkey, scriptCode, tx, inIndex, hashType, function(e, result) {
try {
try {
var success;

if (e) {
// We intentionally ignore errors during signature verification and
// treat these cases as an invalid signature.
success = false;
// We intentionally ignore errors during signature verification and
// treat these cases as an invalid signature.
success = false;
} else {
success = result;
success = result;
}

// Update stack
this.stackPop();
this.stackPop();
this.stack.push(new Buffer([success ? 1 : 0]));
if (opcode === OP_CHECKSIGVERIFY) {
if (success) {
this.stackPop();
} else {
throw new Error("OP_CHECKSIGVERIFY negative");
}
if (success) {
this.stackPop();
} else {
throw new Error("OP_CHECKSIGVERIFY negative");
}
}

// Run next step
executeStep.call(this, cb);
} catch (e) {
cb(e);
}
} catch (e) {
cb(e);
}
}.bind(this));

// Note that for asynchronous opcodes we have to return here to prevent
Expand Down Expand Up @@ -686,12 +686,12 @@ function spec(b) {

// Drop the signatures, since a signature can't sign itself
sigs.forEach(function(sig) {
scriptCode.findAndDelete(sig);
});
scriptCode.findAndDelete(sig);
});

var success = true,
isig = 0,
ikey = 0;
isig = 0,
ikey = 0;
checkMultiSigStep.call(this);

function checkMultiSigStep() {
Expand All @@ -701,26 +701,26 @@ function spec(b) {
var key = keys[ikey];

checkSig(sig, key, scriptCode, tx, inIndex, hashType, function(e, result) {
try {
try {
if (!e && result) {
isig++;
sigsCount--;
isig++;
sigsCount--;
} else {
ikey++;
keysCount--;

// If there are more signatures than keys left, then too many
// signatures have failed
if (sigsCount > keysCount) {
success = false;
}
ikey++;
keysCount--;

// If there are more signatures than keys left, then too many
// signatures have failed
if (sigsCount > keysCount) {
success = false;
}
}

checkMultiSigStep.call(this);
} catch (e) {
} catch (e) {
cb(e);
}
}.bind(this));
}
}.bind(this));
} else {
this.stack.push(new Buffer([success ? 1 : 0]));
if (opcode === OP_CHECKMULTISIGVERIFY) {
Expand Down Expand Up @@ -763,7 +763,7 @@ function spec(b) {
}
} catch (e) {
log.debug("Script aborted: " +
(e.message ? e : e));
(e.message ? e.message : e));
cb(e);
}
}
Expand All @@ -774,14 +774,14 @@ function spec(b) {
var self = this;

self.eval(scriptSig, tx, n, hashType, function(e) {
if (e) {
if (e) {
callback(e)
return;
}
}

self.eval(scriptPubkey, tx, n, hashType, callback);
});
};
self.eval(scriptPubkey, tx, n, hashType, callback);
});
};

/**
* Get the top element of the stack.
Expand Down Expand Up @@ -821,7 +821,7 @@ function spec(b) {
}

var s = this.stack,
l = s.length;
l = s.length;

var tmp = s[l - a];
s[l - a] = s[l - b];
Expand All @@ -836,16 +836,16 @@ function spec(b) {
*/
ScriptInterpreter.prototype.getPrimitiveStack = function getPrimitiveStack() {
return this.stack.map(function(entry) {
if (entry.length > 2) {
if (entry.length > 2) {
return buffertools.toHex(entry.slice(0));
}
var num = castBigint(entry);
if (num.cmp(-128) >= 0 && num.cmp(127) <= 0) {
}
var num = castBigint(entry);
if (num.cmp(-128) >= 0 && num.cmp(127) <= 0) {
return num.toNumber();
} else {
} else {
return buffertools.toHex(entry.slice(0));
}
});
}
});
};

var castBool = ScriptInterpreter.castBool = function castBool(v) {
Expand Down
10 changes: 5 additions & 5 deletions test/data/script_valid.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[
["0x01 0x0b", "11 EQUAL", "push 1 byte"],
["0x02 0x417a", "0x417a EQUAL"],
["0x02 0x417a", "'Az' EQUAL"],
["0x4b 0x417a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a",
"0x417a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a EQUAL", "push 75 bytes"],
"'Azzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz' EQUAL", "push 75 bytes"],

["0x4c 0x01 0x07","7 EQUAL", "0x4c is OP_PUSHDATA1"],
["0x4d 0x0100 0x08","8 EQUAL", "0x4d is OP_PUSHDATA2"],
Expand All @@ -11,7 +11,7 @@
["0x4c 0x00","0 EQUAL"],
["0x4d 0x0000","0 EQUAL"],
["0x4e 0x00000000","0 EQUAL"],
["0x4f 0x03e8 ADD","0x03e7 EQUAL"],
["0x4f 1000 ADD","999 EQUAL"],
["0", "IF 0x50 ENDIF 1", "0x50 is reserved (ok if not executed)"],
["0x51", "0x5f ADD 0x60 EQUAL", "0x51 through 0x60 push 1 through 16 onto stack"],
["1","NOP"],
Expand Down Expand Up @@ -53,8 +53,8 @@

["1 1", "VERIFY"],

["10 0 11 TOALTSTACK DROP FROMALTSTACK", "ADD 0x15 EQUAL"],
["0x676176696e5f7761735f68657265 TOALTSTACK 11 FROMALTSTACK", "0x676176696e5f7761735f68657265 EQUALVERIFY 11 EQUAL"],
["10 0 11 TOALTSTACK DROP FROMALTSTACK", "ADD 21 EQUAL"],
["'gavin_was_here' TOALTSTACK 11 FROMALTSTACK", "'gavin_was_here' EQUALVERIFY 11 EQUAL"],

["0 IFDUP", "DEPTH 1 EQUALVERIFY 0 EQUAL"],
["1 IFDUP", "DEPTH 2 EQUALVERIFY 1 EQUALVERIFY 1 EQUAL"],
Expand Down
4 changes: 0 additions & 4 deletions test/test.Script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,13 @@ describe('Script', function() {
});
});



test_data.dataScriptValid.forEach(function(datum) {
if (datum.length < 2) throw new Error('Invalid test data');
var human = datum[0] + ' ' + datum[1];
it('should parse script from human readable ' + human, function() {
var h2 = Script.fromStringContent(human).getStringContent(false, null);
Script.fromStringContent(h2).getStringContent(false, null).should.equal(h2);
});


});

});
22 changes: 22 additions & 0 deletions test/test.ScriptInterpreter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ var chai = require('chai');
var bitcore = require('../bitcore');

var should = chai.should();
var test_data = require('./testdata');

var ScriptInterpreterModule = bitcore.ScriptInterpreter;
var Script = bitcore.Script.class();
var ScriptInterpreter;

describe('ScriptInterpreter', function() {
Expand All @@ -20,6 +22,26 @@ describe('ScriptInterpreter', function() {
var si = new ScriptInterpreter();
should.exist(si);
});
var i = 0;
test_data.dataScriptValid.forEach(function(datum) {
if (datum.length < 2) throw new Error('Invalid test data');
var scriptSig = datum[0]; // script inputs
var scriptPubKey = datum[1]; // output script
var human = scriptSig + ' ' + scriptPubKey;
it('should validate script ' + human, function(done) {
i++;
console.log(i + ' ' + human);
ScriptInterpreter.verify(Script.fromStringContent(scriptSig),
Script.fromStringContent(scriptPubKey),
null, 0, 0, // tx, output index, and hashtype
function (err, result) {
should.not.exist(err);
result.should.equal(true);
done();
}
);
});
});
});


Expand Down
1 change: 1 addition & 0 deletions test/testdata.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ module.exports.dataTxValid = dataTxValid;
module.exports.dataTxInvalid = dataTxInvalid;
module.exports.dataScriptValid = dataScriptValid;
module.exports.dataScriptInvalid = dataScriptInvalid;
module.exports.dataScriptAll = dataScriptValid.concat(dataScriptInvalid);

0 comments on commit e83590f

Please sign in to comment.