Scripts update

foundry.toml

@@ -11,11 +11,13 @@ runs = 256
 [profile.ci]
 fuzz_runs = 100_000
 verbosity = 4
+solc = "0.8.21"
+evm_version = "cancun"
 
 [rpc_endpoints]
 goerli = "${RPC_URL_GOERLI}"
 mainnet = "${RPC_URL_MAINNET}"
 
 [etherscan]
-goerli = {key = "${ETHERSCAN_KEY}", url = "https://api-goerli.etherscan.io/api"}
-mainnet = {key = "${ETHERSCAN_KEY}"}
+goerli = { key = "${ETHERSCAN_KEY}", url = "https://api-goerli.etherscan.io/api" }
+mainnet = { key = "${ETHERSCAN_KEY}" }

script/DeployLiquity.s.sol

@@ -4,11 +4,11 @@ pragma solidity ^0.8.13;
 import "forge-std/console2.sol";
 import {ERC20} from "solmate/tokens/ERC20.sol";
 
-import {MainnetAddresses} from "./base/MainnetAddresses.sol";
-import {MainnetDeployBase} from "./base/MainnetDeployBase.sol";
-import {ISwapRouter} from "../src/interfaces/uniswap/ISwapRouter.sol";
-import {Constants as C} from "../src/lib/Constants.sol";
-import {scLiquity} from "../src/liquity/scLiquity.sol";
+import {SwapperLib} from "src/lib/SwapperLib.sol";
+import {MainnetAddresses} from "script/base/MainnetAddresses.sol";
+import {MainnetDeployBase} from "script/base/MainnetDeployBase.sol";
+import {Constants as C} from "src/lib/Constants.sol";
+import {scLiquity} from "src/liquity/scLiquity.sol";
 
 /**
  * Mainnet deployment script for scLiquity vault.
@@ -24,32 +24,17 @@ contract DeployLiquity is MainnetDeployBase {
         // get some LUSD and make the initial deposit (addressing share inflation)
         weth.deposit{value: 0.01 ether}();
 
-        uint256 usdcAmount = _swapWethForUsdc(0.01 ether);
-        uint256 lusdAmount = _swapUsdcForLusd(usdcAmount);
+        uint256 usdcAmount =
+            SwapperLib._uniswapSwapExactInput(address(weth), address(usdc), deployerAddress, 0.01 ether, 0, 500); // 0.05% pool fee
+        uint256 lusdAmount =
+            SwapperLib._uniswapSwapExactInput(address(usdc), address(lusd), deployerAddress, usdcAmount, 0, 500); // 0.05% pool fee
 
         _deposit(vault, lusdAmount);
 
         _setTreasury(vault, MainnetAddresses.TREASURY);
 
-        _transferAdminRoleToMultisig(vault, deployerAddress);
+        _transferAdminRoleToMultisig(vault);
 
         vm.stopBroadcast();
     }
-
-    function _swapUsdcForLusd(uint256 _amountIn) internal returns (uint256 amountOut) {
-        usdc.approve(C.UNISWAP_V3_SWAP_ROUTER, _amountIn);
-
-        ISwapRouter.ExactInputSingleParams memory params = ISwapRouter.ExactInputSingleParams({
-            tokenIn: address(usdc),
-            tokenOut: address(lusd),
-            fee: 500, // 0.05%
-            recipient: deployerAddress,
-            deadline: block.timestamp + 1000,
-            amountIn: _amountIn,
-            amountOutMinimum: 0,
-            sqrtPriceLimitX96: 0
-        });
-
-        amountOut = ISwapRouter(C.UNISWAP_V3_SWAP_ROUTER).exactInputSingle(params);
-    }
 }

script/DeployStaking.s.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
-import {CREATE3Script} from "./base/CREATE3Script.sol";
-import {RewardTracker} from "../src/staking/RewardTracker.sol";
-import {MainnetAddresses as MA} from "./base/MainnetAddresses.sol";
-import {Constants as C} from "../src/lib/Constants.sol";
+import {CREATE3Script} from "script/base/CREATE3Script.sol";
+import {MainnetAddresses as MA} from "script/base/MainnetAddresses.sol";
+import {RewardTracker} from "src/staking/RewardTracker.sol";
+import {Constants as C} from "src/lib/Constants.sol";
 
 contract DeployStaking is CREATE3Script {
     string public NAME = "Staked Quartz";

script/base/CREATE3Script.sol

@@ -17,4 +17,12 @@ abstract contract CREATE3Script is Script {
 
         return keccak256(bytes(string.concat(name, "-v", version)));
     }
+
+    // function predictDeploy(IERC4626 _vault) public view returns (YieldStreams predicted) {
+    //     predicted = YieldStreams(CREATE3.getDeployed(getSalt(_vault), address(this)));
+    // }
+
+    // function isDeployed(IERC4626 _vault) public view returns (bool) {
+    //     return address(predictDeploy(_vault)).code.length > 0;
+    // }
 }

script/base/DeployLeveragedEth.sol → script/base/DeployScWethV2AndScUsdcV2.sol

@@ -27,29 +27,22 @@ import {MainnetDeployBase} from "../base/MainnetDeployBase.sol";
  * Base Deployment file that handles Forked & Mainnet deployment.
  * Forked node deployments are equivalent to mainnet deployments.
  */
