@exodus/ethereum-api 5.0.13 → 5.1.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "5.0.13",
+  "version": "5.1.0-alpha.0",
   "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": "^2.27.0-alpha.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": "d876955802b9f0765ee1bf49ab4c8969a436886d"
+  "gitHead": "3241be77078ca4bf456bd7b2e8f3fe545142c92e"
 }

package/src/index.js

@@ -9,3 +9,4 @@ export * from './tx-log'
 export * from './get-balances'
 export * from './staking'
 export * from './simulate-tx'
+export * from './optimism-gas'

package/src/optimism-gas/addresses.js

@@ -0,0 +1 @@
+export const GAS_ORACLE_ADDRESS = '0x420000000000000000000000000000000000000F'

package/src/optimism-gas/index.js

@@ -0,0 +1,16 @@
+import * as ethUtil from '@exodus/ethereumjs-util'
+import { convertUnsignedTx, createContract } from '@exodus/ethereum-lib'
+import { getServerByName } from '../exodus-eth-server'
+import { GAS_ORACLE_ADDRESS } from './addresses'
+
+const gasContract = createContract(GAS_ORACLE_ADDRESS, 'optimismGasOracle')
+
+export async function estimateOptimismL1DataFee({ unsignedTx }) {
+  const ethjsTx = convertUnsignedTx(unsignedTx)
+  const serialized = ethjsTx.serialize()
+  const callData = gasContract.getL1Fee.build(serialized)
+  const buffer = Buffer.from(callData)
+  const data = ethUtil.bufferToHex(buffer)
+  const server = getServerByName('optimism')
+  return server.ethCall({ to: GAS_ORACLE_ADDRESS, data }, 'latest')
+}

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

@@ -8,7 +8,6 @@ import {
   getAllLogItemsByAsset,
   checkPendingTransactions,
   getDeriveTransactionsToCheck,
-  excludeUnchangedTokenBalances,
 } from './monitor-utils'
 import { getLogItemsFromServerTx, getDeriveDataNeededForTick, filterEffects } from './clarity-utils'
 
