chore: Change the repository architecture to a monorepo

Consensys · Sep 29, 2023 · 22eb545 · 22eb545
1 parent e475d26
commit 22eb545
Show file tree

Hide file tree

Showing 66 changed files with 271 additions and 220 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,45 @@
+name: Lint
+
+on:
+  pull_request:
+    branches:
+      - main
+      - dev
+      - release/*
+  push:
+    branches:
+      - main
+      - dev
+      - release/*
+
+jobs:
+  lint:
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Check out the repo"
+        uses: "actions/checkout@v3"
+
+      - name: "Install Pnpm"
+        uses: "pnpm/action-setup@v2"
+        with:
+          version: "8"
+
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          cache: "pnpm"
+          node-version: "lts/*"
+
+      - name: "Install the Node.js dependencies"
+        run: "pnpm install"
+
+      - name: "Check code linting"
+        run: "pnpm -r run lint"
+
+      - name: "Run Prettier"
+        run: "pnpm run prettier"
+
+      - name: "Add lint summary"
+        run: |
+          echo "## Lint result" >> $GITHUB_STEP_SUMMARY
+          echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/smart-contracts-test.yml b/.github/workflows/smart-contracts-test.yml
@@ -1,4 +1,4 @@
-name: Smart Contracts Test
+name: Smart Contracts
 
 on:
   pull_request:
@@ -16,39 +16,13 @@ env:
   FOUNDRY_PROFILE: ci
 
 jobs:
-  lint:
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Check out the repo"
-        uses: "actions/checkout@v3"
-
-      - name: "Install Foundry"
-        uses: "foundry-rs/foundry-toolchain@v1"
-
-      - name: "Install Pnpm"
-        uses: "pnpm/action-setup@v2"
-        with:
-          version: "8"
-
-      - name: "Install Node.js"
-        uses: "actions/setup-node@v3"
-        with:
-          cache: "pnpm"
-          node-version: "lts/*"
-
-      - name: "Install the Node.js dependencies"
-        run: "pnpm install"
-
-      - name: "Lint the contracts"
-        run: "pnpm lint"
-
-      - name: "Add lint summary"
-        run: |
-          echo "## Lint result" >> $GITHUB_STEP_SUMMARY
-          echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
-
   build:
+    defaults:
+      run:
+        working-directory: contracts
+
     runs-on: "ubuntu-latest"
+
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
@@ -70,10 +44,17 @@ jobs:
           echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
 
   test-unit:
+    defaults:
+      run:
+        working-directory: contracts
+
     env:
       FOUNDRY_FUZZ_RUNS: "5000"
-    needs: ["lint", "build"]
+
+    needs: ["build"]
+
     runs-on: "ubuntu-latest"
+
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
@@ -84,16 +65,22 @@ jobs:
         uses: "foundry-rs/foundry-toolchain@v1"
 
       - name: "Run the unit tests"
-        run: 'forge test --match-path "test/*"'
+        run: "forge test"
 
       - name: "Add test summary"
         run: |
           echo "## Unit tests result" >> $GITHUB_STEP_SUMMARY
           echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
 
   coverage:
-    needs: ["lint", "build"]
+    defaults:
+      run:
+        working-directory: contracts
+
+    needs: ["build"]
+
     runs-on: "ubuntu-latest"
+
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
@@ -104,7 +91,7 @@ jobs:
         uses: "foundry-rs/foundry-toolchain@v1"
 
       - name: "Generate the coverage report using the unit tests"
-        run: 'forge coverage --match-path "test/**/*.sol" --report lcov'
+        run: "forge coverage --report lcov"
 
       - name: "Upload coverage report to Codecov"
         uses: "codecov/codecov-action@v3"
@@ -126,8 +113,14 @@ jobs:
           echo "✅ Uploaded to Codecov" >> $GITHUB_STEP_SUMMARY
 
   upgradeability:
