Migrate smart contracts extensions to hardhat

smart-contract-extensions/.gitignore

@@ -6,4 +6,7 @@ mnemonic.*
 .openzeppelin/.session
 .openzeppelin/dev-*
 coverage.json
-coverage/
+coverage/
+
+artifacts
+cache

smart-contract-extensions/hardhat.config.js

@@ -0,0 +1,32 @@
+/**
+ * @type import('hardhat/config').HardhatUserConfig
+ */
+
+// gas reporting for tests
+require('hardhat-gas-reporter')
+
+// truffle testing
+require('@nomiclabs/hardhat-truffle5')
+
+// code coverage
+require("solidity-coverage");
+
+const settings = {
+  optimizer: {
+    enabled: true,
+    runs: 2000000,
+  },
+}
+
+module.exports = {
+  solidity: {
+    compilers: [
+      { version: '0.6.11', settings },
+    ]
+  },
+  gasReporter: {
+    currency: 'USD',
+    excludeContracts: ['Migrations'],
+    gasPrice: 5,
+  },
+}

smart-contract-extensions/package.json

@@ -4,12 +4,11 @@
   "description": "Contracts which interact with other contracts",
   "scripts": {
     "build": "yarn compile",
-    "compile": "truffle compile",
-    "test": "truffle test",
+    "compile": "hardhat compile",
+    "test": "hardhat test",
     "lint": "solium -d ./contracts/ && eslint .",
     "lintFix": "solium -d ./contracts/ --fix && eslint . --fix",
-    "coverage": "truffle run coverage",
-    "ganache": "ganache-cli",
+    "coverage": "hardhat coverage",
     "ci": "yarn build && yarn test && yarn coverage"
   },
   "files": [
@@ -31,29 +30,30 @@
   "author": "HardlyDifficult",
   "license": "MIT",
   "dependencies": {
+    "@nomiclabs/hardhat-truffle5": "2.0.0",
+    "@nomiclabs/hardhat-web3": "2.0.0",
     "@openzeppelin/contracts": "3.1.0",
     "@openzeppelin/test-helpers": "0.5.13",
     "@openzeppelin/upgrades": "2.8.0",
     "@typescript-eslint/eslint-plugin": "4.3.0",
     "@typescript-eslint/parser": "4.3.0",
     "@unlock-protocol/unlock-abi-7": "1.0.3",
-    "@vue/cli": "4.5.13",
     "babel-eslint": "10.1.0",
     "bignumber.js": "9.0.1",
     "chai": "4.2.0",
-    "coveralls": "3.1.1",
     "eslint": "7.8.1",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-json": "3.0.0",
     "eslint-plugin-markdown": "2.0.0",
     "eslint-plugin-prettier": "3.1.4",
-    "eth-gas-reporter": "0.2.22",
+    "hardhat": "^2.6.2",
+    "hardhat-gas-reporter": "^1.0.4",
     "hardlydifficult-eth": "1.1.2",
     "prettier": "2.1.1",
     "solidity-coverage": "0.7.17",
     "solium": "1.2.5",
-    "truffle": "5.1.43",
     "truffle-assertions": "0.9.2",
-    "truffle-flattener": "1.4.4"
+    "web3": "1.5.2",
+    "web3-eth-abi": "^1.5.2"
   }
 }

smart-contract-extensions/test/hooks/codeRequiredHook.js

@@ -21,12 +21,15 @@ contract('CodeRequiredHook', accounts => {
 
     // Calculate the code account
     const code = 'super secret hard to guess code goes here'
-    const codePK = web3.eth.abi.encodeParameters(
+
+    const codePK = web3.utils.keccak256(
+      web3.eth.abi.encodeParameters(
       ['address', 'bytes32'],
       // By including the lock address in the codePK, we can have
       // codes reused for multiple locks without that being visible on-chain
       [lock.address, web3.utils.keccak256(code)]
-    )
+    ))
+
     codeAccount = web3.eth.accounts.privateKeyToAccount(codePK)
 
     // Create the hook contract with that code
@@ -90,12 +93,13 @@ contract('CodeRequiredHook', accounts => {
   it('can not buy with an incorrect code provided', async () => {
     // Calculate an incorrect code
     const code = 'WRONG'
-    const codePK = web3.eth.abi.encodeParameters(
-      ['address', 'bytes32'],
-      // By including the lock address in the codePK, we can have
-      // codes reused for multiple locks without that being visible on-chain
-      [lock.address, web3.utils.keccak256(code)]
-    )
+    const codePK = web3.utils.keccak256(
+      web3.eth.abi.encodeParameters(
+        ['address', 'bytes32'],
+        // By including the lock address in the codePK, we can have
+        // codes reused for multiple locks without that being visible on-chain
+        [lock.address, web3.utils.keccak256(code)]
+    ))
     const wrongcodeAccount = web3.eth.accounts.privateKeyToAccount(codePK)
     const messageToSign = web3.utils.keccak256(
       web3.eth.abi.encodeParameters(['address'], [keyBuyer])

smart-contract-extensions/test/hooks/discountCodeHook.js

@@ -214,7 +214,7 @@ contract('DiscountCodeHook', accounts => {
           from: keyBuyer,
         }
       ),
-      'ONLY_LOCK_MANAGER.'
+      "VM Exception while processing transaction: reverted with reason string 'ONLY_LOCK_MANAGER'"
     )
   })
 

smart-contract-extensions/test/uniswapAndCall.js

@@ -16,11 +16,16 @@ async function createAndFundExchange(uniswap, token, tokenOwner) {
   await token.mint(tokenOwner, '1000000000000000000000000', {
     from: tokenOwner,
   })
+
   await token.approve(exchange.address, -1, { from: tokenOwner })
+
+  const blockNumber = await web3.eth.getBlockNumber()
+  const latestBlock = await web3.eth.getBlock(blockNumber)
+
   await exchange.addLiquidity(
     '1',
     '1000000000000000000000000',
-    Math.round(Date.now() / 1000) + 60,
+    latestBlock.timestamp + 60,
     {
       from: tokenOwner,
       value: web3.utils.toWei('1', 'ether'),
@@ -139,6 +144,7 @@ contract('swapAndCall', accounts => {
     })
   })
 
+
   describe('started with sourceTokens', () => {
     beforeEach(async () => {
       await sourceToken.mint(testAccount, '1000000000000000000000000', {