Merge branch 'cagefree' into dev

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.1",
+    "@makerdao/testchain": "^1.1.3",
     "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": "0xEc321982B087B32258a018d6F56A4632B75A0da5",
-  "CHIEF": "0x3595fAe96c4dB62C237dc3bBe9C3C4Fe2D6f65da",
+  "IOU": "0xAE130aEcdF43abbEfdBb97D87bA8Ea38f922CcD8",
+  "CHIEF": "0x787b559e0A2BE9F1FCfa7824eCE7dC315f2fAF57",
   "POLLING": "0x9A2810a12197CB844af4BA74a4b81bC1CA727130",
-  "VOTE_PROXY_FACTORY": "0x4C206682C1F875318A61CF9e2aDfE4AeE7DA948E",
-  "MCD_ESM": "0x921835c3fe968e44a718039269b96A82960f8f84",
-  "MCD_END": "0x4E5DFf4787432B5CCE8abC3A64A68b7330c2D67B",
+  "VOTE_PROXY_FACTORY": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF",
+  "MCD_ESM": "0xb002A319887185e56d787A5c90900e13834a85E3",
+  "MCD_END": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e",
   "PAUSE": "0x512FaC9c9E9082EDf078f09057CC9ed8D859CCbA"
 }

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

@@ -1,88 +1,88 @@
 {
-  "BAT": "0xD04dee550855F8e8392EA0E7DA81ED768B1a5a03",
-  "CDP_MANAGER": "0xD2aee8C4eF35124D0255f5324e1E8b8b004281dA",
+  "BAT": "0x4aF6E9FA188161FD283DC8d51619615d00ef3F01",
+  "CDP_MANAGER": "0xb3dc8De316349D8cE5168FE33C2E75c4f0cd0FFE",
   "DEPLOYER": "0x16Fb96a5fa0427Af0C8F7cF1eB4870231c8154B6",
-  "DGD": "0xe026eA1f2Fcd3EBF571aC89a189E6c620B3D472c",
+  "DGD": "0x49058F4F6c8C3E1b75aeD7AA45e06c439b9429f0",
   "ETH": "0x7ba25F791FA76C3ef40AC98ed42634a8bC24c238",
-  "FAUCET": "0xDF28Eaf10480C3231728D19686B4F3714B4fc8D7",
-  "FLIPPER_MOM": "0x85FD3feC44BDd5D8A5eD2C830b5B70A55DBe73a5",
-  "GET_CDPS": "0xbB7e4117e35d312DDE268Fd5E55258B5382Fa0a8",
-  "GNT": "0xEf87e3834Fd42632925503425A8FAB766667F9b8",
-  "GOV_GUARD": "0xF260Ca89D1784066a1ACf043496422afa1837777",
-  "MCD_ADM": "0x3595fAe96c4dB62C237dc3bBe9C3C4Fe2D6f65da",
-  "MCD_CAT": "0xF079c1DB17F02fCc28504eCCe8B7954545b92cc5",
-  "MCD_DAI": "0x550f139BFA96E0e1b2e56ca41D7362Eb0597952E",
-  "MCD_DEPLOY": "0x5fcF285f999e35Db4a262F2C55918A280bB6c16c",
-  "MCD_END": "0x4E5DFf4787432B5CCE8abC3A64A68b7330c2D67B",
-  "MCD_ESM": "0x921835c3fe968e44a718039269b96A82960f8f84",
-  "MCD_FLAP": "0x8652256Fd6E7c4710D221b29771C883180e59218",
-  "MCD_FLIP_BAT_A": "0x1Fbc08663d4cba95B6acFb95EE5D92d29Ef30b64",
-  "MCD_FLIP_DGD_A": "0x78B1b6D1feE7aa5471047FE66bd0CFEf362F3D9B",
-  "MCD_FLIP_ETH_A": "0xfdA8b6F3768B01aCA03D66198EaA28d89124E657",
-  "MCD_FLIP_ETH_B": "0x2B3d66FA629D3B351f7A31a9460C947Ef9F10A93",
-  "MCD_FLIP_ETH_C": "0x9C8d511614E4534F3f0F33b2C5BC80a2434D4683",
-  "MCD_FLIP_GNT_A": "0x73404C7d17b47968eCB9605da218B047D8042aC0",
-  "MCD_FLIP_OMG_A": "0x90EA5515BC8539aF9A386b1BD53201C51854c497",
-  "MCD_FLIP_REP_A": "0x8728247e5dB4D0323F11C9BaaCec7D17bdF8e23e",
-  "MCD_FLIP_SAI": "0x50F9C21f9ec233031617C9A4D19f8731A5827961",
-  "MCD_FLIP_USDC_A": "0x828cf0B2CCC3E75559230949E02e36E1273cceA8",
-  "MCD_FLIP_ZRX_A": "0x7fFfA3548195c63931503d219D5976203A48D0ad",
-  "MCD_FLOP": "0x767D24eD4918758782DeC80a7c684645ec615a44",
-  "MCD_GOV": "0xf6FAcD07110c1AD84441a6baa4f281522C1Ff856",
-  "MCD_GOV_ACTIONS": "0xf0E2dc711C9bff000Ab8B0506657702cAFB3e336",
-  "MCD_IOU": "0xEc321982B087B32258a018d6F56A4632B75A0da5",
-  "MCD_JOIN_BAT_A": "0x6BbbC41BbfaD2fb0830b69B9351Ef2ee7827261B",
-  "MCD_JOIN_DAI": "0x313f0b446be0fBeF4AF061f6Db8AF5185bcCD851",
-  "MCD_JOIN_DGD_A": "0x1cf1ed5eFa0C38d1Ab13fB999e227ECE981690FE",
-  "MCD_JOIN_ETH_A": "0x4355a632871C695642E3822D2d20AADE26AC2291",
-  "MCD_JOIN_ETH_B": "0x75Fe4E792D459Cc14C3fD66b2e0D72A8BE4aFb31",
-  "MCD_JOIN_ETH_C": "0xDd0EfD7A7C4F019dEC36462cC7b6a76A7B6BD203",
-  "MCD_JOIN_GNT_A": "0x19f327ba84fe82c7D1D2646c4af97246C7A189FE",
-  "MCD_JOIN_OMG_A": "0x3809c24350BD0ec4b517dDd8A366FACC4716417B",
-  "MCD_JOIN_REP_A": "0x51045Fd583766DfCFA384E764F5557626044eCdC",
-  "MCD_JOIN_SAI": "0xB7b51798677B531dec5C0C5CD08c904DF92B2655",
-  "MCD_JOIN_USDC_A": "0xE1cc99698119D2fFE8b6518FA6aBe72014805781",
-  "MCD_JOIN_ZRX_A": "0xa5e52461e040905424A42823BBdc8e2F53f8366E",
-  "MCD_JUG": "0x61B3e3B1b33813C9810a1D85609466E6F434a3ba",
-  "MCD_PAUSE": "0x512FaC9c9E9082EDf078f09057CC9ed8D859CCbA",
-  "MCD_PAUSE_PROXY": "0x7E36D5A12aa83f897572Fb381B2d1076875F3e34",
-  "MCD_POT": "0xfA08a08aa3BCD1A84598983E4c31E92f7CC52ac7",
-  "MCD_SPOT": "0x854D9FC33352188c2150cCAaC5BA27Dd028781d1",
-  "MCD_VAT": "0x5a21E97f584626AF7e3aa21995E872070E5b4AaF",
-  "MCD_VOW": "0x63622E9a38644c9EF4A0879dE25f06fbC4474920",
-  "MIGRATION": "0xECd0b09cBBeb2E329c1cF55155ee8ef4d485b978",
-  "MIGRATION_PROXY_ACTIONS": "0x1129751170e8e4A2694903bF54eD46cBEa69be98",
-  "MULTICALL": "0x5f350A042A44445aEAd11a85696a23a6ba9024D7",
-  "OMG": "0x72147385Da8420313263a7F8Ea59e747144a684A",
-  "OSM_MOM": "0x6c747d8D445719eB0Bcc376692F5dae308993b1A",
-  "PIP_BAT": "0xf7384F283B64FA27D25F49eF7ea7a9C4772d37ae",
-  "PIP_DGD": "0x6E9572192AaE21294A90EC753aB1d77bF093A105",
-  "PIP_ETH": "0xC5f6810c1b7e6a9964649E689796942B3838aDbC",
-  "PIP_GNT": "0xF6390ddC44CeB5E492b89299891Ec7fa246e0471",
-  "PIP_OMG": "0x0071a303B1d11D3D8B3c3D7b565C068FaC912CBB",
-  "PIP_REP": "0x0c0E528c152470b20203A779b41e9c5cfbE792AD",
-  "PIP_SAI": "0xb0d1909498471d170F74F4204eE6C1b1940E6154",
-  "PIP_USDC": "0xC7a7d5CdE659e327eFC5Fe68c05E88701d7f6036",
-  "PIP_ZRX": "0x052a71Fc599F4383fd251dcd1822761Ea4b4a568",
-  "PROXY_ACTIONS": "0x9E7fF1657d6B4996af8e999F21D7117c114B5D32",
-  "PROXY_ACTIONS_DSR": "0x269aC292f6071C7391AFf7E0442825CC30F67cbE",
-  "PROXY_ACTIONS_END": "0x69006610F4eA33EA69DBF2BBB831bB8216791439",
-  "PROXY_DEPLOYER": "0xE63107b66bc71D37Cc73CF6483F741d334744e85",
-  "PROXY_FACTORY": "0xDc8BfE8B9b048395a6c19d9e372Fe08Eee5071b6",
-  "PROXY_PAUSE_ACTIONS": "0x89AdB1cC3911e85A0106889E60eDdd8636303eEd",
-  "PROXY_REGISTRY": "0x95a3CdA2C69D8Bfe8E620A013090611AE322B412",
-  "REP": "0x82e32066414306959B8F3CAA5C0b6D177dbba3Fd",
+  "FAUCET": "0x298E3eb3C76938DA922EF01b99c87dF156985701",
+  "FLIPPER_MOM": "0xd7e93C4B43A55fe3DbEBe4c89991769d01c3E76d",
+  "GET_CDPS": "0x883c76966eA1D1AFEC54a1c20f84A57a287BB021",
+  "GNT": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5",
+  "GOV_GUARD": "0x6741A0FECce6ecbf7C1f338dE624F63d970497EA",
+  "MCD_ADM": "0x787b559e0A2BE9F1FCfa7824eCE7dC315f2fAF57",
+  "MCD_CAT": "0x8C4Be23DE45F82a4feC7a93F69929Bd2A13A4777",
+  "MCD_DAI": "0x36fdda9B5DAbdDA030598116D09f1E1c6bB1DeaB",
+  "MCD_DEPLOY": "0x3ea503Fb236e6eE3B4d48b6Bd96Ba5F7Cf68AF94",
+  "MCD_END": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e",
+  "MCD_ESM": "0xb002A319887185e56d787A5c90900e13834a85E3",
+  "MCD_FLAP": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6",
+  "MCD_FLIP_BAT_A": "0x5cAed1013a733fcaD7BF2b074FA38eeC7EDfDFC4",
+  "MCD_FLIP_DGD_A": "0x16c8C8a35Bc22C724E2A27f3070635619e482310",
+  "MCD_FLIP_ETH_A": "0x19E602E0dC93749Ea7aFa0C88F4693d4C02102D3",
+  "MCD_FLIP_ETH_B": "0xB61ae46ebb38C2769b7d34Ce80E30e1AafAa7E6D",
+  "MCD_FLIP_ETH_C": "0x8C431FA9B86A9c60850017e7c730CAc97546bd5C",
+  "MCD_FLIP_GNT_A": "0xd5b47f44451994B5dF7e1A33EA9758E4cC4dC634",
+  "MCD_FLIP_OMG_A": "0xb1E284C566B2887cE2D2DE94e835919175327569",
+  "MCD_FLIP_REP_A": "0x0a53BD73eFAe5DC217d49d1D58434aA36Ff195ba",
+  "MCD_FLIP_SAI": "0xbfFBcf057e66781F42949112e1630191465533d0",
+  "MCD_FLIP_USDC_A": "0x2A96fB287b32a844e867c3b1FBF2534a145e9Bff",
+  "MCD_FLIP_ZRX_A": "0x2A9a492Fc71a6E4CE3f35382c5eF2F6144F58C09",
+  "MCD_FLOP": "0x2A92CCF051f33912115f86eA0530f4999E3AC1Ac",
+  "MCD_GOV": "0x8c12691dba1C6A76a358669c9fE72B9f968F4EAE",
+  "MCD_GOV_ACTIONS": "0x2006CAA6901322b195e27aC007d2de1C09B7f19E",
+  "MCD_IOU": "0xAE130aEcdF43abbEfdBb97D87bA8Ea38f922CcD8",
+  "MCD_JOIN_BAT_A": "0xb782CEe543F1a9A0724F32731f53DcdD198C2695",
+  "MCD_JOIN_DAI": "0x88015F50fb5b2bB1aBF8a9C3e1Db231E267b5C4f",
+  "MCD_JOIN_DGD_A": "0xA5DD0E5906fAc83862581C5DCA85CF926ABFa09b",
+  "MCD_JOIN_ETH_A": "0xE9658D1356890E06987C2D769B7d76cAedBcFf4b",
+  "MCD_JOIN_ETH_B": "0xDC901A38a2Ec3283556F039b115423049517B50c",
+  "MCD_JOIN_ETH_C": "0x5Ab87E4729BFFFE884c40a65c5bEF55Af105a99e",
+  "MCD_JOIN_GNT_A": "0x8a339ADa3b96d6139BBDCe3Bd0375725Fc411133",
+  "MCD_JOIN_OMG_A": "0x8752bdE45da8B2665CD36754A39FD5cc82F0AD05",
+  "MCD_JOIN_REP_A": "0x2a5F3e35aBA017435b3c8A66F64da3509a6A71Ec",
+  "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06",
+  "MCD_JOIN_USDC_A": "0x6efDF221190D139DD29bdbC0aB984165C6cC6C4b",
+  "MCD_JOIN_ZRX_A": "0x666866f71a978f119acEc358543c1E72FC27637d",
+  "MCD_JUG": "0xF2Cba62837A52B0c1847f225438C82D050b4aC19",
+  "MCD_PAUSE": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43",
+  "MCD_PAUSE_PROXY": "0x1D1FF62A8C9E48e09cF8735657A1855ac3f400D2",
+  "MCD_POT": "0xCe1410e4b98058fA7534FA8fcEe28E82056EB0e9",
+  "MCD_SPOT": "0xBDe07Bb0c774f41a59901876454637E3FeAB8C73",
+  "MCD_VAT": "0xEDf775290396cb081B6B3a6d1E4edBb8e2ce3109",
+  "MCD_VOW": "0x8D68d36D45A34A6Ff368069bD0baa32ad49A6092",
+  "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "MIGRATION_PROXY_ACTIONS": "0x19BDC4b950285a608E50F3b5E7DF154FacBda861",
+  "MULTICALL": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A",
+  "OMG": "0xEB9d9336b4A89260bC4B94ee6a34e2faF46B0CA5",
+  "OSM_MOM": "0x378100E78ccEf442F38f1FcFdc4B4352884bcb67",
+  "PIP_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc",
+  "PIP_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053",
+  "PIP_ETH": "0x2B2fBfcA02F8C29c750ed193828b40887e8BBb32",
+  "PIP_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8",
+  "PIP_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733",
+  "PIP_REP": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A",
+  "PIP_SAI": "0x8A74211B5fC144A846fD1daA4dC8ABbB6268E18f",
+  "PIP_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7",
+  "PIP_ZRX": "0x80f178c7b47cb635Ceb12aBB891338744e98365C",
+  "PROXY_ACTIONS": "0x0E69131732c7700d5d598350504ba885D677CCA8",
+  "PROXY_ACTIONS_DSR": "0xE425CA42d0CB22D0D82366f6B811d559cff437B4",
+  "PROXY_ACTIONS_END": "0x5E6085775Cd0B41fC70d1A6B48a0451bf7aCa801",
+  "PROXY_DEPLOYER": "0xD017565df4873172C5b5f79cF5B896f1A098137C",
+  "PROXY_FACTORY": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4",
+  "PROXY_PAUSE_ACTIONS": "0x25f3850107175351B664b73d9F429DdFDF0A42ad",
+  "PROXY_REGISTRY": "0x5e73B1F57f673EC875C1624D7C13F06Ef8259b23",
+  "REP": "0xc677d837a437c24Db14E1225416d52BcC9B86E94",
   "SAI": "0xC226F3CD13d508bc319F4f4290172748199d6612",
   "SAI_TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761",
-  "USDC": "0xa186d12ad135E78f94BFD44936C94b3532123E56",
-  "VAL_BAT": "0xf7384F283B64FA27D25F49eF7ea7a9C4772d37ae",
-  "VAL_DGD": "0x6E9572192AaE21294A90EC753aB1d77bF093A105",
-  "VAL_ETH": "0xC5f6810c1b7e6a9964649E689796942B3838aDbC",
-  "VAL_GNT": "0xF6390ddC44CeB5E492b89299891Ec7fa246e0471",
-  "VAL_OMG": "0x0071a303B1d11D3D8B3c3D7b565C068FaC912CBB",
-  "VAL_REP": "0x0c0E528c152470b20203A779b41e9c5cfbE792AD",
-  "VAL_USDC": "0xC7a7d5CdE659e327eFC5Fe68c05E88701d7f6036",
-  "VAL_ZRX": "0x052a71Fc599F4383fd251dcd1822761Ea4b4a568",
-  "VOTE_PROXY_FACTORY": "0x4C206682C1F875318A61CF9e2aDfE4AeE7DA948E",
-  "ZRX": "0x5bAdcf24825f44d226A02d88f1Dd1937a29085F1"
+  "USDC": "0x23c9aafE0d1968EaC6d9F1edb9FA831641783FEd",
+  "VAL_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc",
+  "VAL_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053",
+  "VAL_ETH": "0x2B2fBfcA02F8C29c750ed193828b40887e8BBb32",
+  "VAL_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8",
+  "VAL_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733",
+  "VAL_REP": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A",
+  "VAL_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7",
+  "VAL_ZRX": "0x80f178c7b47cb635Ceb12aBB891338744e98365C",
+  "VOTE_PROXY_FACTORY": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF",
+  "ZRX": "0x927F29F213c691ACe67cBC9FDb6eBBfd04D07EC4"
 }

