Remove hardhat

yieldnest · Apr 5, 2024 · 46e9178 · 46e9178
1 parent 2563607
commit 46e9178
Show file tree

Hide file tree

Showing 70 changed files with 297 additions and 584 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/openzeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/safe-smart-account"]
+	path = lib/safe-smart-account
+	url = https://github.com/safe-global/safe-smart-account
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/openzeppelin/openzeppelin-contracts
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Setups
 
-install		:;	npm i && git submodule update --init --recursive
+install		:;	git submodule update --init --recursive
 
 # Linting and Formatting
 

diff --git a/foundry.toml b/foundry.toml
@@ -1,8 +1,12 @@
 [profile.default]
 src = 'src'
 out = 'out'
-libs = ['node_modules', 'lib']
+libs = ['lib']
 test = 'test'
-cache_path  = 'cache_forge'
+cache_path  = 'cache'
+
+[profile.solc]
+optimizer = true
+optimizer-runs = 200
 
 fs_permissions = [{ access = "read-write", path = "./deployments"}, { access = "read", path = "./"}]
diff --git a/hardhat.config.js b/hardhat.config.js
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/lib/safe-smart-account b/lib/safe-smart-account
diff --git a/package.json b/package.json
diff --git a/scripts/forge/Actors.sol → scripts/Actors.sol b/scripts/forge/Actors.sol → scripts/Actors.sol
@@ -41,18 +41,18 @@ contract ActorAddresses {
         });
 
         actors[1] = Actors({
-            DEFAULT_SIGNER: 0x0000000000000000000000000000000000000000,
-            PROXY_ADMIN_OWNER: 0x0000000000000000000000000000000000000000,
-            ADMIN: 0x0000000000000000000000000000000000000000,
-            STAKING_ADMIN: 0x0000000000000000000000000000000000000000,
-            STAKING_NODES_ADMIN: 0x0000000000000000000000000000000000000000,
-            VALIDATOR_MANAGER: 0x0000000000000000000000000000000000000000,
-            FEE_RECEIVER: 0x0000000000000000000000000000000000000000,
-            PAUSE_ADMIN: 0x0000000000000000000000000000000000000000,
-            LSD_RESTAKING_MANAGER: 0x0000000000000000000000000000000000000000,
-            STAKING_NODE_CREATOR: 0x0000000000000000000000000000000000000000,
-            ORACLE_MANAGER: 0x0000000000000000000000000000000000000000,
-            DEPOSIT_BOOTSTRAPER: 0x0000000000000000000000000000000000000000
+            DEFAULT_SIGNER: 		0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266,
+            PROXY_ADMIN_OWNER:		0x70997970C51812dc3A010C7d01b50e0d17dc79C8,
+            ADMIN: 					0x90F79bf6EB2c4f870365E785982E1f101E93b906,
+            STAKING_ADMIN: 			0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65,
+            STAKING_NODES_ADMIN: 	0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc,
+            VALIDATOR_MANAGER: 		0x976EA74026E726554dB657fA54763abd0C3a0aa9,
+            FEE_RECEIVER: 			0x14dC79964da2C08b23698B3D3cc7Ca32193d9955,
+            PAUSE_ADMIN:            0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f,
+            LSD_RESTAKING_MANAGER:  0xa0Ee7A142d267C1f36714E4a8F75612F20a79720,
+            STAKING_NODE_CREATOR: 0xBcd4042DE499D14e55001CcbB24a551F3b954096,
+            ORACLE_MANAGER: 0x71bE63f3384f5fb98995898A86B02Fb2426c5788,
+            DEPOSIT_BOOTSTRAPER: 0xFABB0ac9d68B0B445fB7357272Ff202C5651694a
         });
     }
 

diff --git a/scripts/forge/BaseScript.s.sol → scripts/BaseScript.s.sol b/scripts/forge/BaseScript.s.sol → scripts/BaseScript.s.sol
@@ -1,21 +1,21 @@
 // SPDX-License-Identifier: BSD 3-Clause License
 pragma solidity ^0.8.24;
 
