@exodus/ethereum-api 3.3.6-alpha.0 → 3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "3.3.6-alpha.0",
+  "version": "3.5.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -17,7 +17,7 @@
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/bip32": "^1.0.0",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^2.24.4-alpha.0",
+    "@exodus/ethereum-lib": "^2.25.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.2.1",
     "@exodus/key-utils": "^1.0.0",
@@ -38,5 +38,5 @@
   "devDependencies": {
     "@exodus/models": "^8.10.4"
   },
-  "gitHead": "8caeef539add41e9bdaba1e97061fca1a7c29b87"
+  "gitHead": "adb3bcb3d3c538706a0fd7fe3cf11ba89712905b"
 }

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

@@ -47,7 +47,7 @@ export default class ClarityServer extends EventEmitter {
   }
 
   createSocket(namespace) {
-    return io(`${this.uri}${namespace}`)
+    return io(`${this.uri}${namespace}`, { transports: ['websocket', 'polling'] })
   }
 
   disconnectTransactions(address) {
@@ -158,6 +158,11 @@ export default class ClarityServer extends EventEmitter {
     return response.result
   }
 
+  async isContract(address) {
+    const code = await this.getCode(address)
+    return code.length > 2
+  }
+
   buildRequest({ method, params = [] }) {
     return { jsonrpc: '2.0', id: this.id++, method, params }
   }
@@ -235,6 +240,10 @@ export default class ClarityServer extends EventEmitter {
     return this.sendRequest(request)
   }
 
+  async getBalanceProxied(...params) {
+    return this.getBalance(...params)
+  }
+
   async gasPrice(...params) {
     const request = this.gasPriceRequest(...params)
     return this.sendRequest(request)

package/src/fee-monitor/optimism.js

@@ -0,0 +1,15 @@
+import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'optimism'
+
+export class OptimismFeeMonitor extends EthereumLikeFeeMonitor {
+  constructor({ updateFee, interval }) {
+    super({
+      updateFee,
+      assetName,
+      getGasPrice: async () => (await getServerByName(assetName).getFee())?.gasPrice,
+      interval,
+    })
+  }
+}

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

@@ -36,7 +36,7 @@ export class ClarityMonitor extends BaseMonitor {
   }
 
   setServer(config) {
-    if (config.server === this.server.uri) {
+    if (!config?.server || config.server === this.server.uri) {
       return
     }
     this.server.setURI(config.server)
@@ -156,16 +156,13 @@ export class ClarityMonitor extends BaseMonitor {
       ...derivedData,
     })
 
-    const nextCursorBuff = response.cursor ? Buffer.from(response.cursor) : null
-    const nextCursorBase64 = nextCursorBuff?.toString?.('base64') || null
-
     const accountState = await this.getNewAccountState({
       tokens,
       ourWalletAddress: derivedData.ourWalletAddress,
     })
     await this.updateAccountState({
       walletAccount,
-      newData: { cursor: nextCursorBase64, ...accountState },
+      newData: { clarityCursor: response.cursor, ...accountState },
     })
 
     await this.removeFromTxLog(txsToRemove)
@@ -315,8 +312,8 @@ export class ClarityMonitor extends BaseMonitor {
 
   async getHistoryFromServer({ walletAccount, derivedData, refresh }) {
     const address = derivedData.ourWalletAddress
-    const cursorBase64 = derivedData.currentAccountState?.cursor
-    const cursor = cursorBase64 && !refresh ? Buffer.from(cursorBase64, 'base64') : null
+    const currentCursor = derivedData.currentAccountState?.clarityCursor
+    const cursor = currentCursor && !refresh ? currentCursor : null
     return this.server.getAllTransactions({ walletAccount, address, cursor })
   }