chore: use trimmed down smock/plugins (#347)

* chore: use trimmed down smock/plugins

* fix: add storage layout for smock

* chore: lint

* fix: explicitly compile the OVM artifacts

* Use latest plugins and tweak package.json
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>

packages/contracts/.gitignore

 node_modules/
 artifacts/
+artifacts-ovm/
 cache/
+cache-ovm/
 yarn-error.log
 build/
 .DS_STORE

packages/contracts/hardhat.config.ts

@@ -10,7 +10,6 @@ import '@nomiclabs/hardhat-ethers'
 import '@nomiclabs/hardhat-waffle'
 import '@typechain/hardhat'
 import '@eth-optimism/plugins/hardhat/compiler'
-import '@eth-optimism/smock/build/src/plugins/hardhat-storagelayout'
 
 const config: HardhatUserConfig = {
   networks: {
@@ -26,6 +25,11 @@ const config: HardhatUserConfig = {
     version: '0.7.6',
     settings: {
       optimizer: { enabled: true, runs: 200 },
+      outputSelection: {
+        '*': {
+          '*': ['storageLayout'],
+        },
+      },
     },
   },
   typechain: {

packages/contracts/package.json

@@ -7,19 +7,22 @@
     "build/contracts/*",
     "build/dumps/*json",
     "build/artifacts/**/*.json",
+    "build/artifacts-ovm/**/*.json",
     "build/types/**/*.ts"
   ],
   "license": "MIT",
   "scripts": {
     "all": "yarn clean && yarn build && yarn test && yarn lint:fix && yarn lint",
-    "build": "yarn run build:contracts && yarn run build:typescript && yarn run build:copy && yarn run build:dump && yarn run build:typechain",
+    "build": "yarn run build:contracts && yarn run build:contracts:ovm && yarn run build:typescript && yarn run build:copy && yarn run build:dump && yarn run build:typechain",
     "build:kovan": "yarn run build:contracts && yarn run build:typescript && yarn run build:copy && CHAIN_ID=69 yarn run build:dump && yarn run build:typechain",
     "build:mainnet": "yarn run build:contracts && yarn run build:typescript && yarn run build:copy && CHAIN_ID=10 yarn run build:dump && yarn run build:typechain",
     "build:typescript": "tsc -p .",
     "build:contracts": "hardhat compile --show-stack-traces",
+    "build:contracts:ovm": "TARGET=ovm hardhat compile --show-stack-traces",
     "build:dump": "ts-node \"bin/take-dump.ts\"",
-    "build:copy": "yarn run build:copy:artifacts && yarn run build:copy:contracts",
+    "build:copy": "yarn run build:copy:artifacts && yarn build:copy:artifacts:ovm && yarn run build:copy:contracts",
     "build:copy:artifacts": "copyfiles -u 1 \"artifacts/**/*.json\" \"build/artifacts\"",
+    "build:copy:artifacts:ovm": "copyfiles -u 1 \"artifacts-ovm/**/*.json\" \"build/artifacts-ovm\"",
     "build:copy:contracts": "copyfiles -u 2 \"contracts/optimistic-ethereum/**/*.sol\" \"build/contracts\"",
     "build:typechain": "hardhat typechain",
     "test": "yarn run test:contracts",
@@ -29,25 +32,25 @@
     "lint:typescript": "tslint --format stylish --project .",
     "lint:fix": "yarn run lint:fix:typescript",
     "lint:fix:typescript": "prettier --config prettier-config.json --write \"hardhat.config.ts\" \"{src,test}/**/*.ts\"",
-    "clean": "rm -rf ./artifacts ./build ./cache",
+    "clean": "rm -rf ./build ./artifacts ./artifacts-ovm ./cache ./cache-ovm",
     "deploy": "./bin/deploy.js",
     "serve": "./bin/serve_dump.sh"
   },
   "dependencies": {
-    "@eth-optimism/core-utils": "^0.1.8",
+    "@eth-optimism/core-utils": "^0.1.10",
+    "@eth-optimism/dev": "^1.1.1",
     "@eth-optimism/solc": "^0.6.12-alpha.1",
     "@ethersproject/abstract-provider": "^5.0.8",
     "@ethersproject/contracts": "^5.0.5",
     "@ethersproject/hardware-wallets": "^5.0.8",
     "@openzeppelin/contracts": "^3.3.0",
     "@typechain/hardhat": "^1.0.1",
-    "ganache-core": "^2.12.1",
+    "ganache-core": "^2.13.2",
     "glob": "^7.1.6"
   },
   "devDependencies": {
-    "@eth-optimism/dev": "^1.1.1",
-    "@eth-optimism/plugins": "^0.0.17",
-    "@eth-optimism/smock": "0.2.1-alpha.0",
+    "@eth-optimism/plugins": "^1.0.0-alpha.2",
+    "@eth-optimism/smock": "^1.0.0-alpha.3",
     "@nomiclabs/hardhat-ethers": "^2.0.1",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@typechain/ethers-v5": "1.0.0",
@@ -56,7 +59,7 @@
     "buffer-xor": "^2.0.2",
     "chai": "^4.3.1",
     "copyfiles": "^2.3.0",
-    "ethereum-waffle": "3.0.0",
+    "ethereum-waffle": "^3.3.0",
     "ethers": "^5.0.31",
     "hardhat": "^2.0.8",
     "lodash": "^4.17.20",

packages/contracts/src/contract-defs.ts

@@ -5,8 +5,8 @@ import { Interface } from 'ethers/lib/utils'
 
 export const getContractDefinition = (name: string, ovm?: boolean): any => {
   const match = glob.sync(
-    path.resolve(__dirname, `../artifacts`) +
-      `/**/${name}${ovm ? '-ovm' : ''}.json`
+    path.resolve(__dirname, `../artifacts${ovm ? '-ovm' : ''}`) +
+      `/**/${name}.json`
   )
 
   if (match.length > 0) {