Skip to content
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.

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

Verify testnet4 deploy #2820

Merged
merged 15 commits into from
Oct 23, 2023
Prev Previous commit
Next Next commit
Fix pjson yarn flatten command
yorhodes committed Oct 19, 2023
commit dbbbc1bdb694e89ab26b4d7a16762fd0b240e792
4 changes: 3 additions & 1 deletion solidity/flatten.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
LICENSE="// SPDX-License-Identifier: MIT OR Apache-2.0"
yorhodes marked this conversation as resolved.
Show resolved Hide resolved

rm -rf flattened
mkdir -p flattened

@@ -8,12 +10,12 @@ yarn hardhat flatten > flattened/flattened.sol
grep -vE "// SPDX.*" flattened/flattened.sol > flattened/delicensed.sol

# add license
LICENSE="// SPDX-License-Identifier: MIT OR Apache-2.0"
echo "$LICENSE" | cat - flattened/delicensed.sol > flattened/licensed.sol

# compile
solc flattened/licensed.sol

# TODO: automate this?
if [ $? -ne 0 ]; then
echo "Remove @openzeppelin/../ICrossDomainMessenger and replace Optimism_Bridge with ICrossDomainMessenger"
echo "Then try compiling again with solc flattened/licensed.sol"
2 changes: 1 addition & 1 deletion solidity/package.json
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@
"clean": "hardhat clean && rm -rf ./dist ./cache ./types ./coverage",
"coverage": "./coverage.sh",
"docs": "forge doc",
"flatten": "hardhat flatten > contracts/flattened.sol && grep -vE '// SPDX.*' contracts/flattened.sol",
"flatten": "./flatten.sh",
"prettier": "prettier --write ./contracts ./test",
"test": "hardhat test && forge test -vvv",
"gas": "forge snapshot",