Merge branch 'eulerswap' into development

kasperpawlowski · kasperpawlowski · commit 071178d418f9 · 2025-06-05T23:27:39.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -34,3 +34,6 @@
 [submodule "lib/solidity-bytes-utils"]
 	path = lib/solidity-bytes-utils
 	url = https://github.com/GNSPS/solidity-bytes-utils
+[submodule "lib/euler-swap"]
+	path = lib/euler-swap
+	url = https://github.com/euler-xyz/euler-swap
diff --git a/lib/euler-swap b/lib/euler-swap
@@ -0,0 +1 @@
+Subproject commit b948f4052d7ab3116235ec754368b7125dbd5082
diff --git a/remappings.txt b/remappings.txt
@@ -13,6 +13,10 @@ lib/layerzero-devtools/packages/oapp-evm-upgradeable/contracts:@openzeppelin/con
 @layerzerolabs/lz-evm-oapp-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/oapp
 openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
 openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+lib/fee-flow/src:solmate/=lib/fee-flow/lib/solmate/src
+lib/fee-flow/utils:solmate/=lib/fee-flow/lib/solmate/utils
+lib/fee-flow/tokens:solmate/=lib/fee-flow/lib/solmate/tokens
+lib/euler-swap:solmate/=lib/euler-swap/lib/euler-vault-kit/lib/permit2/lib/solmate
 ethereum-vault-connector/=lib/ethereum-vault-connector/src/
 evc/=lib/ethereum-vault-connector/src/
 evk/=lib/euler-vault-kit/src/
diff --git a/script/22_EulerSwapImplementation.s.sol b/script/22_EulerSwapImplementation.s.sol
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma solidity ^0.8.0;
+
+import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
+
+contract EulerSwapImplementation is ScriptUtils {
+    function run() public broadcast returns (address implementation) {
+        string memory inputScriptFileName = "22_EulerSwapImplementation_input.json";
+        string memory outputScriptFileName = "22_EulerSwapImplementation_output.json";
+        string memory json = getScriptFile(inputScriptFileName);
+        address evc = vm.parseJsonAddress(json, ".evc");
+        address poolManager = vm.parseJsonAddress(json, ".poolManager");
+
+        implementation = execute(evc, poolManager);
+
+        string memory object;
+        object = vm.serializeAddress("implementation", "eulerSwapImplementation", implementation);
+
+        vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
+    }
+
+    function deploy(address evc, address poolManager) public broadcast returns (address implementation) {
+        implementation = execute(evc, poolManager);
+    }
+
+    function execute(address evc, address poolManager) public returns (address implementation) {
+        bytes memory bytecode =
+            abi.encodePacked(vm.getCode("out-euler-swap/EulerSwap.sol/EulerSwap.json"), abi.encode(evc, poolManager));
+        assembly {
+            implementation := create(0, add(bytecode, 0x20), mload(bytecode))
+        }
+    }
+}
diff --git a/script/23_EulerSwapFactory.s.sol b/script/23_EulerSwapFactory.s.sol
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma solidity ^0.8.0;
+
+import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
+
+contract EulerSwapFactory is ScriptUtils {
+    function run() public broadcast returns (address eulerSwapFactory) {
+        string memory inputScriptFileName = "23_EulerSwapFactory_input.json";
+        string memory outputScriptFileName = "23_EulerSwapFactory_output.json";
+        string memory json = getScriptFile(inputScriptFileName);
+        address evc = vm.parseJsonAddress(json, ".evc");
+        address eVaultFactory = vm.parseJsonAddress(json, ".eVaultFactory");
+        address eulerSwapImplementation = vm.parseJsonAddress(json, ".eulerSwapImplementation");
+        address feeOwner = vm.parseJsonAddress(json, ".feeOwner");
+        address feeReceipientSetter = vm.parseJsonAddress(json, ".feeReceipientSetter");
+
+        eulerSwapFactory = execute(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeReceipientSetter);
+
+        string memory object;
+        object = vm.serializeAddress("factory", "eulerSwapFactory", eulerSwapFactory);
+
+        vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
+    }
+
+    function deploy(
+        address evc,
+        address eVaultFactory,
+        address eulerSwapImplementation,
+        address feeOwner,
+        address feeReceipientSetter
+    ) public broadcast returns (address eulerSwapFactory) {
+        eulerSwapFactory = execute(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeReceipientSetter);
+    }
+
+    function execute(
+        address evc,
+        address eVaultFactory,
+        address eulerSwapImplementation,
+        address feeOwner,
+        address feeReceipientSetter
+    ) public returns (address eulerSwapFactory) {
+        bytes memory bytecode = abi.encodePacked(
+            vm.getCode("out-euler-swap/EulerSwapFactory.sol/EulerSwapFactory.json"),
+            abi.encode(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeReceipientSetter)
+        );
+        assembly {
+            eulerSwapFactory := create(0, add(bytecode, 0x20), mload(bytecode))
+        }
+    }
+}
diff --git a/script/50_CoreAndPeriphery.s.sol b/script/50_CoreAndPeriphery.s.sol
@@ -36,6 +36,8 @@ import {OFTAdapterUpgradeableDeployer, MintBurnOFTAdapterDeployer} from "./14_OF
 import {EdgeFactoryDeployer} from "./15_EdgeFactory.s.sol";
 import {EulerEarnImplementation, IntegrationsParams} from "./20_EulerEarnImplementation.s.sol";
 import {EulerEarnFactory} from "./21_EulerEarnFactory.s.sol";
