Merge pull request #40 from BitGo/separate-offline

[BG-9476] Separate Offline/Online Commands and Fix Key-Response

Author: dannydeezy

app/admin.js

@@ -8,10 +8,8 @@ const pjson = require('../package.json');
 const fs = require('fs');
 const crypto = require('crypto');
 
-const db = require('./db.js');
-const MasterKey = require('./models/masterkey.js');
+let db, MasterKey, WalletKey;
 const signingTool = require('./sign.js');
-const WalletKey = require('./models/walletkey.js');
 const utils = require('./utils');
 const bitcoinMessage = require('bitcoinjs-message');
 
@@ -108,6 +106,15 @@ setVerificationCommand.addArgument(
   }
 );
 
+const recoveryInfoCommand = subparsers.addParser('recoveryInfo', { addHelp: true });
+recoveryInfoCommand.addArgument(
+  ['file'],
+  {
+    action: 'store',
+    help: 'the path to the recovery file that bitgo provided'
+  }
+);
+
 const generateKeysCommand = subparsers.addParser('generate', { addHelp: true });
 generateKeysCommand.addArgument(
   ['master'],
@@ -368,11 +375,32 @@ const handleVerification = co(function *(args) {
   }
 });
 
+const handleRecoveryInfo = co(function *(args){
+  const json = JSON.parse(fs.readFileSync(args.file));
+  const pub = json.backupKey;
+  const walletkey = yield WalletKey.findOne({ pub });
+  const masterkey = yield MasterKey.findOne({ pub: walletkey.masterKey });
+  json.masterkey = masterkey.pub;
+  json.masterkeypath = masterkey.path;
+  json.walletkeypath = walletkey.path;
+  const filename = args.file.substring(0,args.file.length - 5) + '-prepared.json';
+  console.log('got info... writing file ' + filename);
+  fs.writeFileSync(filename, JSON.stringify(json, null, 2));
+  console.log('done.');
+});
+
+const requireDB = function() {
+  MasterKey = require('./models/masterkey.js');
+  WalletKey = require('./models/walletkey.js');
+  db = require('./db.js');
+}
+
 const run = co(function *(testArgs) {
   const args = parser.parseArgs(testArgs);
 
   switch (args.cmd) {
     case 'import':
+      requireDB();
       yield handleImportKeys(args);
       break;
     case 'sign':
@@ -388,11 +416,17 @@ const run = co(function *(testArgs) {
       handleGenerateHDSeed();
       break;
     case 'verification':
+      requireDB();
       yield handleVerification(args);
       break;
+    case 'recoveryInfo':
+      requireDB();
+      yield handleRecoveryInfo(args);
   }
 
-  db.connection.close();
+  if (db && db.connection) {
+    db.connection.close();
+  }
 });
 
 // For admin script and unit testing of functions

app/krs.js

@@ -186,5 +186,14 @@ exports.provisionKey = co(function *(req) {
     yield notifyEndpoint(key, 'created');
   }
 
-  return key;
+  const response = {
+    masterKey: masterKey.pub,
+    path: key.path,
+    userEmail: key.userEmail,
+    custom: key.custom,
+    masterKeySig: masterKey.signature,
+    pub: key.pub
+  }
+
+  return response;
 });

app/sign.js

@@ -193,7 +193,7 @@ const handleSignXrp = function(recoveryRequest, key, skipConfirm) {
   const rippleParse = require('ripple-binary-codec');
 
   const decimals = coinDecimals[recoveryRequest.coin];
-  const transaction = rippleParse.decode(recoveryRequest.txHex);
+  const transaction = rippleParse.decode(recoveryRequest.tx);
   const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';
 
   const outputs = [{

bin/admin.js

@@ -6,5 +6,7 @@ const admin = require('../app/admin');
 Promise.try(admin.run).catch(function(e) {
   console.log(e.message);
   console.log(e.stack);
-  admin.db.connection.close();
+  if (admin.db && admin.db.connection) {
+    admin.db.connection.close();
+  }
 });