Merge branch 'cash' of https://github.com/bitpay/bitcore-lib into cash

bitpay · May 1, 2018 · 44b6521 · 44b6521
2 parents 029f231 + cc4a7ae
commit 44b6521
Show file tree

Hide file tree

Showing 14 changed files with 2,895 additions and 1,619 deletions.
diff --git a/lib/crypto/bn.js b/lib/crypto/bn.js
@@ -172,18 +172,6 @@ BN.prototype.toScriptNumBuffer = function() {
   });
 };
 
-BN.prototype.gt = function(b) {
-  return this.cmp(b) > 0;
-};
-
-BN.prototype.gte = function(b) {
-  return this.cmp(b) >= 0;
-};
-
-BN.prototype.lt = function(b) {
-  return this.cmp(b) < 0;
-};
-
 BN.trim = function(buf, natlen) {
   return buf.slice(natlen - buf.length, buf.length);
 };

diff --git a/lib/crypto/signature.js b/lib/crypto/signature.js
@@ -291,7 +291,7 @@ Signature.prototype.hasDefinedHashtype = function() {
     return false;
   }
   // accept with or without Signature.SIGHASH_ANYONECANPAY by ignoring the bit
-  var temp = this.nhashtype & ~Signature.SIGHASH_ANYONECANPAY;
+  var temp = this.nhashtype & 0x1F
   if (temp < Signature.SIGHASH_ALL || temp > Signature.SIGHASH_SINGLE) {
     return false;
   }

diff --git a/lib/opcode.js b/lib/opcode.js
@@ -137,9 +137,9 @@ Opcode.map = {
 
   // splice ops
   OP_CAT: 126,
-  OP_SUBSTR: 127,
-  OP_LEFT: 128,
-  OP_RIGHT: 129,
+  OP_SPLIT: 127,
+  OP_NUM2BIN: 128,
+  OP_BIN2NUM: 129,
   OP_SIZE: 130,
 
   // bit logic
@@ -197,6 +197,7 @@ Opcode.map = {
   OP_CHECKMULTISIGVERIFY: 175,
 
   OP_CHECKLOCKTIMEVERIFY: 177,
+  OP_CHECKSEQUENCEVERIFY: 178,
 
   // expansion
   OP_NOP1: 176,