Experimental: Immutable launcher with dex liquidity transfer

.gitmodules

@@ -13,3 +13,9 @@
 [submodule "lib/uma-protocol"]
 	path = lib/uma-protocol
 	url = https://github.com/UMAprotocol/protocol
+[submodule "lib/v2-core"]
+	path = lib/v2-core
+	url = https://github.com/Uniswap/v2-core
+[submodule "lib/v2-periphery"]
+	path = lib/v2-periphery
+	url = https://github.com/Uniswap/v2-periphery

remappings.txt

@@ -8,3 +8,5 @@
 @lm/=src/modules/logicModule/
 @lm_pc/=src/modules/logicModule/paymentClient/
 @aut/=src/modules/authorizer/
+@univ2core/=lib/v2-core/contracts/
+@univ2peri/=lib/v2-periphery/contracts/

script/deploymentScript/CustomFactoryDeploymentScript.s.sol

@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.0;
+
+import "forge-std/Script.sol";
+
+import {Restricted_PIM_Factory_v1} from
+    "src/factories/custom/Restricted_PIM_Factory_v1.sol";
+import {Immutable_PIM_Factory_v1} from
+    "src/experimental/factories/Immutable_PIM_Factory_v1.sol";
+import {UniswapV2Adapter} from
+    "src/experimental/modules/ImmutableMigration/UniswapV2Adapter.sol";
+
+import {ERC2771Context} from "@oz/metatx/ERC2771Context.sol";
+
+contract CustomFactoryDeploymentScript is Script {
+    address public orchestratorFactory =
+        vm.envOr("ORCHESTRATOR_FACTORY_ADDRESS", address(0));
+
+    address public uniswapAdapter;
+
+    function run() public virtual {
+        console2.log(
+            "Deploying Custom Factory, attached to Orchestrator Factory at %s:",
+            orchestratorFactory
+        );
+
+        uniswapAdapter = deployUniswapAdapter();
+
+        _deploy(vm.envString("FACTORY_TYPE"));
+    }
+
+    function deploy(address orchestratorFactory_) public {
+        // Take Orchestrator Factory from function parameter
+        // and not from the env file.
+        orchestratorFactory = orchestratorFactory_;
+
+        console2.log();
+        console2.log(
+            "================================================================================"
+        );
+        console2.log("Start Custom Factory Deployment Script");
+        console2.log(
+            "================================================================================"
+        );
+        console2.log(
+            "--------------------------------------------------------------------------------"
+        );
+        console2.log(" Deploying Custom Factories:");
+
+        _deploy("RESTRICTED");
+
+        _deploy("IMMUTABLE");
+
+        console2.log(
+            "--------------------------------------------------------------------------------"
+        );
+    }
+
+    function _deploy(string memory factoryType_) public validateInputs {
+        // Obtain the correct trusted forwarder from the orchestrator factory.
+        address trustedForwarder =
+            ERC2771Context(orchestratorFactory).trustedForwarder();
+        require(
+            trustedForwarder != address(0),
+            "Trusted Forwarder address not set - aborting!"
+        );
+
+        vm.startBroadcast(vm.envUint("DEPLOYER_PRIVATE_KEY"));
+        if (_isEqual(factoryType_, "RESTRICTED")) {
+            {
+                console2.log(
+                    "\tRestricted_PIM_Factory_v1: %s",
+                    address(
+                        new Restricted_PIM_Factory_v1(
+                            orchestratorFactory, trustedForwarder
+                        )
+                    )
+                );
+            }
+        } else if (_isEqual(factoryType_, "IMMUTABLE")) {
+            {
+                console2.log(
+                    "\tImmutable_PIM_Factory_v1: %s",
+                    address(
+                        new Immutable_PIM_Factory_v1(
+                            orchestratorFactory,
+                            trustedForwarder,
+                            uniswapAdapter
+                        )
+                    )
+                );
+            }
+        } else {
+            revert("Invalid factory type - aborting!");
+        }
+
+        vm.stopBroadcast();
+    }
+
+    function deployUniswapAdapter() internal returns (address) {
+        address uniswapFactoryAddress = vm.envAddress("UNISWAPFACTORY");
+        address uniswapRouterAddress = vm.envAddress("UNISWAPROUTER");
+
+        return address(
+            new UniswapV2Adapter(uniswapFactoryAddress, uniswapRouterAddress)
+        );
+    }
+
+    function _isEqual(string memory a_, string memory b_)
+        internal
+        pure
+        returns (bool)
+    {
+        return
+            keccak256(abi.encodePacked(a_)) == keccak256(abi.encodePacked(b_));
+    }
+
+    modifier validateInputs() {
+        require(
+            orchestratorFactory != address(0),
+            "Orchestrator Factory address not set - aborting!"
+        );
+        _;
+    }
+}

script/deploymentScript/TestnetDeploymentScript.s.sol

@@ -1,23 +1,23 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
-import "forge-std/Script.sol";
+import 'forge-std/Script.sol';
 
 // Scripts
