@exodus/ethereum-api 2.23.0 → 2.24.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.23.0",
+  "version": "2.24.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -29,12 +29,12 @@
     "ms": "^2.1.1",
     "url": "0.10.3",
     "url-join": "4.0.0",
-    "ws": "6.1.0"
+    "ws": "^6.1.0"
   },
   "devDependencies": {
     "@exodus/assets": "^8.0.67",
     "@exodus/assets-base": "^8.0.136",
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "5a1621d8fb3c1ecf4c47dc37f284e9a40d7fd018"
+  "gitHead": "3ebe0a3ec7c9090ebbd451c0845b64090852cead"
 }

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/account.js

@@ -1,4 +1,4 @@
-import assert from 'assert'
+import assert from 'minimalistic-assert'
 import request from './request'
 
 const isValidResponseCheck = (x) =>

package/src/etherscan/logs.js

@@ -1,4 +1,4 @@
-import assert from 'assert'
+import assert from 'minimalistic-assert'
 import request from './request'
 
 const isValidResponseCheck = (x) =>

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