@exodus/ethereum-api 7.0.14 → 7.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "7.0.14",
+  "version": "7.0.16",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -17,7 +17,7 @@
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
     "@exodus/currency": "^2.1.3",
-    "@exodus/ethereum-lib": "^4.2.3",
+    "@exodus/ethereum-lib": "^4.2.5",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.3.0-beta.4",
     "@exodus/simple-retry": "^0.0.6",
@@ -38,5 +38,5 @@
     "@exodus/assets-testing": "file:../../../__testing__",
     "@exodus/models": "^11.0.0"
   },
-  "gitHead": "932d009fbd44833d111c7b73142f62e671623ab3"
+  "gitHead": "6fa73dbdd4ae4ff56f19a7a2854f439deaf99a13"
 }

package/src/ens/index.js

@@ -40,7 +40,7 @@ function namehash(inputName) {
 // ENS only available on mainnet atm
 const ENS_REGISTRY_ADDRESS = ENS_REGISTRY_ADDRESSES['ethereum']
 
-const getResolverAddress = async (name: string, server: Object) =>
+const getResolverAddress = async (name, server) =>
   server
     .ethCall({
       to: ENS_REGISTRY_ADDRESS,
@@ -48,7 +48,7 @@ const getResolverAddress = async (name: string, server: Object) =>
     })
     .then((result) => '0x' + result.slice(26))
 
-const resolveEnsName = async (name: string, server: Object) => {
+const resolveEnsName = async (name, server) => {
   const resolverAddress = await getResolverAddress(name, server)
   const hex = await server.ethCall({
     to: resolverAddress,
@@ -57,7 +57,7 @@ const resolveEnsName = async (name: string, server: Object) => {
   return '0x' + hex.slice(26)
 }
 
-const resolveEnsAddress = async (address: string, server: Object) => {
+const resolveEnsAddress = async (address, server) => {
   const name = `${address.slice(2)}.addr.reverse`
 
   const resolverAddress = await getResolverAddress(name, server)

package/src/fee-monitor/ethereumholesky.js

@@ -0,0 +1,18 @@
+import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'ethereumholesky'
+
+// @deprecated use ./server-based-fee-monitor.js
+export class EthereumHoleskyFeeMonitor extends EthereumLikeFeeMonitor {
+  constructor({ updateFee, interval }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
+    super({
+      updateFee,
+      assetName,
+      getGasPrice,
+      interval,
+    })
+  }
+}

package/src/fee-monitor/index.js

@@ -3,6 +3,7 @@ export * from './server-based-fee-monitor'
 export * from './ethereum'
 export * from './ethereumclassic'
 export * from './ethereumgoerli'
+export * from './ethereumholesky'
 export * from './bsc'
 export * from './polygon'
 export * from './avalanchec'

package/src/gas-estimation.js

@@ -15,14 +15,14 @@ export const DEFAULT_CONTRACT_GAS_LIMIT = 1e6
 // the gasEstimation will fail. If gasPrice is set to '0x0', the account's balance is not
 // used to estimate gas.
 export async function estimateGasLimit(
-  asset: Object,
-  fromAddress: string,
-  toAddress: string,
-  amount: Buffer | Object,
-  data: Buffer | string,
-  gasPrice?: string = '0x',
-  extraPercentage?: number = EXTRA_PERCENTAGE
-): Promise<number> {
+  asset,
+  fromAddress,
+  toAddress,
+  amount,
+  data,
+  gasPrice = '0x',
+  extraPercentage = EXTRA_PERCENTAGE
+) {
   const opts = {
     from: fromAddress,
     to: toAddress,

package/src/get-balances.js

@@ -36,7 +36,7 @@ const getBalance = ({ asset, accountState, txLog }) => {
 
   const shouldFixBalance = isRpcBalanceAsset(asset)
 
-  if (['ethereum', 'ethereumgoerli'].includes(asset.name)) {
+  if (['ethereum', 'ethereumgoerli', 'ethereumholesky'].includes(asset.name)) {
     const { balance: ethereumBalance } = getEthereumBalances({
       asset,
       liquidBalance: balance,

package/src/staking/ethereum/api.js

@@ -16,6 +16,10 @@ export class EthereumStaking {
       EVERSTAKE_ADDRESS_CONTRACT_ACCOUNTING: '0x6e95818C2Dde3d87406F5C5d0A759d9372053a94',
       EVERSTAKE_ADDRESS_CONTRACT_POOL: '0x1F28aD3B3e26192a09c1248D4092c692c32f8Ec0',
     },
+    ethereumholesky: {
+      EVERSTAKE_ADDRESS_CONTRACT_ACCOUNTING: '0x624087DD1904ab122A32878Ce9e933C7071F53B9',
+      EVERSTAKE_ADDRESS_CONTRACT_POOL: '0xAFA848357154a6a624686b348303EF9a13F63264',
+    },
   }
   static METHODS_IDS = {
     DELEGATE: '0x3a29dbae', // stake(uint256 source)
@@ -25,7 +29,7 @@ export class EthereumStaking {
   }
 
   constructor(
-    asset, // ethereum or ethereumgoerli for testnet
+    asset, // ethereum or ethereumholesky for testnet
     minAmount = MIN_AMOUNT
   ) {
     this.asset = asset

package/src/staking/ethereum/service.js

@@ -9,9 +9,10 @@ export function createEthereumStakingService({
   asset,
   assetClientInterface,
   createAndBroadcastTX,
+  telemetryId,
 }) {
   const staking = new EthereumStaking(asset)
-  const stakingProvider = stakingProviderClientFactory()
+  const stakingProvider = stakingProviderClientFactory({ telemetryId })
 
   function amountToCurrency({ asset, amount }) {
     return isNumberUnit(amount) ? amount : asset.currency.parse(amount)

package/src/staking/ethereum/staking-utils.js

@@ -5,10 +5,11 @@ const { DELEGATE, UNSTAKE, UNSTAKE_PENDING, CLAIM_UNSTAKE } = EthereumStaking.ME
 const STAKING_MANAGER_CONTRACTS = [
   EthereumStaking.addresses.ethereum.EVERSTAKE_ADDRESS_CONTRACT_POOL.toLowerCase(),
   EthereumStaking.addresses.ethereumgoerli.EVERSTAKE_ADDRESS_CONTRACT_POOL.toLowerCase(),
+  EthereumStaking.addresses.ethereumholesky.EVERSTAKE_ADDRESS_CONTRACT_POOL.toLowerCase(),
 ]
 
 export const isEthereumStakingTx = ({ coinName }) =>
-  ['ethereum', 'ethereumgoerli'].includes(coinName)
+  ['ethereum', 'ethereumgoerli', 'ethereumholesky'].includes(coinName)
 export const isEthereumDelegate = (tx) =>
   isEthereumStakingTx(tx) &&
   STAKING_MANAGER_CONTRACTS.includes(tx.to) &&

package/src/staking/matic/service.js

@@ -5,10 +5,14 @@ import { MaticStakingApi } from './api'
 import { stakingProviderClientFactory } from '../staking-provider-client'
 import { isNumberUnit } from '@exodus/currency'
 
-export function createPolygonStakingService({ assetClientInterface, createAndBroadcastTX }) {
+export function createPolygonStakingService({
+  assetClientInterface,
+  createAndBroadcastTX,
+  telemetryId,
+}) {
   const stakingApi = new MaticStakingApi()
   const assetName = 'ethereum'
-  const stakingProvider = stakingProviderClientFactory()
+  const stakingProvider = stakingProviderClientFactory({ telemetryId })
 
   async function getStakeAssets() {
     const { polygon: asset, ethereum: feeAsset } = await assetClientInterface.getAssetsForNetwork({

package/src/staking/staking-provider-client.js

@@ -5,7 +5,10 @@ import ms from 'ms'
 const DEFAULT_STAKING_URL = 'https://staking.a.exodus.io'
 const HTTP_POST_TIMEOUT = ms('30s')
 
-export const stakingProviderClientFactory = (defaultStakingUrl = DEFAULT_STAKING_URL) => {
+export const stakingProviderClientFactory = ({
+  defaultStakingUrl = DEFAULT_STAKING_URL,
+  telemetryId,
+} = {}) => {
   assert(defaultStakingUrl, '"defaultStakingUrl" must be provided')
 
   let stakingUrl = new URL(defaultStakingUrl) // always should be an URL instance
@@ -20,8 +23,11 @@ export const stakingProviderClientFactory = (defaultStakingUrl = DEFAULT_STAKING
   }
 
   const stakingRequest = ({ asset, data }) => {
+    const headers = {}
+    if (telemetryId) headers.telemetryId = telemetryId
     return fetchival(stakingUrl, {
       timeout: HTTP_POST_TIMEOUT,
+      headers,
     })(asset)('stake').post(data)
   }
 

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

@@ -4,7 +4,6 @@ import { getAssetAddresses, isRpcBalanceAsset } from '@exodus/ethereum-lib'
 import { isEmpty } from 'lodash'
 
 import {
-  type PendingTransactionsDictionary,
   getAllLogItemsByAsset,
   checkPendingTransactions,
   getDeriveTransactionsToCheck,
@@ -12,16 +11,6 @@ import {
 } from './monitor-utils'
 import { getLogItemsFromServerTx, getDeriveDataNeededForTick, filterEffects } from './clarity-utils'
 
-import { type Tx } from '@exodus/models'
-
-type DerivedData = {
-  ourWalletAddress: string,
-  currentAccountState: Object,
-  unconfirmedTransactions: PendingTransactionsDictionary,
-  pendingTransactionsGroupedByAddressAndNonce: PendingTransactionsDictionary,
-  simulatedTransactions: any,
-}
-
 export class ClarityMonitor extends BaseMonitor {
   constructor({ server, config, ...args }) {
     super(args)
@@ -47,7 +36,7 @@ export class ClarityMonitor extends BaseMonitor {
     }
   }
 
-  async deriveData({ assetName, walletAccount, tokens }: Object): DerivedData {
+  async deriveData({ assetName, walletAccount, tokens }) {
     const { ourWalletAddress, currentAccountState } = await this.deriveDataNeededForTick({
       assetName,
       walletAccount,
@@ -67,7 +56,7 @@ export class ClarityMonitor extends BaseMonitor {
   }
 
   // eslint-disable-next-line no-undef
-  async checkPendingTransactions(params): { txsToRemove: { tx: Tx, assetSource: AssetSource }[] } {
+  async checkPendingTransactions(params) {
     const {
       pendingTransactionsToCheck,
       pendingTransactionsGroupedByAddressAndNonce,

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

@@ -1,10 +1,8 @@
-/* @flow */
 import BN from 'bn.js'
 import { getServer } from '@exodus/ethereum-api'
 import { isRpcBalanceAsset, getAssetAddresses } from '@exodus/ethereum-lib'
 
 import {
-  type PendingTransactionsDictionary,
   checkPendingTransactions,
   getAllLogItemsByAsset,
   getLogItemsFromServerTx,
@@ -22,20 +20,8 @@ import {
 
 import { isEmpty } from 'lodash'
 
-import { type Tx } from '@exodus/models'
-
 import { BaseMonitor } from '@exodus/asset-lib'
 
-export type { AssetSource } from '@exodus/models/lib/types'
-
-type DerivedData = {
-  ourWalletAddress: string,
-  currentAccountState: Object,
-  minimumConfirmations: number,
-  unconfirmedTransactions: PendingTransactionsDictionary,
-  pendingTransactionsGroupedByAddressAndNonce: PendingTransactionsDictionary,
-  simulatedTransactions: any,
-}
 // The base ethereum monitor class handles listening for, fetching,
 // formatting, and populating-to-state all ETH/ETC/ERC20 transactions.
 
@@ -60,7 +46,7 @@ export class EthereumMonitor extends BaseMonitor {
     }
   }
 
-  async deriveData({ assetSource, tokens }: Object): DerivedData {
+  async deriveData({ assetSource, tokens }) {
     const { asset: assetName, walletAccount } = assetSource
 
     const {
@@ -84,7 +70,7 @@ export class EthereumMonitor extends BaseMonitor {
   }
 
   // eslint-disable-next-line no-undef
-  async checkPendingTransactions(params): { txsToRemove: { tx: Tx, assetSource: AssetSource }[] } {
+  async checkPendingTransactions(params) {
     const {
       pendingTransactionsToCheck,
       pendingTransactionsGroupedByAddressAndNonce,

package/src/tx-log/monitor-utils/check-pending-transactions.js

@@ -1,7 +1,5 @@
-// @flow
 import getSenderNonceKey from './get-sender-nonce-key'
 import getFeeAmount from './get-fee-amount'
-import type { PendingTransactionsDictionary } from './types'
 
 export default function checkPendingTransactions({
   pendingTransactionsGroupedByAddressAndNonce = {},
@@ -9,13 +7,7 @@ export default function checkPendingTransactions({
   txlist,
   ourWalletAddress,
   asset,
-}: {
-  pendingTransactionsGroupedByAddressAndNonce: PendingTransactionsDictionary,
-  pendingTransactionsToCheck: PendingTransactionsDictionary,
-  txlist: Array<Object>,
-  ourWalletAddress: string,
-  asset: Object,
-}): PendingTransactionsDictionary {
+}) {
   for (const tx of txlist) {
     delete pendingTransactionsToCheck[tx.txId || tx.hash] // Found this transaction, do not mark it as dropped
 

package/src/tx-log/monitor-utils/get-sender-nonce-key.js

@@ -1,4 +1,4 @@
-export default function getSenderNonceKey(tx, ourWalletAddress): string {
+export default function getSenderNonceKey(tx, ourWalletAddress) {
   if (Array.isArray(tx.from)) {
     // Tx class. we don't define the 'from' address if our wallet was the sender.
     const from = tx.from[0] || ourWalletAddress

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

@@ -6,5 +6,3 @@ 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-unchanged-token-balances'
-
-export type { PendingTransactionsDictionary } from './types'

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

@@ -1,11 +0,0 @@
-import type { Tx } from '@exodus/models'
-
-export type PendingTransactionsDictionary =
-  | {
-      [string]: {
-        tx: Tx,
-        replaced?: boolean,
-        assetName: string,
-      },
-    }
-  | {}