Commit 8b636e09 authored by Matt Joiner's avatar Matt Joiner Committed by GitHub

Run cannon-prestate if devnet cannon prestate files are missing (#11399)

* Fix devnet-up when op-program/bin is missing prestate-proof.json

* Fix cannon-prestate to always run

* Add prestate.json
parent 770cbc62
...@@ -129,6 +129,12 @@ reproducible-prestate: ## Builds reproducible-prestate binary ...@@ -129,6 +129,12 @@ reproducible-prestate: ## Builds reproducible-prestate binary
make -C ./op-program reproducible-prestate make -C ./op-program reproducible-prestate
.PHONY: reproducible-prestate .PHONY: reproducible-prestate
# Include any files required for the devnet to build and run. This appears to be the only one that's actually needed.
DEVNET_CANNON_PRESTATE_FILES := op-program/bin/prestate-proof.json op-program/bin/prestate.json
$(DEVNET_CANNON_PRESTATE_FILES):
make cannon-prestate
cannon-prestate: op-program cannon ## Generates prestate using cannon and op-program cannon-prestate: op-program cannon ## Generates prestate using cannon and op-program
./cannon/bin/cannon load-elf --path op-program/bin/op-program-client.elf --out op-program/bin/prestate.json --meta op-program/bin/meta.json ./cannon/bin/cannon load-elf --path op-program/bin/op-program-client.elf --out op-program/bin/prestate.json --meta op-program/bin/meta.json
./cannon/bin/cannon run --proof-at '=0' --stop-at '=1' --input op-program/bin/prestate.json --meta op-program/bin/meta.json --proof-fmt 'op-program/bin/%d.json' --output "" ./cannon/bin/cannon run --proof-at '=0' --stop-at '=1' --input op-program/bin/prestate.json --meta op-program/bin/meta.json --proof-fmt 'op-program/bin/%d.json' --output ""
...@@ -152,16 +158,14 @@ nuke: clean devnet-clean ## Completely clean the project directory ...@@ -152,16 +158,14 @@ nuke: clean devnet-clean ## Completely clean the project directory
git clean -Xdf git clean -Xdf
.PHONY: nuke .PHONY: nuke
pre-devnet: submodules ## Prepares for running a local devnet ## Prepares for running a local devnet
pre-devnet: submodules $(DEVNET_CANNON_PRESTATE_FILES)
@if ! [ -x "$(command -v geth)" ]; then \ @if ! [ -x "$(command -v geth)" ]; then \
make install-geth; \ make install-geth; \
fi fi
@if ! [ -x "$(command -v eth2-testnet-genesis)" ]; then \ @if ! [ -x "$(command -v eth2-testnet-genesis)" ]; then \
make install-eth2-testnet-genesis; \ make install-eth2-testnet-genesis; \
fi fi
@if [ ! -e op-program/bin ]; then \
make cannon-prestate; \
fi
.PHONY: pre-devnet .PHONY: pre-devnet
devnet-up: pre-devnet ## Starts the local devnet devnet-up: pre-devnet ## Starts the local devnet
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment