@metamask/bridge-status-controller 32.0.0 → 34.0.0

package/dist/types.d.mts

@@ -1,13 +1,15 @@
 import type { AccountsControllerGetAccountByAddressAction, AccountsControllerGetSelectedMultichainAccountAction } from "@metamask/accounts-controller";
 import type { ControllerGetStateAction, ControllerStateChangeEvent, RestrictedMessenger } from "@metamask/base-controller";
-import type { BridgeBackgroundAction, BridgeControllerAction, ChainId, Quote, QuoteMetadata, QuoteResponse, StatusTypes, TxData } from "@metamask/bridge-controller";
+import type { BridgeBackgroundAction, BridgeControllerAction, ChainId, Quote, QuoteMetadata, QuoteResponse, TxData } from "@metamask/bridge-controller";
 import type { GetGasFeeState } from "@metamask/gas-fee-controller";
 import type { NetworkControllerFindNetworkClientIdByChainIdAction, NetworkControllerGetNetworkClientByIdAction, NetworkControllerGetStateAction } from "@metamask/network-controller";
 import type { RemoteFeatureFlagControllerGetStateAction } from "@metamask/remote-feature-flag-controller";
 import type { HandleSnapRequest } from "@metamask/snaps-controllers";
+import type { Infer } from "@metamask/superstruct";
 import type { TransactionControllerGetStateAction, TransactionControllerTransactionConfirmedEvent, TransactionControllerTransactionFailedEvent, TransactionMeta } from "@metamask/transaction-controller";
 import type { BridgeStatusController } from "./bridge-status-controller.mjs";
 import type { BRIDGE_STATUS_CONTROLLER_NAME } from "./constants.mjs";
