Mainnet spell 2024-09-27

Makefile

@@ -1,5 +1,5 @@
 all                  :; DAPP_LIBRARIES=' lib/dss-exec-lib/src/DssExecLib.sol:DssExecLib:$(shell cat DssExecLib.address)' \
-                         DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=1 \
+                         DAPP_BUILD_OPTIMIZE=0 DAPP_BUILD_OPTIMIZE_RUNS=200 \
                          DAPP_REMAPPINGS=$$(cat remappings.txt) \
                          dapp --use solc:0.8.16 build
 clean                :; forge clean

scripts/test-dssspell-forge.sh

@@ -19,8 +19,8 @@ done
 DSS_EXEC_LIB=$(< DssExecLib.address)
 echo "Using DssExecLib at: $DSS_EXEC_LIB"
 export FOUNDRY_LIBRARIES="lib/dss-exec-lib/src/DssExecLib.sol:DssExecLib:$DSS_EXEC_LIB"
-export FOUNDRY_OPTIMIZER=true
-export FOUNDRY_OPTIMIZER_RUNS=1
+export FOUNDRY_OPTIMIZER=false
+export FOUNDRY_OPTIMIZER_RUNS=200
 export FOUNDRY_ROOT_CHAINID=1
 
 TEST_ARGS=''

src/DssSpell.t.base.sol

@@ -253,6 +253,7 @@ contract DssSpellTestBase is Config, DssTest {
     SUsdsLike                      susds = SUsdsLike(          addr.addr("SUSDS"));
     UsdsJoinLike                usdsJoin = UsdsJoinLike(       addr.addr("USDS_JOIN"));
     DSTokenAbstract                  gov = DSTokenAbstract(    addr.addr("MCD_GOV"));
+    DSTokenAbstract                  mkr = DSTokenAbstract(    addr.addr("MCD_GOV"));
     GemAbstract                      sky = GemAbstract(        addr.addr("SKY"));
     EndAbstract                      end = EndAbstract(        addr.addr("MCD_END"));
     ESMAbstract                      esm = ESMAbstract(        addr.addr("MCD_ESM"));
@@ -2579,7 +2580,7 @@ contract DssSpellTestBase is Config, DssTest {
             uint256 lotRad = vow.bump() * split.burn() / WAD;
             uint256 payWad = (vow.bump() - lotRad) / RAY;
 
-            uint256 pbalancePauseProxy = pair.balanceOf(pauseProxy);
+            uint256 pskyBalancePauseProxy = sky.balanceOf(pauseProxy);
             uint256 pdaiVow = vat.dai(address(vow));
             uint256 preserveUsds = usds.balanceOf(address(pair));
             uint256 preserveSky = sky.balanceOf(address(pair));
@@ -2593,9 +2594,9 @@ contract DssSpellTestBase is Config, DssTest {
 
             vow.flap();
 
-            assertGt(pair.balanceOf(pauseProxy),      pbalancePauseProxy,          "TestError/Flapper/pair-pauseProxy-balance-no-increase");
+            assertGt(sky.balanceOf(pauseProxy),       pskyBalancePauseProxy,       "TestError/Flapper/unexpected-sky-pause-proxy-balance");
+            assertLt(sky.balanceOf(address(pair)),    preserveSky,                 "TestError/Flapper/unexpected-sky-pair-balance");
             assertEq(usds.balanceOf(address(pair)),   preserveUsds + lotRad / RAY, "TestError/Flapper/invalid-usds-pair-balance-increase");
-            assertEq(sky.balanceOf(address(pair)),    preserveSky,                 "TestError/Flapper/unexpected-sky-pair-balance-change");
             assertEq(pdaiVow - vat.dai(address(vow)), vow.bump(),                  "TestError/Flapper/invalid-vat-dai-vow-change");
             assertEq(usds.balanceOf(address(flap)),   0,                           "TestError/Flapper/invalid-usds-balance");
             assertEq(sky.balanceOf(address(flap)),    0,                           "TestError/Flapper/invalid-sky-balance");