@exodus/ethereum-api 2.12.0 → 2.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.12.0",
+  "version": "2.13.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -11,7 +11,8 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.5.4",
-    "@exodus/ethereum-lib": "^2.13.4",
+    "@exodus/crypto": "^1.0.0-rc.0",
+    "@exodus/ethereum-lib": "^2.13.5",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/simple-retry": "^0.0.6",
     "fetchival": "0.3.3",
@@ -27,5 +28,5 @@
     "@exodus/assets-base": "^8.0.136",
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "de5323b963812c9da9e7554664b5b562605a52bd"
+  "gitHead": "7d9f726b6115d756d5fbed46664d466972c0f314"
 }

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

@@ -6,6 +6,7 @@ import createWebSocket from './ws'
 import { retry } from '@exodus/simple-retry'
 import { simpleErc20 } from '@exodus/solidity-contract'
 import { bufferToHex } from '@exodus/ethereumjs-util'
+import { randomUUID } from '@exodus/crypto/randomUUID'
 
 const RETRY_DELAYS = ['10s']
 
@@ -18,10 +19,10 @@ export function create(defaultURL) {
     return url.format(obj)
   })
 
-  async function request(module, params = {}, version = 'v1') {
+  async function request(module, params = {}, { version = 'v1', method = 'get' } = {}) {
     const url = urlJoin(version === 'v1' ? API_URL : API_URL.replace('v1', version), module)
     try {
-      return await fetchival(url, { timeout: ms('15s') }).get(params)
+      return await fetchival(url, { timeout: ms('15s') })[method](params)
     } catch (err) {
       let nerr = err
       if (err.response && err.response.status === 500) {
@@ -106,7 +107,7 @@ export function create(defaultURL) {
           address,
           ...opts,
         },
-        'v2'
+        { version: 'v2' }
       )
     },
 
@@ -229,5 +230,13 @@ export function create(defaultURL) {
         method: 'net_version',
       })
     },
+
+    async proxyToCoinNode(requestData) {
+      if (!requestData.jsonrpc) requestData.jsonrpc = '2.0'
+      if (!requestData.id) requestData.id = randomUUID()
+      if (!requestData.params) requestData.params = []
+
+      return request('proxy', requestData, { version: 'v2', method: 'post' })
+    },
   }
 }

package/src/get-balances.js

@@ -0,0 +1,38 @@
+import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
+
+const fixBalance = ({ txLog, balance }) => {
+  for (const tx of txLog) {
+    // TODO: pending can only be less than a few minutes old, we can only search the latest txs to improve performance
+    if (tx.sent && tx.pending && !tx.error) {
+      // coinAmount is negative for sent tx
+      balance = balance.sub(tx.coinAmount.abs())
+      if (tx.coinAmount.unitType.equals(tx.feeAmount.unitType)) {
+        balance = balance.sub(tx.feeAmount)
+      }
+    }
+  }
+  return balance
+}
+
+/**
+ * Api method to return the balance based on either account state balances or tx history.
+ *
+ * @param asset the asset to get the balances
+ * @param txLog the txLog when the balance is transaction based
+ * @param accountState the account state when the balance is loaded from RPC
+ * @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)) {
+    const balance =
+      asset.baseAsset.name === asset.name
+        ? accountState?.balance
+        : accountState?.tokenBalances?.[asset.name]
+    return balance && !balance.isZero ? { balance: fixBalance({ txLog, balance }) } : null
+  }
+  return txLog.size
+    ? {
+        balance: txLog.getMutations().slice(-1)[0].balance,
+      }
+    : null
+}

package/src/index.js

@@ -6,3 +6,4 @@ export * from './fee-monitor'
 export * from './gas-estimation'
 export * from './exodus-eth-server'
 export * from './tx-log'
+export * from './get-balances'

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

@@ -224,9 +224,8 @@ export class EthereumMonitor extends BaseMonitor {
           .filter((token) => isRpcBalanceAsset(token) && token.contract.address)
           .map(async (token) => {
             const { confirmed } = await server.balanceOf(ourWalletAddress, token.contract.address)
-            const value = confirmed[token.contract.address]
-            const balance = token.currency.baseUnit(value || 0)
-            return { [token.name]: balance }
+            const value = token.currency.baseUnit(confirmed[token.contract.address] || 0)
+            return value.isZero ? {} : { [token.name]: value }
           })
       ))
     )