From a0cf3eabd58a80e32ad4d44819e6533b406c4700 Mon Sep 17 00:00:00 2001 From: Gonzalo Balabasquer Date: Thu, 27 Aug 2020 12:14:02 -0300 Subject: [PATCH] Upgrade ilk-registry and adjust optimization runs --- .dapp.json | 12 +++++++----- default.nix | 2 +- libexec/base-deploy | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.dapp.json b/.dapp.json index 43d25a6e..b1a9c570 100644 --- a/.dapp.json +++ b/.dapp.json @@ -290,15 +290,17 @@ "url": "https://github.com/makerdao/flipper-mom" } }, - "ilk-registry_5995cde": { + "ilk-registry_2393e47": { "deps": { - "ds-test": "ds-test_eb7148d" + "ds-test": "ds-test_eb7148d", + "ds-value": "ds-value_f3dc6c8", + "dss": "dss_ee01dab" }, "name": "ilk-registry", "repo": { - "name": "ilk-registry-5995cde", + "name": "ilk-registry-2393e47", "ref": "HEAD", - "rev": "5995cdec069020892d39b57404381f54ad01279a", + "rev": "2393e4714fb1c24991d101fbd4ce1991fe375edb", "url": "https://github.com/makerdao/ilk-registry" } }, @@ -432,7 +434,7 @@ "dss-deploy-pause-proxy-actions": "dss-deploy-pause-proxy-actions_3033e39", "dss-proxy-actions": "dss-proxy-actions_8045d9c", "flipper-mom": "flipper-mom_9ba73a4", - "ilk-registry": "ilk-registry_5995cde", + "ilk-registry": "ilk-registry_2393e47", "mkr-authority": "mkr-authority_62380ee", "multicall": "multicall_57967fc", "osm": "osm_ec26fd0", diff --git a/default.nix b/default.nix index 5cf9f71e..fe1a4bac 100644 --- a/default.nix +++ b/default.nix @@ -41,7 +41,7 @@ let # Create derivations from lock file data packages = packageSpecs (deps' // { # Package overrides - ilk-registry = deps'.ilk-registry // { name = "ilk-registry-optimized"; solcFlags = "--optimize"; solc = solc-versions.solc_0_6_7; }; + ilk-registry = deps'.ilk-registry // { name = "ilk-registry-optimized"; solcFlags = "--optimize --optimize-runs 1000000"; solc = solc-versions.solc_0_6_7; }; dss-proxy-actions = deps'.dss-proxy-actions // { name = "dss-proxy-actions-optimized"; solcFlags = "--optimize"; }; dss-deploy-optimized = deps'.dss-deploy // { name = "dss-deploy-optimized"; solcFlags = "--optimize"; }; }); diff --git a/libexec/base-deploy b/libexec/base-deploy index 3cc19767..86345eb9 100755 --- a/libexec/base-deploy +++ b/libexec/base-deploy @@ -182,7 +182,7 @@ FLIPPER_MOM=$(dappCreate flipper-mom FlipperMom "$MCD_CAT") log "FLIPPER_MOM=$FLIPPER_MOM" # Deploy IlkRegistry -ILK_REGISTRY=$(dappCreate ilk-registry-optimized IlkRegistry "$(seth --to-checksum-address "$MCD_END")") +ILK_REGISTRY=$(dappCreate ilk-registry-optimized IlkRegistry "$MCD_VAT" "$MCD_CAT" "$MCD_SPOT") log "ILK_REGISTRY=$ILK_REGISTRY" for token in $tokens; do