build: use soldeer package manager

.github/workflows/ci.yml

@@ -24,6 +24,10 @@ jobs:
         with:
           cache: true
 
+      - name: Install dependencies
+        run: forge soldeer install
+        working-directory: ./contracts
+
       - name: Show Foundry version
         run: forge --version
 

.gitignore

@@ -3,6 +3,7 @@ cache/
 out/
 target/
 deps/
+dependencies/
 node_modules/
 .vscode/*
 .idea/
@@ -19,8 +20,3 @@ contracts/broadcast/*/31337/
 .history
 *.nockma
 *.bkp
-
-
-# Added by cargo
-
-/target

.gitmodules

@@ -1,16 +0,0 @@
-[submodule "lib/forge-std"]
-	path = contracts/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = contracts/lib/openzeppelin-contracts
-	url = https://github.com/openzeppelin/openzeppelin-contracts
-[submodule "lib/risc0-ethereum"]
-	path = contracts/lib/risc0-ethereum
-	url = https://github.com/risc0/risc0-ethereum
-[submodule "lib/elliptic-curve-solidity"]
-	path = contracts/lib/elliptic-curve-solidity
-	url = https://github.com/witnet/elliptic-curve-solidity
-	branch = master
-[submodule "contracts/lib/solady"]
-	path = contracts/lib/solady
-	url = https://github.com/vectorized/solady

contracts/foundry.toml

@@ -1,5 +1,11 @@
 # Full reference https://github.com/foundry-rs/foundry/tree/master/crates/config
 [profile.default]
+src = "src"
+libs = ["lib", "dependencies"]
+out = "out"
+script = "script"
+test = "test"
+
 fs_permissions = [
     { access = "read", path = "./test/examples/transactions/test_tx_reg_01_01.bin" },
     { access = "read", path = "./test/examples/transactions/test_tx_reg_05_01.bin" },
@@ -19,17 +25,6 @@ fs_permissions = [
 ]
 
 
-auto_detect_remappings = false
-remappings = [
-    "forge-std/=lib/forge-std/src/",
-    "@openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/",
-    "openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/",  # Used within `risc0-ethereum`
-    "@solady/=lib/solady/src",
-    "@risc0-ethereum/=lib/risc0-ethereum/contracts/src/",
-    "@elliptic-curve-solidity/=lib/elliptic-curve-solidity/",
-]
-
-
 # Deterministic deployment settings (https://book.getfoundry.sh/guides/deterministic-deployments-using-create2#configuring-your-foundrytoml)
 cbor_metadata = false
 bytecode_hash = "none"
@@ -46,14 +41,33 @@ gas_reports = [
 optimizer = true
 via_ir = true
 optimizer_runs = 10_000
-
-src = "src"
-libs = ["lib"]
-out = "out"
-script = "script"
-test = "test"
 allow_internal_expect_revert = true
 
+auto_detect_remappings = false
+
+remappings = [
+    "forge-std/=dependencies/forge-std-1.11.0/src/",
+    "@openzeppelin-contracts/=dependencies/@openzeppelin-contracts-5.4.0/",
+    "openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.4.0/",
+    "@risc0-ethereum/=dependencies/risc0-ethereum-3.0.1/contracts/src/",
+    "@elliptic-curve-solidity/=dependencies/elliptic-curve-solidity-0.2.5/",
+    "@solady/=dependencies/solady-0.1.26/src/",
+]
+
+[dependencies]
+"forge-std" = "1.11.0"
+"@openzeppelin-contracts" = "5.4.0"
+"solady" = "0.1.26"
+"risc0-ethereum" = { version = "3.0.1", git = "https://github.com/risc0/risc0-ethereum.git", tag = "v3.0.1" }
+"elliptic-curve-solidity" = { version = "0.2.5", git = "https://github.com/witnet/elliptic-curve-solidity", rev = "347547890840fd501809dfe0b855206407136ec0" }
+
+[soldeer]
+recursive_deps = true
+remappings_generate = false
+remappings_regenerate = true
+remappings_version = false
+remappings_prefix = ""
+
 [fuzz]
 runs = 1_000
 

contracts/soldeer.lock

@@ -0,0 +1,32 @@
+[[dependencies]]
+name = "@openzeppelin-contracts"
+version = "5.4.0"
+url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_4_0_19-07-2025_08:59:41_contracts.zip"
+checksum = "3dd38f17610dba4602bd008ee2cb551e51e97d7b4ce04e1ffdf853da832942fa"
+integrity = "4eb0ef219d10ab5a5708adaae1132dc0a93ab6a193378486e842d606c989ff3e"
+
+[[dependencies]]
+name = "elliptic-curve-solidity"
+version = "0.2.5"
+git = "https://github.com/witnet/elliptic-curve-solidity"
+rev = "347547890840fd501809dfe0b855206407136ec0"
+
+[[dependencies]]
+name = "forge-std"
+version = "1.11.0"
+url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_11_0_09-10-2025_06:23:22_forge-std-1.11.zip"
+checksum = "0290ef84c693dc9086f98f6a9b4a69dc5c2b6aa1cfe10a989bd1def1a456c099"
+integrity = "84aa7d32f8c7329468cf16f31f0f74e68072e634fdbde98f3bb00c6b136103b2"
+
+[[dependencies]]
+name = "risc0-ethereum"
+version = "3.0.1"
+git = "https://github.com/risc0/risc0-ethereum.git"
+rev = "365e7b2db4f620fa256580c27558d2623362b9ae"
+
+[[dependencies]]
+name = "solady"
+version = "0.1.26"
+url = "https://soldeer-revisions.s3.amazonaws.com/solady/0_1_26_25-08-2025_15:30:06_solady.zip"
+checksum = "9872ac7cfd32c1eba32800508a1325c49f4a4aa8c6f670454db91971a583e26b"
+integrity = "5da4b5ca9cbad98812a4b75ad528ff34c72a0b84433204be6d1420c81de1d6ff"