Commit 4ae92056 authored by Liam Horne's avatar Liam Horne Committed by GitHub

Merge pull request #1566 from ethereum-optimism/liam/fix-mismatches-2

build: fix mismatched js package versions (reduce yarn.lock size)
parents 28a2e5d0 6d3e1d7f
---
'@eth-optimism/integration-tests': patch
'@eth-optimism/batch-submitter': patch
'@eth-optimism/common-ts': patch
'@eth-optimism/contracts': patch
'@eth-optimism/core-utils': patch
'@eth-optimism/data-transport-layer': patch
'@eth-optimism/hardhat-ovm': patch
'@eth-optimism/message-relayer': patch
'@eth-optimism/replica-healthcheck': patch
'@eth-optimism/specs': patch
---
Update dependencies
...@@ -22,17 +22,17 @@ ...@@ -22,17 +22,17 @@
"@eth-optimism/core-utils": "^0.6.0", "@eth-optimism/core-utils": "^0.6.0",
"@eth-optimism/hardhat-ovm": "^0.2.3", "@eth-optimism/hardhat-ovm": "^0.2.3",
"@eth-optimism/message-relayer": "^0.1.13", "@eth-optimism/message-relayer": "^0.1.13",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.5",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/chai": "^4.2.17", "@types/chai": "^4.2.18",
"@types/chai-as-promised": "^7.1.3", "@types/chai-as-promised": "^7.1.4",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/rimraf": "^3.0.0", "@types/rimraf": "^3.0.0",
"@types/shelljs": "^0.8.8", "@types/shelljs": "^0.8.8",
"@typescript-eslint/eslint-plugin": "^4.26.0", "@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0", "@typescript-eslint/parser": "^4.26.0",
"chai": "^4.3.3", "chai": "^4.3.4",
"chai-as-promised": "^7.1.1", "chai-as-promised": "^7.1.1",
"docker-compose": "^0.23.8", "docker-compose": "^0.23.8",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
...@@ -49,11 +49,11 @@ ...@@ -49,11 +49,11 @@
"eslint-plugin-unicorn": "^32.0.1", "eslint-plugin-unicorn": "^32.0.1",
"ethereum-waffle": "^3.3.0", "ethereum-waffle": "^3.3.0",
"ethers": "^5.4.5", "ethers": "^5.4.5",
"hardhat": "^2.2.1", "hardhat": "^2.3.0",
"hardhat-gas-reporter": "^1.0.4", "hardhat-gas-reporter": "^1.0.4",
"mocha": "^8.3.1", "mocha": "^8.4.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"shelljs": "^0.8.4", "shelljs": "^0.8.4",
"typescript": "^4.2.3" "typescript": "^4.3.5"
} }
} }
...@@ -33,35 +33,35 @@ ...@@ -33,35 +33,35 @@
"url": "https://github.com/ethereum-optimism/optimism-monorepo.git" "url": "https://github.com/ethereum-optimism/optimism-monorepo.git"
}, },
"dependencies": { "dependencies": {
"@eth-optimism/common-ts": "^0.1.5", "@eth-optimism/common-ts": "0.1.5",
"@eth-optimism/contracts": "^0.4.13", "@eth-optimism/contracts": "^0.4.13",
"@eth-optimism/core-utils": "^0.6.0", "@eth-optimism/core-utils": "^0.6.0",
"@eth-optimism/ynatm": "^0.2.2", "@eth-optimism/ynatm": "^0.2.2",
"@ethersproject/abstract-provider": "^5.4.1", "@ethersproject/abstract-provider": "^5.4.1",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.5",
"@sentry/node": "^6.2.5", "@sentry/node": "^6.3.1",
"bcfg": "^0.1.6", "bcfg": "^0.1.6",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"dotenv": "^8.2.0", "dotenv": "^10.0.0",
"ethers": "^5.4.5", "ethers": "^5.4.5",
"old-contracts": "npm:@eth-optimism/contracts@^0.0.2-alpha.7", "old-contracts": "npm:@eth-optimism/contracts@^0.0.2-alpha.7",
"prom-client": "^13.1.0" "prom-client": "^13.1.0"
}, },
"devDependencies": { "devDependencies": {
"@eth-optimism/smock": "^1.1.9", "@eth-optimism/smock": "^1.1.10",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/bluebird": "^3.5.34", "@types/bluebird": "^3.5.34",
"@types/chai": "^4.1.7", "@types/chai": "^4.2.18",
"@types/mocha": "^5.2.6", "@types/mocha": "^8.2.2",
"@types/node": "^11.11.3", "@types/node": "^15.12.2",
"@types/prettier": "^1.19.1", "@types/prettier": "^2.2.3",
"@types/rimraf": "^3.0.0", "@types/rimraf": "^3.0.0",
"@types/sinon": "^9.0.10", "@types/sinon": "^9.0.10",
"@types/sinon-chai": "^3.2.5", "@types/sinon-chai": "^3.2.5",
"@typescript-eslint/eslint-plugin": "^4.26.0", "@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0", "@typescript-eslint/parser": "^4.26.0",
"chai": "^4.2.0", "chai": "^4.3.4",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"eslint": "^7.27.0", "eslint": "^7.27.0",
"eslint-plugin-prettier": "^3.4.0", "eslint-plugin-prettier": "^3.4.0",
...@@ -72,16 +72,16 @@ ...@@ -72,16 +72,16 @@
"eslint-plugin-prefer-arrow": "^1.2.3", "eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.24.0", "eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1", "eslint-plugin-unicorn": "^32.0.1",
"ethereum-waffle": "3.0.0", "ethereum-waffle": "^3.3.0",
"ganache-core": "^2.13.2", "ganache-core": "^2.13.2",
"hardhat": "^2.2.1", "hardhat": "^2.3.0",
"mocha": "^6.1.4", "mocha": "^8.4.0",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"lint-staged": "11.0.0", "lint-staged": "11.0.0",
"rimraf": "^2.6.3", "rimraf": "^3.0.2",
"sinon": "^9.2.4", "sinon": "^9.2.4",
"sinon-chai": "^3.5.0", "sinon-chai": "^3.5.0",
"typescript": "^4.2.3" "typescript": "^4.3.5"
}, },
"resolutions": { "resolutions": {
"ganache-core": "^2.13.2", "ganache-core": "^2.13.2",
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/chai": "^4.2.18", "@types/chai": "^4.2.18",
"@types/express": "^4.17.11", "@types/express": "^4.17.12",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/pino": "^6.3.6", "@types/pino": "^6.3.6",
"@types/pino-multi-stream": "^5.1.1", "@types/pino-multi-stream": "^5.1.1",
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
"eslint-plugin-react": "^7.24.0", "eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1", "eslint-plugin-unicorn": "^32.0.1",
"mocha": "^8.4.0", "mocha": "^8.4.0",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"supertest": "^6.1.3", "supertest": "^6.1.4",
"ts-mocha": "^8.0.0", "ts-mocha": "^8.0.0",
"typescript": "^4.2.3" "typescript": "^4.3.5"
}, },
"dependencies": { "dependencies": {
"@sentry/node": "^6.2.5", "@sentry/node": "^6.3.1",
"express": "^4.17.1", "express": "^4.17.1",
"pino": "^6.11.3", "pino": "^6.11.3",
"pino-multi-stream": "^5.3.0", "pino-multi-stream": "^5.3.0",
......
...@@ -59,21 +59,21 @@ ...@@ -59,21 +59,21 @@
"glob": "^7.1.6" "glob": "^7.1.6"
}, },
"devDependencies": { "devDependencies": {
"@codechecks/client": "0.1.10-beta", "@codechecks/client": "^0.1.11",
"@eth-optimism/hardhat-ovm": "^0.2.3", "@eth-optimism/hardhat-ovm": "^0.2.3",
"@eth-optimism/smock": "^1.1.10", "@eth-optimism/smock": "^1.1.10",
"@ethersproject/transactions": "^5.4.0", "@ethersproject/transactions": "^5.4.0",
"@nomiclabs/hardhat-ethers": "^2.0.1", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@openzeppelin/contracts": "^3.3.0", "@openzeppelin/contracts": "^3.3.0",
"@openzeppelin/contracts-upgradeable": "^3.3.0", "@openzeppelin/contracts-upgradeable": "^3.3.0",
"@typechain/ethers-v5": "^7.0.1", "@typechain/ethers-v5": "^7.0.1",
"@typechain/hardhat": "^2.3.0", "@typechain/hardhat": "^2.3.0",
"@types/buffer-xor": "^2.0.0", "@types/buffer-xor": "^2.0.0",
"@types/chai": "^4.2.17", "@types/chai": "^4.2.18",
"@types/copyfiles": "^2.4.0", "@types/copyfiles": "^2.4.0",
"@types/glob": "^7.1.3", "@types/glob": "^7.1.3",
"@types/lodash": "^4.14.161", "@types/lodash": "^4.14.168",
"@types/mkdirp": "^1.0.1", "@types/mkdirp": "^1.0.1",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/yargs": "^16.0.1", "@types/yargs": "^16.0.1",
...@@ -81,10 +81,10 @@ ...@@ -81,10 +81,10 @@
"@typescript-eslint/parser": "^4.26.0", "@typescript-eslint/parser": "^4.26.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"buffer-xor": "^2.0.2", "buffer-xor": "^2.0.2",
"chai": "^4.3.1", "chai": "^4.3.4",
"copyfiles": "^2.3.0", "copyfiles": "^2.3.0",
"directory-tree": "^2.2.7", "directory-tree": "^2.2.7",
"dotenv": "^8.2.0", "dotenv": "^10.0.0",
"eslint": "^7.27.0", "eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-ban": "^1.5.2", "eslint-plugin-ban": "^1.5.2",
...@@ -97,27 +97,27 @@ ...@@ -97,27 +97,27 @@
"ethereum-waffle": "^3.3.0", "ethereum-waffle": "^3.3.0",
"ethers": "^5.4.5", "ethers": "^5.4.5",
"ganache-core": "^2.13.2", "ganache-core": "^2.13.2",
"hardhat": "^2.2.1", "hardhat": "^2.3.0",
"hardhat-deploy": "^0.7.4", "hardhat-deploy": "^0.7.4",
"hardhat-gas-reporter": "^1.0.4", "hardhat-gas-reporter": "^1.0.4",
"lint-staged": "11.0.0", "lint-staged": "11.0.0",
"lodash": "^4.17.20", "lodash": "^4.17.21",
"merkle-patricia-tree": "^4.0.0", "merkle-patricia-tree": "^4.0.0",
"merkletreejs": "^0.2.12", "merkletreejs": "^0.2.18",
"mkdirp": "^1.0.4", "mkdirp": "^1.0.4",
"mocha": "^8.3.0", "mocha": "^8.4.0",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"random-bytes-seed": "^1.0.3", "random-bytes-seed": "^1.0.3",
"rlp": "^2.2.6", "rlp": "^2.2.6",
"solhint": "^3.3.6", "solhint": "^3.3.6",
"solidity-coverage": "^0.7.16", "solidity-coverage": "^0.7.16",
"ts-generator": "0.0.8", "ts-generator": "0.0.8",
"ts-node": "^9.1.1", "ts-node": "^10.0.0",
"typechain": "^5.1.0", "typechain": "^5.1.0",
"typescript": "^4.2.3", "typescript": "^4.3.5",
"yargs": "^16.2.0" "yargs": "^16.2.0"
}, },
"peerDependencies": { "peerDependencies": {
"ethers": "^5.0.0" "ethers": "^5.4.5"
} }
} }
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
"test:coverage": "nyc ts-mocha test/**/*.spec.ts && nyc merge .nyc_output coverage.json" "test:coverage": "nyc ts-mocha test/**/*.spec.ts && nyc merge .nyc_output coverage.json"
}, },
"devDependencies": { "devDependencies": {
"@types/chai": "^4.2.17", "@types/chai": "^4.2.18",
"@types/lodash": "^4.14.168", "@types/lodash": "^4.14.168",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/prettier": "^2.2.3", "@types/prettier": "^2.2.3",
"@typescript-eslint/eslint-plugin": "^4.26.0", "@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0", "@typescript-eslint/parser": "^4.26.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"chai": "^4.3.0", "chai": "^4.3.4",
"eslint": "^7.27.0", "eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-ban": "^1.5.2", "eslint-plugin-ban": "^1.5.2",
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
"eslint-plugin-react": "^7.24.0", "eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1", "eslint-plugin-unicorn": "^32.0.1",
"lint-staged": "11.0.0", "lint-staged": "11.0.0",
"mocha": "^8.3.0", "mocha": "^8.4.0",
"nyc": "^15.1.0", "nyc": "^15.1.0",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"ts-mocha": "^8.0.0", "ts-mocha": "^8.0.0",
"typescript": "^4.2.3" "typescript": "^4.3.5"
}, },
"dependencies": { "dependencies": {
"@ethersproject/abstract-provider": "^5.4.1", "@ethersproject/abstract-provider": "^5.4.1",
......
...@@ -23,21 +23,21 @@ ...@@ -23,21 +23,21 @@
"pre-commit": "lint-staged" "pre-commit": "lint-staged"
}, },
"dependencies": { "dependencies": {
"@eth-optimism/common-ts": "^0.1.5", "@eth-optimism/common-ts": "0.1.5",
"@eth-optimism/contracts": "^0.4.13", "@eth-optimism/contracts": "^0.4.13",
"@eth-optimism/core-utils": "^0.6.0", "@eth-optimism/core-utils": "^0.6.0",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.5",
"@ethersproject/transactions": "^5.0.21", "@ethersproject/transactions": "^5.4.0",
"@sentry/node": "^6.3.1", "@sentry/node": "^6.3.1",
"@sentry/tracing": "^6.3.1", "@sentry/tracing": "^6.3.1",
"@types/express": "^4.17.11", "@types/express": "^4.17.12",
"axios": "^0.21.1", "axios": "^0.21.1",
"bcfg": "^0.1.6", "bcfg": "^0.1.6",
"bfj": "^7.0.2", "bfj": "^7.0.2",
"browser-or-node": "^1.3.0", "browser-or-node": "^1.3.0",
"cors": "^2.8.5", "cors": "^2.8.5",
"dotenv": "^8.2.0", "dotenv": "^10.0.0",
"ethers": "^5.4.0", "ethers": "^5.4.5",
"express": "^4.17.1", "express": "^4.17.1",
"express-prom-bundle": "^6.3.6", "express-prom-bundle": "^6.3.6",
"level": "^6.0.1", "level": "^6.0.1",
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
"devDependencies": { "devDependencies": {
"@ethersproject/abstract-provider": "^5.4.1", "@ethersproject/abstract-provider": "^5.4.1",
"@types/browser-or-node": "^1.3.0", "@types/browser-or-node": "^1.3.0",
"@types/chai": "^4.2.17", "@types/chai": "^4.2.18",
"@types/chai-as-promised": "^7.1.3", "@types/chai-as-promised": "^7.1.4",
"@types/cors": "^2.8.9", "@types/cors": "^2.8.9",
"@types/levelup": "^4.3.0", "@types/levelup": "^4.3.0",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/node-fetch": "^2.5.8", "@types/node-fetch": "^2.5.10",
"@types/workerpool": "^6.0.0", "@types/workerpool": "^6.0.0",
"bfj": "^7.0.2", "bfj": "^7.0.2",
"@typescript-eslint/eslint-plugin": "^4.26.0", "@typescript-eslint/eslint-plugin": "^4.26.0",
...@@ -69,14 +69,14 @@ ...@@ -69,14 +69,14 @@
"eslint-plugin-prefer-arrow": "^1.2.3", "eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.24.0", "eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1", "eslint-plugin-unicorn": "^32.0.1",
"hardhat": "^2.2.1", "hardhat": "^2.3.0",
"mocha": "^8.3.2", "mocha": "^8.4.0",
"pino-pretty": "^4.7.1", "pino-pretty": "^4.7.1",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"lint-staged": "11.0.0", "lint-staged": "11.0.0",
"prom-client": "^13.1.0", "prom-client": "^13.1.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"ts-node": "^9.1.1", "ts-node": "^10.0.0",
"typescript": "^4.2.3" "typescript": "^4.3.5"
} }
} }
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
"node-fetch": "^2.6.1" "node-fetch": "^2.6.1"
}, },
"peerDependencies": { "peerDependencies": {
"ethers": "^5.4.0", "ethers": "^5.4.5",
"hardhat": "^2.2.1" "hardhat": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
"eslint-plugin-prefer-arrow": "^1.2.3", "eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.24.0", "eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1", "eslint-plugin-unicorn": "^32.0.1",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"lint-staged": "11.0.0", "lint-staged": "11.0.0",
"typescript": "^4.2.3" "typescript": "^4.3.5"
} }
} }
...@@ -34,18 +34,18 @@ ...@@ -34,18 +34,18 @@
"url": "https://github.com/ethereum-optimism/optimism.git" "url": "https://github.com/ethereum-optimism/optimism.git"
}, },
"dependencies": { "dependencies": {
"@eth-optimism/common-ts": "^0.1.5", "@eth-optimism/common-ts": "0.1.5",
"@eth-optimism/contracts": "^0.4.13", "@eth-optimism/contracts": "^0.4.13",
"@eth-optimism/core-utils": "^0.6.0", "@eth-optimism/core-utils": "^0.6.0",
"@sentry/node": "6.2.5", "@sentry/node": "^6.3.1",
"bcfg": "^0.1.6", "bcfg": "^0.1.6",
"dotenv": "^8.2.0", "dotenv": "^10.0.0",
"ethers": "^5.4.5", "ethers": "^5.4.5",
"merkletreejs": "^0.2.18", "merkletreejs": "^0.2.18",
"rlp": "^2.2.6" "rlp": "^2.2.6"
}, },
"devDependencies": { "devDependencies": {
"@eth-optimism/smock": "^1.1.9", "@eth-optimism/smock": "^1.1.10",
"@nomiclabs/ethereumjs-vm": "^4", "@nomiclabs/ethereumjs-vm": "^4",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
"lint-staged": "11.0.0", "lint-staged": "11.0.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mocha": "^8.4.0", "mocha": "^8.4.0",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"typescript": "^4.2.3" "typescript": "^4.3.5"
} }
} }
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"supertest": "^6.1.4", "supertest": "^6.1.4",
"ts-mocha": "^8.0.0", "ts-mocha": "^8.0.0",
"ts-node": "^10.0.0", "ts-node": "^10.0.0",
"typescript": "^4.3.2" "typescript": "^4.3.5"
}, },
"dependencies": { "dependencies": {
"@eth-optimism/common-ts": "0.1.5", "@eth-optimism/common-ts": "0.1.5",
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
"license": "MIT", "license": "MIT",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@types/prettier": "2.2.1", "@types/prettier": "^2.2.3",
"prettier": "^2.2.1", "prettier": "^2.3.1",
"lint-staged": "11.0.0" "lint-staged": "11.0.0"
}, },
"scripts": { "scripts": {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment