Merge branch 'dev' into fix/goerli-ci

packages/dai-plugin-governance/babel.config.js

@@ -0,0 +1,23 @@
+module.exports = function(api) {
+    api.cache(true);
+
+    const presets = ['@babel/preset-env'];
+    const plugins = [
+      ['@babel/plugin-proposal-decorators', { legacy: true }],
+      '@babel/plugin-proposal-function-sent',
+      '@babel/plugin-proposal-export-namespace-from',
+      '@babel/plugin-proposal-numeric-separator',
+      '@babel/plugin-proposal-throw-expressions',
+      '@babel/plugin-proposal-class-properties',
+      '@babel/plugin-transform-runtime'
+    ];
+
+    const babelrcRoots = ['.', './lib/*'];
+
+    return {
+      presets,
+      plugins,
+      babelrcRoots
+    };
+  };
+

packages/dai-plugin-governance/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@makerdao/dai-plugin-governance",
   "description": "A dai.js plugin for adding MKR governance support to dapps.",
-  "version": "0.14.3",
+  "version": "0.14.6",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/dai-plugin-governance/src/SpellService.js

@@ -16,6 +16,7 @@ export default class SpellService extends PublicService {
     this.executionDate = {};
     this.scheduledDate = {};
     this.nextCastTime = {};
+    this.expiration = {};
     this.executiveHash = {};
     this.officeHours = {};
   }
@@ -50,6 +51,18 @@ export default class SpellService extends PublicService {
     return this.nextCastTime[spellAddress];
   }
 
+  async getExpiration(spellAddress) {
+    if (this.expiration[spellAddress]) return this.expiration[spellAddress];
+    const spell = this.get('smartContract').getContractByAddressAndAbi(
+      spellAddress,
+      DsSpellAbi
+    );
+    const expiration = await spell.expiration();
+    if (!expiration.toNumber()) return undefined;
+    this.expiration[spellAddress] = new Date(expiration.toNumber() * 1000);
+    return this.expiration[spellAddress];
+  }
+
   async getScheduledDate(spellAddress) {
     if (this.scheduledDate[spellAddress])
       return this.scheduledDate[spellAddress];

packages/dai-plugin-governance/test/SpellService.test.js

@@ -52,6 +52,15 @@ describe('use mainnet', () => {
     expect(eta).toEqual(new Date('2020-01-26T11:53:19.000Z'));
   });
 
+  test('get spell expiration', async () => {
+    const eta = await spellService.getExpiration(
+      '0x9400d4D59134af2a48a4bf4237E809A80f90Fe63'
+    );
+    expect(eta).toEqual(new Date('2021-11-07T20:22:48.000Z'));
+  });
+
+  //TODO: add test for getNextCastTime();
+
   test('get executive hash text', async () => {
     const done = await spellService.getExecutiveHash(
       '0x9400d4D59134af2a48a4bf4237E809A80f90Fe63'

packages/dai/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makerdao/dai",
-  "version": "0.32.15",
+  "version": "0.35.16",
   "contributors": [
     "Wouter Kampmann <[email protected]>",
     "Sean Brennan <[email protected]>",