packages/dai-plugin-mcd/test/schemas/computed.spec.js

@@ -462,10 +462,10 @@ test(USER_VAULTS_LIST, async () => {
 
   // todo: make expected addresses dynamic
   expect(batVault.vaultAddress).toEqual(
-    '0xfCEED937ad17C6Ef4155B45c7d3016d06De2D226'
+    '0xDCaBb01efa573f4F27AfA9E63bAD3610d033061c'
   );
   expect(ethVault.vaultAddress).toEqual(
-    '0x06594612047F065966dc21826F9787AF633bE945'
+    '0x9FD3432c61615F3BeE9f29225934B569246302eB'
   );
 });
 

packages/dai-plugin-mcd/test/schemas/getCdps.spec.js

@@ -77,10 +77,10 @@ test(USER_VAULT_ADDRESSES, async () => {
 
   // todo: make expected addresses dynamic
   expect(userVaultAddresses[0]).toEqual(
-    '0xfCEED937ad17C6Ef4155B45c7d3016d06De2D226'
+    '0xDCaBb01efa573f4F27AfA9E63bAD3610d033061c'
   );
   expect(userVaultAddresses[1]).toEqual(
-    '0x06594612047F065966dc21826F9787AF633bE945'
+    '0x9FD3432c61615F3BeE9f29225934B569246302eB'
   );
 });
 

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

