@exodus/bitcoinjs-lib-forks 0.0.5 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoinjs-lib-forks",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Client-side Bitcoin Forks JavaScript library",
   "main": "./src/index.js",
   "engines": {
@@ -35,7 +35,6 @@
   "dependencies": {
     "@exodus/crypto": "^1.0.0-rc.27",
     "bech32": "0.0.3",
-    "bigi": "^1.4.0",
     "bip66": "^1.1.0",
     "bitcoin-ops": "^1.3.0",
     "pushdata-bitcoin": "^1.0.1",

package/src/ecsignature.js

@@ -2,99 +2,32 @@ var bip66 = require('bip66')
 var typeforce = require('typeforce')
 var types = require('./types')
 
-var BigInteger = require('bigi')
-
-function ECSignature (r, s) {
-  typeforce(types.tuple(types.BigInt, types.BigInt), arguments)
-
-  this.r = r
-  this.s = s
-}
-
-ECSignature.parseCompact = function (buffer) {
-  typeforce(types.BufferN(65), buffer)
-
-  var flagByte = buffer.readUInt8(0) - 27
-  if (flagByte !== (flagByte & 7)) throw new Error('Invalid signature parameter')
-
-  var compressed = !!(flagByte & 4)
-  var recoveryParam = flagByte & 3
-  var signature = ECSignature.fromRSBuffer(buffer.slice(1))
-
-  return {
-    compressed: compressed,
-    i: recoveryParam,
-    signature: signature
-  }
-}
-
-ECSignature.fromRSBuffer = function (buffer) {
+// Parses buffer as an unsigned integer and converts to DER
+// minimum width but highest bit is 0 for unsigned
+function toDer (buf) {
+  let start = 0
+  while (start < buf.length && buf[start] === 0) start++
+  if (start > 0) buf = buf.slice(start)
+  if (buf.length === 0) return Buffer.alloc(1)
+  const prefix = Buffer.alloc(buf[0] >= 0x80 ? 1 : 0)
+  return Buffer.concat([prefix, buf]) // copies
+}
+
+exports.fromRSBuffer = function (buffer) {
   typeforce(types.BufferN(64), buffer)
-
-  var r = BigInteger.fromBuffer(buffer.slice(0, 32))
-  var s = BigInteger.fromBuffer(buffer.slice(32, 64))
-  return new ECSignature(r, s)
-}
-
-ECSignature.fromDER = function (buffer) {
-  var decode = bip66.decode(buffer)
-  var r = BigInteger.fromDERInteger(decode.r)
-  var s = BigInteger.fromDERInteger(decode.s)
-
-  return new ECSignature(r, s)
-}
-
-// BIP62: 1 byte hashType flag (only 0x01, 0x02, 0x03, 0x81, 0x82 and 0x83 are allowed)
-ECSignature.parseScriptSignature = function (buffer) {
-  var hashType = buffer.readUInt8(buffer.length - 1)
-  var hashTypeMod = hashType & ~0xc0
-
-  if (hashTypeMod <= 0x00 || hashTypeMod >= 0x04) throw new Error('Invalid hashType ' + hashType)
+  const r = toDer(buffer.slice(0, 32))
+  const s = toDer(buffer.slice(32, 64))
 
   return {
-    signature: ECSignature.fromDER(buffer.slice(0, -1)),
-    hashType: hashType
-  }
-}
-
-ECSignature.prototype.toCompact = function (i, compressed) {
-  if (compressed) {
-    i += 4
-  }
-
-  i += 27
-
-  var buffer = Buffer.alloc(65)
-  buffer.writeUInt8(i, 0)
-  this.toRSBuffer(buffer, 1)
-  return buffer
-}
+    toScriptSignature (hashType) {
+      var hashTypeMod = hashType & ~0xc0
+      if (hashTypeMod <= 0 || hashTypeMod >= 4) throw new Error('Invalid hashType ' + hashType)
 
-ECSignature.prototype.toDER = function () {
-  var r = Buffer.from(this.r.toDERInteger())
-  var s = Buffer.from(this.s.toDERInteger())
+      var hashTypeBuffer = Buffer.alloc(1)
+      hashTypeBuffer.writeUInt8(hashType, 0)
 
-  return bip66.encode(r, s)
-}
-
-const N = BigInteger.fromHex('ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551')
-ECSignature.prototype.toRSBuffer = function (buffer, offset, { canonical } = {}) {
-  buffer = buffer || Buffer.alloc(64)
-  this.r.toBuffer(32).copy(buffer, offset)
-  let s = this.s
-  if (canonical && s.compareTo(N) >= 0) s = N.subtract(s)
-  s.toBuffer(32).copy(buffer, offset + 32)
-  return buffer
-}
-
-ECSignature.prototype.toScriptSignature = function (hashType) {
-  var hashTypeMod = hashType & ~0xc0
-  if (hashTypeMod <= 0 || hashTypeMod >= 4) throw new Error('Invalid hashType ' + hashType)
-
-  var hashTypeBuffer = Buffer.alloc(1)
-  hashTypeBuffer.writeUInt8(hashType, 0)
-
-  return Buffer.concat([this.toDER(), hashTypeBuffer])
+      const der = bip66.encode(r, s)
+      return Buffer.concat([der, hashTypeBuffer])
+    }
+  }
 }
-
-module.exports = ECSignature

package/src/index.js

@@ -1,20 +1,4 @@
-var script = require('./script')
-
-var templates = require('./templates')
-for (var key in templates) {
-  script[key] = templates[key]
-}
-
-module.exports = {
-  bufferutils: require('./bufferutils'), // TODO: remove in 4.0.0
-
-  ECSignature: require('./ecsignature'),
-  Transaction: require('./transaction'),
-  TransactionBuilder: require('./transaction_builder'),
-
-  address: require('./address'),
-  crypto: require('./crypto'),
-  networks: require('./networks'),
-  opcodes: require('bitcoin-ops'),
-  script: script
-}
+exports.Transaction = require('./transaction')
+exports.TransactionBuilder = require('./transaction_builder')
+exports.address = require('./address')
+exports.networks = require('./networks')

package/src/transaction_builder.js

@@ -12,7 +12,6 @@ var P2SH = SIGNABLE.concat([btemplates.types.P2WPKH, btemplates.types.P2WSH])
 
 var ECSignature = require('./ecsignature')
 var Transaction = require('./transaction')
-const { ecdsaVerifyHashSync } = require('@exodus/crypto/secp256k1')
 
 function supportedType (type) {
   return SIGNABLE.indexOf(type) !== -1
@@ -172,59 +171,6 @@ function expandInput (scriptSig, witnessStack) {
   return result
 }
 
-// could be done in expandInput, but requires the original Transaction for hashForSignature
-function fixMultisigOrder (input, transaction, vin, value, forkId) {
-  if (input.redeemScriptType !== scriptTypes.MULTISIG || !input.redeemScript) return
-  if (input.pubKeys.length === input.signatures.length) return
-
-  var unmatched = input.signatures.concat()
-
-  input.signatures = input.pubKeys.map(function (pubKey) {
-    var match
-
-    // check for a signature
-    unmatched.some(function (signature, i) {
-      // skip if undefined || OP_0
-      if (!signature) return false
-
-      // TODO: avoid O(n) hashForSignature
-      var parsed = ECSignature.parseScriptSignature(signature)
-      var hash
-      switch (forkId) {
-        case Transaction.FORKID_BCH:
-          hash = transaction.hashForCashSignature(vin, input.signScript, value, parsed.hashType)
-          break
-        case Transaction.FORKID_BTG:
-          hash = transaction.hashForGoldSignature(vin, input.signScript, value, parsed.hashType)
-          break
-        default:
-          if (input.witness) {
-            hash = transaction.hashForWitnessV0(vin, input.signScript, value, parsed.hashType)
-          } else {
-            hash = transaction.hashForSignature(vin, input.signScript, parsed.hashType)
-          }
-          break
-      }
-
-      // skip if signature does not match pubKey
-      // Allow non-normalized though
-      if (!ecdsaVerifyHashSync({
-        signature: parsed.signature.toRSBuffer(null, 0, { canonical: true }),
-        hash,
-        publicKey: pubKey
-      })) return false
-
-      // remove matched signature from unmatched
-      unmatched[i] = undefined
-      match = signature
-
-      return true
-    })
-
-    return match
-  })
-}
-
 function expandOutput (script, scriptType, ourPubKey) {
   typeforce(types.Buffer, script)
 
@@ -533,44 +479,6 @@ TransactionBuilder.prototype.setVersion = function (version) {
   this.tx.version = version
 }
 
-TransactionBuilder.fromTransaction = function (transaction, network, forkId) {
-  var txb = new TransactionBuilder(network)
-
-  if (typeof forkId === 'number') {
-    if (forkId === Transaction.FORKID_BTG) {
-      txb.enableBitcoinGold(true)
-    } else if (forkId === Transaction.FORKID_BCH) {
-      txb.enableBitcoinCash(true)
-    }
-  }
-
-  // Copy transaction fields
-  txb.setVersion(transaction.version)
-  txb.setLockTime(transaction.locktime)
-
-  // Copy outputs (done first to avoid signature invalidation)
-  transaction.outs.forEach(function (txOut) {
-    txb.addOutput(txOut.script, txOut.value)
-  })
-
-  // Copy inputs
-  transaction.ins.forEach(function (txIn) {
-    txb.__addInputUnsafe(txIn.hash, txIn.index, {
-      sequence: txIn.sequence,
-      script: txIn.script,
-      witness: txIn.witness,
-      value: txIn.value
-    })
-  })
-
-  // fix some things not possible through the public API
-  txb.inputs.forEach(function (input, i) {
-    fixMultisigOrder(input, transaction, i, input.value, forkId)
-  })
-
-  return txb
-}
-
 TransactionBuilder.prototype.addInput = function (txHash, vout, sequence, prevOutScript) {
   if (!this.__canModifyInputs()) {
     throw new Error('No, this would invalidate signatures')

package/src/types.js

@@ -15,12 +15,7 @@ function Satoshi (value) {
   return typeforce.UInt53(value) && value <= SATOSHI_MAX
 }
 
-// external dependent types
-var BigInt = typeforce.quacksLike('BigInteger')
-var ECPoint = typeforce.quacksLike('Point')
-
 // exposed, external API
-var ECSignature = typeforce.compile({ r: BigInt, s: BigInt })
 var Network = typeforce.compile({
   messagePrefix: typeforce.oneOf(typeforce.Buffer, typeforce.String),
   bip32: {
@@ -34,11 +29,8 @@ var Network = typeforce.compile({
 
 // extend typeforce types with ours
 var types = {
-  BigInt: BigInt,
   BIP32Path: BIP32Path,
   Buffer256bit: typeforce.BufferN(32),
-  ECPoint: ECPoint,
-  ECSignature: ECSignature,
   Hash160bit: typeforce.BufferN(20),
   Hash256bit: typeforce.BufferN(32),
   Network: Network,