Skip to content

feat(ops-bedrock): fix devnet setup #2584

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
mergify merged 2 commits into from
May 19, 2022
Merged

feat(ops-bedrock): fix devnet setup #2584

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
040c796
feat(ops-bedrock): fix devnet setup
protolambda May 18, 2022
88cf78b
Merge branch 'develop' into fix-bedrock-devnet
mergify[bot] May 19, 2022
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: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ devnet-clean:
rm -rf ./contracts-bedrock/deployments/devnetL1
rm -rf ./.devnet
cd ./ops-bedrock && docker-compose down
docker volume rm ops_l1_data
docker volume rm ops_l2_data
docker volume rm ops-bedrock_l1_data
docker volume rm ops-bedrock_l2_data
docker volume rm ops-bedrock_op_log
.PHONY: devnet-clean

test-unit:
Expand Down
14 changes: 7 additions & 7 deletions ops-bedrock/devnet-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# time in this script.
#
# This script is safe to run multiple times. It stores state in `.devnet`, and
# packages/contracts/deployments/devnetL1.
# contracts-bedrock/deployments/devnetL1.
#
# Don't run this script directly. Run it using the makefile, e.g. `make devnet-up`.
# To clean up your devnet, run `make devnet-clean`.
Expand Down Expand Up @@ -72,17 +72,17 @@ wait_up $L1_URL
cd ../

# Deploy contracts using Hardhat.
if [ ! -f ./packages/contracts/deployments/devnetL1/OptimismPortal.json ]; then
if [ ! -f ./contracts-bedrock/deployments/devnetL1/OptimismPortal.json ]; then
echo "Deploying contracts."
cd ./packages/contracts
cd ./contracts-bedrock
L2OO_STARTING_BLOCK_TIMESTAMP=$GENESIS_TIMESTAMP yarn hardhat --network devnetL1 deploy
cd ../../
cd ../
else
echo "Contracts already deployed, skipping."
fi

function get_deployed_bytecode() {
echo $(jq -r .deployedBytecode ./packages/contracts/artifacts/contracts/$1)
echo $(jq -r .deployedBytecode ./contracts-bedrock/artifacts/contracts/$1)
}

# Pull out the necessary bytecode/addresses from the artifacts/deployments.
Expand All @@ -92,8 +92,8 @@ OPTIMISM_MINTABLE_TOKEN_FACTORY_BYTECODE=$(get_deployed_bytecode universal/Optim
L2_STANDARD_BRIDGE_BYTECODE=$(get_deployed_bytecode L2/L2StandardBridge.sol/L2StandardBridge.json)
L1_BLOCK_INFO_BYTECODE=$(get_deployed_bytecode L2/L1Block.sol/L1Block.json)

DEPOSIT_CONTRACT_ADDRESS=$(jq -r .address < ./packages/contracts/deployments/devnetL1/OptimismPortal.json)
L2OO_ADDRESS=$(jq -r .address < ./packages/contracts/deployments/devnetL1/L2OutputOracle.json)
DEPOSIT_CONTRACT_ADDRESS=$(jq -r .address < ./contracts-bedrock/deployments/devnetL1/OptimismPortal.json)
L2OO_ADDRESS=$(jq -r .address < ./contracts-bedrock/deployments/devnetL1/L2OutputOracle.json)

# Replace values in the L2 genesis file. It doesn't matter if this gets run every time,
# since the replaced values will be the same.
Expand Down