RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

script: cleanup.

Browse Source
This commit is contained in:
Christopher Jeffrey 2015-12-09 10:42:36 -08:00
parent 89f2a0dcc3
commit c869578009
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bcoin/script.js
View File

@ -139,8 +139,6 @@ script.execute = function execute(s, stack, tx, index) {
stack.alt = stack.alt || []; stack.alt = stack.alt || [];
// TODO: if statements
for (var pc = 0; pc < s.length; pc++) { for (var pc = 0; pc < s.length; pc++) {
var o = s[pc]; var o = s[pc];
@ -165,6 +163,8 @@ script.execute = function execute(s, stack, tx, index) {
// OP_EVAL // OP_EVAL
// if (o === 'nop1') { // if (o === 'nop1') {
// var evalScript = script.decode(stack.pop()); // var evalScript = script.decode(stack.pop());
// if (!Array.isArray(evalScript))
// return false;
// var res = script.execute(evalScript, stack, tx, index); // var res = script.execute(evalScript, stack, tx, index);
// if (!res) // if (!res)
// return false; // return false;
@ -399,13 +399,6 @@ script.execute = function execute(s, stack, tx, index) {
stack.push(n.toArray()); stack.push(n.toArray());
// stack.push(res ? [ 1 ] : []); // stack.push(res ? [ 1 ] : []);
} }
// stack.push(n.toArray());
// if (op == 'numeqverify') {
// if (n.cmp(0) !== 0)
// stack.pop();
// else
// return false;
// }
break; break;
case 'within': case 'within':
if (stack.length < 3) if (stack.length < 3)
@ -464,7 +457,6 @@ script.execute = function execute(s, stack, tx, index) {
if (!script.isValidSig(sig)) if (!script.isValidSig(sig))
return false; return false;
// var subscript = input.out.tx.getSubscript(input.out.index);
var subscript = s.slice(lastSep + 1); var subscript = s.slice(lastSep + 1);
var hash = tx.subscriptHash(index, subscript, type); var hash = tx.subscriptHash(index, subscript, type);
@ -506,24 +498,18 @@ script.execute = function execute(s, stack, tx, index) {
// Get signatures // Get signatures
var succ = 0; var succ = 0;
// for (var i = 0, j = 0; i < m && j < n; i++) {
for (var i = 0; i < m; i++) { for (var i = 0; i < m; i++) {
var sig = stack.pop(); var sig = stack.pop();
var type = sig[sig.length - 1]; var type = sig[sig.length - 1];
if (!constants.rhashType[type & 0x7f]) if (!constants.rhashType[type & 0x7f])
return false; return false;
// var subscript = input.out.tx.getSubscript(input.out.index);
var subscript = s.slice(lastSep + 1); var subscript = s.slice(lastSep + 1);
var hash = tx.subscriptHash(index, subscript, type); var hash = tx.subscriptHash(index, subscript, type);
if (!script.isValidSig(sig)) if (!script.isValidSig(sig))
return false; return false;
// var res = false;
// for (; !res && j < n; j++)
// res = script.verify(hash, sig.slice(0, -1), keys[j]);
// Strict order: // Strict order:
var res = script.verify(hash, sig.slice(0, -1), keys.pop()); var res = script.verify(hash, sig.slice(0, -1), keys.pop());
if (res) if (res)