Set pause delay via config file

makerdao · Apr 4, 2019 · b6df9cc · b6df9cc
1 parent 00eb99a
commit b6df9cc
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 2 deletions.
diff --git a/base-deploy b/base-deploy
@@ -126,7 +126,7 @@ PROXY_PAUSE_ACTIONS=$(dapp create TestchainPauseProxyActions)
 seth send "$PROXY_REGISTRY" 'build()'
 
 # Get a proxy for the deployer address
-PROXY_DEPLOYER="$(seth call "$PROXY_REGISTRY" 'proxies(address)(address)' "$ETH_FROM")"
+PROXY_DEPLOYER=0x"$(seth call "$PROXY_REGISTRY" 'proxies(address)(address)' "$ETH_FROM")"
 
 # Elect the proxy address as the new chief hat
 seth send "$MCD_ADM" 'vote(address[] memory)' ["${PROXY_DEPLOYER#0x}"]

diff --git a/contracts/testchain-pause-proxy-actions b/contracts/testchain-pause-proxy-actions
diff --git a/kovan-deploy b/kovan-deploy
@@ -45,4 +45,7 @@ done
 # shellcheck source=/dev/null
 ./set-ilks-spotter-poke
 
+# shellcheck source=/dev/null
+./set-pause-delay
+
 echo "KOVAN DEPLOYMENT COMPLETED SUCCESSFULLY"
diff --git a/kovan.json b/kovan.json
@@ -1,6 +1,7 @@
 {
   "description": "Kovan deployment",
   "etherscanApiKey": "4PDDUF52BTUD32C3RJ7RJXRY7KIJFJ38RY",
+  "pauseDelay": "300",
   "line": "1000000",
   "tokens": {
     "ETH": {

diff --git a/set-pause-delay b/set-pause-delay
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -ex
+
+export ETH_GAS=${ETH_GAS:-"7000000"}
+
+# Get config variables
+CONFIG_FILE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )/out/config.json"
+
+delay=$(jq -r ".pauseDelay" "$CONFIG_FILE")
+
+if [ "$delay" -gt 0 ]; then
+    # shellcheck source=/dev/null
+    . load-addresses
+
+    cd contracts/testchain-pause-proxy-actions
+    dapp build
+    action=$(dapp create ActionChangeDelay)
+    calldata="$(seth calldata 'changeDelay(address,address,uint256)' "$MCD_PAUSE" "$action" "$(seth --to-uint256 "$delay")")"
+    seth send "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
+fi
diff --git a/step-1-deploy b/step-1-deploy
@@ -79,6 +79,11 @@ for token in $tokens; do
     fi
 done
 
+if [ "$CONFIG_STEP" = "step-1" ]; then
+    # shellcheck source=/dev/null
+    ./set-pause-delay
+fi
+
 # Copy abi files
 cp ./contracts/testchain-medians/out/Median.abi ./out/abi
 cp ./contracts/osm/out/DSValue.abi ./out/abi

diff --git a/step-1.json b/step-1.json
@@ -3,6 +3,7 @@
   "defaults": {},
   "roles": ["CREATOR"],
   "omniaFromAddr": "0xdc9A20F5a46AFE0802b361076BeFC51f787B2e58",
+  "pauseDelay": "0",
   "tokens": {
     "ETH": {
       "pip": {

diff --git a/step-2-deploy b/step-2-deploy
@@ -9,4 +9,9 @@ export CONFIG_STEP=${CONFIG_STEP:-"step-2"}
 # shellcheck source=/dev/null
 ./poll-deploy
 
+if [ "$CONFIG_STEP" = "step-2" ]; then
+    # shellcheck source=/dev/null
+    ./set-pause-delay
+fi
+
 echo "STEP 2 COMPLETED SUCCESSFULLY"
diff --git a/step-2.json b/step-2.json
@@ -3,6 +3,7 @@
   "defaults": {},
   "roles": ["CREATOR"],
   "omniaFromAddr": "0xdc9A20F5a46AFE0802b361076BeFC51f787B2e58",
+  "pauseDelay": "0",
   "tokens": {
     "ETH": {
       "pip": {

diff --git a/step-3-deploy b/step-3-deploy
@@ -11,4 +11,9 @@ export CONFIG_STEP=${CONFIG_STEP:-"step-3"}
 # shellcheck source=/dev/null
 ./set-ilks-spell-line
 
+if [ "$CONFIG_STEP" = "step-3" ]; then
+    # shellcheck source=/dev/null
+    ./set-pause-delay
+fi
+
 echo "STEP 3 COMPLETED SUCCESSFULLY"
diff --git a/step-3.json b/step-3.json
@@ -3,6 +3,7 @@
   "defaults": {},
   "roles": ["CREATOR"],
   "omniaFromAddr": "0xdc9A20F5a46AFE0802b361076BeFC51f787B2e58",
+  "pauseDelay": "0",
   "line": "1500",
   "tokens": {
     "ETH": {

diff --git a/step-4-deploy b/step-4-deploy
@@ -26,4 +26,9 @@ export CONFIG_STEP=${CONFIG_STEP:-"step-4"}
 # shellcheck source=/dev/null
 ./set-ilks-spotter-poke
 
+if [ "$CONFIG_STEP" = "step-4" ]; then
+    # shellcheck source=/dev/null
+    ./set-pause-delay
+fi
+
 echo "STEP 4 COMPLETED SUCCESSFULLY"
diff --git a/step-4.json b/step-4.json
@@ -3,6 +3,7 @@
   "defaults": {},
   "roles": ["CREATOR"],
   "omniaFromAddr": "0xdc9A20F5a46AFE0802b361076BeFC51f787B2e58",
+  "pauseDelay": "0",
   "line": "1500",
   "tokens": {
     "ETH": {

diff --git a/step-7-deploy b/step-7-deploy
@@ -51,4 +51,10 @@ seth send "$MCD_SPOT" 'poke(bytes32)' "$(seth --to-bytes32 "$(seth --from-ascii
 # Bite CDP
 seth send "$MCD_CAT" 'bite(bytes32,address)' "$(seth --to-bytes32 "$(seth --from-ascii "${token}-${ilk}")")" "$URN"
 
+# Set Pause Delay
+if [ "$CONFIG_STEP" = "step-7" ]; then
+    # shellcheck source=/dev/null
+    ./set-pause-delay
+fi
+
 echo "STEP 7 COMPLETED SUCCESSFULLY"
diff --git a/step-7.json b/step-7.json
@@ -3,6 +3,7 @@
   "defaults": {},
   "roles": ["CREATOR"],
   "omniaFromAddr": "0xdc9A20F5a46AFE0802b361076BeFC51f787B2e58",
+  "pauseDelay": "0",
   "line": "1500",
   "tokens": {
     "ETH": {