-    needs: ["lint", "build"]
+    defaults:
+      run:
+        working-directory: contracts
+
+    needs: ["build"]
+
     runs-on: "ubuntu-latest"
+
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
@@ -155,7 +148,7 @@ jobs:
         run: "forge build"
 
       - name: "Check contracts upgradeability"
-        run: "pnpm run check:upgradeability:ci"
+        run: "cd contracts && pnpm run check:upgradeability:ci"
 
       - name: "Add upgradeability summary"
         run: |

diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,12 @@
-[submodule "lib/forge-std"]
-  branch = "v1"
-  path = "lib/forge-std"
-  url = "https://github.com/foundry-rs/forge-std"
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-  branch = "release-v4.9"
-  path = "lib/openzeppelin-contracts-upgradeable"
-  url = "https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable"
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
+[submodule "contracts/lib/forge-std"]
+    branch = "v1"
+	path = contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
+    branch = "release-v4.9"
+	path = contracts/lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "contracts/lib/openzeppelin-contracts"]
+    branch = "release-v4.9"
+	path = contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -2,5 +2,5 @@
 . "$(dirname -- "$0")/_/husky.sh"
 
 pnpm run prettier:write
-pnpm run lint
-pnpm run test
+pnpm -r run lint
+pnpm -r run test
diff --git a/.env.example → contracts/.env.example b/.env.example → contracts/.env.example
diff --git a/.openzeppelin/unknown-59140.json → contracts/.openzeppelin/unknown-59140.json b/.openzeppelin/unknown-59140.json → contracts/.openzeppelin/unknown-59140.json
diff --git a/.openzeppelin/unknown-59144.json → contracts/.openzeppelin/unknown-59144.json b/.openzeppelin/unknown-59144.json → contracts/.openzeppelin/unknown-59144.json
diff --git a/foundry.toml → contracts/foundry.toml b/foundry.toml → contracts/foundry.toml
@@ -8,6 +8,3 @@ linea_goerli = "${LINEA_GOERLI_RPC_URL}"
 
 [etherscan]
 linea_goerli = { key = "${ETHERSCAN_API_KEY}" }
