feat: get fee estimation from middleware (#103)

BoltzExchange · Feb 21, 2019 · 63e7240 · 63e7240
1 parent 34776bf
commit 63e7240
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 52 deletions.
diff --git a/src/constants/actions/index.js b/src/constants/actions/index.js
@@ -39,7 +39,6 @@ export const COMPLETE_REFUND = 'COMPLETE_REFUND';
 export const SET_REFUND_FILE = 'SET_REFUND_FILE';
 export const SET_REFUND_TXHASH = 'SET_REFUND_TXHASH';
 export const SET_REFUND_DESTINATION = 'SET_REFUND_DESTINATION';
-export const SET_REFUND_TRANSACTION = 'SET_REFUND_TRANSACTION';
 export const SET_REFUND_TRANSACTION_HASH = 'SET_REFUND_TRANSACTION_HASH';
 export const REFUND_REQUEST = 'REFUND_REQUEST';
 export const REFUND_RESPONSE = 'REFUND_RESPONSE';
diff --git a/src/scripts/utils.js b/src/scripts/utils.js
@@ -1,4 +1,6 @@
+import axios from 'axios';
 import {
+  boltzApi,
   bitcoinNetwork,
   litecoinNetwork,
   bitcoinExplorer,
@@ -126,3 +128,17 @@ export const getSampleAddress = symbol => {
 export const getSampleInvoice = symbol => {
   return symbol === 'BTC' ? bitcoinInvoice : litecoinInvoice;
 };
+
+export const getFeeEstimation = callback => {
+  const url = `${boltzApi}/getfeeestimation`;
+  return () => {
+    axios
+      .get(url)
+      .then(response => callback(response.data))
+      .catch(error => {
+        window.alert(
+          `Failed to get fee estimations: ${error.response.data.error}`
+        );
+      });
+  };
+};
diff --git a/src/views/refund/refundActions.js b/src/views/refund/refundActions.js
@@ -3,7 +3,11 @@ import { ECPair, address, Transaction } from 'bitcoinjs-lib';
 import { constructRefundTransaction, detectSwap } from 'boltz-core';
 import { boltzApi } from '../../constants';
 import * as actionTypes from '../../constants/actions';
-import { getHexBuffer, getNetwork } from '../../scripts/utils';
+import {
+  getHexBuffer,
+  getNetwork,
+  getFeeEstimation,
+} from '../../scripts/utils';
 
 const verifyRefundFile = (fileJSON, keys) => {
   const verify = keys.every(key => fileJSON.hasOwnProperty(key));
@@ -40,11 +44,6 @@ export const setDestinationAddress = address => ({
   payload: address,
 });
 
-const setRefundTransaction = transaction => ({
-  type: actionTypes.SET_REFUND_TRANSACTION,
-  payload: transaction,
-});
-
 const setRefundTransactionHash = hash => ({
   type: actionTypes.SET_REFUND_TRANSACTION_HASH,
   payload: hash,
@@ -62,6 +61,32 @@ export const refundResponse = (success, response) => ({
   },
 });
 
+const refundTransaction = (
+  refundFile,
+  response,
+  destinationAddress,
+  currency,
+  feeEstimation
+) => {
+  const redeemScript = getHexBuffer(refundFile.redeemScript);
+  const lockupTransaction = Transaction.fromHex(response.data.transactionHex);
+
+  // TODO: make sure the provided lockup transaction hash was correct and show more specific error if not
+  return constructRefundTransaction(
+    [
+      {
+        redeemScript,
+        txHash: lockupTransaction.getHash(),
+        keys: ECPair.fromPrivateKey(getHexBuffer(refundFile.privateKey)),
+        ...detectSwap(redeemScript, lockupTransaction),
+      },
+    ],
+    address.toOutputScript(destinationAddress, getNetwork(currency)),
+    refundFile.timeoutBlockHeight,
+    feeEstimation[currency]
+  );
+};
+
 export const startRefund = (
   refundFile,
   transactionHash,
@@ -79,37 +104,24 @@ export const startRefund = (
         transactionHash,
       })
       .then(response => {
-        const redeemScript = getHexBuffer(refundFile.redeemScript);
-        const lockupTransaction = Transaction.fromHex(
-          response.data.transactionHex
-        );
-
-        // TODO: make sure the provided lockup transaction hash was correct and show more specific error if not
-        const refundTransaction = constructRefundTransaction(
-          [
-            {
-              redeemScript,
-              txHash: lockupTransaction.getHash(),
-              keys: ECPair.fromPrivateKey(getHexBuffer(refundFile.privateKey)),
-              ...detectSwap(redeemScript, lockupTransaction),
-            },
-          ],
-          address.toOutputScript(destinationAddress, getNetwork(currency)),
-          refundFile.timeoutBlockHeight,
-          1
-        );
-
-        const refundTransactionHex = refundTransaction.toHex();
-        const refundTransactionHash = refundTransaction.getId();
-
-        dispatch(setRefundTransaction(refundTransactionHex));
-        dispatch(setRefundTransactionHash(refundTransactionHash));
-
         dispatch(
-          broadcastRefund(currency, refundTransactionHex, () => {
-            dispatch(refundResponse(true, response.data));
-
-            cb();
+          getFeeEstimation(feeEstimation => {
+            const transaction = refundTransaction(
+              refundFile,
+              response,
+              destinationAddress,
+              currency,
+              feeEstimation
+            );
+
+            dispatch(setRefundTransactionHash(transaction.getId()));
+            dispatch(
+              broadcastRefund(currency, transaction.toHex(), () => {
+                dispatch(refundResponse(true, response.data));
+
+                cb();
+              })
+            );
           })
         );
       })

diff --git a/src/views/refund/refundReducer.js b/src/views/refund/refundReducer.js
@@ -41,12 +41,6 @@ const reducer = (state = initalState, action) => {
         destinationAddress: action.payload,
       };
 
-    case actionTypes.SET_REFUND_TRANSACTION:
-      return {
-        ...state,
-        refundTransaction: action.payload,
-      };
-
     case actionTypes.SET_REFUND_TRANSACTION_HASH:
       return {
         ...state,

diff --git a/src/views/refund/steps/uploadRefundFile.js b/src/views/refund/steps/uploadRefundFile.js
@@ -46,12 +46,12 @@ const StyledUploadRefundFile = ({
       <FaCheckCircle size={240} className={classes.icon} />
     ) : (
       <DropZone className={classes.dropZone} onFileRead={setRefundFile}>
-        <p className={classes.info}>Drag the Refund JSON File Here</p>
+        <p className={classes.info}>Drag the refund JSON file here</p>
         <span className={classes.info}>or</span>
         <FileUpload text={'Select file'} onFileRead={setRefundFile} />
       </DropZone>
     )}
-    <p className={classes.info}>Paste the lockup transaction hash</p>
+    <p className={classes.info}>Paste the hash of the lockup transaction</p>
     <InputArea
       height={50}
       width={500}

diff --git a/src/views/reverse/reverseActions.js b/src/views/reverse/reverseActions.js
@@ -4,7 +4,12 @@ import { Transaction, ECPair, address } from 'bitcoinjs-lib';
 import { detectSwap, constructClaimTransaction } from 'boltz-core';
 import { boltzApi } from '../../constants';
 import * as actionTypes from '../../constants/actions';
-import { toSatoshi, getHexBuffer, getNetwork } from '../../scripts/utils';
+import {
+  toSatoshi,
+  getHexBuffer,
+  getNetwork,
+  getFeeEstimation,
+} from '../../scripts/utils';
 
 export const initReverseSwap = state => ({
   type: actionTypes.INIT_REVERSE_SWAP,
@@ -76,7 +81,7 @@ export const startReverseSwap = (swapInfo, nextStage) => {
   };
 };
 
-const claimTransaction = (swapInfo, response, preimage) => {
+const claimTransaction = (swapInfo, response, preimage, feeEstimation) => {
   const redeemScript = getHexBuffer(response.redeemScript);
   const lockupTransaction = Transaction.fromHex(response.lockupTransaction);
 
@@ -91,7 +96,7 @@ const claimTransaction = (swapInfo, response, preimage) => {
       },
     ],
     address.toOutputScript(swapInfo.address, getNetwork(swapInfo.quote)),
-    2,
+    feeEstimation[swapInfo.quote],
     false
   );
 };
@@ -106,11 +111,20 @@ const startListening = (dispatch, swapInfo, response, nextStage) => {
       dispatch(setReverseSwapStatus('Waiting for invoice to be paid...'));
       nextStage();
     } else {
-      const claimTx = claimTransaction(swapInfo, response, data.preimage);
       dispatch(
-        broadcastClaim(swapInfo.quote, claimTx.toHex(), () => {
-          dispatch(reverseSwapResponse(true, response));
-          nextStage();
+        getFeeEstimation(feeEstimation => {
+          const claimTx = claimTransaction(
+            swapInfo,
+            response,
+            data.preimage,
+            feeEstimation
+          );
+          dispatch(
+            broadcastClaim(swapInfo.quote, claimTx.toHex(), () => {
+              dispatch(reverseSwapResponse(true, response));
+              nextStage();
+            })
+          );
         })
       );
     }