Merge pull request #235 from makerdao/v1.0.6

v1.0.6

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.1.5",
+    "@makerdao/testchain": "^1.1.8",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.5",

packages/dai-plugin-governance/contracts/addresses/testnet.json

@@ -1,10 +1,10 @@
 {
   "GOV": "0x1c3ac7216250edc5b9daa5598da0579688b9dbd5",
-  "IOU": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF",
-  "CHIEF": "0x00ED8CcEF5351aF14aa6214e6153c39a5e1d1528",
+  "IOU": "0x04De75eD338D41D2E901bf703179D1049883aF5b",
+  "CHIEF": "0xd97fd1B5867cC71AfA32A0c36d38102241856Cde",
   "POLLING": "0x9A2810a12197CB844af4BA74a4b81bC1CA727130",
-  "VOTE_PROXY_FACTORY": "0x9d0C1845c18bD93FB3514705715AAc54FB2135dd",
-  "MCD_ESM": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43",
-  "MCD_END": "0xb002A319887185e56d787A5c90900e13834a85E3",
+  "VOTE_PROXY_FACTORY": "0x17c7D82597A3a07AEd1FDF1db560B7502AeB3ADf",
+  "MCD_ESM": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511",
+  "MCD_END": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43",
   "PAUSE": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43"
 }

packages/dai-plugin-governance/scripts/install-testchain-outputs.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-CWD=`dirname $0`
-CONTRACTS=$CWD/../contracts
-SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain}
+CONTRACTS=$GOVERNANCE/contracts
 
 CHIEF=`jq ".MCD_ADM" "$SOURCE/out/addresses-mcd.json"`
 jq ".CHIEF=$CHIEF" $CONTRACTS/addresses/testnet.json > testnet.tmp && mv testnet.tmp $CONTRACTS/addresses/testnet.json
@@ -16,7 +14,7 @@ POLLING=`jq ".POLLING" "$SOURCE/out/addresses.json"`
 jq ".POLLING=$POLLING" $CONTRACTS/addresses/testnet.json > testnet.tmp && mv testnet.tmp $CONTRACTS/addresses/testnet.json
 cp $SOURCE/out/PollingEmitter.abi $CONTRACTS/abis/Polling.json
 
-GOV=`jq ".GOV" "$SOURCE/out/addresses.json"`
+GOV=`jq ".SAI_GOV" "$SOURCE/out/addresses.json"`
 jq ".GOV=$GOV" $CONTRACTS/addresses/testnet.json > testnet.tmp && mv testnet.tmp $CONTRACTS/addresses/testnet.json
 
 for CONTRACT in "VOTE_PROXY_FACTORY","VoteProxyFactory" "MCD_ESM","ESM" "MCD_END","End"

packages/dai-plugin-mcd/contracts/addresses/testnet.json

