Development

script/02_PeripheryFactories.s.sol

@@ -7,6 +7,7 @@ import {EulerRouterFactory} from "../src/EulerRouterFactory/EulerRouterFactory.s
 import {SnapshotRegistry} from "../src/SnapshotRegistry/SnapshotRegistry.sol";
 import {EulerKinkIRMFactory} from "../src/IRMFactory/EulerKinkIRMFactory.sol";
 import {EulerKinkyIRMFactory} from "../src/IRMFactory/EulerKinkyIRMFactory.sol";
+import {EulerFixedCyclicalBinaryIRMFactory} from "../src/IRMFactory/EulerFixedCyclicalBinaryIRMFactory.sol";
 import {EulerIRMAdaptiveCurveFactory} from "../src/IRMFactory/EulerIRMAdaptiveCurveFactory.sol";
 import {GovernorAccessControlEmergencyFactory} from "../src/GovernorFactory/GovernorAccessControlEmergencyFactory.sol";
 import {CapRiskStewardFactory} from "../src/GovernorFactory/CapRiskStewardFactory.sol";
@@ -18,6 +19,7 @@ contract PeripheryFactories is ScriptUtils {
         address externalVaultRegistry;
         address kinkIRMFactory;
         address kinkyIRMFactory;
+        address fixedCyclicalBinaryIRMFactory;
         address adaptiveCurveIRMFactory;
         address irmRegistry;
         address governorAccessControlEmergencyFactory;
@@ -40,6 +42,9 @@ contract PeripheryFactories is ScriptUtils {
             vm.serializeAddress("peripheryFactories", "externalVaultRegistry", deployedContracts.externalVaultRegistry);
         object = vm.serializeAddress("peripheryFactories", "kinkIRMFactory", deployedContracts.kinkIRMFactory);
         object = vm.serializeAddress("peripheryFactories", "kinkyIRMFactory", deployedContracts.kinkyIRMFactory);
+        object = vm.serializeAddress(
+            "peripheryFactories", "fixedCyclicalBinaryIRMFactory", deployedContracts.fixedCyclicalBinaryIRMFactory
+        );
         object = vm.serializeAddress(
             "peripheryFactories", "adaptiveCurveIRMFactory", deployedContracts.adaptiveCurveIRMFactory
         );
@@ -64,6 +69,7 @@ contract PeripheryFactories is ScriptUtils {
         deployedContracts.externalVaultRegistry = address(new SnapshotRegistry(evc, getDeployer()));
         deployedContracts.kinkIRMFactory = address(new EulerKinkIRMFactory());
         deployedContracts.kinkyIRMFactory = address(new EulerKinkyIRMFactory());
+        deployedContracts.fixedCyclicalBinaryIRMFactory = address(new EulerFixedCyclicalBinaryIRMFactory());
         deployedContracts.adaptiveCurveIRMFactory = address(new EulerIRMAdaptiveCurveFactory());
         deployedContracts.irmRegistry = address(new SnapshotRegistry(evc, getDeployer()));
         deployedContracts.governorAccessControlEmergencyFactory =

script/08_Lenses.s.sol

@@ -19,8 +19,17 @@ contract Lenses is ScriptUtils {
         address oracleAdapterRegistry = vm.parseJsonAddress(json, ".oracleAdapterRegistry");
         address kinkIRMFactory = vm.parseJsonAddress(json, ".kinkIRMFactory");
         address adaptiveCurveIRMFactory = vm.parseJsonAddress(json, ".adaptiveCurveIRMFactory");
-
-        lenses = execute(eVaultFactory, oracleAdapterRegistry, kinkIRMFactory, adaptiveCurveIRMFactory);
+        address kinkyIRMFactory = vm.parseJsonAddress(json, ".kinkyIRMFactory");
+        address fixedCyclicalBinaryIRMFactory = vm.parseJsonAddress(json, ".fixedCyclicalBinaryIRMFactory");
+
+        lenses = execute(
+            eVaultFactory,
+            oracleAdapterRegistry,
+            kinkIRMFactory,
+            adaptiveCurveIRMFactory,
+            kinkyIRMFactory,
+            fixedCyclicalBinaryIRMFactory
+        );
 
         string memory object;
         object = vm.serializeAddress("lenses", "accountLens", lenses[0]);
@@ -36,21 +45,34 @@ contract Lenses is ScriptUtils {
         address eVaultFactory,
         address oracleAdapterRegistry,
         address kinkIRMFactory,
-        address adaptiveCurveIRMFactory
+        address adaptiveCurveIRMFactory,
+        address kinkyIRMFactory,
+        address fixedCyclicalBinaryIRMFactory
     ) public broadcast returns (address[] memory lenses) {
-        lenses = execute(eVaultFactory, oracleAdapterRegistry, kinkIRMFactory, adaptiveCurveIRMFactory);
+        lenses = execute(
+            eVaultFactory,
+            oracleAdapterRegistry,
+            kinkIRMFactory,
+            adaptiveCurveIRMFactory,
+            kinkyIRMFactory,
+            fixedCyclicalBinaryIRMFactory
+        );
     }
 
     function execute(
         address eVaultFactory,
         address oracleAdapterRegistry,
         address kinkIRMFactory,
-        address adaptiveCurveIRMFactory
+        address adaptiveCurveIRMFactory,
+        address kinkyIRMFactory,
+        address fixedCyclicalBinaryIRMFactory
     ) public returns (address[] memory lenses) {
         lenses = new address[](6);
         lenses[0] = address(new AccountLens());
         lenses[1] = address(new OracleLens(oracleAdapterRegistry));
-        lenses[2] = address(new IRMLens(kinkIRMFactory, adaptiveCurveIRMFactory));
+        lenses[2] = address(
+            new IRMLens(kinkIRMFactory, adaptiveCurveIRMFactory, kinkyIRMFactory, fixedCyclicalBinaryIRMFactory)
+        );
         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[3])));
@@ -107,24 +129,34 @@ contract LensIRMDeployer is ScriptUtils {
         string memory json = getScriptFile(inputScriptFileName);
         address kinkIRMFactory = vm.parseJsonAddress(json, ".kinkIRMFactory");
         address adaptiveCurveIRMFactory = vm.parseJsonAddress(json, ".adaptiveCurveIRMFactory");
+        address kinkyIRMFactory = vm.parseJsonAddress(json, ".kinkyIRMFactory");
+        address fixedCyclicalBinaryIRMFactory = vm.parseJsonAddress(json, ".fixedCyclicalBinaryIRMFactory");
 
-        irmLens = execute(kinkIRMFactory, adaptiveCurveIRMFactory);
+        irmLens = execute(kinkIRMFactory, adaptiveCurveIRMFactory, kinkyIRMFactory, fixedCyclicalBinaryIRMFactory);
 
         string memory object;
         object = vm.serializeAddress("lens", "irmLens", irmLens);
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address kinkIRMFactory, address adaptiveCurveIRMFactory)
-        public
-        broadcast
-        returns (address irmLens)
-    {
-        irmLens = execute(kinkIRMFactory, adaptiveCurveIRMFactory);
+    function deploy(
+        address kinkIRMFactory,
+        address adaptiveCurveIRMFactory,
+        address kinkyIRMFactory,
+        address fixedCyclicalBinaryIRMFactory
+    ) public broadcast returns (address irmLens) {
+        irmLens = execute(kinkIRMFactory, adaptiveCurveIRMFactory, kinkyIRMFactory, fixedCyclicalBinaryIRMFactory);
     }
 
-    function execute(address kinkIRMFactory, address adaptiveCurveIRMFactory) public returns (address irmLens) {
-        irmLens = address(new IRMLens(kinkIRMFactory, adaptiveCurveIRMFactory));
+    function execute(
+        address kinkIRMFactory,
+        address adaptiveCurveIRMFactory,
+        address kinkyIRMFactory,
+        address fixedCyclicalBinaryIRMFactory
+    ) public returns (address irmLens) {
+        irmLens = address(
+            new IRMLens(kinkIRMFactory, adaptiveCurveIRMFactory, kinkyIRMFactory, fixedCyclicalBinaryIRMFactory)
+        );
     }
 }
 

script/20_EulerEarnFactory.s.sol

@@ -4,34 +4,48 @@ pragma solidity ^0.8.0;
 
 import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
 
-contract EulerEarnFactory is ScriptUtils {
-    function run() public broadcast returns (address eulerEarnfactory) {
+contract EulerEarnFactoryDeployer is ScriptUtils {
+    function run() public broadcast returns (address eulerEarnfactory, address eulerEarnPublicAllocator) {
         string memory inputScriptFileName = "21_EulerEarnFactory_input.json";
         string memory outputScriptFileName = "21_EulerEarnFactory_output.json";
         string memory json = getScriptFile(inputScriptFileName);
         address evc = vm.parseJsonAddress(json, ".evc");
         address permit2 = vm.parseJsonAddress(json, ".permit2");
         address perspective = vm.parseJsonAddress(json, ".perspective");
 
-        eulerEarnfactory = execute(evc, permit2, perspective);
+        (eulerEarnfactory, eulerEarnPublicAllocator) = execute(evc, permit2, perspective);
 
         string memory object;
         object = vm.serializeAddress("factory", "eulerEarnfactory", eulerEarnfactory);
+        object = vm.serializeAddress("publicAllocator", "eulerEarnPublicAllocator", eulerEarnPublicAllocator);
 
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address evc, address permit2, address perspective) public broadcast returns (address factory) {
-        factory = execute(evc, permit2, perspective);
+    function deploy(address evc, address permit2, address perspective)
+        public
+        broadcast
+        returns (address factory, address publicAllocator)
+    {
+        (factory, publicAllocator) = execute(evc, permit2, perspective);
     }
 
-    function execute(address evc, address permit2, address perspective) public returns (address factory) {
+    function execute(address evc, address permit2, address perspective)
+        public
+        returns (address factory, address publicAllocator)
+    {
         bytes memory bytecode = abi.encodePacked(
             vm.getCode("out-euler-earn/EulerEarnFactory.sol/EulerEarnFactory.json"),
             abi.encode(getDeployer(), evc, permit2, perspective)
         );
         assembly {
             factory := create(0, add(bytecode, 0x20), mload(bytecode))
         }
+
+        bytecode =
+            abi.encodePacked(vm.getCode("out-euler-earn/PublicAllocator.sol/PublicAllocator.json"), abi.encode(evc));
+        assembly {
+            publicAllocator := create(0, add(bytecode, 0x20), mload(bytecode))
+        }
     }
 }

script/50_CoreAndPeriphery.s.sol

@@ -34,7 +34,7 @@ import {EVaultFactoryGovernorDeployer, TimelockControllerDeployer} from "./12_Go
 import {TermsOfUseSignerDeployer} from "./13_TermsOfUseSigner.s.sol";
 import {OFTAdapterUpgradeableDeployer, MintBurnOFTAdapterDeployer} from "./14_OFT.s.sol";
 import {EdgeFactoryDeployer} from "./15_EdgeFactory.s.sol";
-import {EulerEarnFactory} from "./20_EulerEarnFactory.s.sol";
+import {EulerEarnFactoryDeployer} from "./20_EulerEarnFactory.s.sol";
 import {EulerSwapImplementationDeployer} from "./21_EulerSwapImplementation.s.sol";
 import {EulerSwapFactoryDeployer} from "./22_EulerSwapFactory.s.sol";
 import {EulerSwapPeripheryDeployer} from "./23_EulerSwapPeriphery.s.sol";
@@ -99,9 +99,6 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         int256 adjustmentSpeed;
     }
 
-    mapping(uint256 chainId => bool isHarvestCoolDownCheckOn) internal EULER_EARN_HARVEST_COOL_DOWN_CHECK_ON;
-    uint256[1] internal EULER_EARN_HARVEST_COOL_DOWN_CHECK_ON_CHAIN_IDS = [1];
-
     address internal constant BURN_ADDRESS = address(0xdead);
     uint256 internal constant EUL_HUB_CHAIN_ID = 1;
     uint8 internal constant EUL_DECIMALS = 18;
@@ -138,11 +135,6 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
     AdaptiveCurveIRMParams[] internal DEFAULT_ADAPTIVE_CURVE_IRMS_PARAMS;
 
     constructor() {
-        for (uint256 i = 0; i < EULER_EARN_HARVEST_COOL_DOWN_CHECK_ON_CHAIN_IDS.length; ++i) {
-            uint256 chainId = EULER_EARN_HARVEST_COOL_DOWN_CHECK_ON_CHAIN_IDS[i];
-            EULER_EARN_HARVEST_COOL_DOWN_CHECK_ON[chainId] = true;
-        }
-
         for (uint256 i = 0; i < IRM_INITIAL_RATES_AT_TARGET.length; ++i) {
             DEFAULT_ADAPTIVE_CURVE_IRMS_PARAMS.push(
                 AdaptiveCurveIRMParams({
@@ -472,7 +464,10 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             console.log("- OFT Adapter already deployed. Skipping...");
         }
 
-        if (containsOftHubChainId(block.chainid) && bridgeAddresses.oftAdapter != address(0)) {
+        if (
+            containsOftHubChainId(block.chainid) && bridgeAddresses.oftAdapter != address(0)
+                && !getSkipOFTHubChainConfig()
+        ) {
             console.log("+ Attempting to configure OFT Adapter on chain %s", block.chainid);
 
             LayerZeroUtil lzUtil = new LayerZeroUtil();
@@ -661,6 +656,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
                 && peripheryAddresses.oracleAdapterRegistry == address(0)
                 && peripheryAddresses.externalVaultRegistry == address(0) && peripheryAddresses.kinkIRMFactory == address(0)
                 && peripheryAddresses.kinkyIRMFactory == address(0)
+                && peripheryAddresses.fixedCyclicalBinaryIRMFactory == address(0)
                 && peripheryAddresses.adaptiveCurveIRMFactory == address(0) && peripheryAddresses.irmRegistry == address(0)
                 && peripheryAddresses.governorAccessControlEmergencyFactory == address(0)
                 && peripheryAddresses.capRiskStewardFactory == address(0)
@@ -674,6 +670,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             peripheryAddresses.externalVaultRegistry = peripheryContracts.externalVaultRegistry;
             peripheryAddresses.kinkIRMFactory = peripheryContracts.kinkIRMFactory;
             peripheryAddresses.kinkyIRMFactory = peripheryContracts.kinkyIRMFactory;
+            peripheryAddresses.fixedCyclicalBinaryIRMFactory = peripheryContracts.fixedCyclicalBinaryIRMFactory;
             peripheryAddresses.adaptiveCurveIRMFactory = peripheryContracts.adaptiveCurveIRMFactory;
             peripheryAddresses.irmRegistry = peripheryContracts.irmRegistry;
             peripheryAddresses.governorAccessControlEmergencyFactory =
@@ -859,13 +856,13 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             console.log("- EulerUngovernedNzxPerspective already deployed. Skipping...");
         }
 
-        if (coreAddresses.eulerEarnFactory == address(0)) {
-            console.log("+ Deploying EulerEarn factory...");
-            EulerEarnFactory deployer = new EulerEarnFactory();
-            coreAddresses.eulerEarnFactory =
+        if (coreAddresses.eulerEarnFactory == address(0) && peripheryAddresses.eulerEarnPublicAllocator == address(0)) {
+            console.log("+ Deploying EulerEarn factory and public allocator...");
+            EulerEarnFactoryDeployer deployer = new EulerEarnFactoryDeployer();
+            (coreAddresses.eulerEarnFactory, peripheryAddresses.eulerEarnPublicAllocator) =
                 deployer.deploy(coreAddresses.evc, coreAddresses.permit2, peripheryAddresses.evkFactoryPerspective);
         } else {
-            console.log("- EulerEarn factory already deployed. Skipping...");
+            console.log("- EulerEarn factory and public allocator already deployed. Skipping...");
             if (vm.isDir("out-euler-earn")) vm.removeDir("out-euler-earn", true);
         }
 
@@ -927,8 +924,12 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         if (lensAddresses.irmLens == address(0)) {
             console.log("+ Deploying LensIRM...");
             LensIRMDeployer deployer = new LensIRMDeployer();
-            lensAddresses.irmLens =
-                deployer.deploy(peripheryAddresses.kinkIRMFactory, peripheryAddresses.adaptiveCurveIRMFactory);
+            lensAddresses.irmLens = deployer.deploy(
+                peripheryAddresses.kinkIRMFactory,
+                peripheryAddresses.adaptiveCurveIRMFactory,
+                peripheryAddresses.kinkyIRMFactory,
+                peripheryAddresses.fixedCyclicalBinaryIRMFactory
+            );
         } else {
             console.log("- LensIRM already deployed. Skipping...");
         }

script/interactiveDeployment.sh

@@ -37,7 +37,7 @@ if ! script/utils/checkEnvironment.sh "$@"; then
     exit 1
 fi
 
-eulerEarnCompilerOptions="--via-ir --optimize --optimizer-runs 800 --use 0.8.26 --out out-euler-earn"
+eulerEarnCompilerOptions="--via-ir --optimize --optimizer-runs 200 --use 0.8.26 --out out-euler-earn"
 eulerSwapCompilerOptions="--optimize --optimizer-runs 1000000 --use 0.8.27 --out out-euler-swap"
 
 while true; do
@@ -779,10 +779,16 @@ while true; do
                         --arg eVaultFactory "$eVaultFactory" \
                         --arg oracleAdapterRegistry "$oracle_adapter_registry" \
                         --arg kinkIRMFactory "$kink_irm_factory" \
+                        --arg adaptiveCurveIRMFactory "$adaptive_curve_irm_factory" \
+                        --arg kinkyIRMFactory "$kinky_irm_factory" \
+                        --arg fixedCyclicalBinaryIRMFactory "$fixed_cyclical_binary_irm_factory" \
                         '{
                             eVaultFactory: $eVaultFactory,
                             oracleAdapterRegistry: $oracleAdapterRegistry,
-                            kinkIRMFactory: $kinkIRMFactory
+                            kinkIRMFactory: $kinkIRMFactory,
+                            adaptiveCurveIRMFactory: $adaptiveCurveIRMFactory,
+                            kinkyIRMFactory: $kinkyIRMFactory,
+                            fixedCyclicalBinaryIRMFactory: $fixedCyclicalBinaryIRMFactory
                         }' --indent 4 > script/${jsonName}_input.json
                     ;;
                 1)

script/production/ConfigWhitelistGovernedPerspective.sh

@@ -16,6 +16,12 @@ eval 'set -- $SCRIPT_ARGS'
 addresses_dir_path="${ADDRESSES_DIR_PATH%/}/$(cast chain-id --rpc-url $DEPLOYMENT_RPC_URL)"
 evc=$(jq -r '.evc' "$addresses_dir_path/CoreAddresses.json")
 
+if [[ "$@" != *"--earn"* && "$@" != *"--evk"* ]]; then
+    echo "Error: Either --earn or --evk option must be provided"
+    echo "Usage: $0 <csv_file_path> [--earn|--evk] [other_options...]"
+    exit 1
+fi
+
 if [[ "$@" == *"--earn"* ]]; then
     governed_perspective=$(jq -r '.eulerEarnGovernedPerspective' "$addresses_dir_path/PeripheryAddresses.json")
 else
@@ -100,6 +106,7 @@ items="["
 
 while IFS=, read -r -a columns || [ -n "$columns" ]; do
     vault="${columns[0]}"
+    label="${columns[1]}"
     whitelist="${columns[2]}"
 
     if [[ "$vault" == "Vault" ]]; then
@@ -110,20 +117,20 @@ while IFS=, read -r -a columns || [ -n "$columns" ]; do
 
     if [[ "$whitelist" == "Yes" ]]; then
         if [[ $isVerified == *false* ]]; then
-            echo "Adding 'perspectiveVerify' batch item for vault $vault"
+            echo "Adding 'perspectiveVerify' batch item for vault $vault ($label)"
             items+="($governed_perspective,$onBehalfOf,0,$(cast calldata "perspectiveVerify(address,bool)" $vault true)),"
         elif [[ "$verbose" == "--verbose" ]]; then
-            echo "Vault $vault is already verified. Skipping..."
+            echo "Vault $vault ($label) is already verified. Skipping..."
         fi
     elif [[ "$whitelist" == "No" ]]; then
         if [[ $isVerified == *true* ]]; then
-            echo "Adding 'perspectiveUnverify' batch item for vault $vault"
+            echo "Adding 'perspectiveUnverify' batch item for vault $vault ($label)"
             items+="($governed_perspective,$onBehalfOf,0,$(cast calldata "perspectiveUnverify(address)" $vault)),"
         elif [[ "$verbose" == "--verbose" ]]; then
-            echo "Vault $vault is not verified. Skipping..."
+            echo "Vault $vault ($label) is not verified. Skipping..."
         fi
     else
-        echo "Invalid Whitelist value for vault $vault. Skipping..."
+        echo "Invalid Whitelist value for vault $vault ($label). Skipping..."
     fi
 done < <(tr -d '\r' < "$csv_file")