Remove endowment:long-running

MetaMask · Sep 21, 2023 · b4953aa · b4953aa
1 parent 814188a
commit b4953aa
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 326 deletions.
diff --git a/packages/snaps-controllers/src/snaps/SnapController.test.ts b/packages/snaps-controllers/src/snaps/SnapController.test.ts
diff --git a/packages/snaps-controllers/src/snaps/SnapController.ts b/packages/snaps-controllers/src/snaps/SnapController.ts
@@ -52,7 +52,6 @@ import {
   getErrorMessage,
   HandlerType,
   logError,
-  logWarning,
   normalizeRelative,
   resolveVersionRange,
   SnapCaveatType,
@@ -2112,7 +2111,6 @@ export class SnapController extends BaseController<
 
     try {
       const result = await this.#executeWithTimeout(
-        snapId,
         this.messagingSystem.call('ExecutionService:executeSnap', {
           ...snapData,
           endowments: await this.#getEndowments(snapId),
@@ -2563,7 +2561,6 @@ export class SnapController extends BaseController<
       // This will either get the result or reject due to the timeout.
       try {
         const result = await this.#executeWithTimeout(
-          snapId,
           handleRpcRequestPromise,
           timer,
         );
@@ -2583,31 +2580,15 @@ export class SnapController extends BaseController<
    * 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.
    * @template PromiseValue - The value of the Promise.
    */
   async #executeWithTimeout<PromiseValue>(
-    snapId: ValidatedSnapId,
     promise: Promise<PromiseValue>,
     timer?: Timer,
   ): Promise<PromiseValue> {
-    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;
-    }
-
     const result = await withTimeout(promise, timer ?? this.maxRequestTime);
     if (result === hasTimedOut) {
       throw new Error('The request timed out.');

diff --git a/packages/snaps-controllers/src/snaps/endowments/enum.ts b/packages/snaps-controllers/src/snaps/endowments/enum.ts
@@ -1,6 +1,5 @@
 export enum SnapEndowments {
   NetworkAccess = 'endowment:network-access',
-  LongRunning = 'endowment:long-running',
   TransactionInsight = 'endowment:transaction-insight',
   Cronjob = 'endowment:cronjob',
   EthereumProvider = 'endowment:ethereum-provider',

diff --git a/packages/snaps-controllers/src/snaps/endowments/index.ts b/packages/snaps-controllers/src/snaps/endowments/index.ts
@@ -9,7 +9,6 @@ import {
 } from './cronjob';
 import { ethereumProviderEndowmentBuilder } from './ethereum-provider';
 import { lifecycleHooksEndowmentBuilder } from './lifecycle-hooks';
-import { longRunningEndowmentBuilder } from './long-running';
 import {
   getNameLookupCaveatMapper,
   nameLookupCaveatSpecifications,
@@ -30,7 +29,6 @@ import { webAssemblyEndowmentBuilder } from './web-assembly';
 
 export const endowmentPermissionBuilders = {
   [networkAccessEndowmentBuilder.targetName]: networkAccessEndowmentBuilder,
-  [longRunningEndowmentBuilder.targetName]: longRunningEndowmentBuilder,
   [transactionInsightEndowmentBuilder.targetName]:
     transactionInsightEndowmentBuilder,
   [cronjobEndowmentBuilder.targetName]: cronjobEndowmentBuilder,

diff --git a/packages/snaps-controllers/src/snaps/endowments/long-running.test.ts b/packages/snaps-controllers/src/snaps/endowments/long-running.test.ts
diff --git a/packages/snaps-controllers/src/snaps/endowments/long-running.ts b/packages/snaps-controllers/src/snaps/endowments/long-running.ts
diff --git a/packages/snaps-controllers/src/snaps/permission.test.ts b/packages/snaps-controllers/src/snaps/permission.test.ts
@@ -37,15 +37,6 @@ describe('buildSnapEndowmentSpecifications', () => {
           ],
           "targetName": "endowment:lifecycle-hooks",
         },
-        "endowment:long-running": {
-          "allowedCaveats": null,
-          "endowmentGetter": [Function],
-          "permissionType": "Endowment",
-          "subjectTypes": [
-            "snap",
-          ],
-          "targetName": "endowment:long-running",
-        },
         "endowment:name-lookup": {
           "allowedCaveats": [
             "chainIds",

diff --git a/packages/snaps-controllers/src/test-utils/controller.ts b/packages/snaps-controllers/src/test-utils/controller.ts
@@ -177,12 +177,9 @@ export const getControllerMessenger = (registry = new MockSnapsRegistry()) => {
     SnapControllerEvents | AllowedEvents
   >();
 
-  messenger.registerActionHandler(
-    'PermissionController:hasPermission',
-    (permission) => {
-      return permission !== SnapEndowments.LongRunning;
-    },
-  );
+  messenger.registerActionHandler('PermissionController:hasPermission', () => {
+    return true;
+  });
 
   messenger.registerActionHandler('PermissionController:hasPermissions', () => {
     return true;
@@ -483,8 +480,8 @@ export const getRestrictedCronjobControllerMessenger = (
   if (mocked) {
     messenger.registerActionHandler(
       'PermissionController:hasPermission',
-      (permission) => {
-        return permission !== SnapEndowments.LongRunning;
+      () => {
+        return true;
       },
     );
 

diff --git a/packages/snaps-utils/src/manifest/validation.ts b/packages/snaps-utils/src/manifest/validation.ts
@@ -143,7 +143,6 @@ export const ChainIdsStruct = array(ChainIdStruct);
 
 /* eslint-disable @typescript-eslint/naming-convention */
 export const PermissionsStruct = type({
-  'endowment:long-running': optional(object({})),
   'endowment:network-access': optional(object({})),
   'endowment:webassembly': optional(object({})),
   'endowment:transaction-insight': optional(