@@ -1,100 +1,95 @@
 {
-  "BAT": "0x120A978e83BEeac3DBBB856b35941618A52986d5",
-  "CDP_MANAGER": "0xb3dc8De316349D8cE5168FE33C2E75c4f0cd0FFE",
+  "BAT": "0xEB9d9336b4A89260bC4B94ee6a34e2faF46B0CA5",
+  "CDP_MANAGER": "0xAE3AFb153a36d3E48D4CbC2D0A83EBF9fD2f89Ca",
   "DEPLOYER": "0x16Fb96a5fa0427Af0C8F7cF1eB4870231c8154B6",
-  "DGD": "0xfFE1912a78AA9E556cC80a4F3822551F5bB1A119",
+  "DGD": "0x4aF6E9FA188161FD283DC8d51619615d00ef3F01",
+  "DSR_MANAGER": "0x2B0B998110C0038336a8d5609c4E3A0AC35Af0f4",
   "ETH": "0x7ba25F791FA76C3ef40AC98ed42634a8bC24c238",
-  "FAUCET": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4",
-  "FLIPPER_MOM": "0xd7e93C4B43A55fe3DbEBe4c89991769d01c3E76d",
-  "GET_CDPS": "0x883c76966eA1D1AFEC54a1c20f84A57a287BB021",
-  "GNT": "0x2D1E17cD66E68173d2a6DCaCcf640ce613D75983",
-  "MCD_ADM": "0x00ED8CcEF5351aF14aa6214e6153c39a5e1d1528",
-  "MCD_CAT": "0x36fdda9B5DAbdDA030598116D09f1E1c6bB1DeaB",
-  "MCD_DAI": "0x88015F50fb5b2bB1aBF8a9C3e1Db231E267b5C4f",
-  "MCD_DEPLOY": "0x3ea503Fb236e6eE3B4d48b6Bd96Ba5F7Cf68AF94",
-  "MCD_END": "0xb002A319887185e56d787A5c90900e13834a85E3",
-  "MCD_ESM": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43",
-  "MCD_FLAP": "0x2A92CCF051f33912115f86eA0530f4999E3AC1Ac",
-  "MCD_FLIP_BAT_A": "0x25ff5F18C0b2e00749bcd564B0a8519B75d46Ed8",
-  "MCD_FLIP_DGD_A": "0x4add0e51f43f43A1930316c036157d86c0A36B9D",
-  "MCD_FLIP_ETH_A": "0xBDe07Bb0c774f41a59901876454637E3FeAB8C73",
-  "MCD_FLIP_ETH_B": "0xC928B33616df7b603879247b8BAfbF12b5a645A7",
-  "MCD_FLIP_ETH_C": "0x26953EeA2F75430AD336Fa5e6385659CF085621b",
-  "MCD_FLIP_GNT_A": "0xbA84F99DF52445073c24F71337C2aC10d16A12Df",
-  "MCD_FLIP_OMG_A": "0x7E1dce941eDf0172D564e9f9da2453039A41aAa3",
-  "MCD_FLIP_REP_A": "0xcad20ff35c9F2803eAB7324bf41DD3931349b077",
-  "MCD_FLIP_SAI": "0x8Fcc971E5F73e2F8e40313C16Ad17AD10696f01C",
-  "MCD_FLIP_USDC_A": "0xb957a5d4113eC015AF73796099e6654d66A6115e",
-  "MCD_FLIP_WBTC_A": "0x65CAFd3a6eAefA22d503adb48dd2e0811e945600",
-  "MCD_FLIP_ZRX_A": "0x4d1B37D96ab3B54d8Ada05A17D649a8e7fA6Bf0e",
-  "MCD_FLOP": "0x19E602E0dC93749Ea7aFa0C88F4693d4C02102D3",
+  "FAUCET": "0x5e73B1F57f673EC875C1624D7C13F06Ef8259b23",
+  "FLIPPER_MOM": "0x061a2B2662AC2C1AAfe9b39Fc6e4c6730e01bE5E",
+  "GET_CDPS": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "GNT": "0x49058F4F6c8C3E1b75aeD7AA45e06c439b9429f0",
+  "MCD_ADM": "0xd97fd1B5867cC71AfA32A0c36d38102241856Cde",
+  "MCD_CAT": "0x88015F50fb5b2bB1aBF8a9C3e1Db231E267b5C4f",
+  "MCD_DAI": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6",
+  "MCD_DEPLOY": "0x72b59ACcB5a9a9e47296fbeF741bF2Bc82FFDE62",
+  "MCD_END": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43",
+  "MCD_ESM": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511",
+  "MCD_FLAP": "0x19E602E0dC93749Ea7aFa0C88F4693d4C02102D3",
+  "MCD_FLIP_BAT_A": "0x8f28BB6447368AD9eBAD0Da79703Dba3c338bb10",
+  "MCD_FLIP_DGD_A": "0xdE5D18140244ECF90aADb6460239446fC8226D65",
+  "MCD_FLIP_ETH_A": "0xCe1410e4b98058fA7534FA8fcEe28E82056EB0e9",
+  "MCD_FLIP_ETH_B": "0x80ba561ED1D06A53A2f5c3A50dEf17Fac48f4466",
+  "MCD_FLIP_ETH_C": "0x2697faB781b68640B1A98A8E080EAeA639dAB7bE",
+  "MCD_FLIP_GNT_A": "0x3aefde6f900E8841A99844e365D95Bfd62D7C5e9",
+  "MCD_FLIP_OMG_A": "0xA418bBE1E7f8DFC2D78C4b7E36Cf100d53A62D23",
+  "MCD_FLIP_REP_A": "0x40F7ED727Cc7E76f2Ab91Ca6648e1Ea8C33608DA",
+  "MCD_FLIP_TUSD_A": "0xD6D91193dC275945208Dc3D79716d9C2E9c95249",
+  "MCD_FLIP_USDC_A": "0xBfa1975B1DBB70cf96340142d5D88686096956DC",
+  "MCD_FLIP_USDC_B": "0x5Ffcf6974C8C3447aDD56Bc0049CDb817bD87559",
+  "MCD_FLIP_WBTC_A": "0xA156b084cb4882d5F224F21E8051FFF18347dDE7",
+  "MCD_FLIP_ZRX_A": "0xe3a6Bdb923Eb4542C96db93307213C4e79cdF822",
+  "MCD_FLOP": "0xBDe07Bb0c774f41a59901876454637E3FeAB8C73",
   "MCD_GOV": "0x1c3ac7216250eDC5B9DaA5598DA0579688b9dbD5",
-  "MCD_GOV_ACTIONS": "0x5d2132779D43A0B64F1f3e824B8A3163438358e8",
-  "MCD_IOU": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF",
-  "MCD_JOIN_BAT_A": "0xEB9d9336b4A89260bC4B94ee6a34e2faF46B0CA5",
-  "MCD_JOIN_DAI": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6",
-  "MCD_JOIN_DGD_A": "0x4aF6E9FA188161FD283DC8d51619615d00ef3F01",
-  "MCD_JOIN_ETH_A": "0xF7Cbc73FE7d30c68AD7b64D293D4F52F76027261",
-  "MCD_JOIN_ETH_B": "0x6741A0FECce6ecbf7C1f338dE624F63d970497EA",
-  "MCD_JOIN_ETH_C": "0xF2ea44B10D559c7bcBf156861efFd3425fb5E5Fb",
-  "MCD_JOIN_GNT_A": "0x49058F4F6c8C3E1b75aeD7AA45e06c439b9429f0",
-  "MCD_JOIN_OMG_A": "0x927F29F213c691ACe67cBC9FDb6eBBfd04D07EC4",
-  "MCD_JOIN_REP_A": "0xDC901A38a2Ec3283556F039b115423049517B50c",
-  "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06",
-  "MCD_JOIN_USDC_A": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5",
-  "MCD_JOIN_WBTC_A": "0x23c9aafE0d1968EaC6d9F1edb9FA831641783FEd",
-  "MCD_JOIN_ZRX_A": "0xc677d837a437c24Db14E1225416d52BcC9B86E94",
-  "MCD_JUG": "0x8D68d36D45A34A6Ff368069bD0baa32ad49A6092",
-  "MCD_PAUSE": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511",
-  "MCD_PAUSE_PROXY": "0xB8065F28CbAf91C2674a980c17432821bC3E8F4a",
-  "MCD_POT": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e",
-  "MCD_SPOT": "0xCe1410e4b98058fA7534FA8fcEe28E82056EB0e9",
-  "MCD_VAT": "0xF2Cba62837A52B0c1847f225438C82D050b4aC19",
-  "MCD_VOW": "0x8C4Be23DE45F82a4feC7a93F69929Bd2A13A4777",
-  "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
-  "MIGRATION_PROXY_ACTIONS": "0x19BDC4b950285a608E50F3b5E7DF154FacBda861",
-  "MULTICALL": "0x298E3eb3C76938DA922EF01b99c87dF156985701",
-  "OMG": "0x64ED8f151dAc0f40f45DaccEBa2f2712641A9B50",
-  "OSM_MOM": "0x378100E78ccEf442F38f1FcFdc4B4352884bcb67",
+  "MCD_GOV_ACTIONS": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF",
+  "MCD_IOU": "0x04De75eD338D41D2E901bf703179D1049883aF5b",
+  "MCD_JOIN_BAT_A": "0x8752bdE45da8B2665CD36754A39FD5cc82F0AD05",
+  "MCD_JOIN_DAI": "0x2A92CCF051f33912115f86eA0530f4999E3AC1Ac",
+  "MCD_JOIN_DGD_A": "0xb782CEe543F1a9A0724F32731f53DcdD198C2695",
+  "MCD_JOIN_ETH_A": "0x71ce2f5A1ee392425B749956f9B58481A7c6b707",
+  "MCD_JOIN_ETH_B": "0x61aFcbadDfeEFE7155416248cB51511d73b94e42",
+  "MCD_JOIN_ETH_C": "0xE9658D1356890E06987C2D769B7d76cAedBcFf4b",
+  "MCD_JOIN_GNT_A": "0xA5DD0E5906fAc83862581C5DCA85CF926ABFa09b",
+  "MCD_JOIN_OMG_A": "0x666866f71a978f119acEc358543c1E72FC27637d",
+  "MCD_JOIN_REP_A": "0xEc93D8Ea996Da9Ffe359778F3DaE6134DF0de016",
+  "MCD_JOIN_TUSD_A": "0x689E9DC3214aC88F312FdD148684BF199cCF596c",
+  "MCD_JOIN_USDC_A": "0x8a339ADa3b96d6139BBDCe3Bd0375725Fc411133",
+  "MCD_JOIN_USDC_B": "0xcf4a441593Fbf1Bf56960674C5a3a18049C7bbe2",
+  "MCD_JOIN_WBTC_A": "0x6C0604d4b3EBB76DBA48cC0B5a54Bd0f260d962c",
+  "MCD_JOIN_ZRX_A": "0x2a5F3e35aBA017435b3c8A66F64da3509a6A71Ec",
+  "MCD_JUG": "0x8C4Be23DE45F82a4feC7a93F69929Bd2A13A4777",
+  "MCD_PAUSE": "0x9F3CEceFEb8bCCEd859A983cB3A9b4DA65D79bD1",
+  "MCD_PAUSE_PROXY": "0xB68fbD349C6810a96a4cA1035e6Afb29CC10e401",
+  "MCD_POT": "0xb002A319887185e56d787A5c90900e13834a85E3",
+  "MCD_SPOT": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e",
+  "MCD_VAT": "0x8D68d36D45A34A6Ff368069bD0baa32ad49A6092",
+  "MCD_VOW": "0x36fdda9B5DAbdDA030598116D09f1E1c6bB1DeaB",
+  "MULTICALL": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4",
+  "OMG": "0x927F29F213c691ACe67cBC9FDb6eBBfd04D07EC4",
+  "OSM_MOM": "0x296D06095288397615E024AfF4FeCc0C57edF70B",
   "PIP_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc",
   "PIP_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053",
   "PIP_ETH": "0x2B2fBfcA02F8C29c750ed193828b40887e8BBb32",
   "PIP_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8",
   "PIP_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733",
   "PIP_REP": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A",
-  "PIP_SAI": "0x8A74211B5fC144A846fD1daA4dC8ABbB6268E18f",
+  "PIP_TUSD": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A",
   "PIP_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7",
-  "PIP_WBTC": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A",
+  "PIP_WBTC": "0x298E3eb3C76938DA922EF01b99c87dF156985701",
   "PIP_ZRX": "0x80f178c7b47cb635Ceb12aBB891338744e98365C",
-  "PROXY_ACTIONS": "0x0E69131732c7700d5d598350504ba885D677CCA8",
-  "PROXY_ACTIONS_DSR": "0xE425CA42d0CB22D0D82366f6B811d559cff437B4",
-  "PROXY_ACTIONS_END": "0x5E6085775Cd0B41fC70d1A6B48a0451bf7aCa801",
-  "PROXY_DEPLOYER": "0xde78bC0e2a1C5118773b692F5ed999f3B626F1AF",
-  "PROXY_FACTORY": "0x5e73B1F57f673EC875C1624D7C13F06Ef8259b23",
-  "PROXY_PAUSE_ACTIONS": "0xAE130aEcdF43abbEfdBb97D87bA8Ea38f922CcD8",
-  "PROXY_REGISTRY": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
-  "REP": "0xC3e78EA1b93D134f795c84e01caa2966f2180892",
-  "SAI": "0xC226F3CD13d508bc319F4f4290172748199d6612",
-  "SAI_TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761",
-  "USDC": "0xDa4EbE73ff9e11FC6f97cEf200199Ddb385d7982",
+  "PROXY_ACTIONS": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06",
+  "PROXY_ACTIONS_DSR": "0xE6666822E10D3c5c33726Ea732506AaA50Ea0C88",
+  "PROXY_ACTIONS_END": "0x9dFCC19cc49f9961020a152629Db481F12b6b4Ba",
+  "PROXY_DEPLOYER": "0xe502f772B4303dD6ae8A7A0167c38C8dc9BeA922",
+  "PROXY_FACTORY": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
+  "PROXY_PAUSE_ACTIONS": "0x00ED8CcEF5351aF14aa6214e6153c39a5e1d1528",
+  "PROXY_REGISTRY": "0xc6c39b56d3dafcb213b4344D54e70E232b10ca48",
+  "REP": "0xDC901A38a2Ec3283556F039b115423049517B50c",
+  "TUSD": "0x7581e647b7b5d522B198EF44F51E1121b3D837B0",
+  "USDC": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5",
   "VAL_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc",
   "VAL_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053",
   "VAL_ETH": "0x2B2fBfcA02F8C29c750ed193828b40887e8BBb32",
   "VAL_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8",
   "VAL_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733",
   "VAL_REP": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A",
+  "VAL_TUSD": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A",
   "VAL_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7",
-  "VAL_WBTC": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A",
+  "VAL_WBTC": "0x298E3eb3C76938DA922EF01b99c87dF156985701",
   "VAL_ZRX": "0x80f178c7b47cb635Ceb12aBB891338744e98365C",
-  "VOTE_PROXY_FACTORY": "0x9d0C1845c18bD93FB3514705715AAc54FB2135dd",
-  "WBTC": "0xcf4a441593Fbf1Bf56960674C5a3a18049C7bbe2",
-  "ZRX": "0xb13094D7341fA2F77aD8a5eD61A9bB7cF9F62093",
-
-  "MCD_JOIN_USDC_B": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5",
-  "MCD_FLIP_USDC_B": "0xb957a5d4113eC015AF73796099e6654d66A6115e",
-  "TUSD": "0xDa4EbE73ff9e11FC6f97cEf200199Ddb385d7982",
-  "PIP_TUSD": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7",
-  "MCD_JOIN_TUSD_A": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5",
-  "MCD_FLIP_TUSD_A": "0xb957a5d4113eC015AF73796099e6654d66A6115e"
-
+  "VOTE_PROXY_FACTORY": "0x17c7D82597A3a07AEd1FDF1db560B7502AeB3ADf",
+  "WBTC": "0x2A3a2f87403d675748eb11B6fCe92a16A0084eb6",
+  "ZRX": "0xc677d837a437c24Db14E1225416d52BcC9B86E94",
+  "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06"
 }

