From 03a4949753e4ebc36172c9f29e3a4c2ca7933ed0 Mon Sep 17 00:00:00 2001 From: Samyak Jain <34437877+KaymasJain@users.noreply.github.com> Date: Sun, 27 Oct 2019 01:12:48 +0530 Subject: [PATCH] Migrate Thrilok check done --- contracts/ProxyLogics/MCD/InstaMcdMigrate.sol | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contracts/ProxyLogics/MCD/InstaMcdMigrate.sol b/contracts/ProxyLogics/MCD/InstaMcdMigrate.sol index 66c1387..4e5cca2 100644 --- a/contracts/ProxyLogics/MCD/InstaMcdMigrate.sol +++ b/contracts/ProxyLogics/MCD/InstaMcdMigrate.sol @@ -352,7 +352,9 @@ contract LiquidityResolver is MCDResolver { contract MigrateResolver is LiquidityResolver { + event LogMigrate(uint scdCdp, uint toConvert, address payFeeWith, uint mcdCdp); + function migrate( uint scdCDP, // uint mcdCDP, for merge @@ -377,9 +379,9 @@ contract MigrateResolver is LiquidityResolver { // Check if sai_join has enough sai to migrate. if (saiBal < _wad) { + _wad = saiBal; // Set new convert ratio according to sai_join balance. - maxConvert = sub(wdiv(saiBal, _wadTotal), 1000000000000000); - _wad = wmul(_wadTotal, maxConvert); + maxConvert = sub(wdiv(saiBal, _wadTotal), 10); } uint _ink = wmul(tub.ink(scdCup), maxConvert); // Taking collateral in PETH only