-import {DeploymentScript} from "script/deploymentScript/DeploymentScript.s.sol";
+import {DeploymentScript} from 'script/deploymentScript/DeploymentScript.s.sol';
+import {CustomFactoryDeploymentScript} from 'script/deploymentScript/CustomFactoryDeploymentScript.s.sol';
 
 // Contracts
-import {DeterministicFactory_v1} from "@df/DeterministicFactory_v1.sol";
+import {DeterministicFactory_v1} from '@df/DeterministicFactory_v1.sol';
 
 // Interfaces
-import {IERC20} from "@oz/token/ERC20/IERC20.sol";
+import {IERC20} from '@oz/token/ERC20/IERC20.sol';
 
 // Mocks
-import {
-    OptimisticOracleV3Mock,
-    OptimisticOracleV3Interface
-} from "test/modules/logicModule/oracle/utils/OptimisiticOracleV3Mock.sol";
-import {ERC20Mock} from "test/utils/mocks/ERC20Mock.sol";
+import {OptimisticOracleV3Mock, OptimisticOracleV3Interface} from 'test/modules/logicModule/oracle/utils/OptimisiticOracleV3Mock.sol';
+import {ERC20Mock} from 'test/utils/mocks/ERC20Mock.sol';
+import {uniswapFactoryAddress, uniswapRouterAddress, uniswapFactoryBytecode, uniswapRouterBytecode} from 'test/experimental/factories/Immutable_PIM_Factory_v1.t.sol';
+import {UniswapV2Adapter} from 'src/experimental/modules/ImmutableMigration/UniswapV2Adapter.sol';
 
 /**
  * @title Inverter Testnet Deployment Script
@@ -33,14 +33,14 @@ contract TestnetDeploymentScript is DeploymentScript {
 
     uint64 immutable DEFAULT_LIVENESS = 25_000;
 
-    function run() public virtual override {
+    function run() public virtual override(DeploymentScript) {
         console2.log();
         console2.log(
-            "================================================================================"
+            '================================================================================'
         );
-        console2.log("Start Testnet Deployment Script");
+        console2.log('Start Testnet Deployment Script');
         console2.log(
-            "================================================================================"
+            '================================================================================'
         );
 
         // Set required parameters to testnet values
@@ -58,27 +58,34 @@ contract TestnetDeploymentScript is DeploymentScript {
 
         vm.startBroadcast(deployerPrivateKey);
         {
-            console2.log(" Set up dependency contracts ");
+            console2.log(' Set up dependency contracts ');
 
             // Deploy and setup DeterministicFactory
-            deterministicFactory =
-                address(new DeterministicFactory_v1(deployer));
+            deterministicFactory = address(
+                new DeterministicFactory_v1(deployer)
+            );
             DeterministicFactory_v1(deterministicFactory).setAllowedDeployer(
                 deployer
             );
-            console2.log("\tDeterministic Factory: %s", deterministicFactory);
+            console2.log('\tDeterministic Factory: %s', deterministicFactory);
 
-            console2.log(" Set up mocks");
+            console2.log(' Set up mocks');
 
             // Deploy and setup UMA's OptimisticOracleV3Mock
             ooV3 = new OptimisticOracleV3Mock(
-                IERC20(address(mockCollateralToken)), DEFAULT_LIVENESS
+                IERC20(address(mockCollateralToken)),
+                DEFAULT_LIVENESS
             ); // @note FeeToken?
-            console2.log("\tOptimisticOracleV3Mock: %s", address(ooV3));
+            console2.log('\tOptimisticOracleV3Mock: %s', address(ooV3));
 
             // Deploy and setup Mock Collateral Token
-            mockCollateralToken = new ERC20Mock("Inverter USD", "iUSD");
-            console2.log("\tERC20Mock iUSD: %s", address(mockCollateralToken));
+            mockCollateralToken = new ERC20Mock('Inverter USD', 'iUSD');
+            console2.log('\tERC20Mock iUSD: %s', address(mockCollateralToken));
+
+            // Deploy uniswap v2 adapter
+            address uniswapV2Adapter = deployUniswapAdapter();
+            vm.setEnv('DEX_ADAPTER', vm.toString(uniswapV2Adapter));
+            console2.log('\tUniswapV2Adapter: %s', uniswapV2Adapter);
         }
         vm.stopBroadcast();
 
@@ -88,5 +95,26 @@ contract TestnetDeploymentScript is DeploymentScript {
         proxyAndBeaconDeployer.setFactory(deterministicFactory);
 
         super.run();
+
+        CustomFactoryDeploymentScript customFactoryDeploymentScript = new CustomFactoryDeploymentScript();
+        customFactoryDeploymentScript.deploy(orchestratorFactory);
+    }
+
+    //--------------------------------------------------------------------------
+    // Utils
+    //--------------------------------------------------------------------------
+
+    function deployUniswapAdapter() internal returns (address) {
+        vm.etch(uniswapFactoryAddress, uniswapFactoryBytecode);
+        vm.etch(uniswapRouterAddress, uniswapRouterBytecode);
+
+        // Deploy UniswapV2Adapter
+        return
+            address(
+                new UniswapV2Adapter(
+                    uniswapFactoryAddress,
+                    uniswapRouterAddress
+                )
+            );
     }
 }