From 974d1fd6f11484c89e886a7bc79908bf0758a06f Mon Sep 17 00:00:00 2001
From: Gonzalo Balabasquer <gbalabasquer@gmail.com>
Date: Thu, 14 Nov 2019 10:25:06 -0300
Subject: [PATCH] Update to version 0.2.16

---
 libexec/mcd/conf/kovan.json | 106 ++++++++++++------------------------
 libexec/mcd/mcd-cdp-open    |   7 ++-
 2 files changed, 39 insertions(+), 74 deletions(-)

diff --git a/libexec/mcd/conf/kovan.json b/libexec/mcd/conf/kovan.json
index ffbf852..39f4e19 100644
--- a/libexec/mcd/conf/kovan.json
+++ b/libexec/mcd/conf/kovan.json
@@ -1,85 +1,49 @@
 {
-  "DEPLOYER": "0x61de44946D6b809a30D8e6A236157966659f9640",
-  "MULTICALL": "0xe810185d1fa43e5a0934aeb990f752877b745976",
+  "DEPLOYER": "0xdB33dFD3D61308C33C63209845DaD3e6bfb2c674",
+  "MULTICALL": "0xe23415c0cd8cf8b1e42f3002897a514405e052c3",
   "FAUCET": "0x94598157fcf0715c3bc9b4a35450cce82ac57b20",
-  "MCD_DEPLOY": "0x8dfc277b7e53082c2b6ae3bd1e3b3c91cea1af9c",
+  "MCD_DEPLOY": "0x0ff7ce98fd5c1caf09d6479ec22b7bee9079de09",
   "MCD_GOV": "0xaaf64bfcc32d0f15873a02163e7e500671a4ffcd",
-  "GOV_GUARD": "",
-  "MCD_ADM": "0x9b49a4c8e03bb659f6638e52f551244c49779229",
-  "MCD_IOU": "0x39b20ecbdb7511d85cb4a33a619286cd3b9ce0ce",
-  "VOTE_PROXY_FACTORY": "0xd3f98269b41764c8f460019ed0cc14a562e7da63",
-  "MCD_VAT": "0xb597803e4b5b2a43a92f3e1dcafea5425c873116",
-  "MCD_JUG": "0x9404a7fd173f1aa716416f391accd28bd0d84406",
-  "MCD_CAT": "0x212f54b04d50594317317c94db73c15ce1a33b73",
-  "MCD_VOW": "0x6740282231148a5d8a81da510ae25b21b226ba13",
-  "MCD_JOIN_DAI": "0x9e0d5a6a836a6c323cf45eb07cb40cfc81664eec",
-  "MCD_FLAP": "0xdfcbb3b6ce226c315ed8f650aef23478214e8e69",
-  "MCD_FLOP": "0x766c3441e46cd10b955b8f22bca10bdcdca5aaad",
-  "MCD_PAUSE": "0x04eb7f6d435d6b06194e1245b687899b4f08829b",
-  "MCD_PAUSE_PROXY": "0xcff264d6b0675062f1035530e3a7a66f65d360c3",
-  "MCD_GOV_ACTIONS": "0xf57f612161fb4ad3e17c5cc49fee569eb8da9b8f",
-  "MCD_DAI": "0x1d7e3a1a65a367db1d1d3f51a54ac01a2c4c92ff",
-  "MCD_SPOT": "0x932e82e999fad1f7ea9566f42cd3e94a4f46897e",
-  "MCD_POT": "0x286d3429226f04de6a9cf5a1cb3608dedf84810b",
-  "MCD_END": "0xb50864cd5ff7b936d4e05284c029387a660f5f2b",
-  "MCD_ESM": "0x1f144ee018104b35a0c8fdaa52055f4004785dd9",
-  "PROXY_ACTIONS": "0x19ee8a65a26f5e4e70b59fdcd8e1047920b57c13",
-  "PROXY_ACTIONS_END": "0x1478de8e2feea7cc0cd6d5faeff45616be9c13fa",
-  "PROXY_ACTIONS_DSR": "0x9f514de1fe291a657b08cc93d72c1b50d2cd704f",
-  "CDP_MANAGER": "0xb1fd1f2c83a6cb5155866169d81a9b7cf9e2019d",
-  "GET_CDPS": "0x05e0690128dcef6e16126e5a4f8f4a226797567d",
+  "MCD_ADM": "0xbbffc76e94b34f72d96d054b31f6424249c1337d",
+  "MCD_VAT": "0x2d9fad7795f0658f5931b75845d14250aecc81ee",
+  "MCD_JUG": "0x3fc6481a07d64d1d4ee157f6c207ca3f16e0c5da",
+  "MCD_CAT": "0xab10dfc4578ee6f9389c3c3f5f010cf9df30ea2b",
+  "MCD_VOW": "0x6f29dfc2f7142c6f161abc0e5be6e79a41269fa9",
+  "MCD_JOIN_DAI": "0x3a3cc501d46b84f310067ef7c5df4ae1f05810ea",
+  "MCD_FLAP": "0xc9d17f368a23e30a5e9ee59acec43cba4eaed951",
+  "MCD_FLOP": "0x3207a405afe20a77e04f8c74674cd9f0192d7371",
+  "MCD_PAUSE": "0x7ab7272785839443f89b88d440d86cbd3d2fd107",
+  "MCD_PAUSE_PROXY": "0x7fee42b37e55de8191da138d3fde658c65e96d04",
+  "MCD_GOV_ACTIONS": "0xde65b19457153f297ebacf0004bf5b9707db9e9b",
+  "MCD_DAI": "0xc27a24e60a89a03bd2f1ffb4ea59076fd8385fe6",
+  "MCD_SPOT": "0x0648831224d954a4add8686b70ef2f59a8ca9c7e",
+  "MCD_POT": "0x1c11810b1f8551d543f33a48ba88dcb0e8002b0f",
+  "MCD_END": "0x8e288a37b5d2f37d127a0beaef06fae05197866a",
+  "MCD_ESM": "0x0cc9b7ed9dc4d9892ceb07ae44aaf521548804aa",
+  "PROXY_ACTIONS": "0xca8fadc01fef6bfc4110dc00858af6977fea65b1",
+  "PROXY_ACTIONS_END": "0xdd61c16af37a92a2305849729c5f308d2775877f",
+  "PROXY_ACTIONS_DSR": "0x89aaeaad2a5fd3aac5306b8daac0647f3b0018d9",
+  "CDP_MANAGER": "0x9aa3779a1ffe9a2ef6c9aeeb18d2731937cefe05",
+  "GET_CDPS": "0x05d36a4cb61b5bb8bf0d87e6b2ea8c97f02eed45",
   "PROXY_FACTORY": "0xe11e3b391f7e8bc47247866af32af67dd58dc800",
   "PROXY_REGISTRY": "0x64a436ae831c1672ae81f674cab8b6775df3475c",
   "ETH": "0xd0a1e359811322d97991e03f863a0c30c2cf029c",
   "VAL_ETH": "0x75dd74e8afe8110c8320ed397cccff3b8134d981",
   "PIP_ETH": "0x75dd74e8afe8110c8320ed397cccff3b8134d981",
-  "MCD_JOIN_ETH_A": "0x55cd2f4cf74edc7c869bcf5e16086781ee97ee40",
-  "MCD_FLIP_ETH_A": "0xed9c01b0da1453cabcd6605ca0d85391d520b627",
-  "MCD_JOIN_ETH_B": "0x795bf49eb037f9fd19bd0ff582da42d75323a53b",
-  "MCD_FLIP_ETH_B": "0x3e30a46198e1d33597a02dd1e4eeb49ac924ec2c",
-  "MCD_JOIN_ETH_C": "0x3aae95264b28f6460a79be1494aebb6d6167d836",
-  "MCD_FLIP_ETH_C": "0x1f3fac040c2e049621095495eccd0456a12c58d3",
-  "REP": "0xc7aa227823789e363f29679f23f7e8f6d9904a9b",
-  "VAL_REP": "0x5debc8c4124db0c1d3bad99e69287a576c7b2ccc",
-  "PIP_REP": "0x5debc8c4124db0c1d3bad99e69287a576c7b2ccc",
-  "MCD_JOIN_REP_A": "0xd40163ea845abbe53a12564395e33fe108f90cd3",
-  "MCD_FLIP_REP_A": "0x2f47d490a16666e217b84d33d613af3872014a09",
-  "ZRX": "0x18392097549390502069c17700d21403ea3c721a",
-  "VAL_ZRX": "0xc010f1bbde279a5bb05c93f5fc902293d5a9f7a9",
-  "PIP_ZRX": "0xc010f1bbde279a5bb05c93f5fc902293d5a9f7a9",
-  "MCD_JOIN_ZRX_A": "0x1f4150647b4aa5eb36287d06d757a5247700c521",
-  "MCD_FLIP_ZRX_A": "0xd854703ebc643253daec660657d80b689232afc7",
-  "OMG": "0x441b1a74c69ee6e631834b626b29801d42076d38",
-  "VAL_OMG": "0x1e9740f61e80650a60ba70f2d0b477fb85db2b03",
-  "PIP_OMG": "0x1e9740f61e80650a60ba70f2d0b477fb85db2b03",
-  "MCD_JOIN_OMG_A": "0x2ebb31f1160c7027987a03482ab0fec130e98251",
-  "MCD_FLIP_OMG_A": "0xd30aa45a78ddf0d56abe8bf45667e6efd54f7f14",
+  "MCD_JOIN_ETH_A": "0xe5d124ec935b1b460372a28ce8ae7fb200fca9c0",
+  "MCD_FLIP_ETH_A": "0x6eb58e32e3f4407f074de5fee7454f1749be57b2",
   "BAT": "0x9f8cfb61d3b2af62864408dd703f9c3beb55dff7",
   "VAL_BAT": "0x5c40c9eb35c76069fa4c3a00ea59fac6ffa9c113",
   "PIP_BAT": "0x5c40c9eb35c76069fa4c3a00ea59fac6ffa9c113",
-  "MCD_JOIN_BAT_A": "0xe56b354524115f101798d243e05fd891f7d92e99",
-  "MCD_FLIP_BAT_A": "0xb07071290da73220ad0fd09454f2086f97813dd1",
-  "DGD": "0x62aeec5fb140bb233b1c5612a8747ca1dc56dc1b",
-  "VAL_DGD": "0x112bf99e873317643fbfcc22d197e3e01b825cb0",
-  "PIP_DGD": "0x112bf99e873317643fbfcc22d197e3e01b825cb0",
-  "MCD_JOIN_DGD_A": "0xd5f63712af0d62597ad6bf8d357f163bc699e18c",
-  "MCD_FLIP_DGD_A": "0x469e3f2511dc486c20d9f4626b03e7deb1325bd5",
-  "GNT": "0xc81ba844f451d4452a01bbb2104c1c4f89252907",
-  "VAL_GNT": "0xf46e96a6f23fdcb5870f0ac0dbe9d2c605485ddc",
-  "PIP_GNT": "0xf46e96a6f23fdcb5870f0ac0dbe9d2c605485ddc",
-  "MCD_JOIN_GNT_A": "0xc667ac878fd8eb4412dcad07988fea80008b65ee",
-  "MCD_FLIP_GNT_A": "0xcb4198df364f2d33d5d333757b82bc44e6d5539f",
+  "MCD_JOIN_BAT_A": "0x19a681c4f316731f75d37ea6be79a3a76b75a809",
+  "MCD_FLIP_BAT_A": "0xfd00bb61c59c40d78af6b9fb3dab5d81530ce9cf",
   "SAI": "0xc4375b7de8af5a38a93548eb8453a498222c4ff2",
-  "PIP_SAI": "0x0000000000000000000000000000000000000001",
-  "MCD_JOIN_SAI": "0xfe85da396c78f698ec894bc90dec7d6f44caa76c",
-  "MCD_FLIP_SAI": "0x143167dc9f2d359c8a1032b0d3291291d472e593",
-  "PROXY_PAUSE_ACTIONS": "0xe4e6cd4f3fe2b7db248609195a2d71e072773380",
-  "PROXY_DEPLOYER": "0x818a81dd914e89a4698869ee54c8e2c056bfda03",
+  "PIP_SAI": "0x0000000000000000000000000000000000000000",
+  "MCD_JOIN_SAI": "0x7c32ea45214446cc7be901997dfe5318f3af4acc",
+  "MCD_FLIP_SAI": "0x5b21577c9c3444a748684a80a1aaefdac538a6cb",
+  "PROXY_PAUSE_ACTIONS": "0x9f02cae61a0ca698c0d130dae527e31982480335",
+  "PROXY_DEPLOYER": "0xa9fccb07dd3f774d5b9d02e99de1a27f47f91189",
   "SAI_TUB": "0xa71937147b55deb8a530c7229c442fd3f31b7db2",
-  "MIGRATION": "0x97cb5a9abcdbe291d0cd85915fa5b08746fe948a",
-  "MIGRATION_PROXY_ACTIONS": "0x17134c5ab1ea28f21df9c8203b817bd3b9f9a12d",
-  "GOV_POLL_GEN": "0xcf7ea4476f392139c20623e8372fb7f71bd5b50d",
-  "POLL_ID": "0",
-  "VOTE_YES": "0x69138d410005236e49c5ca0f54fcb1be996fb631",
-  "VOTE_NO": "0x87db3bc78798b395683a2bc2d3ad0a8f78240ab4"
+  "MIGRATION": "0xfa793be7cb0cdfe636d19f49f880aebb568e39cf",
+  "MIGRATION_PROXY_ACTIONS": "0xaafa1ea9486baad4ebc281f9feba922b8b0a1b1f"
 }
