Merge pull request #313 from euler-xyz/development

Development

Author: kasperpawlowski

.gitmodules

@@ -22,9 +22,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/euler-earn"]
-	path = lib/euler-earn
-	url = https://github.com/euler-xyz/euler-earn
 [submodule "lib/layerzero-devtools"]
 	path = lib/layerzero-devtools
 	url = https://github.com/LayerZero-Labs/devtools
@@ -37,3 +34,6 @@
 [submodule "lib/euler-swap"]
 	path = lib/euler-swap
 	url = https://github.com/euler-xyz/euler-swap
+[submodule "lib/euler-earn"]
+	path = lib/euler-earn
+	url = https://github.com/euler-xyz/euler-earn

audits/Supremacy IRMLinearKinky.pdf

@@ -6,6 +6,7 @@ import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
 import {EulerRouterFactory} from "../src/EulerRouterFactory/EulerRouterFactory.sol";
 import {SnapshotRegistry} from "../src/SnapshotRegistry/SnapshotRegistry.sol";
 import {EulerKinkIRMFactory} from "../src/IRMFactory/EulerKinkIRMFactory.sol";
+import {EulerKinkyIRMFactory} from "../src/IRMFactory/EulerKinkyIRMFactory.sol";
 import {EulerIRMAdaptiveCurveFactory} from "../src/IRMFactory/EulerIRMAdaptiveCurveFactory.sol";
 import {GovernorAccessControlEmergencyFactory} from "../src/GovernorFactory/GovernorAccessControlEmergencyFactory.sol";
 import {CapRiskStewardFactory} from "../src/GovernorFactory/CapRiskStewardFactory.sol";
