@exodus/ethereum-api 2.22.1 → 2.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.22.1",
+  "version": "2.24.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -9,18 +9,19 @@
   ],
   "author": "Exodus Movement, Inc.",
   "license": "UNLICENSED",
-  "homepage": "https://github.com/ExodusMovement/ethereum#readme",
+  "homepage": "https://github.com/ExodusMovement/assets/tree/main/ethereum",
   "publishConfig": {
     "access": "restricted"
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.5.4",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^2.20.0",
+    "@exodus/ethereum-lib": "^2.21.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
+    "@exodus/fetch": "^1.2.1",
     "@exodus/simple-retry": "^0.0.6",
     "@exodus/solidity-contract": "^1.0.1",
-    "fetchival": "0.3.3",
+    "events": "^1.1.1",
     "idna-uts46-hx": "^2.3.1",
     "js-sha3": "^0.8.0",
     "make-concurrent": "4.0.0",
@@ -35,5 +36,5 @@
     "@exodus/assets-base": "^8.0.136",
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "6a99fbefed718767bf3f8a81f18881084ffbdb6c"
+  "gitHead": "43d1c84ed5ecc17a3970113097ec9ad6d58e4312"
 }

package/src/eth-like-util.js

@@ -4,8 +4,6 @@ import { memoizeLruCache } from '@exodus/asset-lib'
 import assets from '@exodus/assets'
 import SolidityContract from '@exodus/solidity-contract'
 
-// Mobile only.
-// We should refactor mobile to pass 'asset' instead of 'assetName' so that we can use 'isContractAddress'. But that would touch many assets.
 export async function isContract(baseAssetName, address) {
   return getServerByName(baseAssetName).isContract(address)
 }

package/src/etherscan/request.js

@@ -1,9 +1,6 @@
 import ms from 'ms'
 import makeConcurrent from 'make-concurrent'
-import fetchival from 'fetchival'
-// The module in desktop explicitly sets node-fetch. Do we need this?
-// import fetch from '../fetch'
-// fetchival.fetch = fetch
+import { fetchival } from '@exodus/fetch'
 
 const ETHERSCAN_API_URL = 'https://api.etherscan.io/api'
 const DEFAULT_ETHERSCAN_API_KEY = 'XM3VGRSNW1TMSIR14I9MVFP15X74GNHTRI'

package/src/etherscan/ws.js

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import EventEmitter from 'events/' // '/' forces it to use the module from node_modules
 import ms from 'ms'
 import WebSocket from '../websocket'
 

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

@@ -1,8 +1,8 @@
 import urlJoin from 'url-join'
 import url from 'url'
-import fetchival from 'fetchival'
 import ms from 'ms'
 import createWebSocket from './ws'
+import { fetchival } from '@exodus/fetch'
 import { retry } from '@exodus/simple-retry'
 import SolidityContract from '@exodus/solidity-contract'
 import { bufferToHex } from '@exodus/ethereumjs-util'

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

@@ -1,5 +1,5 @@
 import ms from 'ms'
-import { EventEmitter } from 'events'
+import EventEmitter from 'events/' // '/' forces it to use the module from node_modules
 import WebSocket from '../websocket'
 
 const RECONNECT_INTERVAL = ms('10s')

package/src/simulate-tx/simulate-eth-tx.js

@@ -1,4 +1,6 @@
 import assets from '@exodus/assets'
+import { APPROVE_METHOD_ID } from '@exodus/ethereum-lib'
+import SolidityContract from '@exodus/solidity-contract'
 
 import { fetchTxPreview } from './fetch-tx-preview'
 import { getERC20Params } from '../eth-like-util'
@@ -67,10 +69,35 @@ async function prepareBalanceChanges(internalTransactions, balanceChanges) {
   return preparedBalanceChanges
 }
 
+async function tryToDecodeApprovalTransaction(transaction) {
+  if (!transaction?.data.startsWith(APPROVE_METHOD_ID)) return null
+
+  const contract = SolidityContract.erc20(transaction.to)
+  try {
+    const decodedInput = contract.decodeInput(transaction.data)
+    if (!decodedInput.values) return null
+
+    const [grantedTo, balance] = decodedInput.values
+
+    const symbol = (await getAssetSymbolFromContract(transaction.to)).toUpperCase() || 'Token'
+
+    return [{ grantedTo, balance, symbol, decimals: undefined }] // ToDo: Return 'decimals' in the future once we support changing the approval amount.
+  } catch (e) {
+    console.error(e.message)
+
+    return null
+  }
+}
+
 export async function simulateAndRetrieveSideEffects(transaction) {
   const willSend = []
   const willReceive = []
 
+  const approveTransactionData = await tryToDecodeApprovalTransaction(transaction)
+  if (approveTransactionData) {
+    return { willApprove: approveTransactionData }
+  }
+
   if (!transaction.to) throw new Error(`'to' field is missing in the TX object`)
 
   const blocknativeTxObject = {

package/src/websocket/index.js

@@ -4,13 +4,13 @@
  *
  * Based on https://github.com/ExodusMovement/fetch/blob/master/core.js , note that chooses native on Desktop
  */
-if (
-  typeof process !== 'undefined' &&
-  process &&
-  (process.type === 'renderer' || process.type === 'worker')
-) {
+if (typeof process !== 'undefined' && (process.type === 'renderer' || process.type === 'worker')) {
   // THIS IS FOR DESKTOP
-  module.exports = require('ws')
+  if (process.env.EXODUS_DISABLE_WS) {
+    module.exports = globalThis.WebSocket
+  } else {
+    module.exports = require('ws')
+  }
 } else {
   // eslint-disable-next-line no-undef
   if (global.window?.WebSocket) {