Fix Tests

Some tests were broken, causing CI to fail and blocking merges. This
commit fixes those tests:
- Fix usage of bitgo-account-lib interface since it has changed
- Yield promises

Ticket: BG-19296

Author: Mark Toda

app/admin.js

@@ -445,7 +445,7 @@ const run = co(function *(testArgs) {
       yield handleImportKeys(args);
       break;
     case 'sign':
-      signingTool.handleSign(args);
+      yield signingTool.handleSign(args);
       break;
     case 'derive':
       handleDeriveKey(args);

app/sign.js

@@ -1,3 +1,5 @@
+const Promise = require('bluebird');
+const co = Promise.coroutine;
 const utxoLib = require('bitgo-utxo-lib');
 const accountLib = require('@bitgo/account-lib');
 const statics = require('@bitgo/statics');
@@ -175,7 +177,7 @@ const handleSignUtxo = function(recoveryRequest, key, skipConfirm) {
 
     // Derive signing key from chain path
     const derivedHDNode = backupKeyNode.derivePath(input.chainPath);
-    console.log(`Signing input ${ i + 1 } of ${ recoveryRequest.inputs.length } 
+    console.log(`Signing input ${ i + 1 } of ${ recoveryRequest.inputs.length }  \
     with ${ derivedHDNode.neutered().toBase58() } (${ input.chainPath })`);
 
     // Handle BCH
@@ -214,9 +216,9 @@ const handleSignUtxo = function(recoveryRequest, key, skipConfirm) {
   return txBuilder.build().toHex();
 };
 
-const handleHalfSignEth = function(recoveryRequest, key, skipConfirm, basecoin) {
-  return utils.halfSignEthTransaction(basecoin, recoveryRequest, key);
-};
+const handleHalfSignEth = co(function *(recoveryRequest, key, skipConfirm, basecoin) {
+  return yield utils.halfSignEthTransaction(basecoin, recoveryRequest, key);
+});
 
 const handleSignEthereum = function(recoveryRequest, key, skipConfirm) {
   return signEthTx(recoveryRequest, key, skipConfirm, false);
@@ -268,26 +270,28 @@ const signEthTx = function(recoveryRequest, key, skipConfirm, isToken) {
   return transaction.serialize().toString('hex');
 };
 
-const handleSignTrx = function(recoveryRequest, key, skipConfirm) {
+const handleSignTrx = co(function *(recoveryRequest, key, skipConfirm) {
   const coin = recoveryRequest.coin;
 
   const txHex = getTransactionHexFromRequest(recoveryRequest);
-  const builder = new accountLib.TransactionBuilder({ coinName: coin });
+  const builder = new accountLib.getBuilder(coin);
   builder.from(txHex);
+  const builtTransaction = yield builder.build();
 
-  const outputs = builder.build().destinations.map(d => {
+  const outputs = builtTransaction.outputs.map(d => {
     return {
       address: d.address,
-      amount: d.value.toString(10)
+      amount: d.value
     };
   });
 
   key = promptForConfirmationAndKey(recoveryRequest, outputs, skipConfirm, key);
   const signingKey = getBackupSigningKey(key, recoveryRequest.backupKey);
 
-  builder.sign({ key: signingKey });
-  return JSON.stringify(builder.build().toJson());
-};
+  builder.sign({ key: signingKey.toString('hex') });
+  const signedTransaction = yield builder.build();
+  return JSON.stringify(signedTransaction.toJson());
+});
 
 const handleSignEos = function(recoveryRequest, key, skipConfirm) {
   const EosJs = require('eosjs');
@@ -402,7 +406,7 @@ const handleSignErc20 = function(recoveryRequest, key, skipConfirm) {
   Takes in either an xprv, xlmsecret, or 24 words.
   Returns an xprv or xlmsecret
  */
-const parseKey = function(rawkey, coin, path) {
+const parseKey = co(function *(rawkey, coin, path) {
 
   if (rawkey.includes(',') && rawkey.split(',').length === 24) {
     const mnemonic = rawkey.replace(/,/g, ' '); // replace commas with spaces
@@ -416,7 +420,7 @@ const parseKey = function(rawkey, coin, path) {
     if (!bip39.validateMnemonic(mnemonic)) {
       throw new Error('Invalid mnemonic');
     }
-    const seed = bip39.mnemonicToSeed(mnemonic);
+    const seed = yield bip39.mnemonicToSeed(mnemonic);
     let node = utxoLib.HDNode.fromSeedBuffer(seed);
     if (path) {
       node = node.derivePath(path);
@@ -432,7 +436,7 @@ const parseKey = function(rawkey, coin, path) {
     return node.toBase58();
   }
   return rawkey;
-};
+});
 
 /**
  Not all recoveryRequest files are formatted the same. Sometimes they have 'tx', 'txHex', or 'transactionHex'
@@ -451,7 +455,7 @@ const getTransactionHexFromRequest = function(recoveryRequest) {
   throw new Error('The recovery request did not provide a transaction hex');
 };
 
-const handleSign = function(args) {
+const handleSign = co(function *(args) {
   const file = args.file;
 
   const recoveryRequest = JSON.parse(fs.readFileSync(file, { encoding: 'utf8' }));
@@ -469,7 +473,7 @@ const handleSign = function(args) {
     args.key = prompt('Key: ');
   }
 
-  const key = parseKey(args.key, coin.name, args.path);
+  const key = yield parseKey(args.key, coin.name, args.path);
 
   let txHex, halfSignedInfo;
 
@@ -480,7 +484,7 @@ const handleSign = function(args) {
   switch (basecoin.getFamily()) {
     case 'eth':
       if (recoveryRequest.txPrebuild) {
-        halfSignedInfo = handleHalfSignEth(recoveryRequest, key, args.confirm, basecoin);
+        halfSignedInfo = yield handleHalfSignEth(recoveryRequest, key, args.confirm, basecoin);
       } else {
         if (coin.family === 'eth' && !coin.isToken) {
           txHex = handleSignEthereum(recoveryRequest, key, args.confirm);
@@ -493,7 +497,7 @@ const handleSign = function(args) {
       txHex = handleSignEos(recoveryRequest, key, args.confirm);
       break;
     case 'trx':
-      txHex = handleSignTrx(recoveryRequest, key, args.confirm);
+      txHex = yield handleSignTrx(recoveryRequest, key, args.confirm);
       break;
     case 'xrp':
       txHex = handleSignXrp(recoveryRequest, key, args.confirm);
@@ -528,7 +532,7 @@ const handleSign = function(args) {
     console.log('Done');
   }
   return finalRecovery;
-};
+});
 
 module.exports = { handleSign, handleSignUtxo, handleSignEthereum,
   handleSignXrp, handleSignXlm, handleSignErc20, handleSignEos, handleSignTrx, parseKey };

app/utils.js

@@ -1,3 +1,5 @@
+const Promise = require('bluebird');
+const co = Promise.coroutine;
 const Q = require('q');
 const binary = require('ripple-binary-codec');
 const nodemailer = require('nodemailer');
@@ -187,7 +189,7 @@ exports.signXrpWithPrivateKey = function(txHex, privateKey, options) {
   };
 };
 
-exports.halfSignEthTransaction = function(basecoin, recoveryRequest, key) {
+exports.halfSignEthTransaction = co(function *(basecoin, recoveryRequest, key) {
   const txPrebuild = recoveryRequest.txPrebuild;
   const obj = {
     prv: key,
@@ -196,7 +198,7 @@ exports.halfSignEthTransaction = function(basecoin, recoveryRequest, key) {
     expireTime: txPrebuild.expireTime,
     txPrebuild
   };
-  const signedtx = basecoin.signTransaction(obj);
+  const signedtx = yield basecoin.signTransaction(obj);
   const outFile = {
     txInfo: signedtx.halfSigned
   };
@@ -209,7 +211,7 @@ exports.halfSignEthTransaction = function(basecoin, recoveryRequest, key) {
     outFile.tokenContractAddress = recoveryRequest.tokenContractAddress;
   }
   return outFile;
-};
+});
 
 
 /**

package-lock.json

@@ -4,7 +4,7 @@
   "description": "Reference implementation of the Key Recovery Service protocol for dispensing public keys",
   "main": "index.js",
   "scripts": {
-    "test": "./node_modules/mocha/bin/_mocha --timeout 20000 --recursive test/",
+    "test": "./node_modules/mocha/bin/_mocha --exit --timeout 20000 --recursive test/",
     "start": "node -r dotenv/config bin/server.js",
     "lint": "./node_modules/.bin/eslint --ext .js .",
     "audit": "npm audit"
@@ -18,7 +18,7 @@
     "supertest": "^3.3.0"
   },
   "dependencies": {
-    "@bitgo/account-lib": "^1.0.2",
+    "@bitgo/account-lib": "1.1.0",
     "@bitgo/statics": "^3.4.2",
     "argparse": "^1.0.10",
     "bignumber.js": "^7.2.1",

package.json

@@ -1,3 +1,5 @@
+const Promise = require('bluebird');
+const co = Promise.coroutine;
 const fs = require('fs');
 const should = require('should');
 
@@ -148,12 +150,12 @@ describe('Offline Signing Tool', function() {
       + 'JhnuffK8BCMXPBdht77jyoWZHJQzZbwwEvCY4LhTv6Fnnuey1ibnZniJWzrF6y5sZ"]}');
   });
 
-  it('cosigns a trx transaction', function() {
+  it('cosigns a trx transaction', co(function *() {
     const recoveryRequest = JSON.parse(fs.readFileSync('./test/transactions/ttrx.json', { encoding: 'utf8' }));
     const key = 'xprv9s21ZrQH143K2SGfLqMk9eaSbix4XUqXg2wqXkATpfnQsyvaXBTnEqi71aLSq1rL3qJh32FRrA2VnrfMMEmbN'
       + 'S5xnRCiNSHKdAVR6Ep5Ptx';
 
-    const txHex = signingTool.handleSignTrx(recoveryRequest, key, true);
+    const txHex = yield signingTool.handleSignTrx(recoveryRequest, key, true);
     txHex.should.equal('{"visible":false,"txID":"26d73a8892e9a5ed6bccc07da7b8113ced08749fcb7b2600bb96a4076'
       + '6eed8da","raw_data":{"contract":[{"parameter":{"value":{"amount":22000000,"owner_address":"41becdc3'
       + '8018e2202ec67679257ba97fce9b3995a4","to_address":"41979719d19c20cb8480ed0f1135285ff14c8dad58"},"type'
@@ -167,7 +169,7 @@ describe('Offline Signing Tool', function() {
       + '929f3d59dac0e434d4c07c553a951e0c42fe01f4677d587ae7a226a9d7521a8a7200"]}');
     const tx = JSON.parse(txHex);
     tx.signature.length.should.equal(2);
-  });
+  }));
 
   // function called in transaction: sendMultiSigToken, see https://bloxy.info/functions/0dcd7a6c, pre-EIP155
   it('cosigns an erc20 transaction', function() {
@@ -254,39 +256,39 @@ describe('Offline Signing Tool', function() {
     }
   });
 
-  it('parses a private key from 24 words and a path', function() {
+  it('parses a private key from 24 words and a path', co(function *() {
     const key = 'bone,penalty,bundle,plug,february,roof,rely,angry,inspire,auto,indicate,shell,assist,unhappy,unab'
       + 'le,clarify,pond,check,size,key,donor,midnight,inquiry,avoid';
     const path = 'm/0';
-    const xprv = signingTool.parseKey(key, 'eth', path);
+    const xprv = yield signingTool.parseKey(key, 'eth', path);
     xprv.should.equal('xprv9u4GesLhZXFMtAFY2vT1QpXQrgJHRcbTKnw2J1Bqm2m2HpDztvS7D3AwF69fYZnuBJyJQm4v8hegzKY'
       + '3rLCmBgujbZ3sFRzzLT42Z9oTqBt');
-  });
+  }));
 
-  it('half-signs an ETH transaction', function() {
+  it('half-signs an ETH transaction', co(function *() {
     const key = 'xprv9s21ZrQH143K2VPbcq9NwP51S43YX67rUG834oU8BvHgvSayfp9DRuPs6xfKThGbHbdaiGNWdyS5LmTc9GdCV'
       + 'CpNUs6wfyaLukHsvVB8PwP';
     const file = './test/transactions/unsigned-teth.json';
     const expectedOut = JSON.parse(fs.readFileSync('./test/transactions/half-signed-teth.json'));
 
     const args = { file, key, noWrite: true };
-    const outFile = signingTool.handleSign(args);
+    const outFile = yield signingTool.handleSign(args);
     should(outFile.txInfo.sequenceId).not.be.ok();
     delete outFile.txInfo.sequenceId;
     delete outFile.txInfo.hopTransaction;
     outFile.should.deepEqual(expectedOut);
-  });
+  }));
 
-  it('half-signs an ERC-20 transaction', function() {
+  it('half-signs an ERC-20 transaction', co(function *() {
     const key = 'xprv9s21ZrQH143K2VPbcq9NwP51S43YX67rUG834oU8BvHgvSayfp9DRuPs6xfKThGbHbdaiGNWdyS5LmTc9GdCV'
       + 'CpNUs6wfyaLukHsvVB8PwP';
     const file = './test/transactions/unsigned-terc.json';
     const expectedOut = JSON.parse(fs.readFileSync('./test/transactions/half-signed-terc.json'));
     const args = { file, key, noWrite: true };
-    const outFile = signingTool.handleSign(args);
+    const outFile = yield signingTool.handleSign(args);
     should(outFile.txInfo.sequenceId).not.be.ok();
     delete outFile.txInfo.sequenceId;
     delete outFile.txInfo.hopTransaction;
     outFile.should.deepEqual(expectedOut);
-  });
+  }));
 });