@exodus/ethereum-api 8.5.0 → 8.7.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.7.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.6.0...@exodus/ethereum-api@8.7.0) (2024-06-21)
+
+
+### Features
+
+* EVM NFT's fee and send ([#2626](https://github.com/ExodusMovement/assets/issues/2626)) ([2231954](https://github.com/ExodusMovement/assets/commit/22319543463e88046339ad6658683e13f0e71a46))
+
+
+
+## [8.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.5.0...@exodus/ethereum-api@8.6.0) (2024-06-18)
+
+
+### Features
+
+* add tokenAssetType to base asset ([#2298](https://github.com/ExodusMovement/assets/issues/2298)) ([80c9dc8](https://github.com/ExodusMovement/assets/commit/80c9dc8a4d2a8614f84b66d2c9649cdf19601443))
+
+
+### Bug Fixes
+
+* add handling 400 error code for eth like  ([#2592](https://github.com/ExodusMovement/assets/issues/2592)) ([ac1121d](https://github.com/ExodusMovement/assets/commit/ac1121dab0cc451cfeeb8001915b11fc0bbe00a0))
+* send fromAddress when approving tokens ([#2600](https://github.com/ExodusMovement/assets/issues/2600)) ([25a08ff](https://github.com/ExodusMovement/assets/commit/25a08ff08ca02405fc39d5590c60b025e98e703a))
+
+
+
 ## [8.5.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.4.2...@exodus/ethereum-api@8.5.0) (2024-06-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.5.0",
+  "version": "8.7.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -66,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "7f584775d566248fa9633086baee1064edbe8ef0"
+  "gitHead": "685abde3787a364cdd00a675e95fe4dfa9053d96"
 }

package/src/allowance/index.js

@@ -33,6 +33,7 @@ export const createApprove =
     spenderAddress,
     asset,
     feeData,
+    fromAddress,
     approveAmount,
     gasLimit,
     txInput: preTxInput,
@@ -50,6 +51,7 @@ export const createApprove =
       txInput,
       feeData,
       isContract: true,
+      fromAddress,
     }
 
     gasLimit = gasLimit || (await fetchGasLimit(gasLimitOptions))
@@ -64,6 +66,7 @@ export const createApprove =
       gasPrice: feeData.gasPrice,
       gasLimit,
       silent: true,
+      fromAddress,
       ...rest,
     })
 

package/src/create-asset.js

@@ -58,7 +58,6 @@ export const createAssetFactory = ({
   nfts = false,
   serverUrl,
   stakingConfiguration = {},
-  tokenType,
   useEip1191ChainIdChecksum = false,
 }) => {
   assert(assetsList, 'assetsList is required')

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

@@ -29,7 +29,7 @@ export function create(defaultURL, ensAssetName) {
       )
     } catch (err) {
       let nerr = err
-      if (err.response && err.response.status === 500) {
+      if (err.response && (err.response.status === 500 || err.response.status === 400)) {
         try {
           const data = await err.response.json()
           const msg = data.error.replace(/^RPC error \(code: -\d+\): /, '')

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

@@ -1,6 +1,9 @@
 import {
+  // eslint-disable-next-line import/no-deprecated
   DEFAULT_SERVER_URLS,
+  // eslint-disable-next-line import/no-deprecated
   ETHEREUM_LIKE_ASSETS,
+  // eslint-disable-next-line import/no-deprecated
   ETHEREUM_LIKE_MONITOR_TYPES,
 } from '@exodus/ethereum-lib'
 
@@ -27,8 +30,11 @@ export function createEvmServer({ assetName, serverUrl, monitorType }) {
 
 // @Deprecated
 const serverMap = Object.fromEntries(
+  // eslint-disable-next-line import/no-deprecated
   ETHEREUM_LIKE_ASSETS.map((assetName) => {
+    // eslint-disable-next-line import/no-deprecated
     const monitorType = ETHEREUM_LIKE_MONITOR_TYPES[assetName]
+    // eslint-disable-next-line import/no-deprecated
     const serverUrl = DEFAULT_SERVER_URLS[assetName]
     return [assetName, createEvmServer({ assetName, serverUrl, monitorType })]
   })

package/src/gas-estimation.js

@@ -1,6 +1,6 @@
 import BN from 'bn.js'
 import * as ethUtil from '@exodus/ethereumjs-util'
-import { currency2buffer, isToken } from '@exodus/ethereum-lib'
+import { currency2buffer, isEthereumLikeToken } from '@exodus/ethereum-lib'
 import { estimateGas, isContractAddressCached } from './eth-like-util'
 
 const EXTRA_PERCENTAGE = 20
@@ -42,7 +42,7 @@ export async function fetchGasLimit({
   asset,
   fromAddress,
   toAddress,
-  txInput = '0x',
+  txInput: providedTxInput,
   amount,
   bip70,
   throwOnError = true,
@@ -53,21 +53,22 @@ export async function fetchGasLimit({
 
   if (!amount) amount = asset.currency.ZERO
 
+  const isToken = isEthereumLikeToken(asset)
+
+  const txInput =
+    providedTxInput ||
+    (isToken
+      ? ethUtil.bufferToHex(
+          asset.contract.transfer.build(toAddress.toLowerCase(), amount.toBaseString())
+        )
+      : '0x')
+
   const defaultGasLimit = () =>
     asset.gasLimit + GAS_PER_NON_ZERO_BYTE * ethUtil.toBuffer(txInput).length
 
-  const _isToken = isToken(asset)
-
   const isContract = await isContractAddressCached({ asset, address: toAddress })
 
-  if (_isToken) {
-    // only create tx-input only if not pass tx-input to a token asset
-    if (txInput === '0x') {
-      txInput = ethUtil.bufferToHex(
-        asset.contract.transfer.build(toAddress.toLowerCase(), amount.toBaseString())
-      )
-    }
-
+  if (isToken) {
     amount = asset.baseAsset.currency.ZERO
     toAddress = asset.contract.address
   } else if (

package/src/get-fee-async.js

@@ -2,6 +2,7 @@ import assert from 'minimalistic-assert'
 import { fetchGasLimit } from './gas-estimation'
 import { isForwarderContractCached } from './eth-like-util'
 import { getFeeFactory } from './get-fee'
+import { getNftArguments } from './nft-utils'
 
 const FIXED_TRANSFER_GAS_LIMIT_ASSETS = new Set([
   'amp',
@@ -33,38 +34,47 @@ const getFeeAsyncFactory = ({
   assert(createUnsignedTx, 'createUnsignedTx is required')
   const getFee = getFeeFactory({ gasLimit: defaultGasLimit })
   return async ({
+    nft,
     asset,
     fromAddress = '0xffffffffffffffffffffffffffffffffffffffff', // sending from a random address
     toAddress = '0xffffffffffffffffffffffffffffffffffffffff', // sending to a random address,
     amount,
     bip70,
-    txInput,
+    txInput: txInputPram,
     isExchange,
     customFee,
     calculateEffectiveFee,
     isSendAll,
     isRbfAllowed = true, // Destkop, isRbfAllowed=true when advanced panel is on
-    throwOnError = false,
   }) => {
-    const extraPercentage = await resolveExtraPercentage({ asset, toAddress })
+    const resolveGasLimit = async () => {
+      if (nft) {
+        return getNftArguments({ asset, nft, fromAddress, toAddress })
+      }
+
+      const extraPercentage = await resolveExtraPercentage({ asset, toAddress })
+      const txInput = txInputPram ?? '0x'
+      const gasLimit = await fetchGasLimit({
+        asset,
+        fromAddress,
+        toAddress,
+        txInput, // default value is '0x'
+        amount,
+        bip70,
+        extraPercentage,
+      })
+      return { gasLimit, txInput }
+    }
+
+    const { txInput, gasLimit, contractAddress } = await resolveGasLimit()
 
-    const gasLimit = await fetchGasLimit({
-      asset,
-      fromAddress,
-      toAddress,
-      txInput: txInput ?? '0x', // default value is '0x'
-      amount,
-      bip70,
-      throwOnError,
-      extraPercentage,
-    })
     const feeData = await assetClientInterface.getFeeConfig({ assetName: asset.baseAsset.name })
 
     const optimismL1DataFee = asset.baseAsset.estimateL1DataFee
       ? await asset.baseAsset.estimateL1DataFee({
           unsignedTx: createUnsignedTx({
             asset,
-            address: toAddress,
+            address: contractAddress || toAddress,
             fromAddress,
             amount,
             nonce: 0,
@@ -90,7 +100,13 @@ const getFeeAsyncFactory = ({
     const l1DataFee = optimismL1DataFee
       ? asset.baseAsset.currency.baseUnit(optimismL1DataFee)
       : asset.baseAsset.currency.ZERO
-    return { fee: fee.add(l1DataFee), optimismL1DataFee, gasLimit, ...rest }
+    return {
+      fee: fee.add(l1DataFee),
+      optimismL1DataFee,
+      gasLimit,
+      txInput,
+      ...rest,
+    }
   }
 }
 

package/src/nft-utils.js

@@ -0,0 +1,53 @@
+import SolidityContract from '@exodus/solidity-contract'
+import { fetchGasLimit } from './gas-estimation'
+import assert from 'minimalistic-assert'
+
+export const getNftArguments = async ({ asset, nft, fromAddress, toAddress }) => {
+  assert(asset, 'asset is required')
+  assert(nft, 'nft is required')
+  assert(fromAddress, 'fromAddress is required')
+  assert(toAddress, 'toAddress is required')
+  const { contractAddress, tokenId, contractType } = nft
+
+  const txInputs = []
+
+  if (!contractType || contractType === 'erc1155') {
+    const txInput = `0x${SolidityContract.simpleErc1155(contractAddress)
+      .safeTransferFrom.build(fromAddress, toAddress, tokenId, 1, [])
+      .toString('hex')}`
+    txInputs.push({ txInput, contractType: 'erc1155' })
+  }
+
+  if (!contractType || contractType === 'erc721') {
+    const txInput = `0x${SolidityContract.simpleErc721(contractAddress)
+      .safeTransferFrom.build(fromAddress, toAddress, tokenId)
+      .toString('hex')}`
+    txInputs.push({ txInput, contractType: 'erc721' })
+  }
+
+  const errors = [`Cannot fetch gas for ${asset.name}`]
+  const { txInput, gasLimit } = await Promise.any(
+    txInputs.map(async ({ txInput, contractType }) => {
+      try {
+        const gasLimit = await fetchGasLimit({
+          asset,
+          fromAddress,
+          toAddress: contractAddress,
+          txInput,
+          amount: asset.baseAsset.currency.ZERO,
+        })
+        return { txInput, gasLimit }
+      } catch (e) {
+        errors.push(`ContractType ${contractType} nft input ${txInput}. ${e.message}`)
+        throw e
+      }
+    })
+  ).catch((e) => {
+    throw new Error(errors.join('\n'))
+  })
+  return {
+    contractAddress,
+    gasLimit,
+    txInput,
+  }
+}

package/src/staking/ethereum/service.js

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

package/src/staking/matic/service.js

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

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

@@ -6,7 +6,7 @@ const DEFAULT_STAKING_URL = 'https://staking.a.exodus.io'
 const HTTP_POST_TIMEOUT = ms('30s')
 
 export const stakingProviderClientFactory = (
-  { defaultStakingUrl = DEFAULT_STAKING_URL, getTelemetryId } = Object.create(null)
+  { defaultStakingUrl = DEFAULT_STAKING_URL } = Object.create(null)
 ) => {
   assert(defaultStakingUrl, '"defaultStakingUrl" must be provided')
 
@@ -22,11 +22,8 @@ export const stakingProviderClientFactory = (
   }
 
   const stakingRequest = async ({ asset, data }) => {
-    const headers = {}
-    if (typeof getTelemetryId === 'function') headers.telemetryId = await getTelemetryId()
     return fetchival(stakingUrl, {
       timeout: HTTP_POST_TIMEOUT,
-      headers,
     })(asset)('stake').post(data)
   }
 

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

@@ -1,4 +1,5 @@
 import { getServer } from '../exodus-eth-server'
+// eslint-disable-next-line import/no-deprecated
 import { DEFAULT_SERVER_URLS } from '@exodus/ethereum-lib'
 import { Tx } from '@exodus/models'
 
@@ -31,6 +32,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
 
   setServer(config) {
     if (!config?.server) {
+      // eslint-disable-next-line import/no-deprecated
       this.server.setURI(DEFAULT_SERVER_URLS[this.asset.name])
       return
     }

package/src/tx-send/get-fee-info.js

@@ -28,7 +28,6 @@ const getFeeInfo = async function getFeeInfo({
       amount,
       txInput,
       throwOnError: false,
-      isContract: feeOpts.isContract ?? undefined,
     })
   }
 

package/src/tx-send/tx-send.js

@@ -1,18 +1,16 @@
 /* eslint-disable  @exodus/export-default/last */
 
 import { getNonce, transactionExists } from '../eth-like-util'
-import {
-  calculateBumpedGasPrice,
-  isToken as checkIsToken,
-  normalizeTxId,
-} from '@exodus/ethereum-lib'
+import { calculateBumpedGasPrice, isEthereumLikeToken, normalizeTxId } from '@exodus/ethereum-lib'
 import assert from 'minimalistic-assert'
 import getFeeInfo from './get-fee-info'
+import { getNftArguments } from '../nft-utils'
 
 const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
   assert(assetClientInterface, 'assetClientInterface is required')
   assert(createUnsignedTx, 'createUnsignedTx is required')
   return async ({
+    nft,
     asset,
     walletAccount,
     amount,
@@ -43,13 +41,21 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       assetName: baseAsset.name,
       walletAccount,
     })
-
-    let nonceParam = _nonce
-
     const feeData = await assetClientInterface.getFeeData({
       assetName: baseAsset.name,
     })
 
+    let contractAddress
+    if (nft) {
+      const nftArguments = await getNftArguments({ asset, nft, fromAddress, toAddress: address })
+      contractAddress = nftArguments.contractAddress
+      feeOpts.gasLimit = nftArguments.gasLimit
+      txInput = nftArguments.txInput
+      amount = asset.baseAsset.currency.ZERO
+    }
+
+    let nonceParam = _nonce
+
     let eip1559Enabled = feeData.eip1559Enabled
 
     // `replacedTx` is always an ETH/ETC transaction (not a token)
@@ -102,7 +108,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       assetClientInterface,
       asset,
       walletAccount,
-      toAddress: address,
+      toAddress: contractAddress || address,
       amount,
       nonce: nonceParam,
       fromAddress,
@@ -171,7 +177,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       ],
     })
 
-    const isToken = checkIsToken(asset)
+    const isToken = isEthereumLikeToken(asset)
     if (isToken) {
       await assetClientInterface.updateTxLogAndNotify({
         assetName: baseAsset.name,
@@ -224,7 +230,7 @@ const createTx = async ({
   feeOpts,
   createUnsignedTx,
 }) => {
-  const isToken = checkIsToken(asset)
+  const isToken = isEthereumLikeToken(asset)
 
   if (txInput && isToken && !keepTxInput)
     throw new Error(`Additional data for Ethereum Token (${asset.name}) is not allowed`)