-
Notifications
You must be signed in to change notification settings - Fork 97
fix(l1): use proper docker image to spin up localnets. #4131
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,7 @@ clean: clean-vectors ## 🧹 Remove build artifacts | |
|
||
STAMP_FILE := .docker_build_stamp | ||
$(STAMP_FILE): $(shell find crates cmd -type f -name '*.rs') Cargo.toml Dockerfile | ||
docker build -t ethrex:unstable . | ||
docker build -t ethrex . | ||
touch $(STAMP_FILE) | ||
|
||
build-image: $(STAMP_FILE) ## 🐳 Build the Docker image | ||
|
@@ -62,34 +62,11 @@ checkout-ethereum-package: ## 📦 Checkout specific Ethereum package revision | |
fi | ||
|
||
ENCLAVE ?= lambdanet | ||
mpaulucci marked this conversation as resolved.
Show resolved
Hide resolved
|
||
LOCALNET_CONFIG_FILE ?= ./fixtures/network/network_params.yaml | ||
|
||
localnet: stop-localnet-silent build-image checkout-ethereum-package ## 🌐 Start local network | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file fixtures/network/network_params.yaml | ||
docker logs -f $$(docker ps -q --filter ancestor=ethrex) | ||
|
||
localnet-snooper: stop-localnet-silent build-image checkout-ethereum-package ## 🌐 Start local network and output the JSON-RPC requests ethrex exchanges with the consensus client | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file fixtures/network/network_params.yaml | ||
docker logs -f $$(docker ps -q --filter name=snooper-engine-3-lighthouse-ethrex) | ||
|
||
localnet-client-comparision: stop-localnet-silent build-image checkout-ethereum-package ## 🌐 Start local network | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This removes a lot of unrelated makefile targets. Is that ok? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes, I don't think we need one target per network |
||
cp metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_l1_perf.json ethereum-package/src/grafana/ethrex_l1_perf.json | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file fixtures/network/network_params_client_comparision.yaml | ||
docker logs -f $$(docker ps -q -n 1 --filter ancestor=ethrex) | ||
|
||
localnet-assertoor-blob: stop-localnet-silent build-image checkout-ethereum-package ## 🌐 Start local network with assertoor test | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file .github/config/assertoor/network_params_blob.yaml | ||
docker logs -f $$(docker ps -q --filter ancestor=ethrex) | ||
|
||
localnet-assertoor-ethrex-only: stop-localnet-silent build-image checkout-ethereum-package ## 🌐 Start local network with assertoor test | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file fixtures/network/network_params_ethrex_only.yaml | ||
docker logs -f $$(docker ps -q -n 1 --filter ancestor=ethrex) | ||
|
||
localnet-assertoor-different-cl: stop-localnet-silent build-image checkout-ethereum-package ## 🌐 Start local network with assertoor test | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file .github/config/assertoor/network_params_ethrex_multiple_cl.yaml | ||
docker logs -f $$(docker ps -q -n 1 --filter ancestor=ethrex) | ||
|
||
localnet-assertoor-tx: stop-localnet-silent build-image checkout-ethereum-package ## 🌐 Start local network with assertoor test | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file .github/config/assertoor/network_params_tx.yaml | ||
kurtosis run --enclave $(ENCLAVE) ethereum-package --args-file $(LOCALNET_CONFIG_FILE) | ||
docker logs -f $$(docker ps -q --filter ancestor=ethrex) | ||
|
||
mpaulucci marked this conversation as resolved.
Show resolved
Hide resolved
|
||
stop-localnet: ## 🛑 Stop local network | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are some places in CI and makefile where we retag this, I think. We should clean up those
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, its being worked on here: #4120
In general we shouldn't use make targets on the CI IMO