diff --git a/package.json b/package.json
index 70001a960..3dfffd995 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/plugin-transform-runtime": "^7.3.4",
     "@babel/preset-env": "^7.4.5",
-    "@makerdao/testchain": "^1.0.2",
+    "@makerdao/testchain": "^1.0.3",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.5",
diff --git a/packages/dai-plugin-mcd/contracts/addresses/testnet.json b/packages/dai-plugin-mcd/contracts/addresses/testnet.json
index ca8006f5c..6009eb49e 100644
--- a/packages/dai-plugin-mcd/contracts/addresses/testnet.json
+++ b/packages/dai-plugin-mcd/contracts/addresses/testnet.json
@@ -1,81 +1,80 @@
 {
-  "BAT": "0x59c6eeb79b7b06b7ec3d604f97a66040c2552b95",
-  "CDP_MANAGER": "0x818e4eb4798a4be80e8234db3cb7a4fa3a61e7a8",
+  "BAT": "0x85f1c78e0b9ad4496ee0d87dcf06c50b7644f680",
+  "CDP_MANAGER": "0x5328696001b4f70173a79c75d97553f079c33d38",
   "DEPLOYER": "0x16fb96a5fa0427af0c8f7cf1eb4870231c8154b6",
-  "DGD": "0xad1af604731534a6b83db7f5c21b5aa5ed15cb0f",
-  "ETH": "0x9a72a69b28d502f25eb1f5bbeb4e9655c65aaa38",
-  "FAUCET": "0x4f7d338eab9f9c57da3fde00817e019681dfa48f",
-  "GET_CDPS": "0xb70f17a62ed9a8e852b791e9964cbe53cd064e9b",
-  "GNT": "0x8db7e035cbb8ded5c34b20101b1eb650ff00d6bf",
-  "GOV_GUARD": "0x5f9a6257a1165bb4be7ddc0523d0afd026acb47c",
-  "MCD_ADM": "0x3cd28f255a60097b81baa2e5d612afe750c1fedf",
-  "MCD_CAT": "0xbd098426f9de1d890174dfe3ab7c2acb573b2bd4",
-  "MCD_DAI": "0xd349d3b65085dc0f4c739951d21f5fc0aff4a8c9",
-  "MCD_DEPLOY": "0x0178d59312b04782662a203af4c708ab3ee061a1",
-  "MCD_END": "0x145acf8d05f3fde70f380932863de3cfcfe35aa1",
-  "MCD_ESM": "0xd4139b5666fb81b288fabf5f09066eb90feb7cb9",
-  "MCD_FLAP": "0x7d4ee8d938fd5d6b18442561d0c8fdd3e3335727",
-  "MCD_FLIP_BAT_A": "0x3c5225f4adbc2172f895fff47803822bbd48cc85",
-  "MCD_FLIP_DGD_A": "0xa55376ef146b6fbb978ef050049d8110ff043da0",
-  "MCD_FLIP_ETH_A": "0x832a636b21a3f25e8b1ecf90482e784f795a112b",
-  "MCD_FLIP_ETH_B": "0x93501226341144166b509145e84ffd7aa3b0bc2b",
-  "MCD_FLIP_ETH_C": "0x4abe596b332132538d0479420d26b8cc062f9053",
-  "MCD_FLIP_GNT_A": "0x8181ae65c91e83107c55e4413d23f41bb58e3c34",
-  "MCD_FLIP_OMG_A": "0x14a54464c10127a28e31ba9f019f0b031b8dde87",
-  "MCD_FLIP_REP_A": "0xd9692b79b17e4ef266eae5f155539c16bed3f000",
-  "MCD_FLIP_SAI": "0x173926f7ae33090723393e0cc6842f1d12e5a40a",
-  "MCD_FLIP_ZRX_A": "0x701b43bea400fd9d1da222cc941256872ea48a2f",
-  "MCD_FLOP": "0xaabecfd73796cccd6615372c9599868c5eade18f",
-  "MCD_GOV": "0x69ba6cfa9c87e04f84b6eb2e2382263b8dfe0c16",
-  "MCD_GOV_ACTIONS": "0x38058a17d2d60d8cd83bd76fb346d58a2f5292ef",
-  "MCD_IOU": "0x2f89ba8c33ae5b5660f149327bcaf4d8bf021de0",
-  "MCD_JOIN_BAT_A": "0x8d7cf4d0313062503f909c87b52ed58b4f7b0f24",
-  "MCD_JOIN_DAI": "0x5cc6ff83848fe6cbee329d83fd5a51888aea7923",
-  "MCD_JOIN_DGD_A": "0xec594114e3b17778f0445fe8eb309a5375fd9520",
-  "MCD_JOIN_ETH_A": "0x31c3b195315f278e35de0fab1d2a6af69667ee9d",
-  "MCD_JOIN_ETH_B": "0x0e19ce1e60bbef527a983969f38446c0b0582687",
-  "MCD_JOIN_ETH_C": "0x488bcf2688abb59aba8765375c472e239efc1467",
-  "MCD_JOIN_GNT_A": "0xe12e8420ca99ad29e7483c4dc252b45472428b6a",
-  "MCD_JOIN_OMG_A": "0x33af3884b2e0a063ebb2001b27623c194f35a6d3",
-  "MCD_JOIN_REP_A": "0x86f1a4fc5f436b3d941f700cf00846fdadee3033",
-  "MCD_JOIN_SAI": "0x99e7f1b12f07b3c0300f92475115324a18d39043",
-  "MCD_JOIN_ZRX_A": "0x5e1782585db2e3d20f63f4a9868e5f30450f3cc7",
-  "MCD_JUG": "0x3c5367885a99fd7560699670fa379d829be1eee7",
-  "MCD_PAUSE": "0x4e651a79ab17cc32961af86929791a8bc18b4dc9",
-  "MCD_PAUSE_PROXY": "0xf0d21d384a41dc573269daa30184943200028f7d",
-  "MCD_POT": "0xf9491800f696a0549b4385b2e4006dddd333f361",
-  "MCD_SPOT": "0x3e608866d7bc42caa4bcaff1957eaa1ea4e4a308",
-  "MCD_VAT": "0x00e0dc8cdbe41a443f53b9f33b0406598ced1c73",
-  "MCD_VOW": "0xcbe8dd77fad8079f107d8cad4a040264de66b84e",
-  "MIGRATION": "0x313450288048d2294649a86127066d462fe16dc4",
-  "MIGRATION_PROXY_ACTIONS": "0xfdb977224348da0da32fc153bc808bef1c92bd1e",
-  "MULTICALL": "0x27dbc8f8b068edb2906a749b2f3c970d42d904b6",
-  "OMG": "0xb3ba35ca0dbb27b06c18110c15a68c2fb006fdc7",
-  "PIP_BAT": "0xf0d4c01ed1dc50c6213fb0d89e947eabb34b3279",
-  "PIP_DGD": "0x23845543baf1e6f1071f8090f4ee8c8ea9ca7214",
-  "PIP_ETH": "0xd3316a684838bd0db32805b70eda07fd22113f55",
-  "PIP_GNT": "0xb0edddb340ea5412bf627ea2e45798a9be1d42a2",
-  "PIP_OMG": "0xaeb0f2978d328fb4275b2aaf093819eff7183a13",
-  "PIP_REP": "0xc6f60f9f197bd23962c46a621610589af0381db2",
-  "PIP_SAI": "0x39acb99024b5f48082cd020a2a1785e4b7d42e21",
-  "PIP_ZRX": "0x474c551f56c98fd904350dd831f29681aaf0ec29",
-  "PROXY_ACTIONS": "0xe68efbf00631256a7134bf06aa0d13de3061715c",
-  "PROXY_ACTIONS_DSR": "0x8e91ffddedbb4517c88a48b6aa0370d60cfcaca0",
-  "PROXY_ACTIONS_END": "0xbdb87e4f8ed0129f8788657b4b7c06740ad8eb9a",
-  "PROXY_DEPLOYER": "0x873689a8ac8ea6350218c29ab5db65ec8bc05e9a",
-  "PROXY_FACTORY": "0x88b3eafc9d3ca073cb03867edbb78ad9d0acbfd5",
-  "PROXY_PAUSE_ACTIONS": "0xdf2c73108143e4dbe9b78dc81a1f9243d61eed29",
-  "PROXY_REGISTRY": "0x5fc0a03c3f80b7b25143ab1526537de645aa799c",
-  "REP": "0x83b691b38aa0211021105c9f3158f5ff8c27e7b2",
-  "SAI": "0xa00577347d3e0eccc4a3a676d5dc4d1020e5075d",
-  "SAI_TUB": "0xf63c6584531377c7c8272bb4a4aa7fe34c3e2e68",
-  "VAL_BAT": "0xf0d4c01ed1dc50c6213fb0d89e947eabb34b3279",
-  "VAL_DGD": "0x23845543baf1e6f1071f8090f4ee8c8ea9ca7214",
-  "VAL_ETH": "0xd3316a684838bd0db32805b70eda07fd22113f55",
-  "VAL_GNT": "0xb0edddb340ea5412bf627ea2e45798a9be1d42a2",
-  "VAL_OMG": "0xaeb0f2978d328fb4275b2aaf093819eff7183a13",
-  "VAL_REP": "0xc6f60f9f197bd23962c46a621610589af0381db2",
-  "VAL_ZRX": "0x474c551f56c98fd904350dd831f29681aaf0ec29",
-  "VOTE_PROXY_FACTORY": "0xc0b037c4206b5faa9a6dff03117089da3833a85e",
-  "ZRX": "0x1aa776513426a3ea3d249f4e6bb2cfce514839ba"
+  "DGD": "0xbe0b519f4c6188080f23480143441900fb95271f",
+  "ETH": "0x140041885a385929f73e2ff9dc220a5729852cca",
+  "FAUCET": "0x3f07938030bbde9f7670163a0953c0c30d11317d",
+  "GET_CDPS": "0x264cfed6a189d5cadbb954feeb77e0946bcb4d52",
+  "GNT": "0xee00145ad44610527b3c6f6f81ba4a1a847c0e26",
+  "MCD_ADM": "0x538f5ebf3d7352e250c021caf2f9b7752443329e",
+  "MCD_CAT": "0xfbeb3c2993de05f50f16010bd58d68ecf21a105c",
+  "MCD_DAI": "0x1bfd73c91bfd272a0acbc92de56daec2e1762a08",
+  "MCD_DEPLOY": "0xac9c19c0b52da4ed409e50b937fb5c89bf8b03f6",
+  "MCD_END": "0x2b0008ef7f8bb4edf6829d2369f0a7f67d7a1c58",
+  "MCD_ESM": "0x64dd2ad30b740df0e30283ae8229060f0947e7af",
+  "MCD_FLAP": "0xd233f7d34e210fc29c104b6f2943b73e1fc047f6",
+  "MCD_FLIP_BAT_A": "0x7c3f3edc872e034a9fad81ebb34dc31696fb8c7f",
+  "MCD_FLIP_DGD_A": "0x7fb0c1a85924ddea4166f46a36788bccbe1a3530",
+  "MCD_FLIP_ETH_A": "0x4cd1cccb64d2e45c7e291a4cd4d9c6e47e0cf3f3",
+  "MCD_FLIP_ETH_B": "0x7d7f6f2dbf1839f0ff6a0377ea9ed7d9edd2c466",
+  "MCD_FLIP_ETH_C": "0x04c5f6520585246eff03553d918f34888b5a82c3",
+  "MCD_FLIP_GNT_A": "0xbae599d064f7386ccfde946987f258adcd78b103",
+  "MCD_FLIP_OMG_A": "0xb0d4b93765f634f4e93e7fcae520d1e784f0b7b1",
+  "MCD_FLIP_REP_A": "0x2d7c15a604edaada8bf7964f27715ba2807e7683",
+  "MCD_FLIP_SAI": "0x63103b6c612f995e1611983b8914c24a281a315a",
+  "MCD_FLIP_ZRX_A": "0x09db428ade41bde8558d0fcedcf2872e7052f39e",
+  "MCD_FLOP": "0x88e56d3c45c16d991e802a5897dd1e6770310a7b",
+  "MCD_GOV": "0xe8608ec3d229f578bed5b405d1e04bc2a0bb65e8",
+  "MCD_GOV_ACTIONS": "0xd5142080784467ea4b00a7b22129ed6ba2975597",
+  "MCD_IOU": "0xd2b90e772eea9725e19873c0cc855dd1be00cc1c",
+  "MCD_JOIN_BAT_A": "0x65bf686ee1c203e1b5042a4453822862e6d5cd4b",
+  "MCD_JOIN_DAI": "0xbbb480f328c1369c817bf3ecca84ab7b0b93c285",
+  "MCD_JOIN_DGD_A": "0x30754b6832083f81d597d57ff7d570549f879972",
+  "MCD_JOIN_ETH_A": "0xbd2675b116d1d4a272be7b9217b928729ddc119d",
+  "MCD_JOIN_ETH_B": "0x1f9aee606083c0de267d45676f35359c39c983e6",
+  "MCD_JOIN_ETH_C": "0x53ccddee332ff5b706c625f2e9a0352ba2178262",
+  "MCD_JOIN_GNT_A": "0xab98fd5473b0b68834e66ec654c2fbab3022ef0c",
+  "MCD_JOIN_OMG_A": "0xfb014b78a984c6f3cf32aa71fd07d9b5b6022de1",
+  "MCD_JOIN_REP_A": "0x38262a71d9323212a0a8b00bb4da309488b7466d",
+  "MCD_JOIN_SAI": "0x50523426e76cd1b102596c504acb1b79da420861",
+  "MCD_JOIN_ZRX_A": "0x4417a7457a61dd3931e9fcea4240c839b004cdee",
+  "MCD_JUG": "0xcf32ce4087a2aaa822d6fe6e03bbdf1bb36ff369",
+  "MCD_PAUSE": "0xe335eab6c528e7156b215af00f0f1a67dbb8a5f0",
+  "MCD_PAUSE_PROXY": "0x5fa1426f5356e46a5e1e5353717d415f0d1fe357",
+  "MCD_POT": "0x1fbf51a780232f0cf01195d7021e1bb76612462a",
+  "MCD_SPOT": "0x7c33d68b344a5ee68ddb088b312726b748729b7a",
+  "MCD_VAT": "0xbd73ab43673046b538dd6a5f2e24dfcccc363ce3",
+  "MCD_VOW": "0xa4427ea553cc6b9095dbdb3ad83136af62d8e7fa",
+  "MIGRATION": "0x1f8d3148c725de9d31751c9f8cb764c8ee6d9719",
+  "MIGRATION_PROXY_ACTIONS": "0x5f295c5589118d2f8eab6488c366d42c0f54882c",
+  "MULTICALL": "0x6dbff82b7b650ac3892dde048456804e5c1a7a47",
+  "OMG": "0x19338ac26dd9e1c5f64b0162e7fb220f977ef536",
+  "PIP_BAT": "0x7ed0d0255153050e9623ffeceee49a1020503ca3",
+  "PIP_DGD": "0x0661dd217a825c71a656fa2c5e34c950a4a6a4e2",
+  "PIP_ETH": "0xaf14e6e871f81bb92f151aff1bb80936aa06c6d6",
+  "PIP_GNT": "0x7d682abc03f8e231758a695466334e97774df94e",
+  "PIP_OMG": "0x33da3e834fed3880be7736946a046c1da2b87040",
+  "PIP_REP": "0xc2f6d019aa28b472c11f2f2984d72178542f22fb",
+  "PIP_SAI": "0x9c7f936933a8f34388e9e458378ae060ebd9db2c",
+  "PIP_ZRX": "0x25ef34ab610df2844d26fc4455677e94cadf00c8",
+  "PROXY_ACTIONS": "0x86280b26bc61e8da67cb1f65cca44ae0b742ce11",
+  "PROXY_ACTIONS_DSR": "0xc1a255355abdbd080fd6a29eee76ee760c974b9d",
+  "PROXY_ACTIONS_END": "0xe92057cd15ce1d5c4f4fe7740438a7ec71aa4dfc",
+  "PROXY_DEPLOYER": "0x9ad2bab35b84141e908ab47e480531f3317dfb0a",
+  "PROXY_FACTORY": "0x2b119e8e14d03ccdd595f8b9381a7b917e68326e",
+  "PROXY_PAUSE_ACTIONS": "0x677130654f97fbb55059e52abb06505501c680ed",
+  "PROXY_REGISTRY": "0xf87c5ed6d908fda068f7cc15b5bd02e6df19bc6d",
+  "REP": "0xd8cbd8473d1b701d867161507c5a1917a2d6d223",
+  "SAI": "0xbe061138fbab3849533c80c9692370f268fdd80b",
+  "SAI_TUB": "0xcf600122aa3a1e2ca2867a1c30c48b2ded6aaf84",
+  "VAL_BAT": "0x7ed0d0255153050e9623ffeceee49a1020503ca3",
+  "VAL_DGD": "0x0661dd217a825c71a656fa2c5e34c950a4a6a4e2",
+  "VAL_ETH": "0xaf14e6e871f81bb92f151aff1bb80936aa06c6d6",
+  "VAL_GNT": "0x7d682abc03f8e231758a695466334e97774df94e",
+  "VAL_OMG": "0x33da3e834fed3880be7736946a046c1da2b87040",
+  "VAL_REP": "0xc2f6d019aa28b472c11f2f2984d72178542f22fb",
+  "VAL_ZRX": "0x25ef34ab610df2844d26fc4455677e94cadf00c8",
+  "VOTE_PROXY_FACTORY": "0x454b73d687a4f6d8ecca4420f6094be93b4cbedb",
+  "ZRX": "0x7263a9242c3737b54493ed1078ac3dcfab131c26"
 }
