wip skip gas

Author: micaelae

packages/bridge-status-controller/src/utils/transaction.test.ts

@@ -1814,9 +1814,6 @@ describe('Bridge Status Controller Transaction Utils', () => {
         {
           "data": "0xbridgeData",
           "from": "0xUserAddress",
-          "gas": "0x5208",
-          "maxFeePerGas": "0xb1a2bc2ec50000",
-          "maxPriorityFeePerGas": "0xb1a2bc2ec50000",
           "to": "0xBridgeContract",
           "value": "0x1000",
         }
@@ -2033,9 +2030,6 @@ describe('Bridge Status Controller Transaction Utils', () => {
               "params": {
                 "data": "0xbridgeData",
                 "from": "0xUserAddress",
-                "gas": "0x5208",
-                "maxFeePerGas": "0xb1a2bc2ec50000",
-                "maxPriorityFeePerGas": "0xb1a2bc2ec50000",
                 "to": "0xBridgeContract",
                 "value": "0x1000",
               },
@@ -2205,9 +2199,6 @@ describe('Bridge Status Controller Transaction Utils', () => {
         {
           "data": "0xbridgeData",
           "from": "0xUserAddress",
-          "gas": "0x5208",
-          "maxFeePerGas": "0xb1a2bc2ec50000",
-          "maxPriorityFeePerGas": "0xb1a2bc2ec50000",
           "to": "0xBridgeContract",
           "value": "0x1000",
         }

packages/bridge-status-controller/src/utils/transaction.ts

@@ -59,7 +59,7 @@ const is7702Tx = (tx: TransactionMeta) => {
   );
 };
 
-const getGasFeeEstimates = async (
+export const getGasFeeEstimates = async (
   messenger: BridgeStatusControllerMessenger,
   args: Parameters<TransactionController['estimateGasFee']>[0],
 ) => {
@@ -316,6 +316,7 @@ export const toQuoteAndTxMetadata = ({
  * @param networkClientId - the network client ID to use for the gas fee estimates
  * @param chainId - the chain ID to use for the gas fee estimates
  * @param simulatedGasFeeLimits - either the txFee from the quote or the simulated gas fee limits for the batch sell
+ * @param skipGasFields - when true (gasIncluded7702), omit gas and fee fields so the batch controller sponsors gas
  * @returns The gas fee estimates for the transaction
  */
 export const toTransactionParams = async (
@@ -324,6 +325,7 @@ export const toTransactionParams = async (
   networkClientId: string,
   chainId: Hex,
   simulatedGasFeeLimits?: SimulatedGasFeeLimits | TxFeeGasLimits,
+  skipGasFields = false,
 ): Promise<BatchTransactionParams> => {
   const normalizedTrade = {
     ...trade,
@@ -332,6 +334,11 @@ export const toTransactionParams = async (
     from: trade.from,
     value: trade.value,
   };
+
+  if (skipGasFields) {
+    return normalizedTrade;
+  }
+
   const transactionParams = {
     ...trade,
     // Only add gasLimit and gas if they're truthy
@@ -386,17 +393,28 @@ export const getAddTransactionBatchParams = async ({
   const hexChainId = formatChainIdToHex(trade.chainId);
   const networkClientId = getNetworkClientIdByChainId(messenger, hexChainId);
 
+  // Gas fields should be omitted only when gas is sponsored via 7702
+  const skipGasFields = quoteResponse.quote.gasIncluded7702 === true;
+  const isGasless =
+    quoteResponse.quote.gasIncluded === true || skipGasFields;
+
   const transactions: TransactionBatchSingleRequest[] = await Promise.all(
-    tradeData.map(async ({ tx, txFee, quoteResponse: _, ...rest }) => ({
-      params: await toTransactionParams(
-        messenger,
-        tx,
-        networkClientId,
-        hexChainId,
-        txFee,
-      ),
-      ...rest,
-    })),
+    tradeData.map(async ({ tx, txFee, quoteResponse: _, ...rest }) => {
+      const simulatedGasFeeLimits =
+        !skipGasFields && isGasless ? txFee : undefined;
+
+      return {
+        params: await toTransactionParams(
+          messenger,
+          tx,
+          networkClientId,
+          hexChainId,
+          simulatedGasFeeLimits,
+          skipGasFields,
+        ),
+        ...rest,
+      };
+    }),
   );
 
   return {
@@ -416,10 +434,7 @@ export const getAddTransactionBatchParams = async ({
           // For gasless transactions with STX/sendBundle we keep disabling 7702.
           quoteResponse.quote.gasIncluded,
     isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored),
-    /**
-     * Gas fields should be omitted only when gas is sponsored via 7702
-     */
-    isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702),
+    isGasFeeIncluded: skipGasFields,
     ...addTransactionBatchParams,
   };
 };