+import type { StatusResponseSchema } from "./utils/validators.mjs";
 export declare enum BridgeClientId {
     EXTENSION = "extension",
     MOBILE = "mobile"
@@ -40,36 +42,6 @@ export type StatusRequestDto = Omit<StatusRequest, 'quote' | 'srcChainId' | 'des
 export type StatusRequestWithSrcTxHash = StatusRequest & {
     srcTxHash: string;
 };
-export type Asset = {
-    chainId: ChainId;
-    address: string;
-    symbol: string;
-    name: string;
-    decimals: number;
-    icon?: string | null;
-};
-export type SrcChainStatus = {
-    chainId: ChainId;
-    /**
-     * The txHash of the transaction on the source chain.
-     * This might be undefined for smart transactions (STX)
-     */
-    txHash?: string;
-    /**
-     * The atomic amount of the token sent minus fees on the source chain
-     */
-    amount?: string;
-    token?: Record<string, never> | Asset;
-};
-export type DestChainStatus = {
-    chainId: ChainId;
-    txHash?: string;
-    /**
-     * The atomic amount of the token received on the destination chain
-     */
-    amount?: string;
-    token?: Record<string, never> | Asset;
-};
 export declare enum BridgeId {
     HOP = "hop",
     CELER = "celer",
@@ -84,47 +56,11 @@ export declare enum BridgeId {
     RELAY = "relay",
     MAYAN = "mayan"
 }
-export declare enum FeeType {
-    METABRIDGE = "metabridge",
-    REFUEL = "refuel"
-}
-export type FeeData = {
-    amount: string;
-    asset: Asset;
-};
-export type Protocol = {
-    displayName?: string;
-    icon?: string;
-    name?: string;
-};
-export declare enum ActionTypes {
-    BRIDGE = "bridge",
-    SWAP = "swap",
-    REFUEL = "refuel"
-}
-export type Step = {
-    action: ActionTypes;
-    srcChainId: ChainId;
-    destChainId?: ChainId;
-    srcAsset: Asset;
-    destAsset: Asset;
-    srcAmount: string;
-    destAmount: string;
-    protocol: Protocol;
-};
-export type StatusResponse = {
-    status: StatusTypes;
-    srcChain: SrcChainStatus;
-    destChain?: DestChainStatus;
-    bridge?: BridgeId;
-    isExpectedToken?: boolean;
-    isUnrecognizedRouterAddress?: boolean;
-    refuel?: RefuelStatusResponse;
-};
+export type StatusResponse = Infer<typeof StatusResponseSchema>;
 export type RefuelStatusResponse = object & StatusResponse;
-export type RefuelData = object & Step;
 export type BridgeHistoryItem = {
     txMetaId: string;
+    batchId?: string;
     quote: Quote;
     status: StatusResponse;
     startTime?: number;
@@ -133,12 +69,12 @@ export type BridgeHistoryItem = {
     completionTime?: number;
     pricingData?: {
         /**
-         * From QuoteMetadata.sentAmount.amount, the actual amount sent by user in non-atomic decimal form
+         * The actual amount sent by user in non-atomic decimal form
          */
-        amountSent: string;
-        amountSentInUsd?: string;
-        quotedGasInUsd?: string;
-        quotedReturnInUsd?: string;
+        amountSent: QuoteMetadata['sentAmount']['amount'];
+        amountSentInUsd?: QuoteMetadata['sentAmount']['usd'];
+        quotedGasInUsd?: QuoteMetadata['gasFee']['usd'];
+        quotedReturnInUsd?: QuoteMetadata['toTokenAmount']['usd'];
         quotedRefuelSrcAmountInUsd?: string;
         quotedRefuelDestAmountInUsd?: string;
     };

package/dist/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2CAA2C,EAC3C,oDAAoD,EACrD,sCAAsC;AACvC,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,mBAAmB,EACpB,kCAAkC;AACnC,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,aAAa,EACb,aAAa,EACb,WAAW,EACX,MAAM,EACP,oCAAoC;AACrC,OAAO,KAAK,EAAE,cAAc,EAAE,qCAAqC;AACnE,OAAO,KAAK,EACV,mDAAmD,EACnD,2CAA2C,EAC3C,+BAA+B,EAChC,qCAAqC;AACtC,OAAO,KAAK,EAAE,yCAAyC,EAAE,iDAAiD;AAC1G,OAAO,KAAK,EAAE,iBAAiB,EAAE,oCAAoC;AACrE,OAAO,KAAK,EACV,mCAAmC,EACnC,8CAA8C,EAC9C,2CAA2C,EAC3C,eAAe,EAChB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,sBAAsB,EAAE,uCAAmC;AACzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,wBAAoB;AAKjE,oBAAY,cAAc;IACxB,SAAS,cAAc;IACvB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,aAAa,GAAG,CAC1B,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,KAEf,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,aAAa,EACb,OAAO,GAAG,YAAY,GAAG,aAAa,GAAG,QAAQ,CAClD,GAAG;IACF,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,aAAa,GAAG;IACvD,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC;CACvC,CAAC;AAEF,oBAAY,QAAQ;IAClB,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,WAAW,gBAAgB;IAC3B,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,KAAK,UAAU;CAChB;AAED,oBAAY,OAAO;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,oBAAY,WAAW;IACrB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,KAAK,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,MAAM,CAAC,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,cAAc,CAAC;AAE3D,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC;AAEvC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC,EAAE,MAAM,CAAC;IACzC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE;QACZ;;WAEG;QACH,UAAU,EAAE,MAAM,CAAC;QACnB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,2BAA2B,CAAC,EAAE,MAAM,CAAC;KACtC,CAAC;IACF,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,oBAAY,kBAAkB;IAC5B,kCAAkC,kCAAkC;IACpE,kBAAkB,qBAAqB;IACvC,SAAS,aAAa;IACtB,WAAW,eAAe;IAC1B,SAAS,aAAa;CACvB;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,2BAA2B,CAAC;IACpC;;;OAGG;IACH,eAAe,EAAE,2BAA2B,CAAC;IAC7C;;;OAGG;IACH,kBAAkB,EAAE,2BAA2B,CAAC;IAChD,aAAa,EAAE,2BAA2B,CAAC;IAC3C;;;OAGG;IACH,cAAc,EAAE,IAAI,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAC;IAC5D;;;OAGG;IACH,UAAU,EAAE,2BAA2B,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,IAAI,EAAE,IAAI,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,YAAY,EAAE,eAAe,CAAC;IAC9B,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,aAAa,GAAG,aAAa,CAAC;IAC7C,SAAS,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC3C,kBAAkB,EAAE,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;IAC5D,uBAAuB,CAAC,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACvE,qBAAqB,CAAC,EAAE,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;IACnE,YAAY,CAAC,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACjD,YAAY,CAAC,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;CAClD,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,2CAA2C,GAAG,IAAI,CAC5D,iCAAiC,EACjC,eAAe,CAChB,GAAG;IACF,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG;IACxC,SAAS,EAAE,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;CAC3D,CAAC;AAGF,KAAK,4BAA4B,CAC/B,YAAY,SAAS,MAAM,sBAAsB,IAC/C;IACF,IAAI,EAAE,GAAG,OAAO,6BAA6B,IAAI,YAAY,EAAE,CAAC;IAChE,OAAO,EAAE,sBAAsB,CAAC,YAAY,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,wBAAwB,CACzE,OAAO,6BAA6B,EACpC,2BAA2B,CAC5B,CAAC;AAGF,MAAM,MAAM,yDAAyD,GACnE,4BAA4B,CAAC,kBAAkB,CAAC,kCAAkC,CAAC,CAAC;AAEtF,MAAM,MAAM,4CAA4C,GACtD,4BAA4B,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;AAEtE,MAAM,MAAM,sCAAsC,GAChD,4BAA4B,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;AAE/D,MAAM,MAAM,oCAAoC,GAC9C,4BAA4B,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;AAE7D,MAAM,MAAM,6BAA6B,GACrC,yDAAyD,GACzD,4CAA4C,GAC5C,sCAAsC,GACtC,oCAAoC,GACpC,oCAAoC,CAAC;AAGzC,MAAM,MAAM,sCAAsC,GAAG,0BAA0B,CAC7E,OAAO,6BAA6B,EACpC,2BAA2B,CAC5B,CAAC;AAEF,MAAM,MAAM,4BAA4B,GACtC,sCAAsC,CAAC;AAEzC;;GAEG;AACH,KAAK,cAAc,GACf,mDAAmD,GACnD,+BAA+B,GAC/B,2CAA2C,GAC3C,oDAAoD,GACpD,iBAAiB,GACjB,mCAAmC,GACnC,sBAAsB,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,GACzE,sBAAsB,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,GACtE,sBAAsB,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,GACtE,cAAc,GACd,2CAA2C,GAC3C,yCAAyC,CAAC;AAE9C;;GAEG;AACH,KAAK,aAAa,GACd,2CAA2C,GAC3C,8CAA8C,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG,mBAAmB,CAC/D,OAAO,6BAA6B,EACpC,6BAA6B,GAAG,cAAc,EAC9C,4BAA4B,GAAG,aAAa,EAC5C,cAAc,CAAC,MAAM,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC"}
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.mjs

@@ -20,17 +20,6 @@ export var BridgeId;
     BridgeId["RELAY"] = "relay";
     BridgeId["MAYAN"] = "mayan";
 })(BridgeId || (BridgeId = {}));
-export var FeeType;
-(function (FeeType) {
-    FeeType["METABRIDGE"] = "metabridge";
-    FeeType["REFUEL"] = "refuel";
-})(FeeType || (FeeType = {}));
-export var ActionTypes;
-(function (ActionTypes) {
-    ActionTypes["BRIDGE"] = "bridge";
-    ActionTypes["SWAP"] = "swap";
-    ActionTypes["REFUEL"] = "refuel";
-})(ActionTypes || (ActionTypes = {}));
 export var BridgeStatusAction;
 (function (BridgeStatusAction) {
     BridgeStatusAction["START_POLLING_FOR_BRIDGE_TX_STATUS"] = "startPollingForBridgeTxStatus";

package/dist/types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAqCA,8EAA8E;AAC9E,2BAA2B;AAE3B,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,yCAAuB,CAAA;IACvB,mCAAiB,CAAA;AACnB,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AA2ED,MAAM,CAAN,IAAY,QAaX;AAbD,WAAY,QAAQ;IAClB,uBAAW,CAAA;IACX,2BAAe,CAAA;IACf,uCAA2B,CAAA;IAC3B,+BAAmB,CAAA;IACnB,+BAAmB,CAAA;IACnB,mCAAuB,CAAA;IACvB,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IACrB,2BAAe,CAAA;IACf,2BAAe,CAAA;AACjB,CAAC,EAbW,QAAQ,KAAR,QAAQ,QAanB;AAED,MAAM,CAAN,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,oCAAyB,CAAA;IACzB,4BAAiB,CAAA;AACnB,CAAC,EAHW,OAAO,KAAP,OAAO,QAGlB;AAaD,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,gCAAiB,CAAA;AACnB,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAsDD,MAAM,CAAN,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,0FAAoE,CAAA;IACpE,6DAAuC,CAAA;IACvC,4CAAsB,CAAA;IACtB,gDAA0B,CAAA;IAC1B,4CAAsB,CAAA;AACxB,CAAC,EANW,kBAAkB,KAAlB,kBAAkB,QAM7B","sourcesContent":["import type {\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerGetSelectedMultichainAccountAction,\n} from '@metamask/accounts-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedMessenger,\n} from '@metamask/base-controller';\nimport type {\n  BridgeBackgroundAction,\n  BridgeControllerAction,\n  ChainId,\n  Quote,\n  QuoteMetadata,\n  QuoteResponse,\n  StatusTypes,\n  TxData,\n} from '@metamask/bridge-controller';\nimport type { GetGasFeeState } from '@metamask/gas-fee-controller';\nimport type {\n  NetworkControllerFindNetworkClientIdByChainIdAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n} from '@metamask/network-controller';\nimport type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';\nimport type { HandleSnapRequest } from '@metamask/snaps-controllers';\nimport type {\n  TransactionControllerGetStateAction,\n  TransactionControllerTransactionConfirmedEvent,\n  TransactionControllerTransactionFailedEvent,\n  TransactionMeta,\n} from '@metamask/transaction-controller';\n\nimport type { BridgeStatusController } from './bridge-status-controller';\nimport type { BRIDGE_STATUS_CONTROLLER_NAME } from './constants';\n\n// All fields need to be types not interfaces, same with their children fields\n// o/w you get a type error\n\nexport enum BridgeClientId {\n  EXTENSION = 'extension',\n  MOBILE = 'mobile',\n}\n\nexport type FetchFunction = (\n  input: RequestInfo | URL,\n  init?: RequestInit,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n) => Promise<any>;\n\n/**\n * These fields are specific to Solana transactions and can likely be infered from TransactionMeta\n *\n * @deprecated these should be removed eventually\n */\nexport type SolanaTransactionMeta = {\n  isSolana: boolean;\n  isBridgeTx: boolean;\n};\n\nexport type StatusRequest = {\n  bridgeId: string; // lifi, socket, squid\n  srcTxHash?: string; // lifi, socket, squid, might be undefined for STX\n  bridge: string; // lifi, socket, squid\n  srcChainId: ChainId; // lifi, socket, squid\n  destChainId: ChainId; // lifi, socket, squid\n  quote?: Quote; // squid\n  refuel?: boolean; // lifi\n};\n\nexport type StatusRequestDto = Omit<\n  StatusRequest,\n  'quote' | 'srcChainId' | 'destChainId' | 'refuel'\n> & {\n  srcChainId: string; // lifi, socket, squid\n  destChainId: string; // lifi, socket, squid\n  requestId?: string;\n  refuel?: string; // lifi\n};\n\nexport type StatusRequestWithSrcTxHash = StatusRequest & {\n  srcTxHash: string;\n};\n\nexport type Asset = {\n  chainId: ChainId;\n  address: string;\n  symbol: string;\n  name: string;\n  decimals: number;\n  icon?: string | null;\n};\n\nexport type SrcChainStatus = {\n  chainId: ChainId;\n  /**\n   * The txHash of the transaction on the source chain.\n   * This might be undefined for smart transactions (STX)\n   */\n  txHash?: string;\n  /**\n   * The atomic amount of the token sent minus fees on the source chain\n   */\n  amount?: string;\n  token?: Record<string, never> | Asset;\n};\n\nexport type DestChainStatus = {\n  chainId: ChainId;\n  txHash?: string;\n  /**\n   * The atomic amount of the token received on the destination chain\n   */\n  amount?: string;\n  token?: Record<string, never> | Asset;\n};\n\nexport enum BridgeId {\n  HOP = 'hop',\n  CELER = 'celer',\n  CELERCIRCLE = 'celercircle',\n  CONNEXT = 'connext',\n  POLYGON = 'polygon',\n  AVALANCHE = 'avalanche',\n  MULTICHAIN = 'multichain',\n  AXELAR = 'axelar',\n  ACROSS = 'across',\n  STARGATE = 'stargate',\n  RELAY = 'relay',\n  MAYAN = 'mayan',\n}\n\nexport enum FeeType {\n  METABRIDGE = 'metabridge',\n  REFUEL = 'refuel',\n}\n\nexport type FeeData = {\n  amount: string;\n  asset: Asset;\n};\n\nexport type Protocol = {\n  displayName?: string;\n  icon?: string;\n  name?: string; // for legacy quotes\n};\n\nexport enum ActionTypes {\n  BRIDGE = 'bridge',\n  SWAP = 'swap',\n  REFUEL = 'refuel',\n}\n\nexport type Step = {\n  action: ActionTypes;\n  srcChainId: ChainId;\n  destChainId?: ChainId;\n  srcAsset: Asset;\n  destAsset: Asset;\n  srcAmount: string;\n  destAmount: string;\n  protocol: Protocol;\n};\n\nexport type StatusResponse = {\n  status: StatusTypes;\n  srcChain: SrcChainStatus;\n  destChain?: DestChainStatus;\n  bridge?: BridgeId;\n  isExpectedToken?: boolean;\n  isUnrecognizedRouterAddress?: boolean;\n  refuel?: RefuelStatusResponse;\n};\n\nexport type RefuelStatusResponse = object & StatusResponse;\n\nexport type RefuelData = object & Step;\n\nexport type BridgeHistoryItem = {\n  txMetaId: string; // Need this to handle STX that might not have a txHash immediately\n  quote: Quote;\n  status: StatusResponse;\n  startTime?: number; // timestamp in ms\n  estimatedProcessingTimeInSeconds: number;\n  slippagePercentage: number;\n  completionTime?: number; // timestamp in ms\n  pricingData?: {\n    /**\n     * From QuoteMetadata.sentAmount.amount, the actual amount sent by user in non-atomic decimal form\n     */\n    amountSent: string;\n    amountSentInUsd?: string;\n    quotedGasInUsd?: string; // from QuoteMetadata.gasFee.usd\n    quotedReturnInUsd?: string; // from QuoteMetadata.toTokenAmount.usd\n    quotedRefuelSrcAmountInUsd?: string;\n    quotedRefuelDestAmountInUsd?: string;\n  };\n  initialDestAssetBalance?: string;\n  targetContractAddress?: string;\n  account: string;\n  hasApprovalTx: boolean;\n  approvalTxId?: string;\n  isStxEnabled?: boolean;\n};\n\nexport enum BridgeStatusAction {\n  START_POLLING_FOR_BRIDGE_TX_STATUS = 'startPollingForBridgeTxStatus',\n  WIPE_BRIDGE_STATUS = 'wipeBridgeStatus',\n  GET_STATE = 'getState',\n  RESET_STATE = 'resetState',\n  SUBMIT_TX = 'submitTx',\n}\n\nexport type TokenAmountValuesSerialized = {\n  amount: string;\n  valueInCurrency: string | null;\n  usd: string | null;\n};\n\nexport type QuoteMetadataSerialized = {\n  gasFee: TokenAmountValuesSerialized;\n  /**\n   * The total network fee for the bridge transaction\n   * estimatedGasFees + relayerFees\n   */\n  totalNetworkFee: TokenAmountValuesSerialized;\n  /**\n   * The total max network fee for the bridge transaction\n   * maxGasFees + relayerFees\n   */\n  totalMaxNetworkFee: TokenAmountValuesSerialized;\n  toTokenAmount: TokenAmountValuesSerialized;\n  /**\n   * The adjusted return for the bridge transaction\n   * destTokenAmount - totalNetworkFee\n   */\n  adjustedReturn: Omit<TokenAmountValuesSerialized, 'amount'>;\n  /**\n   * The actual amount sent by user in non-atomic decimal form\n   * srcTokenAmount + metabridgeFee\n   */\n  sentAmount: TokenAmountValuesSerialized;\n  swapRate: string; // destTokenAmount / sentAmount\n  /**\n   * The cost of the bridge transaction\n   * sentAmount - adjustedReturn\n   */\n  cost: Omit<TokenAmountValuesSerialized, 'amount'>;\n};\n\nexport type StartPollingForBridgeTxStatusArgs = {\n  bridgeTxMeta: TransactionMeta;\n  statusRequest: StatusRequest;\n  quoteResponse: QuoteResponse & QuoteMetadata;\n  startTime?: BridgeHistoryItem['startTime'];\n  slippagePercentage: BridgeHistoryItem['slippagePercentage'];\n  initialDestAssetBalance?: BridgeHistoryItem['initialDestAssetBalance'];\n  targetContractAddress?: BridgeHistoryItem['targetContractAddress'];\n  approvalTxId?: BridgeHistoryItem['approvalTxId'];\n  isStxEnabled?: BridgeHistoryItem['isStxEnabled'];\n};\n\n/**\n * Chrome: The BigNumber values are automatically serialized to strings when sent to the background\n * Firefox: The BigNumber values are not serialized to strings when sent to the background,\n * so we force the ui to do it manually, by using StartPollingForBridgeTxStatusArgsSerialized type on the startPollingForBridgeTxStatus action\n */\nexport type StartPollingForBridgeTxStatusArgsSerialized = Omit<\n  StartPollingForBridgeTxStatusArgs,\n  'quoteResponse'\n> & {\n  quoteResponse: QuoteResponse<string | TxData> & QuoteMetadata;\n};\n\nexport type SourceChainTxMetaId = string;\n\nexport type BridgeStatusControllerState = {\n  txHistory: Record<SourceChainTxMetaId, BridgeHistoryItem>;\n};\n\n// Actions\ntype BridgeStatusControllerAction<\n  FunctionName extends keyof BridgeStatusController,\n> = {\n  type: `${typeof BRIDGE_STATUS_CONTROLLER_NAME}:${FunctionName}`;\n  handler: BridgeStatusController[FunctionName];\n};\n\nexport type BridgeStatusControllerGetStateAction = ControllerGetStateAction<\n  typeof BRIDGE_STATUS_CONTROLLER_NAME,\n  BridgeStatusControllerState\n>;\n\n// Maps to BridgeController function names\nexport type BridgeStatusControllerStartPollingForBridgeTxStatusAction =\n  BridgeStatusControllerAction<BridgeStatusAction.START_POLLING_FOR_BRIDGE_TX_STATUS>;\n\nexport type BridgeStatusControllerWipeBridgeStatusAction =\n  BridgeStatusControllerAction<BridgeStatusAction.WIPE_BRIDGE_STATUS>;\n\nexport type BridgeStatusControllerResetStateAction =\n  BridgeStatusControllerAction<BridgeStatusAction.RESET_STATE>;\n\nexport type BridgeStatusControllerSubmitTxAction =\n  BridgeStatusControllerAction<BridgeStatusAction.SUBMIT_TX>;\n\nexport type BridgeStatusControllerActions =\n  | BridgeStatusControllerStartPollingForBridgeTxStatusAction\n  | BridgeStatusControllerWipeBridgeStatusAction\n  | BridgeStatusControllerResetStateAction\n  | BridgeStatusControllerGetStateAction\n  | BridgeStatusControllerSubmitTxAction;\n\n// Events\nexport type BridgeStatusControllerStateChangeEvent = ControllerStateChangeEvent<\n  typeof BRIDGE_STATUS_CONTROLLER_NAME,\n  BridgeStatusControllerState\n>;\n\nexport type BridgeStatusControllerEvents =\n  BridgeStatusControllerStateChangeEvent;\n\n/**\n * The external actions available to the BridgeStatusController.\n */\ntype AllowedActions =\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | AccountsControllerGetSelectedMultichainAccountAction\n  | HandleSnapRequest\n  | TransactionControllerGetStateAction\n  | BridgeControllerAction<BridgeBackgroundAction.GET_BRIDGE_ERC20_ALLOWANCE>\n  | BridgeControllerAction<BridgeBackgroundAction.TRACK_METAMETRICS_EVENT>\n  | BridgeControllerAction<BridgeBackgroundAction.STOP_POLLING_FOR_QUOTES>\n  | GetGasFeeState\n  | AccountsControllerGetAccountByAddressAction\n  | RemoteFeatureFlagControllerGetStateAction;\n\n/**\n * The external events available to the BridgeStatusController.\n */\ntype AllowedEvents =\n  | TransactionControllerTransactionFailedEvent\n  | TransactionControllerTransactionConfirmedEvent;\n\n/**\n * The messenger for the BridgeStatusController.\n */\nexport type BridgeStatusControllerMessenger = RestrictedMessenger<\n  typeof BRIDGE_STATUS_CONTROLLER_NAME,\n  BridgeStatusControllerActions | AllowedActions,\n  BridgeStatusControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n"]}
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAsCA,8EAA8E;AAC9E,2BAA2B;AAE3B,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,yCAAuB,CAAA;IACvB,mCAAiB,CAAA;AACnB,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AA0CD,MAAM,CAAN,IAAY,QAaX;AAbD,WAAY,QAAQ;IAClB,uBAAW,CAAA;IACX,2BAAe,CAAA;IACf,uCAA2B,CAAA;IAC3B,+BAAmB,CAAA;IACnB,+BAAmB,CAAA;IACnB,mCAAuB,CAAA;IACvB,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IACrB,2BAAe,CAAA;IACf,2BAAe,CAAA;AACjB,CAAC,EAbW,QAAQ,KAAR,QAAQ,QAanB;AAkCD,MAAM,CAAN,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,0FAAoE,CAAA;IACpE,6DAAuC,CAAA;IACvC,4CAAsB,CAAA;IACtB,gDAA0B,CAAA;IAC1B,4CAAsB,CAAA;AACxB,CAAC,EANW,kBAAkB,KAAlB,kBAAkB,QAM7B","sourcesContent":["import type {\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerGetSelectedMultichainAccountAction,\n} from '@metamask/accounts-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedMessenger,\n} from '@metamask/base-controller';\nimport type {\n  BridgeBackgroundAction,\n  BridgeControllerAction,\n  ChainId,\n  Quote,\n  QuoteMetadata,\n  QuoteResponse,\n  TxData,\n} from '@metamask/bridge-controller';\nimport type { GetGasFeeState } from '@metamask/gas-fee-controller';\nimport type {\n  NetworkControllerFindNetworkClientIdByChainIdAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n} from '@metamask/network-controller';\nimport type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';\nimport type { HandleSnapRequest } from '@metamask/snaps-controllers';\nimport type { Infer } from '@metamask/superstruct';\nimport type {\n  TransactionControllerGetStateAction,\n  TransactionControllerTransactionConfirmedEvent,\n  TransactionControllerTransactionFailedEvent,\n  TransactionMeta,\n} from '@metamask/transaction-controller';\n\nimport type { BridgeStatusController } from './bridge-status-controller';\nimport type { BRIDGE_STATUS_CONTROLLER_NAME } from './constants';\nimport type { StatusResponseSchema } from './utils/validators';\n\n// All fields need to be types not interfaces, same with their children fields\n// o/w you get a type error\n\nexport enum BridgeClientId {\n  EXTENSION = 'extension',\n  MOBILE = 'mobile',\n}\n\nexport type FetchFunction = (\n  input: RequestInfo | URL,\n  init?: RequestInit,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n) => Promise<any>;\n\n/**\n * These fields are specific to Solana transactions and can likely be infered from TransactionMeta\n *\n * @deprecated these should be removed eventually\n */\nexport type SolanaTransactionMeta = {\n  isSolana: boolean;\n  isBridgeTx: boolean;\n};\n\nexport type StatusRequest = {\n  bridgeId: string; // lifi, socket, squid\n  srcTxHash?: string; // lifi, socket, squid, might be undefined for STX\n  bridge: string; // lifi, socket, squid\n  srcChainId: ChainId; // lifi, socket, squid\n  destChainId: ChainId; // lifi, socket, squid\n  quote?: Quote; // squid\n  refuel?: boolean; // lifi\n};\n\nexport type StatusRequestDto = Omit<\n  StatusRequest,\n  'quote' | 'srcChainId' | 'destChainId' | 'refuel'\n> & {\n  srcChainId: string; // lifi, socket, squid\n  destChainId: string; // lifi, socket, squid\n  requestId?: string;\n  refuel?: string; // lifi\n};\n\nexport type StatusRequestWithSrcTxHash = StatusRequest & {\n  srcTxHash: string;\n};\n\nexport enum BridgeId {\n  HOP = 'hop',\n  CELER = 'celer',\n  CELERCIRCLE = 'celercircle',\n  CONNEXT = 'connext',\n  POLYGON = 'polygon',\n  AVALANCHE = 'avalanche',\n  MULTICHAIN = 'multichain',\n  AXELAR = 'axelar',\n  ACROSS = 'across',\n  STARGATE = 'stargate',\n  RELAY = 'relay',\n  MAYAN = 'mayan',\n}\n\nexport type StatusResponse = Infer<typeof StatusResponseSchema>;\n\nexport type RefuelStatusResponse = object & StatusResponse;\n\nexport type BridgeHistoryItem = {\n  txMetaId: string; // Need this to handle STX that might not have a txHash immediately\n  batchId?: string;\n  quote: Quote;\n  status: StatusResponse;\n  startTime?: number; // timestamp in ms\n  estimatedProcessingTimeInSeconds: number;\n  slippagePercentage: number;\n  completionTime?: number; // timestamp in ms\n  pricingData?: {\n    /**\n     * The actual amount sent by user in non-atomic decimal form\n     */\n    amountSent: QuoteMetadata['sentAmount']['amount'];\n    amountSentInUsd?: QuoteMetadata['sentAmount']['usd'];\n    quotedGasInUsd?: QuoteMetadata['gasFee']['usd'];\n    quotedReturnInUsd?: QuoteMetadata['toTokenAmount']['usd'];\n    quotedRefuelSrcAmountInUsd?: string;\n    quotedRefuelDestAmountInUsd?: string;\n  };\n  initialDestAssetBalance?: string;\n  targetContractAddress?: string;\n  account: string;\n  hasApprovalTx: boolean;\n  approvalTxId?: string;\n  isStxEnabled?: boolean;\n};\n\nexport enum BridgeStatusAction {\n  START_POLLING_FOR_BRIDGE_TX_STATUS = 'startPollingForBridgeTxStatus',\n  WIPE_BRIDGE_STATUS = 'wipeBridgeStatus',\n  GET_STATE = 'getState',\n  RESET_STATE = 'resetState',\n  SUBMIT_TX = 'submitTx',\n}\n\nexport type TokenAmountValuesSerialized = {\n  amount: string;\n  valueInCurrency: string | null;\n  usd: string | null;\n};\n\nexport type QuoteMetadataSerialized = {\n  gasFee: TokenAmountValuesSerialized;\n  /**\n   * The total network fee for the bridge transaction\n   * estimatedGasFees + relayerFees\n   */\n  totalNetworkFee: TokenAmountValuesSerialized;\n  /**\n   * The total max network fee for the bridge transaction\n   * maxGasFees + relayerFees\n   */\n  totalMaxNetworkFee: TokenAmountValuesSerialized;\n  toTokenAmount: TokenAmountValuesSerialized;\n  /**\n   * The adjusted return for the bridge transaction\n   * destTokenAmount - totalNetworkFee\n   */\n  adjustedReturn: Omit<TokenAmountValuesSerialized, 'amount'>;\n  /**\n   * The actual amount sent by user in non-atomic decimal form\n   * srcTokenAmount + metabridgeFee\n   */\n  sentAmount: TokenAmountValuesSerialized;\n  swapRate: string; // destTokenAmount / sentAmount\n  /**\n   * The cost of the bridge transaction\n   * sentAmount - adjustedReturn\n   */\n  cost: Omit<TokenAmountValuesSerialized, 'amount'>;\n};\n\nexport type StartPollingForBridgeTxStatusArgs = {\n  bridgeTxMeta: TransactionMeta;\n  statusRequest: StatusRequest;\n  quoteResponse: QuoteResponse & QuoteMetadata;\n  startTime?: BridgeHistoryItem['startTime'];\n  slippagePercentage: BridgeHistoryItem['slippagePercentage'];\n  initialDestAssetBalance?: BridgeHistoryItem['initialDestAssetBalance'];\n  targetContractAddress?: BridgeHistoryItem['targetContractAddress'];\n  approvalTxId?: BridgeHistoryItem['approvalTxId'];\n  isStxEnabled?: BridgeHistoryItem['isStxEnabled'];\n};\n\n/**\n * Chrome: The BigNumber values are automatically serialized to strings when sent to the background\n * Firefox: The BigNumber values are not serialized to strings when sent to the background,\n * so we force the ui to do it manually, by using StartPollingForBridgeTxStatusArgsSerialized type on the startPollingForBridgeTxStatus action\n */\nexport type StartPollingForBridgeTxStatusArgsSerialized = Omit<\n  StartPollingForBridgeTxStatusArgs,\n  'quoteResponse'\n> & {\n  quoteResponse: QuoteResponse<string | TxData> & QuoteMetadata;\n};\n\nexport type SourceChainTxMetaId = string;\n\nexport type BridgeStatusControllerState = {\n  txHistory: Record<SourceChainTxMetaId, BridgeHistoryItem>;\n};\n\n// Actions\ntype BridgeStatusControllerAction<\n  FunctionName extends keyof BridgeStatusController,\n> = {\n  type: `${typeof BRIDGE_STATUS_CONTROLLER_NAME}:${FunctionName}`;\n  handler: BridgeStatusController[FunctionName];\n};\n\nexport type BridgeStatusControllerGetStateAction = ControllerGetStateAction<\n  typeof BRIDGE_STATUS_CONTROLLER_NAME,\n  BridgeStatusControllerState\n>;\n\n// Maps to BridgeController function names\nexport type BridgeStatusControllerStartPollingForBridgeTxStatusAction =\n  BridgeStatusControllerAction<BridgeStatusAction.START_POLLING_FOR_BRIDGE_TX_STATUS>;\n\nexport type BridgeStatusControllerWipeBridgeStatusAction =\n  BridgeStatusControllerAction<BridgeStatusAction.WIPE_BRIDGE_STATUS>;\n\nexport type BridgeStatusControllerResetStateAction =\n  BridgeStatusControllerAction<BridgeStatusAction.RESET_STATE>;\n\nexport type BridgeStatusControllerSubmitTxAction =\n  BridgeStatusControllerAction<BridgeStatusAction.SUBMIT_TX>;\n\nexport type BridgeStatusControllerActions =\n  | BridgeStatusControllerStartPollingForBridgeTxStatusAction\n  | BridgeStatusControllerWipeBridgeStatusAction\n  | BridgeStatusControllerResetStateAction\n  | BridgeStatusControllerGetStateAction\n  | BridgeStatusControllerSubmitTxAction;\n\n// Events\nexport type BridgeStatusControllerStateChangeEvent = ControllerStateChangeEvent<\n  typeof BRIDGE_STATUS_CONTROLLER_NAME,\n  BridgeStatusControllerState\n>;\n\nexport type BridgeStatusControllerEvents =\n  BridgeStatusControllerStateChangeEvent;\n\n/**\n * The external actions available to the BridgeStatusController.\n */\ntype AllowedActions =\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | AccountsControllerGetSelectedMultichainAccountAction\n  | HandleSnapRequest\n  | TransactionControllerGetStateAction\n  | BridgeControllerAction<BridgeBackgroundAction.GET_BRIDGE_ERC20_ALLOWANCE>\n  | BridgeControllerAction<BridgeBackgroundAction.TRACK_METAMETRICS_EVENT>\n  | BridgeControllerAction<BridgeBackgroundAction.STOP_POLLING_FOR_QUOTES>\n  | GetGasFeeState\n  | AccountsControllerGetAccountByAddressAction\n  | RemoteFeatureFlagControllerGetStateAction;\n\n/**\n * The external events available to the BridgeStatusController.\n */\ntype AllowedEvents =\n  | TransactionControllerTransactionFailedEvent\n  | TransactionControllerTransactionConfirmedEvent;\n\n/**\n * The messenger for the BridgeStatusController.\n */\nexport type BridgeStatusControllerMessenger = RestrictedMessenger<\n  typeof BRIDGE_STATUS_CONTROLLER_NAME,\n  BridgeStatusControllerActions | AllowedActions,\n  BridgeStatusControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n"]}

package/dist/utils/gas.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTxGasEstimates = void 0;
+exports.calculateGasFees = exports.getTxGasEstimates = void 0;
+const controller_utils_1 = require("@metamask/controller-utils");
 const bignumber_js_1 = require("bignumber.js");
 const getTransaction1559GasFeeEstimates = (txGasFeeEstimates, estimatedBaseFee) => {
     const { maxFeePerGas, maxPriorityFeePerGas } = txGasFeeEstimates?.high ?? {};
@@ -28,4 +29,36 @@ const getTxGasEstimates = ({ txGasFeeEstimates, networkGasFeeEstimates, }) => {
     return getTransaction1559GasFeeEstimates(txGasFeeEstimates, estimatedBaseFee);
 };
 exports.getTxGasEstimates = getTxGasEstimates;
+const calculateGasFees = async (disable7702, messagingSystem, estimateGasFeeFn, { chainId: _, gasLimit, ...trade }, networkClientId, chainId, txFee) => {
+    if (!disable7702) {
+        return {};
+    }
+    if (txFee) {
+        return { ...txFee, gas: gasLimit?.toString() };
+    }
+    const transactionParams = {
+        ...trade,
+        gas: gasLimit?.toString(),
+        data: trade.data,
+        to: trade.to,
+        value: trade.value,
+    };
+    const { gasFeeEstimates } = messagingSystem.call('GasFeeController:getState');
+    const { estimates: txGasFeeEstimates } = await estimateGasFeeFn({
+        transactionParams,
+        chainId,
+        networkClientId,
+    });
+    const { maxFeePerGas, maxPriorityFeePerGas } = (0, exports.getTxGasEstimates)({
+        networkGasFeeEstimates: gasFeeEstimates,
+        txGasFeeEstimates,
+    });
+    const maxGasLimit = (0, controller_utils_1.toHex)(transactionParams.gas ?? 0);
+    return {
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        gas: maxGasLimit,
+    };
+};
+exports.calculateGasFees = calculateGasFees;
 //# sourceMappingURL=gas.cjs.map

package/dist/utils/gas.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"gas.cjs","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":";;;AAQA,+CAAyC;AAEzC,MAAM,iCAAiC,GAAG,CACxC,iBAA2C,EAC3C,gBAAwB,EACxB,EAAE;IACF,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC;IAE7E,MAAM,wBAAwB,GAAG,oBAAoB;QACnD,CAAC,CAAC,IAAI,wBAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC;aAChC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;aACd,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;QACnC,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,wBAAwB;QACxB,YAAY;QACZ,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;GAOG;AACI,MAAM,iBAAiB,GAAG,CAAC,EAChC,iBAAiB,EACjB,sBAAsB,GAMvB,EAAE,EAAE;IACH,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAAE,GAAG,sBAAyC,CAAC;IAC7E,OAAO,iCAAiC,CACtC,iBAAwD,EACxD,gBAAgB,CACjB,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,iBAAiB,qBAc5B","sourcesContent":["import type {\n  GasFeeEstimates,\n  GasFeeState,\n} from '@metamask/gas-fee-controller';\nimport type {\n  FeeMarketGasFeeEstimates,\n  TransactionController,\n} from '@metamask/transaction-controller';\nimport { BigNumber } from 'bignumber.js';\n\nconst getTransaction1559GasFeeEstimates = (\n  txGasFeeEstimates: FeeMarketGasFeeEstimates,\n  estimatedBaseFee: string,\n) => {\n  const { maxFeePerGas, maxPriorityFeePerGas } = txGasFeeEstimates?.high ?? {};\n\n  const baseAndPriorityFeePerGas = maxPriorityFeePerGas\n    ? new BigNumber(estimatedBaseFee, 10)\n        .times(10 ** 9)\n        .plus(maxPriorityFeePerGas, 16)\n    : undefined;\n\n  return {\n    baseAndPriorityFeePerGas,\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n  };\n};\n\n/**\n * Get the gas fee estimates for a transaction\n *\n * @param params - The parameters for the gas fee estimates\n * @param params.txGasFeeEstimates - The gas fee estimates for the transaction (TransactionController)\n * @param params.networkGasFeeEstimates - The gas fee estimates for the network (GasFeeController)\n * @returns The gas fee estimates for the transaction\n */\nexport const getTxGasEstimates = ({\n  txGasFeeEstimates,\n  networkGasFeeEstimates,\n}: {\n  txGasFeeEstimates: Awaited<\n    ReturnType<TransactionController['estimateGasFee']>\n  >['estimates'];\n  networkGasFeeEstimates: GasFeeState['gasFeeEstimates'];\n}) => {\n  const { estimatedBaseFee = '0' } = networkGasFeeEstimates as GasFeeEstimates;\n  return getTransaction1559GasFeeEstimates(\n    txGasFeeEstimates as unknown as FeeMarketGasFeeEstimates,\n    estimatedBaseFee,\n  );\n};\n"]}
+{"version":3,"file":"gas.cjs","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":";;;AACA,iEAAmD;AAUnD,+CAAyC;AAIzC,MAAM,iCAAiC,GAAG,CACxC,iBAA2C,EAC3C,gBAAwB,EACxB,EAAE;IACF,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC;IAE7E,MAAM,wBAAwB,GAAG,oBAAoB;QACnD,CAAC,CAAC,IAAI,wBAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC;aAChC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;aACd,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;QACnC,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,wBAAwB;QACxB,YAAY;QACZ,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;GAOG;AACI,MAAM,iBAAiB,GAAG,CAAC,EAChC,iBAAiB,EACjB,sBAAsB,GAMvB,EAAE,EAAE;IACH,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAAE,GAAG,sBAAyC,CAAC;IAC7E,OAAO,iCAAiC,CACtC,iBAAwD,EACxD,gBAAgB,CACjB,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,iBAAiB,qBAc5B;AAEK,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAoB,EACpB,eAAgD,EAChD,gBAAuE,EACvE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAU,EAC1C,eAAuB,EACvB,OAAY,EACZ,KAA8D,EAC9D,EAAE;IACF,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IACD,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC;KAChD;IACD,MAAM,iBAAiB,GAAG;QACxB,GAAG,KAAK;QACR,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE;QACzB,IAAI,EAAE,KAAK,CAAC,IAAqB;QACjC,EAAE,EAAE,KAAK,CAAC,EAAmB;QAC7B,KAAK,EAAE,KAAK,CAAC,KAAsB;KACpC,CAAC;IACF,MAAM,EAAE,eAAe,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC9E,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,MAAM,gBAAgB,CAAC;QAC9D,iBAAiB;QACjB,OAAO;QACP,eAAe;KAChB,CAAC,CAAC;IACH,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,IAAA,yBAAiB,EAAC;QAC/D,sBAAsB,EAAE,eAAe;QACvC,iBAAiB;KAClB,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,IAAA,wBAAK,EAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAEtD,OAAO;QACL,YAAY;QACZ,oBAAoB;QACpB,GAAG,EAAE,WAAW;KACjB,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,gBAAgB,oBAuC3B","sourcesContent":["import type { TxData } from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport type {\n  GasFeeEstimates,\n  GasFeeState,\n} from '@metamask/gas-fee-controller';\nimport type {\n  FeeMarketGasFeeEstimates,\n  TransactionController,\n} from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\n\nimport type { BridgeStatusControllerMessenger } from '../types';\n\nconst getTransaction1559GasFeeEstimates = (\n  txGasFeeEstimates: FeeMarketGasFeeEstimates,\n  estimatedBaseFee: string,\n) => {\n  const { maxFeePerGas, maxPriorityFeePerGas } = txGasFeeEstimates?.high ?? {};\n\n  const baseAndPriorityFeePerGas = maxPriorityFeePerGas\n    ? new BigNumber(estimatedBaseFee, 10)\n        .times(10 ** 9)\n        .plus(maxPriorityFeePerGas, 16)\n    : undefined;\n\n  return {\n    baseAndPriorityFeePerGas,\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n  };\n};\n\n/**\n * Get the gas fee estimates for a transaction\n *\n * @param params - The parameters for the gas fee estimates\n * @param params.txGasFeeEstimates - The gas fee estimates for the transaction (TransactionController)\n * @param params.networkGasFeeEstimates - The gas fee estimates for the network (GasFeeController)\n * @returns The gas fee estimates for the transaction\n */\nexport const getTxGasEstimates = ({\n  txGasFeeEstimates,\n  networkGasFeeEstimates,\n}: {\n  txGasFeeEstimates: Awaited<\n    ReturnType<TransactionController['estimateGasFee']>\n  >['estimates'];\n  networkGasFeeEstimates: GasFeeState['gasFeeEstimates'];\n}) => {\n  const { estimatedBaseFee = '0' } = networkGasFeeEstimates as GasFeeEstimates;\n  return getTransaction1559GasFeeEstimates(\n    txGasFeeEstimates as unknown as FeeMarketGasFeeEstimates,\n    estimatedBaseFee,\n  );\n};\n\nexport const calculateGasFees = async (\n  disable7702: boolean,\n  messagingSystem: BridgeStatusControllerMessenger,\n  estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee,\n  { chainId: _, gasLimit, ...trade }: TxData,\n  networkClientId: string,\n  chainId: Hex,\n  txFee?: { maxFeePerGas: string; maxPriorityFeePerGas: string },\n) => {\n  if (!disable7702) {\n    return {};\n  }\n  if (txFee) {\n    return { ...txFee, gas: gasLimit?.toString() };\n  }\n  const transactionParams = {\n    ...trade,\n    gas: gasLimit?.toString(),\n    data: trade.data as `0x${string}`,\n    to: trade.to as `0x${string}`,\n    value: trade.value as `0x${string}`,\n  };\n  const { gasFeeEstimates } = messagingSystem.call('GasFeeController:getState');\n  const { estimates: txGasFeeEstimates } = await estimateGasFeeFn({\n    transactionParams,\n    chainId,\n    networkClientId,\n  });\n  const { maxFeePerGas, maxPriorityFeePerGas } = getTxGasEstimates({\n    networkGasFeeEstimates: gasFeeEstimates,\n    txGasFeeEstimates,\n  });\n  const maxGasLimit = toHex(transactionParams.gas ?? 0);\n\n  return {\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    gas: maxGasLimit,\n  };\n};\n"]}

package/dist/utils/gas.d.cts

@@ -1,6 +1,9 @@
+import type { TxData } from "@metamask/bridge-controller";
 import type { GasFeeState } from "@metamask/gas-fee-controller";
 import type { TransactionController } from "@metamask/transaction-controller";
+import type { Hex } from "@metamask/utils";
 import { BigNumber } from "bignumber.js";
+import type { BridgeStatusControllerMessenger } from "../types.cjs";
 /**
  * Get the gas fee estimates for a transaction
  *
@@ -17,4 +20,8 @@ export declare const getTxGasEstimates: ({ txGasFeeEstimates, networkGasFeeEstim
     maxFeePerGas: `0x${string}`;
     maxPriorityFeePerGas: `0x${string}`;
 };
+export declare const calculateGasFees: (disable7702: boolean, messagingSystem: BridgeStatusControllerMessenger, estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee, { chainId: _, gasLimit, ...trade }: TxData, networkClientId: string, chainId: Hex, txFee?: {
+    maxFeePerGas: string;
+    maxPriorityFeePerGas: string;
+}) => Promise<{}>;
 //# sourceMappingURL=gas.d.cts.map

package/dist/utils/gas.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"gas.d.cts","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,WAAW,EACZ,qCAAqC;AACtC,OAAO,KAAK,EAEV,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,EAAE,SAAS,EAAE,qBAAqB;AAqBzC;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB;uBAIT,QACjB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CACpD,CAAC,WAAW,CAAC;4BACU,WAAW,CAAC,iBAAiB,CAAC;;;;;CAOvD,CAAC"}
+{"version":3,"file":"gas.d.cts","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAE1D,OAAO,KAAK,EAEV,WAAW,EACZ,qCAAqC;AACtC,OAAO,KAAK,EAEV,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAC3C,OAAO,EAAE,SAAS,EAAE,qBAAqB;AAEzC,OAAO,KAAK,EAAE,+BAA+B,EAAE,qBAAiB;AAqBhE;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB;uBAIT,QACjB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CACpD,CAAC,WAAW,CAAC;4BACU,WAAW,CAAC,iBAAiB,CAAC;;;;;CAOvD,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBACd,OAAO,sEAEF,OAAO,sBAAsB,SAAS,CAAC,cAAc,sCACnC,MAAM,mBACzB,MAAM,WACd,GAAG,UACJ;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,oBAAoB,EAAE,MAAM,CAAA;CAAE,gBAgC/D,CAAC"}

package/dist/utils/gas.d.mts

@@ -1,6 +1,9 @@
+import type { TxData } from "@metamask/bridge-controller";
 import type { GasFeeState } from "@metamask/gas-fee-controller";
 import type { TransactionController } from "@metamask/transaction-controller";
+import type { Hex } from "@metamask/utils";
 import { BigNumber } from "bignumber.js";
+import type { BridgeStatusControllerMessenger } from "../types.mjs";
 /**
  * Get the gas fee estimates for a transaction
  *
@@ -17,4 +20,8 @@ export declare const getTxGasEstimates: ({ txGasFeeEstimates, networkGasFeeEstim
     maxFeePerGas: `0x${string}`;
     maxPriorityFeePerGas: `0x${string}`;
 };
+export declare const calculateGasFees: (disable7702: boolean, messagingSystem: BridgeStatusControllerMessenger, estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee, { chainId: _, gasLimit, ...trade }: TxData, networkClientId: string, chainId: Hex, txFee?: {
+    maxFeePerGas: string;
+    maxPriorityFeePerGas: string;
+}) => Promise<{}>;
 //# sourceMappingURL=gas.d.mts.map

package/dist/utils/gas.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"gas.d.mts","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,WAAW,EACZ,qCAAqC;AACtC,OAAO,KAAK,EAEV,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,EAAE,SAAS,EAAE,qBAAqB;AAqBzC;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB;uBAIT,QACjB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CACpD,CAAC,WAAW,CAAC;4BACU,WAAW,CAAC,iBAAiB,CAAC;;;;;CAOvD,CAAC"}
+{"version":3,"file":"gas.d.mts","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAE1D,OAAO,KAAK,EAEV,WAAW,EACZ,qCAAqC;AACtC,OAAO,KAAK,EAEV,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAC3C,OAAO,EAAE,SAAS,EAAE,qBAAqB;AAEzC,OAAO,KAAK,EAAE,+BAA+B,EAAE,qBAAiB;AAqBhE;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB;uBAIT,QACjB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CACpD,CAAC,WAAW,CAAC;4BACU,WAAW,CAAC,iBAAiB,CAAC;;;;;CAOvD,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBACd,OAAO,sEAEF,OAAO,sBAAsB,SAAS,CAAC,cAAc,sCACnC,MAAM,mBACzB,MAAM,WACd,GAAG,UACJ;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,oBAAoB,EAAE,MAAM,CAAA;CAAE,gBAgC/D,CAAC"}

package/dist/utils/gas.mjs

@@ -1,3 +1,4 @@
+import { toHex } from "@metamask/controller-utils";
 import { BigNumber } from "bignumber.js";
 const getTransaction1559GasFeeEstimates = (txGasFeeEstimates, estimatedBaseFee) => {
     const { maxFeePerGas, maxPriorityFeePerGas } = txGasFeeEstimates?.high ?? {};
@@ -24,4 +25,35 @@ export const getTxGasEstimates = ({ txGasFeeEstimates, networkGasFeeEstimates, }
     const { estimatedBaseFee = '0' } = networkGasFeeEstimates;
     return getTransaction1559GasFeeEstimates(txGasFeeEstimates, estimatedBaseFee);
 };
+export const calculateGasFees = async (disable7702, messagingSystem, estimateGasFeeFn, { chainId: _, gasLimit, ...trade }, networkClientId, chainId, txFee) => {
+    if (!disable7702) {
+        return {};
+    }
+    if (txFee) {
+        return { ...txFee, gas: gasLimit?.toString() };
+    }
+    const transactionParams = {
+        ...trade,
+        gas: gasLimit?.toString(),
+        data: trade.data,
+        to: trade.to,
+        value: trade.value,
+    };
+    const { gasFeeEstimates } = messagingSystem.call('GasFeeController:getState');
+    const { estimates: txGasFeeEstimates } = await estimateGasFeeFn({
+        transactionParams,
+        chainId,
+        networkClientId,
+    });
+    const { maxFeePerGas, maxPriorityFeePerGas } = getTxGasEstimates({
+        networkGasFeeEstimates: gasFeeEstimates,
+        txGasFeeEstimates,
+    });
+    const maxGasLimit = toHex(transactionParams.gas ?? 0);
+    return {
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        gas: maxGasLimit,
+    };
+};
 //# sourceMappingURL=gas.mjs.map

package/dist/utils/gas.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"gas.mjs","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,qBAAqB;AAEzC,MAAM,iCAAiC,GAAG,CACxC,iBAA2C,EAC3C,gBAAwB,EACxB,EAAE;IACF,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC;IAE7E,MAAM,wBAAwB,GAAG,oBAAoB;QACnD,CAAC,CAAC,IAAI,SAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC;aAChC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;aACd,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;QACnC,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,wBAAwB;QACxB,YAAY;QACZ,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,iBAAiB,EACjB,sBAAsB,GAMvB,EAAE,EAAE;IACH,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAAE,GAAG,sBAAyC,CAAC;IAC7E,OAAO,iCAAiC,CACtC,iBAAwD,EACxD,gBAAgB,CACjB,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type {\n  GasFeeEstimates,\n  GasFeeState,\n} from '@metamask/gas-fee-controller';\nimport type {\n  FeeMarketGasFeeEstimates,\n  TransactionController,\n} from '@metamask/transaction-controller';\nimport { BigNumber } from 'bignumber.js';\n\nconst getTransaction1559GasFeeEstimates = (\n  txGasFeeEstimates: FeeMarketGasFeeEstimates,\n  estimatedBaseFee: string,\n) => {\n  const { maxFeePerGas, maxPriorityFeePerGas } = txGasFeeEstimates?.high ?? {};\n\n  const baseAndPriorityFeePerGas = maxPriorityFeePerGas\n    ? new BigNumber(estimatedBaseFee, 10)\n        .times(10 ** 9)\n        .plus(maxPriorityFeePerGas, 16)\n    : undefined;\n\n  return {\n    baseAndPriorityFeePerGas,\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n  };\n};\n\n/**\n * Get the gas fee estimates for a transaction\n *\n * @param params - The parameters for the gas fee estimates\n * @param params.txGasFeeEstimates - The gas fee estimates for the transaction (TransactionController)\n * @param params.networkGasFeeEstimates - The gas fee estimates for the network (GasFeeController)\n * @returns The gas fee estimates for the transaction\n */\nexport const getTxGasEstimates = ({\n  txGasFeeEstimates,\n  networkGasFeeEstimates,\n}: {\n  txGasFeeEstimates: Awaited<\n    ReturnType<TransactionController['estimateGasFee']>\n  >['estimates'];\n  networkGasFeeEstimates: GasFeeState['gasFeeEstimates'];\n}) => {\n  const { estimatedBaseFee = '0' } = networkGasFeeEstimates as GasFeeEstimates;\n  return getTransaction1559GasFeeEstimates(\n    txGasFeeEstimates as unknown as FeeMarketGasFeeEstimates,\n    estimatedBaseFee,\n  );\n};\n"]}
+{"version":3,"file":"gas.mjs","sourceRoot":"","sources":["../../src/utils/gas.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,mCAAmC;AAUnD,OAAO,EAAE,SAAS,EAAE,qBAAqB;AAIzC,MAAM,iCAAiC,GAAG,CACxC,iBAA2C,EAC3C,gBAAwB,EACxB,EAAE;IACF,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC;IAE7E,MAAM,wBAAwB,GAAG,oBAAoB;QACnD,CAAC,CAAC,IAAI,SAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC;aAChC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;aACd,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;QACnC,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,wBAAwB;QACxB,YAAY;QACZ,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,iBAAiB,EACjB,sBAAsB,GAMvB,EAAE,EAAE;IACH,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAAE,GAAG,sBAAyC,CAAC;IAC7E,OAAO,iCAAiC,CACtC,iBAAwD,EACxD,gBAAgB,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAoB,EACpB,eAAgD,EAChD,gBAAuE,EACvE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAU,EAC1C,eAAuB,EACvB,OAAY,EACZ,KAA8D,EAC9D,EAAE;IACF,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IACD,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC;KAChD;IACD,MAAM,iBAAiB,GAAG;QACxB,GAAG,KAAK;QACR,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE;QACzB,IAAI,EAAE,KAAK,CAAC,IAAqB;QACjC,EAAE,EAAE,KAAK,CAAC,EAAmB;QAC7B,KAAK,EAAE,KAAK,CAAC,KAAsB;KACpC,CAAC;IACF,MAAM,EAAE,eAAe,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC9E,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,MAAM,gBAAgB,CAAC;QAC9D,iBAAiB;QACjB,OAAO;QACP,eAAe;KAChB,CAAC,CAAC;IACH,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,iBAAiB,CAAC;QAC/D,sBAAsB,EAAE,eAAe;QACvC,iBAAiB;KAClB,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAEtD,OAAO;QACL,YAAY;QACZ,oBAAoB;QACpB,GAAG,EAAE,WAAW;KACjB,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { TxData } from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport type {\n  GasFeeEstimates,\n  GasFeeState,\n} from '@metamask/gas-fee-controller';\nimport type {\n  FeeMarketGasFeeEstimates,\n  TransactionController,\n} from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\n\nimport type { BridgeStatusControllerMessenger } from '../types';\n\nconst getTransaction1559GasFeeEstimates = (\n  txGasFeeEstimates: FeeMarketGasFeeEstimates,\n  estimatedBaseFee: string,\n) => {\n  const { maxFeePerGas, maxPriorityFeePerGas } = txGasFeeEstimates?.high ?? {};\n\n  const baseAndPriorityFeePerGas = maxPriorityFeePerGas\n    ? new BigNumber(estimatedBaseFee, 10)\n        .times(10 ** 9)\n        .plus(maxPriorityFeePerGas, 16)\n    : undefined;\n\n  return {\n    baseAndPriorityFeePerGas,\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n  };\n};\n\n/**\n * Get the gas fee estimates for a transaction\n *\n * @param params - The parameters for the gas fee estimates\n * @param params.txGasFeeEstimates - The gas fee estimates for the transaction (TransactionController)\n * @param params.networkGasFeeEstimates - The gas fee estimates for the network (GasFeeController)\n * @returns The gas fee estimates for the transaction\n */\nexport const getTxGasEstimates = ({\n  txGasFeeEstimates,\n  networkGasFeeEstimates,\n}: {\n  txGasFeeEstimates: Awaited<\n    ReturnType<TransactionController['estimateGasFee']>\n  >['estimates'];\n  networkGasFeeEstimates: GasFeeState['gasFeeEstimates'];\n}) => {\n  const { estimatedBaseFee = '0' } = networkGasFeeEstimates as GasFeeEstimates;\n  return getTransaction1559GasFeeEstimates(\n    txGasFeeEstimates as unknown as FeeMarketGasFeeEstimates,\n    estimatedBaseFee,\n  );\n};\n\nexport const calculateGasFees = async (\n  disable7702: boolean,\n  messagingSystem: BridgeStatusControllerMessenger,\n  estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee,\n  { chainId: _, gasLimit, ...trade }: TxData,\n  networkClientId: string,\n  chainId: Hex,\n  txFee?: { maxFeePerGas: string; maxPriorityFeePerGas: string },\n) => {\n  if (!disable7702) {\n    return {};\n  }\n  if (txFee) {\n    return { ...txFee, gas: gasLimit?.toString() };\n  }\n  const transactionParams = {\n    ...trade,\n    gas: gasLimit?.toString(),\n    data: trade.data as `0x${string}`,\n    to: trade.to as `0x${string}`,\n    value: trade.value as `0x${string}`,\n  };\n  const { gasFeeEstimates } = messagingSystem.call('GasFeeController:getState');\n  const { estimates: txGasFeeEstimates } = await estimateGasFeeFn({\n    transactionParams,\n    chainId,\n    networkClientId,\n  });\n  const { maxFeePerGas, maxPriorityFeePerGas } = getTxGasEstimates({\n    networkGasFeeEstimates: gasFeeEstimates,\n    txGasFeeEstimates,\n  });\n  const maxGasLimit = toHex(transactionParams.gas ?? 0);\n\n  return {\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    gas: maxGasLimit,\n  };\n};\n"]}

package/dist/utils/metrics.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEVMTxPropertiesFromTransactionMeta = exports.getRequestMetadataFromHistory = exports.getTradeDataFromHistory = exports.getPriceImpactFromQuote = exports.getTradeDataFromQuote = exports.getRequestParamFromHistory = exports.getFinalizedTxProperties = exports.getTxStatusesFromHistory = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
 const transaction_controller_1 = require("@metamask/transaction-controller");
-const getTxStatusesFromHistory = ({ status, hasApprovalTx, quote, }) => {
+const getTxStatusesFromHistory = ({ status, hasApprovalTx, approvalTxId, quote, }) => {
     const source_transaction = status.srcChain.txHash
         ? bridge_controller_1.StatusTypes.COMPLETE
         : bridge_controller_1.StatusTypes.PENDING;
@@ -22,7 +22,7 @@ const getTxStatusesFromHistory = ({ status, hasApprovalTx, quote, }) => {
         allowance_reset_transaction: isEthUsdtTx
             ? allowance_reset_transaction
             : undefined,
-        approval_transaction: hasApprovalTx ? approval_transaction : undefined,
+        approval_transaction: hasApprovalTx || approvalTxId ? approval_transaction : undefined,
         source_transaction,
         destination_transaction: status.status === bridge_controller_1.StatusTypes.FAILED
             ? bridge_controller_1.StatusTypes.FAILED
@@ -56,7 +56,7 @@ exports.getRequestParamFromHistory = getRequestParamFromHistory;
 const getTradeDataFromQuote = (quoteResponse) => {
     return {
         usd_quoted_gas: Number(quoteResponse.gasFee?.usd ?? 0),
-        gas_included: false,
+        gas_included: quoteResponse.quote.gasIncluded ?? false,
         provider: (0, bridge_controller_1.formatProviderLabel)(quoteResponse.quote),
         quoted_time_minutes: Number(quoteResponse.estimatedProcessingTimeInSeconds / 60),
         usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),
@@ -70,7 +70,7 @@ exports.getPriceImpactFromQuote = getPriceImpactFromQuote;
 const getTradeDataFromHistory = (historyItem) => {
     return {
         usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),
-        gas_included: false,
+        gas_included: historyItem.quote.gasIncluded ?? false,
         provider: (0, bridge_controller_1.formatProviderLabel)(historyItem.quote),
         quoted_time_minutes: Number(historyItem.estimatedProcessingTimeInSeconds / 60),
         usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),
@@ -98,7 +98,11 @@ exports.getRequestMetadataFromHistory = getRequestMetadataFromHistory;
  */
 const getEVMTxPropertiesFromTransactionMeta = (transactionMeta) => {
     return {
-        source_transaction: transactionMeta.status === transaction_controller_1.TransactionStatus.failed
+        source_transaction: [
+            transaction_controller_1.TransactionStatus.failed,
+            transaction_controller_1.TransactionStatus.dropped,
+            transaction_controller_1.TransactionStatus.rejected,
+        ].includes(transactionMeta.status)
             ? bridge_controller_1.StatusTypes.FAILED
             : bridge_controller_1.StatusTypes.COMPLETE,
         error_message: transactionMeta.error?.message
@@ -114,7 +118,8 @@ const getEVMTxPropertiesFromTransactionMeta = (transactionMeta) => {
         token_address_destination: (0, bridge_controller_1.formatAddressToAssetId)(transactionMeta.destinationTokenAddress ?? '', transactionMeta.chainId) ?? '',
         custom_slippage: false,
         is_hardware_wallet: false,
-        swap_type: transactionMeta.type === transaction_controller_1.TransactionType.swap
+        swap_type: transactionMeta.type &&
+            [transaction_controller_1.TransactionType.swap, transaction_controller_1.TransactionType.swapApproval].includes(transactionMeta.type)
             ? bridge_controller_1.MetricsSwapType.SINGLE
             : bridge_controller_1.MetricsSwapType.CROSSCHAIN,
         security_warnings: [],

package/dist/utils/metrics.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.cjs","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountsControllerState } from '@metamask/accounts-controller';\nimport type {\n  QuoteResponse,\n  TxData,\n  QuoteMetadata,\n} from '@metamask/bridge-controller';\nimport {\n  type TxStatusData,\n  StatusTypes,\n  formatChainIdToHex,\n  isEthUsdt,\n  type RequestParams,\n  formatChainIdToCaip,\n  type TradeData,\n  formatProviderLabel,\n  type RequestMetadata,\n  isCustomSlippage,\n  getSwapType,\n  isHardwareWallet,\n  formatAddressToAssetId,\n  MetricsActionType,\n  MetricsSwapType,\n} from '@metamask/bridge-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n  type TransactionMeta,\n} from '@metamask/transaction-controller';\nimport type { CaipAssetType } from '@metamask/utils';\nimport type { BridgeHistoryItem } from 'src/types';\n\nimport type { QuoteFetchData } from '../../../bridge-controller/src/utils/metrics/types';\n\nexport const getTxStatusesFromHistory = ({\n  status,\n  hasApprovalTx,\n  quote,\n}: BridgeHistoryItem): TxStatusData => {\n  const source_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n  const destination_transaction = status.destChain?.txHash\n    ? status.status\n    : StatusTypes.PENDING;\n\n  const hexChainId = formatChainIdToHex(quote.srcChainId);\n  const isEthUsdtTx = isEthUsdt(hexChainId, quote.srcAsset.address);\n  const allowance_reset_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : undefined;\n  const approval_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n\n  return {\n    allowance_reset_transaction: isEthUsdtTx\n      ? allowance_reset_transaction\n      : undefined,\n    approval_transaction: hasApprovalTx ? approval_transaction : undefined,\n    source_transaction,\n    destination_transaction:\n      status.status === StatusTypes.FAILED\n        ? StatusTypes.FAILED\n        : destination_transaction,\n  };\n};\n\nexport const getFinalizedTxProperties = (historyItem: BridgeHistoryItem) => {\n  return {\n    actual_time_minutes:\n      historyItem.completionTime && historyItem.startTime\n        ? (historyItem.completionTime - historyItem.startTime) / 60000\n        : 0,\n    usd_actual_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0), // TODO calculate based on USD price at completion time\n    usd_actual_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0), // TODO calculate based on USD price at completion time\n    quote_vs_execution_ratio: 1, // TODO calculate based on USD price at completion time\n    quoted_vs_used_gas_ratio: 1, // TODO calculate based on USD price at completion time\n  };\n};\n\nexport const getRequestParamFromHistory = (\n  historyItem: BridgeHistoryItem,\n): RequestParams => {\n  return {\n    chain_id_source: formatChainIdToCaip(historyItem.quote.srcChainId),\n    token_symbol_source: historyItem.quote.srcAsset.symbol,\n    token_address_source: historyItem.quote.srcAsset.assetId,\n    chain_id_destination: formatChainIdToCaip(historyItem.quote.destChainId),\n    token_symbol_destination: historyItem.quote.destAsset.symbol,\n    token_address_destination: historyItem.quote.destAsset.assetId,\n  };\n};\n\nexport const getTradeDataFromQuote = (\n  quoteResponse: QuoteResponse<TxData | string> & QuoteMetadata,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(quoteResponse.gasFee?.usd ?? 0),\n    gas_included: false,\n    provider: formatProviderLabel(quoteResponse.quote),\n    quoted_time_minutes: Number(\n      quoteResponse.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),\n  };\n};\n\nexport const getPriceImpactFromQuote = (\n  quote: QuoteResponse['quote'],\n): Pick<QuoteFetchData, 'price_impact'> => {\n  return { price_impact: Number(quote.priceData?.priceImpact ?? '0') };\n};\n\nexport const getTradeDataFromHistory = (\n  historyItem: BridgeHistoryItem,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),\n    gas_included: false,\n    provider: formatProviderLabel(historyItem.quote),\n    quoted_time_minutes: Number(\n      historyItem.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),\n  };\n};\n\nexport const getRequestMetadataFromHistory = (\n  historyItem: BridgeHistoryItem,\n  account?: AccountsControllerState['internalAccounts']['accounts'][string],\n): RequestMetadata => {\n  const { quote, slippagePercentage, isStxEnabled } = historyItem;\n\n  return {\n    slippage_limit: slippagePercentage,\n    custom_slippage: isCustomSlippage(slippagePercentage),\n    usd_amount_source: Number(historyItem.pricingData?.amountSentInUsd ?? 0),\n    swap_type: getSwapType(quote.srcChainId, quote.destChainId),\n    is_hardware_wallet: isHardwareWallet(account),\n    stx_enabled: isStxEnabled ?? false,\n    security_warnings: [],\n  };\n};\n\n/**\n * Get the properties for a swap transaction that is not in the txHistory\n *\n * @param transactionMeta - The transaction meta\n * @returns The properties for the swap transaction\n */\nexport const getEVMTxPropertiesFromTransactionMeta = (\n  transactionMeta: TransactionMeta,\n) => {\n  return {\n    source_transaction:\n      transactionMeta.status === TransactionStatus.failed\n        ? StatusTypes.FAILED\n        : StatusTypes.COMPLETE,\n    error_message: transactionMeta.error?.message\n      ? 'Failed to finalize swap tx'\n      : undefined,\n    chain_id_source: formatChainIdToCaip(transactionMeta.chainId),\n    chain_id_destination: formatChainIdToCaip(transactionMeta.chainId),\n    token_symbol_source: transactionMeta.sourceTokenSymbol ?? '',\n    token_symbol_destination: transactionMeta.destinationTokenSymbol ?? '',\n    usd_amount_source: 100,\n    stx_enabled: false,\n    token_address_source:\n      formatAddressToAssetId(\n        transactionMeta.sourceTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    token_address_destination:\n      formatAddressToAssetId(\n        transactionMeta.destinationTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    custom_slippage: false,\n    is_hardware_wallet: false,\n    swap_type:\n      transactionMeta.type === TransactionType.swap\n        ? MetricsSwapType.SINGLE\n        : MetricsSwapType.CROSSCHAIN,\n    security_warnings: [],\n    price_impact: 0,\n    usd_quoted_gas: 0,\n    gas_included: false,\n    quoted_time_minutes: 0,\n    usd_quoted_return: 0,\n    provider: '' as `${string}_${string}`,\n    actual_time_minutes: 0,\n    quote_vs_execution_ratio: 0,\n    quoted_vs_used_gas_ratio: 0,\n    usd_actual_return: 0,\n    usd_actual_gas: 0,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n  };\n};\n"]}
+{"version":3,"file":"metrics.cjs","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountsControllerState } from '@metamask/accounts-controller';\nimport type {\n  QuoteResponse,\n  TxData,\n  QuoteMetadata,\n} from '@metamask/bridge-controller';\nimport {\n  type TxStatusData,\n  StatusTypes,\n  formatChainIdToHex,\n  isEthUsdt,\n  type RequestParams,\n  formatChainIdToCaip,\n  type TradeData,\n  formatProviderLabel,\n  type RequestMetadata,\n  isCustomSlippage,\n  getSwapType,\n  isHardwareWallet,\n  formatAddressToAssetId,\n  MetricsActionType,\n  MetricsSwapType,\n} from '@metamask/bridge-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n  type TransactionMeta,\n} from '@metamask/transaction-controller';\nimport type { CaipAssetType } from '@metamask/utils';\nimport type { BridgeHistoryItem } from 'src/types';\n\nimport type { QuoteFetchData } from '../../../bridge-controller/src/utils/metrics/types';\n\nexport const getTxStatusesFromHistory = ({\n  status,\n  hasApprovalTx,\n  approvalTxId,\n  quote,\n}: BridgeHistoryItem): TxStatusData => {\n  const source_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n  const destination_transaction = status.destChain?.txHash\n    ? status.status\n    : StatusTypes.PENDING;\n\n  const hexChainId = formatChainIdToHex(quote.srcChainId);\n  const isEthUsdtTx = isEthUsdt(hexChainId, quote.srcAsset.address);\n  const allowance_reset_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : undefined;\n  const approval_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n\n  return {\n    allowance_reset_transaction: isEthUsdtTx\n      ? allowance_reset_transaction\n      : undefined,\n    approval_transaction:\n      hasApprovalTx || approvalTxId ? approval_transaction : undefined,\n    source_transaction,\n    destination_transaction:\n      status.status === StatusTypes.FAILED\n        ? StatusTypes.FAILED\n        : destination_transaction,\n  };\n};\n\nexport const getFinalizedTxProperties = (historyItem: BridgeHistoryItem) => {\n  return {\n    actual_time_minutes:\n      historyItem.completionTime && historyItem.startTime\n        ? (historyItem.completionTime - historyItem.startTime) / 60000\n        : 0,\n    usd_actual_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0), // TODO calculate based on USD price at completion time\n    usd_actual_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0), // TODO calculate based on USD price at completion time\n    quote_vs_execution_ratio: 1, // TODO calculate based on USD price at completion time\n    quoted_vs_used_gas_ratio: 1, // TODO calculate based on USD price at completion time\n  };\n};\n\nexport const getRequestParamFromHistory = (\n  historyItem: BridgeHistoryItem,\n): RequestParams => {\n  return {\n    chain_id_source: formatChainIdToCaip(historyItem.quote.srcChainId),\n    token_symbol_source: historyItem.quote.srcAsset.symbol,\n    token_address_source: historyItem.quote.srcAsset.assetId,\n    chain_id_destination: formatChainIdToCaip(historyItem.quote.destChainId),\n    token_symbol_destination: historyItem.quote.destAsset.symbol,\n    token_address_destination: historyItem.quote.destAsset.assetId,\n  };\n};\n\nexport const getTradeDataFromQuote = (\n  quoteResponse: QuoteResponse<TxData | string> & QuoteMetadata,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(quoteResponse.gasFee?.usd ?? 0),\n    gas_included: quoteResponse.quote.gasIncluded ?? false,\n    provider: formatProviderLabel(quoteResponse.quote),\n    quoted_time_minutes: Number(\n      quoteResponse.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),\n  };\n};\n\nexport const getPriceImpactFromQuote = (\n  quote: QuoteResponse['quote'],\n): Pick<QuoteFetchData, 'price_impact'> => {\n  return { price_impact: Number(quote.priceData?.priceImpact ?? '0') };\n};\n\nexport const getTradeDataFromHistory = (\n  historyItem: BridgeHistoryItem,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),\n    gas_included: historyItem.quote.gasIncluded ?? false,\n    provider: formatProviderLabel(historyItem.quote),\n    quoted_time_minutes: Number(\n      historyItem.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),\n  };\n};\n\nexport const getRequestMetadataFromHistory = (\n  historyItem: BridgeHistoryItem,\n  account?: AccountsControllerState['internalAccounts']['accounts'][string],\n): RequestMetadata => {\n  const { quote, slippagePercentage, isStxEnabled } = historyItem;\n\n  return {\n    slippage_limit: slippagePercentage,\n    custom_slippage: isCustomSlippage(slippagePercentage),\n    usd_amount_source: Number(historyItem.pricingData?.amountSentInUsd ?? 0),\n    swap_type: getSwapType(quote.srcChainId, quote.destChainId),\n    is_hardware_wallet: isHardwareWallet(account),\n    stx_enabled: isStxEnabled ?? false,\n    security_warnings: [],\n  };\n};\n\n/**\n * Get the properties for a swap transaction that is not in the txHistory\n *\n * @param transactionMeta - The transaction meta\n * @returns The properties for the swap transaction\n */\nexport const getEVMTxPropertiesFromTransactionMeta = (\n  transactionMeta: TransactionMeta,\n) => {\n  return {\n    source_transaction: [\n      TransactionStatus.failed,\n      TransactionStatus.dropped,\n      TransactionStatus.rejected,\n    ].includes(transactionMeta.status)\n      ? StatusTypes.FAILED\n      : StatusTypes.COMPLETE,\n    error_message: transactionMeta.error?.message\n      ? 'Failed to finalize swap tx'\n      : undefined,\n    chain_id_source: formatChainIdToCaip(transactionMeta.chainId),\n    chain_id_destination: formatChainIdToCaip(transactionMeta.chainId),\n    token_symbol_source: transactionMeta.sourceTokenSymbol ?? '',\n    token_symbol_destination: transactionMeta.destinationTokenSymbol ?? '',\n    usd_amount_source: 100,\n    stx_enabled: false,\n    token_address_source:\n      formatAddressToAssetId(\n        transactionMeta.sourceTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    token_address_destination:\n      formatAddressToAssetId(\n        transactionMeta.destinationTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    custom_slippage: false,\n    is_hardware_wallet: false,\n    swap_type:\n      transactionMeta.type &&\n      [TransactionType.swap, TransactionType.swapApproval].includes(\n        transactionMeta.type,\n      )\n        ? MetricsSwapType.SINGLE\n        : MetricsSwapType.CROSSCHAIN,\n    security_warnings: [],\n    price_impact: 0,\n    usd_quoted_gas: 0,\n    gas_included: false,\n    quoted_time_minutes: 0,\n    usd_quoted_return: 0,\n    provider: '' as `${string}_${string}`,\n    actual_time_minutes: 0,\n    quote_vs_execution_ratio: 0,\n    quoted_vs_used_gas_ratio: 0,\n    usd_actual_return: 0,\n    usd_actual_gas: 0,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n  };\n};\n"]}

package/dist/utils/metrics.d.cts

@@ -4,7 +4,7 @@ import { type TxStatusData, StatusTypes, type RequestParams, type TradeData, typ
 import { type TransactionMeta } from "@metamask/transaction-controller";
 import type { BridgeHistoryItem } from "src/types";
 import type { QuoteFetchData } from "../../../bridge-controller/src/utils/metrics/types.cjs";
-export declare const getTxStatusesFromHistory: ({ status, hasApprovalTx, quote, }: BridgeHistoryItem) => TxStatusData;
+export declare const getTxStatusesFromHistory: ({ status, hasApprovalTx, approvalTxId, quote, }: BridgeHistoryItem) => TxStatusData;
 export declare const getFinalizedTxProperties: (historyItem: BridgeHistoryItem) => {
     actual_time_minutes: number;
     usd_actual_return: number;

package/dist/utils/metrics.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.cts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EACN,aAAa,EACd,oCAAoC;AACrC,OAAO,EACL,KAAK,YAAY,EACjB,WAAW,EAGX,KAAK,aAAa,EAElB,KAAK,SAAS,EAEd,KAAK,eAAe,EAKpB,iBAAiB,EACjB,eAAe,EAChB,oCAAoC;AACrC,OAAO,EAGL,KAAK,eAAe,EACrB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,+DAA2D;AAEzF,eAAO,MAAM,wBAAwB,sCAIlC,iBAAiB,KAAG,YA4BtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBAAiB,iBAAiB;;;;;;CAWtE,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa,KAC5D,SAUF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAUF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8CjC,CAAC"}
+{"version":3,"file":"metrics.d.cts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EACN,aAAa,EACd,oCAAoC;AACrC,OAAO,EACL,KAAK,YAAY,EACjB,WAAW,EAGX,KAAK,aAAa,EAElB,KAAK,SAAS,EAEd,KAAK,eAAe,EAKpB,iBAAiB,EACjB,eAAe,EAChB,oCAAoC;AACrC,OAAO,EAGL,KAAK,eAAe,EACrB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,+DAA2D;AAEzF,eAAO,MAAM,wBAAwB,oDAKlC,iBAAiB,KAAG,YA6BtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBAAiB,iBAAiB;;;;;;CAWtE,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa,KAC5D,SAUF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAUF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDjC,CAAC"}

package/dist/utils/metrics.d.mts

@@ -4,7 +4,7 @@ import { type TxStatusData, StatusTypes, type RequestParams, type TradeData, typ
 import { type TransactionMeta } from "@metamask/transaction-controller";
 import type { BridgeHistoryItem } from "src/types";
 import type { QuoteFetchData } from "../../../bridge-controller/src/utils/metrics/types.mjs";
-export declare const getTxStatusesFromHistory: ({ status, hasApprovalTx, quote, }: BridgeHistoryItem) => TxStatusData;
+export declare const getTxStatusesFromHistory: ({ status, hasApprovalTx, approvalTxId, quote, }: BridgeHistoryItem) => TxStatusData;
 export declare const getFinalizedTxProperties: (historyItem: BridgeHistoryItem) => {
     actual_time_minutes: number;
     usd_actual_return: number;

package/dist/utils/metrics.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.mts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EACN,aAAa,EACd,oCAAoC;AACrC,OAAO,EACL,KAAK,YAAY,EACjB,WAAW,EAGX,KAAK,aAAa,EAElB,KAAK,SAAS,EAEd,KAAK,eAAe,EAKpB,iBAAiB,EACjB,eAAe,EAChB,oCAAoC;AACrC,OAAO,EAGL,KAAK,eAAe,EACrB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,+DAA2D;AAEzF,eAAO,MAAM,wBAAwB,sCAIlC,iBAAiB,KAAG,YA4BtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBAAiB,iBAAiB;;;;;;CAWtE,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa,KAC5D,SAUF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAUF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8CjC,CAAC"}
+{"version":3,"file":"metrics.d.mts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EACN,aAAa,EACd,oCAAoC;AACrC,OAAO,EACL,KAAK,YAAY,EACjB,WAAW,EAGX,KAAK,aAAa,EAElB,KAAK,SAAS,EAEd,KAAK,eAAe,EAKpB,iBAAiB,EACjB,eAAe,EAChB,oCAAoC;AACrC,OAAO,EAGL,KAAK,eAAe,EACrB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,+DAA2D;AAEzF,eAAO,MAAM,wBAAwB,oDAKlC,iBAAiB,KAAG,YA6BtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBAAiB,iBAAiB;;;;;;CAWtE,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa,KAC5D,SAUF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAUF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDjC,CAAC"}

package/dist/utils/metrics.mjs

@@ -1,6 +1,6 @@
 import { StatusTypes, formatChainIdToHex, isEthUsdt, formatChainIdToCaip, formatProviderLabel, isCustomSlippage, getSwapType, isHardwareWallet, formatAddressToAssetId, MetricsActionType, MetricsSwapType } from "@metamask/bridge-controller";
 import { TransactionStatus, TransactionType } from "@metamask/transaction-controller";
-export const getTxStatusesFromHistory = ({ status, hasApprovalTx, quote, }) => {
+export const getTxStatusesFromHistory = ({ status, hasApprovalTx, approvalTxId, quote, }) => {
     const source_transaction = status.srcChain.txHash
         ? StatusTypes.COMPLETE
         : StatusTypes.PENDING;
@@ -19,7 +19,7 @@ export const getTxStatusesFromHistory = ({ status, hasApprovalTx, quote, }) => {
         allowance_reset_transaction: isEthUsdtTx
             ? allowance_reset_transaction
             : undefined,
-        approval_transaction: hasApprovalTx ? approval_transaction : undefined,
+        approval_transaction: hasApprovalTx || approvalTxId ? approval_transaction : undefined,
         source_transaction,
         destination_transaction: status.status === StatusTypes.FAILED
             ? StatusTypes.FAILED
@@ -50,7 +50,7 @@ export const getRequestParamFromHistory = (historyItem) => {
 export const getTradeDataFromQuote = (quoteResponse) => {
     return {
         usd_quoted_gas: Number(quoteResponse.gasFee?.usd ?? 0),
-        gas_included: false,
+        gas_included: quoteResponse.quote.gasIncluded ?? false,
         provider: formatProviderLabel(quoteResponse.quote),
         quoted_time_minutes: Number(quoteResponse.estimatedProcessingTimeInSeconds / 60),
         usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),
@@ -62,7 +62,7 @@ export const getPriceImpactFromQuote = (quote) => {
 export const getTradeDataFromHistory = (historyItem) => {
     return {
         usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),
-        gas_included: false,
+        gas_included: historyItem.quote.gasIncluded ?? false,
         provider: formatProviderLabel(historyItem.quote),
         quoted_time_minutes: Number(historyItem.estimatedProcessingTimeInSeconds / 60),
         usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),
@@ -88,7 +88,11 @@ export const getRequestMetadataFromHistory = (historyItem, account) => {
  */
 export const getEVMTxPropertiesFromTransactionMeta = (transactionMeta) => {
     return {
-        source_transaction: transactionMeta.status === TransactionStatus.failed
+        source_transaction: [
+            TransactionStatus.failed,
+            TransactionStatus.dropped,
+            TransactionStatus.rejected,
+        ].includes(transactionMeta.status)
             ? StatusTypes.FAILED
             : StatusTypes.COMPLETE,
         error_message: transactionMeta.error?.message
@@ -104,7 +108,8 @@ export const getEVMTxPropertiesFromTransactionMeta = (transactionMeta) => {
         token_address_destination: formatAddressToAssetId(transactionMeta.destinationTokenAddress ?? '', transactionMeta.chainId) ?? '',
         custom_slippage: false,
         is_hardware_wallet: false,
-        swap_type: transactionMeta.type === TransactionType.swap
+        swap_type: transactionMeta.type &&
+            [TransactionType.swap, TransactionType.swapApproval].includes(transactionMeta.type)
             ? MetricsSwapType.SINGLE
             : MetricsSwapType.CROSSCHAIN,
         security_warnings: [],