@@ -1,15 +1,15 @@
 {
   "TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761",
-  "GET_CDPS_1": "0xbB7e4117e35d312DDE268Fd5E55258B5382Fa0a8",
-  "CDP_MANAGER_1": "0xD2aee8C4eF35124D0255f5324e1E8b8b004281dA",
-  "MCD_END_1": "0x4E5DFf4787432B5CCE8abC3A64A68b7330c2D67B",
-  "MCD_VAT_1": "0x5a21E97f584626AF7e3aa21995E872070E5b4AaF",
-  "MCD_DAI_1": "0x550f139BFA96E0e1b2e56ca41D7362Eb0597952E",
-  "MCD_POT_1": "0xfA08a08aa3BCD1A84598983E4c31E92f7CC52ac7",
+  "GET_CDPS_1": "0x883c76966eA1D1AFEC54a1c20f84A57a287BB021",
+  "CDP_MANAGER_1": "0xb3dc8De316349D8cE5168FE33C2E75c4f0cd0FFE",
+  "MCD_END_1": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e",
+  "MCD_VAT_1": "0xEDf775290396cb081B6B3a6d1E4edBb8e2ce3109",
+  "MCD_DAI_1": "0x36fdda9B5DAbdDA030598116D09f1E1c6bB1DeaB",
+  "MCD_POT_1": "0xCe1410e4b98058fA7534FA8fcEe28E82056EB0e9",
   "REDEEMER": "0x2DaF1c09275B0b72277909377Eb20CCf10eFA02E",
   "OLD_MKR": "0xa3bFc24194007416fa73fC6E3A7D3B245f647d6E",
   "OLD_CHIEF": "0x1d24598fa8B77811E68243A2746CC553E68ca03B",
   "OLD_VOTE_PROXY_FACTORY": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC",
-  "MIGRATION": "0xECd0b09cBBeb2E329c1cF55155ee8ef4d485b978",
-  "MIGRATION_PROXY_ACTIONS": "0x1129751170e8e4A2694903bF54eD46cBEa69be98"
+  "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
+  "MIGRATION_PROXY_ACTIONS": "0x19BDC4b950285a608E50F3b5E7DF154FacBda861"
 }