@@ -159,7 +158,6 @@ export class ClarityMonitor extends BaseMonitor {
 
     const accountState = await this.getNewAccountState({
       tokens,
-      currentTokenBalances: derivedData.currentAccountState?.tokenBalances,
       ourWalletAddress: derivedData.ourWalletAddress,
     })
     await this.updateAccountState({
@@ -189,7 +187,7 @@ export class ClarityMonitor extends BaseMonitor {
     }
   }
 
-  async getNewAccountState({ tokens, currentTokenBalances, ourWalletAddress }) {
+  async getNewAccountState({ tokens, ourWalletAddress }) {
     const asset = this.asset
     const newAccountState = {}
     const balances = await this.getBalances({ tokens, ourWalletAddress })
@@ -198,15 +196,14 @@ export class ClarityMonitor extends BaseMonitor {
       newAccountState.balance = asset.currency.baseUnit(balance)
     }
     const tokenBalancePairs = Object.entries(balances).filter((entry) => entry[0] !== asset.name)
-    const tokenBalanceEntries = tokenBalancePairs
+    const entries = tokenBalancePairs
       .map((pair) => {
         const token = tokens.find((token) => token.name === pair[0])
         const value = token.currency.baseUnit(pair[1] || 0)
-        return [token.name, value]
+        return value.isZero ? null : [token.name, value]
       })
       .filter((pair) => pair)
-
-    const tokenBalances = excludeUnchangedTokenBalances(currentTokenBalances, tokenBalanceEntries)
+    const tokenBalances = Object.fromEntries(entries)
     if (!isEmpty(tokenBalances)) newAccountState.tokenBalances = tokenBalances
     return newAccountState
   }

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

@@ -11,7 +11,6 @@ import {
   getDeriveDataNeededForTick,
   getDeriveTransactionsToCheck,
   getHistoryFromServer,
-  excludeUnchangedTokenBalances,
 } from './monitor-utils'
 
 import {
@@ -186,10 +185,8 @@ export class EthereumMonitor extends BaseMonitor {
 
     const accountState = await this.getNewAccountState({
       tokens,
-      currentTokenBalances: derivedData.currentAccountState?.tokenBalances,
       ourWalletAddress: derivedData.ourWalletAddress,
     })
-
     await this.updateAccountState({ newData: { index, ...accountState }, walletAccount })
 
     await this.removeFromTxLog(txsToRemove)
@@ -223,7 +220,7 @@ export class EthereumMonitor extends BaseMonitor {
     }
   }
 
-  async getNewAccountState({ tokens, currentTokenBalances, ourWalletAddress }) {
+  async getNewAccountState({ tokens, ourWalletAddress }) {
     const asset = this.asset
     const newAccountState = {}
     const server = this.server
@@ -239,11 +236,10 @@ export class EthereumMonitor extends BaseMonitor {
         .map(async (token) => {
           const { confirmed } = await server.balanceOf(ourWalletAddress, token.contract.address)
           const value = token.currency.baseUnit(confirmed[token.contract.address] || 0)
-          return [token.name, value]
+          return value.isZero ? null : [token.name, value]
         })
     )
-
-    const tokenBalances = excludeUnchangedTokenBalances(currentTokenBalances, tokenBalancePairs)
+    const tokenBalances = Object.fromEntries(tokenBalancePairs.filter((pair) => pair))
     if (!isEmpty(tokenBalances)) newAccountState.tokenBalances = tokenBalances
     return newAccountState
   }

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

@@ -3,11 +3,7 @@ import { getServer } from '@exodus/ethereum-api'
 import { DEFAULT_SERVER_URLS } from '@exodus/ethereum-lib'
 import { Tx } from '@exodus/models'
 
-import {
-  getDeriveDataNeededForTick,
-  getDeriveTransactionsToCheck,
-  excludeUnchangedTokenBalances,
-} from './monitor-utils'
+import { getDeriveDataNeededForTick, getDeriveTransactionsToCheck } from './monitor-utils'
 
 import { isEmpty, unionBy, zipObject } from 'lodash'
 
@@ -61,22 +57,21 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
     return Object.fromEntries(entries)
   }
 
-  async getNewAccountState({ tokens, currentTokenBalances, ourWalletAddress }) {
+  async getNewAccountState({ tokens, ourWalletAddress }) {
     const asset = this.asset
     const newAccountState = {}
     const balances = await this.getBalances({ tokens, ourWalletAddress })
     const balance = balances[asset.name]
     newAccountState.balance = asset.currency.baseUnit(balance)
     const tokenBalancePairs = Object.entries(balances).filter((entry) => entry[0] !== asset.name)
-    const tokenBalanceEntries = tokenBalancePairs
+    const entries = tokenBalancePairs
       .map((pair) => {
         const token = tokens.find((token) => token.name === pair[0])
         const value = token.currency.baseUnit(pair[1] || 0)
-        return [token.name, value]
+        return value.isZero ? null : [token.name, value]
       })
       .filter((pair) => pair)
-
-    const tokenBalances = excludeUnchangedTokenBalances(currentTokenBalances, tokenBalanceEntries)
+    const tokenBalances = Object.fromEntries(entries)
     if (!isEmpty(tokenBalances)) newAccountState.tokenBalances = tokenBalances
     return newAccountState
   }
@@ -84,11 +79,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
   async deriveData({ assetSource, tokens }) {
     const { assetName, walletAccount } = assetSource
 
-    const { ourWalletAddress, currentAccountState } = await this.deriveDataNeededForTick({
-      assetName,
-      walletAccount,
-    })
-
+    const { ourWalletAddress } = await this.deriveDataNeededForTick({ assetName, walletAccount })
     const {
       pendingTransactionsGroupedByAddressAndNonce,
       pendingTransactionsToCheck,
@@ -105,7 +96,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
       'tx.txId'
     )
 
-    return { ourWalletAddress, pendingTransactions, currentAccountState }
+    return { ourWalletAddress, pendingTransactions }
   }
 
   async getTransactionsFromNode(transactions) {
@@ -157,7 +148,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
 
     const assetSource = { assetName: this.asset.name, walletAccount }
 
-    const { ourWalletAddress, pendingTransactions, currentAccountState } = await this.deriveData({
+    const { ourWalletAddress, pendingTransactions } = await this.deriveData({
       assetSource,
       tokens,
     })
@@ -180,7 +171,6 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
 
     const accountState = await this.getNewAccountState({
       tokens,
-      currentTokenBalances: currentAccountState?.tokenBalances,
       ourWalletAddress,
     })
 

package/src/tx-log/monitor-utils/index.js

@@ -1,10 +1,8 @@
 export { default as getDeriveDataNeededForTick } from './get-derive-data-needed-for-tick'
-
 export { default as getAllLogItemsByAsset } from './get-all-log-items-by-asset'
 export { default as getLogItemsFromServerTx } from './get-log-items-from-server-tx'
 export { default as getHistoryFromServer } from './get-history-from-server'
 export { default as checkPendingTransactions } from './check-pending-transactions'
 export { default as getDeriveTransactionsToCheck } from './get-derive-transactions-to-check'
-export * from './exclude-unchaged-token-balances'
 
 export type { PendingTransactionsDictionary } from './types'

package/src/tx-log/monitor-utils/exclude-unchaged-token-balances.js

@@ -1,13 +0,0 @@
-export function excludeUnchangedTokenBalances(currentTokenBalances, newTokenBalancePairs) {
-  const newTokenBalances = Object.fromEntries(newTokenBalancePairs)
-
-  const tokenBalances = newTokenBalancePairs.reduce((tokenBalancesAcc, [token, balance]) => {
-    const currentBalance = currentTokenBalances[token]
-    if (!newTokenBalances[token].isZero || (currentBalance && !currentBalance.isZero)) {
-      tokenBalancesAcc[token] = balance
-    }
-    return tokenBalancesAcc
-  }, {})
-
-  return tokenBalances
-}