diff --git a/package.json b/package.json index d47b4c97f..4c8d0f7e4 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,8 @@ "glob": "^7.1.6" }, "devDependencies": { - "@eth-optimism/plugins": "^0.0.16", + "@eth-optimism/dev": "^1.0.0", + "@eth-optimism/plugins": "^0.0.10", "@eth-optimism/smock": "0.2.1-alpha.0", "@nomiclabs/hardhat-ethers": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1", diff --git a/tslint.json b/tslint.json index c65da46ff..2b42f22de 100644 --- a/tslint.json +++ b/tslint.json @@ -1,38 +1,3 @@ { - "extends": [ - "tslint:latest", - "tslint-config-prettier", - "tslint-plugin-prettier" - ], - "rulesDirectory": [ - "tslint-no-focused-test" - ], - "rules": { - "ban-types": false, - "comment-format": false, - "interface-name": false, - "max-classes-per-file": false, - "member-ordering": false, - "no-bitwise": false, - "no-empty-interface": false, - "no-implicit-dependencies": [true, "dev"], - "no-string-literal": false, - "no-submodule-imports": false, - "no-unused-expression": false, - "object-literal-sort-keys": false, - "ordered-imports": false, - "prettier": [true, "prettier-config.json"], - "semicolon": false, - "variable-name": false, - "no-focused-test": true, - "no-console": false, - "array-type": false, - "class-name": false - }, - "linterOptions": { - "exclude": [ - "**/node_modules/**/*", - "bin/**/*" - ] - } + "extends": "@eth-optimism/dev/tslint.json" } diff --git a/yarn.lock b/yarn.lock index 7aa6f867e..27b95a51f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -51,6 +51,11 @@ ethers "5.0.0" ganache-core "^2.12.1" +"@eth-optimism/dev@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@eth-optimism/dev/-/dev-1.0.0.tgz#6a8ba479abe9a87fc689ba7bc6d23365f90b3a00" + integrity sha512-btafO+VcHrWND3giztLo08LAaVx7k9UIODU0NEgw6NR2XvSZpcTbXf0xb4RDCMxwpmkbZc5gpyHrP72Uk9xSxw== + "@eth-optimism/ethereumjs-vm@^4.2.0-alpha.2": version "4.2.0-alpha.2" resolved "https://registry.yarnpkg.com/@eth-optimism/ethereumjs-vm/-/ethereumjs-vm-4.2.0-alpha.2.tgz#e8af5e0594224c36bb9f6756cf0ff38467d265b8"