Merge pull request #362 from euler-xyz/development

Sync dev into master

Author: kasperpawlowski

.env.example

@@ -4,6 +4,7 @@ DEPLOYER_KEY=
 SAFE_KEY=
 SAFE_ADDRESS=
 SAFE_NONCE=
+SAFE_API_KEY=
 VERIFIER_URL=
 VERIFIER_API_KEY=
 TENDERLY_ACCESS_KEY=

.gitignore

@@ -13,3 +13,15 @@ broadcast/
 
 # Scripts temporary files
 script/*.json
+
+# Node.js
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.npm
+.yarn-integrity
+
+# Logs
+logs
+*.log

foundry.lock

@@ -0,0 +1,41 @@
+{
+  "lib/ethereum-vault-connector": {
+    "rev": "a7d3c29ef7e4964736e47675e0588630d6afbfd7"
+  },
+  "lib/euler-earn": {
+    "rev": "1c0b329e864ebea843dcdc090c3fb92f2a96a200"
+  },
+  "lib/euler-price-oracle": {
+    "rev": "ffc3cb82615fc7d003a7f431175bd1eaf0bf41c5"
+  },
+  "lib/euler-swap": {
+    "rev": "b948f4052d7ab3116235ec754368b7125dbd5082"
+  },
+  "lib/euler-vault-kit": {
+    "rev": "422bf2447047d32aa9f4e5bab4be16ab3ea67ec2"
+  },
+  "lib/fee-flow": {
+    "rev": "4a419c94e9cd68f65e11f07da9a69f726177cb9c"
+  },
+  "lib/forge-std": {
+    "rev": "b93cf4bc34ff214c099dc970b153f85ade8c9f66"
+  },
+  "lib/layerzero-devtools": {
+    "rev": "cc871a1bd4a28931fd3db4bb097ca30a8e057501"
+  },
+  "lib/layerzero-v2": {
+    "rev": "7da76840e41dc593d3c2007ce35b911b1d816b4b"
+  },
+  "lib/openzeppelin-contracts": {
+    "rev": "69c8def5f222ff96f2b5beff05dfba996368aa79"
+  },
+  "lib/openzeppelin-contracts-upgradeable": {
+    "rev": "fa525310e45f91eb20a6d3baa2644be8e0adba31"
+  },
+  "lib/reward-streams": {
+    "rev": "9eb7b8a7fa31c275d688063c4abd07165b50b89f"
+  },
+  "lib/solidity-bytes-utils": {
+    "rev": "e0115c4d231910df47ce3b60625ce562fe4af985"
+  }
+}

lib/euler-price-oracle

@@ -17,6 +17,7 @@ import {UniswapV3Oracle} from "euler-price-oracle/adapter/uniswap/UniswapV3Oracl
 import {FixedRateOracle} from "euler-price-oracle/adapter/fixed/FixedRateOracle.sol";
 import {RateProviderOracle} from "euler-price-oracle/adapter/rate/RateProviderOracle.sol";
 import {PendleOracle} from "euler-price-oracle/adapter/pendle/PendleOracle.sol";
+import {PendleUniversalOracle} from "euler-price-oracle/adapter/pendle/PendleUniversalOracle.sol";
 import {IdleTranchesOracle} from "euler-price-oracle/adapter/idle/IdleTranchesOracle.sol";
 
 contract ChainlinkAdapter is ScriptUtils {
@@ -533,6 +534,52 @@ contract PendleAdapter is ScriptUtils {
     }
 }
 
+contract PendleUniversalAdapter is ScriptUtils {
+    function run() public broadcast returns (address adapter) {
+        string memory inputScriptFileName = "03_PendleUniversalAdapter_input.json";
+        string memory outputScriptFileName = "03_PendleUniversalAdapter_output.json";
+        string memory json = getScriptFile(inputScriptFileName);
+        address adapterRegistry = vm.parseJsonAddress(json, ".adapterRegistry");
+        bool addToAdapterRegistry = vm.parseJsonBool(json, ".addToAdapterRegistry");
+        address pendleOracle = vm.parseJsonAddress(json, ".pendleOracle");
+        address pendleMarket = vm.parseJsonAddress(json, ".pendleMarket");
+        address base = vm.parseJsonAddress(json, ".base");
+        address quote = vm.parseJsonAddress(json, ".quote");
+        uint32 twapWindow = uint32(vm.parseJsonUint(json, ".twapWindow"));
+
+        adapter = execute(adapterRegistry, addToAdapterRegistry, pendleOracle, pendleMarket, base, quote, twapWindow);
+
+        string memory object;
+        object = vm.serializeAddress("oracleAdapters", "adapter", adapter);
+        vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
+    }
+
+    function deploy(
+        address adapterRegistry,
+        bool addToAdapterRegistry,
+        address pendleOracle,
+        address pendleMarket,
+        address base,
+        address quote,
+        uint32 twapWindow
+    ) public broadcast returns (address adapter) {
+        adapter = execute(adapterRegistry, addToAdapterRegistry, pendleOracle, pendleMarket, base, quote, twapWindow);
+    }
+
+    function execute(
+        address adapterRegistry,
+        bool addToAdapterRegistry,
+        address pendleOracle,
+        address pendleMarket,
+        address base,
+        address quote,
+        uint32 twapWindow
+    ) public returns (address adapter) {
+        adapter = address(new PendleUniversalOracle(pendleOracle, pendleMarket, base, quote, twapWindow));
+        if (addToAdapterRegistry) SnapshotRegistry(adapterRegistry).add(adapter, base, quote);
+    }
+}
+
 contract IdleTranchesAdapter is ScriptUtils {
     function run() public broadcast returns (address adapter) {
         string memory inputScriptFileName = "03_IdleTranchesAdapter_input.json";

script/03_OracleAdapters.s.sol

@@ -881,7 +881,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             peripheryAddresses.eulerEarnFactoryPerspective == address(0)
                 && peripheryAddresses.eulerEarnGovernedPerspective == address(0)
         ) {
-            if (input.deployEulerEarn) {
+            if (coreAddresses.eulerEarnFactory != address(0)) {
                 console.log("+ Deploying EulerEarnFactoryPerspective and Euler Earn GovernedPerspective...");
                 EulerEarnPerspectivesDeployer deployer = new EulerEarnPerspectivesDeployer();
                 address[] memory perspectives = deployer.deploy(coreAddresses.eulerEarnFactory);

script/50_CoreAndPeriphery.s.sol

@@ -21,6 +21,7 @@ It should contain the following environment variables:
 - `SAFE_KEY` (the private key which will be used to sign Safe transactions; this is optional if you don't send transactions via Safe or provide a different option to derive the Safe signer key, i.e. `--ledger` or `--account ACC_NAME`)
 - `SAFE_ADDRESS` (the Safe address which will be used to send transactions via Safe; this is optional if you don't send transactions via Safe. you can use the `--safe-address` option in the command instead. you may also provide the key from the `MultisigAddresses.json` file instead of providing the address)
 - `SAFE_NONCE` (the Safe nonce which will be used to send transactions via Safe; this is optional and if not provided, the script will try to retrieve it from the Safe). you can use the `--safe-nonce` option in the command as well
+- `SAFE_API_KEY` (the Safe API key that can be generated by signing up here: https://developer.safe.global/; if not provided, the Safe API may not be functional)
 - `VERIFIER_URL` (url of the contract verifier, i.e. https://api.polygonscan.com/api; this is optional and only needed for contracts verification)
 - `VERIFIER_API_KEY` (verifier api key; this is optional and only needed for contracts verification)
 - `TENDERLY_ACCESS_KEY` (tenderly access key; this is optional and only used for advanced use cases)

script/README.md

@@ -1305,11 +1305,11 @@ while true; do
             euler_swap_fee_owner=${euler_swap_fee_owner:-$multisig_dao}
             euler_swap_fee_recipient_setter=${euler_swap_fee_recipient_setter:-$multisig_dao}
 
-            if [ -z "$eulerEarnFactory" ] || [ "$eulerEarnFactory" == "$addressZero" ]; then
+            if { [ -z "$eulerEarnFactory" ] || [ "$eulerEarnFactory" == "$addressZero" ]; } && [ "$deploy_euler_earn" = "y" ]; then
                 forge compile lib/euler-earn/src $eulerEarnCompilerOptions --force
             fi
 
-            if [ -z "$eulerSwapFactory_v1" ] || [ "$eulerSwapFactory_v1" == "$addressZero" ]; then
+            if { [ -z "$eulerSwapV1Factory" ] || [ "$eulerSwapV1Factory" == "$addressZero" ]; } && [ "$deploy_euler_swap_v1" = "y" ]; then
                 forge compile lib/euler-swap/src $eulerSwapCompilerOptions --force
             fi
 

script/interactiveDeployment.sh

@@ -23,15 +23,6 @@ import {
 import {VaultLens, VaultInfoFull} from "../../src/Lens/VaultLens.sol";
 import {AccountLens, AccountInfo, AccountMultipleVaultsInfo} from "../../src/Lens/AccountLens.sol";
 
-abstract contract CustomScriptBase is BatchBuilder {
-    function run() public {
-        execute();
-        saveAddresses();
-    }
-
-    function execute() public virtual {}
-}
-
 contract GetVaultInfoFull is ScriptUtils {
     function run(address vault) public view returns (VaultInfoFull memory) {
         return VaultLens(lensAddresses.vaultLens).getVaultInfoFull(vault);
@@ -81,13 +72,13 @@ contract BridgeEULToLabsMultisig is ScriptUtils, SafeMultisendBuilder {
                 util.run(dstChainId, dstAddress, amount);
             } else {
                 (address to, uint256 value, bytes memory rawCalldata) =
-                    util.getSendCalldata(dstChainId, dstAddress, amount, 1e4);
+                    util.getSendCalldata(safe, dstChainId, dstAddress, amount, 1e4);
                 addMultisendItem(tokenAddresses.EUL, abi.encodeCall(IERC20.approve, (to, amount)));
                 addMultisendItem(to, value, rawCalldata);
             }
         }
 
-        if (multisendItemExists()) executeMultisend(safe, safeNonce++, false);
+        if (multisendItemExists()) executeMultisend(safe, safeNonce++, true, false);
     }
 }
 
@@ -188,8 +179,7 @@ contract MigratePosition is BatchBuilder {
         address[] memory controllers = IEVC(coreAddresses.evc).getControllers(sourceAccount);
 
         for (uint256 i = 0; i < collaterals.length; ++i) {
-            uint256 amount = IEVault(collaterals[i]).balanceOf(sourceAccount);
-            if (amount == 0) continue;
+            if (IEVault(collaterals[i]).balanceOf(sourceAccount) == 0) continue;
 
             addBatchItem(
                 coreAddresses.evc,
@@ -199,7 +189,7 @@ contract MigratePosition is BatchBuilder {
             addBatchItem(
                 collaterals[i],
                 sourceAccount,
-                abi.encodeCall(IEVault(collaterals[i]).transfer, (destinationAccount, amount))
+                abi.encodeCall(IEVault(collaterals[i]).transferFromMax, (sourceAccount, destinationAccount))
             );
             addBatchItem(
                 coreAddresses.evc, address(0), abi.encodeCall(IEVC.disableCollateral, (sourceAccount, collaterals[i]))
@@ -230,8 +220,8 @@ contract MigratePosition is BatchBuilder {
     }
 }
 
-contract MergeSafeBatchBuilderFiles is CustomScriptBase, SafeMultisendBuilder {
-    function execute() public override {
+contract MergeSafeBatchBuilderFiles is ScriptUtils, SafeMultisendBuilder {
+    function run() public {
         address safe = getSafe();
         string memory basePath = string.concat(
             vm.projectRoot(), "/", getPath(), "/SafeBatchBuilder_", vm.toString(safeNonce), "_", vm.toString(safe), "_"
@@ -250,8 +240,8 @@ contract MergeSafeBatchBuilderFiles is CustomScriptBase, SafeMultisendBuilder {
     }
 }
 
-contract UnpauseEVaultFactory is CustomScriptBase {
-    function execute() public override {
+contract UnpauseEVaultFactory is BatchBuilder {
+    function run() public {
         SafeTransaction transaction = new SafeTransaction();
 
         transaction.create(
@@ -265,8 +255,8 @@ contract UnpauseEVaultFactory is CustomScriptBase {
     }
 }
 
-contract DeployAndConfigureCapRiskSteward is CustomScriptBase {
-    function execute() public override {
+contract DeployAndConfigureCRSAndGACE is BatchBuilder {
+    function run() public {
         require(getConfigAddress("riskSteward") != address(0), "Risk steward config address not found");
         require(getConfigAddress("gauntlet") != address(0), "Gauntlet config address not found");
 
@@ -411,11 +401,13 @@ contract DeployAndConfigureCapRiskSteward is CustomScriptBase {
             (bool success,) = targets[i].call{value: values[i]}(payloads[i]);
             require(success, "timelock execution simulation failed");
         }
+
+        saveAddresses();
     }
 }
 
-contract RedeployOracleUtilsAndVaultLenses is CustomScriptBase {
-    function execute() public override {
+contract RedeployOracleUtilsAndVaultLenses is BatchBuilder {
+    function run() public {
         {
             LensOracleDeployer deployer = new LensOracleDeployer();
             lensAddresses.oracleLens = deployer.deploy(peripheryAddresses.oracleAdapterRegistry);
@@ -433,5 +425,7 @@ contract RedeployOracleUtilsAndVaultLenses is CustomScriptBase {
             LensEulerEarnVaultDeployer deployer = new LensEulerEarnVaultDeployer();
             lensAddresses.eulerEarnVaultLens = deployer.deploy(lensAddresses.utilsLens);
         }
+
+        saveAddresses();
     }
 }

script/production/CustomScripts.s.sol

@@ -49,7 +49,11 @@ fi
 read -p "Provide the deployment name used to save results (default: default): " deployment_name
 deployment_name=${deployment_name:-default}
 
-if [[ "$@" == *"--account"* ]]; then
+if [ -n "$DEPLOYER_KEY" ]; then
+    set -- "$@" --private-key "$DEPLOYER_KEY"
+fi
+
+if [[ "$@" == *"--account"* && -z "$DEPLOYER_KEY" ]]; then
     read -s -p "Enter keystore password: " password
     set -- "$@" --password "$password"
     echo ""
@@ -377,6 +381,30 @@ while IFS=, read -r -a columns || [ -n "$columns" ]; do
         base="${columns[8]}"
         quote="${columns[9]}"
 
+        jq -n \
+            --argjson addToAdapterRegistry false \
+            --arg adapterRegistry "0x0000000000000000000000000000000000000000" \
+            --arg pendleOracle "${columns[6]}" \
+            --arg pendleMarket "${columns[7]}" \
+            --arg base "${columns[8]}" \
+            --arg quote "${columns[9]}" \
+            --arg twapWindow "${columns[10]}" \
+            '{
+                addToAdapterRegistry: $addToAdapterRegistry,
+                adapterRegistry: $adapterRegistry,
+                pendleOracle: $pendleOracle,
+                pendleMarket: $pendleMarket,
+                base: $base,
+                quote: $quote,
+                twapWindow: $twapWindow
+            }' --indent 4 > script/${jsonName}_input.json
+    elif [[ "$provider" == "PendleUniversal" ]]; then
+        scriptName=${baseName}.s.sol:PendleUniversalAdapter
+        jsonName=03_PendleUniversalAdapter
+
+        base="${columns[8]}"
+        quote="${columns[9]}"
+
         jq -n \
             --argjson addToAdapterRegistry false \
             --arg adapterRegistry "0x0000000000000000000000000000000000000000" \
@@ -423,7 +451,23 @@ while IFS=, read -r -a columns || [ -n "$columns" ]; do
         continue
     fi
 
-    if script/utils/executeForgeScript.sh $scriptName "$@"; then
+    skip=false
+    if [[ "$provider" == *Pendle* ]]; then
+        result=$(cast call "${columns[6]}" "getOracleState(address,uint32)(bool,uint16,bool)" ${columns[7]} ${columns[10]} --rpc-url $DEPLOYMENT_RPC_URL)
+        increaseCardinalityRequired=$(echo "$result" | head -1)
+        cardinalityRequired=$(echo "$result" | sed -n '2p')
+        oldestObservationSatisfied=$(echo "$result" | tail -1)
+        
+        if [[ "$increaseCardinalityRequired" == "true" ]]; then
+            echo "Increasing observation cardinality for $adapterName..."
+            cast send "${columns[7]}" "increaseObservationsCardinalityNext(uint16)" $cardinalityRequired --rpc-url $DEPLOYMENT_RPC_URL "$@"
+            skip=true
+        elif [[ "$oldestObservationSatisfied" == "false" ]]; then
+            skip=true
+        fi
+    fi
+
+    if [[ "$skip" != "true" ]] && script/utils/executeForgeScript.sh $scriptName "$@"; then
         counter=$(script/utils/getFileNameCounter.sh "$deployment_dir/output/${jsonName}.json")
         adapter=$(jq -r '.adapter' "script/${jsonName}_output.json")
         entry="${baseSymbol},${quoteSymbol},${provider},${adapterName},${adapter},$base,$quote,${shouldWhitelist}"
@@ -442,7 +486,13 @@ while IFS=, read -r -a columns || [ -n "$columns" ]; do
         for json_file in script/*.json; do
             rm "$json_file"
         done
-        echo "Error deploying $adapterName. Exiting..."
-        exit 1
+
+        if [[ "$skip" == "true" ]]; then
+            echo "Skipping deployment of $adapterName. Insufficient observation history."
+            continue
+        else
+            echo "Error deploying $adapterName. Exiting..."
+            exit 1
+        fi
     fi
 done < <(tr -d '\r' < "$csv_file")