Skip to content

Commit

Permalink
Merge pull request ethereum-optimism#1566 from ethereum-optimism/liam…
Browse files Browse the repository at this point in the history
…/fix-mismatches-2

build: fix mismatched js package versions (reduce yarn.lock size)
  • Loading branch information
snario authored Oct 14, 2021
2 parents 28a2e5d + 6d3e1d7 commit 4ae9205
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 283 deletions.
14 changes: 14 additions & 0 deletions .changeset/hip-penguins-camp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
'@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
14 changes: 7 additions & 7 deletions integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
"@eth-optimism/core-utils": "^0.6.0",
"@eth-optimism/hardhat-ovm": "^0.2.3",
"@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-waffle": "^2.0.1",
"@types/chai": "^4.2.17",
"@types/chai-as-promised": "^7.1.3",
"@types/chai": "^4.2.18",
"@types/chai-as-promised": "^7.1.4",
"@types/mocha": "^8.2.2",
"@types/rimraf": "^3.0.0",
"@types/shelljs": "^0.8.8",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"chai": "^4.3.3",
"chai": "^4.3.4",
"chai-as-promised": "^7.1.1",
"docker-compose": "^0.23.8",
"dotenv": "^10.0.0",
Expand All @@ -49,11 +49,11 @@
"eslint-plugin-unicorn": "^32.0.1",
"ethereum-waffle": "^3.3.0",
"ethers": "^5.4.5",
"hardhat": "^2.2.1",
"hardhat": "^2.3.0",
"hardhat-gas-reporter": "^1.0.4",
"mocha": "^8.3.1",
"mocha": "^8.4.0",
"rimraf": "^3.0.2",
"shelljs": "^0.8.4",
"typescript": "^4.2.3"
"typescript": "^4.3.5"
}
}
32 changes: 16 additions & 16 deletions packages/batch-submitter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,35 @@
"url": "https://github.com/ethereum-optimism/optimism-monorepo.git"
},
"dependencies": {
"@eth-optimism/common-ts": "^0.1.5",
"@eth-optimism/common-ts": "0.1.5",
"@eth-optimism/contracts": "^0.4.13",
"@eth-optimism/core-utils": "^0.6.0",
"@eth-optimism/ynatm": "^0.2.2",
"@ethersproject/abstract-provider": "^5.4.1",
"@ethersproject/providers": "^5.4.4",
"@sentry/node": "^6.2.5",
"@ethersproject/providers": "^5.4.5",
"@sentry/node": "^6.3.1",
"bcfg": "^0.1.6",
"bluebird": "^3.7.2",
"dotenv": "^8.2.0",
"dotenv": "^10.0.0",
"ethers": "^5.4.5",
"old-contracts": "npm:@eth-optimism/contracts@^0.0.2-alpha.7",
"prom-client": "^13.1.0"
},
"devDependencies": {
"@eth-optimism/smock": "^1.1.9",
"@eth-optimism/smock": "^1.1.10",
"@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/bluebird": "^3.5.34",
"@types/chai": "^4.1.7",
"@types/mocha": "^5.2.6",
"@types/node": "^11.11.3",
"@types/prettier": "^1.19.1",
"@types/chai": "^4.2.18",
"@types/mocha": "^8.2.2",
"@types/node": "^15.12.2",
"@types/prettier": "^2.2.3",
"@types/rimraf": "^3.0.0",
"@types/sinon": "^9.0.10",
"@types/sinon-chai": "^3.2.5",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"chai": "^4.2.0",
"chai": "^4.3.4",
"babel-eslint": "^10.1.0",
"eslint": "^7.27.0",
"eslint-plugin-prettier": "^3.4.0",
Expand All @@ -72,16 +72,16 @@
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1",
"ethereum-waffle": "3.0.0",
"ethereum-waffle": "^3.3.0",
"ganache-core": "^2.13.2",
"hardhat": "^2.2.1",
"mocha": "^6.1.4",
"prettier": "^2.2.1",
"hardhat": "^2.3.0",
"mocha": "^8.4.0",
"prettier": "^2.3.1",
"lint-staged": "11.0.0",
"rimraf": "^2.6.3",
"rimraf": "^3.0.2",
"sinon": "^9.2.4",
"sinon-chai": "^3.5.0",
"typescript": "^4.2.3"
"typescript": "^4.3.5"
},
"resolutions": {
"ganache-core": "^2.13.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/common-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"@types/chai": "^4.2.18",
"@types/express": "^4.17.11",
"@types/express": "^4.17.12",
"@types/mocha": "^8.2.2",
"@types/pino": "^6.3.6",
"@types/pino-multi-stream": "^5.1.1",
Expand All @@ -39,13 +39,13 @@
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1",
"mocha": "^8.4.0",
"prettier": "^2.2.1",
"supertest": "^6.1.3",
"prettier": "^2.3.1",
"supertest": "^6.1.4",
"ts-mocha": "^8.0.0",
"typescript": "^4.2.3"
"typescript": "^4.3.5"
},
"dependencies": {
"@sentry/node": "^6.2.5",
"@sentry/node": "^6.3.1",
"express": "^4.17.1",
"pino": "^6.11.3",
"pino-multi-stream": "^5.3.0",
Expand Down
28 changes: 14 additions & 14 deletions packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,32 +59,32 @@
"glob": "^7.1.6"
},
"devDependencies": {
"@codechecks/client": "0.1.10-beta",
"@codechecks/client": "^0.1.11",
"@eth-optimism/hardhat-ovm": "^0.2.3",
"@eth-optimism/smock": "^1.1.10",
"@ethersproject/transactions": "^5.4.0",
"@nomiclabs/hardhat-ethers": "^2.0.1",
"@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1",
"@openzeppelin/contracts": "^3.3.0",
"@openzeppelin/contracts-upgradeable": "^3.3.0",
"@typechain/ethers-v5": "^7.0.1",
"@typechain/hardhat": "^2.3.0",
"@types/buffer-xor": "^2.0.0",
"@types/chai": "^4.2.17",
"@types/chai": "^4.2.18",
"@types/copyfiles": "^2.4.0",
"@types/glob": "^7.1.3",
"@types/lodash": "^4.14.161",
"@types/lodash": "^4.14.168",
"@types/mkdirp": "^1.0.1",
"@types/mocha": "^8.2.2",
"@types/yargs": "^16.0.1",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"babel-eslint": "^10.1.0",
"buffer-xor": "^2.0.2",
"chai": "^4.3.1",
"chai": "^4.3.4",
"copyfiles": "^2.3.0",
"directory-tree": "^2.2.7",
"dotenv": "^8.2.0",
"dotenv": "^10.0.0",
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ban": "^1.5.2",
Expand All @@ -97,27 +97,27 @@
"ethereum-waffle": "^3.3.0",
"ethers": "^5.4.5",
"ganache-core": "^2.13.2",
"hardhat": "^2.2.1",
"hardhat": "^2.3.0",
"hardhat-deploy": "^0.7.4",
"hardhat-gas-reporter": "^1.0.4",
"lint-staged": "11.0.0",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"merkle-patricia-tree": "^4.0.0",
"merkletreejs": "^0.2.12",
"merkletreejs": "^0.2.18",
"mkdirp": "^1.0.4",
"mocha": "^8.3.0",
"prettier": "^2.2.1",
"mocha": "^8.4.0",
"prettier": "^2.3.1",
"random-bytes-seed": "^1.0.3",
"rlp": "^2.2.6",
"solhint": "^3.3.6",
"solidity-coverage": "^0.7.16",
"ts-generator": "0.0.8",
"ts-node": "^9.1.1",
"ts-node": "^10.0.0",
"typechain": "^5.1.0",
"typescript": "^4.2.3",
"typescript": "^4.3.5",
"yargs": "^16.2.0"
},
"peerDependencies": {
"ethers": "^5.0.0"
"ethers": "^5.4.5"
}
}
10 changes: 5 additions & 5 deletions packages/core-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"test:coverage": "nyc ts-mocha test/**/*.spec.ts && nyc merge .nyc_output coverage.json"
},
"devDependencies": {
"@types/chai": "^4.2.17",
"@types/chai": "^4.2.18",
"@types/lodash": "^4.14.168",
"@types/mocha": "^8.2.2",
"@types/prettier": "^2.2.3",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"babel-eslint": "^10.1.0",
"chai": "^4.3.0",
"chai": "^4.3.4",
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ban": "^1.5.2",
Expand All @@ -39,11 +39,11 @@
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1",
"lint-staged": "11.0.0",
"mocha": "^8.3.0",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^2.2.1",
"prettier": "^2.3.1",
"ts-mocha": "^8.0.0",
"typescript": "^4.2.3"
"typescript": "^4.3.5"
},
"dependencies": {
"@ethersproject/abstract-provider": "^5.4.1",
Expand Down
28 changes: 14 additions & 14 deletions packages/data-transport-layer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
"pre-commit": "lint-staged"
},
"dependencies": {
"@eth-optimism/common-ts": "^0.1.5",
"@eth-optimism/common-ts": "0.1.5",
"@eth-optimism/contracts": "^0.4.13",
"@eth-optimism/core-utils": "^0.6.0",
"@ethersproject/providers": "^5.4.4",
"@ethersproject/transactions": "^5.0.21",
"@ethersproject/providers": "^5.4.5",
"@ethersproject/transactions": "^5.4.0",
"@sentry/node": "^6.3.1",
"@sentry/tracing": "^6.3.1",
"@types/express": "^4.17.11",
"@types/express": "^4.17.12",
"axios": "^0.21.1",
"bcfg": "^0.1.6",
"bfj": "^7.0.2",
"browser-or-node": "^1.3.0",
"cors": "^2.8.5",
"dotenv": "^8.2.0",
"ethers": "^5.4.0",
"dotenv": "^10.0.0",
"ethers": "^5.4.5",
"express": "^4.17.1",
"express-prom-bundle": "^6.3.6",
"level": "^6.0.1",
Expand All @@ -47,12 +47,12 @@
"devDependencies": {
"@ethersproject/abstract-provider": "^5.4.1",
"@types/browser-or-node": "^1.3.0",
"@types/chai": "^4.2.17",
"@types/chai-as-promised": "^7.1.3",
"@types/chai": "^4.2.18",
"@types/chai-as-promised": "^7.1.4",
"@types/cors": "^2.8.9",
"@types/levelup": "^4.3.0",
"@types/mocha": "^8.2.2",
"@types/node-fetch": "^2.5.8",
"@types/node-fetch": "^2.5.10",
"@types/workerpool": "^6.0.0",
"bfj": "^7.0.2",
"@typescript-eslint/eslint-plugin": "^4.26.0",
Expand All @@ -69,14 +69,14 @@
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1",
"hardhat": "^2.2.1",
"mocha": "^8.3.2",
"hardhat": "^2.3.0",
"mocha": "^8.4.0",
"pino-pretty": "^4.7.1",
"prettier": "^2.2.1",
"prettier": "^2.3.1",
"lint-staged": "11.0.0",
"prom-client": "^13.1.0",
"rimraf": "^3.0.2",
"ts-node": "^9.1.1",
"typescript": "^4.2.3"
"ts-node": "^10.0.0",
"typescript": "^4.3.5"
}
}
8 changes: 4 additions & 4 deletions packages/hardhat-ovm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"node-fetch": "^2.6.1"
},
"peerDependencies": {
"ethers": "^5.4.0",
"hardhat": "^2.2.1"
"ethers": "^5.4.5",
"hardhat": "^2.3.0"
},
"devDependencies": {
"@types/mocha": "^8.2.2",
Expand All @@ -38,8 +38,8 @@
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-unicorn": "^32.0.1",
"prettier": "^2.2.1",
"prettier": "^2.3.1",
"lint-staged": "11.0.0",
"typescript": "^4.2.3"
"typescript": "^4.3.5"
}
}
12 changes: 6 additions & 6 deletions packages/message-relayer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
"url": "https://github.com/ethereum-optimism/optimism.git"
},
"dependencies": {
"@eth-optimism/common-ts": "^0.1.5",
"@eth-optimism/common-ts": "0.1.5",
"@eth-optimism/contracts": "^0.4.13",
"@eth-optimism/core-utils": "^0.6.0",
"@sentry/node": "6.2.5",
"@sentry/node": "^6.3.1",
"bcfg": "^0.1.6",
"dotenv": "^8.2.0",
"dotenv": "^10.0.0",
"ethers": "^5.4.5",
"merkletreejs": "^0.2.18",
"rlp": "^2.2.6"
},
"devDependencies": {
"@eth-optimism/smock": "^1.1.9",
"@eth-optimism/smock": "^1.1.10",
"@nomiclabs/ethereumjs-vm": "^4",
"@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1",
Expand All @@ -71,7 +71,7 @@
"lint-staged": "11.0.0",
"lodash": "^4.17.21",
"mocha": "^8.4.0",
"prettier": "^2.2.1",
"typescript": "^4.2.3"
"prettier": "^2.3.1",
"typescript": "^4.3.5"
}
}
2 changes: 1 addition & 1 deletion packages/replica-healthcheck/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"supertest": "^6.1.4",
"ts-mocha": "^8.0.0",
"ts-node": "^10.0.0",
"typescript": "^4.3.2"
"typescript": "^4.3.5"
},
"dependencies": {
"@eth-optimism/common-ts": "0.1.5",
Expand Down
4 changes: 2 additions & 2 deletions specs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"license": "MIT",
"private": true,
"devDependencies": {
"@types/prettier": "2.2.1",
"prettier": "^2.2.1",
"@types/prettier": "^2.2.3",
"prettier": "^2.3.1",
"lint-staged": "11.0.0"
},
"scripts": {
Expand Down
Loading

0 comments on commit 4ae9205

Please sign in to comment.