@metamask-previews/user-operation-controller 41.2.9-preview-3e34650c2 → 41.2.9-preview-4f4c98e

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Bump minimum Node.js version to 22 ([#9168](https://github.com/MetaMask/core/pull/9168))
+
 ## [41.2.9]
 
 ### Changed

package/dist/{BlockTrackerPollingController.d.mts → BlockTrackerPollingController.d.ts}

@@ -1,7 +1,7 @@
-import { BaseController } from "@metamask/base-controller";
-import type { NetworkClientId, NetworkClient } from "@metamask/network-controller";
-import { PollingTokenSetId } from "@metamask/polling-controller";
-import type { Json } from "@metamask/utils";
+import { BaseController } from '@metamask/base-controller';
+import type { NetworkClientId, NetworkClient } from '@metamask/network-controller';
+import { PollingTokenSetId } from '@metamask/polling-controller';
+import type { Json } from '@metamask/utils';
 /**
  * The minimum input required to start polling for a {@link BlockTrackerPollingController}.
  * Implementing classes may provide additional properties.
@@ -12,12 +12,12 @@ export type BlockTrackerPollingInput = {
 declare class Empty {
 }
 export declare const BlockTrackerPollingControllerOnly: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
-    "__#21@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    _activeListeners: Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
     _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#3@#pollingTokenSets": Map<string, Set<string>>;
-    readonly "__#3@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    readonly _pollingTokenSets: Map<PollingTokenSetId, Set<string>>;
+    readonly _callbacks: Map<string, Set<(input: PollingInput) => void>>;
     _executePoll(input: PollingInput): Promise<void>;
     startPolling(input: PollingInput): string;
     stopAllPolling(): void;
@@ -25,12 +25,12 @@ export declare const BlockTrackerPollingControllerOnly: <PollingInput extends Bl
     onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof Empty;
 export declare const BlockTrackerPollingController: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
-    "__#21@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    _activeListeners: Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
     _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#3@#pollingTokenSets": Map<string, Set<string>>;
-    readonly "__#3@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    readonly _pollingTokenSets: Map<PollingTokenSetId, Set<string>>;
+    readonly _callbacks: Map<string, Set<(input: PollingInput) => void>>;
     _executePoll(input: PollingInput): Promise<void>;
     startPolling(input: PollingInput): string;
     stopAllPolling(): void;
@@ -38,4 +38,4 @@ export declare const BlockTrackerPollingController: <PollingInput extends BlockT
     onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseController;
 export {};
-//# sourceMappingURL=BlockTrackerPollingController.d.mts.map
+//# sourceMappingURL=BlockTrackerPollingController.d.ts.map

package/dist/BlockTrackerPollingController.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockTrackerPollingController.d.ts","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAIL,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AA4EF,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,iCAAiC,GAC5C,YAAY,SAAS,wBAAwB;+CAnDA,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;wCAEQ,IAAI;yCAqBH,iBAAiB,GAAG,IAAI;;;;;;;;iBA4BW,CAAC;AAE7E,eAAO,MAAM,6BAA6B,GACxC,YAAY,SAAS,wBAAwB;+CA1DA,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;wCAEQ,IAAI;yCAqBH,iBAAiB,GAAG,IAAI;;;;;;;;0BAsC9D,CAAC"}

package/dist/{BlockTrackerPollingController.mjs → BlockTrackerPollingController.js}

@@ -1,10 +1,5 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-import { BaseController } from "@metamask/base-controller";
-import { AbstractPollingControllerBaseMixin, getKey } from "@metamask/polling-controller";
+import { BaseController } from '@metamask/base-controller';
+import { AbstractPollingControllerBaseMixin, getKey, } from '@metamask/polling-controller';
 /**
  * BlockTrackerPollingControllerMixin
  * A polling controller that polls using a block tracker.
@@ -16,15 +11,22 @@ import { AbstractPollingControllerBaseMixin, getKey } from "@metamask/polling-co
 // the class defined inside the function scope, so this can't be easily typed.
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/naming-convention
 function BlockTrackerPollingControllerMixin(Base) {
-    var _BlockTrackerPollingController_activeListeners;
     class BlockTrackerPollingController extends AbstractPollingControllerBaseMixin(Base) {
         constructor() {
             super(...arguments);
-            _BlockTrackerPollingController_activeListeners.set(this, {});
+            // This field is public (rather than using `#`) so that declaration
+            // emission can describe it. Private/protected members on the class
+            // returned by an exported mixin function trigger TS4094, and giving the
+            // mixin an explicit return type to work around that breaks consumers
+            // that supply the base class's own type arguments via
+            // `BlockTrackerPollingController()<Name, State, Messenger>`. The
+            // leading underscore signals "internal, do not use" without needing
+            // true privacy.
+            this._activeListeners = {};
         }
         _startPolling(input) {
             const key = getKey(input);
-            if (__classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
+            if (this._activeListeners[key]) {
                 return;
             }
             const networkClient = this._getNetworkClientById(input.networkClientId);
@@ -33,7 +35,7 @@ function BlockTrackerPollingControllerMixin(Base) {
                 // TODO: Either fix this lint violation or explain why it's necessary to ignore.
                 // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 networkClient.blockTracker.addListener('latest', updateOnNewBlock);
-                __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key] = updateOnNewBlock;
+                this._activeListeners[key] = updateOnNewBlock;
             }
             else {
                 throw new Error(`Unable to retrieve blockTracker for networkClientId ${input.networkClientId}`);
@@ -42,22 +44,21 @@ function BlockTrackerPollingControllerMixin(Base) {
         _stopPollingByPollingTokenSetId(key) {
             const { networkClientId } = JSON.parse(key);
             const networkClient = this._getNetworkClientById(networkClientId);
-            if (networkClient && __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
-                const listener = __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
+            if (networkClient && this._activeListeners[key]) {
+                const listener = this._activeListeners[key];
                 if (listener) {
                     // TODO: Either fix this lint violation or explain why it's necessary to ignore.
                     // eslint-disable-next-line @typescript-eslint/no-misused-promises
                     networkClient.blockTracker.removeListener('latest', listener);
-                    delete __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
+                    delete this._activeListeners[key];
                 }
             }
         }
     }
-    _BlockTrackerPollingController_activeListeners = new WeakMap();
     return BlockTrackerPollingController;
 }
 class Empty {
 }
 export const BlockTrackerPollingControllerOnly = () => BlockTrackerPollingControllerMixin(Empty);
 export const BlockTrackerPollingController = () => BlockTrackerPollingControllerMixin(BaseController);
-//# sourceMappingURL=BlockTrackerPollingController.mjs.map
+//# sourceMappingURL=BlockTrackerPollingController.js.map

package/dist/BlockTrackerPollingController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockTrackerPollingController.js","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAK3D,OAAO,EACL,kCAAkC,EAClC,MAAM,GAGP,MAAM,8BAA8B,CAAC;AAWtC;;;;;;GAMG;AACH,gFAAgF;AAChF,8EAA8E;AAC9E,kHAAkH;AAClH,SAAS,kCAAkC,CAGzC,IAAW;IACX,MAAe,6BAA8B,SAAQ,kCAAkC,CAGrF,IAAI,CAAC;QAHP;;YAIE,mEAAmE;YACnE,mEAAmE;YACnE,wEAAwE;YACxE,qEAAqE;YACrE,sDAAsD;YACtD,iEAAiE;YACjE,oEAAoE;YACpE,gBAAgB;YAChB,qBAAgB,GAAqD,EAAE,CAAC;QA2C1E,CAAC;QArCC,aAAa,CAAC,KAAmB;YAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAE1B,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO;YACT,CAAC;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxE,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC7D,gFAAgF;gBAChF,kEAAkE;gBAClE,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBACnE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,uDAAuD,KAAK,CAAC,eAAe,EAAE,CAC/E,CAAC;YACJ,CAAC;QACH,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAC9C,eAAkC,CACnC,CAAC;YAEF,IAAI,aAAa,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBAC5C,IAAI,QAAQ,EAAE,CAAC;oBACb,gFAAgF;oBAChF,kEAAkE;oBAClE,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC9D,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;QACH,CAAC;KACF;IAED,OAAO,6BAA6B,CAAC;AACvC,CAAC;AAED,MAAM,KAAK;CAAG;AAEd,MAAM,CAAC,MAAM,iCAAiC,GAAG,GAK7C,EAAE,CAAC,kCAAkC,CAA6B,KAAK,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAKzC,EAAE,CACJ,kCAAkC,CAChC,cAAc,CACf,CAAC","sourcesContent":["import { BaseController } from '@metamask/base-controller';\nimport type {\n  NetworkClientId,\n  NetworkClient,\n} from '@metamask/network-controller';\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n  Constructor,\n  PollingTokenSetId,\n} from '@metamask/polling-controller';\nimport type { Json } from '@metamask/utils';\n\n/**\n * The minimum input required to start polling for a {@link BlockTrackerPollingController}.\n * Implementing classes may provide additional properties.\n */\nexport type BlockTrackerPollingInput = {\n  networkClientId: NetworkClientId;\n};\n\n/**\n * BlockTrackerPollingControllerMixin\n * A polling controller that polls using a block tracker.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// This is a function that's used as class, and the return type is inferred from\n// the class defined inside the function scope, so this can't be easily typed.\n// eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/naming-convention\nfunction BlockTrackerPollingControllerMixin<\n  TBase extends Constructor,\n  PollingInput extends BlockTrackerPollingInput,\n>(Base: TBase) {\n  abstract class BlockTrackerPollingController extends AbstractPollingControllerBaseMixin<\n    TBase,\n    PollingInput\n  >(Base) {\n    // This field is public (rather than using `#`) so that declaration\n    // emission can describe it. Private/protected members on the class\n    // returned by an exported mixin function trigger TS4094, and giving the\n    // mixin an explicit return type to work around that breaks consumers\n    // that supply the base class's own type arguments via\n    // `BlockTrackerPollingController()<Name, State, Messenger>`. The\n    // leading underscore signals \"internal, do not use\" without needing\n    // true privacy.\n    _activeListeners: Record<string, (options: Json) => Promise<void>> = {};\n\n    abstract _getNetworkClientById(\n      networkClientId: NetworkClientId,\n    ): NetworkClient | undefined;\n\n    _startPolling(input: PollingInput): void {\n      const key = getKey(input);\n\n      if (this._activeListeners[key]) {\n        return;\n      }\n\n      const networkClient = this._getNetworkClientById(input.networkClientId);\n      if (networkClient) {\n        const updateOnNewBlock = this._executePoll.bind(this, input);\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        networkClient.blockTracker.addListener('latest', updateOnNewBlock);\n        this._activeListeners[key] = updateOnNewBlock;\n      } else {\n        throw new Error(\n          `Unable to retrieve blockTracker for networkClientId ${input.networkClientId}`,\n        );\n      }\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void {\n      const { networkClientId } = JSON.parse(key);\n      const networkClient = this._getNetworkClientById(\n        networkClientId as NetworkClientId,\n      );\n\n      if (networkClient && this._activeListeners[key]) {\n        const listener = this._activeListeners[key];\n        if (listener) {\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/no-misused-promises\n          networkClient.blockTracker.removeListener('latest', listener);\n          delete this._activeListeners[key];\n        }\n      }\n    }\n  }\n\n  return BlockTrackerPollingController;\n}\n\nclass Empty {}\n\nexport const BlockTrackerPollingControllerOnly = <\n  PollingInput extends BlockTrackerPollingInput,\n  // The return type is inferred from the class defined inside the function\n  // scope, so this can't be easily typed.\n  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type\n>() => BlockTrackerPollingControllerMixin<typeof Empty, PollingInput>(Empty);\n\nexport const BlockTrackerPollingController = <\n  PollingInput extends BlockTrackerPollingInput,\n  // The return type is inferred from the class defined inside the function\n  // scope, so this can't be easily typed.\n  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type\n>() =>\n  BlockTrackerPollingControllerMixin<typeof BaseController, PollingInput>(\n    BaseController,\n  );\n"]}

package/dist/{UserOperationController-method-action-types.d.cts → UserOperationController-method-action-types.d.ts}

@@ -2,7 +2,7 @@
  * This file is auto generated.
  * Do not edit manually.
  */
-import type { UserOperationController } from "./UserOperationController.cjs";
+import type { UserOperationController } from './UserOperationController.js';
 /**
  * Create and submit a user operation.
  *
@@ -54,4 +54,4 @@ export type UserOperationControllerStartPollingByNetworkClientIdAction = {
  * Union of all UserOperationController action types.
  */
 export type UserOperationControllerMethodActions = UserOperationControllerAddUserOperationAction | UserOperationControllerAddUserOperationFromTransactionAction | UserOperationControllerStartPollingByNetworkClientIdAction;
-//# sourceMappingURL=UserOperationController-method-action-types.d.cts.map
+//# sourceMappingURL=UserOperationController-method-action-types.d.ts.map

package/dist/UserOperationController-method-action-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserOperationController-method-action-types.d.ts","sourceRoot":"","sources":["../src/UserOperationController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,6CAA6C,GAAG;IAC1D,IAAI,EAAE,0CAA0C,CAAC;IACjD,OAAO,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;CACtD,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,4DAA4D,GAAG;IACzE,IAAI,EAAE,yDAAyD,CAAC;IAChE,OAAO,EAAE,uBAAuB,CAAC,iCAAiC,CAAC,CAAC;CACrE,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,0DAA0D,GAAG;IACvE,IAAI,EAAE,uDAAuD,CAAC;IAC9D,OAAO,EAAE,uBAAuB,CAAC,+BAA+B,CAAC,CAAC;CACnE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oCAAoC,GAC5C,6CAA6C,GAC7C,4DAA4D,GAC5D,0DAA0D,CAAC"}

package/dist/{UserOperationController-method-action-types.mjs → UserOperationController-method-action-types.js}

@@ -3,4 +3,4 @@
  * Do not edit manually.
  */
 export {};
-//# sourceMappingURL=UserOperationController-method-action-types.mjs.map
+//# sourceMappingURL=UserOperationController-method-action-types.js.map

package/dist/UserOperationController-method-action-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserOperationController-method-action-types.js","sourceRoot":"","sources":["../src/UserOperationController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { UserOperationController } from './UserOperationController.js';\n\n/**\n * Create and submit a user operation.\n *\n * @param request - Information required to create a user operation.\n * @param request.data - Data to include in the resulting transaction.\n * @param request.maxFeePerGas - Maximum fee per gas to pay towards the transaction.\n * @param request.maxPriorityFeePerGas - Maximum priority fee per gas to pay towards the transaction.\n * @param request.to - Destination address of the resulting transaction.\n * @param request.value - Value to include in the resulting transaction.\n * @param options - Configuration options when creating a user operation.\n * @param options.networkClientId - ID of the network client used to query the chain.\n * @param options.origin - Origin of the user operation, such as the hostname of a dApp.\n * @param options.requireApproval - Whether to require user approval before submitting the user operation. Defaults to true.\n * @param options.smartContractAccount - Smart contract abstraction to provide the contract specific values such as call data and nonce. Defaults to the current snap account.\n * @param options.swaps - Swap metadata to record with the user operation.\n * @param options.type - Type of the transaction.\n */\nexport type UserOperationControllerAddUserOperationAction = {\n  type: `UserOperationController:addUserOperation`;\n  handler: UserOperationController['addUserOperation'];\n};\n\n/**\n * Create and submit a user operation equivalent to the provided transaction.\n *\n * @param transaction - Transaction to use as the basis for the user operation.\n * @param options - Configuration options when creating a user operation.\n * @param options.networkClientId - ID of the network client used to query the chain.\n * @param options.origin - Origin of the user operation, such as the hostname of a dApp.\n * @param options.requireApproval - Whether to require user approval before submitting the user operation. Defaults to true.\n * @param options.smartContractAccount - Smart contract abstraction to provide the contract specific values such as call data and nonce. Defaults to the current snap account.\n * @param options.swaps - Swap metadata to record with the user operation.\n * @param options.type - Type of the transaction.\n */\nexport type UserOperationControllerAddUserOperationFromTransactionAction = {\n  type: `UserOperationController:addUserOperationFromTransaction`;\n  handler: UserOperationController['addUserOperationFromTransaction'];\n};\n\n/**\n * Starts polling for pending user operations on the given network.\n *\n * @param networkClientId - The ID of the network client to poll.\n * @returns The polling token that can be used to stop polling.\n */\nexport type UserOperationControllerStartPollingByNetworkClientIdAction = {\n  type: `UserOperationController:startPollingByNetworkClientId`;\n  handler: UserOperationController['startPollingByNetworkClientId'];\n};\n\n/**\n * Union of all UserOperationController action types.\n */\nexport type UserOperationControllerMethodActions =\n  | UserOperationControllerAddUserOperationAction\n  | UserOperationControllerAddUserOperationFromTransactionAction\n  | UserOperationControllerStartPollingByNetworkClientIdAction;\n"]}

package/dist/{UserOperationController.d.cts → UserOperationController.d.ts}

@@ -1,17 +1,15 @@
-/// <reference types="node" />
-/// <reference types="npm-which/node_modules/@types/node/events.js" />
-import type { ApprovalControllerAddRequestAction } from "@metamask/approval-controller";
-import { BaseController } from "@metamask/base-controller";
-import type { ControllerGetStateAction, ControllerStateChangeEvent } from "@metamask/base-controller";
-import type { GasFeeState } from "@metamask/gas-fee-controller";
-import type { KeyringControllerPrepareUserOperationAction, KeyringControllerPatchUserOperationAction, KeyringControllerSignUserOperationAction } from "@metamask/keyring-controller";
-import type { Messenger } from "@metamask/messenger";
-import type { NetworkControllerGetNetworkClientByIdAction } from "@metamask/network-controller";
-import { TransactionType } from "@metamask/transaction-controller";
-import type { TransactionMeta, TransactionParams } from "@metamask/transaction-controller";
-import EventEmitter from "events";
-import type { SmartContractAccount, UserOperationMetadata } from "./types.cjs";
-import type { UserOperationControllerMethodActions } from "./UserOperationController-method-action-types.cjs";
+import type { ApprovalControllerAddRequestAction } from '@metamask/approval-controller';
+import { BaseController } from '@metamask/base-controller';
+import type { ControllerGetStateAction, ControllerStateChangeEvent } from '@metamask/base-controller';
+import type { GasFeeState } from '@metamask/gas-fee-controller';
+import type { KeyringControllerPrepareUserOperationAction, KeyringControllerPatchUserOperationAction, KeyringControllerSignUserOperationAction } from '@metamask/keyring-controller';
+import type { Messenger } from '@metamask/messenger';
+import type { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller';
+import { TransactionType } from '@metamask/transaction-controller';
+import type { TransactionMeta, TransactionParams } from '@metamask/transaction-controller';
+import EventEmitter from 'events';
+import type { SmartContractAccount, UserOperationMetadata } from './types.js';
+import type { UserOperationControllerMethodActions } from './UserOperationController-method-action-types.js';
 declare const controllerName = "UserOperationController";
 type Events = {
     'transaction-updated': [metadata: TransactionMeta];
@@ -133,4 +131,4 @@ export declare class UserOperationController extends BaseController<typeof contr
     startPollingByNetworkClientId(networkClientId: string): string;
 }
 export {};
-//# sourceMappingURL=UserOperationController.d.cts.map
+//# sourceMappingURL=UserOperationController.d.ts.map

package/dist/UserOperationController.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserOperationController.d.ts","sourceRoot":"","sources":["../src/UserOperationController.ts"],"names":[],"mappings":"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"}

package/dist/{UserOperationController.mjs → UserOperationController.js}

@@ -10,27 +10,26 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _UserOperationController_instances, _UserOperationController_entrypoint, _UserOperationController_getGasFeeEstimates, _UserOperationController_pendingUserOperationTracker, _UserOperationController_addUserOperation, _UserOperationController_prepareAndSubmitUserOperation, _UserOperationController_waitForConfirmation, _UserOperationController_createMetadata, _UserOperationController_prepareUserOperation, _UserOperationController_addPaymasterData, _UserOperationController_approveUserOperation, _UserOperationController_signUserOperation, _UserOperationController_submitUserOperation, _UserOperationController_failUserOperation, _UserOperationController_createEmptyUserOperation, _UserOperationController_updateMetadata, _UserOperationController_deleteMetadata, _UserOperationController_updateTransaction, _UserOperationController_addPendingUserOperationTrackerListeners, _UserOperationController_requestApproval, _UserOperationController_getTransactionType, _UserOperationController_getProvider, _UserOperationController_updateUserOperationAfterApproval, _UserOperationController_regenerateUserOperation;
-import { BaseController } from "@metamask/base-controller";
-import { ApprovalType } from "@metamask/controller-utils";
-import { errorCodes } from "@metamask/rpc-errors";
-import { TransactionType } from "@metamask/transaction-controller";
-import { add0x } from "@metamask/utils";
+import { BaseController } from '@metamask/base-controller';
+import { ApprovalType } from '@metamask/controller-utils';
+import { errorCodes } from '@metamask/rpc-errors';
+import { TransactionType } from '@metamask/transaction-controller';
+import { add0x } from '@metamask/utils';
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
-import EventEmitter from "events";
-import $lodash from "lodash";
-const { cloneDeep } = $lodash;
-import { v1 as random } from "uuid";
-import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from "./constants.mjs";
-import { Bundler } from "./helpers/Bundler.mjs";
-import { PendingUserOperationTracker } from "./helpers/PendingUserOperationTracker.mjs";
-import { SnapSmartContractAccount } from "./helpers/SnapSmartContractAccount.mjs";
-import { projectLogger as log } from "./logger.mjs";
-import { UserOperationStatus } from "./types.mjs";
-import { updateGasFees } from "./utils/gas-fees.mjs";
-import { updateGas } from "./utils/gas.mjs";
-import { getTransactionMetadata } from "./utils/transaction.mjs";
-import { validateAddUserOperationOptions, validateAddUserOperationRequest, validatePrepareUserOperationResponse, validateSignUserOperationResponse, validateUpdateUserOperationResponse } from "./utils/validation.mjs";
+import EventEmitter from 'events';
+import { cloneDeep } from 'lodash-es';
+import { v1 as random } from 'uuid';
+import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from './constants.js';
+import { Bundler } from './helpers/Bundler.js';
+import { PendingUserOperationTracker } from './helpers/PendingUserOperationTracker.js';
+import { SnapSmartContractAccount } from './helpers/SnapSmartContractAccount.js';
+import { projectLogger as log } from './logger.js';
+import { UserOperationStatus } from './types.js';
+import { updateGasFees } from './utils/gas-fees.js';
+import { updateGas } from './utils/gas.js';
+import { getTransactionMetadata } from './utils/transaction.js';
+import { validateAddUserOperationOptions, validateAddUserOperationRequest, validatePrepareUserOperationResponse, validateSignUserOperationResponse, validateUpdateUserOperationResponse, } from './utils/validation.js';
 const controllerName = 'UserOperationController';
 const MESSENGER_EXPOSED_METHODS = [
     'addUserOperation',
@@ -486,4 +485,4 @@ _UserOperationController_entrypoint = new WeakMap(), _UserOperationController_ge
     await __classPrivateFieldGet(this, _UserOperationController_instances, "m", _UserOperationController_addPaymasterData).call(this, metadata, smartContractAccount);
     log('Regenerated user operation', metadata.userOperation);
 };
-//# sourceMappingURL=UserOperationController.mjs.map
+//# sourceMappingURL=UserOperationController.js.map

package/dist/UserOperationController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserOperationController.js","sourceRoot":"","sources":["../src/UserOperationController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  AcceptResultCallbacks,\n  ApprovalControllerAddRequestAction,\n  AddResult,\n} from '@metamask/approval-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n} from '@metamask/base-controller';\nimport { ApprovalType } from '@metamask/controller-utils';\nimport type { GasFeeState } from '@metamask/gas-fee-controller';\nimport type {\n  KeyringControllerPrepareUserOperationAction,\n  KeyringControllerPatchUserOperationAction,\n  KeyringControllerSignUserOperationAction,\n} from '@metamask/keyring-controller';\nimport type { Messenger } from '@metamask/messenger';\nimport type {\n  NetworkControllerGetNetworkClientByIdAction,\n  Provider,\n} from '@metamask/network-controller';\nimport { errorCodes } from '@metamask/rpc-errors';\nimport { TransactionType } from '@metamask/transaction-controller';\nimport type {\n  TransactionMeta,\n  TransactionParams,\n} from '@metamask/transaction-controller';\nimport { add0x } from '@metamask/utils';\n// This package purposefully relies on Node's EventEmitter module.\n// eslint-disable-next-line import-x/no-nodejs-modules\nimport EventEmitter from 'events';\nimport { cloneDeep } from 'lodash-es';\nimport { v1 as random } from 'uuid';\n\nimport { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from './constants.js';\nimport { Bundler } from './helpers/Bundler.js';\nimport { PendingUserOperationTracker } from './helpers/PendingUserOperationTracker.js';\nimport { SnapSmartContractAccount } from './helpers/SnapSmartContractAccount.js';\nimport { projectLogger as log } from './logger.js';\nimport type {\n  SmartContractAccount,\n  UserOperation,\n  UserOperationMetadata,\n} from './types.js';\nimport { UserOperationStatus } from './types.js';\nimport type { UserOperationControllerMethodActions } from './UserOperationController-method-action-types.js';\nimport { updateGasFees } from './utils/gas-fees.js';\nimport { updateGas } from './utils/gas.js';\nimport { getTransactionMetadata } from './utils/transaction.js';\nimport {\n  validateAddUserOperationOptions,\n  validateAddUserOperationRequest,\n  validatePrepareUserOperationResponse,\n  validateSignUserOperationResponse,\n  validateUpdateUserOperationResponse,\n} from './utils/validation.js';\n\nconst controllerName = 'UserOperationController';\n\nconst MESSENGER_EXPOSED_METHODS = [\n  'addUserOperation',\n  'addUserOperationFromTransaction',\n  'startPollingByNetworkClientId',\n] as const;\n\nconst stateMetadata = {\n  userOperations: {\n    includeInStateLogs: true,\n    persist: true,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n};\n\nconst getDefaultState = () => ({\n  userOperations: {},\n});\n\ntype Events = {\n  'transaction-updated': [metadata: TransactionMeta];\n  'user-operation-added': [metadata: UserOperationMetadata];\n  'user-operation-confirmed': [metadata: UserOperationMetadata];\n  'user-operation-failed': [metadata: UserOperationMetadata, error: Error];\n  [key: `${string}:confirmed`]: [metadata: UserOperationMetadata];\n  [key: `${string}:failed`]: [metadata: UserOperationMetadata, error: Error];\n};\n\nexport type UserOperationControllerEventEmitter = EventEmitter & {\n  on<T extends keyof Events>(\n    eventName: T,\n    listener: (...args: Events[T]) => void,\n  ): UserOperationControllerEventEmitter;\n\n  once<T extends keyof Events>(\n    eventName: T,\n    listener: (...args: Events[T]) => void,\n  ): UserOperationControllerEventEmitter;\n\n  emit<T extends keyof Events>(eventName: T, ...args: Events[T]): boolean;\n};\n\nexport type UserOperationControllerState = {\n  userOperations: Record<string, UserOperationMetadata>;\n};\n\nexport type GetUserOperationState = ControllerGetStateAction<\n  typeof controllerName,\n  UserOperationControllerState\n>;\n\nexport type UserOperationStateChange = ControllerStateChangeEvent<\n  typeof controllerName,\n  UserOperationControllerState\n>;\n\nexport type UserOperationControllerActions =\n  | GetUserOperationState\n  | UserOperationControllerMethodActions\n  | NetworkControllerGetNetworkClientByIdAction\n  | ApprovalControllerAddRequestAction\n  | KeyringControllerPrepareUserOperationAction\n  | KeyringControllerPatchUserOperationAction\n  | KeyringControllerSignUserOperationAction;\n\nexport type UserOperationControllerEvents = UserOperationStateChange;\n\nexport type UserOperationControllerMessenger = Messenger<\n  typeof controllerName,\n  UserOperationControllerActions,\n  UserOperationControllerEvents\n>;\n\nexport type UserOperationControllerOptions = {\n  entrypoint: string;\n  getGasFeeEstimates: () => Promise<GasFeeState>;\n  interval?: number;\n  messenger: UserOperationControllerMessenger;\n  state?: Partial<UserOperationControllerState>;\n};\n\nexport type AddUserOperationRequest = {\n  data?: string;\n  from: string;\n  maxFeePerGas?: string;\n  maxPriorityFeePerGas?: string;\n  to?: string;\n  value?: string;\n};\n\nexport type AddUserOperationSwapOptions = {\n  approvalTxId?: string;\n  destinationTokenAddress?: string;\n  destinationTokenAmount?: string;\n  destinationTokenDecimals?: number;\n  destinationTokenSymbol?: string;\n  estimatedBaseFee?: string;\n  sourceTokenAddress?: string;\n  sourceTokenAmount?: string;\n  sourceTokenDecimals?: number;\n  sourceTokenSymbol?: string;\n  swapAndSendRecipient?: string;\n  swapMetaData?: Record<string, unknown>;\n  swapTokenValue?: string;\n};\n\nexport type AddUserOperationOptions = {\n  networkClientId: string;\n  origin: string;\n  requireApproval?: boolean;\n  smartContractAccount?: SmartContractAccount;\n  swaps?: AddUserOperationSwapOptions;\n  type?: TransactionType;\n};\n\nexport type AddUserOperationResponse = {\n  id: string;\n  hash: () => Promise<string | undefined>;\n  transactionHash: () => Promise<string | undefined>;\n};\n\n/**\n * All the objects related to a pending user operation in order to:\n * - Avoid duplicated effort to derive the same properties.\n * - Minimise duplicate arguments in private methods.\n */\ntype UserOperationCache = {\n  chainId: string;\n  metadata: UserOperationMetadata;\n  options: AddUserOperationOptions & {\n    smartContractAccount: SmartContractAccount;\n  };\n  provider: Provider;\n  request: AddUserOperationRequest;\n  transaction?: TransactionParams;\n};\n\n/**\n * Controller for creating and managing the life cycle of user operations.\n */\nexport class UserOperationController extends BaseController<\n  typeof controllerName,\n  UserOperationControllerState,\n  UserOperationControllerMessenger\n> {\n  hub: UserOperationControllerEventEmitter;\n\n  readonly #entrypoint: string;\n\n  readonly #getGasFeeEstimates: () => Promise<GasFeeState>;\n\n  readonly #pendingUserOperationTracker: PendingUserOperationTracker;\n\n  /**\n   * Construct a UserOperationController instance.\n   *\n   * @param options - Controller options.\n   * @param options.entrypoint - Address of the entrypoint contract.\n   * @param options.getGasFeeEstimates - Callback to get gas fee estimates.\n   * @param options.messenger - Restricted messenger for the user operation controller.\n   * @param options.state - Initial state to set on the controller.\n   */\n  constructor({\n    entrypoint,\n    getGasFeeEstimates,\n    messenger,\n    state,\n  }: UserOperationControllerOptions) {\n    super({\n      name: controllerName,\n      metadata: stateMetadata,\n      messenger,\n      state: { ...getDefaultState(), ...state },\n    });\n\n    this.hub = new EventEmitter() as UserOperationControllerEventEmitter;\n\n    this.messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n\n    this.#entrypoint = entrypoint;\n    this.#getGasFeeEstimates = getGasFeeEstimates;\n\n    this.#pendingUserOperationTracker = new PendingUserOperationTracker({\n      getUserOperations: () =>\n        cloneDeep(Object.values(this.state.userOperations)),\n      messenger,\n    });\n\n    this.#addPendingUserOperationTrackerListeners();\n  }\n\n  /**\n   * Create and submit a user operation.\n   *\n   * @param request - Information required to create a user operation.\n   * @param request.data - Data to include in the resulting transaction.\n   * @param request.maxFeePerGas - Maximum fee per gas to pay towards the transaction.\n   * @param request.maxPriorityFeePerGas - Maximum priority fee per gas to pay towards the transaction.\n   * @param request.to - Destination address of the resulting transaction.\n   * @param request.value - Value to include in the resulting transaction.\n   * @param options - Configuration options when creating a user operation.\n   * @param options.networkClientId - ID of the network client used to query the chain.\n   * @param options.origin - Origin of the user operation, such as the hostname of a dApp.\n   * @param options.requireApproval - Whether to require user approval before submitting the user operation. Defaults to true.\n   * @param options.smartContractAccount - Smart contract abstraction to provide the contract specific values such as call data and nonce. Defaults to the current snap account.\n   * @param options.swaps - Swap metadata to record with the user operation.\n   * @param options.type - Type of the transaction.\n   */\n  async addUserOperation(\n    request: AddUserOperationRequest,\n    options: AddUserOperationOptions,\n  ): Promise<AddUserOperationResponse> {\n    validateAddUserOperationRequest(request);\n    validateAddUserOperationOptions(options);\n\n    return await this.#addUserOperation(request, options);\n  }\n\n  /**\n   * Create and submit a user operation equivalent to the provided transaction.\n   *\n   * @param transaction - Transaction to use as the basis for the user operation.\n   * @param options - Configuration options when creating a user operation.\n   * @param options.networkClientId - ID of the network client used to query the chain.\n   * @param options.origin - Origin of the user operation, such as the hostname of a dApp.\n   * @param options.requireApproval - Whether to require user approval before submitting the user operation. Defaults to true.\n   * @param options.smartContractAccount - Smart contract abstraction to provide the contract specific values such as call data and nonce. Defaults to the current snap account.\n   * @param options.swaps - Swap metadata to record with the user operation.\n   * @param options.type - Type of the transaction.\n   */\n  async addUserOperationFromTransaction(\n    transaction: TransactionParams,\n    options: AddUserOperationOptions,\n  ): Promise<AddUserOperationResponse> {\n    validateAddUserOperationOptions(options);\n\n    const { data, from, maxFeePerGas, maxPriorityFeePerGas, to, value } =\n      transaction;\n\n    const request: AddUserOperationRequest = {\n      data: data === '' ? undefined : data,\n      from,\n      maxFeePerGas,\n      maxPriorityFeePerGas,\n      to,\n      value,\n    };\n\n    validateAddUserOperationRequest(request);\n\n    return await this.#addUserOperation(request, { ...options, transaction });\n  }\n\n  /**\n   * Starts polling for pending user operations on the given network.\n   *\n   * @param networkClientId - The ID of the network client to poll.\n   * @returns The polling token that can be used to stop polling.\n   */\n  startPollingByNetworkClientId(networkClientId: string): string {\n    return this.#pendingUserOperationTracker.startPolling({\n      networkClientId,\n    });\n  }\n\n  async #addUserOperation(\n    request: AddUserOperationRequest,\n    options: AddUserOperationOptions & { transaction?: TransactionParams },\n  ): Promise<AddUserOperationResponse> {\n    log('Adding user operation', { request, options });\n\n    const {\n      networkClientId,\n      origin,\n      smartContractAccount: requestSmartContractAccount,\n      swaps,\n      transaction,\n    } = options;\n\n    const { chainId, provider } = await this.#getProvider(networkClientId);\n\n    const metadata = await this.#createMetadata(\n      chainId,\n      origin,\n      transaction,\n      swaps,\n    );\n\n    const smartContractAccount =\n      requestSmartContractAccount ??\n      new SnapSmartContractAccount(this.messenger);\n\n    const cache: UserOperationCache = {\n      chainId,\n      metadata,\n      options: { ...options, smartContractAccount },\n      provider,\n      request,\n      transaction,\n    };\n\n    const { id } = metadata;\n    let throwError = false;\n\n    const hashValue = (async () => {\n      try {\n        return await this.#prepareAndSubmitUserOperation(cache);\n      } catch (error) {\n        this.#failUserOperation(metadata, error);\n\n        if (throwError) {\n          throw error;\n        }\n\n        return undefined;\n      }\n    })();\n\n    const hash = async () => {\n      throwError = true;\n      return await hashValue;\n    };\n\n    const transactionHash = async () => {\n      await hash();\n\n      const { transactionHash: finalTransactionHash } =\n        await this.#waitForConfirmation(metadata);\n\n      return finalTransactionHash as string;\n    };\n\n    return {\n      id,\n      hash,\n      transactionHash,\n    };\n  }\n\n  async #prepareAndSubmitUserOperation(cache: UserOperationCache) {\n    const { metadata, options } = cache;\n    const { requireApproval, smartContractAccount } = options;\n    let resultCallbacks: AcceptResultCallbacks | undefined;\n\n    try {\n      await this.#prepareUserOperation(cache);\n      await this.#addPaymasterData(metadata, smartContractAccount);\n\n      this.hub.emit('user-operation-added', metadata);\n\n      if (requireApproval !== false) {\n        resultCallbacks = await this.#approveUserOperation(cache);\n      }\n\n      await this.#signUserOperation(metadata, smartContractAccount);\n      await this.#submitUserOperation(metadata);\n\n      resultCallbacks?.success();\n\n      return metadata.hash as string;\n    } catch (error) {\n      /* istanbul ignore next */\n      resultCallbacks?.error(error as Error);\n      throw error;\n    }\n  }\n\n  async #waitForConfirmation(\n    metadata: UserOperationMetadata,\n  ): Promise<UserOperationMetadata> {\n    const { id, hash } = metadata;\n\n    log('Waiting for confirmation', id, hash);\n\n    return new Promise((resolve, reject) => {\n      this.hub.once(`${id}:confirmed`, (finalMetadata) => {\n        resolve(finalMetadata);\n      });\n\n      this.hub.once(`${id}:failed`, (_finalMetadata, error) => {\n        reject(error);\n      });\n    });\n  }\n\n  async #createMetadata(\n    chainId: string,\n    origin: string,\n    transaction?: TransactionParams,\n    swaps?: AddUserOperationSwapOptions,\n  ): Promise<UserOperationMetadata> {\n    const metadata: UserOperationMetadata = {\n      actualGasCost: null,\n      actualGasUsed: null,\n      baseFeePerGas: null,\n      bundlerUrl: null,\n      chainId,\n      error: null,\n      hash: null,\n      id: random(),\n      origin,\n      status: UserOperationStatus.Unapproved,\n      swapsMetadata: swaps\n        ? {\n            approvalTxId: swaps.approvalTxId ?? null,\n            destinationTokenAddress: swaps.destinationTokenAddress ?? null,\n            destinationTokenAmount: swaps.destinationTokenAmount ?? null,\n            destinationTokenDecimals: swaps.destinationTokenDecimals ?? null,\n            destinationTokenSymbol: swaps.destinationTokenSymbol ?? null,\n            estimatedBaseFee: swaps.estimatedBaseFee ?? null,\n            sourceTokenAddress: swaps.sourceTokenAddress ?? null,\n            sourceTokenAmount: swaps.sourceTokenAmount ?? null,\n            sourceTokenDecimals: swaps.sourceTokenDecimals ?? null,\n            sourceTokenSymbol: swaps.sourceTokenSymbol ?? null,\n            swapAndSendRecipient: swaps.swapAndSendRecipient ?? null,\n            swapMetaData: (swaps.swapMetaData as Record<string, never>) ?? null,\n            swapTokenValue: swaps.swapTokenValue ?? null,\n          }\n        : null,\n      time: Date.now(),\n      transactionHash: null,\n      transactionParams: (transaction as Required<TransactionParams>) ?? null,\n      transactionType: null,\n      userFeeLevel: null,\n      userOperation: this.#createEmptyUserOperation(transaction),\n    };\n\n    this.#updateMetadata(metadata);\n\n    log('Added user operation', metadata.id);\n\n    return metadata;\n  }\n\n  async #prepareUserOperation(cache: UserOperationCache) {\n    const { chainId, metadata, options, provider, request, transaction } =\n      cache;\n\n    const { data, from, to, value } = request;\n    const { id, transactionParams, userOperation } = metadata;\n    const { smartContractAccount } = options;\n\n    log('Preparing user operation', { id });\n\n    const transactionType = await this.#getTransactionType(\n      transaction,\n      options,\n    );\n\n    metadata.transactionType = transactionType ?? null;\n\n    log('Determined transaction type', transactionType);\n\n    await updateGasFees({\n      getGasFeeEstimates: this.#getGasFeeEstimates,\n      metadata,\n      originalRequest: request,\n      provider,\n      transaction: transactionParams ?? undefined,\n    });\n\n    const response = await smartContractAccount.prepareUserOperation({\n      chainId,\n      data,\n      from,\n      to,\n      value,\n    });\n\n    validatePrepareUserOperationResponse(response);\n\n    const {\n      bundler: bundlerUrl,\n      callData,\n      dummyPaymasterAndData,\n      dummySignature,\n      initCode,\n      nonce,\n      sender,\n    } = response;\n\n    userOperation.callData = callData;\n    userOperation.initCode = initCode ?? EMPTY_BYTES;\n    userOperation.nonce = nonce;\n    userOperation.paymasterAndData = dummyPaymasterAndData ?? EMPTY_BYTES;\n    userOperation.sender = sender;\n    userOperation.signature = dummySignature ?? EMPTY_BYTES;\n\n    metadata.bundlerUrl = bundlerUrl;\n\n    await updateGas(metadata, response, this.#entrypoint);\n\n    this.#updateMetadata(metadata);\n  }\n\n  async #addPaymasterData(\n    metadata: UserOperationMetadata,\n    smartContractAccount: SmartContractAccount,\n  ) {\n    const { id, userOperation, chainId } = metadata;\n\n    log('Requesting paymaster data', { id });\n\n    const response = await smartContractAccount.updateUserOperation({\n      userOperation,\n      chainId,\n    });\n\n    validateUpdateUserOperationResponse(response);\n\n    userOperation.paymasterAndData = response.paymasterAndData ?? EMPTY_BYTES;\n    if (response.callGasLimit) {\n      userOperation.callGasLimit = response.callGasLimit;\n    }\n    if (response.preVerificationGas) {\n      userOperation.preVerificationGas = response.preVerificationGas;\n    }\n    if (response.verificationGasLimit) {\n      userOperation.verificationGasLimit = response.verificationGasLimit;\n    }\n\n    this.#updateMetadata(metadata);\n  }\n\n  async #approveUserOperation(cache: UserOperationCache) {\n    log('Requesting approval');\n\n    const { metadata } = cache;\n\n    const { resultCallbacks, value } = await this.#requestApproval(metadata);\n    const updatedTransaction = value?.txMeta;\n\n    if (updatedTransaction) {\n      await this.#updateUserOperationAfterApproval(cache, updatedTransaction);\n    }\n\n    metadata.status = UserOperationStatus.Approved;\n\n    this.#updateMetadata(metadata);\n\n    return resultCallbacks;\n  }\n\n  async #signUserOperation(\n    metadata: UserOperationMetadata,\n    smartContractAccount: SmartContractAccount,\n  ) {\n    const { id, chainId, userOperation } = metadata;\n\n    log('Signing user operation', id, userOperation);\n\n    const response = await smartContractAccount.signUserOperation({\n      userOperation,\n      chainId,\n    });\n\n    validateSignUserOperationResponse(response);\n\n    const { signature } = response;\n\n    userOperation.signature = signature;\n\n    log('Signed user operation', signature);\n\n    metadata.status = UserOperationStatus.Signed;\n\n    this.#updateMetadata(metadata);\n  }\n\n  async #submitUserOperation(metadata: UserOperationMetadata) {\n    const { userOperation } = metadata;\n\n    log('Submitting user operation', userOperation);\n\n    const bundler = new Bundler(metadata.bundlerUrl as string);\n\n    const hash = await bundler.sendUserOperation(\n      userOperation,\n      this.#entrypoint,\n    );\n\n    metadata.hash = hash;\n    metadata.status = UserOperationStatus.Submitted;\n\n    this.#updateMetadata(metadata);\n  }\n\n  #failUserOperation(metadata: UserOperationMetadata, error: unknown) {\n    const { id } = metadata;\n    const rawError = error as Record<string, string>;\n\n    log('User operation failed', id, error);\n\n    metadata.error = {\n      name: rawError.name,\n      message: rawError.message,\n      stack: rawError.stack,\n      code: rawError.code,\n      rpc: rawError.value,\n    };\n\n    metadata.status = UserOperationStatus.Failed;\n\n    this.#updateMetadata(metadata);\n\n    if (\n      String(rawError.code) === String(errorCodes.provider.userRejectedRequest)\n    ) {\n      this.#deleteMetadata(id);\n    }\n  }\n\n  #createEmptyUserOperation(transaction?: TransactionParams): UserOperation {\n    return {\n      callData: EMPTY_BYTES,\n      callGasLimit: EMPTY_BYTES,\n      initCode: EMPTY_BYTES,\n      maxFeePerGas: transaction?.maxFeePerGas ?? EMPTY_BYTES,\n      maxPriorityFeePerGas: transaction?.maxPriorityFeePerGas ?? EMPTY_BYTES,\n      nonce: EMPTY_BYTES,\n      paymasterAndData: EMPTY_BYTES,\n      preVerificationGas: EMPTY_BYTES,\n      sender: ADDRESS_ZERO,\n      signature: EMPTY_BYTES,\n      verificationGasLimit: EMPTY_BYTES,\n    };\n  }\n\n  #updateMetadata(metadata: UserOperationMetadata) {\n    const { id } = metadata;\n\n    this.update((state) => {\n      state.userOperations[id] = cloneDeep(metadata);\n    });\n\n    this.#updateTransaction(metadata);\n  }\n\n  #deleteMetadata(id: string) {\n    this.update((state) => {\n      delete state.userOperations[id];\n    });\n  }\n\n  #updateTransaction(metadata: UserOperationMetadata) {\n    if (!metadata.transactionParams) {\n      return;\n    }\n\n    const transactionMetadata = getTransactionMetadata(metadata);\n\n    this.hub.emit('transaction-updated', transactionMetadata);\n  }\n\n  #addPendingUserOperationTrackerListeners() {\n    this.#pendingUserOperationTracker.hub.on(\n      'user-operation-confirmed',\n      (metadata) => {\n        log('In listener...');\n        this.hub.emit('user-operation-confirmed', metadata);\n        this.hub.emit(`${metadata.id}:confirmed`, metadata);\n      },\n    );\n\n    this.#pendingUserOperationTracker.hub.on(\n      'user-operation-failed',\n      (metadata, error) => {\n        this.hub.emit('user-operation-failed', metadata, error);\n        this.hub.emit(`${metadata.id}:failed`, metadata, error);\n      },\n    );\n\n    this.#pendingUserOperationTracker.hub.on(\n      'user-operation-updated',\n      (metadata) => {\n        this.#updateMetadata(metadata);\n      },\n    );\n  }\n\n  async #requestApproval(metadata: UserOperationMetadata) {\n    const { id, origin } = metadata;\n    const type = ApprovalType.Transaction;\n    const requestData = { txId: id };\n\n    return (await this.messenger.call(\n      'ApprovalController:addRequest',\n      {\n        id,\n        origin,\n        type,\n        requestData,\n        expectsResult: true,\n      },\n      true, // Should display approval request to user\n    )) as AddResult & { value?: { txMeta?: TransactionMeta } };\n  }\n\n  async #getTransactionType(\n    transaction: TransactionParams | undefined,\n    options: AddUserOperationOptions,\n  ): Promise<TransactionType | undefined> {\n    if (!transaction) {\n      return undefined;\n    }\n\n    if (options.type) {\n      return options.type;\n    }\n\n    return TransactionType.contractInteraction;\n  }\n\n  async #getProvider(\n    networkClientId: string,\n  ): Promise<{ provider: Provider; chainId: string }> {\n    const { provider, configuration } = this.messenger.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n\n    const { chainId } = configuration;\n\n    return { provider, chainId };\n  }\n\n  async #updateUserOperationAfterApproval(\n    cache: UserOperationCache,\n    updatedTransaction: TransactionMeta,\n  ) {\n    log('Found updated transaction in approval', { updatedTransaction });\n\n    const { metadata, request } = cache;\n\n    const { userOperation } = metadata;\n    const usingPaymaster = userOperation.paymasterAndData !== EMPTY_BYTES;\n\n    const updatedMaxFeePerGas = add0x(\n      updatedTransaction.txParams.maxFeePerGas as string,\n    );\n\n    const updatedMaxPriorityFeePerGas = add0x(\n      updatedTransaction.txParams.maxPriorityFeePerGas as string,\n    );\n\n    let regenerateUserOperation = false;\n    const previousMaxFeePerGas = userOperation.maxFeePerGas;\n    const previousMaxPriorityFeePerGas = userOperation.maxPriorityFeePerGas;\n\n    const gasFeesUpdated =\n      previousMaxFeePerGas !== updatedMaxFeePerGas ||\n      previousMaxPriorityFeePerGas !== updatedMaxPriorityFeePerGas;\n\n    /**\n     * true when we detect {@link getTransactionMetadata} has set the gas fees to zero\n     * because the userOperation has a paymaster. This should not be mistaken for gas\n     * fees being updated during the approval process.\n     */\n    const areGasFeesZeroBecauseOfPaymaster =\n      usingPaymaster &&\n      updatedMaxFeePerGas === VALUE_ZERO &&\n      updatedMaxPriorityFeePerGas === VALUE_ZERO;\n\n    if (gasFeesUpdated && !areGasFeesZeroBecauseOfPaymaster) {\n      log('Gas fees updated during approval', {\n        previousMaxFeePerGas,\n        previousMaxPriorityFeePerGas,\n        updatedMaxFeePerGas,\n        updatedMaxPriorityFeePerGas,\n      });\n\n      userOperation.maxFeePerGas = updatedMaxFeePerGas;\n      userOperation.maxPriorityFeePerGas = updatedMaxPriorityFeePerGas;\n\n      regenerateUserOperation = usingPaymaster;\n    }\n\n    const previousData = request.data ?? EMPTY_BYTES;\n    const updatedData = updatedTransaction.txParams.data ?? EMPTY_BYTES;\n\n    if (previousData !== updatedData) {\n      log('Data updated during approval', { previousData, updatedData });\n      regenerateUserOperation = true;\n    }\n\n    const previousValue = request.value ?? VALUE_ZERO;\n    const updatedValue = updatedTransaction.txParams.value ?? VALUE_ZERO;\n\n    if (previousValue !== updatedValue) {\n      log('Value updated during approval', { previousValue, updatedValue });\n      regenerateUserOperation = true;\n    }\n\n    if (regenerateUserOperation) {\n      const updatedRequest = {\n        ...request,\n        data: updatedData,\n        maxFeePerGas: updatedMaxFeePerGas,\n        maxPriorityFeePerGas: updatedMaxPriorityFeePerGas,\n        value: updatedValue,\n      };\n\n      await this.#regenerateUserOperation({\n        ...cache,\n        request: updatedRequest,\n      });\n    }\n  }\n\n  async #regenerateUserOperation(cache: UserOperationCache) {\n    log(\n      'Regenerating user operation as parameters were updated during approval',\n    );\n\n    const {\n      options: { smartContractAccount },\n      metadata,\n    } = cache;\n\n    await this.#prepareUserOperation(cache);\n    await this.#addPaymasterData(metadata, smartContractAccount);\n\n    log('Regenerated user operation', metadata.userOperation);\n  }\n}\n"]}

package/dist/{constants.d.cts → constants.d.ts}

@@ -1,4 +1,4 @@
 export declare const EMPTY_BYTES = "0x";
 export declare const ADDRESS_ZERO = "0x0000000000000000000000000000000000000000";
 export declare const VALUE_ZERO = "0x0";
-//# sourceMappingURL=constants.d.cts.map
+//# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,OAAO,CAAC;AAChC,eAAO,MAAM,YAAY,+CAA+C,CAAC;AACzE,eAAO,MAAM,UAAU,QAAQ,CAAC"}

package/dist/{constants.mjs → constants.js}

@@ -1,4 +1,4 @@
 export const EMPTY_BYTES = '0x';
 export const ADDRESS_ZERO = '0x0000000000000000000000000000000000000000';
 export const VALUE_ZERO = '0x0';
-//# sourceMappingURL=constants.mjs.map
+//# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC;AAChC,MAAM,CAAC,MAAM,YAAY,GAAG,4CAA4C,CAAC;AACzE,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAC","sourcesContent":["export const EMPTY_BYTES = '0x';\nexport const ADDRESS_ZERO = '0x0000000000000000000000000000000000000000';\nexport const VALUE_ZERO = '0x0';\n"]}

package/dist/helpers/{Bundler.d.cts → Bundler.d.ts}

@@ -1,4 +1,4 @@
-import type { UserOperation, UserOperationReceipt } from "../types.cjs";
+import type { UserOperation, UserOperationReceipt } from '../types.js';
 /**
  * Response from the `eth_estimateUserOperationGas` bundler method.
  * Includes the estimated gas limits required by a user operation.
@@ -43,4 +43,4 @@ export declare class Bundler {
      */
     sendUserOperation(userOperation: UserOperation, entrypoint: string): Promise<string>;
 }
-//# sourceMappingURL=Bundler.d.cts.map
+//# sourceMappingURL=Bundler.d.ts.map

package/dist/helpers/Bundler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Bundler.d.ts","sourceRoot":"","sources":["../../src/helpers/Bundler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAIvE;;;GAGG;AACH,MAAM,MAAM,uCAAuC,GAAG;IACpD,iFAAiF;IACjF,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,2DAA2D;IAC3D,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAElC,2DAA2D;IAC3D,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvC,sEAAsE;IACtE,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/B,CAAC;AAEF;;GAEG;AACH,qBAAa,OAAO;;IAGlB,YAAY,GAAG,EAAE,MAAM,EAEtB;IAED;;;;;;OAMG;IACG,wBAAwB,CAC5B,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,uCAAuC,CAAC,CAWlD;IAED;;;;;OAKG;IACG,uBAAuB,CAC3B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAO3C;IAED;;;;;;OAMG;IACG,iBAAiB,CACrB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAejB;CA0BF"}

package/dist/helpers/{Bundler.mjs → Bundler.js}

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _Bundler_instances, _Bundler_url, _Bundler_query;
-import { createModuleLogger, projectLogger } from "../logger.mjs";
+import { createModuleLogger, projectLogger } from '../logger.js';
 const log = createModuleLogger(projectLogger, 'bundler');
 /**
  * A helper class for interacting with a bundler.
@@ -84,4 +84,4 @@ _Bundler_url = new WeakMap(), _Bundler_instances = new WeakSet(), _Bundler_query
     }
     return responseJson.result;
 };
-//# sourceMappingURL=Bundler.mjs.map
+//# sourceMappingURL=Bundler.js.map

package/dist/helpers/Bundler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Bundler.js","sourceRoot":"","sources":["../../src/helpers/Bundler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGjE,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;AAoBzD;;GAEG;AACH,MAAM,OAAO,OAAO;IAGlB,YAAY,GAAW;;QAFd,+BAAa;QAGpB,uBAAA,IAAI,gBAAQ,GAAG,MAAA,CAAC;IAClB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,wBAAwB,CAC5B,aAA4B,EAC5B,UAAkB;QAElB,GAAG,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,uBAAA,IAAI,oBAAK,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;QAErE,MAAM,QAAQ,GAA4C,MAAM,uBAAA,IAAI,0CAAO,MAAX,IAAI,EAClE,8BAA8B,EAC9B,CAAC,aAAa,EAAE,UAAU,CAAC,CAC5B,CAAC;QAEF,GAAG,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEnC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,uBAAuB,CAC3B,IAAa;QAEb,GAAG,CAAC,gCAAgC,EAAE,EAAE,GAAG,EAAE,uBAAA,IAAI,oBAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhE,OAAO,MAAM,uBAAA,IAAI,0CAAO,MAAX,IAAI,EACf,6BAA6B,EAC7B,CAAC,IAAI,CAAC,CACP,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,iBAAiB,CACrB,aAA4B,EAC5B,UAAkB;QAElB,GAAG,CAAC,wBAAwB,EAAE;YAC5B,GAAG,EAAE,uBAAA,IAAI,oBAAK;YACd,aAAa;YACb,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,IAAI,GAAW,MAAM,uBAAA,IAAI,0CAAO,MAAX,IAAI,EAAQ,uBAAuB,EAAE;YAC9D,aAAa;YACb,UAAU;SACX,CAAC,CAAC;QAEH,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC;IACd,CAAC;CA0BF;mFAxBC,KAAK,yBAAW,MAAc,EAAE,MAAiB;IAC/C,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB;YAC1B,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;KAChE,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,uBAAA,IAAI,oBAAK,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAE3C,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;QAEzE,KAA2C,CAAC,IAAI;YAC/C,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;QAE1B,MAAM,KAAK,CAAC;IACd,CAAC;IAED,OAAO,YAAY,CAAC,MAAM,CAAC;AAC7B,CAAC","sourcesContent":["import { createModuleLogger, projectLogger } from '../logger.js';\nimport type { UserOperation, UserOperationReceipt } from '../types.js';\n\nconst log = createModuleLogger(projectLogger, 'bundler');\n\n/**\n * Response from the `eth_estimateUserOperationGas` bundler method.\n * Includes the estimated gas limits required by a user operation.\n */\nexport type BundlerEstimateUserOperationGasResponse = {\n  /** Estimated gas required to compensate the bundler for any pre-verification. */\n  preVerificationGas: number | string;\n\n  /** Estimated gas required to verify the user operation. */\n  verificationGas?: number | string;\n\n  /** Estimated gas required to verify the user operation. */\n  verificationGasLimit?: number | string;\n\n  /** Estimated gas required for the execution of the user operation. */\n  callGasLimit: number | string;\n};\n\n/**\n * A helper class for interacting with a bundler.\n */\nexport class Bundler {\n  readonly #url: string;\n\n  constructor(url: string) {\n    this.#url = url;\n  }\n\n  /**\n   * Estimate the gas required to execute a user operation.\n   *\n   * @param userOperation - The user operation to estimate gas for.\n   * @param entrypoint - The address of entrypoint to use for the user operation.\n   * @returns The estimated gas limits for the user operation.\n   */\n  async estimateUserOperationGas(\n    userOperation: UserOperation,\n    entrypoint: string,\n  ): Promise<BundlerEstimateUserOperationGasResponse> {\n    log('Estimating gas', { url: this.#url, userOperation, entrypoint });\n\n    const response: BundlerEstimateUserOperationGasResponse = await this.#query(\n      'eth_estimateUserOperationGas',\n      [userOperation, entrypoint],\n    );\n\n    log('Estimated gas', { response });\n\n    return response;\n  }\n\n  /**\n   * Retrieve the receipt for a user operation.\n   *\n   * @param hash - The hash of the user operation.\n   * @returns The receipt for the user operation, or `undefined` if the user operation is pending.\n   */\n  async getUserOperationReceipt(\n    hash?: string,\n  ): Promise<UserOperationReceipt | undefined> {\n    log('Getting user operation receipt', { url: this.#url, hash });\n\n    return await this.#query<UserOperationReceipt | undefined>(\n      'eth_getUserOperationReceipt',\n      [hash],\n    );\n  }\n\n  /**\n   * Submit a user operation to the bundler.\n   *\n   * @param userOperation - The signed user operation to submit.\n   * @param entrypoint - The address of entrypoint to use for the user operation.\n   * @returns The hash of the user operation.\n   */\n  async sendUserOperation(\n    userOperation: UserOperation,\n    entrypoint: string,\n  ): Promise<string> {\n    log('Sending user operation', {\n      url: this.#url,\n      userOperation,\n      entrypoint,\n    });\n\n    const hash: string = await this.#query('eth_sendUserOperation', [\n      userOperation,\n      entrypoint,\n    ]);\n\n    log('Sent user operation', hash);\n\n    return hash;\n  }\n\n  async #query<T>(method: string, params: unknown[]): Promise<T> {\n    const request = {\n      method: 'POST',\n      headers: {\n        Accept: 'application/json',\n        'Content-Type': 'application/json',\n      },\n      body: JSON.stringify({ jsonrpc: '2.0', id: 1, method, params }),\n    };\n\n    const response = await fetch(this.#url, request);\n    const responseJson = await response.json();\n\n    if (responseJson.error) {\n      const error = new Error(responseJson.error.message || responseJson.error);\n\n      (error as unknown as Record<string, string>).code =\n        responseJson.error.code;\n\n      throw error;\n    }\n\n    return responseJson.result;\n  }\n}\n"]}

package/dist/helpers/{PendingUserOperationTracker.d.cts → PendingUserOperationTracker.d.ts}

@@ -1,9 +1,7 @@
-/// <reference types="node" />
-/// <reference types="npm-which/node_modules/@types/node/events.js" />
-import type { NetworkClient, NetworkClientId } from "@metamask/network-controller";
-import EventEmitter from "events";
-import type { UserOperationMetadata } from "../types.cjs";
-import type { UserOperationControllerMessenger } from "../UserOperationController.cjs";
+import type { NetworkClient, NetworkClientId } from '@metamask/network-controller';
+import EventEmitter from 'events';
+import type { UserOperationMetadata } from '../types.js';
+import type { UserOperationControllerMessenger } from '../UserOperationController.js';
 type Events = {
     'user-operation-confirmed': [metadata: UserOperationMetadata];
     'user-operation-failed': [txMeta: UserOperationMetadata, error: Error];
@@ -19,12 +17,12 @@ type PendingUserOperationPollingInput = {
     networkClientId: NetworkClientId;
 };
 declare const PendingUserOperationTracker_base: (abstract new (...args: any[]) => {
-    "__#21@#activeListeners": Record<string, (options: import("@metamask/utils").Json) => Promise<void>>;
-    _getNetworkClientById(networkClientId: string): NetworkClient | undefined;
+    _activeListeners: Record<string, (options: import("@metamask/utils").Json) => Promise<void>>;
+    _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
     _startPolling(input: PendingUserOperationPollingInput): void;
-    _stopPollingByPollingTokenSetId(key: string): void;
-    readonly "__#3@#pollingTokenSets": Map<string, Set<string>>;
-    readonly "__#3@#callbacks": Map<string, Set<(input: PendingUserOperationPollingInput) => void>>;
+    _stopPollingByPollingTokenSetId(key: import("@metamask/polling-controller").PollingTokenSetId): void;
+    readonly _pollingTokenSets: Map<import("@metamask/polling-controller").PollingTokenSetId, Set<string>>;
+    readonly _callbacks: Map<string, Set<(input: PendingUserOperationPollingInput) => void>>;
     _executePoll(input: PendingUserOperationPollingInput): Promise<void>;
     startPolling(input: PendingUserOperationPollingInput): string;
     stopAllPolling(): void;
@@ -48,4 +46,4 @@ export declare class PendingUserOperationTracker extends PendingUserOperationTra
     _getNetworkClientById(networkClientId: string): NetworkClient | undefined;
 }
 export {};
-//# sourceMappingURL=PendingUserOperationTracker.d.cts.map
+//# sourceMappingURL=PendingUserOperationTracker.d.ts.map

package/dist/helpers/PendingUserOperationTracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PendingUserOperationTracker.d.ts","sourceRoot":"","sources":["../../src/helpers/PendingUserOperationTracker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAKtC,OAAO,YAAY,MAAM,QAAQ,CAAC;AAIlC,OAAO,KAAK,EAAE,qBAAqB,EAAwB,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AAKtF,KAAK,MAAM,GAAG;IACZ,0BAA0B,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;IAC9D,uBAAuB,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACvE,wBAAwB,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,uCAAuC,GAAG,YAAY,GAAG;IACnE,EAAE,CAAC,CAAC,SAAS,MAAM,MAAM,EACvB,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,GACrC,uCAAuC,CAAC;IAE3C,IAAI,CAAC,CAAC,SAAS,MAAM,MAAM,EACzB,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,GACrC,uCAAuC,CAAC;IAE3C,IAAI,CAAC,CAAC,SAAS,MAAM,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACzE,CAAC;AAEF,6EAA6E;AAC7E,KAAK,gCAAgC,GAAG;IACtC,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;;;;;;;;;;;;;;;;AAEF;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,gCAAqE;;IACpH,GAAG,EAAE,uCAAuC,CAAC;IAM7C,YAAY,EACV,iBAAiB,EACjB,SAAS,GACV,EAAE;QACD,iBAAiB,EAAE,MAAM,qBAAqB,EAAE,CAAC;QACjD,SAAS,EAAE,gCAAgC,CAAC;KAC7C,EAOA;IAEK,YAAY,CAAC,EAAE,eAAe,EAAE,EAAE,gCAAgC,iBAevE;IAED,qBAAqB,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAKxE;CAkIF"}

package/dist/helpers/{PendingUserOperationTracker.mjs → PendingUserOperationTracker.js}

@@ -10,23 +10,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PendingUserOperationTracker_instances, _PendingUserOperationTracker_getUserOperations, _PendingUserOperationTracker_messenger, _PendingUserOperationTracker_checkUserOperations, _PendingUserOperationTracker_checkUserOperation, _PendingUserOperationTracker_onUserOperationConfirmed, _PendingUserOperationTracker_onUserOperationFailed, _PendingUserOperationTracker_getPendingUserOperations, _PendingUserOperationTracker_updateUserOperation, _PendingUserOperationTracker_getUserOperationReceipt, _PendingUserOperationTracker_normalizeGasValue;
-function $importDefault(module) {
-    if (module?.__esModule) {
-        return module.default;
-    }
-    return module;
-}
-import { query, toHex } from "@metamask/controller-utils";
-import $EthQuery from "@metamask/eth-query";
-const EthQuery = $importDefault($EthQuery);
-import { createModuleLogger } from "@metamask/utils";
+import { query, toHex } from '@metamask/controller-utils';
+import EthQuery from '@metamask/eth-query';
+import { createModuleLogger } from '@metamask/utils';
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
-import EventEmitter from "events";
-import { BlockTrackerPollingControllerOnly } from "../BlockTrackerPollingController.mjs";
-import { projectLogger } from "../logger.mjs";
-import { UserOperationStatus } from "../types.mjs";
-import { Bundler } from "./Bundler.mjs";
+import EventEmitter from 'events';
+import { BlockTrackerPollingControllerOnly } from '../BlockTrackerPollingController.js';
+import { projectLogger } from '../logger.js';
+import { UserOperationStatus } from '../types.js';
+import { Bundler } from './Bundler.js';
 const log = createModuleLogger(projectLogger, 'pending-user-operations');
 /**
  * A helper class to periodically query the bundlers
@@ -124,4 +117,4 @@ _PendingUserOperationTracker_getUserOperations = new WeakMap(), _PendingUserOper
     }
     return gasValue;
 };
-//# sourceMappingURL=PendingUserOperationTracker.mjs.map
+//# sourceMappingURL=PendingUserOperationTracker.js.map

package/dist/helpers/PendingUserOperationTracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PendingUserOperationTracker.js","sourceRoot":"","sources":["../../src/helpers/PendingUserOperationTracker.ts"],"names":[],"mappings":"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","sourcesContent":["import { query, toHex } from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClient,\n  NetworkClientId,\n  Provider,\n} from '@metamask/network-controller';\nimport { createModuleLogger } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n// This package purposefully relies on Node's EventEmitter module.\n// eslint-disable-next-line import-x/no-nodejs-modules\nimport EventEmitter from 'events';\n\nimport { BlockTrackerPollingControllerOnly } from '../BlockTrackerPollingController.js';\nimport { projectLogger } from '../logger.js';\nimport type { UserOperationMetadata, UserOperationReceipt } from '../types.js';\nimport { UserOperationStatus } from '../types.js';\nimport type { UserOperationControllerMessenger } from '../UserOperationController.js';\nimport { Bundler } from './Bundler.js';\n\nconst log = createModuleLogger(projectLogger, 'pending-user-operations');\n\ntype Events = {\n  'user-operation-confirmed': [metadata: UserOperationMetadata];\n  'user-operation-failed': [txMeta: UserOperationMetadata, error: Error];\n  'user-operation-updated': [txMeta: UserOperationMetadata];\n};\n\nexport type PendingUserOperationTrackerEventEmitter = EventEmitter & {\n  on<T extends keyof Events>(\n    eventName: T,\n    listener: (...args: Events[T]) => void,\n  ): PendingUserOperationTrackerEventEmitter;\n\n  once<T extends keyof Events>(\n    eventName: T,\n    listener: (...args: Events[T]) => void,\n  ): PendingUserOperationTrackerEventEmitter;\n\n  emit<T extends keyof Events>(eventName: T, ...args: Events[T]): boolean;\n};\n\n/** The input to start polling for the {@link PendingUserOperationTracker} */\ntype PendingUserOperationPollingInput = {\n  networkClientId: NetworkClientId;\n};\n\n/**\n * A helper class to periodically query the bundlers\n * and update the status of any submitted user operations.\n */\nexport class PendingUserOperationTracker extends BlockTrackerPollingControllerOnly<PendingUserOperationPollingInput>() {\n  hub: PendingUserOperationTrackerEventEmitter;\n\n  readonly #getUserOperations: () => UserOperationMetadata[];\n\n  readonly #messenger: UserOperationControllerMessenger;\n\n  constructor({\n    getUserOperations,\n    messenger,\n  }: {\n    getUserOperations: () => UserOperationMetadata[];\n    messenger: UserOperationControllerMessenger;\n  }) {\n    super();\n\n    this.hub = new EventEmitter() as PendingUserOperationTrackerEventEmitter;\n\n    this.#getUserOperations = getUserOperations;\n    this.#messenger = messenger;\n  }\n\n  async _executePoll({ networkClientId }: PendingUserOperationPollingInput) {\n    try {\n      const { blockTracker, configuration, provider } =\n        this._getNetworkClientById(networkClientId) as NetworkClient;\n\n      log('Polling', {\n        blockNumber: blockTracker.getCurrentBlock(),\n        chainId: configuration.chainId,\n      });\n\n      await this.#checkUserOperations(configuration.chainId, provider);\n    } catch (error) {\n      /* istanbul ignore next */\n      log('Failed to check user operations', error);\n    }\n  }\n\n  _getNetworkClientById(networkClientId: string): NetworkClient | undefined {\n    return this.#messenger.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n  }\n\n  async #checkUserOperations(chainId: string, provider: Provider) {\n    const pendingUserOperations = this.#getPendingUserOperations().filter(\n      (metadata) => metadata.chainId === chainId,\n    );\n\n    if (!pendingUserOperations.length) {\n      log('No pending user operations to check');\n      return;\n    }\n\n    log('Found pending user operations to check', {\n      count: pendingUserOperations.length,\n      ids: pendingUserOperations.map((userOperation) => userOperation.id),\n    });\n\n    await Promise.all(\n      pendingUserOperations.map((userOperation) =>\n        this.#checkUserOperation(userOperation, provider),\n      ),\n    );\n  }\n\n  async #checkUserOperation(\n    metadata: UserOperationMetadata,\n    provider: Provider,\n  ) {\n    const { bundlerUrl, hash, id } = metadata;\n\n    if (!hash || !bundlerUrl) {\n      log('Skipping user operation as missing hash or bundler', id);\n      return;\n    }\n\n    try {\n      const receipt = await this.#getUserOperationReceipt(hash, bundlerUrl);\n      const isSuccess = receipt?.success;\n\n      if (receipt && !isSuccess) {\n        this.#onUserOperationFailed(metadata, receipt);\n        return;\n      }\n\n      if (isSuccess) {\n        await this.#onUserOperationConfirmed(metadata, receipt, provider);\n        return;\n      }\n\n      log('No receipt found for user operation', { id, hash });\n    } catch (error) {\n      log('Failed to check user operation', id, error);\n    }\n  }\n\n  async #onUserOperationConfirmed(\n    metadata: UserOperationMetadata,\n    receipt: UserOperationReceipt,\n    provider: Provider,\n  ) {\n    const { id } = metadata;\n\n    const {\n      actualGasCost,\n      actualGasUsed,\n      receipt: { blockHash, transactionHash },\n    } = receipt;\n\n    log('User operation confirmed', id, transactionHash);\n\n    const { baseFeePerGas } = await query(\n      new EthQuery(provider),\n      'getBlockByHash',\n      [blockHash, false],\n    );\n\n    metadata.actualGasCost = this.#normalizeGasValue(actualGasCost);\n    metadata.actualGasUsed = this.#normalizeGasValue(actualGasUsed);\n    metadata.baseFeePerGas = baseFeePerGas;\n    metadata.status = UserOperationStatus.Confirmed;\n    metadata.transactionHash = transactionHash;\n\n    this.#updateUserOperation(metadata);\n\n    this.hub.emit('user-operation-confirmed', metadata);\n  }\n\n  #onUserOperationFailed(\n    metadata: UserOperationMetadata,\n    _receipt: UserOperationReceipt,\n  ) {\n    const { id } = metadata;\n\n    log('User operation failed', id);\n\n    metadata.status = UserOperationStatus.Failed;\n\n    this.#updateUserOperation(metadata);\n\n    this.hub.emit(\n      'user-operation-failed',\n      metadata,\n      new Error('User operation receipt has failed status'),\n    );\n  }\n\n  #getPendingUserOperations(): UserOperationMetadata[] {\n    return this.#getUserOperations().filter(\n      (userOperation) => userOperation.status === UserOperationStatus.Submitted,\n    );\n  }\n\n  #updateUserOperation(metadata: UserOperationMetadata) {\n    this.hub.emit('user-operation-updated', metadata);\n  }\n\n  async #getUserOperationReceipt(\n    hash: string,\n    bundlerUrl: string,\n  ): Promise<UserOperationReceipt | undefined> {\n    const bundler = new Bundler(bundlerUrl);\n    return bundler.getUserOperationReceipt(hash);\n  }\n\n  #normalizeGasValue(gasValue: Hex | number): string {\n    if (typeof gasValue === 'number') {\n      return toHex(gasValue);\n    }\n    return gasValue;\n  }\n}\n"]}