diff --git a/package.json b/package.json index c82be4d1a..4adf64974 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": "^0.2.17-1", + "@makerdao/testchain": "^1.0.1", "babel-eslint": "^10.0.3", "babel-jest": "^24.8.0", "babel-loader": "^8.0.5", diff --git a/packages/dai-plugin-mcd/contracts/abis/Flopper.json b/packages/dai-plugin-mcd/contracts/abis/Flopper.json index 9346d5c29..fec2b3ffa 100644 --- a/packages/dai-plugin-mcd/contracts/abis/Flopper.json +++ b/packages/dai-plugin-mcd/contracts/abis/Flopper.json @@ -1 +1 @@ -[{"inputs":[{"internalType":"address","name":"vat_","type":"address"},{"internalType":"address","name":"gem_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"id","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"lot","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"bid","type":"uint256"},{"indexed":true,"internalType":"address","name":"gal","type":"address"}],"name":"Kick","type":"event"},{"anonymous":true,"inputs":[{"indexed":true,"internalType":"bytes4","name":"sig","type":"bytes4"},{"indexed":true,"internalType":"address","name":"usr","type":"address"},{"indexed":true,"internalType":"bytes32","name":"arg1","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"arg2","type":"bytes32"},{"indexed":false,"internalType":"bytes","name":"data","type":"bytes"}],"name":"LogNote","type":"event"},{"constant":true,"inputs":[],"name":"beg","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"bids","outputs":[{"internalType":"uint256","name":"bid","type":"uint256"},{"internalType":"uint256","name":"lot","type":"uint256"},{"internalType":"address","name":"guy","type":"address"},{"internalType":"uint48","name":"tic","type":"uint48"},{"internalType":"uint48","name":"end","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"cage","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"name":"deal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"},{"internalType":"uint256","name":"lot","type":"uint256"},{"internalType":"uint256","name":"bid","type":"uint256"}],"name":"dent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"bytes32","name":"what","type":"bytes32"},{"internalType":"uint256","name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"gem","outputs":[{"internalType":"contract GemLike","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"gal","type":"address"},{"internalType":"uint256","name":"lot","type":"uint256"},{"internalType":"uint256","name":"bid","type":"uint256"}],"name":"kick","outputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"kicks","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"live","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"pad","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"tau","outputs":[{"internalType":"uint48","name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"name":"tick","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"ttl","outputs":[{"internalType":"uint48","name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"vat","outputs":[{"internalType":"contract VatLike","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"wards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"name":"yank","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file +[{"inputs":[{"internalType":"address","name":"vat_","type":"address"},{"internalType":"address","name":"gem_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"id","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"lot","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"bid","type":"uint256"},{"indexed":true,"internalType":"address","name":"gal","type":"address"}],"name":"Kick","type":"event"},{"anonymous":true,"inputs":[{"indexed":true,"internalType":"bytes4","name":"sig","type":"bytes4"},{"indexed":true,"internalType":"address","name":"usr","type":"address"},{"indexed":true,"internalType":"bytes32","name":"arg1","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"arg2","type":"bytes32"},{"indexed":false,"internalType":"bytes","name":"data","type":"bytes"}],"name":"LogNote","type":"event"},{"constant":true,"inputs":[],"name":"beg","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"bids","outputs":[{"internalType":"uint256","name":"bid","type":"uint256"},{"internalType":"uint256","name":"lot","type":"uint256"},{"internalType":"address","name":"guy","type":"address"},{"internalType":"uint48","name":"tic","type":"uint48"},{"internalType":"uint48","name":"end","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"cage","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"name":"deal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"},{"internalType":"uint256","name":"lot","type":"uint256"},{"internalType":"uint256","name":"bid","type":"uint256"}],"name":"dent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"bytes32","name":"what","type":"bytes32"},{"internalType":"uint256","name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"gem","outputs":[{"internalType":"contract GemLike","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"gal","type":"address"},{"internalType":"uint256","name":"lot","type":"uint256"},{"internalType":"uint256","name":"bid","type":"uint256"}],"name":"kick","outputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"kicks","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"live","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"pad","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"tau","outputs":[{"internalType":"uint48","name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"name":"tick","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"ttl","outputs":[{"internalType":"uint48","name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"vat","outputs":[{"internalType":"contract VatLike","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"vow","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"wards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"name":"yank","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/packages/dai-plugin-mcd/contracts/abis/MigrationProxyActions.json b/packages/dai-plugin-mcd/contracts/abis/MigrationProxyActions.json index 2ca3de053..96c645a79 100644 --- a/packages/dai-plugin-mcd/contracts/abis/MigrationProxyActions.json +++ b/packages/dai-plugin-mcd/contracts/abis/MigrationProxyActions.json @@ -1 +1 @@ -[{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"}],"name":"migrate","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"},{"internalType":"uint256","name":"minRatio","type":"uint256"}],"name":"migratePayFeeWithDebt","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"address","name":"payGem","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"}],"name":"migratePayFeeWithGem","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapDaiToSai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapSaiToDai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file +[{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"address","name":"jug","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"}],"name":"migrate","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"address","name":"jug","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"},{"internalType":"uint256","name":"minRatio","type":"uint256"}],"name":"migratePayFeeWithDebt","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"address","name":"jug","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"address","name":"payGem","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"}],"name":"migratePayFeeWithGem","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapDaiToSai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapSaiToDai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/packages/dai-plugin-mcd/contracts/addresses/kovan.json b/packages/dai-plugin-mcd/contracts/addresses/kovan.json index c2a5f7cca..f05f1af0e 100644 --- a/packages/dai-plugin-mcd/contracts/addresses/kovan.json +++ b/packages/dai-plugin-mcd/contracts/addresses/kovan.json @@ -4,6 +4,7 @@ "FAUCET": "0x94598157fcf0715c3bc9b4a35450cce82ac57b20", "MCD_DEPLOY": "0x13141b8a5e4a82ebc6b636849dd6a515185d6236", "MCD_GOV": "0xaaf64bfcc32d0f15873a02163e7e500671a4ffcd", + "GOV_GUARD": "0x2f1b834d8bb7f469a7c75cc75873cd94efc363ad", "MCD_ADM": "0xbbffc76e94b34f72d96d054b31f6424249c1337d", "MCD_VAT": "0xba987bdb501d131f766fee8180da5d81b34b69d9", "MCD_JUG": "0xcbb7718c9f39d05aeede1c472ca8bf804b2f1ead", @@ -11,7 +12,7 @@ "MCD_VOW": "0x0f4cbe6cba918b7488c26e29d9ecd7368f38ea3b", "MCD_JOIN_DAI": "0x5aa71a3ae1c0bd6ac27a1f28e1415fffb6f15b8c", "MCD_FLAP": "0x064cd5f762851b1af81fd8fca837227cb3ec84b4", - "MCD_FLOP": "0x13ab195dfc8519ed2c9530a43406d6a6852fa35e", + "MCD_FLOP": "0x145b00b1ac4f01e84594efa2972fce1f5beb5ced", "MCD_PAUSE": "0x8754e6ecb4fe68daa5132c2886ab39297a5c7189", "MCD_PAUSE_PROXY": "0x0e4725db88bb038bba4c4723e91ba183be11edf3", "MCD_GOV_ACTIONS": "0x0ca17e81073669741714354f16d800af64e95c75", @@ -28,12 +29,10 @@ "PROXY_FACTORY": "0xe11e3b391f7e8bc47247866af32af67dd58dc800", "PROXY_REGISTRY": "0x64a436ae831c1672ae81f674cab8b6775df3475c", "ETH": "0xd0a1e359811322d97991e03f863a0c30c2cf029c", - "VAL_ETH": "0x75dd74e8afe8110c8320ed397cccff3b8134d981", "PIP_ETH": "0x75dd74e8afe8110c8320ed397cccff3b8134d981", "MCD_JOIN_ETH_A": "0x775787933e92b709f2a3c70aa87999696e74a9f8", "MCD_FLIP_ETH_A": "0xb40139ea36d35d0c9f6a2e62601b616f1ffbbd1b", "BAT": "0x9f8cfb61d3b2af62864408dd703f9c3beb55dff7", - "VAL_BAT": "0x5c40c9eb35c76069fa4c3a00ea59fac6ffa9c113", "PIP_BAT": "0x5c40c9eb35c76069fa4c3a00ea59fac6ffa9c113", "MCD_JOIN_BAT_A": "0x2a4c485b1b8dfb46accfbecaf75b6188a59dbd0a", "MCD_FLIP_BAT_A": "0xc94014a032ca5fcc01271f4519add7e87a16b94c", @@ -45,5 +44,5 @@ "PROXY_DEPLOYER": "0xa9fccb07dd3f774d5b9d02e99de1a27f47f91189", "SAI_TUB": "0xa71937147b55deb8a530c7229c442fd3f31b7db2", "MIGRATION": "0x411b2faa662c8e3e5cf8f01dfdae0aee482ca7b0", - "MIGRATION_PROXY_ACTIONS": "0x433870076abd08865f0e038dcc4ac6450e313bd8" + "MIGRATION_PROXY_ACTIONS": "0xf56765d255463139d3aff1613705a5520764ab93" } \ No newline at end of file diff --git a/packages/dai-plugin-mcd/contracts/addresses/mainnet.json b/packages/dai-plugin-mcd/contracts/addresses/mainnet.json index 32bf813b7..24b1d731c 100644 --- a/packages/dai-plugin-mcd/contracts/addresses/mainnet.json +++ b/packages/dai-plugin-mcd/contracts/addresses/mainnet.json @@ -4,6 +4,7 @@ "FAUCET": "0x0000000000000000000000000000000000000000", "MCD_DEPLOY": "0xbaa65281c2fa2baacb2cb550ba051525a480d3f4", "MCD_GOV": "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2", + "GOV_GUARD": "0xc725e52e55929366dfdf86ac4857ae272e8bf13d", "MCD_ADM": "0x9eF05f7F6deB616fd37aC3c959a2dDD25A54E4F5", "MCD_VAT": "0x35d1b3f3d7966a1dfe207aa4514c12a259a0492b", "MCD_JUG": "0x19c0976f590d67707e62397c87829d896dc0f1f1", @@ -11,7 +12,7 @@ "MCD_VOW": "0xa950524441892a31ebddf91d3ceefa04bf454466", "MCD_JOIN_DAI": "0x9759a6ac90977b93b58547b4a71c78317f391a28", "MCD_FLAP": "0xdfe0fb1be2a52cdbf8fb962d5701d7fd0902db9f", - "MCD_FLOP": "0xbe00fe8dfd9c079f1e5f5ad7ae9a3ad2c571fcac", + "MCD_FLOP": "0x4d95a049d5b0b7d32058cd3f2163015747522e99", "MCD_PAUSE": "0xbe286431454714f511008713973d3b053a2d38f3", "MCD_PAUSE_PROXY": "0xbe8e3e3618f7474f8cb1d074a26affef007e98fb", "MCD_GOV_ACTIONS": "0x4f5f0933158569c026d617337614d00ee6589b6e", @@ -28,12 +29,10 @@ "PROXY_FACTORY": "0xa26e15c895efc0616177b7c1e7270a4c7d51c997", "PROXY_REGISTRY": "0x4678f0a6958e4d2bc4f1baf7bc52e8f3564f3fe4", "ETH": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", - "VAL_ETH": "0x81fe72b5a8d1a857d176c3e7d5bd2679a9b85763", "PIP_ETH": "0x81fe72b5a8d1a857d176c3e7d5bd2679a9b85763", "MCD_JOIN_ETH_A": "0x2f0b23f53734252bda2277357e97e1517d6b042a", "MCD_FLIP_ETH_A": "0xd8a04f5412223f513dc55f839574430f5ec15531", "BAT": "0x0d8775f648430679a709e98d2b0cb6250d2887ef", - "VAL_BAT": "0xb4eb54af9cc7882df0121d26c5b97e802915abe6", "PIP_BAT": "0xb4eb54af9cc7882df0121d26c5b97e802915abe6", "MCD_JOIN_BAT_A": "0x3d0b1912b66114d4096f48a8cee3a56c231772ca", "MCD_FLIP_BAT_A": "0xaa745404d55f88c108a28c86abe7b5a1e7817c07", @@ -45,5 +44,5 @@ "PROXY_DEPLOYER": "0x1b93556ab8dccef01cd7823c617a6d340f53fb58", "SAI_TUB": "0x448a5065aebb8e423f0896e6c5d525c040f59af3", "MIGRATION": "0xc73e0383f3aff3215e6f04b0331d58cecf0ab849", - "MIGRATION_PROXY_ACTIONS": "0xe4b22d484958e582098a98229a24e8a43801b674" + "MIGRATION_PROXY_ACTIONS": "0x2e1f6062d9fb227069741e40f89186df222fb426" } \ No newline at end of file diff --git a/packages/dai-plugin-migrations/contracts/abis/MigrationProxyActions.json b/packages/dai-plugin-migrations/contracts/abis/MigrationProxyActions.json index 2ca3de053..96c645a79 100644 --- a/packages/dai-plugin-migrations/contracts/abis/MigrationProxyActions.json +++ b/packages/dai-plugin-migrations/contracts/abis/MigrationProxyActions.json @@ -1 +1 @@ -[{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"}],"name":"migrate","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"},{"internalType":"uint256","name":"minRatio","type":"uint256"}],"name":"migratePayFeeWithDebt","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"address","name":"payGem","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"}],"name":"migratePayFeeWithGem","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapDaiToSai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapSaiToDai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file +[{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"address","name":"jug","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"}],"name":"migrate","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"address","name":"jug","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"},{"internalType":"uint256","name":"minRatio","type":"uint256"}],"name":"migratePayFeeWithDebt","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"address","name":"jug","type":"address"},{"internalType":"bytes32","name":"cup","type":"bytes32"},{"internalType":"address","name":"otc","type":"address"},{"internalType":"address","name":"payGem","type":"address"},{"internalType":"uint256","name":"maxPayAmt","type":"uint256"}],"name":"migratePayFeeWithGem","outputs":[{"internalType":"uint256","name":"cdp","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapDaiToSai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"scdMcdMigration","type":"address"},{"internalType":"uint256","name":"wad","type":"uint256"}],"name":"swapSaiToDai","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/packages/dai-plugin-migrations/contracts/addresses/kovan.json b/packages/dai-plugin-migrations/contracts/addresses/kovan.json index b61e4c0c4..f1e7e96ad 100644 --- a/packages/dai-plugin-migrations/contracts/addresses/kovan.json +++ b/packages/dai-plugin-migrations/contracts/addresses/kovan.json @@ -9,5 +9,5 @@ "REDEEMER": "0x2c0f31271673cc29927be725104642aad65a253e", "OLD_MKR": "0x4bb514a7f83fbb13c2b41448208e89fabbcfe2fb", "MIGRATION": "0x411b2faa662c8e3e5cf8f01dfdae0aee482ca7b0", - "MIGRATION_PROXY_ACTIONS": "0x433870076abd08865f0e038dcc4ac6450e313bd8" + "MIGRATION_PROXY_ACTIONS": "0xf56765d255463139d3aff1613705a5520764ab93" } diff --git a/packages/dai-plugin-migrations/src/migrations/SingleToMultiCdp.js b/packages/dai-plugin-migrations/src/migrations/SingleToMultiCdp.js index 22f323628..eb533e8e2 100644 --- a/packages/dai-plugin-migrations/src/migrations/SingleToMultiCdp.js +++ b/packages/dai-plugin-migrations/src/migrations/SingleToMultiCdp.js @@ -22,13 +22,17 @@ export default class SingleToMultiCdp { @tracksTransactionsWithOptions({ numArguments: 5 }) async execute(cupId, payment = 'MKR', maxPayAmount, minRatio, { promise }) { + const jug = this._manager + .get('smartContract') + .getContract('MCD_JUG') + .address; const migrationProxy = this._manager .get('smartContract') .getContract('MIGRATION_PROXY_ACTIONS'); const migration = this._manager .get('smartContract') .getContract('MIGRATION'); - const defaultArgs = [migration.address, getIdBytes(cupId)]; + const defaultArgs = [migration.address, jug, getIdBytes(cupId)]; const { method, args } = this._setMethodAndArgs( payment, defaultArgs, diff --git a/yarn.lock b/yarn.lock index 7da925f72..3831b5d10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1701,10 +1701,10 @@ js-sha3 "^0.8.0" lodash "^4.17.11" -"@makerdao/testchain@^0.2.17-1": - version "0.2.17-1" - resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-0.2.17-1.tgz#a4546094d7155cd0b7f024c3b288dc3b27684bc2" - integrity sha512-Yl9aeeFGUMv4qOpC8hUA0eY/9MkQSXFexEv9wf2NgmvgA9Y1Lp9B6328e24G6uHOJuJKOBqkaXVJ3jRpFd7xng== +"@makerdao/testchain@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.0.1.tgz#49fdf1a9c870c45bfbf12cabdf2ecb6ab06674c6" + integrity sha512-fUOl7gBXgvCqmyMpaDdv0IfB2JUXfKcDt2ZjNOMrvTsBfxrVaasr8B21bXyZkT9rk6jmtwTNUyCzZCH32aurOA== dependencies: ganache-cli makerdao/ganache-cli#fix/gas-est-crash