Skip to content

fix: package contracts with correct paths #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gakonst merged 2 commits into from
Apr 14, 2021
Merged

fix: package contracts with correct paths #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ad830e
fix: package contracts with correct paths
gakonst Apr 14, 2021
4a4c263
chore: add changeset
gakonst Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hip-mugs-smell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@eth-optimism/contracts": patch
---

fix contract import paths
21 changes: 11 additions & 10 deletions packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"main": "dist/index",
"files": [
"dist/**/*.js",
"dist/contracts/*",
"dist/dumps/*json",
"dist/artifacts/**/*.json",
"dist/artifacts-ovm/**/*.json",
"dist/types/**/*.ts"
"artifacts/**/*.json",
"artifacts-ovm/**/*.json",
"OVM",
"iOVM",
"libraries",
"mockOVM"
],
"types": "dist/index",
"license": "MIT",
Expand All @@ -21,10 +22,6 @@
"build:contracts": "hardhat compile --show-stack-traces",
"build:contracts:ovm": "hardhat compile --network optimism",
"build:dump": "ts-node \"bin/take-dump.ts\"",
"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\" \"dist/artifacts\"",
"build:copy:artifacts:ovm": "copyfiles -u 1 \"artifacts-ovm/**/*.json\" \"dist/artifacts-ovm\"",
"build:copy:contracts": "copyfiles -u 2 \"contracts/optimistic-ethereum/**/*.sol\" \"dist/contracts\"",
"build:typechain": "hardhat typechain",
"test": "yarn run test:contracts",
"test:contracts": "hardhat test --show-stack-traces",
Expand All @@ -35,7 +32,11 @@
"lint:fix:typescript": "prettier --config prettier-config.json --write \"hardhat.config.ts\" \"{src,test}/**/*.ts\"",
"clean": "rm -rf ./dist ./artifacts ./artifacts-ovm ./cache ./cache-ovm ./tsconfig.build.tsbuildinfo",
"deploy": "./bin/deploy.ts",
"serve": "./bin/serve_dump.sh"
"serve": "./bin/serve_dump.sh",
"prepublishOnly": "yarn copyfiles -u 2 \"contracts/optimistic-ethereum/**/*\" ./",
"postpublish": "rimraf OVM iOVM libraries mockOVM",
"prepack": "yarn prepublishOnly",
"postpack": "yarn postpublish"
},
"dependencies": {
"@eth-optimism/core-utils": "^0.2.1",
Expand Down
1 change: 0 additions & 1 deletion packages/contracts/scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
yarn run build:typescript & yarn run build:contracts
yarn run build:contracts:ovm
yarn run build:copy:artifacts & yarn run build:copy:artifacts:ovm & yarn run build:copy:contracts