Upgrade dss-proxy-actions dependency + deploying new proxy contracts

makerdao · Sep 27, 2019 · 2e0cf69 · 2e0cf69
1 parent 8da2724
commit 2e0cf69
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/contracts/dss-proxy-actions b/contracts/dss-proxy-actions
diff --git a/nix/dapp.nix b/nix/dapp.nix
@@ -340,17 +340,17 @@ let
       src' = fetchGit repo';
       src = "${src'}/src";
     };
-    dss-proxy-actions_2bfe32c = rec {
+    dss-proxy-actions_341d689 = rec {
       name = "dss-proxy-actions";
       deps = {
         ds-test = ds-test_a4e4005;
         dss-cdp-manager = dss-cdp-manager_0707db9;
         proxy-registry = proxy-registry_59e077f;
       };
       repo' = {
-        name = "dss-proxy-actions-2bfe32c-source";
+        name = "dss-proxy-actions-341d689-source";
         url = "https://github.com/makerdao/dss-proxy-actions";
-        rev = "2bfe32ce10b0006eee53024ca19c5efe25840775";
+        rev = "341d6897114ef9a795d3025b6fd2535eef5098ba";
         ref = "HEAD";
       };
       src' = fetchGit repo';
@@ -569,7 +569,7 @@ let
       deps = {
         dss-deploy = dss-deploy_29755b9;
         dss-deploy-pause-proxy-actions = dss-deploy-pause-proxy-actions_966d541;
-        dss-proxy-actions = dss-proxy-actions_2bfe32c;
+        dss-proxy-actions = dss-proxy-actions_341d689;
         gov-polling-generator = gov-polling-generator_d08e43e;
         line-spell = line-spell_eabdb69;
         mkr-authority = mkr-authority_441a77d;

diff --git a/scripts/base-deploy b/scripts/base-deploy
@@ -144,6 +144,8 @@ done
 
 # Deploy Proxy Actions (solc optimized)
 PROXY_ACTIONS=$(dappCreate dss-proxy-actions-optimized DssProxyActions)
+PROXY_ACTIONS_END=$(dappCreate dss-proxy-actions-optimized DssProxyActionsEnd)
+PROXY_ACTIONS_DSR=$(dappCreate dss-proxy-actions-optimized DssProxyActionsDsr)
 log "proxy actions deployed"
 
 # Deploy CdpManager (no solc optimization)
@@ -306,6 +308,8 @@ cat > "$OUT_DIR"/addresses.json <<EOF
     "MCD_END": "$MCD_END",
     "MCD_ESM": "$MCD_ESM",
     "PROXY_ACTIONS": "$PROXY_ACTIONS",
+    "PROXY_ACTIONS_END": "$PROXY_ACTIONS_END",
+    "PROXY_ACTIONS_DSR": "$PROXY_ACTIONS_DSR",
     "CDP_MANAGER": "$CDP_MANAGER",
     "GET_CDPS": "$GET_CDPS",
     "PROXY_FACTORY": "$PROXY_FACTORY",