Commit b047e1fd authored by Adrian Sutton's avatar Adrian Sutton Committed by GitHub

Revert "Fix devnet-up when op-program/bin is missing prestate-proof.json (#11383)" (#11393)

This reverts commit 2491a373.

make cannon-prestate doesn't declare all transitive dependencies properly so can fail to build when there are changes.
parent 051db548
...@@ -137,18 +137,11 @@ reproducible-prestate: ## Builds reproducible-prestate binary ...@@ -137,18 +137,11 @@ reproducible-prestate: ## Builds reproducible-prestate binary
make -C ./op-program reproducible-prestate make -C ./op-program reproducible-prestate
.PHONY: reproducible-prestate .PHONY: reproducible-prestate
# Checks if prestate outputs are missing cannon-prestate: op-program cannon ## Generates prestate using cannon and op-program
cannon-prestate: op-program/bin/prestate-proof.json
.PHONY: cannon-prestate
op-program/bin/prestate-proof.json:
make generate-cannon-prestates
generate-cannon-prestates: 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 ""
mv op-program/bin/0.json op-program/bin/prestate-proof.json mv op-program/bin/0.json op-program/bin/prestate-proof.json
.PHONY: generate-cannon-prestates .PHONY: cannon-prestate
mod-tidy: ## Cleans up unused dependencies in Go modules mod-tidy: ## Cleans up unused dependencies in Go modules
# Below GOPRIVATE line allows mod-tidy to be run immediately after # Below GOPRIVATE line allows mod-tidy to be run immediately after
...@@ -167,14 +160,16 @@ nuke: clean devnet-clean ## Completely clean the project directory ...@@ -167,14 +160,16 @@ nuke: clean devnet-clean ## Completely clean the project directory
git clean -Xdf git clean -Xdf
.PHONY: nuke .PHONY: nuke
## Prepares for running a local devnet pre-devnet: submodules ## Prepares for running a local devnet
pre-devnet: submodules cannon-prestate
@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