Support also nst on init validation (#15)

Author: oldchili

deploy/FlapperInit.sol

@@ -48,12 +48,17 @@ interface PairLike {
     function token1() external view returns (address);
 }
 
+interface DaiJoinLike {
+    function dai() external view returns (address);
+}
+
 struct FlapperUniV2Config {
     uint256 hop;
     uint256 want;
     address pip;
     uint256 hump;
     uint256 bump;
+    address daiJoin;
 }
 
 library FlapperInit {
@@ -69,14 +74,15 @@ library FlapperInit {
 
         // Sanity checks
         require(flapper.vat()     == address(dss.vat),     "Flapper vat mismatch");
-        require(flapper.daiJoin() == address(dss.daiJoin), "Flapper daiJoin mismatch");
+        require(flapper.daiJoin() == cfg.daiJoin,          "Flapper daiJoin mismatch");
         require(flapper.spotter() == address(dss.spotter), "Flapper spotter mismatch");
 
         PairLike pair = PairLike(flapper.pair());
-        (address pairDai, address pairGem) = pair.token0() == address(dss.dai) ? (pair.token0(), pair.token1())
-                                                                               : (pair.token1(), pair.token0());
-        require(pairDai == address(dss.dai), "Dai mismatch");
-        require(pairGem == flapper.gem(),    "Gem mismatch");
+        address  dai  = DaiJoinLike(cfg.daiJoin).dai();
+        (address pairDai, address pairGem) = pair.token0() == dai ? (pair.token0(), pair.token1())
+                                                                  : (pair.token1(), pair.token0());
+        require(pairDai == dai,           "Dai mismatch");
+        require(pairGem == flapper.gem(), "Gem mismatch");
 
         require(cfg.hop >= 5 minutes, "hop too low");
         require(cfg.want >= WAD * 90 / 100, "want too low");

test/FlapperMom.t.sol

@@ -78,11 +78,12 @@ contract FlapperMomTest is Test {
 
         // use random values
         FlapperUniV2Config memory cfg = FlapperUniV2Config({
-            hop:  5 minutes,
-            want: 1e18,
-            pip:  address(0),
-            hump: 1,
-            bump: 0
+            hop:     5 minutes,
+            want:    1e18,
+            pip:     address(0),
+            hump:    1,
+            bump:    0,
+            daiJoin: DAI_JOIN
         });
         DssInstance memory dss = MCD.loadFromChainlog(LOG);
 

test/FlapperUniV2.t.sol

@@ -174,11 +174,12 @@ contract FlapperUniV2Test is DssTest {
         // Note - this part emulates the spell initialization
         vm.startPrank(PAUSE_PROXY);
         FlapperUniV2Config memory cfg = FlapperUniV2Config({
-            hop  : 30 minutes,
-            want : WAD * 97 / 100,
-            pip  : address(_medianizer),
-            hump : 50_000_000 * RAD,
-            bump : 5707 * RAD
+            hop     : 30 minutes,
+            want    : WAD * 97 / 100,
+            pip     : address(_medianizer),
+            hump    : 50_000_000 * RAD,
+            bump    : 5707 * RAD,
+            daiJoin : DAI_JOIN
         });
 
         DssInstance memory dss = MCD.loadFromChainlog(LOG);

test/FlapperUniV2SwapOnly.t.sol

@@ -174,11 +174,12 @@ contract FlapperUniV2SwapOnlyTest is DssTest {
         // Note - this part emulates the spell initialization
         vm.startPrank(PAUSE_PROXY);
         FlapperUniV2Config memory cfg = FlapperUniV2Config({
-            hop  : 30 minutes,
-            want : WAD * 97 / 100,
-            pip  : address(_medianizer),
-            hump : 50_000_000 * RAD,
-            bump : 5707 * RAD
+            hop     : 30 minutes,
+            want    : WAD * 97 / 100,
+            pip     : address(_medianizer),
+            hump    : 50_000_000 * RAD,
+            bump    : 5707 * RAD,
+            daiJoin : DAI_JOIN
         });
 
         DssInstance memory dss = MCD.loadFromChainlog(LOG);