Fix MKR redemption check

makerdao · Dec 17, 2019 · 39abd3d · 39abd3d
1 parent 54e23ea
commit 39abd3d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/dai-plugin-migrations/contracts/addresses/mainnet.json b/packages/dai-plugin-migrations/contracts/addresses/mainnet.json
@@ -1,7 +1,7 @@
 {
   "TUB": "0x448a5065aebb8e423f0896e6c5d525c040f59af3",
   "REDEEMER": "0x642ae78fafbb8032da552d619ad43f1d81e4dd7c",
-  "OLD_MKR": "0xa2f6ee81945259b1e38149efeb8931c08a61e4f9",
+  "OLD_MKR": "0xC66eA802717bFb9833400264Dd12c2bCeAa34a6d",
   "GET_CDPS_1": "0x36a724bd100c39f0ea4d3a20f7097ee01a8ff573",
   "CDP_MANAGER_1": "0x5ef30b9986345249bc32d8928b7ee64de9435e39",
   "MCD_END_1": "0xab14d3ce3f733cacb76ec2abe7d2fcb00c99f3d5",

diff --git a/packages/dai-plugin-migrations/src/MigrationService.js b/packages/dai-plugin-migrations/src/MigrationService.js
@@ -48,9 +48,8 @@ export default class MigrationService extends PublicService {
         SINGLE_TO_MULTI_CDP
       ).check(),
       [SAI_TO_DAI]: await this.getMigration(SAI_TO_DAI).check(),
-      [DAI_TO_SAI]: await this.getMigration(DAI_TO_SAI).check()
-      // removed until fixed on mainnet:
-      // [MKR_REDEEMER]: await this.getMigration(MKR_REDEEMER).check()
+      [DAI_TO_SAI]: await this.getMigration(DAI_TO_SAI).check(),
+      [MKR_REDEEMER]: await this.getMigration(MKR_REDEEMER).check()
     };
   }
 

diff --git a/packages/dai-plugin-migrations/src/migrations/MkrRedeemer.js b/packages/dai-plugin-migrations/src/migrations/MkrRedeemer.js
@@ -4,8 +4,9 @@ export default class MkrRedeemer {
     return this;
   }
 
-  async check() {
+  check() {
+    const address = this._manager.get('web3').currentAddress();
     const oldMkr = this._manager.get('token').getToken('OLD_MKR');
-    return oldMkr.balance();
+    return oldMkr.balanceOf(address);
   }
 }