diff --git a/package.json b/package.json
index 3dfffd995..4322a929b 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.3",
+    "@makerdao/testchain": "^1.0.4",
     "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 6009eb49e..e83e24114 100644
--- a/packages/dai-plugin-mcd/contracts/addresses/testnet.json
+++ b/packages/dai-plugin-mcd/contracts/addresses/testnet.json
@@ -1,80 +1,80 @@
 {
-  "BAT": "0x85f1c78e0b9ad4496ee0d87dcf06c50b7644f680",
-  "CDP_MANAGER": "0x5328696001b4f70173a79c75d97553f079c33d38",
+  "BAT": "0x94c41af9d4043952de2f1cc82d33ce66d01dc03b",
+  "CDP_MANAGER": "0x5745e320b40ce83439e979ac5d0f5bf2e363886b",
   "DEPLOYER": "0x16fb96a5fa0427af0c8f7cf1eb4870231c8154b6",
-  "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"
+  "DGD": "0x92e95800fed057ae533b6e16eda8b7d6fc1efc96",
+  "ETH": "0xa6090d1da37cf87de7f0819527a4407ddac91c3d",
+  "FAUCET": "0xd7978f3a46e84f1c0069bde629d2750758459ce2",
+  "GET_CDPS": "0x0a8096156b9d85eaa6217270eaa50ae2ca0e608c",
+  "GNT": "0x8689da958622fe1b5e829a536ea9e226adc88bd4",
+  "MCD_ADM": "0x606cfba3aedb7531ffb42bf51b3d975e53ea30c0",
+  "MCD_CAT": "0x09e4fb474c9689cc9eaa94d68a3459d16f7e6c2a",
+  "MCD_DAI": "0x18a78e3e313bb0ce434a4370b7428c31f9166691",
+  "MCD_DEPLOY": "0xb6262c817f13bdf5191f4ffdb9957440d061b262",
+  "MCD_END": "0xf179ccbc17d581b6fb06295da9ae71318aa85fe4",
+  "MCD_ESM": "0xba3c889674a703528feb1b003f3eb5b4991ce151",
+  "MCD_FLAP": "0x25899082f69d07107fc99d18b4e8120d2b2c83e5",
+  "MCD_FLIP_BAT_A": "0xbb32772c61b60adcf0f6ea5538d17756daf20a00",
+  "MCD_FLIP_DGD_A": "0xcb495bc115fa2ea25f5784e9dd0f47d0d2294772",
+  "MCD_FLIP_ETH_A": "0x3666fcda02e4db72f34dd735169f71c86a6a0d04",
+  "MCD_FLIP_ETH_B": "0x26b9bae56a1f7808da12e986c0bcddfd411569ad",
+  "MCD_FLIP_ETH_C": "0x7b369926fc1ed6bd2c95611944c2651f0d29a763",
+  "MCD_FLIP_GNT_A": "0xad4c46700fafe8e3229bf00e6e4ceba6f142c9a6",
+  "MCD_FLIP_OMG_A": "0x4ece6173dd0b54b2a6bea8d8aa66df54b377c991",
+  "MCD_FLIP_REP_A": "0x5a36fa0e4bcac64897be8de03dda625576e2c826",
+  "MCD_FLIP_SAI": "0xc28c3a5ffd901e937b37c2213664d5262e0a79d8",
+  "MCD_FLIP_ZRX_A": "0xc63048c062ebd5c60e937db3dc03f56d16d4d205",
+  "MCD_FLOP": "0xbb84b51907ef8da6c8fa614d5af474821502b474",
+  "MCD_GOV": "0x4b4bebfc5fc00ece877b738206edcfd9845760b2",
+  "MCD_GOV_ACTIONS": "0xfa5107fa2772b59533f796af2b4619d5f540fe2e",
+  "MCD_IOU": "0x65e64889614e8e23bccba656582bdbf477aba0d5",
+  "MCD_JOIN_BAT_A": "0xe2461464c8fe0f511a96ae5e408d9a013b715220",
+  "MCD_JOIN_DAI": "0x3926a197311a221704b3ac31d7dc5383b8ab5b2b",
+  "MCD_JOIN_DGD_A": "0x01e806987b224c5866386d8d589d895c03c535d4",
+  "MCD_JOIN_ETH_A": "0x73f6750c4a6ae6b23f75aee4d504d86ebffdfe99",
+  "MCD_JOIN_ETH_B": "0x412e95ed632b2fd513a564e0b202d4dd86a27736",
+  "MCD_JOIN_ETH_C": "0x8a57ee56ffcd1cdb6bc1abda322a32e9a3b7a14a",
+  "MCD_JOIN_GNT_A": "0x5cdfcdcf00ed10b6742c602c3b27abba77cdbc87",
+  "MCD_JOIN_OMG_A": "0x79290a4f15ad2d9c9beb69410ba689b9bdec99f5",
+  "MCD_JOIN_REP_A": "0xe340a78b84dc7cf064f37794489dd15dd9151944",
+  "MCD_JOIN_SAI": "0x316ae0696692c12dc26cabe65e89a0e03a07a81e",
+  "MCD_JOIN_ZRX_A": "0x8451c0dceba2bb526199c0415b26639cee1e39df",
+  "MCD_JUG": "0xbe4aadd136af7841d7a59402b2af6ed78d251baa",
+  "MCD_PAUSE": "0x08c0980a83823ee877a3cacd3aaca26ab1fd3a1c",
+  "MCD_PAUSE_PROXY": "0xc50e555cee85cc9952bdd95cd00bdbf9f7f080d7",
+  "MCD_POT": "0xac42032fd6bc5e3abd545bb710ed81085d5d8288",
+  "MCD_SPOT": "0xf904afd0fa759b44387be684c4210463e0e0b300",
+  "MCD_VAT": "0xac398d6a93df1d65acf69b4d4a5d4d6290fb8f35",
+  "MCD_VOW": "0x6c790c34dbbdd09fa0c0d81e5fac081a5022b29b",
+  "MIGRATION": "0x8c544c7a6234ec1d6dba6aa10781c7ce5c51626a",
+  "MIGRATION_PROXY_ACTIONS": "0x95031d7f4484064a3b3959608fd6318d565ee2f3",
+  "MULTICALL": "0xea2b4ac499e7c58e9bd0ca3a1f4985528a084196",
+  "OMG": "0xad00bfbe1449dc824e8e764c6c70f454dd5ea13e",
+  "PIP_BAT": "0x7cced1c393b2bed3672ab5bd35f5c4f997eff4c1",
+  "PIP_DGD": "0x92c2bb19ad9b1be12272b91e2cf4d7f6a951562f",
+  "PIP_ETH": "0xaee606425521914703c392649498c05b136d0fd4",
+  "PIP_GNT": "0xc354a7ab8e643442a262b8205b1a4de38041338a",
+  "PIP_OMG": "0x6628b470bd068c2210d7791e88081f8cc5545c44",
+  "PIP_REP": "0xa2aa41d73d2c42eeb45f9e6de784f6ead965eb3e",
+  "PIP_SAI": "0x5e85cf8af9ff7ca9c44931791c7df54e5426f1ff",
+  "PIP_ZRX": "0xb935b1d1bc75be91ad1ccaf5e3a7105614fad8c3",
+  "PROXY_ACTIONS": "0x60c175ebce7a23862f972faaf652e06a30f57378",
+  "PROXY_ACTIONS_DSR": "0xe9afe04e0118268c7dbb7e04a8e0cc5edef8270f",
+  "PROXY_ACTIONS_END": "0x83a3619324c2cbc0177fb8d9b21da98aeb99f613",
+  "PROXY_DEPLOYER": "0x1e4d1faafdf554ea7b4c8c90af44d8799ff001cc",
+  "PROXY_FACTORY": "0xe7dad9d83fcdbe918def05f9ba742cc4b67c05b0",
+  "PROXY_PAUSE_ACTIONS": "0x4b8133a16a4651d50b20479052e597c9867f33e3",
+  "PROXY_REGISTRY": "0xd21ecf795a003d24680cfa58582d72b25e7edb26",
+  "REP": "0x8b11f5465855b64143cc79e2906f23167426057f",
+  "SAI": "0x5cbdcaab240f12b9aa508678d668b66f3c3db331",
+  "SAI_TUB": "0xd8c827ba025da40f53aa1a8668611f6a947b38cc",
+  "VAL_BAT": "0x7cced1c393b2bed3672ab5bd35f5c4f997eff4c1",
+  "VAL_DGD": "0x92c2bb19ad9b1be12272b91e2cf4d7f6a951562f",
+  "VAL_ETH": "0xaee606425521914703c392649498c05b136d0fd4",
+  "VAL_GNT": "0xc354a7ab8e643442a262b8205b1a4de38041338a",
+  "VAL_OMG": "0x6628b470bd068c2210d7791e88081f8cc5545c44",
+  "VAL_REP": "0xa2aa41d73d2c42eeb45f9e6de784f6ead965eb3e",
+  "VAL_ZRX": "0xb935b1d1bc75be91ad1ccaf5e3a7105614fad8c3",
+  "VOTE_PROXY_FACTORY": "0x5b66ba98000ae9205a88d45c76294e683c1791e5",
+  "ZRX": "0x6c341019ad5bd53cb848d0e16141716423ea8abe"
 }