@@ -16,6 +17,7 @@ contract PeripheryFactories is ScriptUtils {
         address oracleAdapterRegistry;
         address externalVaultRegistry;
         address kinkIRMFactory;
+        address kinkyIRMFactory;
         address adaptiveCurveIRMFactory;
         address irmRegistry;
         address governorAccessControlEmergencyFactory;
@@ -37,6 +39,7 @@ contract PeripheryFactories is ScriptUtils {
         object =
             vm.serializeAddress("peripheryFactories", "externalVaultRegistry", deployedContracts.externalVaultRegistry);
         object = vm.serializeAddress("peripheryFactories", "kinkIRMFactory", deployedContracts.kinkIRMFactory);
+        object = vm.serializeAddress("peripheryFactories", "kinkyIRMFactory", deployedContracts.kinkyIRMFactory);
         object = vm.serializeAddress(
             "peripheryFactories", "adaptiveCurveIRMFactory", deployedContracts.adaptiveCurveIRMFactory
         );
@@ -60,6 +63,7 @@ contract PeripheryFactories is ScriptUtils {
         deployedContracts.oracleAdapterRegistry = address(new SnapshotRegistry(evc, getDeployer()));
         deployedContracts.externalVaultRegistry = address(new SnapshotRegistry(evc, getDeployer()));
         deployedContracts.kinkIRMFactory = address(new EulerKinkIRMFactory());
+        deployedContracts.kinkyIRMFactory = address(new EulerKinkyIRMFactory());
         deployedContracts.adaptiveCurveIRMFactory = address(new EulerIRMAdaptiveCurveFactory());
         deployedContracts.irmRegistry = address(new SnapshotRegistry(evc, getDeployer()));
         deployedContracts.governorAccessControlEmergencyFactory =

lib/euler-earn

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
 import {EulerKinkIRMFactory} from "../src/IRMFactory/EulerKinkIRMFactory.sol";
+import {EulerKinkyIRMFactory} from "../src/IRMFactory/EulerKinkyIRMFactory.sol";
 import {EulerIRMAdaptiveCurveFactory} from "../src/IRMFactory/EulerIRMAdaptiveCurveFactory.sol";
 
 contract KinkIRMDeployer is ScriptUtils {
@@ -40,6 +41,48 @@ contract KinkIRMDeployer is ScriptUtils {
     }
 }
 
+contract KinkyIRMDeployer is ScriptUtils {
+    function run() public broadcast returns (address irm) {
+        string memory inputScriptFileName = "04_KinkIRM_input.json";
+        string memory outputScriptFileName = "04_KinkIRM_output.json";
+        string memory json = getScriptFile(inputScriptFileName);
+        address kinkyIRMFactory = vm.parseJsonAddress(json, ".kinkyIRMFactory");
+        uint256 baseRate = vm.parseJsonUint(json, ".baseRate");
+        uint256 slope = vm.parseJsonUint(json, ".slope");
+        uint256 shape = vm.parseJsonUint(json, ".shape");
+        uint32 kink = uint32(vm.parseJsonUint(json, ".kink"));
+        uint256 cutoff = vm.parseJsonUint(json, ".cutoff");
+
+        irm = execute(kinkyIRMFactory, baseRate, slope, shape, kink, cutoff);
+
+        string memory object;
+        object = vm.serializeAddress("irm", "irm", irm);
+        vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
+    }
+
+    function deploy(
+        address kinkyIRMFactory,
+        uint256 baseRate,
+        uint256 slope,
+        uint256 shape,
+        uint32 kink,
+        uint256 cutoff
+    ) public broadcast returns (address irm) {
+        irm = execute(kinkyIRMFactory, baseRate, slope, shape, kink, cutoff);
+    }
+
+    function execute(
+        address kinkyIRMFactory,
+        uint256 baseRate,
+        uint256 slope,
+        uint256 shape,
+        uint32 kink,
+        uint256 cutoff
+    ) public returns (address irm) {
+        irm = EulerKinkyIRMFactory(kinkyIRMFactory).deploy(baseRate, slope, shape, kink, cutoff);
+    }
+}
+
 contract AdaptiveCurveIRMDeployer is ScriptUtils {
     function run() public broadcast returns (address irm) {
         string memory inputScriptFileName = "04_AdaptiveCurveIRM_input.json";

script/02_PeripheryFactories.s.sol

@@ -53,7 +53,7 @@ contract Lenses is ScriptUtils {
         lenses[2] = address(new IRMLens(kinkIRMFactory, adaptiveCurveIRMFactory));
         lenses[3] = address(new UtilsLens(eVaultFactory, address(lenses[1])));
         lenses[4] = address(new VaultLens(address(lenses[1]), address(lenses[3]), address(lenses[2])));
-        lenses[5] = address(new EulerEarnVaultLens(address(lenses[1]), address(lenses[3])));
+        lenses[5] = address(new EulerEarnVaultLens(address(lenses[3])));
     }
 }
 
@@ -186,21 +186,20 @@ contract LensEulerEarnVaultDeployer is ScriptUtils {
         string memory inputScriptFileName = "08_LensEulerEarnVault_input.json";
         string memory outputScriptFileName = "08_LensEulerEarnVault_output.json";
         string memory json = getScriptFile(inputScriptFileName);
-        address oracleLens = vm.parseJsonAddress(json, ".oracleLens");
         address utilsLens = vm.parseJsonAddress(json, ".utilsLens");
 
-        eulerEarnVaultLens = execute(oracleLens, utilsLens);
+        eulerEarnVaultLens = execute(utilsLens);
 
         string memory object;
         object = vm.serializeAddress("lens", "eulerEarnVaultLens", eulerEarnVaultLens);
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address oracleLens, address utilsLens) public broadcast returns (address eulerEarnVaultLens) {
-        eulerEarnVaultLens = execute(oracleLens, utilsLens);
+    function deploy(address utilsLens) public broadcast returns (address eulerEarnVaultLens) {
+        eulerEarnVaultLens = execute(utilsLens);
     }
 
-    function execute(address oracleLens, address utilsLens) public returns (address eulerEarnVaultLens) {
-        eulerEarnVaultLens = address(new EulerEarnVaultLens(oracleLens, utilsLens));
+    function execute(address utilsLens) public returns (address eulerEarnVaultLens) {
+        eulerEarnVaultLens = address(new EulerEarnVaultLens(utilsLens));
     }
 }

script/04_IRM.s.sol

@@ -423,15 +423,8 @@ contract EulerEarnPerspectivesDeployer is ScriptUtils {
     }
 
     function execute(address eulerEarnFactory) public returns (address[] memory perspectives) {
-        address evc;
-        {
-            (bool success, bytes memory data) = eulerEarnFactory.staticcall(abi.encodeWithSignature("eulerEarnImpl()"));
-            assert(success && data.length == 32);
-            evc = EVCUtil(abi.decode(data, (address))).EVC();
-        }
-
         address eulerEarnFactoryPerspective = address(new EulerEarnFactoryPerspective(eulerEarnFactory));
-        address governedPerspective = address(new GovernedPerspective(evc, getDeployer()));
+        address governedPerspective = address(new GovernedPerspective(EVCUtil(eulerEarnFactory).EVC(), getDeployer()));
 
         perspectives = new address[](2);
         perspectives[0] = eulerEarnFactoryPerspective;

script/08_Lenses.s.sol

@@ -9,23 +9,26 @@ contract EulerEarnFactory is ScriptUtils {
         string memory inputScriptFileName = "21_EulerEarnFactory_input.json";
         string memory outputScriptFileName = "21_EulerEarnFactory_output.json";
         string memory json = getScriptFile(inputScriptFileName);
-        address eulerEarnImplementation = vm.parseJsonAddress(json, ".eulerEarnImplementation");
+        address evc = vm.parseJsonAddress(json, ".evc");
+        address permit2 = vm.parseJsonAddress(json, ".permit2");
+        address perspective = vm.parseJsonAddress(json, ".perspective");
 
-        eulerEarnfactory = execute(eulerEarnImplementation);
+        eulerEarnfactory = execute(evc, permit2, perspective);
 
         string memory object;
         object = vm.serializeAddress("factory", "eulerEarnfactory", eulerEarnfactory);
 
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address implementation) public broadcast returns (address factory) {
-        factory = execute(implementation);
+    function deploy(address evc, address permit2, address perspective) public broadcast returns (address factory) {
+        factory = execute(evc, permit2, perspective);
     }
 
-    function execute(address implementation) public returns (address factory) {
+    function execute(address evc, address permit2, address perspective) public returns (address factory) {
         bytes memory bytecode = abi.encodePacked(
-            vm.getCode("out-euler-earn/EulerEarnFactory.sol/EulerEarnFactory.json"), abi.encode(implementation)
+            vm.getCode("out-euler-earn/EulerEarnFactory.sol/EulerEarnFactory.json"),
+            abi.encode(getDeployer(), evc, permit2, perspective)
         );
         assembly {
             factory := create(0, add(bytecode, 0x20), mload(bytecode))

script/09_Perspectives.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 
 import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
 
-contract EulerSwapImplementation is ScriptUtils {
+contract EulerSwapImplementationDeployer is ScriptUtils {
     function run() public broadcast returns (address implementation) {
         string memory inputScriptFileName = "22_EulerSwapImplementation_input.json";
         string memory outputScriptFileName = "22_EulerSwapImplementation_output.json";