update to hardhat

thegostep · thegostep · commit 562f17df0132 · 2020-12-23T16:06:38.000Z
diff --git a/buidler.config.ts b/buidler.config.ts
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -0,0 +1,17 @@
+import { HardhatUserConfig } from 'hardhat/config'
+
+import '@nomiclabs/hardhat-ethers'
+import '@nomiclabs/hardhat-waffle'
+import '@openzeppelin/hardhat-upgrades'
+import 'solidity-coverage'
+
+require('./scripts/deploy')
+
+export default {
+  solidity: {
+    version: '0.4.24',
+  },
+  mocha: {
+    timeout: 100000,
+  },
+} as HardhatUserConfig
diff --git a/package.json b/package.json
@@ -18,9 +18,9 @@
   "license": "ISC",
   "author": "dev-support@ampleforth.org",
   "scripts": {
-    "compile": "yarn buidler compile",
-    "test": "yarn buidler test",
-    "coverage": "yarn buidler coverage --testfiles 'test/unit/*.ts'",
+    "compile": "yarn hardhat compile",
+    "test": "yarn hardhat test",
+    "coverage": "yarn hardhat coverage --testfiles 'test/unit/*.ts'",
     "format": "yarn prettier --config .prettierrc --write '**/*.ts' 'contracts/**/*.sol'",
     "lint": "yarn solhint 'contracts/**/*.sol'"
   },