diff --git a/packages/dai-plugin-migrations/contracts/addresses/testnet.json b/packages/dai-plugin-migrations/contracts/addresses/testnet.json
index 30c0332d0..285f2b6bc 100644
--- a/packages/dai-plugin-migrations/contracts/addresses/testnet.json
+++ b/packages/dai-plugin-migrations/contracts/addresses/testnet.json
@@ -1,14 +1,14 @@
 {
-  "TUB": "0xf63c6584531377c7c8272bb4a4aa7fe34c3e2e68",
-  "GET_CDPS_1": "0xb70f17a62ed9a8e852b791e9964cbe53cd064e9b",
-  "CDP_MANAGER_1": "0x818e4eb4798a4be80e8234db3cb7a4fa3a61e7a8",
-  "MCD_END_1": "0x145acf8d05f3fde70f380932863de3cfcfe35aa1",
-  "MCD_VAT_1": "0x00e0dc8cdbe41a443f53b9f33b0406598ced1c73",
-  "MCD_DAI_1": "0xd349d3b65085dc0f4c739951d21f5fc0aff4a8c9",
-  "MCD_POT_1": "0xf9491800f696a0549b4385b2e4006dddd333f361",
-  "REDEEMER": "0x059fc499f54aaaa853fe700f54a25fee0538f829",
-  "OLD_MKR": "0x661dc0bbe25ddedbe5a8cd68fa8117002d9a373c",
-  "MIGRATION": "0x313450288048d2294649a86127066d462fe16dc4",
-  "MIGRATION_PROXY_ACTIONS": "0xfdb977224348da0da32fc153bc808bef1c92bd1e",
-  "OLD_CHIEF": "0xaeb199d9984c1da63d9529e03bf57691f426a492"
+  "TUB": "0xcf600122aa3a1e2ca2867a1c30c48b2ded6aaf84",
+  "GET_CDPS_1": "0x264cfed6a189d5cadbb954feeb77e0946bcb4d52",
+  "CDP_MANAGER_1": "0x5328696001b4f70173a79c75d97553f079c33d38",
+  "MCD_END_1": "0x2b0008ef7f8bb4edf6829d2369f0a7f67d7a1c58",
+  "MCD_VAT_1": "0xbd73ab43673046b538dd6a5f2e24dfcccc363ce3",
+  "MCD_DAI_1": "0x1bfd73c91bfd272a0acbc92de56daec2e1762a08",
+  "MCD_POT_1": "0x1fbf51a780232f0cf01195d7021e1bb76612462a",
+  "REDEEMER": "0x396c36f467e6db6c14722e02605d31e9198ae7cf",
+  "OLD_MKR": "0x1e1e0cb82b75fda8d3653bef925bf1babd160067",
+  "MIGRATION": "0x1f8d3148c725de9d31751c9f8cb764c8ee6d9719",
+  "MIGRATION_PROXY_ACTIONS": "0x5f295c5589118d2f8eab6488c366d42c0f54882c",
+  "OLD_CHIEF": "0xe50ff8544b50e2e0f25cab27bc85a7a905d5671a"
 }
