@exodus/bitcoinjs-lib-forks 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoinjs-lib-forks",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Client-side Bitcoin Forks JavaScript library",
   "main": "./src/index.js",
   "engines": {

package/src/crypto.js

@@ -1,7 +1,7 @@
 var createHash = require('create-hash')
 
 function ripemd160 (buffer) {
-  return createHash('rmd160').update(buffer).digest()
+  return createHash('ripemd160').update(buffer).digest()
 }
 
 function sha1 (buffer) {

package/src/transaction_builder.js

@@ -708,22 +708,22 @@ function canSign (input) {
     )
 }
 
-TransactionBuilder.prototype.sign = function (vin, keyPair, redeemScript, hashType, witnessValue, witnessScript) {
+TransactionBuilder.prototype._prepareForSigning = function (vin, keyPair, redeemScript, hashType, witnessValue, witnessScript) {
   // TODO: remove keyPair.network matching in 4.0.0
   if (keyPair.network && keyPair.network !== this.network) throw new TypeError('Inconsistent network')
   if (!this.inputs[vin]) throw new Error('No input at index: ' + vin)
   hashType = hashType || Transaction.SIGHASH_ALL
 
-  var input = this.inputs[vin]
+  let input = this.inputs[vin]
 
   // if redeemScript was previously provided, enforce consistency
   if (input.redeemScript !== undefined &&
-      redeemScript &&
-      !input.redeemScript.equals(redeemScript)) {
+    redeemScript &&
+    !input.redeemScript.equals(redeemScript)) {
     throw new Error('Inconsistent redeemScript')
   }
 
-  var kpPubKey = keyPair.publicKey || keyPair.getPublicKeyBuffer()
+  let kpPubKey = keyPair.publicKey || keyPair.getPublicKeyBuffer()
   if (!canSign(input)) {
     if (witnessValue !== undefined) {
       if (input.value !== undefined && input.value !== witnessValue) throw new Error('Input didn\'t match witnessValue')
@@ -736,7 +736,7 @@ TransactionBuilder.prototype.sign = function (vin, keyPair, redeemScript, hashTy
   }
 
   // ready to sign
-  var signatureHash
+  let signatureHash
   if (this.bitcoinGold) {
     signatureHash = this.tx.hashForGoldSignature(vin, input.signScript, witnessValue, hashType, input.witness)
   } else if (this.bitcoinCash) {
@@ -750,20 +750,37 @@ TransactionBuilder.prototype.sign = function (vin, keyPair, redeemScript, hashTy
   }
 
   // enforce in order signing of public keys
-  var signed = input.pubKeys.some(function (pubKey, i) {
+  const index = input.pubKeys.findIndex(function (pubKey, i) {
     if (!kpPubKey.equals(pubKey)) return false
     if (input.signatures[i]) throw new Error('Signature already exists')
     if (kpPubKey.length !== 33 &&
       input.signType === scriptTypes.P2WPKH) throw new Error('BIP143 rejects uncompressed public keys in P2WPKH or P2WSH')
 
-    var signature = keyPair.sign(signatureHash)
-    if (Buffer.isBuffer(signature)) signature = ECSignature.fromRSBuffer(signature)
-
-    input.signatures[i] = signature.toScriptSignature(hashType)
     return true
   })
 
-  if (!signed) throw new Error('Key pair cannot sign for this input')
+  if (index === -1) throw new Error('Key pair cannot sign for this input')
+
+  return { input, index, signatureHash, hashType }
+}
+
+TransactionBuilder.prototype.signAsync = async function (vin, signer, redeemScript, suppliedHashType, witnessValue, witnessScript) {
+  if (!signer || !signer.publicKey || !signer.sign) throw new TypeError('signer must have sign and publicKey props')
+  const { input, index, signatureHash, hashType } = this._prepareForSigning(vin, signer, redeemScript, suppliedHashType, witnessValue, witnessScript)
+
+  let signature = await signer.sign(signatureHash)
+  if (Buffer.isBuffer(signature)) signature = ECSignature.fromRSBuffer(signature)
+
+  input.signatures[index] = signature.toScriptSignature(hashType)
+}
+
+TransactionBuilder.prototype.sign = function (vin, keyPair, redeemScript, suppliedHashType, witnessValue, witnessScript) {
+  const { input, index, signatureHash, hashType } = this._prepareForSigning(vin, keyPair, redeemScript, suppliedHashType, witnessValue, witnessScript)
+
+  let signature = keyPair.sign(signatureHash)
+  if (Buffer.isBuffer(signature)) signature = ECSignature.fromRSBuffer(signature)
+
+  input.signatures[index] = signature.toScriptSignature(hashType)
 }
 
 function signatureHashType (buffer) {

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-# 0.0.2 / 2018-12-12
-
-- Remove unneeded BCH fork changes
-
-# 0.0.1 / 2018-11-14
-
-Initial release, with 2018-11-15 BCH (BitcoinABC) HF support.