Feature/create vaults fix

packages/dapp/src/epics/vaults/createVault.js

@@ -3,11 +3,13 @@ import 'rxjs/add/operator/filter'
 import 'rxjs/add/operator/map'
 import 'rxjs/add/operator/mergeMap'
 import 'rxjs/add/operator/switchMap'
+import { BigNumber } from 'bignumber.js'
 import { CREATE_VAULT } from '../../constants/transaction-types'
 import { Scheduler } from 'rxjs/Scheduler'
 import { fromPromise } from 'rxjs/observable/fromPromise'
 import { merge } from 'rxjs/observable/merge'
 import { of } from 'rxjs/observable/of'
+import { zip } from 'rxjs/observable/zip'
 import api from '../../api'
 import blockChainActions from '../../actions/blockchain-actions'
 import contractFactory from '../../contractFactory'
@@ -29,25 +31,38 @@ const createVaultEpic = (action$, store, ts = Scheduler.async) => {
           api.contract.VaultFactory.address
         ),
         ts
-      ).switchMap(vaultFactory =>
-        of(vaultFactory)
-          .mergeMap(() =>
+      )
+        .switchMap(vaultFactory => {
+          return zip(
+            fromPromise(api.web3.eth.getGasPrice(), ts),
             fromPromise(
-              vaultFactory
-                .createVault(vaultName.toLowerCase(), vaultSymbol)
-                .then(obj =>
-                  obj.send({ from: accountNumber, gasPrice: 1, gas: 6654755 })
-                ),
+              vaultFactory.createVault(vaultName.toLowerCase(), vaultSymbol),
               ts
-            ).map(txHash =>
-              blockChainActions.transactionCompleted({
-                type: CREATE_VAULT,
-                txHash
-              })
             )
           )
-          .catch(e => of(blockChainActions.transactionFailed(e.toString())))
-      )
+        })
+        .mergeMap(([gasPrice, txObj]) => {
+          const txOptions = { from: accountNumber }
+          return fromPromise(
+            txObj.estimateGas(txOptions).then(gas => {
+              return txObj.send({
+                ...txOptions,
+                gasPrice,
+                // adding 20% to the gas limit as the estimate isn't
+                // always accurate
+                gas: new BigNumber(gas).times(1.2).toFixed(0)
+              })
+            }),
+            ts
+          )
+        })
+        .map(({ transactionHash }) =>
+          blockChainActions.transactionCompleted({
+            type: CREATE_VAULT,
+            txHash: transactionHash
+          })
+        )
+        .catch(e => of(blockChainActions.transactionFailed(e.toString())))
   )
 
   return merge(action$1, action$2)

packages/dapp/src/epics/vaults/createVault.test.js

@@ -9,11 +9,15 @@ import vaultActions from '../../actions/vault-actions'
 
 describe('createVault Epic', () => {
   const owner = '0x242B2Dd21e7E1a2b2516d0A3a06b58e2D9BF9196'
-  const txHash =
-    '0x5d5d3dd42388e0f7fffb8f526117a01202015ced105caf216ede7f560b0e1082'
+  const transaction = {
+    transactionHash:
+      '0x5d5d3dd42388e0f7fffb8f526117a01202015ced105caf216ede7f560b0e1082'
+  }
   const txError = new Error(
     'MetaMask Tx Signature: User denied transaction signature.'
   )
+  const gasPrice = '20000000000'
+  const gasEstimate = '2455473'
   const getStateMock = jest.fn()
   const mockStore = {
     getState: getStateMock
@@ -27,13 +31,21 @@ describe('createVault Epic', () => {
     }
   }
   const apiMock = {
-    web3: {},
+    web3: {
+      eth: {
+        getGasPrice: jest.fn()
+      }
+    },
     contract: {
       VaultFactory: {
         address: '0x0'
       }
     }
   }
+  const txObject = {
+    estimateGas: jest.fn(() => Promise.resolve(gasEstimate)),
+    send: jest.fn()
+  }
   let createVaultEpic
   let fromPromiseSpy
 
@@ -51,7 +63,9 @@ describe('createVault Epic', () => {
   it('emits transactionInProgress action when createVault is fired, and a transactionCompleted when the transaction resolves', () => {
     fromPromiseSpy
       .mockReturnValueOnce(of(new VaultFactoryMock()))
-      .mockReturnValueOnce(of(txHash))
+      .mockReturnValueOnce(of(gasPrice))
+      .mockReturnValueOnce(of(txObject))
+      .mockReturnValueOnce(of(transaction))
 
     const inputValues = {
       a: vaultActions.createVault({
@@ -62,7 +76,10 @@ describe('createVault Epic', () => {
     }
     const expectedValues = {
       b: blockChainActions.transactionInProgress('Create Vault'),
-      c: blockchainActions.transactionCompleted({ type: CREATE_VAULT, txHash })
+      c: blockchainActions.transactionCompleted({
+        type: CREATE_VAULT,
+        txHash: transaction.transactionHash
+      })
     }
 
     const inputMarble = 'a'
@@ -84,6 +101,8 @@ describe('createVault Epic', () => {
   it('emits a transactionFailed action if there was an error during the transaction', () => {
     fromPromiseSpy
       .mockReturnValueOnce(of(new VaultFactoryMock()))
+      .mockReturnValueOnce(of(gasPrice))
+      .mockReturnValueOnce(of(txObject))
       .mockReturnValueOnce(ErrorObservable.create(txError))
 
     const inputValues = {