packages/dai-plugin-mcd/scripts/install-testchain-outputs.sh

@@ -1,14 +1,20 @@
 #!/usr/bin/env bash
 set -e
 
-# TODO take the source directory as a parameter
-
-CWD=`dirname $0`
-CONTRACTS=$CWD/../contracts
-SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain}
+CONTRACTS=$MCD/contracts
 
 for file in $SOURCE/out/mcd/*.abi; do
   cp $file $CONTRACTS/abis/$(basename $file .abi).json
 done
 
-cp $SOURCE/out/addresses-mcd.json $CONTRACTS/addresses/testnet.json
+PACKAGE_ADDRESSES=$CONTRACTS/addresses/testnet.json
+cp $SOURCE/out/addresses-mcd.json $PACKAGE_ADDRESSES
+
+# These contracts are no longer supported, but dummy addresses
+# must still be set to prevent errors when fetching event history
+DEPRECATED_CONTRACTS=$MCD/test/contracts/deprecatedContracts.json
+MIGRATION=$(cat $DEPRECATED_CONTRACTS | jq '.MIGRATION')
+MCD_JOIN_SAI=$(cat $DEPRECATED_CONTRACTS | jq '.MCD_JOIN_SAI')
+cat $PACKAGE_ADDRESSES | jq_inplace ".MIGRATION = $(echo $MIGRATION)" $PACKAGE_ADDRESSES
+cat $PACKAGE_ADDRESSES | jq_inplace ".MCD_JOIN_SAI = $(echo $MCD_JOIN_SAI)" $PACKAGE_ADDRESSES
+

packages/dai-plugin-mcd/test/contracts/deprecatedContracts.json

@@ -0,0 +1,4 @@
+{
+  "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06"
+}

packages/dai-plugin-migrations/contracts/addresses/testnet.json

@@ -1,23 +1,24 @@
 {
   "TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761",
   "TAP": "0x6896659267c3c9fd055d764327199a98e571e00d",
-  "GET_CDPS_1": "0x883c76966eA1D1AFEC54a1c20f84A57a287BB021",
-  "CDP_MANAGER_1": "0xb3dc8De316349D8cE5168FE33C2E75c4f0cd0FFE",
-  "MCD_END_1": "0xb002A319887185e56d787A5c90900e13834a85E3",
-  "MCD_VAT_1": "0xF2Cba62837A52B0c1847f225438C82D050b4aC19",
-  "MCD_DAI_1": "0x88015F50fb5b2bB1aBF8a9C3e1Db231E267b5C4f",
-  "MCD_POT_1": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e",
+  "GET_CDPS_1": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "CDP_MANAGER_1": "0xAE3AFb153a36d3E48D4CbC2D0A83EBF9fD2f89Ca",
+  "MCD_END_1": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43",
+  "MCD_VAT_1": "0x8D68d36D45A34A6Ff368069bD0baa32ad49A6092",
+  "MCD_DAI_1": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6",
+  "MCD_POT_1": "0xb002A319887185e56d787A5c90900e13834a85E3",
   "REDEEMER": "0x2DaF1c09275B0b72277909377Eb20CCf10eFA02E",
   "OLD_MKR": "0xa3bFc24194007416fa73fC6E3A7D3B245f647d6E",
   "OLD_CHIEF": "0x1d24598fa8B77811E68243A2746CC553E68ca03B",
   "OLD_VOTE_PROXY_FACTORY": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC",
   "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
-  "MIGRATION_PROXY_ACTIONS": "0x19BDC4b950285a608E50F3b5E7DF154FacBda861",
-  "PROXY_ACTIONS_END": "0x5E6085775Cd0B41fC70d1A6B48a0451bf7aCa801",
-  "MCD_JOIN_ETH_A": "0xF7Cbc73FE7d30c68AD7b64D293D4F52F76027261",
-  "MCD_JOIN_DAI": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6",
-  "MCD_JOIN_BAT_A": "0xEB9d9336b4A89260bC4B94ee6a34e2faF46B0CA5",
-  "MCD_JOIN_USDC_A": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5",
+  "MIGRATION_PROXY_ACTIONS": null,
+  "PROXY_ACTIONS_END": "0x9dFCC19cc49f9961020a152629Db481F12b6b4Ba",
+  "MCD_JOIN_ETH_A": "0x71ce2f5A1ee392425B749956f9B58481A7c6b707",
+  "MCD_JOIN_DAI": "0x2A92CCF051f33912115f86eA0530f4999E3AC1Ac",
+  "MCD_JOIN_BAT_A": "0x8752bdE45da8B2665CD36754A39FD5cc82F0AD05",
+  "MCD_JOIN_USDC_A": "0x8a339ADa3b96d6139BBDCe3Bd0375725Fc411133",
   "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48",
-  "MCD_ESM": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43"
+  "MCD_ESM": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511",
+  "SAI_TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761"
 }

packages/dai-plugin-migrations/scripts/install-testchain-outputs.sh

@@ -1,14 +1,10 @@
 #!/usr/bin/env bash
 set -e
 
-# TODO take the source directory as a parameter
-
-CWD=`dirname $0`
-CONTRACTS=$CWD/../contracts
-SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain}
+CONTRACTS=$MIGRATIONS/contracts
 
 # Relevant contracts from SCD:
-for CONTRACT in "TUB","SaiTub" "REDEEMER","Redeemer" "OLD_MKR","DSToken" "OLD_CHIEF","DSChief" "SAI_CAGEFREE","CageFree" "OLD_VOTE_PROXY_FACTORY","VoteProxyFactory"
+for CONTRACT in "SAI_TUB","SaiTub" "REDEEMER","Redeemer" "OLD_MKR","DSToken" "OLD_CHIEF","DSChief" "SAI_CAGEFREE","CageFree" "OLD_VOTE_PROXY_FACTORY","VoteProxyFactory"
 do
   IFS=',' read NAME ABI <<< "${CONTRACT}"
   ADDRESS=`jq ".$NAME" "$SOURCE/out/addresses.json"`

packages/dai-plugin-migrations/test/MigrationService.spec.js

@@ -17,7 +17,7 @@ beforeAll(async () => {
   service = maker.service(ServiceRoles.MIGRATION);
 });
 
-test('can access migration contracts', async () => {
+xtest('can access migration contracts', async () => {
   const managerAddress = maker
     .service('smartContract')
     .getContract('CDP_MANAGER').address;

packages/dai-plugin-migrations/test/migrations/DaiToSai.spec.js

@@ -39,7 +39,7 @@ describe('DAI to SAI Migration', () => {
     expect((await migration.check()).eq(1)).toBeTruthy();
   });
 
-  test('execute migrates DAI to SAI', async () => {
+  xtest('execute migrates DAI to SAI', async () => {
     await drawSaiAndMigrateToDai(10, maker);
     const address = maker.service('web3').currentAddress();
     await maker.service('mcd:cdpManager').openLockAndDraw('ETH-A', ETH(1), 1);

packages/dai-plugin-migrations/test/migrations/SaiToDai.spec.js

@@ -39,7 +39,7 @@ describe('SAI to DAI Migration', () => {
     expect((await migration.check()).eq(1)).toBeTruthy();
   });
 
-  test('execute migrates SAI to DAI', async () => {
+  xtest('execute migrates SAI to DAI', async () => {
     const address = maker.service('web3').currentAddress();
     const proxy = await maker.service('proxy').ensureProxy();
     await maker.service('cdp').openProxyCdpLockEthAndDrawSai(0.1, 1, proxy);

packages/dai-plugin-migrations/test/migrations/SingleToMultiCdp.spec.js

@@ -67,12 +67,12 @@ describe('checks', () => {
     });
   });
 
-  test('if there is no sai locked in the mcd migration cdp, return 0', async () => {
+  xtest('if there is no sai locked in the mcd migration cdp, return 0', async () => {
     const saiLiquidity = await migration.migrationSaiAvailable();
     expect(saiLiquidity.toFixed('wei')).toBe('0');
   });
 
-  describe('with sai drawn', () => {
+  xdescribe('with sai drawn', () => {
     beforeEach(async () => {
       jest.setTimeout(20000);
       snapshotData = await takeSnapshot(maker);
@@ -109,7 +109,7 @@ describe('checks', () => {
   });
 });
 
-describe.each(['MKR'])('pay with %s', payment => {
+xdescribe.each(['MKR'])('pay with %s', payment => {
   let cdp, proxyAddress;
 
   beforeEach(async () => {

packages/dai-plugin-scd/contracts/addresses/testnet.json

@@ -27,5 +27,6 @@
   "POLLING": "0x9A2810a12197CB844af4BA74a4b81bC1CA727130",
   "OLD_VOTE_PROXY_FACTORY": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC",
   "LINE_SPELL": "0x26ea0dd33Aa37e15D95a9Ae166092a139Ad62013",
-  "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48"
+  "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48",
+  "MULTICALL": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4"
 }

packages/dai-plugin-scd/scripts/install-testchain-outputs.sh

@@ -1,14 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-CWD=`dirname $0`
-CONTRACTS=$CWD/../contracts
-SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain}
-
-function jq_inplace {
-  TMP=$(mktemp)
-  jq "$1" > $TMP && mv $TMP "$2"
-}
+CONTRACTS=$SCD/contracts
 
 for file in $SOURCE/out/*.abi; do
   cp $file $CONTRACTS/abis/$(basename $file .abi).json