Resolve yarn peer dependency warnings (#123)

* Resolve yarn peer dependency warnings

* Fix linting (scripts and configuration, linting still fails)

* Fix linting for all packages, other than smart-accounts-kit

* Fix linting errors in smart-accounts-kit
- Mark @typescript-eslint/explicit-function-return-type and @typescript-eslint/naming-convention as warning only

* Minor fixes:
- improve error handling in validate-contract-deployments scripts
- fix comment

Author: jeffsmale90

.yarnrc.yml

@@ -17,3 +17,8 @@ plugins:
     spec: 'https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js'
 
 npmMinimalAgeGate: 4320
+
+packageExtensions:
+  "eslint-plugin-n@*":
+    peerDependencies:
+      typescript: "*"

package.json

@@ -30,30 +30,29 @@
     "@lavamoat/allow-scripts": "^3.4.0",
     "@lavamoat/preinstall-always-fail": "^2.1.1",
     "@metamask/create-release-branch": "^4.1.1",
-    "@metamask/eslint-config": "^12.0.0",
-    "@metamask/eslint-config-nodejs": "^12.0.0",
-    "@metamask/eslint-config-typescript": "^12.0.0",
+    "@metamask/eslint-config": "14.1.0",
+    "@metamask/eslint-config-nodejs": "14.0.0",
+    "@metamask/eslint-config-typescript": "14.0.0",
     "@types/keccak": "^3.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
     "@yarnpkg/types": "^4.0.1",
     "abitype": "^1.0.2",
     "buffer": "^6.0.3",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-config-turbo": "^1.11.3",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^41.1.2",
-    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-prettier": "latest",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-import-x": "^4.0.0",
+    "eslint-plugin-jsdoc": "^50.2.4",
+    "eslint-plugin-n": "^17.10.3",
+    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-promise": "^7.1.0",
     "keccak": "^3.0.4",
     "lodash": "^4.17.21",
     "nodemon": "^3.1.0",
     "prettier": "^3.3.3",
     "turbo": "latest",
-    "typescript": "5.0.4",
+    "typescript": "5.5.4",
+    "typescript-eslint": "^8.0.0",
     "viem": "2.31.4",
     "webauthn-p256": "^0.0.10"
   },
@@ -67,7 +66,8 @@
   "lavamoat": {
     "allowScripts": {
       "@lavamoat/preinstall-always-fail": false,
-      "keccak": false
+      "keccak": false,
+      "eslint-plugin-import-x>unrs-resolver": false
     }
   }
 }

packages/7715-permission-types/eslint.config.mjs

@@ -0,0 +1,2 @@
+// eslint-disable-next-line
+export { default } from '../../shared/config/base.eslint.mjs';

packages/7715-permission-types/package.json

@@ -43,6 +43,7 @@
   "scripts": {
     "build": "yarn typecheck && tsup",
     "typecheck": "tsc --noEmit",
+    "lint": "eslint . --cache --ext js,ts",
     "changelog:update": "../../scripts/update-changelog.sh @metamask/7715-permission-types",
     "changelog:validate": "../../scripts/validate-changelog.sh @metamask/7715-permission-types"
   },
@@ -53,7 +54,9 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^5.0.2",
     "compare-versions": "^6.1.1",
+    "eslint": "^9.39.2",
+    "prettier": "^3.5.3",
     "tsup": "^8.5.0",
-    "typescript": "5.0.4"
+    "typescript": "5.5.4"
   }
 }

packages/7715-permission-types/src/types.ts

