Make factory check that vaults are created by EVK factory

spearbit #9

Author: hoytech

script/DeployProtocol.s.sol

@@ -17,10 +17,11 @@ contract DeployProtocol is ScriptUtil {
         string memory json = _getJsonFile(inputScriptFileName);
 
         address evc = vm.parseJsonAddress(json, ".evc");
+        address factory = vm.parseJsonAddress(json, ".factory");
 
         vm.startBroadcast(deployerAddress);
 
-        new EulerSwapFactory(evc);
+        new EulerSwapFactory(evc, factory);
         new EulerSwapPeriphery();
 
         vm.stopBroadcast();

script/json/DeployProtocol_input.json

@@ -1,3 +1,4 @@
 {
-    "evc": "0x0C9a3dd6b8F28529d72d7f9cE918D493519EE383"
-}
+    "evc": "0x0C9a3dd6b8F28529d72d7f9cE918D493519EE383",
+    "factory": "0xF75548aF02f1928CbE9015985D4Fcbf96d728544"
+}

src/EulerSwap.sol

@@ -50,7 +50,6 @@ contract EulerSwap is IEulerSwap, EVCUtil {
     error Overflow();
     error BadParam();
     error AmountTooBig();
-    error DifferentEVC();
     error AssetsOutOfOrderOrEqual();
     error CurveViolation();
     error DepositFailure(bytes reason);
@@ -70,7 +69,6 @@ contract EulerSwap is IEulerSwap, EVCUtil {
         require(curveParams.priceX > 0 && curveParams.priceY > 0, BadParam());
         require(curveParams.priceX <= 1e36 && curveParams.priceY <= 1e36, BadParam());
         require(curveParams.concentrationX <= 1e18 && curveParams.concentrationY <= 1e18, BadParam());
-        require(IEVault(params.vault0).EVC() == IEVault(params.vault1).EVC(), DifferentEVC());
 
         address asset0Addr = IEVault(params.vault0).asset();
         address asset1Addr = IEVault(params.vault1).asset();

src/EulerSwapFactory.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.27;
 import {IEulerSwapFactory, IEulerSwap} from "./interfaces/IEulerSwapFactory.sol";
 import {EulerSwap} from "./EulerSwap.sol";
 import {EVCUtil} from "ethereum-vault-connector/utils/EVCUtil.sol";
+import {GenericFactory} from "evk/GenericFactory/GenericFactory.sol";
 
 /// @title EulerSwapFactory contract
 /// @custom:security-contact [email protected]
@@ -13,6 +14,8 @@ contract EulerSwapFactory is IEulerSwapFactory, EVCUtil {
     address[] public allPools;
     /// @dev Mapping between euler account and deployed pool that is currently set as operator
     mapping(address eulerAccount => address operator) public eulerAccountToPool;
+    /// @dev Vaults must be deployed by this factory
+    address public immutable evkFactory;
 
     event PoolDeployed(
         address indexed asset0,
@@ -34,15 +37,22 @@ contract EulerSwapFactory is IEulerSwapFactory, EVCUtil {
     error Unauthorized();
     error OldOperatorStillInstalled();
     error OperatorNotInstalled();
+    error InvalidVaultImplementation();
 
-    constructor(address evc) EVCUtil(evc) {}
+    constructor(address evc, address evkFactory_) EVCUtil(evc) {
+        evkFactory = evkFactory_;
+    }
 
     /// @inheritdoc IEulerSwapFactory
     function deployPool(IEulerSwap.Params memory params, IEulerSwap.CurveParams memory curveParams, bytes32 salt)
         external
         returns (address)
     {
         require(_msgSender() == params.eulerAccount, Unauthorized());
+        require(
+            GenericFactory(evkFactory).isProxy(params.vault0) && GenericFactory(evkFactory).isProxy(params.vault1),
+            InvalidVaultImplementation()
+        );
 
         EulerSwap pool = new EulerSwap{salt: keccak256(abi.encode(params.eulerAccount, salt))}(params, curveParams);
 

test/EulerSwapFactoryTest.t.sol

@@ -13,7 +13,7 @@ contract EulerSwapFactoryTest is EulerSwapTestBase {
         super.setUp();
 
         vm.prank(creator);
-        eulerSwapFactory = new EulerSwapFactory(address(evc));
+        eulerSwapFactory = new EulerSwapFactory(address(evc), address(factory));
     }
 
     function testDeployPool() public {