+import {EulerSwapImplementation} from "./22_EulerSwapImplementation.s.sol";
+import {EulerSwapFactory} from "./23_EulerSwapFactory.s.sol";
 import {FactoryGovernor} from "./../src/Governor/FactoryGovernor.sol";
 import {
     IGovernorAccessControlEmergencyFactory,
@@ -82,6 +84,10 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         address uniswapV3Router;
         uint256 feeFlowInitPrice;
         bool deployOFT;
+        bool deployEulerSwapV1;
+        address uniswapPoolManager;
+        address eulerSwapFeeOwner;
+        address eulerSwapFeeRecipientSetter;
     }
 
     struct AdaptiveCurveIRMParams {
@@ -172,7 +178,11 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             uniswapV2Router: vm.parseJsonAddress(json, ".uniswapV2Router"),
             uniswapV3Router: vm.parseJsonAddress(json, ".uniswapV3Router"),
             feeFlowInitPrice: vm.parseJsonUint(json, ".feeFlowInitPrice"),
-            deployOFT: vm.parseJsonBool(json, ".deployOFT")
+            deployOFT: vm.parseJsonBool(json, ".deployOFT"),
+            deployEulerSwapV1: vm.parseJsonBool(json, ".deployEulerSwapV1"),
+            uniswapPoolManager: vm.parseJsonAddress(json, ".uniswapPoolManager"),
+            eulerSwapFeeOwner: vm.parseJsonAddress(json, ".eulerSwapFeeOwner"),
+            eulerSwapFeeRecipientSetter: vm.parseJsonAddress(json, ".eulerSwapFeeRecipientSetter")
         });
 
         if (
@@ -253,6 +263,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             coreAddresses.eulerEarnFactory = deployer.deploy(coreAddresses.eulerEarnImplementation);
         } else {
             console.log("- EulerEarn factory already deployed. Skipping...");
+            if (vm.isDir("out-euler-earn")) vm.removeDir("out-euler-earn", true);
         }
 
         if (governorAddresses.eVaultFactoryGovernor == address(0)) {
@@ -993,6 +1004,34 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             console.log("- Adaptive Curve IRM factory or IRM registry not deployed. Skipping...");
         }
 
