Upgrade Vest version for DAI one

makerdao · May 11, 2022 · 5fbf992 · 5fbf992
1 parent 6569b2f
commit 5fbf992
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/.dapp.json b/.dapp.json
@@ -320,14 +320,26 @@
         "url": "https://github.com/makerdao/dss-proxy-actions"
       }
     },
+    "dss-vest_4e04cec": {
+      "deps": {
+        "ds-test": "ds-test_0a5da56"
+      },
+      "name": "dss-vest",
+      "repo": {
+        "name": "dss-vest-4e04cec",
+        "ref": "HEAD",
+        "rev": "4e04cec2607a6e59960ce8bd729666cfddc2f523",
+        "url": "https://github.com/makerdao/dss-vest"
+      }
+    },
     "dss-vest_50b7140": {
       "deps": {
         "ds-test": "ds-test_0a5da56"
       },
       "name": "dss-vest",
       "repo": {
         "name": "dss-vest-50b7140",
-        "ref": "HEAD",
+        "ref": "v1.0.1",
         "rev": "50b71406ba686ffb963a722754cc5ea3a4f21364",
         "url": "https://github.com/makerdao/dss-vest"
       }
@@ -593,7 +605,8 @@
       "dss-flash": "dss-flash_b8f8fdc",
       "dss-gem-joins": "dss-gem-joins_123d6b7",
       "dss-proxy-actions": "dss-proxy-actions_5cf4634",
-      "dss-vest": "dss-vest_50b7140",
+      "dss-vest": "dss-vest_4e04cec",
+      "dss-vest-1_0_1": "dss-vest_50b7140",
       "flash-killer": "flash-killer_7027492",
       "flipper-mom": "flipper-mom_3a57ea1",
       "ilk-registry": "ilk-registry_8ad3682",

diff --git a/default.nix b/default.nix
@@ -51,6 +51,7 @@ 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-1_0_1 = deps'.dss-vest-1_0_1           // { name = "dss-vest-1_0_1-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; };

diff --git a/libexec/base-deploy b/libexec/base-deploy
@@ -338,15 +338,15 @@ 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")
+MCD_VEST_MKR=$(dappCreate dss-vest-1_0_1-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
-MCD_VEST_MKR_TREASURY=$(dappCreate dss-vest-optimized DssVestTransferrable "$MCD_PAUSE_PROXY" "$MCD_GOV")
+MCD_VEST_MKR_TREASURY=$(dappCreate dss-vest-1_0_1-optimized DssVestTransferrable "$MCD_PAUSE_PROXY" "$MCD_GOV")
 sethSend "$MCD_VEST_MKR_TREASURY" 'rely(address)' "$MCD_PAUSE_PROXY"
 sethSend "$MCD_VEST_MKR_TREASURY" 'deny(address)' "$ETH_FROM"