@@ -29,24 +29,24 @@
     "lint"
   ],
   "devDependencies": {
-    "@nomiclabs/buidler": "^1.4.5",
-    "@nomiclabs/buidler-ethers": "^2.0.0",
-    "@nomiclabs/buidler-waffle": "^2.1.0",
-    "@openzeppelin/buidler-upgrades": "^1.0.2",
+    "@nomiclabs/hardhat-ethers": "^2.0.1",
+    "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "@openzeppelin/hardhat-upgrades": "^1.4.3",
     "@types/chai": "^4.2.12",
     "@types/mocha": "^8.0.3",
     "@types/node": "^14.6.1",
     "bignumber.js": "^9.0.0",
     "chai": "^4.2.0",
-    "ethereum-waffle": "^3.0.0",
-    "ethers": "^5.0.13",
+    "ethereum-waffle": "^3.2.1",
+    "ethers": "^5.0.24",
+    "hardhat": "^2.0.6",
     "pre-commit": "^1.2.2",
     "prettier": "^2.1.1",
     "prettier-plugin-solidity": "^1.0.0-alpha.57",
     "solc": "0.4.24",
     "solhint": "^3.2.0",
     "solhint-plugin-prettier": "^0.0.5",
-    "solidity-coverage": "^0.7.10",
+    "solidity-coverage": "^0.7.13",
     "stochasm": "^0.5.0",
     "ts-node": "^9.0.0",
     "typescript": "^4.0.2"
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -1,8 +1,8 @@
-import { task } from '@nomiclabs/buidler/config'
+import { task } from 'hardhat/config'
 import { getAdminAddress } from '@openzeppelin/upgrades-core'
 import ProxyAdmin from '@openzeppelin/upgrades-core/artifacts/ProxyAdmin.json'
 import MultiSigWallet from './MultiSigWalletWithDailyLimit.json'
-import { Interface } from 'ethers/lib/utils'
+import { Interface } from '@ethersproject/abi'
 import { TransactionReceipt } from '@ethersproject/providers'
 
 const parseEvents = (
diff --git a/test/simulation/supply_precision.ts b/test/simulation/supply_precision.ts
@@ -6,7 +6,7 @@
       - the difference in totalSupply() before and after the rebase(+1) should be exactly 1.
 */
 
-import { ethers, upgrades } from '@nomiclabs/buidler'
+import { ethers, upgrades } from 'hardhat'
 import { expect } from 'chai'
 
 async function exec() {
diff --git a/test/simulation/transfer_precision.ts b/test/simulation/transfer_precision.ts
@@ -9,7 +9,7 @@
   increased by x fragments.
 */
 
-import { ethers, upgrades } from '@nomiclabs/buidler'
+import { ethers, upgrades } from 'hardhat'
 import { expect } from 'chai'
 import { BigNumber, BigNumberish, Contract, Signer } from 'ethers'
 import { imul } from '../utils/utils'
diff --git a/test/unit/Orchestrator.ts b/test/unit/Orchestrator.ts
@@ -1,10 +1,11 @@
-import { ethers, waffle } from '@nomiclabs/buidler'
+import { ethers, waffle } from 'hardhat'
 import { Contract, Signer } from 'ethers'
 import { increaseTime } from '../utils/utils'
 import { expect } from 'chai'
+import { TransactionResponse } from '@ethersproject/providers'
 
 let orchestrator: Contract, mockPolicy: Contract, mockDownstream: Contract
-let r: any
+let r: Promise<TransactionResponse>
 let deployer: Signer, user: Signer
 
 async function mockedOrchestrator() {
diff --git a/test/unit/SafeMathInt.ts b/test/unit/SafeMathInt.ts
@@ -1,4 +1,4 @@
-import { ethers } from '@nomiclabs/buidler'
+import { ethers } from 'hardhat'
 import { Contract } from 'ethers'
 import { expect } from 'chai'
 
diff --git a/test/unit/UFragments.ts b/test/unit/UFragments.ts
@@ -1,4 +1,4 @@
-import { ethers, upgrades } from '@nomiclabs/buidler'
+import { ethers, upgrades } from 'hardhat'
 import { Contract, Signer, BigNumber } from 'ethers'
 import { expect } from 'chai'
 
diff --git a/test/unit/UFragmentsPolicy.ts b/test/unit/UFragmentsPolicy.ts
@@ -1,4 +1,4 @@
-import { ethers, upgrades, waffle } from '@nomiclabs/buidler'
+import { ethers, upgrades, waffle } from 'hardhat'
 import { Contract, Signer, BigNumber, BigNumberish, Event } from 'ethers'
 import { TransactionResponse } from '@ethersproject/providers'
 import { expect } from 'chai'
diff --git a/test/unit/UInt256Lib.ts b/test/unit/UInt256Lib.ts
@@ -1,4 +1,4 @@
-import { ethers } from '@nomiclabs/buidler'
+import { ethers } from 'hardhat'
 import { Contract } from 'ethers'
 import { expect } from 'chai'
 
diff --git a/test/unit/uFragments_erc20_behavior.ts b/test/unit/uFragments_erc20_behavior.ts
@@ -22,11 +22,10 @@
   https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/test/token/ERC20/ERC20.test.js
 */
 
-import { ethers, upgrades, waffle } from '@nomiclabs/buidler'
+import { ethers, upgrades, waffle } from 'hardhat'
 import { Contract, Signer, BigNumber } from 'ethers'
 import { TransactionResponse } from '@ethersproject/providers'
 import { expect } from 'chai'
-import { AnySrvRecord } from 'dns'
 
 const toUFrgDenomination = (ample: string): BigNumber =>
   ethers.utils.parseUnits(ample, DECIMALS)
@@ -261,7 +260,7 @@ describe('UFragments:ERC20:approve', () => {
   describe('when the spender is NOT the zero address', function () {
     describe('when the sender has enough balance', function () {
       describe('when there was no approved amount before', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -293,7 +292,7 @@ describe('UFragments:ERC20:approve', () => {
       })
 
       describe('when the spender had an approved amount', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -327,7 +326,7 @@ describe('UFragments:ERC20:approve', () => {
 
     describe('when the sender does not have enough balance', function () {
       describe('when there was no approved amount before', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -359,7 +358,7 @@ describe('UFragments:ERC20:approve', () => {
       })
 
       describe('when the spender had an approved amount', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -403,7 +402,7 @@ describe('UFragments:ERC20:increaseAllowance', () => {
   describe('when the spender is NOT the zero address', function () {
     describe('when the sender has enough balance', function () {
       describe('when there was no approved amount before', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -437,7 +436,7 @@ describe('UFragments:ERC20:increaseAllowance', () => {
       })
 
       describe('when the spender had an approved amount', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         beforeEach(async function () {
           await token
             .connect(owner)
@@ -474,7 +473,7 @@ describe('UFragments:ERC20:increaseAllowance', () => {
 
     describe('when the sender does not have enough balance', function () {
       describe('when there was no approved amount before', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -509,7 +508,7 @@ describe('UFragments:ERC20:increaseAllowance', () => {
       })
 
       describe('when the spender had an approved amount', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         beforeEach(async function () {
           await token
             .connect(owner)
@@ -556,7 +555,7 @@ describe('UFragments:ERC20:decreaseAllowance', () => {
   describe('when the spender is NOT the zero address', function () {
     describe('when the sender does NOT have enough balance', function () {
       describe('when there was no approved amount before', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           r = token
             .connect(owner)
@@ -588,7 +587,7 @@ describe('UFragments:ERC20:decreaseAllowance', () => {
       })
 
       describe('when the spender had an approved amount', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -625,7 +624,7 @@ describe('UFragments:ERC20:decreaseAllowance', () => {
 
     describe('when the sender has enough balance', function () {
       describe('when there was no approved amount before', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
@@ -660,7 +659,7 @@ describe('UFragments:ERC20:decreaseAllowance', () => {
       })
 
       describe('when the spender had an approved amount', function () {
-        let r: any
+        let r: Promise<TransactionResponse>
         before(async function () {
           await token
             .connect(owner)
diff --git a/test/utils/utils.ts b/test/utils/utils.ts
@@ -1,4 +1,4 @@
-import { ethers } from '@nomiclabs/buidler'
+import { ethers } from 'hardhat'
 import { BigNumberish } from 'ethers'
 import { BigNumber as BN } from 'bignumber.js'
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,17 +1,19 @@
+  
 {
   "compilerOptions": {
     "target": "es5",
     "module": "commonjs",
     "strict": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
+    "downlevelIteration": true,
     "outDir": "dist"
   },
   "include": ["./scripts", "./test"],
   "files": [
-    "buidler.config.ts",
-    "./node_modules/@nomiclabs/buidler-ethers/src/type-extensions.d.ts",
-    "./node_modules/@nomiclabs/buidler-waffle/src/type-extensions.d.ts",
-    "./node_modules/@openzeppelin/buidler-upgrades/src/type-extensions.d.ts"
+    "hardhat.config.ts",
+    "./node_modules/@nomiclabs/hardhat-ethers/src/type-extensions.ts",
+    "./node_modules/@nomiclabs/hardhat-waffle/src/type-extensions.ts",
+    "./node_modules/@openzeppelin/hardhat-upgrades/src/type-extensions.ts"
   ]
-}
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ethers } from '@nomiclabs/buidler'`
	`1`	`+import { ethers } from 'hardhat'`
`2`	`2`	`import { Contract } from 'ethers'`
`3`	`3`	`import { expect } from 'chai'`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ethers, upgrades } from '@nomiclabs/buidler'`
	`1`	`+import { ethers, upgrades } from 'hardhat'`
`2`	`2`	`import { Contract, Signer, BigNumber } from 'ethers'`
`3`	`3`	`import { expect } from 'chai'`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ethers, upgrades, waffle } from '@nomiclabs/buidler'`
	`1`	`+import { ethers, upgrades, waffle } from 'hardhat'`
`2`	`2`	`import { Contract, Signer, BigNumber, BigNumberish, Event } from 'ethers'`
`3`	`3`	`import { TransactionResponse } from '@ethersproject/providers'`
`4`	`4`	`import { expect } from 'chai'`