@@ -1,6 +1,6 @@
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // General Types
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 /**
  * A hex-encoded string.
@@ -12,17 +12,17 @@ export type Hex = `0x${string}`;
  */
 export type KeyType = 'secp256r1' | 'secp256k1' | 'ed25519' | 'schnorr';
 
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // Signer Types
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 /**
  * A wallet is the signer for these permissions
  * `data` is not necessary for this signer type as the wallet is both the signer and grantor of these permissions
  */
 export type WalletSigner = {
   type: 'wallet';
-  data: {};
+  data: object;
 };
 
 /**
@@ -63,16 +63,19 @@ export type AccountSigner = {
 
 export type Signer = WalletSigner | KeySigner | MultiKeySigner | AccountSigner;
 
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // Permission Types
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 /**
  * A base permission type that all permissions must extend.
  * `isAdjustmentAllowed` defines a boolean value that allows DApp to define whether the "permission" can be attenuated–adjusted to meet the user's terms.
- * @property type - is an enum defined by the ERCs
- * @property isAdjustmentAllowed - is a boolean that indicates whether the permission can be adjusted.
- * @property data - is a record of the data that is associated with the permission, and the structure is defined by the ERCs.
+ *
+ * type - is an enum defined by the ERCs
+ *
+ * isAdjustmentAllowed - is a boolean that indicates whether the permission can be adjusted.
+ *
+ * data - is a record of the data that is associated with the permission, and the structure is defined by the ERCs.
  */
 export type BasePermission = {
   type: string;
@@ -83,34 +86,42 @@ export type BasePermission = {
 /**
  * A base rule type that all rules must extend.
  * `isAdjustmentAllowed` defines a boolean value that allows DApp to define whether the "rule" can be attenuated–adjusted to meet the user's terms.
- * @property type - is an enum defined by the ERCs
- * @property isAdjustmentAllowed - is a boolean that indicates whether the rule can be adjusted.
- * @property data - is a record of the data that is associated with the rule, and the structure is defined by the ERCs.
+ *
+ * type - is an enum defined by the ERCs
+ *
+ * isAdjustmentAllowed - is a boolean that indicates whether the rule can be adjusted.
+ *
+ * data - is a record of the data that is associated with the rule, and the structure is defined by the ERCs.
  */
 export type Rule = {
   type: string;
   isAdjustmentAllowed: boolean;
   data: Record<string, any>;
 };
 
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // MetaMask Permission Types
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 /**
  * Base data for all MetaMask permissions.
- * @property justification - is a human-readable explanation of why the permission is being requested.
+ *
+ * justification - is a human-readable explanation of why the permission is being requested.
  */
 export type MetaMaskBasePermissionData = {
   justification?: string | null;
 };
 
 /**
  * A permission to stream native tokens.
- * @property data.initialAmount - is the initial amount of the native token to be streamed. Defaults to 0.
- * @property data.maxAmount - is the maximum amount of the native token to be streamed. Defaults to Max Uint256.
- * @property data.amountPerSecond - is the amount of the native token to be streamed per second.
- * @property data.startTime - is the start time of the stream. Defaults to current time.
+ *
+ * data.initialAmount - is the initial amount of the native token to be streamed. Defaults to 0.
+ *
+ * data.maxAmount - is the maximum amount of the native token to be streamed. Defaults to Max Uint256.
+ *
+ * data.amountPerSecond - is the amount of the native token to be streamed per second.
+ *
+ * data.startTime - is the start time of the stream. Defaults to current time.
  */
 export type NativeTokenStreamPermission = BasePermission & {
   type: 'native-token-stream';
@@ -124,9 +135,12 @@ export type NativeTokenStreamPermission = BasePermission & {
 
 /**
  * A permission to stream native tokens periodically.
- * @property data.periodAmount - is the amount of the native token to be streamed per period.
- * @property data.periodDuration - is the duration of the period in seconds.
- * @property data.startTime - is the start time of the stream. Defaults to current time.
+ *
+ * data.periodAmount - is the amount of the native token to be streamed per period.
+ *
+ * data.periodDuration - is the duration of the period in seconds.
+ *
+ * data.startTime - is the start time of the stream. Defaults to current time.
  */
 export type NativeTokenPeriodicPermission = BasePermission & {
   type: 'native-token-periodic';
@@ -139,11 +153,16 @@ export type NativeTokenPeriodicPermission = BasePermission & {
 
 /**
  * A permission to stream ERC20 tokens.
- * @property data.initialAmount - is the initial amount of the ERC20 token to be streamed. Defaults to 0.
- * @property data.maxAmount - is the maximum amount of the ERC20 token to be streamed. Defaults to Max Uint256.
- * @property data.amountPerSecond - is the amount of the ERC20 token to be streamed per second.
- * @property data.startTime - is the start time of the stream. Defaults to current time.
- * @property data.tokenAddress - is the address of the ERC20 token to be streamed.
+ *
+ * data.initialAmount - is the initial amount of the ERC20 token to be streamed. Defaults to 0.
+ *
+ * data.maxAmount - is the maximum amount of the ERC20 token to be streamed. Defaults to Max Uint256.
+ *
+ * data.amountPerSecond - is the amount of the ERC20 token to be streamed per second.
+ *
+ * data.startTime - is the start time of the stream. Defaults to current time.
+ *
+ * data.tokenAddress - is the address of the ERC20 token to be streamed.
  */
 export type Erc20TokenStreamPermission = BasePermission & {
   type: 'erc20-token-stream';
@@ -158,10 +177,14 @@ export type Erc20TokenStreamPermission = BasePermission & {
 
 /**
  * A permission to stream ERC20 tokens periodically.
- * @property data.periodAmount - is the amount of the ERC20 token to be streamed per period.
- * @property data.periodDuration - is the duration of the period in seconds.
- * @property data.startTime - is the start time of the stream. Defaults to current time.
- * @property data.tokenAddress - is the address of the ERC20 token to be streamed per period.
+ *
+ * data.periodAmount - is the amount of the ERC20 token to be streamed per period.
+ *
+ * data.periodDuration - is the duration of the period in seconds.
+ *
+ * data.startTime - is the start time of the stream. Defaults to current time.
+ *
+ * data.tokenAddress - is the address of the ERC20 token to be streamed per period.
  */
 export type Erc20TokenPeriodicPermission = BasePermission & {
   type: 'erc20-token-periodic';
@@ -183,9 +206,10 @@ export type Erc20TokenRevocationPermission = BasePermission & {
 
 /**
  * A custom permission.
- * @property data - is a record of the data that is associated with the permission, and the structure is defined by the ERCs.
+ *
+ * data - is a record of the data that is associated with the permission, and the structure is defined by the ERCs.
  */
-// TODO: Consider openning up permission types with Custom / Unknown permissions in subseqential versions.
+// TODO: Consider opening up permission types with Custom / Unknown permissions in subsequent versions.
 // export type CustomPermission = BasePermission & {
 //     type: 'custom';
 //     data: MetaMaskBasePermissionData & Record<string, unknown>;
@@ -201,17 +225,22 @@ export type PermissionTypes =
   | Erc20TokenPeriodicPermission
   | Erc20TokenRevocationPermission;
 
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // Permission Requests
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 /**
  * Parameters for the `wallet_requestExecutionPermissions` JSON-RPC method.
- * @property chainId - chainId defines the chain with EIP-155 which applies to this permission request and all addresses can be found defined by other parameters.
- * @property address - address identifies the account being targetted for this permission request which is useful when a connection has been established and multiple accounts have been exposed. It is optional to let the user choose which account to grant permission for.
- * @property signer - signer is a field that identifies the key or account associated with the permission or alternatively the wallet will manage the session. See the "Signers" section for details.
- * @property permission - permission defines the allowed behavior the signer can do on behalf of the account. See the "Permission" section for details.
- * @property rules - rules defined the restrictions or conditions that a signer MUST abide by when using a permission to act on behalf of an account. See the "Rule" section for details.
+ *
+ * chainId - chainId defines the chain with EIP-155 which applies to this permission request and all addresses can be found defined by other parameters.
+ *
+ * address - address identifies the account being targetted for this permission request which is useful when a connection has been established and multiple accounts have been exposed. It is optional to let the user choose which account to grant permission for.
+ *
+ * signer - signer is a field that identifies the key or account associated with the permission or alternatively the wallet will manage the session. See the "Signers" section for details.
+ *
+ * permission - permission defines the allowed behavior the signer can do on behalf of the account. See the "Permission" section for details.
+ *
+ * rules - rules defined the restrictions or conditions that a signer MUST abide by when using a permission to act on behalf of an account. See the "Rule" section for details.
  */
 export type PermissionRequest<
   TSigner extends Signer,
@@ -227,9 +256,12 @@ export type PermissionRequest<
 /**
  * Response from the `wallet_requestExecutionPermissions` JSON-RPC method.
  * First note that the response contains all of the parameters of the original request and it is not guaranteed that the values received are equivalent to those requested.
- * @property context - is a catch-all to identify a permission for revoking permissions or submitting userOps, and can contain non-identifying data as well. It MAY be the `context` as defined in ERC-7679 and ERC-7710.
- * @property dependencyInfo - is an array of objects, each containing fields for `factory` and `factoryData` as defined in ERC-4337. Either both `factory` and `factoryData` must be specified in an entry, or neither. This array is used describe accounts that are not yet deployed but MUST be deployed in order for a permission to be successfully redeemed.
- * @property signerMeta - is dependent on the account type. If the signer type is `wallet` then it's not required. If the signer type is `key` or `keys` then `userOpBuilder` is required as defined in ERC-7679. If the signer type is `account` then `delegationManager` is required as defined in ERC-7710.
+ *
+ * context - is a catch-all to identify a permission for revoking permissions or submitting userOps, and can contain non-identifying data as well. It MAY be the `context` as defined in ERC-7679 and ERC-7710.
+ *
+ * dependencyInfo - is an array of objects, each containing fields for `factory` and `factoryData` as defined in ERC-4337. Either both `factory` and `factoryData` must be specified in an entry, or neither. This array is used describe accounts that are not yet deployed but MUST be deployed in order for a permission to be successfully redeemed.
+ *
+ * signerMeta - is dependent on the account type. If the signer type is `wallet` then it's not required. If the signer type is `key` or `keys` then `userOpBuilder` is required as defined in ERC-7679. If the signer type is `account` then `delegationManager` is required as defined in ERC-7710.
  */
 export type PermissionResponse<
   TSigner extends Signer,
@@ -250,7 +282,8 @@ export type PermissionResponse<
 
 /**
  * Parameters for the `wallet_revokeExecutionPermission` JSON-RPC method.
- * @property permissionContext - the context identifier for the permission to be revoked
+ *
+ * permissionContext - the context identifier for the permission to be revoked
  */
 export type RevokeExecutionPermissionRequestParams = {
   permissionContext: Hex;
@@ -260,4 +293,4 @@ export type RevokeExecutionPermissionRequestParams = {
  * Response from the `wallet_revokeExecutionPermission` JSON-RPC method.
  * The wallet will respond with an empty response when successful.
  */
-export type RevokeExecutionPermissionResponseResult = {};
+export type RevokeExecutionPermissionResponseResult = Record<string, never>;

packages/delegation-abis/package.json

@@ -55,7 +55,8 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^5.0.2",
+    "prettier": "^3.5.3",
     "tsup": "^8.5.0",
-    "typescript": "5.0.4"
+    "typescript": "5.5.4"
   }
 }

packages/delegation-core/.eslintrc.cjs

@@ -0,0 +1,2 @@
+// eslint-disable-next-line
+export { default } from '../../shared/config/base.eslint.mjs';

packages/delegation-core/eslint.config.mjs

@@ -65,9 +65,11 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^5.0.2",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.19.0",
+    "eslint": "^9.39.2",
+    "prettier": "^3.5.3",
     "tsup": "^8.5.0",
-    "typescript": "5.0.4",
+    "typescript": "5.5.4",
     "vitest": "^3.2.4"
   },
   "dependencies": {

packages/delegation-core/package.json

@@ -37,6 +37,7 @@ export function createAllowedCalldataTerms(
 /**
  * Creates terms for an AllowedCalldata caveat that ensures the provided execution calldata
  * matches the expected calldata at the specified index.
+ *
  * @param terms - The terms for the AllowedCalldata caveat.
  * @param encodingOptions - The encoding options for the result.
  * @returns The terms as the calldata itself.