+        if (
+            eulerSwapAddresses.eulerSwapV1Implementation == address(0)
+                && eulerSwapAddresses.eulerSwapV1Factory == address(0)
+        ) {
+            if (input.deployEulerSwapV1) {
+                {
+                    console.log("+ Deploying EulerSwap V1 implementation...");
+                    EulerSwapImplementation deployer = new EulerSwapImplementation();
+                    eulerSwapAddresses.eulerSwapV1Implementation =
+                        deployer.deploy(coreAddresses.evc, input.uniswapPoolManager);
+                }
+                {
+                    console.log("+ Deploying EulerSwap V1 factory...");
+                    EulerSwapFactory deployer = new EulerSwapFactory();
+                    eulerSwapAddresses.eulerSwapV1Factory = deployer.deploy(
+                        coreAddresses.evc,
+                        coreAddresses.eVaultFactory,
+                        eulerSwapAddresses.eulerSwapV1Implementation,
+                        input.eulerSwapFeeOwner,
+                        input.eulerSwapFeeRecipientSetter
+                    );
+                }
+            } else {
+                console.log("- EulerSwap v1 not deployed. Skipping...");
+                if (vm.isDir("out-euler-swap")) vm.removeDir("out-euler-swap", true);
+            }
+        }
+
         executeBatch();
 
         if (multisendItemExists()) {
@@ -1015,6 +1054,9 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         vm.writeJson(serializeGovernorAddresses(governorAddresses), getScriptFilePath("GovernorAddresses_output.json"));
         vm.writeJson(serializeTokenAddresses(tokenAddresses), getScriptFilePath("TokenAddresses_output.json"));
         vm.writeJson(serializeLensAddresses(lensAddresses), getScriptFilePath("LensAddresses_output.json"));
+        vm.writeJson(
+            serializeEulerSwapAddresses(eulerSwapAddresses), getScriptFilePath("EulerSwapAddresses_output.json")
+        );
         vm.writeJson(serializeBridgeAddresses(bridgeAddresses), getScriptFilePath("BridgeAddresses_output.json"));
         vm.writeJson(serializeBridgeConfigCache(), getScriptFilePath("BridgeConfigCache_output.json"));
 
@@ -1042,6 +1084,10 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             vm.writeJson(
                 serializeLensAddresses(lensAddresses), getAddressesFilePath("LensAddresses.json", block.chainid)
             );
+            vm.writeJson(
+                serializeEulerSwapAddresses(eulerSwapAddresses),
+                getAddressesFilePath("EulerSwapAddresses.json", block.chainid)
+            );
             vm.writeJson(
                 serializeBridgeAddresses(bridgeAddresses), getAddressesFilePath("BridgeAddresses.json", block.chainid)
             );
diff --git a/script/interactiveDeployment.sh b/script/interactiveDeployment.sh
@@ -38,6 +38,7 @@ if ! script/utils/checkEnvironment.sh "$@"; then
 fi
 
 eulerEarnCompilerOptions="--optimize --optimizer-runs 800 --use 0.8.27 --out out-euler-earn"
+eulerSwapCompilerOptions="--optimize --optimizer-runs 1000000 --use 0.8.27 --out out-euler-swap"
 
 while true; do
     echo ""
@@ -1263,6 +1264,7 @@ while true; do
                 feeFlowController=$(jq -r '.feeFlowController' "$addresses_dir_path/PeripheryAddresses.json" 2>/dev/null)
                 eulerEarnFactory=$(jq -r '.eulerEarnFactory' "$addresses_dir_path/CoreAddresses.json" 2>/dev/null)
                 eulerEarnFactory=${eulerEarnFactory:-$addressZero}
+                eulerSwapV1Factory=$(jq -r '.eulerSwapV1Factory' "$addresses_dir_path/EulerSwapAddresses.json" 2>/dev/null)
             fi
 
             if [ -z "$multisig_dao" ] || [ "$multisig_dao" == "$addressZero" ]; then
@@ -1290,6 +1292,16 @@ while true; do
                 read -p "Should deploy and configure OFT Adapter? (y/n) (default: n): " deploy_oft
             fi
 
+            if [ -z "$eulerSwapV1Factory" ] || [ "$eulerSwapV1Factory" == "$addressZero" ]; then
+                read -p "Should deploy EulerSwap V1? (y/n) (default: n): " deploy_euler_swap_v1
+                
+                if [ "$deploy_euler_swap_v1" = "y" ]; then
+                    read -p "Enter the Uniswap V4 Pool Manager address (default: address(0) or look up https://docs.uniswap.org/contracts/v4/deployments): " uniswap_pool_manager
+                    read -p "Enter the EulerSwap fee owner (default: DAO multisig): " euler_swap_fee_owner
+                    read -p "Enter the EulerSwap fee recipient setter (default: address(0)): " euler_swap_fee_recipient_setter
+                fi
+            fi
+
             multisig_dao=${multisig_dao:-$addressZero}
             multisig_labs=${multisig_labs:-$addressZero}
             multisig_security_council=${multisig_security_council:-$addressZero}
@@ -1300,11 +1312,19 @@ while true; do
             uniswap_router_v3=${uniswap_router_v3:-$addressZero}
             init_price=${init_price:-1000000000000000000}
             deploy_oft=${deploy_oft:-n}
+            deploy_euler_swap_v1=${deploy_euler_swap_v1:-n}
+            uniswap_pool_manager=${uniswap_pool_manager:-$addressZero}
+            euler_swap_fee_owner=${euler_swap_fee_owner:-$multisig_dao}
+            euler_swap_fee_recipient_setter=${euler_swap_fee_recipient_setter:-$addressZero}
 
             if [ -z "$eulerEarnFactory" ] || [ "$eulerEarnFactory" == "$addressZero" ]; then
                 forge compile lib/euler-earn/src $eulerEarnCompilerOptions --force
             fi
 
+            if [ -z "$eulerSwapFactory_v1" ] || [ "$eulerSwapFactory_v1" == "$addressZero" ]; then
+                forge compile lib/euler-swap/src $eulerSwapCompilerOptions --force
+            fi
+
             if [[ "$@" != *"--ffi"* ]]; then
                 set -- "$@" --ffi
             fi
@@ -1320,6 +1340,10 @@ while true; do
                 --arg uniswapRouterV3 "$uniswap_router_v3" \
                 --arg initPrice "$init_price" \
                 --argjson deployOFT "$(jq -n --argjson val \"$deploy_oft\" 'if $val == "y" then true else false end')" \
+                --argjson deployEulerSwapV1 "$(jq -n --argjson val \"$deploy_euler_swap_v1\" 'if $val == "y" then true else false end')" \
+                --arg uniswapPoolManager "$uniswap_pool_manager" \
+                --arg eulerSwapFeeOwner "$euler_swap_fee_owner" \
+                --arg eulerSwapFeeRecipientSetter "$euler_swap_fee_recipient_setter" \
                 '{
                     multisigDAO: $multisigDAO,
                     multisigLabs: $multisigLabs,
@@ -1330,7 +1354,11 @@ while true; do
                     uniswapV2Router: $uniswapRouterV2,
                     uniswapV3Router: $uniswapRouterV3,
                     feeFlowInitPrice: $initPrice,
-                    deployOFT: $deployOFT
+                    deployOFT: $deployOFT,
+                    deployEulerSwapV1: $deployEulerSwapV1,
+                    uniswapPoolManager: $uniswapPoolManager,
+                    eulerSwapFeeOwner: $eulerSwapFeeOwner,
+                    eulerSwapFeeRecipientSetter: $eulerSwapFeeRecipientSetter
                 }' --indent 4 > script/${jsonName}_input.json
             ;;
         51)
