@exodus/ethereum-api 8.3.0 → 8.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.3.0",
+  "version": "8.3.2",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -58,5 +58,5 @@
     "cross-fetch": "^3.1.5",
     "delay": "4.0.1"
   },
-  "gitHead": "7fee55f46b28a0472a166f76e5d06b0f4c99457d"
+  "gitHead": "11a9b2f22c847d15a678534743f628adf15b0a2e"
 }

package/src/create-asset.js

@@ -14,7 +14,6 @@ import {
   encodePrivate,
   encodePublicFactory,
   hasChecksum,
-  parseUnsignedTx,
   signUnsignedTx,
   signUnsignedTxWithSigner,
   signMessage,
@@ -230,13 +229,11 @@ export const createAssetFactory = ({
       getSupportedPurposes: () => [44],
       getTokens,
       hasFeature: (feature) => !!features[feature], // @deprecated use api.features instead
-      parseUnsignedTx: (unsignedTx, { asset }) => parseUnsignedTx(asset, unsignedTx),
       sendTx,
       signTx: ({ unsignedTx, privateKey, signer }) =>
         signer
           ? signUnsignedTxWithSigner(unsignedTx, signer)
           : signUnsignedTx(unsignedTx, privateKey),
-      signUnsignedTx,
       signHardware: signHardwareFactory({ baseAssetName: asset.name }),
       signMessage: ({ message, privateKey, signer }) =>
         signer ? signMessageWithSigner({ message, signer }) : signMessage({ privateKey, message }),

package/src/get-fee-async.js

@@ -90,7 +90,7 @@ const getFeeAsyncFactory = ({
     const l1DataFee = optimismL1DataFee
       ? asset.baseAsset.currency.baseUnit(optimismL1DataFee)
       : asset.baseAsset.currency.ZERO
-    return { fee: fee.add(l1DataFee), gasLimit, ...rest }
+    return { fee: fee.add(l1DataFee), optimismL1DataFee, gasLimit, ...rest }
   }
 }
 

package/src/hooks/monitor.js

@@ -17,6 +17,9 @@ export const createEthereumHooks = ({
       baseAssetName: assetName,
     })
 
+    // some assets may not be available
+    const stakingAssets = stakingAssetNames.map((assetName) => assets[assetName]).filter(Boolean)
+
     const userAddress = await assetClientInterface.getReceiveAddress({
       assetName,
       walletAccount,
@@ -27,19 +30,18 @@ export const createEthereumHooks = ({
       staking: Object.create(null),
     }
 
-    for (const stakingAssetName of stakingAssetNames) {
+    for (const asset of stakingAssets) {
+      const stakingAssetName = asset.name
       const getStakingInfo =
         stakingAssetName === 'polygon' ? getPolygonStakingInfo : getEthereumStakingInfo
-      const asset = assets[stakingAssetName]
-      if (asset) {
-        // asset may not be enabled in the wallet
-        const assetStakingInfo = await getStakingInfo({
-          address: userAddress.toString(),
-          asset,
-          server,
-        })
-        stakingInfo.staking[stakingAssetName] = assetStakingInfo
-      }
+
+      // asset may not be enabled in the wallet
+      const assetStakingInfo = await getStakingInfo({
+        address: userAddress.toString(),
+        asset,
+        server,
+      })
+      stakingInfo.staking[stakingAssetName] = assetStakingInfo
     }
 
     const batch = assetClientInterface.createOperationsBatch()
@@ -50,9 +52,9 @@ export const createEthereumHooks = ({
       batch,
     })
 
-    const processTxLogsPromises = stakingAssetNames.map((stakingAssetName) => {
+    const processTxLogsPromises = stakingAssets.map((asset) => {
       return processTxLog({
-        asset: assets[stakingAssetName],
+        asset,
         assetClientInterface,
         walletAccount,
         batch,

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

@@ -162,7 +162,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
                 gasLimit,
                 replacedTxId: bumpTxId,
                 nonce,
-                tipGasPrice: tipGasPrice.toBaseString(),
+                ...(tipGasPrice ? { tipGasPrice: tipGasPrice.toBaseString() } : {}),
               }
             : { gasLimit, replacedTxId: bumpTxId, nonce },
         },
@@ -193,7 +193,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
                   gasLimit,
                   replacedTxId: bumpTxId,
                   nonce,
-                  tipGasPrice: tipGasPrice.toBaseString(),
+                  ...(tipGasPrice ? { tipGasPrice: tipGasPrice.toBaseString() } : {}),
                 }
               : { gasLimit, replacedTxId: bumpTxId, nonce },
           },
@@ -245,7 +245,14 @@ const createTx = async ({
 
   if (eip1559Enabled) {
     if (customGasPrice) {
-      gasPrice = customGasPrice
+      gasPrice = customGasPrice // aka maxFeePerGas
+
+      // We must ensure maxPriorityFeePerGas <= maxFeePerGas or our transaction library throws an error
+      // It's a bit counterintuitive  since maxPriorityFeePerGas should only contain the tip,
+      // so we should be subtracting the base gas price from the custom gas price to keep just the tip
+      // but the fee is also limited by our maxFeePerGas above, so that implicitly captures the max tip.
+      // Setting this tipGasPrice to undefined will result in a legacy transaction (not an EIP1559 anymore)
+      tipGasPrice = customGasPrice // aka maxPriorityFeePerGas
     }
 
     if (isSendAll && !isToken) {