-import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
-import "../../src/StakingNodesManager.sol";
-import "../../src/StakingNode.sol";
-import "../../src/RewardsReceiver.sol";
-import "../../src/ynLSD.sol";
-import "../../src/YieldNestOracle.sol";
-import "../../src/LSDStakingNode.sol";
-import "../../src/RewardsDistributor.sol";
-import "../../src/external/tokens/WETH.sol";
-import "../../src/ynETH.sol";
-import "../../lib/forge-std/src/Script.sol";
-import "../../lib/forge-std/src/StdJson.sol";
-import "./Utils.sol";
-
-import {ActorAddresses} from "scripts/forge/Actors.sol";
+import "lib/openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol";
+import "src/StakingNodesManager.sol";
+import "src/StakingNode.sol";
+import "src/RewardsReceiver.sol";
+import "src/ynLSD.sol";
+import "src/YieldNestOracle.sol";
+import "src/LSDStakingNode.sol";
+import "src/RewardsDistributor.sol";
+import "src/external/tokens/WETH.sol";
+import "src/ynETH.sol";
+import "lib/forge-std/src/Script.sol";
+import "lib/forge-std/src/StdJson.sol";
+import "scripts/Utils.sol";
+
+import {ActorAddresses} from "scripts/Actors.sol";
 
 abstract contract BaseScript is Script, Utils {
     using stdJson for string;

diff --git a/test/foundry/ContractAddresses.sol → scripts/ContractAddresses.sol b/test/foundry/ContractAddresses.sol → scripts/ContractAddresses.sol
diff --git a/scripts/forge/DeployYieldNest.s.sol → scripts/DeployYieldNest.s.sol b/scripts/forge/DeployYieldNest.s.sol → scripts/DeployYieldNest.s.sol
@@ -3,20 +3,20 @@ pragma solidity ^0.8.24;
 
 
 import "forge-std/Script.sol";
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
-import "../../src/StakingNodesManager.sol";
-import "../../src/RewardsReceiver.sol";
-import "../../src/RewardsDistributor.sol";
-import "../../src/ynETH.sol";
-import "../../src/interfaces/IStakingNode.sol";
-import "../../src/external/ethereum/IDepositContract.sol";
-import "../../src/interfaces/IRewardsDistributor.sol";
-import "../../src/external/tokens/IWETH.sol";
-import "../../test/foundry/ContractAddresses.sol";
-import "./BaseScript.s.sol";
-import "../../src/YieldNestOracle.sol";
-import "../../src/ynLSD.sol";
+import "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import "lib/openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol";
+import "src/StakingNodesManager.sol";
+import "src/RewardsReceiver.sol";
+import "src/RewardsDistributor.sol";
+import "src/ynETH.sol";
+import "src/interfaces/IStakingNode.sol";
+import "src/external/ethereum/IDepositContract.sol";
+import "src/interfaces/IRewardsDistributor.sol";
+import "src/external/tokens/IWETH.sol";
+import "scripts/ContractAddresses.sol";
+import "scripts/BaseScript.s.sol";
+import "src/YieldNestOracle.sol";
+import "src/ynLSD.sol";
 
 
 contract DeployYieldNest is BaseScript {

diff --git a/scripts/forge/DeployYnLSD.s.sol → scripts/DeployYnLSD.s.sol b/scripts/forge/DeployYnLSD.s.sol → scripts/DeployYnLSD.s.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BSD 3-Clause License
 pragma solidity ^0.8.24;
 
-import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {ynLSD} from "../../../src/ynLSD.sol";
-import {YieldNestOracle} from "../../../src/YieldNestOracle.sol";
-import {LSDStakingNode} from "../../../src/LSDStakingNode.sol";
-import "../../src/external/tokens/IWETH.sol";
-import "../../test/foundry/ContractAddresses.sol";
-import "./BaseScript.s.sol";
+import {TransparentUpgradeableProxy} from "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {ynLSD} from "src/ynLSD.sol";
+import {YieldNestOracle} from "src/YieldNestOracle.sol";
+import {LSDStakingNode} from "src/LSDStakingNode.sol";
+import "src/external/tokens/IWETH.sol";
+import "scripts/ContractAddresses.sol";
+import "scripts/BaseScript.s.sol";
 
 
 contract DeployYnLSD is BaseScript {

diff --git a/scripts/forge/Upgrade.s.sol → scripts/Upgrade.s.sol b/scripts/forge/Upgrade.s.sol → scripts/Upgrade.s.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.8.24;
 
 
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
-import "./BaseScript.s.sol";
+import "scripts/BaseScript.s.sol";
 
 contract Upgrade is BaseScript {
     function _deployImplementation(string memory contractName) internal returns (address, address) {

diff --git a/scripts/forge/Utils.sol → scripts/Utils.sol b/scripts/forge/Utils.sol → scripts/Utils.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import {Vm} from "forge-std/Vm.sol";
-import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
+import {ERC1967Utils} from "lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Utils.sol";
 
 contract Utils {
     /**

diff --git a/scripts/forge/Verify.s.sol → scripts/Verify.s.sol b/scripts/forge/Verify.s.sol → scripts/Verify.s.sol
@@ -1,8 +1,8 @@
 /// SPDX-License-Identifier: BSD 3-Clause License
 pragma solidity ^0.8.24;
 
-import {BaseScript} from "scripts/forge/BaseScript.s.sol";
-import {ActorAddresses} from "scripts/forge/Actors.sol";
+import {BaseScript} from "scripts/BaseScript.s.sol";
+import {ActorAddresses} from "scripts/Actors.sol";
 import {console} from "lib/forge-std/src/Console.sol";
 
 contract Verify is BaseScript {