Skip to content
This repository has been archived by the owner on Sep 28, 2022. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into MIG-60-Old-Chief-Check
Browse files Browse the repository at this point in the history
  • Loading branch information
jparklev committed Dec 13, 2019
2 parents 31168a7 + bdb6c75 commit 0c4fde6
Show file tree
Hide file tree
Showing 12 changed files with 127 additions and 120 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.1",
"@makerdao/testchain": "^1.0.2",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.8.0",
"babel-loader": "^8.0.5",
Expand Down
156 changes: 78 additions & 78 deletions packages/dai-plugin-mcd/contracts/addresses/testnet.json
Original file line number Diff line number Diff line change
@@ -1,81 +1,81 @@
{
"BAT": "0x666866f71a978f119acec358543c1e72fc27637d",
"CDP_MANAGER": "0x77d6250c22ecba016a4f6d1a917bf5b2ed0704c5",
"BAT": "0x59c6eeb79b7b06b7ec3d604f97a66040c2552b95",
"CDP_MANAGER": "0x818e4eb4798a4be80e8234db3cb7a4fa3a61e7a8",
"DEPLOYER": "0x16fb96a5fa0427af0c8f7cf1eb4870231c8154b6",
"DGD": "0x8752bde45da8b2665cd36754a39fd5cc82f0ad05",
"ETH": "0x7ba25f791fa76c3ef40ac98ed42634a8bc24c238",
"FAUCET": "0x2d3adfca1e6ad360a138cbcf2f286f70a5ff614a",
"GET_CDPS": "0x8a339ada3b96d6139bbdce3bd0375725fc411133",
"GNT": "0xb782cee543f1a9a0724f32731f53dcdd198c2695",
"GOV_GUARD": "0xf584b166fba89c72c8f23d49224d304f6705f879",
"MCD_ADM": "0x28dd44319c5a159f06ab5c5ee781760ee3200848",
"MCD_CAT": "0x6190cc9b0eff21ed385ac0c43dbb649cebb88b9a",
"MCD_DAI": "0x38d4aa5a17d3d15f0a6baa754b11cd3b6e97b8ed",
"MCD_DEPLOY": "0x629ca18b145a870efb230cf89aa626a4b2d3b228",
"MCD_END": "0x36fdda9b5dabdda030598116d09f1e1c6bb1deab",
"MCD_ESM": "0x88015f50fb5b2bb1abf8a9c3e1db231e267b5c4f",
"MCD_FLAP": "0x0e88266e5d517d6358ad6adabc15475ea2d277d1",
"MCD_FLIP_BAT_A": "0x5ca712b68e99af30839fd002043e9fd482407162",
"MCD_FLIP_DGD_A": "0x2f7510ce3b12f8bdd7079e333ed9868727de1640",
"MCD_FLIP_ETH_A": "0xf2cba62837a52b0c1847f225438c82d050b4ac19",
"MCD_FLIP_ETH_B": "0x5f11a0150a8941fa3aa64a91f734e1b0b249e7bf",
"MCD_FLIP_ETH_C": "0xaddcb0327b22c13fd36ebf4d289a22a8d82beb9d",
"MCD_FLIP_GNT_A": "0xa61db4400f514004b32920b7dc5586b4e5fa7725",
"MCD_FLIP_OMG_A": "0xf52320d012889828f3b62d8d235aebd5f9109766",
"MCD_FLIP_REP_A": "0x48d6c0b14edc177360afbbb360436a3b9d83a866",
"MCD_FLIP_SAI": "0x7138ae30a42de812be5f394c899d8bbe55f0ffab",
"MCD_FLIP_ZRX_A": "0x829feff316aabafdf9280d635b516c448cba736e",
"MCD_FLOP": "0xedf775290396cb081b6b3a6d1e4edbb8e2ce3109",
"MCD_GOV": "0x174666d4101f6294eba19d0846ec85176d28f2e6",
"MCD_GOV_ACTIONS": "0xe1131fbff225ffc0ebdc4233852fdc415e4d2b6b",
"MCD_IOU": "0x392e4ff172e6d88c3375de218f6e7e2fa75d3c82",
"MCD_JOIN_BAT_A": "0xa8119bfc8565ce4640d0512d8656e54369e4cd79",
"MCD_JOIN_DAI": "0x11c8d156e1b5fd883e31e9091874f2af80b02775",
"MCD_JOIN_DGD_A": "0x1fd87e7ddf2a2f22ac5fb8f617a44214f17b883c",
"MCD_JOIN_ETH_A": "0x95ca251198d0d56e4acf6b22adc7e7a1f835fcdd",
"MCD_JOIN_ETH_B": "0xf7cbc73fe7d30c68ad7b64d293d4f52f76027261",
"MCD_JOIN_ETH_C": "0x6741a0fecce6ecbf7c1f338de624f63d970497ea",
"MCD_JOIN_GNT_A": "0xa87faa7500099368ba57a3a2f584f5197c05e37f",
"MCD_JOIN_OMG_A": "0x089af8e5dc55271a2ee4ca5d5bd1d8b37482ea19",
"MCD_JOIN_REP_A": "0xe9658d1356890e06987c2d769b7d76caedbcff4b",
"MCD_JOIN_SAI": "0xcf4a441593fbf1bf56960674c5a3a18049c7bbe2",
"MCD_JOIN_ZRX_A": "0x5ab87e4729bfffe884c40a65c5bef55af105a99e",
"MCD_JUG": "0xc94d704539002c68ff130efb177d201552bbfa90",
"MCD_PAUSE": "0x55320248dc50ef6dabc88ecbc294fd5e2e1f4ec6",
"MCD_PAUSE_PROXY": "0x439d8e0ad339fdddfa79186b2f3697886d3faa7c",
"MCD_POT": "0x8c4be23de45f82a4fec7a93f69929bd2a13a4777",
"MCD_SPOT": "0x8d68d36d45a34a6ff368069bd0baa32ad49a6092",
"MCD_VAT": "0x1b71b5a6e59840fa1a11f1cb92cdadfcf70fa5c8",
"MCD_VOW": "0x6a30d8cfaae0a79472e7e1e038f4a40ac2caff60",
"MIGRATION": "0x689e9dc3214ac88f312fdd148684bf199ccf596c",
"MIGRATION_PROXY_ACTIONS": "0xd324bc539b85e6dfe08005c4d261d0ff22b0a34c",
"MULTICALL": "0x2b2fbfca02f8c29c750ed193828b40887e8bbb32",
"OMG": "0x2a5f3e35aba017435b3c8a66f64da3509a6a71ec",
"PIP_BAT": "0x26ea0dd33aa37e15d95a9ae166092a139ad62013",
"PIP_DGD": "0xb0ae8c0856259c6fe000f8e2c14507e5fc167d48",
"PIP_ETH": "0x1d24598fa8b77811e68243a2746cc553e68ca03b",
"PIP_GNT": "0xa7f1b1b3f05f8d5fceb8dacc893570b9e5d82bff",
"PIP_OMG": "0xa9d33ce18803b0742460ffb1b33b6c40f95178bc",
"PIP_REP": "0x7e430f637f3b844d09fc7f81e7fbbce520162092",
"PIP_SAI": "0x2bb387c549c61e7fce9ddcc9ca19980d696643a4",
"PIP_ZRX": "0x9a2810a12197cb844af4ba74a4b81bc1ca727130",
"PROXY_ACTIONS": "0xa5dd0e5906fac83862581c5dca85cf926abfa09b",
"PROXY_ACTIONS_DSR": "0xda4ebe73ff9e11fc6f97cef200199ddb385d7982",
"PROXY_ACTIONS_END": "0x0e8d43bd507798476c1053165f9c061f1e000a09",
"PROXY_DEPLOYER": "0x06dcc6fa0b1173fe95e6b94412ea3d2ba9b2c849",
"PROXY_FACTORY": "0xe0d81d47ac1e791dd2559013cf1ff005e619d733",
"PROXY_PAUSE_ACTIONS": "0x2cc9a419cec33e7906c6a37988e861ea1bddd1c2",
"PROXY_REGISTRY": "0xdd35201726c511474e7e1ee426b5c78b014addcc",
"REP": "0xf2ea44b10d559c7bcbf156861effd3425fb5e5fb",
"SAI": "0xc226f3cd13d508bc319f4f4290172748199d6612",
"SAI_TUB": "0xe82ce3d6bf40f2f9414c8d01a35e3d9eb16a1761",
"VAL_BAT": "0x26ea0dd33aa37e15d95a9ae166092a139ad62013",
"VAL_DGD": "0xb0ae8c0856259c6fe000f8e2c14507e5fc167d48",
"VAL_ETH": "0x1d24598fa8b77811e68243a2746cc553e68ca03b",
"VAL_GNT": "0xa7f1b1b3f05f8d5fceb8dacc893570b9e5d82bff",
"VAL_OMG": "0xa9d33ce18803b0742460ffb1b33b6c40f95178bc",
"VAL_REP": "0x7e430f637f3b844d09fc7f81e7fbbce520162092",
"VAL_ZRX": "0x9a2810a12197cb844af4ba74a4b81bc1ca727130",
"VOTE_PROXY_FACTORY": "0xf95a6b6740f8fcbb25eb49bc0176c2b4581fdb73",
"ZRX": "0xec93d8ea996da9ffe359778f3dae6134df0de016"
"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"
}
3 changes: 2 additions & 1 deletion packages/dai-plugin-migrations/contracts/abiMap.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
"MCD_POT_1": "Pot",
"REDEEMER": "Redeemer",
"MIGRATION": "ScdMcdMigration",
"MIGRATION_PROXY_ACTIONS": "MigrationProxyActions"
"MIGRATION_PROXY_ACTIONS": "MigrationProxyActions",
"OLD_CHIEF": "DSChief"
}
1 change: 1 addition & 0 deletions packages/dai-plugin-migrations/contracts/abis/DSChief.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"constant":true,"inputs":[],"name":"IOU","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"who","type":"address"}],"name":"getUserRoles","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"owner_","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"GOV","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"code","type":"address"},{"name":"sig","type":"bytes4"}],"name":"getCapabilityRoles","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"code","type":"address"},{"name":"sig","type":"bytes4"}],"name":"isCapabilityPublic","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"MAX_YAYS","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"whom","type":"address"}],"name":"lift","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"yays","type":"address[]"}],"name":"etch","outputs":[{"name":"slate","type":"bytes32"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"approvals","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"who","type":"address"},{"name":"role","type":"uint8"},{"name":"enabled","type":"bool"}],"name":"setUserRole","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"authority_","type":"address"}],"name":"setAuthority","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"role","type":"uint8"},{"name":"code","type":"address"},{"name":"sig","type":"bytes4"},{"name":"enabled","type":"bool"}],"name":"setRoleCapability","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"who","type":"address"},{"name":"role","type":"uint8"}],"name":"hasUserRole","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"slate","type":"bytes32"}],"name":"vote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"caller","type":"address"},{"name":"code","type":"address"},{"name":"sig","type":"bytes4"}],"name":"canCall","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"authority","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"},{"name":"","type":"uint256"}],"name":"slates","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"code","type":"address"},{"name":"sig","type":"bytes4"},{"name":"enabled","type":"bool"}],"name":"setPublicCapability","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"who","type":"address"},{"name":"enabled","type":"bool"}],"name":"setRootUser","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"votes","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"wad","type":"uint256"}],"name":"free","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"wad","type":"uint256"}],"name":"lock","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"yays","type":"address[]"}],"name":"vote","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"who","type":"address"}],"name":"isUserRoot","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"deposits","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"hat","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"GOV","type":"address"},{"name":"IOU","type":"address"},{"name":"MAX_YAYS","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"slate","type":"bytes32"}],"name":"Etch","type":"event"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"authority","type":"address"}],"name":"LogSetAuthority","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"}],"name":"LogSetOwner","type":"event"}]
Loading

0 comments on commit 0c4fde6

Please sign in to comment.