@exodus/ethereum-lib 2.13.1 → 2.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.13.1",
+  "version": "2.13.3",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -10,7 +10,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^3.4.0",
+    "@exodus/asset-lib": "^3.5.4",
     "@exodus/ethereumjs-common": "^2.4.0-exodus.6",
     "@exodus/ethereumjs-tx": "^3.3.0-exodus.6",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
@@ -24,5 +24,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "0266f50330e737c4cce09987e490a103f6cbfa8c"
+  "gitHead": "163192db3e616071238360a14577e6a5c570a51e"
 }

package/src/constants.js

@@ -5,6 +5,7 @@ export const CHAIN_IDS = {
   matic: 137,
   avalanchec: 43114,
   fantommainnet: 250,
+  harmonymainnet: 1666600000,
 }
 export const MIN_GASPRICE = 1e9 // 1 gwei
 export const DEFAULT_FEE_MONITOR_INTERVAL = '1m'
@@ -15,6 +16,7 @@ export const CONFIRMATIONS_NUMBER = {
   matic: 355,
   avalanchec: 30,
   fantommainnet: 3,
+  harmonymainnet: 6,
 }
 export const ETHEREUM_LIKE_ASSETS = [
   'bsc',
@@ -23,6 +25,7 @@ export const ETHEREUM_LIKE_ASSETS = [
   'matic',
   'avalanchec',
   'fantommainnet',
+  'harmonymainnet',
 ]
 export const ETHEREUM_LIKE_TOKEN_TYPES = [
   'ETHEREUM_ERC20',

package/src/fee-data/harmony.js

@@ -0,0 +1,14 @@
+import { FeeData } from '@exodus/asset-lib'
+
+export default new FeeData(
+  {
+    gasPrice: '10 Gwei',
+    max: '700 Gwei',
+    min: '30 Gwei',
+    fuelThreshold: '2500000 Gwei',
+    gasPriceEconomicalRate: 0.8,
+    gasPriceMinimumRate: 0.6,
+  },
+  'gasPrice',
+  'harmonymainnet'
+)

package/src/fee-data/index.js

@@ -4,3 +4,4 @@ export { default as bsc } from './bsc'
 export { default as matic } from './polygon'
 export { default as avalanchec } from './avalanchec'
 export { default as fantommainnet } from './fantom'
+export { default as harmonymainnet } from './harmony'

package/src/monitor-utils/get-derive-data-needed-for-tick.js

@@ -1,14 +1,10 @@
 // A super-selector that returns all the current data needed for a tick of the ETH monitor.
 
-export default function getDeriveDataNeededForTick({
-  getAccountState,
-  getConfirmationsNumber,
-  getReceiveAddress,
-}) {
+export default function getDeriveDataNeededForTick(aci) {
   return async function({ assetName, walletAccount }) {
-    const receiveAddress = await getReceiveAddress({ assetName, walletAccount })
-    const currentAccountState = await getAccountState({ assetName, walletAccount })
-    const minimumConfirmations = await getConfirmationsNumber({ assetName })
+    const receiveAddress = await aci.getReceiveAddress({ assetName, walletAccount })
+    const currentAccountState = await aci.getAccountState({ assetName, walletAccount })
+    const minimumConfirmations = await aci.getConfirmationsNumber({ assetName })
     return {
       ourWalletAddress: receiveAddress.toLowerCase(),
       currentAccountState,

package/src/monitor-utils/get-derive-transactions-to-check.js

@@ -3,7 +3,7 @@ import getSenderNonceKey from './get-sender-nonce-key'
 
 const UNCONFIRMED_TX_LIMIT = ms('5m')
 
-export default function getDeriveTransactionsToCheck({ getTxHistory }) {
+export default function getDeriveTransactionsToCheck({ getTxLog }) {
   return async ({ assetName: _assetName, walletAccount, tokens, ourWalletAddress }) => {
     const pendingTransactionsToCheck = {}
     const pendingTransactionsGroupedByAddressAndNonce = {}
@@ -11,7 +11,7 @@ export default function getDeriveTransactionsToCheck({ getTxHistory }) {
     const now = Date.now()
 
     for (const assetName of [_assetName, ...tokens.map(({ name }) => name)]) {
-      const txSet = await getTxHistory({ assetName, walletAccount })
+      const txSet = await getTxLog({ assetName, walletAccount })
       for (const tx of txSet) {
         // ERC20 sends have an entry in ETH and one in the ERC20 log so we just want the ETH one
         if (

package/src/monitor-utils/get-names-of-tokens-transferred-by-server-tx.js

@@ -1,5 +1,6 @@
 import lodash from 'lodash'
 import getValueOfTransfers from './get-value-of-transfers'
+import { FEE_PAYMENT_PREFIX } from '../utils'
 
 // For ETH transactions, we store an array of token names inside
 // the TX model. This array is used to display text in the UI for
@@ -12,7 +13,6 @@ export default function getNamesOfTokensTransferredByServerTx({
   tokensByAddress,
   ourWalletAddress,
   serverTx,
-  FEE_PAYMENT_PREFIX,
 }) {
   // Treat smart contract ETH transfer transactions as ETH transfers, not token transfers
   if (!getValueOfTransfers(ourWalletAddress, asset, serverTx.internal || []).isZero) {

package/src/monitor-utils/index.js

@@ -3,8 +3,8 @@ export { default as getAllLogItemsByAsset } from './get-all-log-items-by-asset'
 export { default as isConfirmedServerTx } from './is-confirmed-server-tx'
 export { default as isConsideredSentTokenTx } from './is-considered-sent-token-tx'
 export { default as getHistoryFromServer } from './get-history-from-server'
+export { default as getLogItemsFromServerTx } from './get-log-items-from-server-tx'
 export { default as checkPendingTransactions } from './check-pending-transactions'
 export { default as getDeriveTransactionsToCheck } from './get-derive-transactions-to-check'
-export { subscribeToWSNotifications, enableWSUpdates } from './ws-updates'
 
 export type { PendingTransactionsDictionary } from './types'

package/src/utils/index.js

@@ -3,6 +3,7 @@ import * as ethUtil from '@exodus/ethereumjs-util'
 import assets from '@exodus/assets'
 import { ETHEREUM_LIKE_ASSETS, ETHEREUM_LIKE_TOKEN_TYPES } from '../constants'
 import { FeeMarketEIP1559Transaction, Transaction } from '@exodus/ethereumjs-tx'
+import { uniq } from 'lodash'
 
 export { default as calculateExtraEth } from './calculate-extra-eth'
 
@@ -70,3 +71,25 @@ export function deserialize(hex) {
 
 const getTxType = (serializedTx: string) => serializedTx.slice(2, 4)
 export const isEip1559Tx = (serializedTx: string) => getTxType(serializedTx) === '02'
+
+export const APPROVE_METHOD_ID = '0x095ea7b3'
+
+export const FEE_PAYMENT_PREFIX = '0xfee0'
+
+export const isApproveTx = (tx) => tx?.data?.data?.startsWith(APPROVE_METHOD_ID)
+
+export const isFeePaymentTx = (tx) => tx?.data?.data?.startsWith(FEE_PAYMENT_PREFIX)
+
+export const isRpcBalanceAsset = (asset) => ['bsc', 'matic', 'babydoge_bsc'].includes(asset.name)
+
+export const getAssetAddresses = (asset) => {
+  // It seems to be two schemas of assets. The original and the transformed by the client.
+  // Can we unify?
+  const addresses = [
+    asset.contract?.address, // asset in wallets:
+    asset.contract?.current, // asset in @exodus/assets:
+    ...(asset.addresses?.previous || []), // asset in wallets:
+    ...(asset.contract?.previous || []), // asset in @exodus/assets:
+  ]
+  return uniq(addresses.filter((a) => a && typeof a === 'string'))
+}

package/src/monitor-utils/ws-updates.js

@@ -1,59 +0,0 @@
-import ms from 'ms'
-
-const subscribedToAddressNotificationsMap = new Map()
-const UPDATE_LOOP_INTERVAL = ms('5m')
-
-export function subscribeToWSNotifications({
-  addressesByWalletAccount,
-  tick,
-  getState,
-  server,
-  beforeStart = false,
-}) {
-  Object.entries(addressesByWalletAccount).forEach(([walletAccount, addresses]) => {
-    const address = String(Array.from(addresses)[0]).toLowerCase() // Only check m/0/0
-    const mapKey = `${server.getURL()}:${address}` // different chains might have the same addresses
-    if (subscribedToAddressNotificationsMap.has(mapKey)) return
-
-    server.ws.watch(address)
-    server.ws.events.on(`address-${address}`, () => {
-      tick({ refresh: false, getState, walletAccount })
-    })
-    subscribedToAddressNotificationsMap.set(mapKey, true)
-    if (!beforeStart) {
-      // tick for a new wallet account
-      tick({ refresh: false, getState, walletAccount })
-    }
-  })
-}
-
-export function enableWSUpdates({
-  interval,
-  server,
-  timer,
-  dispatch,
-  getState,
-  tickAllWalletAccounts,
-  tick,
-  addressesByWalletAccount,
-  beforeStart = false,
-}) {
-  const defaultInterval = interval
-
-  subscribeToWSNotifications({
-    server,
-    getState,
-    beforeStart,
-    tick,
-    addressesByWalletAccount,
-  })
-
-  server.ws.events.on('open', () => {
-    timer.setNewInterval(UPDATE_LOOP_INTERVAL)
-  })
-  server.ws.events.on('close', async () => {
-    await timer.setNewInterval(defaultInterval)
-    return tickAllWalletAccounts({ dispatch, getState })
-  })
-  server.ws.open()
-}