From 2e0cf69c2ffe5fc5c18ebd40c2f496910f52b7ec Mon Sep 17 00:00:00 2001 From: Gonzalo Balabasquer Date: Fri, 27 Sep 2019 13:21:05 -0300 Subject: [PATCH] Upgrade dss-proxy-actions dependency + deploying new proxy contracts --- contracts/dss-proxy-actions | 2 +- nix/dapp.nix | 8 ++++---- scripts/base-deploy | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/contracts/dss-proxy-actions b/contracts/dss-proxy-actions index 2bfe32ce..341d6897 160000 --- a/contracts/dss-proxy-actions +++ b/contracts/dss-proxy-actions @@ -1 +1 @@ -Subproject commit 2bfe32ce10b0006eee53024ca19c5efe25840775 +Subproject commit 341d6897114ef9a795d3025b6fd2535eef5098ba diff --git a/nix/dapp.nix b/nix/dapp.nix index 82ed58cb..e5b46d50 100644 --- a/nix/dapp.nix +++ b/nix/dapp.nix @@ -340,7 +340,7 @@ 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; @@ -348,9 +348,9 @@ let 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 index b83c0d75..84f1de2c 100755 --- 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 <