bitcoinjs-lib - npm Package Compare versions

Comparing version 2.1.0 to 2.1.1

package.json

 {
   "name": "bitcoinjs-lib",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Client-side Bitcoin JavaScript library",
@@ -5,0 +5,0 @@ "main": "./src/index.js",

src/block.js

 var bufferutils = require('./bufferutils')
 var bcrypto = require('./crypto')
-var bufferReverse = require('buffer-reverse')
 
@@ -74,3 +73,3 @@ var Transaction = require('./transaction')
 Block.prototype.getId = function () {
-  return bufferReverse(this.getHash()).toString('hex')
+  return [].reverse.call(this.getHash()).toString('hex')
 }
@@ -77,0 +76,0 @@

src/script.js

@@ -7,8 +7,13 @@ var bip66 = require('bip66')
 var OPS = require('./opcodes')
-var REVERSE_OPS = []
-for (var op in OPS) {
-  var code = OPS[op]
-  REVERSE_OPS[code] = op
-}
+var REVERSE_OPS = (function () {
+  var result = {}
+  for (var op in OPS) {
+    var code = OPS[op]
+    result[code] = op
+  }
+  return result
+})()
 
+const OP_INT_BASE = OPS.OP_RESERVED // OP_1 - 1
+
 function toASM (chunks) {
@@ -229,19 +234,17 @@ if (types.Buffer(chunks)) {
   var mOp = chunks[0]
-  if (mOp === OPS.OP_0) return false
-  if (mOp < OPS.OP_1) return false
-  if (mOp > OPS.OP_16) return false
-
   var nOp = chunks[chunks.length - 2]
-  if (nOp === OPS.OP_0) return false
-  if (nOp < OPS.OP_1) return false
-  if (nOp > OPS.OP_16) return false
 
-  var m = mOp - (OPS.OP_1 - 1)
-  var n = nOp - (OPS.OP_1 - 1)
-  if (n < m) return false
+  if (!types.Number(mOp)) return false
+  if (!types.Number(nOp)) return false
 
-  var pubKeys = chunks.slice(1, -2)
-  if (n < pubKeys.length) return false
+  var m = mOp - OP_INT_BASE
+  var n = nOp - OP_INT_BASE
 
-  return pubKeys.every(isCanonicalPubKey)
+  // 0 < m <= n <= 16
+  if (m <= 0) return false
+  if (m > n) return false
+  if (n > 16) return false
+  if (n !== chunks.length - 3) return false
+
+  return chunks.slice(1, -2).every(isCanonicalPubKey)
 }
@@ -316,5 +319,5 @@
   return compile([].concat(
-    (OPS.OP_1 - 1) + m,
+    OP_INT_BASE + m,
     pubKeys,
-    (OPS.OP_1 - 1) + n,
+    OP_INT_BASE + n,
     OPS.OP_CHECKMULTISIG
@@ -357,4 +360,4 @@ ))
     var nOp = chunks[chunks.length - 2]
-    var m = mOp - (OPS.OP_1 - 1)
-    var n = nOp - (OPS.OP_1 - 1)
+    var m = mOp - OP_INT_BASE
+    var n = nOp - OP_INT_BASE
 
@@ -361,0 +364,0 @@ if (signatures.length < m) throw new Error('Not enough signatures provided')

src/transaction_builder.js

@@ -5,3 +5,2 @@ var baddress = require('./address')
 var bufferEquals = require('buffer-equals')
-var bufferReverse = require('buffer-reverse/inplace')
 var networks = require('./networks')
@@ -177,4 +176,3 @@ var ops = require('./opcodes')
     // transaction hashs's are displayed in reverse order, un-reverse it
-    txHash = new Buffer(txHash, 'hex')
-    bufferReverse(txHash)
+    txHash = [].reverse.call(new Buffer(txHash, 'hex'))
 
@@ -181,0 +179,0 @@ // is it a Transaction object?

src/transaction.js

 var bcrypto = require('./crypto')
 var bscript = require('./script')
-var bufferReverse = require('buffer-reverse')
 var bufferutils = require('./bufferutils')
@@ -251,3 +250,3 @@ var opcodes = require('./opcodes')
   // transaction hash's are displayed in reverse order
-  return bufferReverse(this.getHash()).toString('hex')
+  return [].reverse.call(this.getHash()).toString('hex')
 }
@@ -254,0 +253,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

82475

decreased by-0.18%

Lines of code

2056

decreased by-0.1%

No dependency changes