packages/dai/contracts/abis.js

@@ -23,6 +23,8 @@ import pit from './abis/GemPit.json';
 
 import multicall from './abis/Multicall.json';
 
+import cageFree from './abis/CageFree.json';
+
 const daiV1 = {
   saiTop,
   tub,
@@ -57,4 +59,4 @@ const proxies = {
   proxyRegistry
 };
 
-export { daiV1, dappHub, exchangesV1, general, proxies, multicall };
+export { daiV1, dappHub, exchangesV1, general, proxies, multicall, cageFree };

packages/dai/contracts/abis/CageFree.json

@@ -0,0 +1 @@
+[{"inputs":[{"internalType":"address","name":"_tap","type":"address"},{"internalType":"address","name":"_weth","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"sender","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"}],"name":"FreeCash","type":"event"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"constant":false,"inputs":[{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"freeCash","outputs":[{"internalType":"uint256","name":"cashoutBalance","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"sai","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"tap","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"weth","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"}]

packages/dai/contracts/addresses/testnet.json

@@ -28,5 +28,5 @@
   "OLD_VOTE_PROXY_FACTORY": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC",
   "LINE_SPELL": "0x26ea0dd33Aa37e15D95a9Ae166092a139Ad62013",
   "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48",
-  "MULTICALL": "0x5f350A042A44445aEAd11a85696a23a6ba9024D7"
+  "MULTICALL": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A"
 }

packages/dai/contracts/contracts.js

@@ -15,5 +15,6 @@ export default {
   PROXY_REGISTRY: 'PROXY_REGISTRY',
   DS_PROXY_FACTORY: 'DS_PROXY_FACTORY',
   DS_PROXY: 'DS_PROXY',
-  MULTICALL: 'MULTICALL'
+  MULTICALL: 'MULTICALL',
+  CAGE_FREE: 'SAI_CAGE_FREE'
 };

packages/dai/contracts/networks.js

@@ -104,6 +104,15 @@ export function contractAddressesInfo(addresses) {
       }
     ],
 
+    // CageFree
+    [contracts.CAGE_FREE]: [
+      {
+        version: 1,
+        address: addresses.SAI_CAGEFREE,
+        abi: abis.cageFree
+      }
+    ],
+
     // Proxies
     [contracts.SAI_PROXY]: [
       {

yarn.lock

@@ -1821,10 +1821,10 @@
     lodash "^4.17.11"
     ws "^7.2.0"
 
-"@makerdao/testchain@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.1.1.tgz#d6a485ae02d31430efa66aba3bb35434ab97626f"
-  integrity sha512-ELDNKmb7uYMea1vxu+FVZFwjPo6+2E8c8XMWpXlr+FloRiFSNUD+g7ZKuNLNd5MFyjXFzzQqCnvZImeYi0nmiw==
+"@makerdao/testchain@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.1.3.tgz#b7fdd86b1c2a87424c622d22f5da50e673997408"
+  integrity sha512-dXZ9PujltGfg3QoUz7j0uuQwDIqQtTQhGnMYueYjnIl7v8lDGno6W9t+ogIx3caiWPh34DIoM4CfN0Di4g2HjA==
   dependencies:
     ganache-cli makerdao/ganache-cli#fix/gas-est-crash
 
@@ -5905,7 +5905,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: