Add Chainlog and DssVest deployments

Author: gbalabasquer

.dapp.json

@@ -220,6 +220,18 @@
         "url": "https://github.com/makerdao/dss-cdp-manager"
       }
     },
+    "dss-chain-log_1a1131d": {
+      "deps": {
+        "ds-test": "ds-test_0a5da56"
+      },
+      "name": "dss-chain-log",
+      "repo": {
+        "name": "dss-chain-log-1a1131d",
+        "ref": "HEAD",
+        "rev": "1a1131d5a6334d2b6a5dbfb3495514462ed528a8",
+        "url": "https://github.com/makerdao/dss-chain-log"
+      }
+    },
     "dss-deploy-pause-proxy-actions_3781fa8": {
       "deps": {
         "ds-proxy": "ds-proxy_e17a252",
@@ -308,6 +320,18 @@
         "url": "https://github.com/makerdao/dss-proxy-actions"
       }
     },
+    "dss-vest_cbe7426": {
+      "deps": {
+        "ds-test": "ds-test_0a5da56"
+      },
+      "name": "dss-vest",
+      "repo": {
+        "name": "dss-vest-cbe7426",
+        "ref": "HEAD",
+        "rev": "cbe7426e6bb8c2ae81dd78da5f4be19c53071082",
+        "url": "https://github.com/makerdao/dss-vest"
+      }
+    },
     "dss_8144130": {
       "deps": {
         "ds-test": "ds-test_0a5da56",
@@ -550,12 +574,14 @@
       "dsr-manager": "dsr-manager_6d79bcb",
       "dss-auto-line": "dss-auto-line_26ad11b",
       "dss-cdp-manager": "dss-cdp-manager_342a1e6",
+      "dss-chain-log": "dss-chain-log_1a1131d",
       "dss-deploy": "dss-deploy_898b76b",
       "dss-deploy-1_2": "dss-deploy_18e9d69",
       "dss-deploy-pause-proxy-actions": "dss-deploy-pause-proxy-actions_3781fa8",
       "dss-flash": "dss-flash_e19d38a",
       "dss-gem-joins": "dss-gem-joins_266b43a",
       "dss-proxy-actions": "dss-proxy-actions_228f2d5",
+      "dss-vest": "dss-vest_cbe7426",
       "flipper-mom": "flipper-mom_1e879f6",
       "ilk-registry": "ilk-registry_34a354f",
       "mkr-authority": "mkr-authority_990745c",

bin/auth-checker

@@ -140,6 +140,7 @@ checkRely "MCD_VAT" "MCD_END" "AUTHED"
 checkRely "MCD_VAT" "MCD_ESM" "AUTHED"
 checkRely "MCD_VAT" "MCD_IAM_AUTO_LINE" "AUTHED"
 checkRely "MCD_VAT" "MCD_FLASH" "AUTHED"
+checkRely "MCD_VAT" "MCD_VEST_DAI" "AUTHED"
 checkRely "MCD_VAT" "MCD_PAUSE_PROXY" "AUTHED"
 for token in $tokens; do
     ilks=$(jq -r ".tokens.${token}.ilks | keys_unsorted[]" "$CONFIG_FILE")
@@ -239,14 +240,14 @@ checkAuthority "MCD_ADM" "MCD_ADM"
 checkOwner "MCD_GOV" "MCD_PAUSE_PROXY"
 canCall "MCD_FLOP" "MCD_GOV" "mint(address,uint256)"
 canCall "MCD_FLAP" "MCD_GOV" "burn(address,uint256)"
+canCall "MCD_VEST_MKR" "MCD_GOV" "mint(address,uint256)"
 
 # gov guard
 if [[ -n "$GOV_GUARD" ]]; then
     checkRoot "GOV_GUARD" "MCD_PAUSE_PROXY"
     checkAuthority "MCD_GOV" "GOV_GUARD"
 fi
 
-
 # iou
 if [[ -n "$MCD_IOU" ]]; then
     checkOwner "MCD_IOU" "MCD_ADM"
@@ -355,3 +356,13 @@ checkRely "ILK_REGISTRY" "MCD_PAUSE_PROXY" "AUTHED"
 # dssFlash
 checkRely "MCD_FLASH" "DEPLOYER" "NOT_AUTHED"
 checkRely "MCD_FLASH" "MCD_PAUSE_PROXY" "AUTHED"
+
+# chainlog
+checkRely "CHANGELOG" "DEPLOYER" "NOT_AUTHED"
+checkRely "CHANGELOG" "MCD_PAUSE_PROXY" "AUTHED"
+
+# dssVest
+checkRely "MCD_VEST_DAI" "DEPLOYER" "NOT_AUTHED"
+checkRely "MCD_VEST_DAI" "MCD_PAUSE_PROXY" "AUTHED"
+checkRely "MCD_VEST_MKR" "DEPLOYER" "NOT_AUTHED"
+checkRely "MCD_VEST_MKR" "MCD_PAUSE_PROXY" "AUTHED"

config/kovan.json

@@ -23,6 +23,7 @@
   "flash_max": "500000000",
   "flash_toll": "0.05",
   "import": {
+    "chainlog": "0xdA0Ab1e0017DEbCd72Be8599041a2aa3bA7e740F",
     "gov": "0xAaF64BFCC32d0F15873a02163e7E500671a4ffcD",
     "authority": "0x27E0c9567729Ea6e3241DE74B3dE499b7ddd3fe6",
     "proxyRegistry": "0x64A436ae831C1672AE81F674CAb8B6775df3475C",

config/main.json

@@ -23,6 +23,7 @@
   "flash_max": "500000000",
   "flash_toll": "0.05",
   "import": {
+    "chainlog": "0xdA0Ab1e0017DEbCd72Be8599041a2aa3bA7e740F",
     "gov": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2",
     "authority": "0x0a3f6849f78076aefaDf113F5BED87720274dDC0",
     "proxyRegistry": "0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4",

default.nix

@@ -51,6 +51,8 @@ let
     dss-deploy-optimized-runs-1 = deps'.dss-deploy  // { name = "dss-deploy-optimized-runs-1"; solcFlags = "--optimize --optimize-runs 1"; solc = solc-static-versions.solc_0_6_12; };
     symbolic-voting = deps'.symbolic-voting         // { name = "symbolic-voting";             solc = solc-static-versions.solc_0_6_6; };
     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; };
   });
 
 in makerScriptPackage {

lib/common.sh

@@ -133,6 +133,12 @@ log() {
     echo ""
 }
 
+logAddr() {
+    sethSend "$CHANGELOG" 'setAddress(bytes32,address)' "$(seth --to-bytes32 "$(seth --from-ascii "$1")")" "$2"
+    printf '%b\n' "${GREEN}${1}=${2}${NC}"
+    echo ""
+}
+
 toUpper() {
     echo "$1" | tr '[:lower:]' '[:upper:]'
 }

libexec/base-deploy

@@ -18,6 +18,18 @@
 # shellcheck source=lib/common.sh
 . "$LIB_DIR/common.sh"
 
+# Deploy Multicall
+newChangelog=false
+CHANGELOG=$(jq -r ".import.chainlog | values" "$CONFIG_FILE")
+if [[ -z "$CHANGELOG" ]]; then
+    CHANGELOG=$(dappCreate dss-chain-log-optimized ChainLog)
+    log "CHANGELOG=$CHANGELOG"
+    newChangelog=true
+else
+    copy dss-chain-log-optimized
+fi
+export CHANGELOG
+
 # Deploy Values or Medians
 tokens=$(jq -r ".tokens | keys_unsorted[]" "$CONFIG_FILE")
 for token in $tokens; do
@@ -28,7 +40,7 @@ for token in $tokens; do
         if [[ "$type" == "median" ]]; then
             contract=$(dappCreate testchain-medians "Median${token}USD")
             eval "export VAL_${token}=${contract}"
-            log "VAL_${token}=$(eval "echo ${contract}")"
+            logAddr "VAL_${token}" "$(eval "echo ${contract}")"
             signers=$(jq -r ".tokens.${token} | .pipDeploy | .signers | .[]" "$CONFIG_FILE")
             # Approve oracle price feed providers
             allsigners=()
@@ -43,25 +55,26 @@ for token in $tokens; do
         if [[ "${type}" == "value" ]]; then
             contract=$(dappCreate ds-value DSValue)
             eval "export VAL_${token}=${contract}"
-            log "VAL_${token}=$(eval "echo ${contract}")"
+            logAddr "VAL_${token}" "$(eval "echo ${contract}")"
         fi
     else
         eval "export VAL_${token}=${pipAddr}"
         copy osm
         copy testchain-medians
+        logAddr "VAL_${token}" "$pipAddr"
     fi
     eval "export PIP_${token}=\$VAL_${token}"
 done
 
 # Deploy Multicall
 MULTICALL=$(dappCreate multicall Multicall)
-log "MULTICALL=$MULTICALL"
+logAddr "MULTICALL" "$MULTICALL"
 
 # Deploy Token Faucet
 FAUCET=$(jq -r ".import.faucet | values" "$CONFIG_FILE")
 if [[ -z "$FAUCET" ]]; then
     FAUCET=$(dappCreate token-faucet RestrictedTokenFaucet)
-    log "FAUCET=$FAUCET"
+    logAddr "FAUCET" "$FAUCET"
     # Allow everyone to use the faucet
     sethSend "$FAUCET" 'hope(address)' "0x0000000000000000000000000000000000000000"
 fi
@@ -70,12 +83,16 @@ fi
 PROXY_REGISTRY=$(jq -r ".import.proxyRegistry | values" "$CONFIG_FILE")
 if [[ -z "$PROXY_REGISTRY" ]]; then
     PROXY_FACTORY=$(dappCreate ds-proxy DSProxyFactory)
-    log "PROXY_FACTORY=$PROXY_FACTORY"
+    logAddr "PROXY_FACTORY" "$PROXY_FACTORY"
     PROXY_REGISTRY=$(dappCreate proxy-registry ProxyRegistry "$PROXY_FACTORY")
-    log "PROXY_REGISTRY=$PROXY_REGISTRY"
+    logAddr "PROXY_REGISTRY" "$PROXY_REGISTRY"
 else
     PROXY_FACTORY=$(seth storage "$PROXY_REGISTRY" 1)
     PROXY_FACTORY=0x${PROXY_FACTORY:26:66}
+    logAddr "PROXY_FACTORY" "$PROXY_FACTORY"
+    logAddr "PROXY_REGISTRY" "$PROXY_REGISTRY"
+    copy ds-proxy
+    copy proxy-registry
 fi
 
 # Deploy Fabs
@@ -115,7 +132,7 @@ if [[ "$newGovToken" == true ]]; then
 
     # Use custom authority for the new GOV token
     GOV_GUARD=$(dappCreate mkr-authority MkrAuthority)
-    log "GOV_GUARD=$GOV_GUARD"
+    logAddr "GOV_GUARD" "$GOV_GUARD"
 
     # Set GOV_GUARD as authority of MCD_GOV
     sethSend "$MCD_GOV" 'setAuthority(address)' "$GOV_GUARD"
@@ -138,37 +155,37 @@ rm "$OUT_DIR/load-ilks-addr-temp"
 
 # Deploy Proxy Actions
 PROXY_ACTIONS=$(dappCreate dss-proxy-actions-optimized DssProxyActions)
-log "PROXY_ACTIONS=$PROXY_ACTIONS"
+logAddr "PROXY_ACTIONS" "$PROXY_ACTIONS"
 PROXY_ACTIONS_END=$(dappCreate dss-proxy-actions-optimized DssProxyActionsEnd)
-log "PROXY_ACTIONS_END=$PROXY_ACTIONS_END"
+logAddr "PROXY_ACTIONS_END" "$PROXY_ACTIONS_END"
 PROXY_ACTIONS_DSR=$(dappCreate dss-proxy-actions-optimized DssProxyActionsDsr)
-log "PROXY_ACTIONS_DSR=$PROXY_ACTIONS_DSR"
+logAddr "PROXY_ACTIONS_DSR" "$PROXY_ACTIONS_DSR"
 
 # Deploy CdpManager
 CDP_MANAGER=$(dappCreate dss-cdp-manager DssCdpManager "$MCD_VAT")
-log "CDP_MANAGER=$CDP_MANAGER"
+logAddr "CDP_MANAGER" "$CDP_MANAGER"
 GET_CDPS=$(dappCreate dss-cdp-manager GetCdps)
-log "GET_CDPS=$GET_CDPS"
+logAddr "GET_CDPS" "$GET_CDPS"
 
 # Deploy DsrManager
 DSR_MANAGER=$(dappCreate dsr-manager DsrManager "$MCD_POT" "$MCD_JOIN_DAI")
-log "DSR_MANAGER=$DSR_MANAGER"
+logAddr "DSR_MANAGER" "$DSR_MANAGER"
 
 # Deploy OsmMom
 OSM_MOM=$(dappCreate osm-mom OsmMom)
-log "OSM_MOM=$OSM_MOM"
+logAddr "OSM_MOM" "$OSM_MOM"
 
 # Deploy FlipperMom
 FLIPPER_MOM=$(dappCreate flipper-mom FlipperMom "$MCD_CAT")
-log "FLIPPER_MOM=$FLIPPER_MOM"
+logAddr "FLIPPER_MOM" "$FLIPPER_MOM"
 
 # Deploy ClipperMom
 CLIPPER_MOM=$(dappCreate clipper-mom-optimized ClipperMom "$MCD_SPOT")
-log "CLIPPER_MOM=$CLIPPER_MOM"
+logAddr "CLIPPER_MOM" "$CLIPPER_MOM"
 
 # Deploy IlkRegistry
 ILK_REGISTRY=$(dappCreate ilk-registry-optimized IlkRegistry "$MCD_VAT" "$MCD_DOG" "$MCD_CAT" "$MCD_SPOT")
-log "ILK_REGISTRY=$ILK_REGISTRY"
+logAddr "ILK_REGISTRY" "$ILK_REGISTRY"
 
 # As all initial collaterals were deployed, we can remove authority of the deployment contract from the core contracts
 sethSend "$MCD_DEPLOY" 'releaseAuth()'
@@ -191,11 +208,11 @@ done
 
 # Deploy GovActions - Library functions for the Pause
 MCD_GOV_ACTIONS=$(dappCreate dss-deploy-1_2 GovActions)
-log "MCD_GOV_ACTIONS=$MCD_GOV_ACTIONS"
+logAddr "MCD_GOV_ACTIONS" "$MCD_GOV_ACTIONS"
 
 # Deploy Pause Proxy Actions (support contract for executing initial set up of the dss system)
 PROXY_PAUSE_ACTIONS=$(dappCreate dss-deploy-pause-proxy-actions DssDeployPauseProxyActions)
-log "PROXY_PAUSE_ACTIONS=$PROXY_PAUSE_ACTIONS"
+logAddr "PROXY_PAUSE_ACTIONS" "$PROXY_PAUSE_ACTIONS"
 
 # Get a proxy for the deployer address (create if didn't previously exist)
 PROXY_DEPLOYER=$(seth call "$PROXY_REGISTRY" 'proxies(address)(address)' "$ETH_FROM")
@@ -212,24 +229,26 @@ sethSend "$MCD_ADM" 'setRootUser(address,bool)' "$PROXY_DEPLOYER" true
 MCD_ADM=$(jq -r ".import.authority | values" "$CONFIG_FILE")
 if [[ -z "$MCD_ADM" ]]; then
     MCD_IOU=$(dappCreate ds-token DSToken '"IOU"')
-    log "MCD_IOU=$MCD_IOU"
+    logAddr "MCD_IOU" "$MCD_IOU"
 
     MCD_ADM=$(dappCreate ds-chief DSChief "$MCD_GOV" "$MCD_IOU" 5)
-    log "MCD_ADM=$MCD_ADM"
+    logAddr "MCD_ADM" "$MCD_ADM"
     sethSend "$MCD_IOU" 'setOwner(address)' "${MCD_ADM}"
 
     # Deploy Vote Proxy Factory
     VOTE_PROXY_FACTORY=$(dappCreate vote-proxy VoteProxyFactory "$MCD_ADM")
-    log "VOTE_PROXY_FACTORY=$VOTE_PROXY_FACTORY"
+    logAddr "VOTE_PROXY_FACTORY" "$VOTE_PROXY_FACTORY"
 
     # Deploy PollingEmitter
     MCD_POLLING_EMITTER=$(dappCreate symbolic-voting PollingEmitter)
-    log "MCD_POLLING_EMITTER=$MCD_POLLING_EMITTER"
+    logAddr "MCD_POLLING_EMITTER" "$MCD_POLLING_EMITTER"
 
     # Deploy Vote Delegate Factory
     VOTE_DELEGATE_PROXY_FACTORY=$(dappCreate vote-delegate-optimized VoteDelegateFactory "$MCD_ADM" "$MCD_POLLING_EMITTER")
-    log "VOTE_DELEGATE_PROXY_FACTORY=$VOTE_DELEGATE_PROXY_FACTORY"
+    logAddr "VOTE_DELEGATE_PROXY_FACTORY" "$VOTE_DELEGATE_PROXY_FACTORY"
 else
+    logAddr "MCD_IOU" "$(seth call "$MCD_ADM" "IOU()(address)")"
+    logAddr "MCD_ADM" "$MCD_ADM"
     copy ds-chief
     copy vote-proxy
     copy symbolic-voting
@@ -283,14 +302,14 @@ fi
 
 # Deploy DssAutoLine
 MCD_IAM_AUTO_LINE=$(dappCreate dss-auto-line-optimized DssAutoLine "$MCD_VAT")
-log "MCD_IAM_AUTO_LINE=$MCD_IAM_AUTO_LINE"
+logAddr "MCD_IAM_AUTO_LINE" "$MCD_IAM_AUTO_LINE"
 # Rely DssAutoLine in the Vat
 calldata="$(seth calldata 'rely(address,address,address,address)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$MCD_VAT" "$MCD_IAM_AUTO_LINE")"
 sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
 
 # Deploy DssFlash
 MCD_FLASH=$(dappCreate dss-flash DssFlash "$MCD_JOIN_DAI" "$MCD_VOW")
-log "MCD_FLASH=$MCD_FLASH"
+logAddr "MCD_FLASH" "$MCD_FLASH"
 # Rely DssFlash in the Vat
 set -e
 calldata="$(seth calldata 'rely(address,address,address,address)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$MCD_VAT" "$MCD_FLASH")"
