Merge pull request #556 from Adamant-im/fix/eth-erc20-increase-fee

fix(ETH/ERC20): round `gasLimit` before converting to BigInt

src/lib/__tests__/eth-utils.spec.js

@@ -4,7 +4,7 @@
 import { describe, it, expect } from 'vitest'
 import Web3Eth from 'web3-eth'
 
-import { toEther, toWei, getAccountFromPassphrase } from '@/lib/eth-utils'
+import { toEther, toWei, getAccountFromPassphrase, increaseFee } from '@/lib/eth-utils'
 
 describe('eth-utils', () => {
   describe('toEther', () => {
@@ -52,4 +52,18 @@ describe('eth-utils', () => {
       })
     })
   })
+
+  describe('increaseFee', () => {
+    it('should multiply `gasLimit` as a number', () => {
+      expect(increaseFee(21000, 2)).toBe(BigInt(42000))
+    })
+
+    it('should multiply `gasLimit` as a bigint', () => {
+      expect(increaseFee(BigInt(21000), 2)).toBe(BigInt(42000))
+    })
+
+    it('should round the result before converting to bigint', () => {
+      expect(increaseFee(BigInt(21001), 1.5)).toBe(BigInt(31502))
+    })
+  })
 })

src/lib/eth-utils.js

@@ -3,6 +3,7 @@ import * as web3Utils from 'web3-utils'
 import { privateKeyToAccount } from 'web3-eth-accounts'
 import BigNumber from 'bignumber.js'
 import cache from '@/store/cache.js'
+import { INCREASE_FEE_MULTIPLIER } from '@/lib/constants'
 
 const HD_KEY_PATH = "m/44'/60'/3'/1/0"
 
@@ -106,3 +107,14 @@ export function toFraction(amount, decimals, separator = '.') {
 
   return whole + (fraction ? separator + fraction : '')
 }
+
+/**
+ * @param {bigint | number} gasLimit
+ * @param {number} multiplier
+ * @returns {bigint} Increased fee
+ */
+export function increaseFee(gasLimit, multiplier = INCREASE_FEE_MULTIPLIER) {
+  const increasedGasLimit = BigNumber(Number(gasLimit)).multipliedBy(multiplier).toNumber()
+
+  return BigInt(Math.round(increasedGasLimit))
+}

src/store/modules/erc20/erc20-actions.js

@@ -38,7 +38,7 @@ const initTransaction = async (api, context, ethAddress, amount, increaseFee) =>
     .getClient()
     .estimateGas(transaction)
     .catch(() => BigInt(DEFAULT_ERC20_TRANSFER_GAS_LIMIT))
-  transaction.gasLimit = increaseFee ? gasLimit * BigInt(INCREASE_FEE_MULTIPLIER) : gasLimit
+  transaction.gasLimit = increaseFee ? ethUtils.increaseFee(gasLimit) : gasLimit
 
   return transaction
 }

src/store/modules/eth/actions.js

@@ -1,11 +1,7 @@
-import * as utils from '../../../lib/eth-utils'
+import * as utils from '@/lib/eth-utils'
 import createActions from '../eth-base/eth-base-actions'
 
-import {
-  DEFAULT_ETH_TRANSFER_GAS_LIMIT,
-  FetchStatus,
-  INCREASE_FEE_MULTIPLIER
-} from '@/lib/constants'
+import { DEFAULT_ETH_TRANSFER_GAS_LIMIT, FetchStatus } from '@/lib/constants'
 import { storeCryptoAddress } from '@/lib/store-crypto-address'
 
 /** Timestamp of the most recent status update */
@@ -37,7 +33,7 @@ const initTransaction = async (api, context, ethAddress, amount, increaseFee) =>
     .getClient()
     .estimateGas(transaction)
     .catch(() => BigInt(DEFAULT_ETH_TRANSFER_GAS_LIMIT))
-  transaction.gasLimit = increaseFee ? gasLimit * BigInt(INCREASE_FEE_MULTIPLIER) : gasLimit
+  transaction.gasLimit = increaseFee ? utils.increaseFee(gasLimit) : gasLimit
 
   return transaction
 }