-
-
-# See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/hardhat.config.ts → contracts/hardhat.config.ts b/hardhat.config.ts → contracts/hardhat.config.ts
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/lib/openzeppelin-contracts b/contracts/lib/openzeppelin-contracts
diff --git a/contracts/lib/openzeppelin-contracts-upgradeable b/contracts/lib/openzeppelin-contracts-upgradeable
diff --git a/contracts/package.json b/contracts/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "linea-attestation-registry-contracts",
+  "version": "0.0.1",
+  "description": "Verax Attestation Registry core smart contracts",
+  "keywords": [
+    "linea-attestation-registry",
+    "blockchain",
+    "attestation",
+    "ethereum",
+    "foundry",
+    "smart-contracts",
+    "solidity"
+  ],
+  "repository": "github.com/Consensys/linea-attestation-registry",
+  "license": "MIT",
+  "author": "Consensys",
+  "files": [
+    "src"
+  ],
+  "scripts": {
+    "build": "forge build",
+    "check:upgradeability": "npx hardhat run script/upgrade/checkUpgradeability.ts",
+    "check:upgradeability:ci": "cp .env.example .env && pnpm run check:upgradeability",
+    "check:upgradeable": "npx hardhat run --network linea script/upgrade/checkUpgradeable.ts",
+    "check:upgradeable:goerli": "npx hardhat run --network linea-goerli script/upgrade/checkUpgradeable.ts",
+    "clean": "rm -rf lcov.info coverage artifacts cache_hardhat cache out typechain-types",
+    "deploy:CorrectModule": "npx hardhat run --network linea script/deploy/deployCorrectModule.ts",
+    "deploy:CorrectModule:goerli": "npx hardhat run --network linea-goerli script/deploy/deployCorrectModule.ts",
+    "deploy:IncorrectModule": "npx hardhat run --network linea script/deploy/deployIncorrectModule.ts",
+    "deploy:IncorrectModule:goerli": "npx hardhat run --network linea-goerli script/deploy/deployIncorrectModule.ts",
+    "deploy:MsgSenderModule": "npx hardhat run --network linea script/deploy/deployMsgSenderModule.ts",
+    "deploy:MsgSenderModule:goerli": "npx hardhat run --network linea-goerli script/deploy/deployMsgSenderModule.ts",
+    "deploy:all": "npx hardhat run --network linea script/deploy/deployEverything.ts",
+    "deploy:all:goerli": "npx hardhat run --network linea-goerli script/deploy/deployEverything.ts",
+    "deploy:post": "npx hardhat run --network linea script/deploy/postDeployment.ts",
+    "deploy:post:goerli": "npx hardhat run --network linea-goerli script/deploy/postDeployment.ts",
+    "lint": "pnpm solhint \"{script,src,test}/**/*.sol\"",
+    "reimport": "npx hardhat run --network linea script/recreateNetworkFile.ts",
+    "reimport:goerli": "npx hardhat run --network linea-goerli script/recreateNetworkFile.ts",
+    "test": "forge test",
+    "upgrade:all": "npx hardhat run --network linea script/upgrade/upgradeEverything.ts",
+    "upgrade:all:force": "npx hardhat run --network linea script/upgrade/forceUgradeEverything.ts",
+    "upgrade:all:goerli": "npx hardhat run --network linea-goerli script/upgrade/upgradeEverything.ts",
+    "upgrade:all:goerli:force": "npx hardhat run --network linea-goerli script/upgrade/forceUgradeEverything.ts"
+  },
+  "devDependencies": {
+    "@nomicfoundation/hardhat-ethers": "^3.0.4",
+    "@nomicfoundation/hardhat-foundry": "^1.1.1",
+    "@nomicfoundation/hardhat-toolbox": "^3.0.0",
+    "@openzeppelin/hardhat-upgrades": "^2.2.1",
+    "dotenv": "^16.3.1",
+    "ethers": "^6.7.1",
+    "hardhat": "^2.17.2",
+    "solhint": "^3.6.2",
+    "solhint-plugin-prettier": "^0.0.5"
+  },
+  "pnpm": {
+    "overrides": {
+      "flat@<5.0.1": ">=5.0.1",
+      "tough-cookie@<4.1.3": ">=4.1.3",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
+  }
+}
diff --git a/script/deploy/deployCorrectModule.ts → ...acts/script/deploy/deployCorrectModule.ts b/script/deploy/deployCorrectModule.ts → ...acts/script/deploy/deployCorrectModule.ts
diff --git a/script/deploy/deployEverything.ts → contracts/script/deploy/deployEverything.ts b/script/deploy/deployEverything.ts → contracts/script/deploy/deployEverything.ts
diff --git a/script/deploy/deployIncorrectModule.ts → ...ts/script/deploy/deployIncorrectModule.ts b/script/deploy/deployIncorrectModule.ts → ...ts/script/deploy/deployIncorrectModule.ts
diff --git a/script/deploy/deployMsgSenderModule.ts → ...ts/script/deploy/deployMsgSenderModule.ts b/script/deploy/deployMsgSenderModule.ts → ...ts/script/deploy/deployMsgSenderModule.ts
diff --git a/script/deploy/postDeployment.ts → contracts/script/deploy/postDeployment.ts b/script/deploy/postDeployment.ts → contracts/script/deploy/postDeployment.ts
diff --git a/script/recreateNetworkFile.ts → contracts/script/recreateNetworkFile.ts b/script/recreateNetworkFile.ts → contracts/script/recreateNetworkFile.ts
diff --git a/script/upgrade/checkUpgradeability.ts → ...cts/script/upgrade/checkUpgradeability.ts b/script/upgrade/checkUpgradeability.ts → ...cts/script/upgrade/checkUpgradeability.ts
diff --git a/script/upgrade/checkUpgradeable.ts → contracts/script/upgrade/checkUpgradeable.ts b/script/upgrade/checkUpgradeable.ts → contracts/script/upgrade/checkUpgradeable.ts
diff --git a/script/upgrade/forceUpgradeEverything.ts → .../script/upgrade/forceUpgradeEverything.ts b/script/upgrade/forceUpgradeEverything.ts → .../script/upgrade/forceUpgradeEverything.ts
diff --git a/script/upgrade/upgradeEverything.ts → ...racts/script/upgrade/upgradeEverything.ts b/script/upgrade/upgradeEverything.ts → ...racts/script/upgrade/upgradeEverything.ts
diff --git a/src/AttestationRegistry.sol → contracts/src/AttestationRegistry.sol b/src/AttestationRegistry.sol → contracts/src/AttestationRegistry.sol
diff --git a/src/ModuleRegistry.sol → contracts/src/ModuleRegistry.sol b/src/ModuleRegistry.sol → contracts/src/ModuleRegistry.sol
diff --git a/src/PortalRegistry.sol → contracts/src/PortalRegistry.sol b/src/PortalRegistry.sol → contracts/src/PortalRegistry.sol
diff --git a/src/Router.sol → contracts/src/Router.sol b/src/Router.sol → contracts/src/Router.sol
diff --git a/src/SchemaRegistry.sol → contracts/src/SchemaRegistry.sol b/src/SchemaRegistry.sol → contracts/src/SchemaRegistry.sol
diff --git a/src/example/CorrectModule.sol → contracts/src/example/CorrectModule.sol b/src/example/CorrectModule.sol → contracts/src/example/CorrectModule.sol
diff --git a/src/example/EASPortal.sol → contracts/src/example/EASPortal.sol b/src/example/EASPortal.sol → contracts/src/example/EASPortal.sol
diff --git a/src/example/IncorrectModule.sol → contracts/src/example/IncorrectModule.sol b/src/example/IncorrectModule.sol → contracts/src/example/IncorrectModule.sol
diff --git a/src/example/MsgSenderModule.sol → contracts/src/example/MsgSenderModule.sol b/src/example/MsgSenderModule.sol → contracts/src/example/MsgSenderModule.sol
diff --git a/src/example/NFTPortal.sol → contracts/src/example/NFTPortal.sol b/src/example/NFTPortal.sol → contracts/src/example/NFTPortal.sol
diff --git a/src/example/PayableModule.sol → contracts/src/example/PayableModule.sol b/src/example/PayableModule.sol → contracts/src/example/PayableModule.sol
diff --git a/src/interface/AbstractModule.sol → contracts/src/interface/AbstractModule.sol b/src/interface/AbstractModule.sol → contracts/src/interface/AbstractModule.sol
diff --git a/src/interface/AbstractPortal.sol → contracts/src/interface/AbstractPortal.sol b/src/interface/AbstractPortal.sol → contracts/src/interface/AbstractPortal.sol
diff --git a/src/interface/IRouter.sol → contracts/src/interface/IRouter.sol b/src/interface/IRouter.sol → contracts/src/interface/IRouter.sol
diff --git a/src/portal/DefaultPortal.sol → contracts/src/portal/DefaultPortal.sol b/src/portal/DefaultPortal.sol → contracts/src/portal/DefaultPortal.sol
diff --git a/src/types/Structs.sol → contracts/src/types/Structs.sol b/src/types/Structs.sol → contracts/src/types/Structs.sol
diff --git a/test/AttestationRegistry.t.sol → contracts/test/AttestationRegistry.t.sol b/test/AttestationRegistry.t.sol → contracts/test/AttestationRegistry.t.sol
diff --git a/test/ModuleRegistry.t.sol → contracts/test/ModuleRegistry.t.sol b/test/ModuleRegistry.t.sol → contracts/test/ModuleRegistry.t.sol
diff --git a/test/PortalRegistry.t.sol → contracts/test/PortalRegistry.t.sol b/test/PortalRegistry.t.sol → contracts/test/PortalRegistry.t.sol
diff --git a/test/Router.t.sol → contracts/test/Router.t.sol b/test/Router.t.sol → contracts/test/Router.t.sol
diff --git a/test/SchemaRegistry.t.sol → contracts/test/SchemaRegistry.t.sol b/test/SchemaRegistry.t.sol → contracts/test/SchemaRegistry.t.sol
diff --git a/test/example/EASPortal.t.sol → contracts/test/example/EASPortal.t.sol b/test/example/EASPortal.t.sol → contracts/test/example/EASPortal.t.sol
diff --git a/test/example/MsgSenderModule.t.sol → contracts/test/example/MsgSenderModule.t.sol b/test/example/MsgSenderModule.t.sol → contracts/test/example/MsgSenderModule.t.sol
diff --git a/test/example/NFTPortal.t.sol → contracts/test/example/NFTPortal.t.sol b/test/example/NFTPortal.t.sol → contracts/test/example/NFTPortal.t.sol
diff --git a/test/example/PayableModule.t.sol → contracts/test/example/PayableModule.t.sol b/test/example/PayableModule.t.sol → contracts/test/example/PayableModule.t.sol
diff --git a/...integration/AttestationRegistryMass.t.sol → ...integration/AttestationRegistryMass.t.sol b/...integration/AttestationRegistryMass.t.sol → ...integration/AttestationRegistryMass.t.sol
diff --git a/test/mocks/AttestationRegistryMock.sol → ...ts/test/mocks/AttestationRegistryMock.sol b/test/mocks/AttestationRegistryMock.sol → ...ts/test/mocks/AttestationRegistryMock.sol
diff --git a/test/mocks/InvalidPortalMock.sol → contracts/test/mocks/InvalidPortalMock.sol b/test/mocks/InvalidPortalMock.sol → contracts/test/mocks/InvalidPortalMock.sol
diff --git a/test/mocks/ModuleRegistryMock.sol → contracts/test/mocks/ModuleRegistryMock.sol b/test/mocks/ModuleRegistryMock.sol → contracts/test/mocks/ModuleRegistryMock.sol
diff --git a/test/mocks/PortalRegistryMock.sol → contracts/test/mocks/PortalRegistryMock.sol b/test/mocks/PortalRegistryMock.sol → contracts/test/mocks/PortalRegistryMock.sol
diff --git a/test/mocks/SchemaRegistryMock.sol → contracts/test/mocks/SchemaRegistryMock.sol b/test/mocks/SchemaRegistryMock.sol → contracts/test/mocks/SchemaRegistryMock.sol
diff --git a/test/mocks/ValidPortalMock.sol → contracts/test/mocks/ValidPortalMock.sol b/test/mocks/ValidPortalMock.sol → contracts/test/mocks/ValidPortalMock.sol
diff --git a/test/portal/DefaultPortal.t.sol → contracts/test/portal/DefaultPortal.t.sol b/test/portal/DefaultPortal.t.sol → contracts/test/portal/DefaultPortal.t.sol
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "linea-attestation-registry",
   "version": "0.0.1",
