Skip to content

Commit

Permalink
fix(ctp): use correct contract import paths (#3340)
Browse files Browse the repository at this point in the history
Fixes two contracts in contracts-periphery to use the correct import
paths. Also modifies the contracts package to copy contracts into the
root directory on every build, not just before publish. This resolves
the issue where the contracts package could not be properly used within
the monorepo.

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
  • Loading branch information
smartcontracts and tynes committed Sep 9, 2022
1 parent c85a1d2 commit f4bf4f5
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .changeset/fifty-badgers-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-periphery': patch
---

Fixes import paths in the contracts-periphery package
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.15;

import {
CrossDomainEnabled
} from "@eth-optimism/contracts/contracts/libraries/bridge/CrossDomainEnabled.sol";
} from "@eth-optimism/contracts/libraries/bridge/CrossDomainEnabled.sol";
import {
OwnableUpgradeable
} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.15;

import {
CrossDomainEnabled
} from "@eth-optimism/contracts/contracts/libraries/bridge/CrossDomainEnabled.sol";
} from "@eth-optimism/contracts/libraries/bridge/CrossDomainEnabled.sol";
import {
OwnableUpgradeable
} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
Expand Down
5 changes: 5 additions & 0 deletions packages/contracts/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
src/contract-artifacts.ts
src/contract-deployed-artifacts.ts
/chugsplash
/L1
/L2
/libraries
/standards
10 changes: 3 additions & 7 deletions packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
"standards"
],
"scripts": {
"build": "yarn build:contracts && yarn autogen:artifacts && yarn build:typescript",
"build": "yarn build:contracts && yarn copy:contracts && yarn autogen:artifacts && yarn build:typescript",
"build:typescript": "tsc -p ./tsconfig.json",
"build:contracts": "hardhat compile --show-stack-traces",
"autogen:markdown": "ts-node scripts/generate-markdown.ts",
"autogen:artifacts": "ts-node scripts/generate-artifacts.ts && ts-node scripts/generate-deployed-artifacts.ts",
"copy:contracts": "yarn copyfiles -u 1 -e \"**/test-*/**/*\" \"contracts/**/*\" ./",
"test": "yarn test:contracts",
"test:contracts": "hardhat test --show-stack-traces",
"test:coverage": "NODE_OPTIONS=--max_old_space_size=8192 hardhat coverage && istanbul check-coverage --statements 90 --branches 84 --functions 88 --lines 90",
Expand All @@ -38,11 +39,7 @@
"lint:contracts:fix": "yarn prettier --write 'contracts/**/*.sol'",
"lint:fix": "yarn lint:contracts:fix && yarn lint:ts:fix",
"lint": "yarn lint:fix && yarn lint:check",
"clean": "rm -rf ./dist ./artifacts ./cache ./coverage ./tsconfig.tsbuildinfo",
"prepublishOnly": "yarn copyfiles -u 1 -e \"**/test-*/**/*\" \"contracts/**/*\" ./",
"postpublish": "rimraf chugsplash L1 L2 libraries standards",
"prepack": "yarn prepublishOnly",
"postpack": "yarn postpublish",
"clean": "rm -rf ./dist ./artifacts ./cache ./coverage ./tsconfig.tsbuildinfo ./chugsplash ./L1 ./L2 ./libraries ./standards",
"pre-commit": "lint-staged",
"validateDocs": "hardhat validateOutput"
},
Expand Down Expand Up @@ -107,7 +104,6 @@
"prettier": "^2.3.1",
"prettier-plugin-solidity": "^1.0.0-beta.18",
"random-bytes-seed": "^1.0.3",
"rimraf": "^3.0.2",
"rlp": "^2.2.6",
"solhint": "^3.3.6",
"solhint-plugin-prettier": "^0.0.5",
Expand Down

0 comments on commit f4bf4f5

Please sign in to comment.