diff --git a/libexec/mcd/mcd-cdp-open b/libexec/mcd/mcd-cdp-open
index afc3edb..f2ac8b6 100755
--- a/libexec/mcd/mcd-cdp-open
+++ b/libexec/mcd/mcd-cdp-open
@@ -6,8 +6,9 @@ export SETH_ASYNC=yes
 export ETH_GAS=${ETH_GAS:-300000}
 
 usr=$(mcd --proxy-address)
-sig="open(address,bytes32)"
-tx=$(mcd --proxy-exec "$sig" "${CDP_MANAGER?}" "$ilk")
+sig="open(address,bytes32,address)"
+proxy=$(mcd --proxy-address)
+tx=$(mcd --proxy-exec "$sig" "${CDP_MANAGER?}" "$ilk" "$proxy")
 
 echo >&2 -n "${0##*/}: Waiting for transaction receipt..."
 block=$(SETH_ASYNC=no SETH_TICK=true seth receipt "$tx" blockNumber)
@@ -25,7 +26,7 @@ logs=$(seth rpc eth_getLogs -- \
     -s "0x$(seth --to-word "$usr")" -i append \
     -i topics \
     -i append | echo "[$(paste -sd , -)]")
-hex=$(echo "$logs" | jshon -a -e data -u)
+hex=$(echo "$logs" | jshon -a -e topics | jq -r ".[3]")
 hash=$(echo "$logs" | jshon -a -e transactionHash -u)
 
 if [ "$hash" == "$tx" ]; then