@@ -299,11 +318,28 @@ sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS
 sethSend "$MCD_FLASH" 'rely(address)' "$MCD_PAUSE_PROXY"
 sethSend "$MCD_FLASH" 'deny(address)' "$ETH_FROM"
 
+# Deploy both DssVest
+MCD_VEST_DAI=$(dappCreate dss-vest-optimized DssVestSuckable "$CHANGELOG")
+logAddr "MCD_VEST_DAI" "$MCD_VEST_DAI"
+sethSend "$MCD_VEST_DAI" 'rely(address)' "$MCD_PAUSE_PROXY"
+sethSend "$MCD_VEST_DAI" 'deny(address)' "$ETH_FROM"
+calldata="$(seth calldata 'rely(address,address,address,address)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$MCD_VAT" "$MCD_VEST_DAI")"
+sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
+MCD_VEST_MKR=$(dappCreate dss-vest-optimized DssVestMintable "$MCD_GOV")
+logAddr "MCD_VEST_MKR" "$MCD_VEST_MKR"
+sethSend "$MCD_VEST_MKR" 'rely(address)' "$MCD_PAUSE_PROXY"
+sethSend "$MCD_VEST_MKR" 'deny(address)' "$ETH_FROM"
+if [[ "$newGovToken" == true ]]; then
+    calldata="$(seth calldata 'rely(address,address,address,address)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$GOV_GUARD" "$MCD_VEST_MKR")"
+    sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
+fi
+
 # Generate addresses.json file
 # shellcheck disable=SC2153
 cat > "$OUT_DIR"/addresses.json <<EOF
 {
     "DEPLOYER": "$(seth --to-checksum-address "$ETH_FROM")",
+    "CHANGELOG": "$CHANGELOG",
     "MULTICALL": "$MULTICALL",
     "FAUCET": "$(seth --to-checksum-address "$FAUCET")",
     "MCD_DEPLOY": "$MCD_DEPLOY",
@@ -340,6 +376,8 @@ cat > "$OUT_DIR"/addresses.json <<EOF
     "CLIPPER_MOM": "$CLIPPER_MOM",
     "MCD_IAM_AUTO_LINE": "$MCD_IAM_AUTO_LINE",
     "MCD_FLASH": "$MCD_FLASH",
+    "MCD_VEST_DAI": "$MCD_VEST_DAI",
+    "MCD_VEST_MKR": "$MCD_VEST_MKR",
     "PROXY_FACTORY": "$(seth --to-checksum-address "$PROXY_FACTORY")",
     "PROXY_REGISTRY": "$(seth --to-checksum-address "$PROXY_REGISTRY")"$ILKS_VARS,
     "PROXY_PAUSE_ACTIONS": "$PROXY_PAUSE_ACTIONS",
@@ -445,3 +483,8 @@ fi
 "$LIBEXEC_DIR"/setters/set-ilks-registry
 
 "$LIBEXEC_DIR"/setters/set-pause-auth-delay
+
+if [[ "$newChangelog" == true ]]; then
+    sethSend "$CHANGELOG" 'rely(address)' "$MCD_PAUSE_PROXY"
+    sethSend "$CHANGELOG" 'deny(address)' "$ETH_FROM"
+fi