-  "description": "Core smart contracts to read and write attestations on Linea",
+  "description": "Verax is a shared on-chain attestation registry",
   "keywords": [
     "linea-attestation-registry",
     "blockchain",
@@ -14,61 +14,18 @@
   "repository": "github.com/Consensys/linea-attestation-registry",
   "license": "MIT",
   "author": "Consensys",
-  "files": [
-    "src"
-  ],
   "scripts": {
-    "build": "forge build",
-    "check:upgradeability": "npx hardhat run script/upgrade/checkUpgradeability.ts",
-    "check:upgradeability:ci": "cp .env.example .env && pnpm run check:upgradeability",
-    "check:upgradeable": "npx hardhat run --network linea script/upgrade/checkUpgradeable.ts",
-    "check:upgradeable:goerli": "npx hardhat run --network linea-goerli script/upgrade/checkUpgradeable.ts",
-    "clean": "rm -rf lcov.info coverage artifacts cache_hardhat cache out typechain-types",
-    "deploy:CorrectModule": "npx hardhat run --network linea script/deploy/deployCorrectModule.ts",
-    "deploy:CorrectModule:goerli": "npx hardhat run --network linea-goerli script/deploy/deployCorrectModule.ts",
-    "deploy:IncorrectModule": "npx hardhat run --network linea script/deploy/deployIncorrectModule.ts",
-    "deploy:IncorrectModule:goerli": "npx hardhat run --network linea-goerli script/deploy/deployIncorrectModule.ts",
-    "deploy:MsgSenderModule": "npx hardhat run --network linea script/deploy/deployMsgSenderModule.ts",
-    "deploy:MsgSenderModule:goerli": "npx hardhat run --network linea-goerli script/deploy/deployMsgSenderModule.ts",
-    "deploy:all": "npx hardhat run --network linea script/deploy/deployEverything.ts",
-    "deploy:all:goerli": "npx hardhat run --network linea-goerli script/deploy/deployEverything.ts",
-    "deploy:post": "npx hardhat run --network linea script/deploy/postDeployment.ts",
-    "deploy:post:goerli": "npx hardhat run --network linea-goerli script/deploy/postDeployment.ts",
-    "lint": "pnpm lint:sol && eslint . && pnpm prettier:check",
-    "lint:sol": "pnpm solhint \"{script,src,test}/**/*.sol\"",
+    "lint": "eslint .",
     "prepare": "husky install",
-    "prettier:check": "prettier --check \"**/*.{json,md,svg,yml,sol,ts}\"",
-    "prettier:write": "prettier --write \"**/*.{json,md,svg,yml,sol,ts}\"",
-    "reimport": "npx hardhat run --network linea script/recreateNetworkFile.ts",
-    "reimport:goerli": "npx hardhat run --network linea-goerli script/recreateNetworkFile.ts",
-    "test": "forge test",
-    "upgrade:all": "npx hardhat run --network linea script/upgrade/upgradeEverything.ts",
-    "upgrade:all:force": "npx hardhat run --network linea script/upgrade/forceUgradeEverything.ts",
-    "upgrade:all:goerli": "npx hardhat run --network linea-goerli script/upgrade/upgradeEverything.ts",
-    "upgrade:all:goerli:force": "npx hardhat run --network linea-goerli script/upgrade/forceUgradeEverything.ts"
+    "prettier": "prettier --check \"**/*.{json,md,svg,yml,sol,ts}\"",
+    "prettier:write": "prettier --write \"**/*.{json,md,svg,yml,sol,ts}\""
   },
   "devDependencies": {
-    "@nomicfoundation/hardhat-ethers": "^3.0.4",
-    "@nomicfoundation/hardhat-foundry": "^1.1.1",
-    "@nomicfoundation/hardhat-toolbox": "^3.0.0",
-    "@openzeppelin/hardhat-upgrades": "^2.2.1",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "ethers": "^6.7.1",
-    "hardhat": "^2.17.2",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
+    "eslint": "^8.50.0",
     "husky": "^8.0.3",
     "prettier": "^2.8.8",
-    "prettier-plugin-solidity": "^1.1.3",
-    "solhint": "^3.6.2",
-    "solhint-plugin-prettier": "^0.0.5"
-  },
-  "pnpm": {
-    "overrides": {
-      "flat@<5.0.1": ">=5.0.1",
-      "tough-cookie@<4.1.3": ">=4.1.3",
-      "minimatch@<3.0.5": ">=3.0.5"
-    }
+    "prettier-plugin-solidity": "^1.1.3"
   }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,3 @@ linea_goerli = "${LINEA_GOERLI_RPC_URL}"

		[etherscan]
		linea_goerli = { key = "${ETHERSCAN_API_KEY}" }


		# See more config options https://github.com/foundry-rs/foundry/tree/master/config