fix: prettier fixes

Author: 0xmad

.github/workflows/main.yml

@@ -30,38 +30,19 @@ jobs:
             - name: Install dependencies
               run: yarn
 
-            - name: Get changed files
-              id: changed-files
-              uses: tj-actions/changed-files@v44
-              with:
-                  files_yaml: |
-                      contracts:
-                        - packages/contracts/**/*.{js,json,ts,sol}
-                      packages:
-                        - packages/**/*.{js,json,ts}
-                        - '!packages/{contracts}/**/*'
-                      to_format:
-                        - '**/*.{cjs,js,json,jsx,md,mdx,sol,ts,tsx,yaml,yml}'
-                      to_lint:
-                        - '**/*.{cjs,js,jsx,ts,tsx}'
-
-            - if: steps.changed-files.outputs.contracts_any_changed == 'true'
-              name: Compile and lint contracts
+            - name: Compile and lint contracts
               run: |
                   yarn compile:contracts
                   yarn workspace @excubiae/contracts lint
 
-            - if: steps.changed-files.outputs.packages_any_changed == 'true'
-              name: Build packages
+            - name: Build packages
               run: yarn build:packages
 
-            - if: steps.changed-files.outputs.to_format_any_changed == 'true'
-              name: Format
-              run: yarn run prettier --check --ignore-unknown --no-error-on-unmatched-pattern ${{ steps.changed-files.outputs.to_format_all_changed_files }}
+            - name: Format
+              run: yarn format:write
 
-            - if: steps.changed-files.outputs.to_lint_any_changed == 'true'
-              name: Run Eslint
-              run: yarn run eslint ${{ steps.changed-files.outputs.to_lint_all_changed_files }} --ext .cjs,.js,.jsx,.ts,.tsx
+            - name: Run Eslint
+              run: yarn lint:fix
 
     test:
         runs-on: ubuntu-latest
@@ -82,16 +63,7 @@ jobs:
             - name: Install dependencies
               run: yarn
 
-            - name: Get changed files
-              id: changed-files
-              uses: tj-actions/changed-files@v44
-              with:
-                  files_yaml: |
-                      contracts:
-                        - packages/contracts/**/*.{js,json,ts,sol}
-
-            - if: steps.changed-files.outputs.contracts_any_changed == 'true'
-              name: Build and Test contracts
+            - name: Build and Test contracts
               run: |
                   yarn compile:contracts
                   yarn test:contracts

.lintstagedrc.json

@@ -1,4 +1,5 @@
 {
-    "**/*.{js,ts,jsx,tsx,md,json,sol,yaml,yml}": "prettier --write --no-error-on-unmatched-pattern",
+    "**/*.{js,ts,jsx,tsx,md,json,yaml,yml}": "prettier --write --no-error-on-unmatched-pattern",
+    "**/*.{sol}": "yarn workspace @excubiae/contracts format:forge",
     "**/*.{js,ts,jsx,tsx}": "eslint"
 }

packages/contracts/contracts/checker/AdvancedChecker.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {IAdvancedChecker, Check, CheckStatus} from "../interfaces/IAdvancedChecker.sol";
-import {Clone} from "../proxy/Clone.sol";
+import { IAdvancedChecker, Check, CheckStatus } from "../interfaces/IAdvancedChecker.sol";
+import { Clone } from "../proxy/Clone.sol";
 
 /// @title AdvancedChecker
 /// @notice Abstract contract for multi-phase validation (PRE, MAIN, POST).
@@ -19,7 +19,12 @@ abstract contract AdvancedChecker is Clone, IAdvancedChecker {
         address subject,
         bytes calldata evidence,
         Check checkType
-    ) external view override returns (bool checked) {
+    )
+        external
+        view
+        override
+        returns (bool checked)
+    {
         return _check(subject, evidence, checkType);
     }
 
@@ -46,19 +51,19 @@ abstract contract AdvancedChecker is Clone, IAdvancedChecker {
     /// @param subject The address to validate.
     /// @param evidence Custom validation data.
     /// @return checked Boolean indicating whether the validation passed.
-    function _checkPre(address subject, bytes calldata evidence) internal view virtual returns (bool checked) {}
+    function _checkPre(address subject, bytes calldata evidence) internal view virtual returns (bool checked) { }
 
     /// @notice Main validation logic.
     /// @dev Derived contracts should override this to implement main check validation.
     /// @param subject The address to validate.
     /// @param evidence Custom validation data.
     /// @return checked Boolean indicating whether the validation passed.
-    function _checkMain(address subject, bytes calldata evidence) internal view virtual returns (bool checked) {}
+    function _checkMain(address subject, bytes calldata evidence) internal view virtual returns (bool checked) { }
 
     /// @notice Post-condition validation logic.
     /// @dev Derived contracts should override this to implement post-check validation.
     /// @param subject The address to validate.
     /// @param evidence Custom validation data.
     /// @return checked Boolean indicating whether the validation passed.
-    function _checkPost(address subject, bytes calldata evidence) internal view virtual returns (bool checked) {}
+    function _checkPost(address subject, bytes calldata evidence) internal view virtual returns (bool checked) { }
 }

packages/contracts/contracts/checker/BaseChecker.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {IBaseChecker} from "../interfaces/IBaseChecker.sol";
-import {Clone} from "../proxy/Clone.sol";
+import { IBaseChecker } from "../interfaces/IBaseChecker.sol";
+import { Clone } from "../proxy/Clone.sol";
 
 /// @title BaseChecker
 /// @notice Abstract base contract for implementing validation checks.
