Dev 2.0

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: test
 
 on: 
   push:
-    branches: [ "main" ]
+    branches: [ "dev-2.0" ]
   pull_request:
     branches: [ "main" ]
 
@@ -18,21 +18,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1.2.0
+        uses: foundry-rs/foundry-toolchain@v1.3.1
         with:
-          version: nightly
+          version: stable
 
       - name: Run Forge build
         run: |
           forge --version
+          forge soldeer install
           forge build --sizes
         id: build
 
       - name: Run Forge tests
         run: |
-          forge test -vvvv
+          forge test -vvv --gas-report
         id: test
+
+      - name: Run snapshot
+        run: forge snapshot

.gitignore

@@ -19,5 +19,10 @@ docs/
 .env
 
 # IDE
+.deps/
 .vscode/
 .prettierrc.json
+src/artifacts/
+
+# foundry
+dependencies/

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/prb-math"]
-	path = lib/prb-math
-	url = https://github.com/paulRBerg/prb-math
+[submodule "src/L2/Superchain"]
+	path = src/L2/Superchain
+	url = git@github.com:M3tering/SuperchainSolaxy.git

README.md

@@ -33,18 +33,23 @@ Read our Contribution Guidelines for details. Join us in making Solaxy better!
 ### Project Layout
 The project is filed in the following directory structure:
 ```
-├── lib/                 # Project dependencies stored as git submodules
+├── dependencies/       # Project dependencies stored 
 ├── script/              # Foundry testing scripts
 ├── src/                 # Contains the Solidity smart contract files
 │   ├── Interfaces/      # Contract interfaces for Solaxy
 ├── test/                # Solidity tests for Foundry
 ```
 
+### How to Install Dependencies
+Soldeer is used for managing and installing the dependencies for this repo, rather that the default Foundry approach of using git submodules. Simply run `forge soldeer install` to stepup any missing dependencies. See [Foundry book](https://book.getfoundry.sh/projects/soldeer).
+
 ### How to Run Tests
 1. Ensure you have Foundry installed: See [Foundry book](https://book.getfoundry.sh/getting-started/installation)
 1. Download or clone the project repository
 1. Navigate to the project directory in your terminal.
-1. Run `forge test -vvv` to execute tests on a fork of IoTeX mainnet, 
+1. Install all dependencies: See my section on 
+ [How to Install Dependencies](#how-to-install-dependencies)
+1. Run `forge test -vvv` to execute tests on a fork of Ethereum mainnet, 
 
 ### License
 This project is licensed under the [MIT License](README.md).

foundry.toml

@@ -1,19 +1,28 @@
 [profile.default]
 src = "src"
 out = "out"
-libs = ["lib"]
 optimizer = true
 optimizer-runs = 1000
-solc-version = "0.8.24"
+solc-version = "0.8.28"
+libs = ["dependencies"]
 
 remappings = [
-    "@prb/math@4.0.2/=lib/prb-math/",
-    "@openzeppelin/contracts@5.0.2/=lib/openzeppelin-contracts/contracts/"
+    "solady/=dependencies/solady-0.1.7/",
+    "forge-std/=dependencies/forge-std-1.9.5/src/",
+    "@prb/math@4.1.0/=dependencies/@prb-math-4.1.0/",
 ]
 
+[soldeer]
+remappings_generate = false
+remappings_location = "config"
+
+[dependencies]
+forge-std = "1.9.5"
+solady = "0.1.7"
+"@prb-math" = "4.1.0"
+
 [rpc_endpoints]
-gnosis-mainnet = "https://gnosis-rpc.publicnode.com"
-chiado-testnet = "https://rpc.chiadochain.net"
+ethereum-mainnet = "https://gateway.tenderly.co/public/mainnet"
 
 [fuzz]
 seed = "0x544D"