@exodus/ethereum-api 2.25.1 → 2.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.25.1",
+  "version": "2.25.3",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "26582c94b07259d510c483a753fb0f696edf3957"
+  "gitHead": "5fc9011ce93fad50a48bccb4ab25930dbf7d762b"
 }

package/src/gas-estimation.js

@@ -5,6 +5,11 @@ import { estimateGas, isContractAddress } from './eth-like-util'
 
 const EXTRA_PERCENTAGE = 20
 
+// 16 gas per non-zero byte (4 gas per zero byte) of "transaction input data"
+const GAS_PER_NON_ZERO_BYTE = 16
+
+export const DEFAULT_CONTRACT_GAS_LIMIT = 1e6
+
 // Starting with geth v1.9.14, if gasPrice is set for eth_estimateGas call, the call allowance will
 // be calculated with account's balance divided by gasPrice. If user's balance is too low,
 // the gasEstimation will fail. If gasPrice is set to '0x0', the account's balance is not
@@ -17,7 +22,7 @@ export async function estimateGasLimit(
   data: Buffer | string,
   gasPrice?: string = '0x',
   extraPercentage?: number = EXTRA_PERCENTAGE
-): number {
+): Promise<number> {
   const opts = {
     from: fromAddress,
     to: toAddress,
@@ -51,6 +56,9 @@ export async function fetchGasLimit({
   if (!amount) amount = asset.currency.ZERO
   if (!feeData.gasPrice) feeData.gasPrice = asset.baseAsset.currency.ZERO
 
+  const defaultGasLimit = () =>
+    asset.gasLimit + GAS_PER_NON_ZERO_BYTE * ethUtil.toBuffer(txInput).length
+
   const _isToken = isToken(asset)
   if (_isToken) {
     txInput = ethUtil.bufferToHex(
@@ -61,7 +69,7 @@ export async function fetchGasLimit({
   } else if (!isContract) {
     if (isContract === undefined)
       isContract = await isContractAddress({ asset, address: toAddress })
-    if (!isContract) return asset.gasLimit
+    if (!isContract) return defaultGasLimit()
   }
 
   const gasPrice = ethUtil.bufferToHex(currency2buffer(feeData.gasPrice))
@@ -78,10 +86,14 @@ export async function fetchGasLimit({
     )
   } catch (err) {
     if (throwOnError) throw err
-    console.log('fetchGasLimit error', err)
-  }
+    console.error('fetchGasLimit error', err)
+
+    // fallback value for contract case
+    if (isContract) return asset.contractGasLimit || DEFAULT_CONTRACT_GAS_LIMIT
 
-  return _isToken ? asset.gasLimit : asset.contractGasLimit
+    // fallback value for rest cases: token.
+    return defaultGasLimit()
+  }
 }
 
 function normalizeAmount(amount) {

package/src/simulate-tx/simulate-eth-tx.js

@@ -23,10 +23,21 @@ async function getAssetSymbolFromContract(contractAddress) {
   return assetSymbol
 }
 
-async function prepareBalanceChanges(internalTransactions, balanceChanges, transactionInput) {
+async function prepareBalanceChanges(
+  internalTransactions,
+  balanceChanges,
+  transactionInput,
+  assetName = 'ethereum'
+) {
+  const assetNameToSymbolMap = Object.create(null)
+  assetNameToSymbolMap['ethereum'] = 'ETH' // Refactor after blowfish integration
+
+  const asset = assets[assetName]
   const preparedBalanceChanges = [...balanceChanges]
 
   const decimals = Object.create(null)
+  decimals[assetNameToSymbolMap[asset.name]] = asset.currency.defaultUnit.power // Always have a default asset decimal in map for edge cases
+
   const assetSymbols = Object.create(null)
   let contractName
   let isERC721 = false
@@ -115,7 +126,7 @@ async function tryToDecodeApprovalTransaction(transaction) {
   }
 }
 
-export async function simulateAndRetrieveSideEffects(transaction) {
+export async function simulateAndRetrieveSideEffects(transaction, assetName) {
   const willSend = []
   const willReceive = []
 
@@ -150,7 +161,8 @@ export async function simulateAndRetrieveSideEffects(transaction) {
       const preparedBalanceChanges = await prepareBalanceChanges(
         internalTransactions,
         sender.balanceChanges,
-        transaction.data
+        transaction.data,
+        assetName
       )
 
       for (const balanceChange of preparedBalanceChanges) {