Merge pull request #25 from GenerationSoftware/gen-427-c4-issue-416

Added CREATE2 to VaultFactory
GenerationSoftware · Aug 17, 2023 · 9ac530b · 9ac530b
2 parents 8985bea + 1abbe58
commit 9ac530b
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 11 deletions.
diff --git a/src/VaultFactory.sol b/src/VaultFactory.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
+import { Create2 } from "openzeppelin/utils/Create2.sol";
 import { IERC20, IERC4626 } from "openzeppelin/token/ERC20/extensions/ERC4626.sol";
 
 import { ILiquidationPair } from "pt-v5-liquidator-interfaces/ILiquidationPair.sol";
@@ -35,6 +36,11 @@ contract VaultFactory {
    */
   mapping(Vault => bool) public deployedVaults;
 
+  /**
+   * @notice Mapping to store deployer nonces for CREATE2
+   */
+  mapping(address => uint) public deployerNonces;
+
   /* ============ External Functions ============ */
 
   /**
@@ -64,19 +70,28 @@ contract VaultFactory {
     uint256 _yieldFeePercentage,
     address _owner
   ) external returns (address) {
-    Vault _vault = new Vault(
-      _asset,
-      _name,
-      _symbol,
-      _twabController,
-      _yieldVault,
-      _prizePool,
-      _claimer,
-      _yieldFeeRecipient,
-      _yieldFeePercentage,
-      _owner
+    bytes memory bytecode = abi.encodePacked(
+      type(Vault).creationCode,
+      abi.encode(
+        _asset,
+        _name,
+        _symbol,
+        _twabController,
+        _yieldVault,
+        _prizePool,
+        _claimer,
+        _yieldFeeRecipient,
+        _yieldFeePercentage,
+        _owner
+      )
     );
 
+    Vault _vault = Vault(Create2.deploy(
+      0,
+      keccak256(abi.encode(msg.sender, deployerNonces[msg.sender]++)),
+      bytecode
+    ));
+
     allVaults.push(_vault);
     deployedVaults[_vault] = true;
 

diff --git a/test/unit/VaultFactory.t.sol b/test/unit/VaultFactory.t.sol
@@ -63,7 +63,39 @@ contract VaultFactoryTest is Test {
       address(this)
     );
 
+    assertEq(address(Vault(_vault).asset()), address(asset));
+
     assertEq(vaultFactory.totalVaults(), 1);
     assertTrue(vaultFactory.deployedVaults(Vault(_vault)));
   }
+
+  function testDeployVault_secondDeployShouldHaveDiffAddress() public {
+    Vault _vault1 = Vault(vaultFactory.deployVault(
+      asset,
+      name,
+      symbol,
+      twabController,
+      yieldVault,
+      prizePool,
+      claimer,
+      address(this),
+      0,
+      address(this)
+    ));
+
+    Vault _vault2 = Vault(vaultFactory.deployVault(
+      asset,
+      name,
+      symbol,
+      twabController,
+      yieldVault,
+      prizePool,
+      claimer,
+      address(this),
+      0,
+      address(this)
+    ));
+
+    assertNotEq(address(_vault1), address(_vault2));
+  }
 }