@@ -24,5 +24,5 @@ abstract contract BaseChecker is Clone, IBaseChecker {
     /// @param subject The address to validate.
     /// @param evidence Custom validation data.
     /// @return checked Boolean indicating whether the validation passed.
-    function _check(address subject, bytes calldata evidence) internal view virtual returns (bool checked) {}
+    function _check(address subject, bytes calldata evidence) internal view virtual returns (bool checked) { }
 }

packages/contracts/contracts/extensions/anonAadhaar/AnonAadhaarChecker.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BaseChecker} from "../../checker/BaseChecker.sol";
-import {IAnonAadhaar} from "./IAnonAadhaar.sol";
+import { BaseChecker } from "../../checker/BaseChecker.sol";
+import { IAnonAadhaar } from "./IAnonAadhaar.sol";
 
 /// @title AnonAadhaarChecker
 /// @notice AnonAadhaar validator.
@@ -58,16 +58,9 @@ contract AnonAadhaarChecker is BaseChecker {
         }
 
         // check if the proof validates
-        if (
-            !anonAadhaarContract.verifyAnonAadhaarProof(
-                providedNullifierSeed,
-                nullifier,
-                timestamp,
-                signal,
-                revealArray,
-                groth16Proof
-            )
-        ) {
+        if (!anonAadhaarContract.verifyAnonAadhaarProof(
+                providedNullifierSeed, nullifier, timestamp, signal, revealArray, groth16Proof
+            )) {
             revert InvalidProof();
         }
 

packages/contracts/contracts/extensions/anonAadhaar/AnonAadhaarCheckerFactory.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {Factory} from "../../proxy/Factory.sol";
-import {AnonAadhaarChecker} from "./AnonAadhaarChecker.sol";
+import { Factory } from "../../proxy/Factory.sol";
+import { AnonAadhaarChecker } from "./AnonAadhaarChecker.sol";
 
 /// @title AnonAadhaarCheckerFactory
 /// @notice Factory contract for deploying minimal proxy instances of AnonAadhaarChecker.
 /// @dev Simplifies deployment of AnonAadhaarChecker clones with appended configuration data.
 contract AnonAadhaarCheckerFactory is Factory {
     /// @notice Initializes the factory with the AnonAadhaarChecker implementation.
-    constructor() Factory(address(new AnonAadhaarChecker())) {}
+    constructor() Factory(address(new AnonAadhaarChecker())) { }
 
     /// @notice Deploys a new AnonAadhaarChecker clone.
     /// @param anonAadhaarVerifier The address of the anonAadhaar contract

packages/contracts/contracts/extensions/anonAadhaar/AnonAadhaarPolicy.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BasePolicy} from "../../policy/BasePolicy.sol";
+import { BasePolicy } from "../../policy/BasePolicy.sol";
 
 /// @title AnonAadhaarPolicy
 /// @notice Policy contract enforcing Aadhaar validation.
@@ -14,7 +14,7 @@ contract AnonAadhaarPolicy is BasePolicy {
 
     /// @notice Create a new instance of AnonAadhaarPolicy
     // solhint-disable-next-line no-empty-blocks
-    constructor() payable {}
+    constructor() payable { }
 
     /// @notice Enforce a user if they can prove anonAadhaar proof
     /// @dev Throw if the proof is not valid or just complete silently
@@ -23,10 +23,7 @@ contract AnonAadhaarPolicy is BasePolicy {
     /// and groth16Proof.
     function _enforce(address subject, bytes calldata evidence) internal override {
         // decode the argument
-        (, uint256 nullifier, , , , ) = abi.decode(
-            evidence,
-            (uint256, uint256, uint256, uint256, uint256[4], uint256[8])
-        );
+        (, uint256 nullifier,,,,) = abi.decode(evidence, (uint256, uint256, uint256, uint256, uint256[4], uint256[8]));
 
         if (enforcedAadhaars[nullifier]) {
             revert AlreadyEnforced();

packages/contracts/contracts/extensions/anonAadhaar/AnonAadhaarPolicyFactory.sol

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {Factory} from "../../proxy/Factory.sol";
-import {IPolicyFactory} from "../../interfaces/IPolicyFactory.sol";
-import {AnonAadhaarPolicy} from "./AnonAadhaarPolicy.sol";
+import { Factory } from "../../proxy/Factory.sol";
+import { IPolicyFactory } from "../../interfaces/IPolicyFactory.sol";
+import { AnonAadhaarPolicy } from "./AnonAadhaarPolicy.sol";
 
 /// @title AnonAadhaarPolicyFactory
 /// @notice Factory contract for deploying minimal proxy instances of AnonAadhaarPolicy.
 /// @dev Simplifies deployment of AnonAadhaarPolicy clones with appended configuration data.
 contract AnonAadhaarPolicyFactory is Factory, IPolicyFactory {
     /// @notice Initializes the factory with the AnonAadhaarPolicy implementation.
-    constructor() Factory(address(new AnonAadhaarPolicy())) {}
+    constructor() Factory(address(new AnonAadhaarPolicy())) { }
 
     /// @notice Deploys a new AnonAadhaarPolicy clone with the specified checker address.
     /// @dev Encodes the checker address and caller as configuration data for the clone.

packages/contracts/contracts/extensions/anonAadhaar/IAnonAadhaar.sol

@@ -9,5 +9,8 @@ interface IAnonAadhaar {
         uint256 signal,
         uint256[4] memory revealArray,
         uint256[8] memory groth16Proof
-    ) external view returns (bool);
+    )
+        external
+        view
+        returns (bool);
 }

packages/contracts/contracts/extensions/eas/EASChecker.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BaseChecker} from "../../checker/BaseChecker.sol";
-import {IEAS} from "./IEAS.sol";
+import { BaseChecker } from "../../checker/BaseChecker.sol";
+import { IEAS } from "./IEAS.sol";
 
 /// @title EASChecker
 /// @notice EAS validator.