diff --git a/script/utils/ScriptUtils.s.sol b/script/utils/ScriptUtils.s.sol
@@ -295,6 +295,26 @@ abstract contract MultisigAddressesLib is ScriptExtended {
     }
 }
 
+abstract contract EulerSwapAddressesLib is ScriptExtended {
+    struct EulerSwapAddresses {
+        address eulerSwapV1Implementation;
+        address eulerSwapV1Factory;
+    }
+
+    function serializeEulerSwapAddresses(EulerSwapAddresses memory Addresses) internal returns (string memory result) {
+        result =
+            vm.serializeAddress("eulerSwapAddresses", "eulerSwapV1Implementation", Addresses.eulerSwapV1Implementation);
+        result = vm.serializeAddress("eulerSwapAddresses", "eulerSwapV1Factory", Addresses.eulerSwapV1Factory);
+    }
+
+    function deserializeEulerSwapAddresses(string memory json) internal pure returns (EulerSwapAddresses memory) {
+        return EulerSwapAddresses({
+            eulerSwapV1Implementation: getAddressFromJson(json, ".eulerSwapV1Implementation"),
+            eulerSwapV1Factory: getAddressFromJson(json, ".eulerSwapV1Factory")
+        });
+    }
+}
+
 abstract contract BridgeAddressesLib is ScriptExtended {
     struct BridgeAddresses {
         address oftAdapter;
@@ -373,6 +393,7 @@ abstract contract ScriptUtils is
     BridgeAddressesLib,
     TokenAddressesLib,
     GovernorAddressesLib,
+    EulerSwapAddressesLib,
     BridgeConfigCache
 {
     MultisigAddresses internal multisigAddresses;
@@ -382,6 +403,7 @@ abstract contract ScriptUtils is
     BridgeAddresses internal bridgeAddresses;
     TokenAddresses internal tokenAddresses;
     GovernorAddresses internal governorAddresses;
+    EulerSwapAddresses internal eulerSwapAddresses;
     uint256 internal safeNonce = getSafeNonce();
 
     constructor() {
@@ -392,6 +414,7 @@ abstract contract ScriptUtils is
         bridgeAddresses = deserializeBridgeAddresses(getAddressesJson("BridgeAddresses.json"));
         tokenAddresses = deserializeTokenAddresses(getAddressesJson("TokenAddresses.json"));
         governorAddresses = deserializeGovernorAddresses(getAddressesJson("GovernorAddresses.json"));
+        eulerSwapAddresses = deserializeEulerSwapAddresses(getAddressesJson("EulerSwapAddresses.json"));
         deserializeBridgeConfigCache(getBridgeConfigCacheJson("BridgeConfigCache.json"));
     }
 
diff --git a/script/utils/verifyContracts.sh b/script/utils/verifyContracts.sh
@@ -78,6 +78,7 @@ function verify_broadcast {
 
     local createVerified=false
     local eulerEarnIndex=0
+    local eulerSwapIndex=0
     for tx in $transactions; do
         local transactionType=$(echo $tx | jq -r '.transactionType')
         local contractAddress=$(echo $tx | jq -r '.contractAddress')
@@ -193,7 +194,7 @@ function verify_broadcast {
         elif [[ $transactionType == "CREATE" && $verificationSuccessful != true ]]; then
             local initCode=$(echo $tx | jq -r '.transaction.input')
 
-            if [ -d "out-euler-earn" ]; then
+            if [ -d "out-euler-earn" ] && [ $eulerEarnIndex -le 7 ]; then
                 # try to verify as EulerEarn contracts
                 local src="lib/euler-earn/src"
                 local verificationOptions="--num-of-optimizations 800 --compiler-version 0.8.27 --root lib/euler-earn"
@@ -263,6 +264,47 @@ function verify_broadcast {
                     ((eulerEarnIndex++))
                 done
             fi
+
+            if [ -d "out-euler-swap" ] && ([ ! -d "out-euler-earn" ] || [ $eulerEarnIndex -gt 7 ]); then
+                # try to verify as EulerSwap contracts
+                local src="lib/euler-swap/src"
+                local verificationOptions="--num-of-optimizations 1000000 --compiler-version 0.8.27 --root lib/euler-swap"
+                local compilerOptions="--optimize --optimizer-runs 1000000 --use 0.8.27"
+
+                while true; do
+                    case $eulerSwapIndex in
+                        0)
+                            # try to verify as EulerSwap
+                            contractName=EulerSwap
+                            constructorBytesSize=64
+                            ;;
+                        1)
+                            # try to verify as EulerSwapFactory
+                            contractName=EulerSwapFactory
+                            constructorBytesSize=160
+                            ;;
+                        *)
+                            break
+                            ;;
+                    esac
+
+                    constructorArgs="--constructor-args ${initCode: -$((2*constructorBytesSize))}"
+
+                    if [ "$createVerified" = false ]; then
+                        forge clean && forge compile $src $compilerOptions
+                    fi
+
+                    verify_contract $contractAddress $contractName "$constructorArgs" "$@" $verificationOptions
+
+                    if [ $? -eq 0 ]; then
+                        createVerified=true
+                        ((eulerSwapIndex++))
+                        break
+                    fi
+
+                    ((eulerSwapIndex++))
+                done
+            fi
         fi
     done
 }
