@exodus/ethereum-api 2.24.5 → 2.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.24.5",
+  "version": "2.25.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.5.4",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^2.21.4",
+    "@exodus/ethereum-lib": "^2.22.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.2.1",
     "@exodus/simple-retry": "^0.0.6",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "2ad238fc652010aa759fcee58c6bbad707ec940d"
+  "gitHead": "26582c94b07259d510c483a753fb0f696edf3957"
 }

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

@@ -1,5 +1,9 @@
 import assets from '@exodus/assets'
-import { APPROVE_METHOD_ID } from '@exodus/ethereum-lib'
+import {
+  checkIsERC721InputData,
+  checkIsNFTInputData,
+  APPROVE_METHOD_ID,
+} from '@exodus/ethereum-lib'
 import SolidityContract from '@exodus/solidity-contract'
 
 import { fetchTxPreview } from './fetch-tx-preview'
@@ -19,19 +23,29 @@ async function getAssetSymbolFromContract(contractAddress) {
   return assetSymbol
 }
 
-async function prepareBalanceChanges(internalTransactions, balanceChanges) {
+async function prepareBalanceChanges(internalTransactions, balanceChanges, transactionInput) {
   const preparedBalanceChanges = [...balanceChanges]
 
   const decimals = Object.create(null)
   const assetSymbols = Object.create(null)
+  let contractName
+  let isERC721 = false
+  let isERC20 = false
 
   if (internalTransactions && Array.isArray(internalTransactions)) {
     for (const transaction of internalTransactions) {
-      const { contractCall } = transaction
+      const { contractCall, input } = transaction
 
       if (!contractCall) continue
 
-      if (contractCall.methodName === 'transfer' || contractCall.methodName === 'transferFrom') {
+      const { decimalValue } = contractCall
+      isERC721 =
+        checkIsNFTInputData(transactionInput) || (!decimalValue && checkIsERC721InputData(input))
+      isERC20 =
+        !isERC721 &&
+        (contractCall.methodName === 'transfer' || contractCall.methodName === 'transferFrom')
+
+      if (isERC20) {
         const assetSymbol =
           contractCall.contractAlias ||
           (await getAssetSymbolFromContract(contractCall.contractAddress))
@@ -39,6 +53,10 @@ async function prepareBalanceChanges(internalTransactions, balanceChanges) {
         assetSymbols[contractCall.contractAddress] = assetSymbol
         decimals[assetSymbol] = contractCall.contractDecimals
       }
+
+      if (isERC721) {
+        contractName = contractCall.contractName
+      }
     }
   }
 
@@ -51,12 +69,18 @@ async function prepareBalanceChanges(internalTransactions, balanceChanges) {
         (await getAssetSymbolFromContract(asset.contractAddress))
     }
 
+    if (isERC721) {
+      asset.type = 'erc721'
+      asset.title = contractName
+      continue
+    }
+
     if (typeof decimals[asset.symbol] === 'number') {
       asset.decimal = decimals[asset.symbol]
       continue
     }
 
-    if (asset.type === 'erc20' && asset.contractAddress) {
+    if (isERC20 && asset.contractAddress) {
       const { decimals: assetDecimal } = await getERC20Params({
         address: asset.contractAddress,
         assetName: 'ethereum',
@@ -66,6 +90,7 @@ async function prepareBalanceChanges(internalTransactions, balanceChanges) {
       asset.decimal = assetDecimal
     }
   }
+
   return preparedBalanceChanges
 }
 
@@ -124,7 +149,8 @@ export async function simulateAndRetrieveSideEffects(transaction) {
     if (sender) {
       const preparedBalanceChanges = await prepareBalanceChanges(
         internalTransactions,
-        sender.balanceChanges
+        sender.balanceChanges,
+        transaction.data
       )
 
       for (const balanceChange of preparedBalanceChanges) {
@@ -140,6 +166,11 @@ export async function simulateAndRetrieveSideEffects(transaction) {
         if (delta.startsWith('-')) {
           willSend.push(account)
         } else {
+          if (asset.type === 'erc721') {
+            account.nft = {
+              title: `${asset.title || asset.symbol} #${delta}`,
+            }
+          }
           willReceive.push(account)
         }
       }