@metamask/snaps-controllers 2.0.0 → 2.0.1

package/dist/cjs/snaps/endowments/enum.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "SnapEndowments", {
 var SnapEndowments;
 (function(SnapEndowments) {
     SnapEndowments["NetworkAccess"] = 'endowment:network-access';
-    SnapEndowments["LongRunning"] = 'endowment:long-running';
     SnapEndowments["TransactionInsight"] = 'endowment:transaction-insight';
     SnapEndowments["Cronjob"] = 'endowment:cronjob';
     SnapEndowments["EthereumProvider"] = 'endowment:ethereum-provider';

package/dist/cjs/snaps/endowments/enum.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/snaps/endowments/enum.ts"],"sourcesContent":["export enum SnapEndowments {\n  NetworkAccess = 'endowment:network-access',\n  LongRunning = 'endowment:long-running',\n  TransactionInsight = 'endowment:transaction-insight',\n  Cronjob = 'endowment:cronjob',\n  EthereumProvider = 'endowment:ethereum-provider',\n  Rpc = 'endowment:rpc',\n  WebAssemblyAccess = 'endowment:webassembly',\n  NameLookup = 'endowment:name-lookup',\n  LifecycleHooks = 'endowment:lifecycle-hooks',\n}\n"],"names":["SnapEndowments","NetworkAccess","LongRunning","TransactionInsight","Cronjob","EthereumProvider","Rpc","WebAssemblyAccess","NameLookup","LifecycleHooks"],"mappings":";;;;;;;;;;IAAO;UAAKA,cAAc;IAAdA,eACVC,mBAAgB;IADND,eAEVE,iBAAc;IAFJF,eAGVG,wBAAqB;IAHXH,eAIVI,aAAU;IAJAJ,eAKVK,sBAAmB;IALTL,eAMVM,SAAM;IANIN,eAOVO,uBAAoB;IAPVP,eAQVQ,gBAAa;IARHR,eASVS,oBAAiB;GATPT,mBAAAA"}
+{"version":3,"sources":["../../../../src/snaps/endowments/enum.ts"],"sourcesContent":["export enum SnapEndowments {\n  NetworkAccess = 'endowment:network-access',\n  TransactionInsight = 'endowment:transaction-insight',\n  Cronjob = 'endowment:cronjob',\n  EthereumProvider = 'endowment:ethereum-provider',\n  Rpc = 'endowment:rpc',\n  WebAssemblyAccess = 'endowment:webassembly',\n  NameLookup = 'endowment:name-lookup',\n  LifecycleHooks = 'endowment:lifecycle-hooks',\n}\n"],"names":["SnapEndowments","NetworkAccess","TransactionInsight","Cronjob","EthereumProvider","Rpc","WebAssemblyAccess","NameLookup","LifecycleHooks"],"mappings":";;;;;;;;;;IAAO;UAAKA,cAAc;IAAdA,eACVC,mBAAgB;IADND,eAEVE,wBAAqB;IAFXF,eAGVG,aAAU;IAHAH,eAIVI,sBAAmB;IAJTJ,eAKVK,SAAM;IALIL,eAMVM,uBAAoB;IANVN,eAOVO,gBAAa;IAPHP,eAQVQ,oBAAiB;GARPR,mBAAAA"}

package/dist/cjs/snaps/endowments/index.js

@@ -35,7 +35,6 @@ const _snapsutils = require("@metamask/snaps-utils");
 const _cronjob = require("./cronjob");
 const _ethereumprovider = require("./ethereum-provider");
 const _lifecyclehooks = require("./lifecycle-hooks");
-const _longrunning = require("./long-running");
 const _namelookup = require("./name-lookup");
 const _networkaccess = require("./network-access");
 const _rpc = require("./rpc");
@@ -57,7 +56,6 @@ function _export_star(from, to) {
 }
 const endowmentPermissionBuilders = {
     [_networkaccess.networkAccessEndowmentBuilder.targetName]: _networkaccess.networkAccessEndowmentBuilder,
-    [_longrunning.longRunningEndowmentBuilder.targetName]: _longrunning.longRunningEndowmentBuilder,
     [_transactioninsight.transactionInsightEndowmentBuilder.targetName]: _transactioninsight.transactionInsightEndowmentBuilder,
     [_cronjob.cronjobEndowmentBuilder.targetName]: _cronjob.cronjobEndowmentBuilder,
     [_ethereumprovider.ethereumProviderEndowmentBuilder.targetName]: _ethereumprovider.ethereumProviderEndowmentBuilder,

package/dist/cjs/snaps/endowments/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/snaps/endowments/index.ts"],"sourcesContent":["import type { PermissionConstraint } from '@metamask/permission-controller';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  cronjobCaveatSpecifications,\n  cronjobEndowmentBuilder,\n  getCronjobCaveatMapper,\n} from './cronjob';\nimport { ethereumProviderEndowmentBuilder } from './ethereum-provider';\nimport { lifecycleHooksEndowmentBuilder } from './lifecycle-hooks';\nimport { longRunningEndowmentBuilder } from './long-running';\nimport {\n  getNameLookupCaveatMapper,\n  nameLookupCaveatSpecifications,\n  nameLookupEndowmentBuilder,\n} from './name-lookup';\nimport { networkAccessEndowmentBuilder } from './network-access';\nimport {\n  getRpcCaveatMapper,\n  rpcCaveatSpecifications,\n  rpcEndowmentBuilder,\n} from './rpc';\nimport {\n  getTransactionInsightCaveatMapper,\n  transactionInsightCaveatSpecifications,\n  transactionInsightEndowmentBuilder,\n} from './transaction-insight';\nimport { webAssemblyEndowmentBuilder } from './web-assembly';\n\nexport const endowmentPermissionBuilders = {\n  [networkAccessEndowmentBuilder.targetName]: networkAccessEndowmentBuilder,\n  [longRunningEndowmentBuilder.targetName]: longRunningEndowmentBuilder,\n  [transactionInsightEndowmentBuilder.targetName]:\n    transactionInsightEndowmentBuilder,\n  [cronjobEndowmentBuilder.targetName]: cronjobEndowmentBuilder,\n  [ethereumProviderEndowmentBuilder.targetName]:\n    ethereumProviderEndowmentBuilder,\n  [rpcEndowmentBuilder.targetName]: rpcEndowmentBuilder,\n  [webAssemblyEndowmentBuilder.targetName]: webAssemblyEndowmentBuilder,\n  [nameLookupEndowmentBuilder.targetName]: nameLookupEndowmentBuilder,\n  [lifecycleHooksEndowmentBuilder.targetName]: lifecycleHooksEndowmentBuilder,\n} as const;\n\nexport const endowmentCaveatSpecifications = {\n  ...cronjobCaveatSpecifications,\n  ...transactionInsightCaveatSpecifications,\n  ...rpcCaveatSpecifications,\n  ...nameLookupCaveatSpecifications,\n};\n\nexport const endowmentCaveatMappers: Record<\n  string,\n  (value: Json) => Pick<PermissionConstraint, 'caveats'>\n> = {\n  [cronjobEndowmentBuilder.targetName]: getCronjobCaveatMapper,\n  [transactionInsightEndowmentBuilder.targetName]:\n    getTransactionInsightCaveatMapper,\n  [rpcEndowmentBuilder.targetName]: getRpcCaveatMapper,\n  [nameLookupEndowmentBuilder.targetName]: getNameLookupCaveatMapper,\n};\n\nexport const handlerEndowments: Record<HandlerType, string> = {\n  [HandlerType.OnRpcRequest]: rpcEndowmentBuilder.targetName,\n  [HandlerType.OnTransaction]: transactionInsightEndowmentBuilder.targetName,\n  [HandlerType.OnCronjob]: cronjobEndowmentBuilder.targetName,\n  [HandlerType.OnNameLookup]: nameLookupEndowmentBuilder.targetName,\n  [HandlerType.OnInstall]: lifecycleHooksEndowmentBuilder.targetName,\n  [HandlerType.OnUpdate]: lifecycleHooksEndowmentBuilder.targetName,\n};\n\nexport * from './enum';\nexport { getRpcCaveatOrigins } from './rpc';\nexport { getTransactionOriginCaveat } from './transaction-insight';\nexport { getChainIdsCaveat } from './name-lookup';\n"],"names":["endowmentPermissionBuilders","endowmentCaveatSpecifications","endowmentCaveatMappers","handlerEndowments","getRpcCaveatOrigins","getTransactionOriginCaveat","getChainIdsCaveat","networkAccessEndowmentBuilder","targetName","longRunningEndowmentBuilder","transactionInsightEndowmentBuilder","cronjobEndowmentBuilder","ethereumProviderEndowmentBuilder","rpcEndowmentBuilder","webAssemblyEndowmentBuilder","nameLookupEndowmentBuilder","lifecycleHooksEndowmentBuilder","cronjobCaveatSpecifications","transactionInsightCaveatSpecifications","rpcCaveatSpecifications","nameLookupCaveatSpecifications","getCronjobCaveatMapper","getTransactionInsightCaveatMapper","getRpcCaveatMapper","getNameLookupCaveatMapper","HandlerType","OnRpcRequest","OnTransaction","OnCronjob","OnNameLookup","OnInstall","OnUpdate"],"mappings":";;;;;;;;;;;IA8BaA,2BAA2B;eAA3BA;;IAcAC,6BAA6B;eAA7BA;;IAOAC,sBAAsB;eAAtBA;;IAWAC,iBAAiB;eAAjBA;;IAUJC,mBAAmB;eAAnBA,wBAAmB;;IACnBC,0BAA0B;eAA1BA,8CAA0B;;IAC1BC,iBAAiB;eAAjBA,6BAAiB;;;4BAzEE;yBAOrB;kCAC0C;gCACF;6BACH;4BAKrC;+BACuC;qBAKvC;oCAKA;6BACqC;qBA2C9B;;;;;;;;;;;;;;AAzCP,MAAMN,8BAA8B;IACzC,CAACO,4CAA6B,CAACC,UAAU,CAAC,EAAED,4CAA6B;IACzE,CAACE,wCAA2B,CAACD,UAAU,CAAC,EAAEC,wCAA2B;IACrE,CAACC,sDAAkC,CAACF,UAAU,CAAC,EAC7CE,sDAAkC;IACpC,CAACC,gCAAuB,CAACH,UAAU,CAAC,EAAEG,gCAAuB;IAC7D,CAACC,kDAAgC,CAACJ,UAAU,CAAC,EAC3CI,kDAAgC;IAClC,CAACC,wBAAmB,CAACL,UAAU,CAAC,EAAEK,wBAAmB;IACrD,CAACC,wCAA2B,CAACN,UAAU,CAAC,EAAEM,wCAA2B;IACrE,CAACC,sCAA0B,CAACP,UAAU,CAAC,EAAEO,sCAA0B;IACnE,CAACC,8CAA8B,CAACR,UAAU,CAAC,EAAEQ,8CAA8B;AAC7E;AAEO,MAAMf,gCAAgC;IAC3C,GAAGgB,oCAA2B;IAC9B,GAAGC,0DAAsC;IACzC,GAAGC,4BAAuB;IAC1B,GAAGC,0CAA8B;AACnC;AAEO,MAAMlB,yBAGT;IACF,CAACS,gCAAuB,CAACH,UAAU,CAAC,EAAEa,+BAAsB;IAC5D,CAACX,sDAAkC,CAACF,UAAU,CAAC,EAC7Cc,qDAAiC;IACnC,CAACT,wBAAmB,CAACL,UAAU,CAAC,EAAEe,uBAAkB;IACpD,CAACR,sCAA0B,CAACP,UAAU,CAAC,EAAEgB,qCAAyB;AACpE;AAEO,MAAMrB,oBAAiD;IAC5D,CAACsB,uBAAW,CAACC,YAAY,CAAC,EAAEb,wBAAmB,CAACL,UAAU;IAC1D,CAACiB,uBAAW,CAACE,aAAa,CAAC,EAAEjB,sDAAkC,CAACF,UAAU;IAC1E,CAACiB,uBAAW,CAACG,SAAS,CAAC,EAAEjB,gCAAuB,CAACH,UAAU;IAC3D,CAACiB,uBAAW,CAACI,YAAY,CAAC,EAAEd,sCAA0B,CAACP,UAAU;IACjE,CAACiB,uBAAW,CAACK,SAAS,CAAC,EAAEd,8CAA8B,CAACR,UAAU;IAClE,CAACiB,uBAAW,CAACM,QAAQ,CAAC,EAAEf,8CAA8B,CAACR,UAAU;AACnE"}
+{"version":3,"sources":["../../../../src/snaps/endowments/index.ts"],"sourcesContent":["import type { PermissionConstraint } from '@metamask/permission-controller';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  cronjobCaveatSpecifications,\n  cronjobEndowmentBuilder,\n  getCronjobCaveatMapper,\n} from './cronjob';\nimport { ethereumProviderEndowmentBuilder } from './ethereum-provider';\nimport { lifecycleHooksEndowmentBuilder } from './lifecycle-hooks';\nimport {\n  getNameLookupCaveatMapper,\n  nameLookupCaveatSpecifications,\n  nameLookupEndowmentBuilder,\n} from './name-lookup';\nimport { networkAccessEndowmentBuilder } from './network-access';\nimport {\n  getRpcCaveatMapper,\n  rpcCaveatSpecifications,\n  rpcEndowmentBuilder,\n} from './rpc';\nimport {\n  getTransactionInsightCaveatMapper,\n  transactionInsightCaveatSpecifications,\n  transactionInsightEndowmentBuilder,\n} from './transaction-insight';\nimport { webAssemblyEndowmentBuilder } from './web-assembly';\n\nexport const endowmentPermissionBuilders = {\n  [networkAccessEndowmentBuilder.targetName]: networkAccessEndowmentBuilder,\n  [transactionInsightEndowmentBuilder.targetName]:\n    transactionInsightEndowmentBuilder,\n  [cronjobEndowmentBuilder.targetName]: cronjobEndowmentBuilder,\n  [ethereumProviderEndowmentBuilder.targetName]:\n    ethereumProviderEndowmentBuilder,\n  [rpcEndowmentBuilder.targetName]: rpcEndowmentBuilder,\n  [webAssemblyEndowmentBuilder.targetName]: webAssemblyEndowmentBuilder,\n  [nameLookupEndowmentBuilder.targetName]: nameLookupEndowmentBuilder,\n  [lifecycleHooksEndowmentBuilder.targetName]: lifecycleHooksEndowmentBuilder,\n} as const;\n\nexport const endowmentCaveatSpecifications = {\n  ...cronjobCaveatSpecifications,\n  ...transactionInsightCaveatSpecifications,\n  ...rpcCaveatSpecifications,\n  ...nameLookupCaveatSpecifications,\n};\n\nexport const endowmentCaveatMappers: Record<\n  string,\n  (value: Json) => Pick<PermissionConstraint, 'caveats'>\n> = {\n  [cronjobEndowmentBuilder.targetName]: getCronjobCaveatMapper,\n  [transactionInsightEndowmentBuilder.targetName]:\n    getTransactionInsightCaveatMapper,\n  [rpcEndowmentBuilder.targetName]: getRpcCaveatMapper,\n  [nameLookupEndowmentBuilder.targetName]: getNameLookupCaveatMapper,\n};\n\nexport const handlerEndowments: Record<HandlerType, string> = {\n  [HandlerType.OnRpcRequest]: rpcEndowmentBuilder.targetName,\n  [HandlerType.OnTransaction]: transactionInsightEndowmentBuilder.targetName,\n  [HandlerType.OnCronjob]: cronjobEndowmentBuilder.targetName,\n  [HandlerType.OnNameLookup]: nameLookupEndowmentBuilder.targetName,\n  [HandlerType.OnInstall]: lifecycleHooksEndowmentBuilder.targetName,\n  [HandlerType.OnUpdate]: lifecycleHooksEndowmentBuilder.targetName,\n};\n\nexport * from './enum';\nexport { getRpcCaveatOrigins } from './rpc';\nexport { getTransactionOriginCaveat } from './transaction-insight';\nexport { getChainIdsCaveat } from './name-lookup';\n"],"names":["endowmentPermissionBuilders","endowmentCaveatSpecifications","endowmentCaveatMappers","handlerEndowments","getRpcCaveatOrigins","getTransactionOriginCaveat","getChainIdsCaveat","networkAccessEndowmentBuilder","targetName","transactionInsightEndowmentBuilder","cronjobEndowmentBuilder","ethereumProviderEndowmentBuilder","rpcEndowmentBuilder","webAssemblyEndowmentBuilder","nameLookupEndowmentBuilder","lifecycleHooksEndowmentBuilder","cronjobCaveatSpecifications","transactionInsightCaveatSpecifications","rpcCaveatSpecifications","nameLookupCaveatSpecifications","getCronjobCaveatMapper","getTransactionInsightCaveatMapper","getRpcCaveatMapper","getNameLookupCaveatMapper","HandlerType","OnRpcRequest","OnTransaction","OnCronjob","OnNameLookup","OnInstall","OnUpdate"],"mappings":";;;;;;;;;;;IA6BaA,2BAA2B;eAA3BA;;IAaAC,6BAA6B;eAA7BA;;IAOAC,sBAAsB;eAAtBA;;IAWAC,iBAAiB;eAAjBA;;IAUJC,mBAAmB;eAAnBA,wBAAmB;;IACnBC,0BAA0B;eAA1BA,8CAA0B;;IAC1BC,iBAAiB;eAAjBA,6BAAiB;;;4BAvEE;yBAOrB;kCAC0C;gCACF;4BAKxC;+BACuC;qBAKvC;oCAKA;6BACqC;qBA0C9B;;;;;;;;;;;;;;AAxCP,MAAMN,8BAA8B;IACzC,CAACO,4CAA6B,CAACC,UAAU,CAAC,EAAED,4CAA6B;IACzE,CAACE,sDAAkC,CAACD,UAAU,CAAC,EAC7CC,sDAAkC;IACpC,CAACC,gCAAuB,CAACF,UAAU,CAAC,EAAEE,gCAAuB;IAC7D,CAACC,kDAAgC,CAACH,UAAU,CAAC,EAC3CG,kDAAgC;IAClC,CAACC,wBAAmB,CAACJ,UAAU,CAAC,EAAEI,wBAAmB;IACrD,CAACC,wCAA2B,CAACL,UAAU,CAAC,EAAEK,wCAA2B;IACrE,CAACC,sCAA0B,CAACN,UAAU,CAAC,EAAEM,sCAA0B;IACnE,CAACC,8CAA8B,CAACP,UAAU,CAAC,EAAEO,8CAA8B;AAC7E;AAEO,MAAMd,gCAAgC;IAC3C,GAAGe,oCAA2B;IAC9B,GAAGC,0DAAsC;IACzC,GAAGC,4BAAuB;IAC1B,GAAGC,0CAA8B;AACnC;AAEO,MAAMjB,yBAGT;IACF,CAACQ,gCAAuB,CAACF,UAAU,CAAC,EAAEY,+BAAsB;IAC5D,CAACX,sDAAkC,CAACD,UAAU,CAAC,EAC7Ca,qDAAiC;IACnC,CAACT,wBAAmB,CAACJ,UAAU,CAAC,EAAEc,uBAAkB;IACpD,CAACR,sCAA0B,CAACN,UAAU,CAAC,EAAEe,qCAAyB;AACpE;AAEO,MAAMpB,oBAAiD;IAC5D,CAACqB,uBAAW,CAACC,YAAY,CAAC,EAAEb,wBAAmB,CAACJ,UAAU;IAC1D,CAACgB,uBAAW,CAACE,aAAa,CAAC,EAAEjB,sDAAkC,CAACD,UAAU;IAC1E,CAACgB,uBAAW,CAACG,SAAS,CAAC,EAAEjB,gCAAuB,CAACF,UAAU;IAC3D,CAACgB,uBAAW,CAACI,YAAY,CAAC,EAAEd,sCAA0B,CAACN,UAAU;IACjE,CAACgB,uBAAW,CAACK,SAAS,CAAC,EAAEd,8CAA8B,CAACP,UAAU;IAClE,CAACgB,uBAAW,CAACM,QAAQ,CAAC,EAAEf,8CAA8B,CAACP,UAAU;AACnE"}

package/dist/esm/snaps/SnapController.js

@@ -64,7 +64,7 @@ function _define_property(obj, key, value) {
 import { BaseControllerV2 as BaseController } from '@metamask/base-controller';
 import { SubjectType } from '@metamask/permission-controller';
 import { WALLET_SNAP_PERMISSION_KEY } from '@metamask/rpc-methods';
-import { assertIsSnapManifest, assertIsValidSnapId, DEFAULT_ENDOWMENTS, DEFAULT_REQUESTED_SNAP_VERSION, getErrorMessage, HandlerType, logError, logWarning, normalizeRelative, resolveVersionRange, SnapCaveatType, SnapStatus, SnapStatusEvents, validateFetchedSnap } from '@metamask/snaps-utils';
+import { assertIsSnapManifest, assertIsValidSnapId, DEFAULT_ENDOWMENTS, DEFAULT_REQUESTED_SNAP_VERSION, getErrorMessage, HandlerType, logError, normalizeRelative, resolveVersionRange, SnapCaveatType, SnapStatus, SnapStatusEvents, validateFetchedSnap } from '@metamask/snaps-utils';
 import { assert, assertIsJsonRpcRequest, Duration, gtRange, gtVersion, hasProperty, inMilliseconds, isNonEmptyArray, isValidSemVerRange, satisfiesVersionRange, timeSince } from '@metamask/utils';
 import { createMachine, interpret } from '@xstate/fsm';
 import { ethErrors } from 'eth-rpc-errors';
@@ -1001,7 +1001,6 @@ _initializeStateMachine = /*#__PURE__*/ new WeakSet(), /**
    * Awaits the specified promise and rejects if the promise doesn't resolve
    * before the timeout.
    *
-   * @param snapId - The snap id.
    * @param promise - The promise to await.
    * @param timer - An optional timer object to control the timeout.
    * @returns The result of the promise or rejects if the promise times out.
@@ -1359,7 +1358,7 @@ async function startSnap(snapData) {
         throw new Error(`Snap "${snapId}" is already started.`);
     }
     try {
-        const result = await _class_private_method_get(this, _executeWithTimeout, executeWithTimeout).call(this, snapId, this.messagingSystem.call('ExecutionService:executeSnap', {
+        const result = await _class_private_method_get(this, _executeWithTimeout, executeWithTimeout).call(this, this.messagingSystem.call('ExecutionService:executeSnap', {
             ...snapData,
             endowments: await _class_private_method_get(this, _getEndowments, getEndowments).call(this, snapId)
         }));
@@ -1537,7 +1536,7 @@ function getRpcRequestHandler(snapId) {
         });
         // This will either get the result or reject due to the timeout.
         try {
-            const result = await _class_private_method_get(this, _executeWithTimeout, executeWithTimeout).call(this, snapId, handleRpcRequestPromise, timer);
+            const result = await _class_private_method_get(this, _executeWithTimeout, executeWithTimeout).call(this, handleRpcRequestPromise, timer);
             _class_private_method_get(this, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish).call(this, snapId, request.id);
             return result;
         } catch (error) {
@@ -1548,13 +1547,7 @@ function getRpcRequestHandler(snapId) {
     runtime.rpcHandler = rpcHandler;
     return rpcHandler;
 }
-async function executeWithTimeout(snapId, promise, timer) {
-    const isLongRunning = this.messagingSystem.call('PermissionController:hasPermission', snapId, SnapEndowments.LongRunning);
-    // Long running snaps have timeouts disabled
-    if (isLongRunning) {
-        logWarning(`${SnapEndowments.LongRunning} will soon be deprecated. For more information please see https://github.com/MetaMask/snaps-monorepo/issues/945.`);
-        return promise;
-    }
+async function executeWithTimeout(promise, timer) {
     const result = await withTimeout(promise, timer ?? this.maxRequestTime);
     if (result === hasTimedOut) {
         throw new Error('The request timed out.');