Trying to update ethers, a terrible mistake right now

.circleci/config.yml

@@ -2,7 +2,7 @@
  jobs:
    build:
      docker:
-       - image: levity/dapptools-node-latest
+       - image: makerdaodux/dapptools-node-circleci-docker
      steps:
        - checkout
        - run:

.eslintrc

@@ -7,7 +7,7 @@
         "node": true
     },
     "extends": "eslint:recommended",
-    "parser": "babel-eslint",
+    "parser": "@typescript-eslint/parser",
     "parserOptions": {
         "ecmaVersion": 8,
         "sourceType": "module",

.prettierrc

@@ -1,3 +1,4 @@
 {
-  "singleQuote": true
+  "singleQuote": true,
+  "parser": "typescript"
 }

README.md

@@ -40,7 +40,17 @@ Run `yarn coverage` to generate a test coverage report.
 
 See [packages/dai/README.md](https://github.com/makerdao/dai.js/blob/dev/packages/dai/README.md#commands) for instructions.
 
+
+## Adding a package as dependency of another
+
+```
+ npx lerna add @makerdao/services-core packages/dai-plugin-mcd
+```
+
+
+
 [build]: https://circleci.com/gh/makerdao/dai.js.svg?style=svg
 [build-url]: https://circleci.com/gh/makerdao/dai.js
 [cover]: https://codecov.io/gh/makerdao/dai.js/branch/dev/graph/badge.svg
 [cover-url]: https://codecov.io/gh/makerdao/dai.js
+

package.json

@@ -23,7 +23,7 @@
     }
   },
   "lint-staged": {
-    "./packages/**/{src,web,test,contracts}/**/*.js": [
+    "./packages/**/{src,web,test,contracts}/**/*.(j|t)s": [
       "prettier --single-quote --write",
       "eslint"
     ]
@@ -32,39 +32,34 @@
     "packages/*"
   ],
   "dependencies": {
-    "lerna": "^3.15.0"
+    "lerna": "^4.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.4.5",
-    "@babel/node": "^7.2.2",
-    "@babel/plugin-proposal-class-properties": "^7.3.4",
-    "@babel/plugin-proposal-decorators": "^7.3.0",
-    "@babel/plugin-proposal-export-namespace-from": "^7.2.0",
-    "@babel/plugin-proposal-function-sent": "^7.2.0",
-    "@babel/plugin-proposal-numeric-separator": "^7.2.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
-    "@babel/plugin-proposal-throw-expressions": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.3.4",
-    "@babel/preset-env": "^7.4.5",
+    "@babel/core": "^7.15.5",
+    "@babel/plugin-proposal-decorators": "^7.15.4",
+    "@babel/preset-env": "^7.15.6",
+    "@babel/preset-typescript": "^7.15.0",
     "@makerdao/testchain": "^1.1.33-beta5",
-    "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.8.0",
-    "babel-loader": "^8.0.5",
-    "babel-plugin-module-resolver": "^3.2.0",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.10.1",
+    "@typescript-eslint/parser": "^4.31.2",
     "chokidar": "^2.0.4",
     "copyfiles": "^2.0.0",
     "eslint": "^5.15.1",
     "eslint-loader": "^2.1.2",
     "husky": "^3.0.8",
-    "jest": "^24.5.0",
+    "jest": "^27.2.1",
     "jest-fetch-mock": "^3.0.3",
     "lint-staged": "^7.1.0",
     "minimist": "^1.2.0",
     "prettier": "^1.12.1",
     "sane": "^4.0.3",
     "solc": "^0.4.23",
     "terser-webpack-plugin": "^2.3.6",
+    "ts-jest": "^27.0.5",
+    "ts-loader": "^9.2.6",
+    "tsdx": "^0.14.1",
+    "typescript": "^4.4.3",
     "webpack": "^4.43.0",
     "webpack-bundle-analyzer": "^3.7.0",
     "webpack-cli": "^3.3.11"

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

@@ -1,11 +1,16 @@
 module.exports = {
+  preset: 'ts-jest',
+  transform: {
+    '^.+\\.(ts|js)?$': 'ts-jest',
+  },
   rootDir: './',
   coverageReporters: ['json', 'lcov', 'text-summary'],
-  collectCoverageFrom: ['src/**/*.js'],
+  collectCoverageFrom: ['src/**/*.js', 'src/**/*.ts'],
   roots: ['src', 'test'],
   setupFilesAfterEnv: ['<rootDir>/test/config/original-setup.js'],
   testPathIgnorePatterns: [
     '<rootDir>/node_modules/',
     '<rootDir>/test/integration/'
-  ]
+  ],
+  testEnvironment : 'jsdom'
 };

packages/dai-plugin-governance/package.json

@@ -8,13 +8,13 @@
     "url": "https://github.com/makerdao/dai-plugin-governance.git"
   },
   "main": "dist/index.js",
