Fix linting errors, and remove lint suppressions

Author: jeffsmale90

eslint-suppressions.json

@@ -1091,32 +1091,6 @@
       "count": 1
     }
   },
-  "packages/gator-permissions-controller/src/GatorPermissionsController.test.ts": {
-    "id-denylist": {
-      "count": 2
-    }
-  },
-  "packages/gator-permissions-controller/src/GatorPermissionsController.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 8
-    }
-  },
-  "packages/gator-permissions-controller/src/decodePermission/utils.test.ts": {
-    "id-length": {
-      "count": 1
-    }
-  },
-  "packages/gator-permissions-controller/src/decodePermission/utils.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 2
-    },
-    "@typescript-eslint/naming-convention": {
-      "count": 1
-    },
-    "id-length": {
-      "count": 1
-    }
-  },
   "packages/logging-controller/src/LoggingController.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1
@@ -2060,4 +2034,4 @@
       "count": 1
     }
   }
-}
+}

packages/gator-permissions-controller/src/GatorPermissionsController.test.ts

@@ -197,7 +197,7 @@ describe('GatorPermissionsController', () => {
                 isAdjustmentAllowed: false,
                 data: {
                   target: '0x1234567890123456789012345678901234567890',
-                  sig: '0xabcd',
+                  signature: '0xabcd',
                   expiry: 1735689600, // Example expiry timestamp
                 },
               },
@@ -275,7 +275,7 @@ describe('GatorPermissionsController', () => {
           isAdjustmentAllowed: false,
           data: {
             target: '0x1234567890123456789012345678901234567890',
-            sig: '0xabcd',
+            signature: '0xabcd',
             expiry: 1735689600,
           },
         },

packages/gator-permissions-controller/src/GatorPermissionsController.ts

@@ -9,13 +9,13 @@ import type { Messenger } from '@metamask/messenger';
 import type { HandleSnapRequest, HasSnap } from '@metamask/snaps-controllers';
 import type { SnapId } from '@metamask/snaps-sdk';
 import { HandlerType } from '@metamask/snaps-utils';
-import {
-  TransactionStatus,
-  type TransactionControllerTransactionApprovedEvent,
-  type TransactionControllerTransactionConfirmedEvent,
-  type TransactionControllerTransactionDroppedEvent,
-  type TransactionControllerTransactionFailedEvent,
-  type TransactionControllerTransactionRejectedEvent,
+import { TransactionStatus } from '@metamask/transaction-controller';
+import type {
+  TransactionControllerTransactionApprovedEvent,
+  TransactionControllerTransactionConfirmedEvent,
+  TransactionControllerTransactionDroppedEvent,
+  TransactionControllerTransactionFailedEvent,
+  TransactionControllerTransactionRejectedEvent,
 } from '@metamask/transaction-controller';
 import type { Hex, Json } from '@metamask/utils';
 
@@ -35,9 +35,7 @@ import {
 } from './errors';
 import { controllerLog } from './logger';
 import { GatorPermissionsSnapRpcMethod } from './types';
-import type {
-  StoredGatorPermissionSanitized,
-} from './types';
+import type { StoredGatorPermissionSanitized } from './types';
 import type {
   GatorPermissionsMap,
   PermissionTypesWithCustom,
@@ -849,7 +847,7 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Helper to refresh permissions after transaction state change
-    const refreshPermissions = (context: string) => {
+    const refreshPermissions = (context: string): void => {
       this.fetchAndUpdateGatorPermissions({ isRevoked: false }).catch(
         (error) => {
           controllerLog(`Failed to refresh permissions after ${context}`, {
@@ -862,7 +860,7 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Helper to unsubscribe from approval/rejection events after decision is made
-    const cleanupApprovalHandlers = () => {
+    const cleanupApprovalHandlers = (): void => {
       if (handlers.approved) {
         this.messenger.unsubscribe(
           'TransactionController:transactionApproved',
@@ -880,7 +878,7 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Cleanup function to unsubscribe from all events and clear timeout
-    const cleanup = (txIdToRemove: string, removeFromState = true) => {
+    const cleanup = (txIdToRemove: string, removeFromState = true): void => {
       cleanupApprovalHandlers();
       if (handlers.confirmed) {
         this.messenger.unsubscribe(
@@ -911,7 +909,7 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Handle approved transaction - add to pending revocations state
-    handlers.approved = (payload) => {
+    handlers.approved = (payload): void => {
       if (payload.transactionMeta.id === txId) {
         controllerLog(
           'Transaction approved by user, adding to pending revocations',
@@ -929,7 +927,7 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Handle rejected transaction - cleanup without adding to state
-    handlers.rejected = (payload) => {
+    handlers.rejected = (payload): void => {
       if (payload.transactionMeta.id === txId) {
         controllerLog('Transaction rejected by user, cleaning up listeners', {
           txId,
@@ -942,15 +940,14 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Handle confirmed transaction - submit revocation
-    handlers.confirmed = (transactionMeta) => {
+    handlers.confirmed = (transactionMeta): void => {
       if (transactionMeta.id === txId) {
         controllerLog('Transaction confirmed, submitting revocation', {
           txId,
           permissionContext,
           txHash: transactionMeta.hash,
         });
 
-
         if (transactionMeta.status !== TransactionStatus.confirmed) {
           controllerLog('Transaction not confirmed, skipping revocation', {
             txId,
@@ -960,7 +957,7 @@ export default class GatorPermissionsController extends BaseController<
           cleanup(transactionMeta.id);
           refreshPermissions('transaction not confirmed');
           return;
-        } 
+        }
 
         const txHash = transactionMeta.hash as Hex | undefined;
 
@@ -995,7 +992,7 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Handle failed transaction - cleanup without submitting revocation
-    handlers.failed = (payload) => {
+    handlers.failed = (payload): void => {
       if (payload.transactionMeta.id === txId) {
         controllerLog('Transaction failed, cleaning up revocation listener', {
           txId,
@@ -1010,7 +1007,7 @@ export default class GatorPermissionsController extends BaseController<
     };
 
     // Handle dropped transaction - cleanup without submitting revocation
-    handlers.dropped = (payload) => {
+    handlers.dropped = (payload): void => {
       if (payload.transactionMeta.id === txId) {
         controllerLog('Transaction dropped, cleaning up revocation listener', {
           txId,

packages/gator-permissions-controller/src/decodePermission/utils.test.ts

@@ -88,7 +88,9 @@ describe('createPermissionRulesForChainId', () => {
     const rules = createPermissionRulesForChainId(contracts);
     expect(rules).toHaveLength(permissionTypeCount);
 
-    const byType = Object.fromEntries(rules.map((r) => [r.permissionType, r]));
+    const byType = Object.fromEntries(
+      rules.map((rule) => [rule.permissionType, rule]),
+    );
 
     // native-token-stream
     expect(byType['native-token-stream']).toBeDefined();

packages/gator-permissions-controller/src/decodePermission/utils.ts

@@ -38,8 +38,18 @@ const ENFORCER_CONTRACT_NAMES = {
  */
 export const getChecksumEnforcersByChainId = (
   contracts: DeployedContractsByName,
-) => {
-  const getChecksumContractAddress = (contractName: string) => {
+): {
+  erc20StreamingEnforcer: Hex;
+  erc20PeriodicEnforcer: Hex;
+  nativeTokenStreamingEnforcer: Hex;
+  nativeTokenPeriodicEnforcer: Hex;
+  exactCalldataEnforcer: Hex;
+  valueLteEnforcer: Hex;
+  timestampEnforcer: Hex;
+  nonceEnforcer: Hex;
+  allowedCalldataEnforcer: Hex;
+} => {
+  const getChecksumContractAddress = (contractName: string): Hex => {
     const address = contracts[contractName];
 
     if (!address) {
@@ -181,9 +191,12 @@ export const createPermissionRulesForChainId: (
  * @param superset - The set expected to contain all elements of `subset`.
  * @returns `true` if `subset` ⊆ `superset`, otherwise `false`.
  */
-export const isSubset = <T>(subset: Set<T>, superset: Set<T>): boolean => {
-  for (const x of subset) {
-    if (!superset.has(x)) {
+export const isSubset = <TElement>(
+  subset: Set<TElement>,
+  superset: Set<TElement>,
+): boolean => {
+  for (const element of subset) {
+    if (!superset.has(element)) {
       return false;
     }
   }

packages/gator-permissions-controller/src/types.ts

@@ -233,7 +233,7 @@ export type RevocationParams = {
   /**
    * The hash of the transaction that was used to revoke the permission. Optional because we might not have submitted the transaction ourselves.
    */
-  txHash : Hex | undefined;
+  txHash: Hex | undefined;
 };
 
 /**