@exodus/ethereum-api 6.3.10 → 6.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.3.10",
+  "version": "6.3.11",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^3.3.29",
+    "@exodus/ethereum-lib": "^3.3.30",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.3.0-beta.4",
     "@exodus/simple-retry": "^0.0.6",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/models": "^8.10.4"
   },
-  "gitHead": "2a2228b5c4b973f263c98cb8a7a17fa3c5c106cb"
+  "gitHead": "45dc3b2f0d2b7ac87c5bd490c5e568bab7a0cb6e"
 }

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

@@ -150,6 +150,7 @@ export default class ClarityServer extends EventEmitter {
 
   async sendBatchRequest(batch) {
     const responses = await this.sendRpcRequest(batch)
+    // FIXME: this falls apart if responses is not an array
     const isValid = responses.every((response) => {
       return !isNaN(response?.id) && response?.result
     })

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

@@ -6,20 +6,21 @@ const DELEGATE = '0x3a29dbae'
 const UNSTAKE_PENDING = '0xed0723d4'
 
 // unstake(uint256 amount)
-const UNSTAKE = '0x2e17de78'
+const UNSTAKE = '0x215f826b'
 
-const STAKING_MANAGER_CONTRACT = EthereumStaking.addresses.ethereum.EVERSTAKE_ADDRESS_CONTRACT_POOL
+const STAKING_MANAGER_CONTRACTS = [
+  EthereumStaking.addresses.ethereum.EVERSTAKE_ADDRESS_CONTRACT_POOL.toLowerCase(),
+  EthereumStaking.addresses.ethereumgoerli.EVERSTAKE_ADDRESS_CONTRACT_POOL.toLowerCase(),
+]
 
-export const isEthereumTx = ({ coinName }) => coinName === 'ethereum'
+export const isEthereumStakingTx = ({ coinName }) =>
+  ['ethereum', 'ethereumgoerli'].includes(coinName)
 export const isEthereumDelegate = (tx) =>
-  isEthereumTx(tx) && tx.to === STAKING_MANAGER_CONTRACT && tx.data?.methodId === DELEGATE
-export const isEthereumUndelegate = (tx) =>
-  isEthereumTx(tx) &&
-  tx.from[0] === STAKING_MANAGER_CONTRACT &&
-  tx.data &&
-  tx.data.methodId === UNSTAKE
+  isEthereumStakingTx(tx) &&
+  STAKING_MANAGER_CONTRACTS.includes(tx.to) &&
+  tx.data?.methodId === DELEGATE
+export const isEthereumUndelegate = (tx) => isEthereumStakingTx(tx) && tx.data?.methodId === UNSTAKE
 export const isEthereumClaimUndelegate = (tx) =>
-  isEthereumTx(tx) &&
-  tx.from[0] === STAKING_MANAGER_CONTRACT &&
-  tx.data &&
-  tx.data.methodId === UNSTAKE_PENDING
+  isEthereumStakingTx(tx) &&
+  STAKING_MANAGER_CONTRACTS.includes(tx.from[0]) &&
+  tx.data?.methodId === UNSTAKE_PENDING

package/src/staking/ethereum-staking.js

@@ -137,7 +137,7 @@ export class EthereumStaking {
     }
   }
 
-  async unstake({ address, amount }) {
+  async unstake({ address, amount, isAllowedInterchange = false, source = '0' }) {
     const amountWei = amount.toBaseString()
     const balance = await this.autocompoundBalanceOf(address)
 
@@ -145,7 +145,9 @@ export class EthereumStaking {
       return {
         to: this.poolAddress,
         amount: this.asset.currency.ZERO,
-        data: bufferToHex(this.buildTxData(this.contractPool, 'unstake', amountWei)),
+        data: bufferToHex(
+          this.buildTxData(this.contractPool, 'unstake', amountWei, isAllowedInterchange, source)
+        ),
       }
     } else {
       throw new Error(`Max Amount for unstake ${balance}`)

package/src/tx-log/monitor-utils/get-log-items-from-server-tx.js

@@ -27,6 +27,8 @@ export default function getLogItemsFromServerTx({
   const tokenTransfersByTokenName = getTransfersByTokenName(serverTx.erc20 || [], tokensByAddress)
   const toAddress = tryFindExternalRecipient(ethereumTransfers, ourWalletAddress)
   const ourWalletWasSender = serverTx.from === ourWalletAddress
+  const METHOD_ID_LENGTH = 10
+  const methodId = serverTx.data && { methodId: serverTx.data.substring(0, METHOD_ID_LENGTH) }
 
   const logItemCommonProperties = {
     confirmations,
@@ -61,6 +63,7 @@ export default function getLogItemsFromServerTx({
             data: serverTx.data || '0x',
             nonce,
             gasLimit,
+            ...methodId,
           },
           ...(ourWalletWasSender
             ? { from: [], to: toAddress, feeAmount, feeCoinName: asset.feeAsset.name }
@@ -106,9 +109,6 @@ export default function getLogItemsFromServerTx({
       receivingTransferPresent,
     })
 
-    const METHOD_ID_LENGTH = 10
-    const methodId = serverTx.data && { methodId: serverTx.data.substring(0, METHOD_ID_LENGTH) }
-
     logItemsForServerTxEntries.push([
       tokenName,
       {