use soldeer instead of gitsubmodules

.gitignore

@@ -37,4 +37,10 @@ crytic-export
 
 out
 cache_forge
-v2/broadcast/*/31337
+v2/broadcast/*/31337
+
+dependencies/
+
+# Ignoring remappings because we are adding them in foundry.toml
+# And currently forge soldeer always re-generate them, should be fixed in next version
+remappings.txt

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "v2/lib/openzeppelin-foundry-upgrades"]
-	path = v2/lib/openzeppelin-foundry-upgrades
-	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
-[submodule "v2/lib/forge-std"]
-	path = v2/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "v2/lib/openzeppelin-contracts-upgradeable"]
-	path = v2/lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

v2/README.md

@@ -4,6 +4,13 @@ We are currently developing Version 2 (V2) of our smart contract architecture. T
 
 Developers can already begin testing the new interface by referring to [the V2 Localnet guide](./scripts/localnet//v2_localnet.md).
 
+### Dependencies install
+
+```shell
+$ yarn
+$ forge soldeer update
+```
+
 ### Build
 
 ```shell

v2/foundry.toml

@@ -6,9 +6,11 @@ libs = ["lib"]
 remappings = [
   "ds-test/=node_modules/ds-test/src",
   "test/=test",
-  "forge-std/=lib/forge-std/src/",
-  "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/",
-  "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/"
+  "forge-std/=dependencies/forge-std-1.9.2/src/",
+  "openzeppelin-foundry-upgrades/=dependencies/openzeppelin-foundry-upgrades-0.3.2/src/",
+  "solidity-stringutils/=dependencies/openzeppelin-foundry-upgrades-0.3.2/lib/solidity-stringutils/",
+  "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/",
+  "@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/"
 ]
 
 no-match-contract = '.*EchidnaTest$'
@@ -33,3 +35,7 @@ quote_style = "double"
 tab_width = 4
 wrap_comments = true
 sort_imports=true
+
+[dependencies]
+forge-std = "1.9.2"
+openzeppelin-foundry-upgrades = "0.3.2"

v2/soldeer.lock

@@ -0,0 +1,12 @@
+
+[[dependencies]]
+name = "forge-std"
+version = "1.9.2"
+source = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_9_2_06-08-2024_17:31:25_forge-std-1.9.2.zip"
+checksum = "20fd008c7c69b6c737cc0284469d1c76497107bc3e004d8381f6d8781cb27980"
+
+[[dependencies]]
+name = "openzeppelin-foundry-upgrades"
+version = "0.3.2"
+source = "https://soldeer-revisions.s3.amazonaws.com/openzeppelin-foundry-upgrades/0_3_2_15-08-2024_13:33:43_openzeppelin-foundry-upgrades.zip"
+checksum = "664262fe158570c0b9742f18ac101b708ac5e4d4534daec321a47eeee200f225"