Deploy process and abstractions

packages/004_xfuji_forge/script/DeployGoerli.s.sol

@@ -4,15 +4,15 @@ pragma solidity ^0.8.13;
 import "forge-std/console.sol";
 import {ScriptPlus} from "./ScriptPlus.sol";
 import {IConnextHandler} from "nxtp/core/connext/interfaces/IConnextHandler.sol";
+import {BorrowingVault} from "../src/vaults/borrowing/BorrowingVault.sol";
 import {IVault} from "../src/interfaces/IVault.sol";
-import {Vault, ERC20} from "../src/Vault.sol";
 import {XRouter} from "../src/XRouter.sol";
 import {IWETH9} from "../src/helpers/PeripheryPayments.sol";
 import {AaveV3Goerli} from "../src/providers/goerli/AaveV3Goerli.sol";
 import {ILendingProvider} from "../src/interfaces/ILendingProvider.sol";
 
 contract DeployGoerli is ScriptPlus {
-  Vault public vault;
+  IVault public vault;
   XRouter public router;
   ILendingProvider public aaveV3;
 
@@ -43,12 +43,13 @@ contract DeployGoerli is ScriptPlus {
     router = new XRouter(weth, connextHandler);
     saveAddress("./deployments/goerli/XRouter", address(router));
 
-    vault = new Vault(
+    vault = new BorrowingVault(
       asset,
       debtAsset,
-      oracle
+      oracle,
+      address(0)
     );
-    saveAddress("./deployments/goerli/Vault", address(vault));
+    saveAddress("./deployments/goerli/BorrowingVault", address(vault));
 
     vault.setActiveProvider(aaveV3);
     router.registerVault(IVault(address(vault)));

packages/004_xfuji_forge/script/DeployRinkeby.s.sol

@@ -4,15 +4,15 @@ pragma solidity ^0.8.13;
 import "forge-std/console.sol";
 import {ScriptPlus} from "./ScriptPlus.sol";
 import {IConnextHandler} from "nxtp/core/connext/interfaces/IConnextHandler.sol";
+import {BorrowingVault} from "../src/vaults/borrowing/BorrowingVault.sol";
 import {IVault} from "../src/interfaces/IVault.sol";
-import {Vault, ERC20} from "../src/Vault.sol";
 import {XRouter} from "../src/XRouter.sol";
 import {IWETH9} from "../src/helpers/PeripheryPayments.sol";
 import {AaveV3Rinkeby} from "../src/providers/rinkeby/AaveV3Rinkeby.sol";
 import {ILendingProvider} from "../src/interfaces/ILendingProvider.sol";
 
 contract DeployRinkeby is ScriptPlus {
-  Vault public vault;
+  IVault public vault;
   XRouter public router;
   ILendingProvider public aaveV3;
 
@@ -43,12 +43,13 @@ contract DeployRinkeby is ScriptPlus {
     router = new XRouter(weth, connextHandler);
     saveAddress("./deployments/rinkeby/XRouter", address(router));
 
-    vault = new Vault(
+    vault = new BorrowingVault(
       asset,
       debtAsset,
-      oracle
+      oracle,
+      address(0)
     );
-    saveAddress("./deployments/rinkeby/Vault", address(vault));
+    saveAddress("./deployments/rinkeby/BorrowingVault", address(vault));
 
     vault.setActiveProvider(aaveV3);
     router.registerVault(IVault(address(vault)));

packages/004_xfuji_forge/script/bash/goerli/router.sh

@@ -6,7 +6,7 @@ deploy_contract XRouter --constructor-args $WETH $CONNEXT_HANDLER
 
 ROUTER=$(cat ./deployments/goerli/XRouter)
 
-VAULT=$(cat ./deployments/goerli/Vault)
+VAULT=$(cat ./deployments/goerli/BorrowingVault)
 
 cast_tx $ROUTER "setTestnetToken(address)" $TEST_TOKEN
 

packages/004_xfuji_forge/script/bash/goerli/vault.sh

@@ -4,8 +4,8 @@
 
 AAVE_V3=$(cat ./deployments/goerli/AaveV3Goerli)
 
-deploy_contract Vault --constructor-args $ASSET $DEBT_ASSET $ORACLE
+deploy_contract BorrowingVault --constructor-args $ASSET $DEBT_ASSET $ORACLE 0
 
-VAULT=$(cat ./deployments/goerli/Vault)
+VAULT=$(cat ./deployments/goerli/BorrowingVault)
 
 cast_tx $VAULT "setActiveProvider(address)" $AAVE_V3

packages/004_xfuji_forge/script/bash/rinkeby/router.sh

@@ -6,7 +6,7 @@ deploy_contract XRouter --constructor-args $WETH $CONNEXT_HANDLER
 
 ROUTER=$(cat ./deployments/rinkeby/XRouter)
 
-VAULT=$(cat ./deployments/rinkeby/Vault)
+VAULT=$(cat ./deployments/rinkeby/BorrowingVault)
 
 cast_tx $ROUTER "setTestnetToken(address)" $TEST_TOKEN
 

packages/004_xfuji_forge/script/bash/rinkeby/vault.sh

@@ -4,8 +4,8 @@
 
 AAVE_V3=$(cat ./deployments/rinkeby/AaveV3Rinkeby)
 
-deploy_contract Vault --constructor-args $ASSET $DEBT_ASSET $ORACLE
+deploy_contract BorrowingVault --constructor-args $ASSET $DEBT_ASSET $ORACLE 0
 
-VAULT=$(cat ./deployments/rinkeby/Vault)
+VAULT=$(cat ./deployments/rinkeby/BorrowingVault)
 
 cast_tx $VAULT "setActiveProvider(address)" $AAVE_V3

packages/004_xfuji_forge/src/Chief.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity >=0.8.9;
+
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+
+import {IVaultFactory} from "./interfaces/IVaultFactory.sol";
+
+/// @dev Custom Errors
+error ZeroAddress();
+error NotAllowed();
+
+/// @notice Vault deployer contract with template factory allow.
+/// ref: https://github.com/sushiswap/trident/blob/master/contracts/deployer/MasterDeployer.sol
+contract Chief is Ownable {
+  event DeployVault(address indexed factory, address indexed vault, bytes deployData);
+  event AddToAllowed(address indexed factory);
+  event RemoveFromAllowed(address indexed factory);
+
+  mapping(address => bool) public vaults;
+  mapping(address => bool) public allowedFactories;
+
+  function deployVault(address _factory, bytes calldata _deployData) external returns (address vault) {
+    if (!allowedFactories[_factory]) revert NotAllowed();
+    vault = IVaultFactory(_factory).deployVault(_deployData);
+    vaults[vault] = true;
+    emit DeployVault(_factory, vault, _deployData);
+  }
+
+  function addToAllowed(address _factory) external onlyOwner {
+    allowedFactories[_factory] = true;
+    emit AddToAllowed(_factory);
+  }
+
+  function removeFromAllowed(address _factory) external onlyOwner {
+    allowedFactories[_factory] = false;
+    emit RemoveFromAllowed(_factory);
+  }
+}