diff --git a/packages/dai/contracts/abis/VoteProxyFactory.json b/packages/dai/contracts/abis/VoteProxyFactory.json
new file mode 100644
index 000000000..b7c5abb46
--- /dev/null
+++ b/packages/dai/contracts/abis/VoteProxyFactory.json
@@ -0,0 +1 @@
+[{"constant":false,"inputs":[],"name":"linkSelf","outputs":[{"name":"voteProxy","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"hot","type":"address"}],"name":"initiateLink","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"guy","type":"address"}],"name":"hasProxy","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"hotMap","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"linkRequests","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"breakLink","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"coldMap","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"cold","type":"address"}],"name":"approveLink","outputs":[{"name":"voteProxy","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"chief","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"chief_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"cold","type":"address"},{"indexed":true,"name":"hot","type":"address"}],"name":"LinkRequested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"cold","type":"address"},{"indexed":true,"name":"hot","type":"address"},{"indexed":true,"name":"voteProxy","type":"address"}],"name":"LinkConfirmed","type":"event"}]
\ No newline at end of file
diff --git a/packages/dai/contracts/addresses/testnet.json b/packages/dai/contracts/addresses/testnet.json
index f4c561556..c20d6b54b 100644
--- a/packages/dai/contracts/addresses/testnet.json
+++ b/packages/dai/contracts/addresses/testnet.json
@@ -1,29 +1,29 @@
 {
   "ETH_FROM": "0x16fb96a5fa0427af0c8f7cf1eb4870231c8154b6",
-  "GEM": "0x9a72a69b28d502f25eb1f5bbeb4e9655c65aaa38",
-  "GOV": "0x4b00b26634e1911058f799eb55e60360b5efd047",
-  "PIP": "0xa9f037b31f97c4071de883e2e6a24065dd453526",
-  "PEP": "0xdde7bb0ae6748629ce5f4feedb68fccb6c4c1eeb",
+  "GEM": "0x140041885a385929f73e2ff9dc220a5729852cca",
+  "GOV": "0xe8608ec3d229f578bed5b405d1e04bc2a0bb65e8",
+  "PIP": "0x36229df0f0cb1a154b1eb4ec042e448fa9f88a3a",
+  "PEP": "0xb202db1c27e0a13cc773f9d8be9725364de9578d",
   "PIT": "0x0000000000000000000000000000000000000123",
-  "ADM": "0x7f65712694a95019c328fce5aef1a8226d09eff3",
-  "SAI": "0xa00577347d3e0eccc4a3a676d5dc4d1020e5075d",
-  "SIN": "0xb86023cd7c8413feffe289eb0296769a9900a721",
-  "SKR": "0x4a66757f4a25dd11f9c3789a5475d9c6ad34af8f",
-  "DAD": "0x595ddf841d7f06bc4ad3b08bae16f0bab77ec4c7",
-  "MOM": "0xc4f55bb77ef9822b486878456e08ddff61c66fee",
-  "VOX": "0x40b0bc684b37a99e97749da4fbdfdef56fd3a3d3",
-  "TUB": "0xf63c6584531377c7c8272bb4a4aa7fe34c3e2e68",
-  "TAP": "0x3fd551d6e1f560b317183a68b46fdf933c0dfc62",
-  "TOP": "0xa0922d1285d347ef74919460a16c0aaad36545db",
-  "MAKER_OTC": "0xd60d5beff0b0dbe2f8298d9709618d32489dcc55",
-  "PROXY_REGISTRY": "0x17cfdabc89fa8e3376a0bb979c4768f1a07af010",
-  "DS_PROXY": "0xee9aef32e39cbcb8598041d84dc20fdf03d94f2d",
-  "SAI_PROXY": "0x96a24e48f1d89c9cd15f9e8017c467710affef45",
-  "OASIS_PROXY": "0x72e88f7ea65e468492cec8d51cf76b0b08f9e69e",
-  "REDEEMER": "0x059fc499f54aaaa853fe700f54a25fee0538f829",
-  "OLD_MKR": "0x661dc0bbe25ddedbe5a8cd68fa8117002d9a373c",
-  "OLD_CHIEF": "0xaeb199d9984c1da63d9529e03bf57691f426a492",
-  "OLD_IOU": "0x88b03e8ed3482c7bc68822aa3e0e2f0ab12fdd5f",
-  "POLLING": "0xf8a5275ca195e8306ab2e5bc63108fa7be44fc0e",
-  "MULTICALL": "0x2b2fbfca02f8c29c750ed193828b40887e8bbb32"
+  "ADM": "0xfd5a651a12b5a9c091452607fbefd89e6db9b6ca",
+  "SAI": "0xbe061138fbab3849533c80c9692370f268fdd80b",
+  "SIN": "0x7befbad61724d9f93b22977611388ebfc76fe185",
+  "SKR": "0x1ded180b498fd68095446e01cb0abf92cab46663",
+  "DAD": "0x9cc6e5a32c93b65551aecac4ad043b1664f34ddc",
+  "MOM": "0x44aa1c7e29db55681d241560455cd05b5cfa6208",
+  "VOX": "0x6da87dc4348a92835314b7ef6ccbb2dfba402362",
+  "TUB": "0xcf600122aa3a1e2ca2867a1c30c48b2ded6aaf84",
+  "TAP": "0x166129b199562eb7aeed3e406fae53a2f836b4da",
+  "TOP": "0x56460a758cf485547bfaa982be71501d6997ee54",
+  "MAKER_OTC": "0xb7fe224bf9752a0068fc578be851c84b95ed6d11",
+  "PROXY_REGISTRY": "0x1f59ec73026280bbe913fbe5b64d82f82682f6b2",
+  "DS_PROXY": "0xc21edd3d1ba1bccd67008b680b362ce6f344dab3",
+  "SAI_PROXY": "0x3d81ca6771d4f3dee39c05a8cea93f6bd1ec26ab",
+  "OASIS_PROXY": "0xeb011d9a35d7434fc6a4998076cca3455b28b592",
+  "REDEEMER": "0x396c36f467e6db6c14722e02605d31e9198ae7cf",
+  "OLD_MKR": "0x1e1e0cb82b75fda8d3653bef925bf1babd160067",
+  "OLD_CHIEF": "0xe50ff8544b50e2e0f25cab27bc85a7a905d5671a",
+  "OLD_IOU": "0x3be5c78f206f1de8766cfcdfd8f09a6995cd89ec",
+  "POLLING": "0x33bbcca25638d046c754987a45f7cba6a73b1fd4",
+  "OLD_VOTE_PROXY_FACTORY": "0x17d4edea99fad126ce0b3ed46646587d067f4f8c"
 }
