add CdpManager.draw

BAT doesn't like it when you try to transfer 0, which is what happens if you use lockAndDraw when just drawing
makerdao · Nov 18, 2019 · cf62458 · jparklev · Nov 18, 2019 · levity
1 parent 8390e24
commit cf62458
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 60 deletions.
diff --git a/packages/dai-plugin-mcd/src/CdpManager.js b/packages/dai-plugin-mcd/src/CdpManager.js
@@ -141,7 +141,7 @@ export default class CdpManager extends LocalService {
     const jugAddress = this.get('smartContract').getContractAddress('MCD_JUG');
     const isEth = ETH.isInstance(lockAmount);
     const isGnt = GNT.isInstance(lockAmount);
-    const method = setMethod(isEth, isGnt, id);
+    const method = setMethod(isEth, isGnt, id, lockAmount);
     const args = [
       this._managerAddress,
       jugAddress,
@@ -200,48 +200,54 @@ export default class CdpManager extends LocalService {
     return this.proxyActions[method](...args);
   }
 
+  @tracksTransactions
+  async draw(id, ilk, drawAmount, { promise }) {
+    return this.proxyActions.draw(
+      this._managerAddress,
+      this.get('smartContract').getContractAddress('MCD_JUG'),
+      this._adapterAddress('DAI'),
+      this.getIdBytes(id),
+      castAsCurrency(drawAmount, MDAI).toFixed('wei'),
+      { dsProxy: true, promise }
+    );
+  }
+
   @tracksTransactionsWithOptions({ numArguments: 5 })
   wipeAndFree(id, ilk, wipeAmount = MDAI(0), freeAmount, { promise }) {
     const isEth = ETH.isInstance(freeAmount);
     const method = isEth ? 'wipeAndFreeETH' : 'wipeAndFreeGem';
     return this.proxyActions[method](
-      ...[
-        this._managerAddress,
-        this._adapterAddress(ilk),
-        this._adapterAddress('DAI'),
-        this.getIdBytes(id),
-        freeAmount.toFixed(this._precision(freeAmount)),
-        wipeAmount.toFixed('wei'),
-        { dsProxy: true, promise }
-      ].filter(x => x)
+      this._managerAddress,
+      this._adapterAddress(ilk),
+      this._adapterAddress('DAI'),
+      this.getIdBytes(id),
+      freeAmount.toFixed(this._precision(freeAmount)),
+      wipeAmount.toFixed('wei'),
+      { dsProxy: true, promise }
     );
   }
 
   @tracksTransactions
   async wipe(id, wipeAmount, owner, { promise }) {
     if (!owner) owner = await this.getOwner(id);
     return this.proxyActions.safeWipe(
-      ...[
-        this._managerAddress,
-        this._adapterAddress('DAI'),
-        this.getIdBytes(id),
-        wipeAmount.toFixed('wei'),
-        owner,
-        { dsProxy: true, promise }
-      ].filter(x => x)
+      this._managerAddress,
+      this._adapterAddress('DAI'),
+      this.getIdBytes(id),
+      wipeAmount.toFixed('wei'),
+      owner,
+      { dsProxy: true, promise }
     );
   }
 
   @tracksTransactions
   unsafeWipe(id, wipeAmount, { promise }) {
     return this.proxyActions.wipe(
-      ...[
-        this._managerAddress,
-        this._adapterAddress('DAI'),
-        this.getIdBytes(id),
-        wipeAmount.toFixed('wei'),
-        { dsProxy: true, promise }
-      ].filter(x => x)
+      this._managerAddress,
+      this._adapterAddress('DAI'),
+      this.getIdBytes(id),
+      wipeAmount.toFixed('wei'),
+      { dsProxy: true, promise }
     );
   }
 
@@ -272,14 +278,12 @@ export default class CdpManager extends LocalService {
     const isEth = ETH.isInstance(freeAmount);
     const method = isEth ? 'wipeAllAndFreeETH' : 'wipeAllAndFreeGem';
     return this.proxyActions[method](
-      ...[
-        this._managerAddress,
-        this._adapterAddress(ilk),
-        this._adapterAddress('DAI'),
-        this.getIdBytes(id),
-        freeAmount.toFixed(this._precision(freeAmount)),
-        { dsProxy: true, promise }
-      ].filter(x => x)
+      this._managerAddress,
+      this._adapterAddress(ilk),
+      this._adapterAddress('DAI'),
+      this.getIdBytes(id),
+      freeAmount.toFixed(this._precision(freeAmount)),
+      { dsProxy: true, promise }
     );
   }
 

diff --git a/packages/dai-plugin-mcd/src/ManagedCdp.js b/packages/dai-plugin-mcd/src/ManagedCdp.js
@@ -1,5 +1,7 @@
 import { castAsCurrency, stringToBytes } from './utils';
-import { tracksTransactionsWithOptions } from './utils/tracksTransactions';
+import tracksTransactions, {
+  tracksTransactionsWithOptions
+} from './utils/tracksTransactions';
 import { ServiceRoles } from './constants';
 import assert from 'assert';
 import { MDAI } from './index';
@@ -98,8 +100,9 @@ export default class ManagedCdp {
     return this._cdpManager.lock(this.id, this.ilk, amount, null);
   }
 
-  drawDai(amount) {
-    return this.lockAndDraw(undefined, amount);
+  @tracksTransactions
+  drawDai(amount, { promise }) {
+    return this._cdpManager.draw(this.id, this.ilk, amount, { promise });
   }
 
   @tracksTransactionsWithOptions({ numArguments: 3 })

diff --git a/packages/dai-plugin-mcd/test/ManagedCdp.spec.js b/packages/dai-plugin-mcd/test/ManagedCdp.spec.js
@@ -1,6 +1,6 @@
 import { takeSnapshot, restoreSnapshot } from '@makerdao/test-helpers';
 import { mcdMaker, setupCollateral } from './helpers';
-import { ETH, REP, MDAI, USD, GNT, OMG, DGD, BAT } from '../src';
+import { ETH, MDAI, USD, BAT, GNT, DGD } from '../src';
 import { ServiceRoles } from '../src/constants';
 import { dummyEventData, formattedDummyEventData } from './fixtures';
 import { createCurrencyRatio } from '@makerdao/currency';
@@ -13,11 +13,9 @@ beforeAll(async () => {
   maker = await mcdMaker({
     cdpTypes: [
       { currency: ETH, ilk: 'ETH-A' },
-      { currency: BAT, ilk: 'BAT-A' }
-      // { currency: REP, ilk: 'REP-A' },
-      // { currency: OMG, ilk: 'OMG-A' },
-      // { currency: DGD, ilk: 'DGD-A', decimals: 9 },
-      // { currency: GNT, ilk: 'GNT-A' }
+      { currency: BAT, ilk: 'BAT-A' },
+      { currency: DGD, ilk: 'DGD-A', decimals: 9 },
+      { currency: GNT, ilk: 'GNT-A' }
     ]
   });
   dai = maker.getToken(MDAI);
@@ -131,22 +129,17 @@ describe.each([
     'BAT-A',
     BAT,
     async () => setupCollateral(maker, 'BAT-A', { price: 100, debtCeiling: 50 })
+  ],
+  [
+    'GNT-A',
+    GNT,
+    async () => setupCollateral(maker, 'GNT-A', { price: 100, debtCeiling: 50 })
+  ],
+  [
+    'DGD-A',
+    DGD,
+    async () => setupCollateral(maker, 'DGD-A', { price: 100, debtCeiling: 50 })
   ]
-  // [
-  //   'GNT-A',
-  //   GNT,
-  //   async () => setupCollateral(maker, 'GNT-A', { price: 100, debtCeiling: 50 })
-  // ],
-  // [
-  //   'OMG-A',
-  //   OMG,
-  //   async () => setupCollateral(maker, 'OMG-A', { price: 100, debtCeiling: 50 })
-  // ],
-  // [
-  //   'DGD-A',
-  //   DGD,
-  //   async () => setupCollateral(maker, 'DGD-A', { price: 100, debtCeiling: 50 })
-  // ]
 ])('%s', (ilk, GEM, setup) => {
   let startingGemBalance, startingDaiBalance;
 
@@ -236,9 +229,7 @@ describe.each([
 
     const draw = cdp.drawDai(1);
     const drawHandler = jest.fn((tx, state) => {
-      expect(tx.metadata.method).toBe(
-        `lock${GEM == ETH ? 'ETH' : 'Gem'}AndDraw`
-      );
+      expect(tx.metadata.method).toBe('draw');
       expect(state).toBe(txStates[drawHandler.mock.calls.length - 1]);
     });
     txMgr.listen(draw, drawHandler);