@exodus/ethereum-api 4.0.2-alpha1 → 4.0.3-alpha1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "4.0.2-alpha1",
+  "version": "4.0.3-alpha1",
   "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.1-alpha1",
+    "@exodus/ethereum-lib": "^2.26.1-alpha2",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.2.1",
     "@exodus/simple-retry": "^0.0.6",

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

@@ -152,10 +152,13 @@ export default class ClarityServer extends EventEmitter {
 
   async sendRequest(request) {
     const response = await this.sendRpcRequest(request)
-    if (!response?.result) {
-      throw new Error('Bad Response')
+    const result = response?.result
+    const error = response?.error
+    if (error || !result) {
+      const message = error?.message || error?.code || 'no result'
+      throw new Error(`Bad rpc response: ${message}`)
     }
-    return response.result
+    return result
   }
 
   async isContract(address) {

package/src/gas-estimation.js

@@ -61,7 +61,10 @@ export async function fetchGasLimit({
 
   const _isToken = isToken(asset)
   if (_isToken) {
-    txInput = ethUtil.bufferToHex(asset.contract.transfer.build(toAddress, amount.toBaseString()))
+    // only create tx-input only if not pass tx-input to a token asset
+    if (txInput === '0x') {
+      txInput = ethUtil.bufferToHex(asset.contract.transfer.build(toAddress, amount.toBaseString()))
+    }
     amount = asset.baseAsset.currency.ZERO
     toAddress = asset.contract.address
   } else if (!isContract && !['ethereumarbone', 'ethereumarbnova'].includes(asset.name)) {

package/src/get-balances.js

@@ -1,4 +1,4 @@
-import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
+import { ETHEREUM_LIKE_MONITOR_TYPES, isRpcBalanceAsset } from '@exodus/ethereum-lib'
 
 const fixBalance = ({ txLog, balance }) => {
   for (const tx of txLog) {
@@ -23,7 +23,10 @@ const fixBalance = ({ txLog, balance }) => {
  * @returns {{balance}|null} an object with the balance or null if the balance is unknown/zero
  */
 export const getBalances = ({ asset, txLog, accountState }) => {
-  if (isRpcBalanceAsset(asset)) {
+  if (
+    isRpcBalanceAsset(asset) ||
+    ETHEREUM_LIKE_MONITOR_TYPES[asset.baseAsset.name] === 'no-history'
+  ) {
     const balance =
       asset.baseAsset.name === asset.name
         ? accountState?.balance

package/src/tx-log/clarity-utils/get-log-items-from-server-tx.js

@@ -20,8 +20,8 @@ export default function getLogItemsFromServerTx({
   const confirmations = isConfirmedServerTx(serverTx) ? 1 : 0
   const date = parseServerTxDate(serverTx.timestamp) // included even for unconfirmed txs
   const txId = serverTx.hash
-  const nonce = parseInt(serverTx.nonce, 16)
-  const gasLimit = parseInt(serverTx.gas, 16)
+  const nonce = parseInt(serverTx.nonce, 10)
+  const gasLimit = parseInt(serverTx.gas, 10)
   const error = serverTx.error || (serverTx.status === '0' ? 'Failed' : null)
   const feeAmount = getFeeAmount(asset, serverTx)
   const internalTransfers = filterEffects(serverTx.effects, 'internal') || []

package/src/tx-log/ethereum-no-history-monitor.js

@@ -4,10 +4,9 @@ import { Tx } from '@exodus/models'
 
 import { getDeriveDataNeededForTick, getDeriveTransactionsToCheck } from './monitor-utils'
 
-import { isEmpty, unionBy } from 'lodash'
+import { isEmpty, unionBy, zipObject } from 'lodash'
 
 import { BaseMonitor } from '@exodus/asset-lib'
-import { getAssetAddresses } from '@exodus/ethereum-lib'
 
 import { UNCONFIRMED_TX_LIMIT } from './monitor-utils/get-derive-transactions-to-check'
 
@@ -97,6 +96,17 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
     }
   }
 
+  async getTransactionsFromNode(transactions) {
+    const batch = []
+    for (const { tx } of transactions) {
+      const request = this.server.getTransactionByHashRequest(tx.txId)
+      batch.push(request)
+    }
+    const responses = await this.server.sendBatchRequest(batch)
+    const txIds = transactions.map(({ tx }) => tx.txId)
+    return zipObject(txIds, responses)
+  }
+
   async checkPendingTransactions({
     pendingTransactionsGroupedByAddressAndNonce,
     pendingTransactionsToCheck,
@@ -118,16 +128,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
         txsToRemove,
       }
 
-    const batch = []
-    for (const { tx } of pendingTransactions) {
-      const request = this.server.getTransactionByHashRequest(tx.txId)
-      batch.push(request)
-    }
-    const responses = await this.server.sendBatchRequest(batch)
-    const txsFromNode = {}
-    responses.forEach(
-      (response, index) => (txsFromNode[pendingTransactions[index].tx.txId] = response)
-    )
+    const txsFromNode = await this.getTransactionsFromNode(pendingTransactions)
 
     for (const { tx, assetName } of pendingTransactions) {
       const txFromNode = txsFromNode[tx.txId]
@@ -138,7 +139,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
         })
       } else if (txFromNode.blockHash !== null) {
         txsToUpdate.push({
-          tx,
+          tx: { ...tx, confirmations: 1 },
           assetSource: { asset: assetName, walletAccount },
         })
       }
@@ -153,11 +154,6 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
   async tick({ refresh, walletAccount }) {
     const assets = await this.aci.getAssetsForNetwork({ baseAssetName: this.asset.name })
     const tokens = Object.values(assets).filter((asset) => asset.baseAsset.name !== asset.name)
-    const tokensByAddress = tokens.reduce((map, token) => {
-      const addresses = getAssetAddresses(token)
-      for (const address of addresses) map.set(address.toLowerCase(), token)
-      return map
-    }, new Map())
 
     const assetSource = { assetName: this.asset.name, walletAccount }
 
@@ -181,12 +177,12 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
       walletAccount,
     })
 
-    const allAssets = [this.asset, ...tokensByAddress.values()]
-    const logItemsByAsset = Object.fromEntries(allAssets.map((asset) => [asset.name, []]))
+    const logItemsByAsset = {}
 
     txsToUpdate.forEach((txToUpdate) => {
-      const { tx } = txToUpdate
-      logItemsByAsset[txToUpdate.assetSource.asset].push(Tx.fromJSON({ ...tx, confirmations: 1 }))
+      logItemsByAsset[txToUpdate.assetSource.asset] =
+        logItemsByAsset[txToUpdate.assetSource.asset] || []
+      logItemsByAsset[txToUpdate.assetSource.asset].push(Tx.fromJSON(txToUpdate.tx))
     })
 
     await this.updateAccountState({ newData: { ...accountState }, walletAccount })