-abstract contract DeployLeveragedEth is MainnetDeployBase {
-    IPool aavePool = IPool(C.AAVE_V3_POOL);
-    ICurvePool curveEthStEthPool = ICurvePool(C.CURVE_ETH_STETH_POOL);
-    ISwapRouter uniswapRouter = ISwapRouter(C.UNISWAP_V3_SWAP_ROUTER);
-
+abstract contract DeployScWethV2AndScUsdcV2 is MainnetDeployBase {
     scWETH scWeth;
     scUSDC scUsdc;
 
-    address alice = DC.ALICE;
-    address bob = DC.BOB;
-
     function _deploy() internal {
-        vm.startBroadcast(deployerPrivateKey);
+        vm.startBroadcast(deployerAddress);
 
         scWETH.ConstructorParams memory scWethParams = scWETH.ConstructorParams({
             admin: deployerAddress,
             keeper: keeper,
             targetLtv: 0.85e18,
             slippageTolerance: 0.99e18,
-            aavePool: aavePool,
+            aavePool: IPool(C.AAVE_V3_POOL),
             aaveAwstEth: IAToken(C.AAVE_V3_AWSTETH_TOKEN),
             aaveVarDWeth: ERC20(C.AAVE_V3_VAR_DEBT_WETH_TOKEN),
-            curveEthStEthPool: curveEthStEthPool,
+            curveEthStEthPool: ICurvePool(C.CURVE_ETH_STETH_POOL),
             stEth: ILido(C.STETH),
             wstEth: IwstETH(C.WSTETH),
             weth: weth,
@@ -66,11 +59,11 @@ abstract contract DeployLeveragedEth is MainnetDeployBase {
             scWETH: scWeth,
             usdc: usdc,
             weth: WETH(payable(C.WETH)),
-            aavePool: aavePool,
+            aavePool: IPool(C.AAVE_V3_POOL),
             aavePoolDataProvider: IPoolDataProvider(C.AAVE_V3_POOL_DATA_PROVIDER),
             aaveAUsdc: IAToken(C.AAVE_V3_AUSDC_TOKEN),
             aaveVarDWeth: ERC20(C.AAVE_V3_VAR_DEBT_WETH_TOKEN),
-            uniswapSwapRouter: uniswapRouter,
+            uniswapSwapRouter: ISwapRouter(C.UNISWAP_V3_SWAP_ROUTER),
             chainlinkUsdcToEthPriceFeed: AggregatorV3Interface(C.CHAINLINK_USDC_ETH_PRICE_FEED),
             balancerVault: IVault(C.BALANCER_VAULT)
         });

script/base/MainnetAddresses.sol

@@ -17,8 +17,17 @@ library MainnetAddresses {
     address public constant SCUSDCV2_AAVEV2_ADAPTER = 0xE0E9E98FD963C2e69718C76939924522A9646885;
     address public constant SCUSDCV2_AAVEV3_ADAPTER = 0xf59c324fF111D86894f175E22B70b0d54998ff3E;
 
-    address public constant SCDAI = address(0x00); //todo: update after deployment
-    address public constant SCDAI_SPARK_ADAPTER = address(0x00); //TODO: update after deployment
+    address public constant SCUSDT = 0x237eCDF745d2a0052AeaF6f027ce82F77431871E;
+    address public constant SCUSDT_AAVEV3_ADAPTER = 0x795FDAC1bB26D219991f1923190cA7eB0046e32E;
+    address public constant USDT_WETH_PRICE_CONVERTER = 0x8e045458385d51d047bCA5b2B3b74053e235f5F9;
+    address public constant USDT_WETH_SWAPPER = 0xcD0Ae497068980ce94fbe20A6F7431329F0e4D08;
+
+    address public constant SCDAI = 0x16f3cdA06743a58bDdE123687F99E80DCbc28d14;
+
+    address public constant SCSDAI = 0x0Fc97657B67C7E7bD4100c72851d0377DA14B470;
+    address public constant SCSDAI_SPARK_ADAPTER = 0xeD81a1D7cb2AdC2ee379B594e0dA6a988a865ae4;
+    address public constant SDAI_WETH_PRICE_CONVERTER = 0x0dD22Ebc502f328b29a19Bf0A74373B03DfD374c;
+    address public constant SDAI_WETH_SWAPPER = 0x3F76D80dfc54677262FeA7E94a73D96aC69F4A10;
 
     address public constant PRICE_CONVERTER = 0xD76B0Ff4A487CaFE4E19ed15B73f12f6A92095Ca;
     address public constant SWAPPER = 0x6649f12b5ef495a3861b21E3206B1AbfA33A6531;

script/base/MainnetDeployBase.sol

@@ -20,7 +20,6 @@ import {sc4626} from "../../src/sc4626.sol";
 abstract contract MainnetDeployBase is CREATE3Script {
     using SafeTransferLib for ERC20;
 
-    uint256 deployerPrivateKey;
     address deployerAddress;
     address keeper;
     address multisig;
@@ -33,42 +32,38 @@ abstract contract MainnetDeployBase is CREATE3Script {
     }
 
     function _init() internal virtual {
-        deployerPrivateKey = uint256(vm.envBytes32("PRIVATE_KEY"));
+        uint256 deployerPrivateKey = uint256(vm.envBytes32("PRIVATE_KEY"));
+
+        require(deployerPrivateKey != 0, "Deployer private key not set");
+
         deployerAddress = vm.rememberKey(deployerPrivateKey);
-        keeper = vm.envAddress("KEEPER");
-        multisig = vm.envAddress("MULTISIG");
+
+        keeper = vm.envOr("KEEPER", MainnetAddresses.KEEPER);
+        multisig = vm.envOr("MULTISIG", MainnetAddresses.MULTISIG);
+    }
+
+    function deployWithCreate3(string memory _name, bytes memory _creationCode) public returns (address deployed) {
+        deployed = getCreate3Contract(deployerAddress, _name);
+
+        if (deployed.code.length != 0) {
+            console2.log("Existing", _name, ":", deployed);
+        } else {
+            create3.deploy(getCreate3ContractSalt(_name), _creationCode);
+            console2.log("Deployed", _name, ":", deployed);
+        }
     }
 
-    function _transferAdminRoleToMultisig(AccessControl _contract, address _currentAdmin) internal {
+    function _transferAdminRoleToMultisig(AccessControl _contract) internal {
         _contract.grantRole(_contract.DEFAULT_ADMIN_ROLE(), multisig);
-        _contract.revokeRole(_contract.DEFAULT_ADMIN_ROLE(), _currentAdmin);
+        _contract.revokeRole(_contract.DEFAULT_ADMIN_ROLE(), deployerAddress);
     }
 
     function _setTreasury(sc4626 _vault, address _treasury) internal {
         _vault.setTreasury(_treasury);
     }
 
-    function _deposit(sc4626 _vault, uint256 _amount) internal virtual {
-        _vault.asset().approve(address(_vault), _amount);
+    function _deposit(ERC4626 _vault, uint256 _amount) internal virtual {
+        ERC20(_vault.asset()).safeApprove(address(_vault), _amount);
         _vault.deposit(_amount, deployerAddress);
     }
-
-    function _swapWethForUsdc(uint256 _amount) internal returns (uint256 amountOut) {
-        weth.deposit{value: _amount}();
-
-        weth.approve(C.UNISWAP_V3_SWAP_ROUTER, _amount);
-
-        ISwapRouter.ExactInputSingleParams memory params = ISwapRouter.ExactInputSingleParams({
-            tokenIn: address(weth),
-            tokenOut: address(usdc),
-            fee: 500, // 0.05%
-            recipient: deployerAddress,
-            deadline: block.timestamp + 1000,
-            amountIn: _amount,
-            amountOutMinimum: 0,
-            sqrtPriceLimitX96: 0
-        });
-
-        amountOut = ISwapRouter(C.UNISWAP_V3_SWAP_ROUTER).exactInputSingle(params);
-    }
 }