initial price estimate for approve & lock tx are too low #57

harmony-one · Oct 20, 2020 · 0060424 · 0060424
1 parent bc00aa3
commit 0060424
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/src/blockchain-bridge/eth/helpers.ts b/src/blockchain-bridge/eth/helpers.ts
@@ -1,6 +1,7 @@
 import * as agent from 'superagent';
 import Web3 from 'web3';
-import { mulDecimals } from '../../utils';
+import { divDecimals, mulDecimals } from '../../utils';
+import { web3 } from './index';
 const BN = require('bn.js');
 
 export const getGasPrice = async (web3: Web3) => {
@@ -22,3 +23,12 @@ export const getGasPrice = async (web3: Web3) => {
 
   return res;
 };
+
+export const getNetworkFee = async () => {
+  const gasPrice = await getGasPrice(web3);
+  const gasLimit = new BN(process.env.ETH_GAS_LIMIT);
+
+  const fee = gasLimit.mul(gasPrice).mul(new BN(2));
+
+  return Number(divDecimals(fee, 18));
+};
diff --git a/src/pages/Exchange/Details.tsx b/src/pages/Exchange/Details.tsx
@@ -149,11 +149,15 @@ export const Details = observer<{ showTotal?: boolean; children?: any }>(
             style={{ borderTop: '1px solid #dedede' }}
           >
             <AssetRow label="Network Fee" value="">
-              <Price
-                value={exchange.networkFee}
-                isEth={exchange.mode === EXCHANGE_MODE.ETH_TO_ONE}
-                boxProps={{ pad: {} }}
-              />
+              {!exchange.isFeeLoading ? (
+                <Price
+                  value={exchange.networkFee}
+                  isEth={exchange.mode === EXCHANGE_MODE.ETH_TO_ONE}
+                  boxProps={{ pad: {} }}
+                />
+              ) : (
+                <Text>...loading</Text>
+              )}
             </AssetRow>
 
             {/*<AssetRow*/}

diff --git a/src/stores/Exchange.ts b/src/stores/Exchange.ts
@@ -12,6 +12,7 @@ import * as operationService from 'services';
 
 import * as contract from '../blockchain-bridge';
 import { sleep, uuid } from '../utils';
+import { getNetworkFee } from '../blockchain-bridge/eth/helpers';
 
 export enum EXCHANGE_STEPS {
   GET_TOKEN_ADDRESS = 'GET_TOKEN_ADDRESS',
@@ -37,6 +38,7 @@ export class Exchange extends StoreConstructor {
   @observable txHash = '';
   @observable actionStatus: statusFetching = 'init';
   @observable stepNumber = 0;
+  @observable isFeeLoading = false;
 
   defaultTransaction = {
     oneAddress: '',
@@ -71,9 +73,13 @@ export class Exchange extends StoreConstructor {
     return this.stepsConfig[this.stepNumber];
   }
 
+  @observable ethNetworkFee = 0;
+
   @computed
   get networkFee() {
-    return this.mode === EXCHANGE_MODE.ETH_TO_ONE ? 0.000845586 : 0.0134438;
+    return this.mode === EXCHANGE_MODE.ETH_TO_ONE
+      ? this.ethNetworkFee
+      : 0.0134438;
   }
 
   stepsConfig: Array<IStepConfig> = [
@@ -82,14 +88,18 @@ export class Exchange extends StoreConstructor {
       buttons: [
         {
           title: 'Continue',
-          onClick: () => {
+          onClick: async () => {
             this.stepNumber = this.stepNumber + 1;
             // this.transaction.oneAddress = this.stores.user.address;
             this.transaction.erc20Address = this.stores.userMetamask.erc20Address;
 
             switch (this.mode) {
               case EXCHANGE_MODE.ETH_TO_ONE:
                 this.transaction.ethAddress = this.stores.userMetamask.ethAddress;
+
+                this.isFeeLoading = true;
+                this.ethNetworkFee = await getNetworkFee();
+                this.isFeeLoading = false;
                 break;
               case EXCHANGE_MODE.ONE_TO_ETH:
                 this.transaction.oneAddress = this.stores.user.address;
@@ -261,8 +271,8 @@ export class Exchange extends StoreConstructor {
 
       let ethMethods, hmyMethods;
 
-      if(!this.stores.user.address || !this.stores.userMetamask.ethAddress) {
-        await sleep(3000)
+      if (!this.stores.user.address || !this.stores.userMetamask.ethAddress) {
+        await sleep(3000);
       }
 
       if (this.operation.oneAddress !== this.stores.user.address) {