-  "unpkg": "umd/index.js",
-  "jsdelivr": "umd/index.js",
+  "unpkg": "dist/index.js",
+  "jsdelivr": "dist/dai-plugin-governance.esm.js",
+  "typings": "dist/index.d.ts",
+  "module": "dist/dai-plugin-governance.esm.js",
   "scripts": {
-    "build": "yarn clean && yarn build:cjs && yarn build:umd",
-    "build:umd": "webpack --config ../../webpack.config.js",
-    "clean": "rm -rf ./dist ./umd",
-    "build:cjs": "../../scripts/build.sh",
+    "build": "yarn clean && tsdx build && ./scripts/copy-files.sh",
+    "clean": "rm -rf ./dist",
     "prepublishOnly": "yarn build",
     "testchain": "../../scripts/run-testchain.sh",
     "test": "yarn testchain --ci jest --runInBand",
@@ -29,17 +29,16 @@
   },
   "dependencies": {
     "@makerdao/currency": "0.9.9",
+    "@makerdao/dai": "^0.32.13",
     "@makerdao/services-core": "^0.10.0",
     "assert": "^2.0.0",
     "debug": "^4.1.1",
     "ramda": "^0.25.0"
   },
   "peerDependencies": {
-    "@makerdao/dai": "^0.31"
+    "@makerdao/dai": "^0.32.13"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@makerdao/dai": "^0.31",
     "@makerdao/dai-plugin-config": "^0.2.14-rc.1",
     "web3-utils": "^1.2.6"
   }

packages/dai-plugin-governance/scripts/copy-files.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+copyfiles contracts/abis/* dist/abis -f
+copyfiles contracts/addresses/* dist/addresses -f
+copyfiles contracts/contract-info.json dist

packages/dai-plugin-governance/src/GovPollingService.js → packages/dai-plugin-governance/src/GovPollingService.ts

@@ -1,3 +1,5 @@
+// TODO Remove ignore
+// @ts-nocheck
 import { PrivateService } from '@makerdao/services-core';
 import { POLLING, BATCH_POLLING } from './utils/constants';
 import { MKR } from './utils/constants';
@@ -8,6 +10,8 @@ import tracksTransactions from './utils/tracksTransactions';
 const POSTGRES_MAX_INT = 2147483647;
 
 export default class GovPollingService extends PrivateService {
+  polls;
+
   constructor(name = 'govPolling') {
     super(name, [
       'smartContract',

packages/dai-plugin-governance/src/index.js → packages/dai-plugin-governance/src/index.ts

@@ -22,10 +22,17 @@ import GovQueryApiService from './GovQueryApiService';
 import EsmService from './EsmService';
 import SpellService from './SpellService';
 
+type ContractAddresses = {
+  kovan: { [key: string]: string };
+  mainnet: { [key: string]: string };
+  testnet?: { [key: string]: string };
+};
+
 export { MKR, IOU };
+
 export default {
   addConfig: function(config, { network = 'mainnet', staging = false }) {
-    const contractAddresses = {
+    const contractAddresses: ContractAddresses = {
       kovan: require('../contracts/addresses/kovan.json'),
       mainnet: require('../contracts/addresses/mainnet.json')
     };

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

@@ -26,18 +26,18 @@ beforeAll(async () => {
   maker.useAccount('owner');
 });
 
-afterAll(async done => {
+afterAll(async () => {
   if (global.useOldChain) {
     await restoreSnapshotOriginal(global.snapshotId);
-    done();
+    return;
   } else {
     global.client.restoreSnapshot(global.testchainId, global.defaultSnapshotId);
     await sleep(15000);
 
     await global.client.delete(global.testchainId);
     await sleep(15000);
 
-    done();
+    return;
   }
 });
 

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

@@ -17,18 +17,18 @@ beforeAll(async () => {
   await setUpAllowance(maker, esmService._esmContract().address);
 });
 
-afterAll(async done => {
+afterAll(async () => {
   if (global.useOldChain) {
     await restoreSnapshotOriginal(global.snapshotId);
-    done();
+    return;
   } else {
     global.client.restoreSnapshot(global.testchainId, global.defaultSnapshotId);
     await sleep(15000);
 
     await global.client.delete(global.testchainId);
     await sleep(15000);
 
-    done();
+    return;
   }
 });
 

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

@@ -42,16 +42,16 @@ beforeAll(async () => {
   maker.useAccount('owner');
 });
 
-afterAll(async done => {
+afterAll(async () => {
   if (global.useOldChain) {
     await restoreSnapshotOriginal(global.snapshotId);
-    done();
+    return;
   } else {
     global.client.restoreSnapshot(global.testchainId, global.defaultSnapshotId);
     await sleep(15000);
     await global.client.delete(global.testchainId);
     await sleep(15000);
-    done();
+    return;
   }
 });
 

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

@@ -6,18 +6,18 @@ import {
 
 let maker, spellService;
 
-afterAll(async done => {
+afterAll(async () => {
   if (global.useOldChain) {
     await restoreSnapshotOriginal(global.snapshotId);
-    done();
+    return;
   } else {
     global.client.restoreSnapshot(global.testchainId, global.defaultSnapshotId);
     await sleep(15000);
 
     await global.client.delete(global.testchainId);
     await sleep(15000);
 
-    done();
+    return;
   }
 });
 

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

@@ -8,9 +8,9 @@ beforeAll(async () => {
   vdfs = maker.service('voteDelegateFactory');
 });
 
-afterAll(async done => {
+afterAll(async () => {
   await restoreSnapshotOriginal(global.snapshotId);
-  done();
+  return;
 });
 
 test('can create vote delegate factory service', async () => {

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

@@ -32,9 +32,9 @@ beforeAll(async () => {
   await vdfs.createDelegateContract();
 });
 
-afterAll(async done => {
+afterAll(async () => {
   await restoreSnapshotOriginal(global.snapshotId);
-  done();
+  return;
 });
 
 test('can create vote delegate service', async () => {