Add MATIC and WSTETH to tokens (#308)

* update infura keys

* Add MATIC and WSTETH to tokens

* Add abi

* More contracts

* Add goerli to config factory

* Add temp testnet addresses

* Remove kovan from mcd config

* Try updated project id

* Add contracts to network config

* Delete old project id

* Liq test updates

* Switch test network

* Update tests and testnet addresses

* Retrigger

Co-authored-by: Phil Bain <[email protected]>

packages/dai-plugin-governance/package.json

@@ -36,7 +36,7 @@
     "ramda": "^0.25.0"
   },
   "peerDependencies": {
-    "@makerdao/dai": "^0.42.0"
+    "@makerdao/dai": "^0.42.2"
   },
   "devDependencies": {
     "@makerdao/dai-plugin-config": "^0.2.14-rc.1",

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

@@ -1,5 +1,228 @@
 {
-  "MCD_DOG": "0x970b3b28EBD466f2eC181630D4c3C93DfE280448",
+  "AAVE": "0x00ED8CcEF5351aF14aa6214e6153c39a5e1d1528",
+  "BAL": "0xe543f18a82bCEEEA6e0B19C15196582483b76a6d",
+  "BAT": "0x6B09a5b5Dc17eaa7D0B65bA898F58005A70736B5",
+  "CDP_MANAGER": "0x17c7D82597A3a07AEd1FDF1db560B7502AeB3ADf",
+  "CLIPPER_MOM": "0xaAE899cFDf60585F361135A55c954a3D52800533",
+  "COMP": "0x1Ed553FF89645FCDd55409Ae02462f1239f92511",
+  "DEPLOYER": "0x16Fb96a5fa0427Af0C8F7cF1eB4870231c8154B6",
+  "DGD": "0x6C0604d4b3EBB76DBA48cC0B5a54Bd0f260d962c",
+  "DSR_MANAGER": "0x23b8aD8B5B26351fD2C304aE23c8679Da03B9155",
+  "ETH": "0x7ba25F791FA76C3ef40AC98ed42634a8bC24c238",
+  "FAUCET": "0x50289fDAf1C8FE16E14fc28642a77C1A70943245",
+  "FLIPPER_MOM": "0x39028A393b3195262E54aA17928fa46f3FcCE58c",
+  "GET_CDPS": "0x70465b57f4948198330DF49e80cB0b7b4A8563e9",
+  "GNT": "0xdf3B1A36FF07CCCf5E61a60690Fc0170e238f499",
+  "GUSD": "0xBE0fe36494219EE23e42BFaaE77A5b48cF8c6E1C",
+  "ILK_REGISTRY": "0x14f7e74A26a0e6791523451d85129babf01cFd44",
+  "KNC": "0x061a2B2662AC2C1AAfe9b39Fc6e4c6730e01bE5E",
+  "LINK": "0x391e0c5B8bc5e2b7ABC12d330523C1D3e3F86ECE",
+  "LRC": "0x28DD44319c5a159f06AB5C5EE781760ee3200848",
+  "MANA": "0xe8F0f6067FA52572d6631517e9050C46769bEBf3",
+  "MATIC": "0xe8F0f6067FA52572d6631517e9050C46769bEBf3",
+  "WSTETH": "0xe8F0f6067FA52572d6631517e9050C46769bEBf3",
+  "MCD_ADM": "0xAe2f82b48f2C12bA5532879C4A718f8aAbF2f8E6",
+  "MCD_CAT": "0xc1F5856c066cfdD59D405DfCf1e77F667537bc99",
+  "MCD_CLIP_AAVE_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e",
+  "MCD_CLIP_AAVE_CALC_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e",
+  "MCD_CLIP_ETH_B": "0x31880D3A1E5cbF402b6F9840e7aDC6E7962b771B",
+  "MCD_CLIP_CALC_ETH_B": "0xb782CEe543F1a9A0724F32731f53DcdD198C2695",
+  "MCD_CLIP_ETH_C": "0x2aF0c08B3dBB9D81A1D9eBea320Fd2f48f54c5D1",
+  "MCD_CLIP_CALC_ETH_C": "0x0E8D43bd507798476c1053165F9C061F1E000A09",
   "MCD_CLIP_LINK_A": "0xA15f6Fd90F2696e2B1BFdEB7F64A509718CA0dB9",
-  "MCD_CLIP_YFI_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e"
+  "MCD_CLIP_CALC_LINK_A": "0x79E6093AC9894936D2F61A29Bd2fFff44A71C047",
+  "MCD_CLIP_YFI_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e",
+  "MCD_CLIP_CALC_YFI_A": "0x0380BeA5D02A686aa19C1A6b940FC2D0EEA14351",
+  "MCD_CLIP_MATIC_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e",
+  "MCD_CLIP_MATIC_CALC_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e",
+  "MCD_CLIP_WSTETH_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e",
+  "MCD_CLIP_WSTETH_CALC_A": "0x79Cd1ED9D1df3a84e0f5C2261Ce73c588277892e",
+  "MCD_DAI": "0xe53793CA0F1a3991D6bfBc5929f89A9eDe65da44",
+  "MCD_DEPLOY": "0xEc93D8Ea996Da9Ffe359778F3DaE6134DF0de016",
+  "MCD_DOG": "0x970b3b28EBD466f2eC181630D4c3C93DfE280448",
+  "MCD_END": "0x4A504460C1ea6c1945D07619B546e4629fd2A5dB",
+  "MCD_ESM": "0xBFD5ccf89494B6A4A98c525f4E97f57C44f32CEB",
+  "MCD_FLAP": "0xBfd57220780aB21112008C2296C09B3a10d7E2ad",
+  "MCD_FLASH": "0x5bEE1570475945c67499251D974f7aef2455a112",
+  "MCD_FLIP_AAVE_A": "0xA99454a0B81aA2575D88508D01A017cdf448aF38",
+  "MCD_FLIP_BAL_A": "0x48C6Dc5C6709272A3044E7f710FbCe29aA642e25",
+  "MCD_FLIP_BAT_A": "0x9c0ff10dB728ebf5DA896DEDC782bA58F9dF3D57",
+  "MCD_FLIP_COMP_A": "0xCFea08DcA81ac1c528DE5Ef950C9EF8f5Ed5a96B",
+  "MCD_FLIP_DGD_A": "0x8bb51BBc9A7d5041029CB2300b6d7894351315dE",
+  "MCD_FLIP_ETH_A": "0xA7fD71f86a79B9595Bc74dB12226E7298097581B",
+  "MCD_FLIP_GNT_A": "0x0B164D1b88Dd89a22B463238D7f91210B5FA6745",
+  "MCD_FLIP_GUSD_A": "0xb9b3A6a8Ef7eea66b5eC8f65bf77855F2028AF41",
+  "MCD_FLIP_KNC_A": "0xDfd8aF1CE06Af665c1C5Ec6cb99F81C951b476a9",
+  "MCD_FLIP_LRC_A": "0xc162fedaC22ACea1AEDb1FfCd3f728dE8C346948",
+  "MCD_FLIP_MANA_A": "0x14ddb2fec281E19849318f3ce2a51FdE0139C1f1",
+  "MCD_FLIP_MATIC_A": "0x14ddb2fec281E19849318f3ce2a51FdE0139C1f1",
+  "MCD_FLIP_WSTETH_A": "0x14ddb2fec281E19849318f3ce2a51FdE0139C1f1",
+  "MCD_FLIP_OMG_A": "0xc84b50Ea1cB3f964eFE51961140057f7E69b09c1",
+  "MCD_FLIP_PAXUSD_A": "0x609149777E830169f43F773f478e16DB0207B6eC",
+  "MCD_FLIP_RENBTC_A": "0x1bb4Fd4e72201b37Fa1f705B0A6E2b562b7ab64e",
+  "MCD_FLIP_REP_A": "0x76DECA04eA3bd6bCF2F7220aa849CC80ab1A4eef",
+  "MCD_FLIP_TUSD_A": "0x39ac8af65D275193538af30Bfe137744A613430a",
+  "MCD_FLIP_UNI_A": "0x36EED8eBB359e7019be02F183A8313a1385CE872",
+  "MCD_FLIP_USDC_A": "0x77b9cd0d79DF8dA228685bc6502042E46E67Ee59",
+  "MCD_FLIP_USDC_B": "0x8e32119f52c6c5c2e4Da5dB8700e1b8C49D10273",
+  "MCD_FLIP_USDT_A": "0x2Fbe303a869F3868E84AA67e2Df6823a802A0944",
+  "MCD_FLIP_WBTC_A": "0x4f36410DD60A7190bD4763b0F0462Addb8A78F50",
+  "MCD_FLIP_ZRX_A": "0x51E48Bcd93785271e3c5611f6ab15810bf293218",
+  "MCD_FLOP": "0xbacD4966540aAF7223CC9DC39a3ea1E4322Aba78",
+  "MCD_GOV": "0x1c3ac7216250eDC5B9DaA5598DA0579688b9dbD5",
+  "MCD_GOV_ACTIONS": "0x639146631B329Dd28f71e0a9E5bC1b080943a3D4",
+  "MCD_IAM_AUTO_LINE": "0x191c015d683F3c5A2f70234b3780863fb200FB69",
+  "MCD_IOU": "0x9fb9B0CCb0b6bcA8ff7667c1c1733F4469e27Af1",
+  "MCD_JOIN_AAVE_A": "0x20EB41099150cF92A0576409520b72a0AD870c75",
+  "MCD_JOIN_BAL_A": "0xbCaf9D36e65DfB2f098986D7e35420539EDe50E4",
+  "MCD_JOIN_BAT_A": "0xdB8848ea69cCE3f7f41949D274899641e558cDf4",
+  "MCD_JOIN_COMP_A": "0xDBb349cbFB22540B90995298CE3909Dd4Fa2C75d",
+  "MCD_JOIN_DAI": "0xd34835EaE60dA418abfc538B7b55332fC5F10340",
+  "MCD_JOIN_DGD_A": "0xd324BC539B85e6DFe08005c4D261d0ff22b0A34C",
+  "MCD_JOIN_ETH_A": "0x1fD87e7ddF2A2f22ac5fb8F617A44214f17B883c",
+  "MCD_JOIN_ETH_B": "0x4aF6E9FA188161FD283DC8d51619615d00ef3F01",
+  "MCD_JOIN_ETH_C": "0xA5DD0E5906fAc83862581C5DCA85CF926ABFa09b",
+  "MCD_JOIN_GNT_A": "0xfEB7149A008b52581F31717Fad5C5A23ea28cAE4",
+  "MCD_JOIN_GUSD_A": "0x2006CAA6901322b195e27aC007d2de1C09B7f19E",
+  "MCD_JOIN_KNC_A": "0x15ed0b56FC19773832011Da89118c3dd41072091",
+  "MCD_JOIN_LINK_A": "0x453085B32e086994492706b8222fee21E8A098A3",
+  "MCD_JOIN_LRC_A": "0xa26B57185e56375dd20225aDcEbd00d7e82681e4",
+  "MCD_JOIN_MANA_A": "0x6261bc3816Fa6A15dAcC68ff06baB082905f06bC",
+  "MCD_JOIN_MATIC_A": "0x6261bc3816Fa6A15dAcC68ff06baB082905f06bC",
+  "MCD_JOIN_WSTETH_A": "0x6261bc3816Fa6A15dAcC68ff06baB082905f06bC",
+  "MCD_JOIN_OMG_A": "0x7581e647b7b5d522B198EF44F51E1121b3D837B0",
+  "MCD_JOIN_PAXUSD_A": "0xe1131FBFF225FfC0ebdc4233852fdC415e4d2B6b",
+  "MCD_JOIN_RENBTC_A": "0x12F30DFCdCB82B7AAE11513fFcc290EbbdF97124",
+  "MCD_JOIN_REP_A": "0xcf4a441593Fbf1Bf56960674C5a3a18049C7bbe2",
+  "MCD_JOIN_TUSD_A": "0x8A74211B5fC144A846fD1daA4dC8ABbB6268E18f",
+  "MCD_JOIN_UNI_A": "0x5d2132779D43A0B64F1f3e824B8A3163438358e8",
+  "MCD_JOIN_USDC_A": "0xE425CA42d0CB22D0D82366f6B811d559cff437B4",
+  "MCD_JOIN_USDC_B": "0x883c76966eA1D1AFEC54a1c20f84A57a287BB021",
+  "MCD_JOIN_USDT_A": "0x493226477349795d74E106Eed6a2B6a5D437Edab",
+  "MCD_JOIN_WBTC_A": "0xE6666822E10D3c5c33726Ea732506AaA50Ea0C88",
+  "MCD_JOIN_YFI_A": "0x698E14422A7739D268644b2794C1A9e49Ef3960B",
+  "MCD_JOIN_ZRX_A": "0x2B0B998110C0038336a8d5609c4E3A0AC35Af0f4",
+  "MCD_JUG": "0xd6D7C74729bB83c35138E54b8d5530ea96920c92",
+  "MCD_PAUSE": "0x6A309d0a82643cf531f6f7c2B21033D2AE7d016C",
+  "MCD_PAUSE_PROXY": "0x3C55dc3113a0a67Ee240e5149c35399d6BeC9E39",
+  "MCD_POT": "0x3F35940dD9f42F7560fa08F506c81d99fed870a7",
+  "MCD_SPOT": "0xb379BdC949F09e0E1c866785D1896B763E1387b0",
+  "MCD_VAT": "0x6D6e3B9B602a0a37c820F2383A1DD0EC02B5196d",
+  "MCD_VOW": "0xa64D95634d839445283f71137f9CeD3f1405aad5",
+  "MULTICALL": "0x5AE5677589cf9992290918CcD1828dcBD73D842c",
+  "OMG": "0x6efDF221190D139DD29bdbC0aB984165C6cC6C4b",
+  "OSM_MOM": "0x5e5baAcFFefa9958B64894141bE27d8f2a9B92e6",
+  "PAXUSD": "0x299051753C11BD80668f515405EF502d98F35588",
+  "PIP_AAVE": "0x302DBc5F544f6Fe18f1CfF1bb5e971ba13236F4F",
+  "PIP_BAL": "0xc3e27cDDbb7A06f40Ded620a67dB858643da39C2",
+  "PIP_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc",
+  "PIP_COMP": "0xEd9521Ba67e5961401073C8F57A10396B9296Ff2",
+  "PIP_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053",
+  "PIP_ETH": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A",
+  "PIP_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8",
+  "PIP_GUSD": "0x629cA18b145A870eFb230CF89aA626a4B2D3b228",
+  "PIP_KNC": "0x5e73B1F57f673EC875C1624D7C13F06Ef8259b23",
+  "PIP_LINK": "0x161AD3D1336814B895995D5EE8F1510ec3ccEA8C",
+  "PIP_LRC": "0x519a23560835856af262d7d829e1b9d89784DaA7",
+  "PIP_MANA": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
+  "PIP_MATIC": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
+  "PIP_WSTETH": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
+  "PIP_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733",
+  "PIP_PAXUSD": "0xB5e8D7CcF287cF4adaBF00c8529e81cd416b9fa7",
+  "PIP_RENBTC": "0xB3CcF0B63055312b73530D1D0810c862A0690e95",
+  "PIP_REP": "0x80f178c7b47cb635Ceb12aBB891338744e98365C",
+  "PIP_TUSD": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A",
+  "PIP_UNI": "0xF6bbB12EEE8B45214B2c8A8F9487982a35b7Ae81",
+  "PIP_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7",
+  "PIP_USDT": "0xc6c39b56d3dafcb213b4344D54e70E232b10ca48",
+  "PIP_WBTC": "0x298E3eb3C76938DA922EF01b99c87dF156985701",
+  "PIP_YFI": "0x174666d4101f6294EBa19D0846Ec85176D28F2e6",
+  "PIP_ZRX": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4",
+  "PROXY_ACTIONS": "0x04De75eD338D41D2E901bf703179D1049883aF5b",
+  "PROXY_ACTIONS_DSR": "0x55a191069a8ACE1589c9d44E8dbB6D1051C76e20",
+  "PROXY_ACTIONS_END": "0xd97fd1B5867cC71AfA32A0c36d38102241856Cde",
+  "PROXY_DEPLOYER": "0xf0beDfD610eE7A7e3347551Fff56E1173B726807",
+  "PROXY_FACTORY": "0x3ea503Fb236e6eE3B4d48b6Bd96Ba5F7Cf68AF94",
+  "PROXY_PAUSE_ACTIONS": "0xF5303EF974273A97bA92436E39C304618Ffaa5c0",
+  "PROXY_REGISTRY": "0x72b59ACcB5a9a9e47296fbeF741bF2Bc82FFDE62",
+  "RENBTC": "0x787b559e0A2BE9F1FCfa7824eCE7dC315f2fAF57",
+  "REP": "0x2bB387C549c61E7fCe9DDcC9ca19980D696643a4",
+  "TUSD": "0xd7e93C4B43A55fe3DbEBe4c89991769d01c3E76d",
+  "UNI": "0xb6350CdB0eE579357589B72b38110BB306F34Fa9",
+  "USDC": "0x5E6085775Cd0B41fC70d1A6B48a0451bf7aCa801",
+  "USDT": "0x537d6F0138da9FdAF5aeF1Df9E8AC8d0D73005d6",
+  "VAL_AAVE": "0x302DBc5F544f6Fe18f1CfF1bb5e971ba13236F4F",
+  "VAL_BAL": "0xc3e27cDDbb7A06f40Ded620a67dB858643da39C2",
+  "VAL_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc",
+  "VAL_COMP": "0xEd9521Ba67e5961401073C8F57A10396B9296Ff2",
+  "VAL_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053",
+  "VAL_ETH": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A",
+  "VAL_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8",
+  "VAL_GUSD": "0x629cA18b145A870eFb230CF89aA626a4B2D3b228",
+  "VAL_KNC": "0x5e73B1F57f673EC875C1624D7C13F06Ef8259b23",
+  "VAL_LINK": "0x161AD3D1336814B895995D5EE8F1510ec3ccEA8C",
+  "VAL_LRC": "0x519a23560835856af262d7d829e1b9d89784DaA7",
+  "VAL_MANA": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
+  "VAL_MATIC": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
+  "VAL_WSTETH": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11",
+  "VAL_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733",
+  "VAL_PAXUSD": "0xB5e8D7CcF287cF4adaBF00c8529e81cd416b9fa7",
+  "VAL_RENBTC": "0xB3CcF0B63055312b73530D1D0810c862A0690e95",
+  "VAL_REP": "0x80f178c7b47cb635Ceb12aBB891338744e98365C",
+  "VAL_TUSD": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A",
+  "VAL_UNI": "0xF6bbB12EEE8B45214B2c8A8F9487982a35b7Ae81",
+  "VAL_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7",
+  "VAL_USDT": "0xc6c39b56d3dafcb213b4344D54e70E232b10ca48",
+  "VAL_WBTC": "0x298E3eb3C76938DA922EF01b99c87dF156985701",
+  "VAL_YFI": "0x174666d4101f6294EBa19D0846Ec85176D28F2e6",
+  "VAL_ZRX": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4",
+  "VOTE_DELEGATE_FACTORY": "0xe95949a8C0373933dfd7110a66705eb7507Cc5Fd",
+  "VOTE_PROXY_FACTORY": "0x45204Df60612c9047Ba1cc483a957290De72180f",
+  "WBTC": "0x9dFCC19cc49f9961020a152629Db481F12b6b4Ba",
+  "YFI": "0x00727147Df379B69BB7bbf84C8c95e4eaf3e2c96",
+  "ZRX": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06",
+  "SAI": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "OLD_MCD_CAT": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43",
+  "UNIV2DAIETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2DAIETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2DAIETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2DAIETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2WBTCETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2WBTCETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2WBTCETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2WBTCETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2USDCETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2USDCETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2USDCETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2USDCETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2DAIUSDC": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2DAIUSDC": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2DAIUSDC_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2DAIUSDC_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2ETHUSDT": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2ETHUSDT": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2ETHUSDT_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2ETHUSDT_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2LINKETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2LINKETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2LINKETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2LINKETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2UNIETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2UNIETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2UNIETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2UNIETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2WBTCDAI": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2WBTCDAI": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2WBTCDAI_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2WBTCDAI_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2AAVEETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2AAVEETH": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2AAVEETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2AAVEETH_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "UNIV2DAIUSDT": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "PIP_UNIV2DAIUSDT": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_JOIN_UNIV2DAIUSDT_A": "0xC226F3CD13d508bc319F4f4290172748199d6612",
+  "MCD_FLIP_UNIV2DAIUSDT_A": "0xC226F3CD13d508bc319F4f4290172748199d6612"
 }

packages/dai-plugin-liquidations/package.json

@@ -17,7 +17,7 @@
     "test": "yarn testchain --ci jest --runInBand"
   },
   "peerDependencies": {
-    "@makerdao/dai": "^0.42.0"
+    "@makerdao/dai": "^0.42.2"
   },
   "dependencies": {
     "@makerdao/currency": "0.9.9",

packages/dai-plugin-liquidations/test/LiquidationService.test.js

@@ -13,14 +13,29 @@ import { createVaults, setLiquidationsApprovals, getLockAmount } from './utils';
 
 const me = '0x16fb96a5fa0427af0c8f7cf1eb4870231c8154b6';
 
-//currently this test suite tests one ilk.  change the below values to test a different ilk
+//currently this test suite tests one ilk, change the below values to test a different ilk
 const ilk = 'YFI-A';
 const token = YFI;
 const ilkBalance = 10000; // Testchain faucet drops tokens into the account ahead of time.
 const amtToBid = '0.005'; // A fraction of the available auction collateral
 
 let service, cdpManager, network, maker, snapshotData;
 
+const goerliConfig = {
+  plugins: [liquidationPlugin, [McdPlugin, { network }]],
+  accounts: {
+    owner: {
+      type: 'privateKey',
+      key: '0x474beb999fed1b3af2ea048f963833c686a0fba05f5724cb6417cf3b8ee9697e'
+    }
+  },
+  web3: {
+    transactionSettings: {
+      gasPrice: 1000000000 // 1 gwei all day
+    },
+    provider: { infuraProjectId: '992c66ef9bcf438aa47e45c789d3bd31' }
+  }
+};
 const kovanConfig = {
   plugins: [liquidationPlugin, [McdPlugin, { network }]],
   accounts: {
@@ -30,7 +45,7 @@ const kovanConfig = {
     }
   },
   web3: {
-    provider: { infuraProjectId: 'c3f0f26a4c1742e0949d8eedfc47be67' }
+    provider: { infuraProjectId: '406b22e3688c42898054d22555f43271' }
   }
 };
 const testchainConfig = {
@@ -44,15 +59,21 @@ const testchainConfig = {
 };
 
 async function makerInstance(preset) {
-  const config = preset === 'kovan' ? kovanConfig : testchainConfig;
+  const config =
+    preset === 'kovan'
+      ? kovanConfig
+      : preset === 'goerli'
+      ? goerliConfig
+      : testchainConfig;
   const maker = await Maker.create(preset, config);
   await maker.authenticate();
   return maker;
 }
 describe('LiquidationService', () => {
   beforeAll(async () => {
     // To run this test on kovan, just switch the network variable below:
-    //network = 'kovan';
+    // network = 'kovan';
+    // network = 'goerli';
     network = 'testchain';
 
     const preset = network === 'testchain' ? 'test' : network;
@@ -72,7 +93,8 @@ describe('LiquidationService', () => {
 
   test('can bark an unsafe urn', async () => {
     // The setup to create a risky vault takes quite a long time on kovan
-    const timeout = network === 'kovan' ? 480000 : 120000;
+    const timeout =
+      network === 'kovan' || network === 'goerli' ? 960000 : 120000;
     jest.setTimeout(timeout);
 
     // Opens a vault, withdraws DAI and calls drip until vault is unsafe.
@@ -214,8 +236,8 @@ describe('LiquidationService', () => {
     expect(balanceAfter).toEqual(new BigNumber(startingBalance).plus(amtToBid));
   });
 
-  test('get unsafe LINK-A vaults', async () => {
-    const urns = await service.getUnsafeVaults(['LINK-A', 'BAT-A']);
+  test('get unsafe ilk vaults', async () => {
+    const urns = await service.getUnsafeVaults([ilk]);
     console.log('urns', urns);
   }, 10000);
 
@@ -229,13 +251,13 @@ describe('LiquidationService', () => {
     console.log('dusts', dusts);
   }, 10000);
 
-  test('get price for LINK-A', async () => {
-    const price = await service.getPrice('LINK-A');
+  test('get price for ilk', async () => {
+    const price = await service.getPrice(ilk);
     console.log('price', price);
   }, 10000);
 
-  test('getHoleAndDirtForIlk for LINK-A', async () => {
-    const holeAndDirt = await service.getHoleAndDirtForIlk('LINK-A');
+  test('getHoleAndDirtForIlk for ilk', async () => {
+    const holeAndDirt = await service.getHoleAndDirtForIlk(ilk);
     console.log('data', holeAndDirt);
   }, 10000);
 
@@ -245,17 +267,17 @@ describe('LiquidationService', () => {
   }, 10000);
 
   xtest('getChost', async () => {
-    const chost = await service.getChost('LINK-A');
+    const chost = await service.getChost(ilk);
     console.log('chost', chost);
   }, 10000);
 
   test('getTail', async () => {
-    const tail = await service.getTail('LINK-A');
+    const tail = await service.getTail(ilk);
     console.log('tail', tail);
   }, 10000);
 
   test('getCusp', async () => {
-    const cusp = await service.getCusp('LINK-A');
+    const cusp = await service.getCusp(ilk);
     console.log('cusp', cusp);
   }, 10000);
 });

packages/dai-plugin-liquidations/test/utils.js

@@ -92,6 +92,7 @@ export function getLockAmount(network, ilk) {
     'ETH-A': '1',
     'ETH-B': '1',
     'ETH-C': '1',
+    'WSTETH-A': '1',
     'AAVE-A': '3',
     'UNI-A': '50',
     'ZRX-A': '100',

packages/dai-plugin-mcd/contracts/abiMap.js

@@ -56,6 +56,8 @@ export default {
   UNI: require('./abis/DSToken.json'),
   RENBTC: require('./abis/DSToken.json'),
   AAVE: require('./abis/DSToken.json'),
+  MATIC: require('./abis/DSToken.json'),
+  WSTETH: require('./abis/DSToken.json'),
   UNIV2DAIETH: require('./abis/DSToken.json'),
   UNIV2WBTCETH: require('./abis/DSToken.json'),
   UNIV2USDCETH: require('./abis/DSToken.json'),