Merge pull request #26 from euler-xyz/refactor/withdraw

Feat:refactor withdraw mechanism
euler-xyz · Jun 19, 2024 · 4c3c078 · 4c3c078
2 parents 46fc6e9 + a475294
commit 4c3c078
Show file tree

Hide file tree

Showing 39 changed files with 2,390 additions and 1,676 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -11,3 +11,9 @@
 [submodule "lib/reward-streams"]
 	path = lib/reward-streams
 	url = https://github.com/euler-xyz/reward-streams
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/foundry.toml b/foundry.toml
@@ -17,6 +17,9 @@ int_types = "long"
 quote_style = "double"
 number_underscore = "preserve"
 override_spacing = true
+ignore = [
+    "src/lib/StorageLib.sol"
+]
 
 [profile.test]
 no_match_test = "Fuzz"

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
@@ -5,4 +5,5 @@ forge-std/=lib/forge-std/src/
 evk/=lib/euler-vault-kit/
 reward-streams=lib/reward-streams/src
 openzeppelin-contracts/=lib/reward-streams/lib/openzeppelin-contracts/contracts
-@openzeppelin/=lib/ethereum-vault-connector/lib/openzeppelin-contracts/contracts/
+@openzeppelin/=lib/openzeppelin-contracts/
+@openzeppelin-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/