diff --git a/yarn.lock b/yarn.lock
index 8716d6594..862280a8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1704,10 +1704,10 @@
     lodash "^4.17.11"
     ws "^7.2.0"
 
-"@makerdao/testchain@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.0.2.tgz#818cf7851369000f21b8047770f80e3a11e35301"
-  integrity sha512-QMmfHsJNtg5T8d//U2Jv97Gz1ikIOMhRf5U4e4H8OmfTN/RsEdRT7rumofqQJsv7YESJvJk7quUw3RqfWwRLEw==
+"@makerdao/testchain@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.0.3.tgz#c7df934a4863b9bf58ec1fdce9a4352e9d418378"
+  integrity sha512-hvkQbVhfueSY06WqjptYFZy4wwYIxO1SpzZJ3I9kQxlaO8SqBeiqthHlSqvPHsUJBpRU7yDs5yRRzWY61NcRcA==
   dependencies:
     ganache-cli makerdao/ganache-cli#fix/gas-est-crash
 
@@ -5659,7 +5659,7 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-ganache-cli@makerdao/ganache-cli#fix/gas-est-crash:
+"ganache-cli@github:makerdao/ganache-cli#fix/gas-est-crash":
   version "6.4.3-beta.0"
   resolved "https://codeload.github.com/makerdao/ganache-cli/tar.gz/3e512b61da2479042627e6155231dcb038110650"
   dependencies: