@exodus/ethereum-api 2.19.0 → 2.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.19.0",
+  "version": "2.21.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.5.4",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^2.18.0",
+    "@exodus/ethereum-lib": "^2.19.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/simple-retry": "^0.0.6",
     "@exodus/solidity-contract": "^1.0.1",
@@ -29,5 +29,5 @@
     "@exodus/assets-base": "^8.0.136",
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "de6258fcd05409586558bbffff54c2c2a3c065b1"
+  "gitHead": "52d783c8952348157fe767187533498088c52b01"
 }

package/src/eth-like-util.js

@@ -134,12 +134,8 @@ export const getERC20Params = async ({
     })
   )
 
-  const response = paramNames.reduce(
-    (accumulatedObj, paramName, index) => ({
-      ...accumulatedObj,
-      [paramName]: paramValues[index],
-    }),
-    {}
+  const response = Object.fromEntries(
+    paramNames.map((paramName, index) => [paramName, paramValues[index]])
   )
   erc20ParamsCache[cacheKey] = response
 

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

@@ -7,18 +7,64 @@ const ethDecimals = assets.ethereum.units.ETH
 
 const ethHexToInt = (hexValue) => parseInt(hexValue, '16')
 
-async function getDecimals(type, assetContractAddress = null) {
-  if (type === 'erc20' && assetContractAddress) {
-    const { decimals } = await getERC20Params({
-      address: assetContractAddress,
-      assetName: 'ethereum',
-      paramNames: ['decimals'],
-    })
-
-    return decimals
+async function getAssetSymbolFromContract(contractAddress) {
+  const { symbol: assetSymbol } = await getERC20Params({
+    address: contractAddress,
+    assetName: 'ethereum',
+    paramNames: ['symbol'],
+  })
+
+  return assetSymbol
+}
+
+async function prepareBalanceChanges(internalTransactions, balanceChanges) {
+  const preparedBalanceChanges = [...balanceChanges]
+
+  const decimals = {}
+  const assetSymbols = {}
+
+  if (internalTransactions && Array.isArray(internalTransactions)) {
+    for (const transaction of internalTransactions) {
+      const { contractCall } = transaction
+
+      if (!contractCall) continue
+
+      if (contractCall.methodName === 'transfer' || contractCall.methodName === 'transferFrom') {
+        const assetSymbol =
+          contractCall.contractAlias ||
+          (await getAssetSymbolFromContract(contractCall.contractAddress))
+
+        assetSymbols[contractCall.contractAddress] = assetSymbol
+        decimals[assetSymbol] = contractCall.contractDecimals
+      }
+    }
   }
 
-  return ethDecimals
+  for (const balanceChange of preparedBalanceChanges) {
+    const { asset } = balanceChange
+
+    if (!asset.symbol) {
+      asset.symbol =
+        assetSymbols[asset.contractAddress] ||
+        (await getAssetSymbolFromContract(asset.contractAddress))
+    }
+
+    if (typeof decimals[asset.symbol] === 'number') {
+      asset.decimal = decimals[asset.symbol]
+      continue
+    }
+
+    if (asset.type === 'erc20' && asset.contractAddress) {
+      const { decimals: assetDecimal } = await getERC20Params({
+        address: asset.contractAddress,
+        assetName: 'ethereum',
+        paramNames: ['decimals'],
+      })
+
+      asset.decimal = assetDecimal
+    }
+  }
+  return preparedBalanceChanges
 }
 
 export async function simulateAndRetrieveSideEffects(transaction) {
@@ -41,31 +87,32 @@ export async function simulateAndRetrieveSideEffects(transaction) {
     const simulatedTx = await fetchTxPreview(blocknativeTxObject)
 
     const [simulatedBalanceChanges] = simulatedTx.netBalanceChanges
+    const [internalTransactions] = simulatedTx.internalTransactions
 
     const [sender] =
       simulatedBalanceChanges &&
       simulatedBalanceChanges.filter(({ address }) => address === transaction.from)
 
     if (sender) {
-      for (const balanceChange of sender.balanceChanges) {
+      const preparedBalanceChanges = await prepareBalanceChanges(
+        internalTransactions,
+        sender.balanceChanges
+      )
+
+      for (const balanceChange of preparedBalanceChanges) {
         const { delta, asset } = balanceChange
 
-        const decimal = await getDecimals(asset.type, asset.contractAddress)
+        const account = {
+          symbol: asset.symbol,
+          balance: delta,
+          assetType: asset.type,
+          decimal: asset.decimal,
+        }
 
         if (delta.startsWith('-')) {
-          willSend.push({
-            symbol: asset.symbol,
-            balance: delta.slice(1),
-            assetType: asset.type,
-            decimal,
-          })
+          willSend.push(account)
         } else {
-          willReceive.push({
-            symbol: asset.symbol,
-            balance: delta,
-            assetType: asset.type,
-            decimal,
-          })
+          willReceive.push(account)
         }
       }
     }
@@ -73,13 +120,13 @@ export async function simulateAndRetrieveSideEffects(transaction) {
     if (!willSend.length) {
       willSend.push({
         symbol: 'ETH',
-        balance: ethHexToInt(transaction.value).toString(),
+        balance: `-${ethHexToInt(transaction.value)}`,
         assetType: 'ether',
         decimal: ethDecimals,
       })
     }
-  } catch (_) {
-    throw new Error('Simulation of Ethereum transaction failed.')
+  } catch (err) {
+    throw new Error(err)
   }
 
   return { willSend, willReceive }