Commit 6f546085 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

Merge pull request #3128 from ethereum-optimism/ctb/deps-build-cleanup

contracts-bedrock: modularize build
parents 620dddb5 c648d55c
---
'@eth-optimism/contracts-bedrock': patch
---
Fix build for smaller package
...@@ -15,12 +15,13 @@ ...@@ -15,12 +15,13 @@
], ],
"scripts": { "scripts": {
"build:forge": "forge build", "build:forge": "forge build",
"build:differential": "tsc scripts/differential-testing.ts --outDir dist --moduleResolution node",
"prebuild": "yarn ts-node scripts/verifyFoundryInstall.ts", "prebuild": "yarn ts-node scripts/verifyFoundryInstall.ts",
"build": "hardhat compile && yarn autogen:artifacts && yarn build:ts && yarn typechain", "build": "hardhat compile && yarn autogen:artifacts && yarn build:ts && yarn typechain",
"build:ts": "tsc -p tsconfig.json", "build:ts": "tsc -p tsconfig.json",
"autogen:artifacts": "ts-node scripts/generate-artifacts.ts", "autogen:artifacts": "ts-node scripts/generate-artifacts.ts",
"deploy": "hardhat deploy", "deploy": "hardhat deploy",
"test": "yarn build:ts && forge test", "test": "yarn build:differential && forge test",
"gas-snapshot": "forge snapshot", "gas-snapshot": "forge snapshot",
"storage-snapshot": "./scripts/storage-snapshot.sh", "storage-snapshot": "./scripts/storage-snapshot.sh",
"slither": "./scripts/slither.sh", "slither": "./scripts/slither.sh",
...@@ -36,14 +37,10 @@ ...@@ -36,14 +37,10 @@
}, },
"dependencies": { "dependencies": {
"@eth-optimism/core-utils": "^0.9.2", "@eth-optimism/core-utils": "^0.9.2",
"@ethereumjs/trie": "^5.0.0-beta.1",
"@ethereumjs/util": "^8.0.0-beta.1",
"@openzeppelin/contracts": "4.6.0", "@openzeppelin/contracts": "4.6.0",
"@openzeppelin/contracts-upgradeable": "4.7.1", "@openzeppelin/contracts-upgradeable": "4.7.1",
"@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc", "@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc",
"bip39": "^3.0.4",
"ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5", "ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5",
"ethereumjs-wallet": "^1.0.2",
"ethers": "^5.6.8", "ethers": "^5.6.8",
"excessively-safe-call": "https://github.com/nomad-xyz/ExcessivelySafeCall.git#4fcdfd3593d21381f696c790fa6180b8ef559c1e", "excessively-safe-call": "https://github.com/nomad-xyz/ExcessivelySafeCall.git#4fcdfd3593d21381f696c790fa6180b8ef559c1e",
"forge-std": "https://github.com/foundry-rs/forge-std.git#f18682b2874fc57d7c80a511fed0b35ec4201ffa", "forge-std": "https://github.com/foundry-rs/forge-std.git#f18682b2874fc57d7c80a511fed0b35ec4201ffa",
...@@ -51,6 +48,9 @@ ...@@ -51,6 +48,9 @@
}, },
"devDependencies": { "devDependencies": {
"@eth-optimism/hardhat-deploy-config": "^0.2.1", "@eth-optimism/hardhat-deploy-config": "^0.2.1",
"@ethereumjs/trie": "^5.0.0-beta.1",
"@ethereumjs/util": "^8.0.0-beta.1",
"ethereumjs-wallet": "^1.0.2",
"@defi-wonderland/smock": "^2.0.2", "@defi-wonderland/smock": "^2.0.2",
"@foundry-rs/hardhat-forge": "^0.1.16", "@foundry-rs/hardhat-forge": "^0.1.16",
"@nomiclabs/hardhat-ethers": "^2.0.0", "@nomiclabs/hardhat-ethers": "^2.0.0",
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
"@typechain/ethers-v5": "^10.1.0", "@typechain/ethers-v5": "^10.1.0",
"@typescript-eslint/eslint-plugin": "^5.26.0", "@typescript-eslint/eslint-plugin": "^5.26.0",
"@typescript-eslint/parser": "^4.29.1", "@typescript-eslint/parser": "^4.29.1",
"bip39": "^3.0.4",
"chai": "^4.2.0", "chai": "^4.2.0",
"command-exists": "1.2.9", "command-exists": "1.2.9",
"dotenv": "^16.0.0", "dotenv": "^16.0.0",
......
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"rootDir": ".", "rootDir": "./src",
"outDir": "./dist" "outDir": "./dist"
}, },
"exclude": ["hardhat.config.ts", "deploy", "tasks", "test"], "include": [
"include": ["src/**/*", "scripts/**/*"] "src/**/*"
]
} }
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