Add FlashKiller

Author: gbalabasquer

.dapp.json

@@ -396,6 +396,18 @@
         "url": "https://github.com/makerdao/esm"
       }
     },
+    "flash-killer_7027492": {
+      "deps": {
+        "ds-test": "ds-test_0a5da56"
+      },
+      "name": "flash-killer",
+      "repo": {
+        "name": "flash-killer-7027492",
+        "ref": "HEAD",
+        "rev": "70274926eb9ee4519ba7ebbbcc6ba94c1b3e89e8",
+        "url": "https://github.com/makerdao/flash-killer"
+      }
+    },
     "flipper-mom_3a57ea1": {
       "deps": {
         "ds-test": "ds-test_0a5da56"
@@ -582,6 +594,7 @@
       "dss-gem-joins": "dss-gem-joins_b91680b",
       "dss-proxy-actions": "dss-proxy-actions_6d6b293",
       "dss-vest": "dss-vest_8b10556",
+      "flash-killer": "flash-killer_7027492",
       "flipper-mom": "flipper-mom_3a57ea1",
       "ilk-registry": "ilk-registry_81ba973",
       "mkr-authority": "mkr-authority_fc19f8a",

bin/auth-checker

@@ -356,6 +356,8 @@ checkRely "ILK_REGISTRY" "MCD_PAUSE_PROXY" "AUTHED"
 # dssFlash
 checkRely "MCD_FLASH" "DEPLOYER" "NOT_AUTHED"
 checkRely "MCD_FLASH" "MCD_PAUSE_PROXY" "AUTHED"
+checkRely "MCD_FLASH" "MCD_ESM" "AUTHED"
+checkRely "MCD_FLASH" "FLASH_KILLER" "AUTHED"
 
 # chainlog
 checkRely "CHANGELOG" "DEPLOYER" "NOT_AUTHED"

default.nix

@@ -53,6 +53,7 @@ let
     vote-delegate = deps'.vote-delegate             // { name = "vote-delegate-optimized";     solcFlags = "--optimize --optimize-runs 200"; solc = solc-static-versions.solc_0_6_12; };
     dss-vest = deps'.dss-vest                       // { name = "dss-vest-optimized";          solcFlags = "--optimize --optimize-runs 200"; solc = solc-static-versions.solc_0_6_12; };
     dss-chain-log = deps'.dss-chain-log             // { name = "dss-chain-log-optimized";     solcFlags = "--optimize --optimize-runs 200"; solc = solc-static-versions.solc_0_6_12; };
+    flash-killer = deps'.flash-killer               // { name = "flash-killer";                solc = solc-static-versions.solc_0_8_12; };
   });
 
 in makerScriptPackage {

libexec/base-deploy

@@ -314,8 +314,15 @@ logAddr "MCD_FLASH" "$MCD_FLASH"
 set -e
 calldata="$(seth calldata 'rely(address,address,address,address)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$MCD_VAT" "$MCD_FLASH")"
 sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
-# Rely PauseProxy in DssFlash and deny deployer
+
+# Deploy FlashKiller
+FLASH_KILLER=$(dappCreate flash-killer FlashKiller "$MCD_VAT" "$MCD_FLASH")
+logAddr "FLASH_KILLER" "$FLASH_KILLER"
+
+# Rely PauseProxy, ESM and FlashKiller in DssFlash and deny deployer
 sethSend "$MCD_FLASH" 'rely(address)' "$MCD_PAUSE_PROXY"
+sethSend "$MCD_FLASH" 'rely(address)' "$MCD_ESM"
+sethSend "$MCD_FLASH" 'rely(address)' "$FLASH_KILLER"
 sethSend "$MCD_FLASH" 'deny(address)' "$ETH_FROM"
 
 # Deploy both DssVest
@@ -379,6 +386,7 @@ cat > "$OUT_DIR"/addresses.json <<EOF
     "CLIPPER_MOM": "$CLIPPER_MOM",
     "MCD_IAM_AUTO_LINE": "$MCD_IAM_AUTO_LINE",
     "MCD_FLASH": "$MCD_FLASH",
+    "FLASH_KILLER": "$FLASH_KILLER",
     "MCD_VEST_DAI": "$MCD_VEST_DAI",
     "MCD_VEST_MKR": "$MCD_VEST_MKR",
     "MCD_VEST_MKR_TREASURY": "$MCD_VEST_MKR_TREASURY",