build: switch to soldeer

0xPolygon · Jul 5, 2024 · fbc2125 · fbc2125
1 parent 5851746
commit fbc2125
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /target
 /out
 /cache
+/dependencies
 /coverage
 lcov.info
 .DS_Store

diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ A default implementation is included and this contract will be proxy upgradable
 ### Setup
 
 - [Install foundry](https://book.getfoundry.sh/getting-started/installation)
-- Install Dependencies: `forge install`
+- Install Dependencies: `forge soldeer install`
 - Build: `forge build`
 - Test: `forge test`
 

diff --git a/foundry.toml b/foundry.toml
@@ -1,7 +1,7 @@
 [profile.default]
 src = 'src'
 out = 'out'
-libs = ['lib']
+libs = ['dependencies']
 optimizer = true
 optimizer_runs = 200
 via_ir = true
@@ -23,3 +23,8 @@ runs = 10000
 max_test_rejects = 999999
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
+
+[dependencies]
+forge-std = "1.9.1"
+"@openzeppelin-contracts-upgradeable" = "4.9.2"
+"@openzeppelin-contracts" = "4.9.2"
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/remappings.txt b/remappings.txt
@@ -0,0 +1,6 @@
+forge-std/=dependencies/forge-std-1.9.1/src/
+openzeppelin-contracts-upgradeable/contracts/=dependencies/@openzeppelin-contracts-upgradeable-4.9.2/
+openzeppelin-contracts/contracts/=dependencies/@openzeppelin-contracts-4.9.2/
+@forge-std-1.9.1=dependencies/forge-std-1.9.1
+@openzeppelin-contracts-upgradeable-4.9.2=dependencies/@openzeppelin-contracts-upgradeable-4.9.2
+@openzeppelin-contracts-4.9.2=dependencies/@openzeppelin-contracts-4.9.2
diff --git a/soldeer.lock b/soldeer.lock
@@ -0,0 +1,18 @@
+
+[[dependencies]]
+name = "forge-std"
+version = "1.9.1"
+source = "https://soldeer-revisions.s3.amazonaws.com/forge-std/v1_9_1_03-07-2024_14:44:59_forge-std-v1.9.1.zip"
+checksum = "110b35ad3604d91a919c521c71206c18cd07b29c750bd90b5cbbaf37288c9636"
+
+[[dependencies]]
+name = "@openzeppelin-contracts-upgradeable"
+version = "4.9.2"
+source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts-upgradeable/4_9_2_22-01-2024_13:15:04_contracts-upgradeable.zip"
+checksum = "33a161bf7799dcac1475d2470615b56a8f9a9387cb8eef921b49816dbbc61c2b"
+
+[[dependencies]]
+name = "@openzeppelin-contracts"
+version = "4.9.2"
+source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_2_22-01-2024_13:13:52_contracts.zip"
+checksum = "0f4450671798ea5659e6391876a3cf443ca50a696d9b556ac622ec7660bce306"