Merge branch 'bh/package-revamp-part-2' into bh/package-revamp-part-3

.github/workflows/foundry-ci.yaml

@@ -6,23 +6,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
         with:
-          node-version: 18.18.0
-          cache: yarn
+          submodules: recursive
       - uses: foundry-rs/foundry-toolchain@v1
-      - run: yarn
       - run: forge build --contracts contracts/l1-contracts
 
   build-l2:
     name: Build L2
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
         with:
-          node-version: 18.18.0
-          cache: yarn
+          submodules: recursive
       - uses: foundry-rs/foundry-toolchain@v1
-      - run: yarn
       - run: forge build --contracts contracts/l2-contracts

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "lib/openzeppelin-contracts-v4"]
+	path = lib/openzeppelin-contracts-v4
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts-upgradeable-v4"]
+	path = lib/openzeppelin-contracts-upgradeable-v4
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

foundry.toml

@@ -6,4 +6,4 @@ optimizer-runs = 9999999
 src = 'contracts'
 out = 'out'
 cache_path = 'cache_forge'
-libs = ['node_modules']
+libs = ["lib"]

remappings.txt

@@ -1,2 +1,2 @@
-"@openzeppelin/contracts-v4/=node_modules/@openzeppelin/contracts-v4/"
-"@openzeppelin/contracts-upgradeable-v4/=node_modules/@openzeppelin/contracts-upgradeable-v4/"
+@openzeppelin/contracts-v4/=lib/openzeppelin-contracts-v4/contracts/
+@openzeppelin/contracts-upgradeable-v4/=lib/openzeppelin-contracts-upgradeable-v4/contracts/