diff --git a/packages/dai-plugin-migrations/contracts/addresses/testnet.json b/packages/dai-plugin-migrations/contracts/addresses/testnet.json
index fb18d969b..3fb1cd580 100644
--- a/packages/dai-plugin-migrations/contracts/addresses/testnet.json
+++ b/packages/dai-plugin-migrations/contracts/addresses/testnet.json
@@ -1,13 +1,15 @@
 {
-  "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",
-  "OLD_CHIEF": "0xe50ff8544b50e2e0f25cab27bc85a7a905d5671a",
-  "OLD_VOTE_PROXY_FACTORY": "0x17d4edea99fad126ce0b3ed46646587d067f4f8c"
+  "TUB": "0xd8c827ba025da40f53aa1a8668611f6a947b38cc",
+  "GET_CDPS_1": "0x0a8096156b9d85eaa6217270eaa50ae2ca0e608c",
+  "CDP_MANAGER_1": "0x5745e320b40ce83439e979ac5d0f5bf2e363886b",
+  "MCD_END_1": "0xf179ccbc17d581b6fb06295da9ae71318aa85fe4",
+  "MCD_VAT_1": "0xac398d6a93df1d65acf69b4d4a5d4d6290fb8f35",
+  "MCD_DAI_1": "0x18a78e3e313bb0ce434a4370b7428c31f9166691",
+  "MCD_POT_1": "0xac42032fd6bc5e3abd545bb710ed81085d5d8288",
+  "REDEEMER": "0xd1acd5e48908951dc1bfb57af97d2f79ff540b42",
+  "OLD_MKR": "0x134afbc51f0d527bdeae8193d40212d9ac523909",
+  "OLD_CHIEF": "0x44402c1d19b7ee936d6b93e57eebea8bf76832c5",
+  "OLD_VOTE_PROXY_FACTORY": "0x17d4edea99fad126ce0b3ed46646587d067f4f8c",
+  "MIGRATION": "0x8c544c7a6234ec1d6dba6aa10781c7ce5c51626a",
+  "MIGRATION_PROXY_ACTIONS": "0x95031d7f4484064a3b3959608fd6318d565ee2f3"
 }
