normalize transaction hex inputs

Author: Danny Diekroeger

app/sign.js

@@ -160,7 +160,8 @@ const handleSignUtxo = function(recoveryRequest, key, skipConfirm) {
 const handleSignEthereum = function(recoveryRequest, key, skipConfirm) {
   const EthTx = require('ethereumjs-tx');
 
-  const transaction = new EthTx(recoveryRequest.tx);
+  const txHex = getTransactionHexFromRequest(recoveryRequest);
+  const transaction = new EthTx(txHex);
   const decimals = coinDecimals[recoveryRequest.coin];
 
   const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';
@@ -192,13 +193,10 @@ const handleSignXrp = function(recoveryRequest, key, skipConfirm) {
   const rippleKeypairs = require('ripple-keypairs');
   const rippleParse = require('ripple-binary-codec');
 
-  // handle different input formats
-  if (!recoveryRequest.txHex) {
-    recoveryRequest.txHex = recoveryRequest.tx || recoveryRequest.transactionHex;
-  }
+  const txHex = getTransactionHexFromRequest(recoveryRequest);
 
   const decimals = coinDecimals[recoveryRequest.coin];
-  const transaction = rippleParse.decode(recoveryRequest.txHex);
+  const transaction = rippleParse.decode(txHex);
   const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';
 
   const outputs = [{
@@ -217,9 +215,9 @@ const handleSignXrp = function(recoveryRequest, key, skipConfirm) {
 
   const backupAddress = rippleKeypairs.deriveAddress(backupKeyNode.keyPair.getPublicKeyBuffer().toString('hex'));
   const privateKeyHex = backupKeyNode.keyPair.getPrivateKeyBuffer().toString('hex');
-  const cosignedTx = utils.signXrpWithPrivateKey(recoveryRequest.txHex, privateKeyHex, { signAs: backupAddress });
+  const cosignedTx = utils.signXrpWithPrivateKey(txHex, privateKeyHex, { signAs: backupAddress });
 
-  return rippleApi.combine([ recoveryRequest.txHex, cosignedTx.signedTransaction ]).signedTransaction;
+  return rippleApi.combine([ txHex, cosignedTx.signedTransaction ]).signedTransaction;
 };
 
 const handleSignXlm = function(recoveryRequest, key, skipConfirm) {
@@ -233,7 +231,8 @@ const handleSignXlm = function(recoveryRequest, key, skipConfirm) {
 
   const decimals = coinDecimals[recoveryRequest.coin];
 
-  const transaction = new stellar.Transaction(recoveryRequest.tx);
+  const txHex = getTransactionHexFromRequest(recoveryRequest);
+  const transaction = new stellar.Transaction(txHex);
   const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';
 
   if (transaction.operations.length !== 1) {
@@ -276,7 +275,8 @@ const handleSignXlm = function(recoveryRequest, key, skipConfirm) {
 const handleSignErc20 = function(recoveryRequest, key, skipConfirm) {
   const EthTx = require('ethereumjs-tx');
 
-  const transaction = new EthTx(recoveryRequest.tx);
+  const txHex = getTransactionHexFromRequest(recoveryRequest);
+  const transaction = new EthTx(txHex);
 
   const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';
   const txData = transaction.data;
@@ -332,6 +332,23 @@ const parseKey = function(rawkey, coin, path) {
   return rawkey;
 }
 
+/**
+ Not all recoveryRequest files are formatted the same. Sometimes they have 'tx', 'txHex', or 'transactionHex'
+ This function gets and gets and returns the transaction hex in all of these cases
+ */
+const getTransactionHexFromRequest = function(recoveryRequest) {
+  if( recoveryRequest.tx ){
+    return recoveryRequest.tx
+  }
+  if (recoveryRequest.txHex ){
+    return recoveryRequest.txHex
+  }
+  if (recoveryRequest.transactionHex ){
+    return recoveryRequest.transactionHex
+  }
+  throw new Error("The recovery request did not provide a transaction hex");
+}
+
 const handleSign = function(args) {
   const file = args.file;