@exodus/ethereum-api 2.20.0 → 2.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.20.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": "f6ffc7e8100b7b1b85d2c7b30cce4aa2b251cab3"
+  "gitHead": "52d783c8952348157fe767187533498088c52b01"
 }

package/src/eth-like-util.js

@@ -134,7 +134,9 @@ export const getERC20Params = async ({
     })
   )
 
-  const response = Object.fromEntries(paramNames.map((paramName, index) => ([paramName, paramValues[index]])))
+  const response = Object.fromEntries(
+    paramNames.map((paramName, index) => [paramName, paramValues[index]])
+  )
   erc20ParamsCache[cacheKey] = response
 
   return response

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

@@ -7,8 +7,21 @@ const ethDecimals = assets.ethereum.units.ETH
 
 const ethHexToInt = (hexValue) => parseInt(hexValue, '16')
 
-async function getDecimalsFromSimulatedTx(internalTransactions, balanceChanges) {
+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) {
@@ -17,15 +30,27 @@ async function getDecimalsFromSimulatedTx(internalTransactions, balanceChanges)
       if (!contractCall) continue
 
       if (contractCall.methodName === 'transfer' || contractCall.methodName === 'transferFrom') {
-        decimals[contractCall.contractAlias] = contractCall.contractDecimals
+        const assetSymbol =
+          contractCall.contractAlias ||
+          (await getAssetSymbolFromContract(contractCall.contractAddress))
+
+        assetSymbols[contractCall.contractAddress] = assetSymbol
+        decimals[assetSymbol] = contractCall.contractDecimals
       }
     }
   }
 
-  for (const balanceChange of balanceChanges) {
+  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
     }
 
@@ -36,11 +61,10 @@ async function getDecimalsFromSimulatedTx(internalTransactions, balanceChanges)
         paramNames: ['decimals'],
       })
 
-      decimals[asset.symbol] = assetDecimal
+      asset.decimal = assetDecimal
     }
   }
-
-  return decimals
+  return preparedBalanceChanges
 }
 
 export async function simulateAndRetrieveSideEffects(transaction) {
@@ -70,16 +94,19 @@ export async function simulateAndRetrieveSideEffects(transaction) {
       simulatedBalanceChanges.filter(({ address }) => address === transaction.from)
 
     if (sender) {
-      const decimals = await getDecimalsFromSimulatedTx(internalTransactions, sender.balanceChanges)
+      const preparedBalanceChanges = await prepareBalanceChanges(
+        internalTransactions,
+        sender.balanceChanges
+      )
 
-      for (const balanceChange of sender.balanceChanges) {
+      for (const balanceChange of preparedBalanceChanges) {
         const { delta, asset } = balanceChange
 
         const account = {
           symbol: asset.symbol,
           balance: delta,
           assetType: asset.type,
-          decimal: decimals[asset.symbol],
+          decimal: asset.decimal,
         }
 
         if (delta.startsWith('-')) {