diff --git a/packages/dai/contracts/addresses/testnet.json b/packages/dai/contracts/addresses/testnet.json
index bfaed1756..97f441527 100644
--- a/packages/dai/contracts/addresses/testnet.json
+++ b/packages/dai/contracts/addresses/testnet.json
@@ -1,30 +1,30 @@
 {
   "ETH_FROM": "0x16fb96a5fa0427af0c8f7cf1eb4870231c8154b6",
-  "GEM": "0x140041885a385929f73e2ff9dc220a5729852cca",
-  "GOV": "0xe8608ec3d229f578bed5b405d1e04bc2a0bb65e8",
-  "PIP": "0x36229df0f0cb1a154b1eb4ec042e448fa9f88a3a",
-  "PEP": "0xb202db1c27e0a13cc773f9d8be9725364de9578d",
+  "GEM": "0xa6090d1da37cf87de7f0819527a4407ddac91c3d",
+  "GOV": "0x4b4bebfc5fc00ece877b738206edcfd9845760b2",
+  "PIP": "0x13b4413a7a9ee2530ddce32d924a0c5f45472ccd",
+  "PEP": "0xcfab8cb9a7cf6eb4b85df01c82b4581e634a249c",
   "PIT": "0x0000000000000000000000000000000000000123",
-  "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",
-  "MULTICALL": "0x6dbff82b7b650ac3892dde048456804e5c1a7a47"
+  "ADM": "0xc9f97e2f3567f57f81c9527cacf659427abbda01",
+  "SAI": "0x5cbdcaab240f12b9aa508678d668b66f3c3db331",
+  "SIN": "0x5ab392a5bc63f611c79b7b56269781e8d4859930",
+  "SKR": "0x35adabc57cfec60e520f09fc0d82bf20afe7c8fc",
+  "DAD": "0xe2bf0cd1850956fcd2c64336dd57f9d8cd560a88",
+  "MOM": "0x35cdb9882366e8bc8829795d5dbbd822a04bfcc3",
+  "VOX": "0xd3279dbffaa2be66c8c10fc2bf73333a2f06efa1",
+  "TUB": "0xd8c827ba025da40f53aa1a8668611f6a947b38cc",
+  "TAP": "0xb74d0bc68a941d16668b53455ac791fb93aea698",
+  "TOP": "0x1459142205ab53ea838e68d08965b065fa27849b",
+  "MAKER_OTC": "0xcfc50f67469d750c58684f39c477c08ab7768b36",
+  "PROXY_REGISTRY": "0xa7d07da26518393c6991fa8c07a9da9689e3dc64",
+  "DS_PROXY": "0xda135e68ac0f280fa1d1646a30ad9fa88d3cfee9",
+  "SAI_PROXY": "0x52c092eddcdb6be4742e30447d2dd34dc3286390",
+  "OASIS_PROXY": "0xb6658f6d3d4d90dff3ea146943fa150074b33db2",
+  "REDEEMER": "0xd1acd5e48908951dc1bfb57af97d2f79ff540b42",
+  "OLD_MKR": "0x134afbc51f0d527bdeae8193d40212d9ac523909",
+  "OLD_CHIEF": "0x44402c1d19b7ee936d6b93e57eebea8bf76832c5",
+  "OLD_IOU": "0xfbe9b602c9ec4ea2a1147ba40064bc7db64a1aed",
+  "POLLING": "0x082bdef4a5dff91e3fb57d8075b140942ffb58ad",
+  "OLD_VOTE_PROXY_FACTORY": "0x8ec28ae5fd36686a237ab87c776dc69019d70bda",
+  "MULTICALL": "0xea2b4ac499e7c58e9bd0ca3a1f4985528a084196"
 }
diff --git a/yarn.lock b/yarn.lock
index 8358944cd..d67911367 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1704,10 +1704,10 @@
     lodash "^4.17.11"
     ws "^7.2.0"
 
-"@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==
+"@makerdao/testchain@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.0.4.tgz#83551d3c761dc46846a74dfe41d0ba58843c6849"
+  integrity sha512-1n++P1AOMbvZ8X2t6lkqUu09/wFfG05Ml09DIlbpdM7+R4AMZzbKb0rZQxW5fZoCDBrWCi3cJygBE+Hr1V0OiA==
   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: