From 39a6b5572bd9429f74f85c4f25d99c2c53e3983d Mon Sep 17 00:00:00 2001
From: "Julie B." <no-reply@bbjubjub.fr>
Date: Wed, 22 Jan 2025 22:10:16 +0100
Subject: [PATCH] feat: use soldeer by default

---
 .gas-snapshot            | 3 ++-
 .github/workflows/ci.yml | 2 +-
 .gitignore               | 4 ++++
 .gitmodules              | 3 ---
 foundry.toml             | 6 ++++++
 lib/forge-std            | 1 -
 remappings.txt           | 1 +
 soldeer.lock             | 6 ++++++
 test/Contract.t.sol      | 2 +-
 9 files changed, 21 insertions(+), 7 deletions(-)
 delete mode 160000 lib/forge-std
 create mode 100644 remappings.txt
 create mode 100644 soldeer.lock

diff --git a/.gas-snapshot b/.gas-snapshot
index 7b7b9ec..cac8b28 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1 +1,2 @@
-TestContract:testBar() (gas: 401)
+TestContract:testBar() (gas: 3702)
+TestContract:testFoo(uint256) (runs: 256, μ: 4552, ~: 4552)
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fbe7307..8b50564 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
           version: nightly
 
       - name: Install deps
-        run: forge install
+        run: forge soldeer update
 
       - name: Check gas snapshots
         run: forge snapshot --check
diff --git a/.gitignore b/.gitignore
index d8a1d07..7d7c196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 cache/
 out/
+
+
+# Soldeer
+/dependencies
diff --git a/.gitmodules b/.gitmodules
index 888d42d..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
diff --git a/foundry.toml b/foundry.toml
index 93d2364..452a48c 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -1,2 +1,8 @@
 [profile.ci.fuzz]
 runs = 10_000
+
+[profile.default]
+libs = ["dependencies"]
+
+[dependencies]
+forge-std = "1.9.5"
diff --git a/lib/forge-std b/lib/forge-std
deleted file mode 160000
index 40977d9..0000000
--- a/lib/forge-std
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 40977d9e9444acd4c59c16b6782c658c786c0d05
diff --git a/remappings.txt b/remappings.txt
new file mode 100644
index 0000000..ab7a74e
--- /dev/null
+++ b/remappings.txt
@@ -0,0 +1 @@
+forge-std-1.9.5/=dependencies/forge-std-1.9.5/
diff --git a/soldeer.lock b/soldeer.lock
new file mode 100644
index 0000000..2ce8859
--- /dev/null
+++ b/soldeer.lock
@@ -0,0 +1,6 @@
+[[dependencies]]
+name = "forge-std"
+version = "1.9.5"
+url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_9_5_21-12-2024_15:04:05_forge-std-1.9.zip"
+checksum = "57ada736f383289db77fac4472d48f820e7c98172cf9b01681b0c37065ce043f"
+integrity = "4753ffdfa0dde40878372b6a4d8e8fd1648b190b33996896c8b92f6f1680850f"
diff --git a/test/Contract.t.sol b/test/Contract.t.sol
index d7d6076..4de9b86 100644
--- a/test/Contract.t.sol
+++ b/test/Contract.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Unlicense
 pragma solidity ^0.8.13;
 
-import "forge-std/Test.sol";
+import "forge-std-1.9.5/src/Test.sol";
 
 import "src/Contract.sol";