@exodus/ethereum-api 5.1.0 → 6.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "5.1.0",
+  "version": "6.0.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^2.26.9",
+    "@exodus/ethereum-lib": "^3.0.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.2.1",
     "@exodus/simple-retry": "^0.0.6",
@@ -36,5 +36,5 @@
   "devDependencies": {
     "@exodus/models": "^8.10.4"
   },
-  "gitHead": "6c1abd66e1224acbb391007b9ab261e5c09376e7"
+  "gitHead": "35b8c8c3a9aa2be1287d83d553ede11f174cfe0e"
 }

package/src/eth-like-util.js

@@ -1,8 +1,8 @@
+import assert from 'minimalistic-assert'
 import { normalizeTxId, isEthereumLikeAsset, isEthereumLikeToken, ABI } from '@exodus/ethereum-lib'
-import { getServerByName, getServer } from './exodus-eth-server'
 import { memoizeLruCache } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
 import SolidityContract from '@exodus/solidity-contract'
+import { getServerByName, getServer } from './exodus-eth-server'
 
 export async function isContract(baseAssetName, address) {
   return getServerByName(baseAssetName).isContract(address)
@@ -86,18 +86,9 @@ const ERC20BytesParams = new SolidityContract(ABI.erc20BytesParams)
 const DEFAULT_PARAM_NAMES = ['decimals', 'name', 'symbol']
 const erc20ParamsCache = {}
 
-export const getERC20Params = async ({
-  assetName,
-  address,
-  paramNames = DEFAULT_PARAM_NAMES,
-} = {}) => {
-  const asset = assets[assetName]
-  if (!asset) {
-    throw new Error(`${assetName} not found`)
-  }
-  if (!address) {
-    throw new Error(`Token address should be provided, got: ${address}`)
-  }
+export const getERC20Params = async ({ asset, address, paramNames = DEFAULT_PARAM_NAMES } = {}) => {
+  assert(asset, 'getERC20Params(): asset required')
+  assert(address, 'getERC20Params(): address required')
 
   const cacheKey = `${address}:${paramNames}`
   if (erc20ParamsCache[cacheKey]) {

package/src/exodus-eth-server/clarity.js

@@ -107,7 +107,8 @@ export default class ClarityServer extends EventEmitter {
       const timeout = setTimeout(() => reject(new Error('Transactions Timeout')), 300000)
       socket.emit('getTransactions', cursor, (nextCursor) => {
         clearTimeout(timeout)
-        resolve(Buffer.from(nextCursor))
+        const uintArray = new Uint8Array(nextCursor)
+        resolve(Buffer.from(uintArray))
       })
     })
       .catch((error) => console.error(error))

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

@@ -1,4 +1,5 @@
-import assets from '@exodus/assets'
+import assert from 'minimalistic-assert'
+import { asset as ethereum } from '@exodus/ethereum-meta'
 import {
   checkIsERC721InputData,
   checkIsNFTInputData,
@@ -9,14 +10,14 @@ import SolidityContract from '@exodus/solidity-contract'
 import { fetchTxPreview } from './fetch-tx-preview'
 import { getERC20Params } from '../eth-like-util'
 
-const ethDecimals = assets.ethereum.units.ETH
+const ethDecimals = ethereum.units.ETH
 
 const ethHexToInt = (hexValue) => parseInt(hexValue, '16')
 
-async function getAssetSymbolFromContract(contractAddress) {
+async function getAssetSymbolFromContract(contractAddress, asset) {
   const { symbol: assetSymbol } = await getERC20Params({
     address: contractAddress,
-    assetName: 'ethereum',
+    asset,
     paramNames: ['symbol'],
   })
 
@@ -53,12 +54,11 @@ async function prepareBalanceChanges(
   internalTransactions,
   balanceChanges,
   transactionInput,
-  assetName = 'ethereum'
+  asset
 ) {
   const assetNameToSymbolMap = Object.create(null)
   assetNameToSymbolMap['ethereum'] = 'ETH' // Refactor after blowfish integration
 
-  const asset = assets[assetName]
   const preparedBalanceChanges = [...balanceChanges]
 
   const decimals = Object.create(null)
@@ -85,7 +85,7 @@ async function prepareBalanceChanges(
       if (isERC20) {
         const assetSymbol =
           contractCall.contractAlias ||
-          (await getAssetSymbolFromContract(contractCall.contractAddress))
+          (await getAssetSymbolFromContract(contractCall.contractAddress, asset))
 
         assetSymbols[contractCall.contractAddress] = assetSymbol
         decimals[assetSymbol] = contractCall.contractDecimals
@@ -98,40 +98,40 @@ async function prepareBalanceChanges(
   }
 
   for (const balanceChange of preparedBalanceChanges) {
-    const { asset } = balanceChange
+    const { asset: assetData } = balanceChange
 
-    if (!asset.symbol) {
-      asset.symbol =
-        assetSymbols[asset.contractAddress] ||
-        (await getAssetSymbolFromContract(asset.contractAddress))
+    if (!assetData.symbol) {
+      assetData.symbol =
+        assetSymbols[assetData.contractAddress] ||
+        (await getAssetSymbolFromContract(assetData.contractAddress, asset))
     }
 
     if (isERC721) {
-      asset.type = 'erc721'
-      asset.title = contractName
+      assetData.type = 'erc721'
+      assetData.title = contractName
       continue
     }
 
-    if (typeof decimals[asset.symbol] === 'number') {
-      asset.decimal = decimals[asset.symbol]
+    if (typeof decimals[assetData.symbol] === 'number') {
+      assetData.decimal = decimals[assetData.symbol]
       continue
     }
 
-    if (isERC20 && asset.contractAddress) {
+    if (isERC20 && assetData.contractAddress) {
       const { decimals: assetDecimal } = await getERC20Params({
-        address: asset.contractAddress,
-        assetName: 'ethereum',
+        address: assetData.contractAddress,
+        asset,
         paramNames: ['decimals'],
       })
 
-      asset.decimal = assetDecimal
+      assetData.decimal = assetDecimal
     }
   }
 
   return maybeRemoveDuplicates(preparedBalanceChanges)
 }
 
-async function tryToDecodeApprovalTransaction(transaction) {
+async function tryToDecodeApprovalTransaction(transaction, asset) {
   if (!transaction?.data.startsWith(APPROVE_METHOD_ID)) return null
 
   const contract = SolidityContract.erc20(transaction.to)
@@ -142,7 +142,7 @@ async function tryToDecodeApprovalTransaction(transaction) {
     const [grantedTo, balance] = decodedInput.values
 
     const symbol =
-      (await getAssetSymbolFromContract(transaction.to))?.toUpperCase() || 'Unknown Token'
+      (await getAssetSymbolFromContract(transaction.to, asset))?.toUpperCase() || 'Unknown Token'
 
     return [{ grantedTo, balance, symbol, decimals: undefined }] // ToDo: Return 'decimals' in the future once we support changing the approval amount.
   } catch (e) {
@@ -152,11 +152,13 @@ async function tryToDecodeApprovalTransaction(transaction) {
   }
 }
 
-export async function retrieveSideEffects({ transaction, assetName, shouldSimulate = true }) {
+export async function retrieveSideEffects({ transaction, asset, shouldSimulate = true }) {
+  assert(asset, 'retrieveSideEffects(): asset is required')
+
   const willSend = []
   const willReceive = []
 
-  const approveTransactionData = await tryToDecodeApprovalTransaction(transaction)
+  const approveTransactionData = await tryToDecodeApprovalTransaction(transaction, asset)
   if (approveTransactionData) {
     return { willApprove: approveTransactionData }
   }
@@ -192,25 +194,25 @@ export async function retrieveSideEffects({ transaction, assetName, shouldSimula
         internalTransactions,
         sender.balanceChanges,
         transaction.data,
-        assetName
+        asset
       )
 
       for (const balanceChange of preparedBalanceChanges) {
-        const { delta, asset } = balanceChange
+        const { delta, asset: assetData } = balanceChange
 
         const account = {
-          symbol: asset.symbol,
+          symbol: assetData.symbol,
           balance: delta,
-          assetType: asset.type,
-          decimal: asset.decimal,
+          assetType: assetData.type,
+          decimal: assetData.decimal,
         }
 
         if (delta.startsWith('-')) {
           willSend.push(account)
         } else {
-          if (asset.type === 'erc721') {
+          if (assetData.type === 'erc721') {
             account.nft = {
-              title: `${asset.title || asset.symbol} #${delta}`,
+              title: `${assetData.title || assetData.symbol} #${delta}`,
             }
           }
           willReceive.push(account)