diff --git a/.changeset/fifty-badgers-behave.md b/.changeset/fifty-badgers-behave.md new file mode 100644 index 0000000000000..14ce81b5bb7b6 --- /dev/null +++ b/.changeset/fifty-badgers-behave.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/contracts-periphery': patch +--- + +Fixes import paths in the contracts-periphery package diff --git a/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol b/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol index 0ee2d260ae709..947b85ebdaae2 100644 --- a/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol +++ b/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol @@ -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"; diff --git a/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol b/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol index 05b8ddc06ee2c..237dcdd4de9cb 100644 --- a/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol +++ b/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol @@ -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"; diff --git a/packages/contracts/.gitignore b/packages/contracts/.gitignore index ddc7c0d65d1e4..d077503918939 100644 --- a/packages/contracts/.gitignore +++ b/packages/contracts/.gitignore @@ -1,2 +1,7 @@ src/contract-artifacts.ts src/contract-deployed-artifacts.ts +/chugsplash +/L1 +/L2 +/libraries +/standards diff --git a/packages/contracts/package.json b/packages/contracts/package.json index d970e4c8b6301..9b3dd5543b6ea 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -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", @@ -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" }, @@ -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",