Add init validation for UniV3 Factory (#63)

makerdao · Oct 10, 2023 · f934c91 · f934c91
1 parent 1d36641
commit f934c91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/deploy/AllocatorInit.sol b/deploy/AllocatorInit.sol
@@ -95,6 +95,7 @@ interface DepositorUniV3Like {
 
     function roles() external view returns (address);
     function ilk() external view returns (bytes32);
+    function uniV3Factory() external view returns (address);
     function buffer() external view returns (address);
     function deposit(LiquidityParams memory) external returns (uint128, uint256, uint256);
     function withdraw(LiquidityParams memory, bool) external returns (uint128, uint256, uint256, uint256, uint256);
@@ -138,6 +139,7 @@ struct AllocatorIlkConfig {
     address[] swapTokens;
     address[] depositTokens;
     address ilkRegistry;
+    address uniV3Factory;
 }
 
 function bytes32ToStr(bytes32 _bytes32) pure returns (string memory) {
@@ -184,9 +186,10 @@ library AllocatorInit {
         require(SwapperLike(ilkInstance.swapper).ilk()    == ilk,                  "AllocatorInit/swapper-ilk-mismatch");
         require(SwapperLike(ilkInstance.swapper).buffer() == ilkInstance.buffer,   "AllocatorInit/swapper-buffer-mismatch");
 
-        require(DepositorUniV3Like(ilkInstance.depositorUniV3).roles()  == sharedInstance.roles, "AllocatorInit/depositorUniV3-roles-mismatch");
-        require(DepositorUniV3Like(ilkInstance.depositorUniV3).ilk()    == ilk,                  "AllocatorInit/depositorUniV3-ilk-mismatch");
-        require(DepositorUniV3Like(ilkInstance.depositorUniV3).buffer() == ilkInstance.buffer,   "AllocatorInit/depositorUniV3-buffer-mismatch");
+        require(DepositorUniV3Like(ilkInstance.depositorUniV3).roles()        == sharedInstance.roles, "AllocatorInit/depositorUniV3-roles-mismatch");
+        require(DepositorUniV3Like(ilkInstance.depositorUniV3).ilk()          == ilk,                  "AllocatorInit/depositorUniV3-ilk-mismatch");
+        require(DepositorUniV3Like(ilkInstance.depositorUniV3).uniV3Factory() == cfg.uniV3Factory,     "AllocatorInit/depositorUniV3-uniV3Factory-mismatch");
+        require(DepositorUniV3Like(ilkInstance.depositorUniV3).buffer()       == ilkInstance.buffer,   "AllocatorInit/depositorUniV3-buffer-mismatch");
 
         require(StableSwapperLike(ilkInstance.stableSwapper).swapper()                 == ilkInstance.swapper,        "AllocatorInit/stableSwapper-swapper-mismatch");
         require(StableDepositorUniV3Like(ilkInstance.stableDepositorUniV3).depositor() == ilkInstance.depositorUniV3, "AllocatorInit/stableDepositorUniV3-depositorUniV3-mismatch");

diff --git a/test/integration/Deployment.t.sol b/test/integration/Deployment.t.sol
@@ -191,7 +191,8 @@ contract DeploymentTest is DssTest {
             conduitMoverKeepers         : conduitMoverKeepers,
             swapTokens                  : swapTokens,
             depositTokens               : depositTokens,
-            ilkRegistry                 : ILK_REGISTRY
+            ilkRegistry                 : ILK_REGISTRY,
+            uniV3Factory                : UNIV3_FACTORY
         });
 
         AllocatorInit.initIlk(dss, sharedInst, ilkInst, cfg);