Skip to content

Commit

Permalink
refactor: add ethereum-package as a submodule (#1276)
Browse files Browse the repository at this point in the history
  • Loading branch information
avilagaston9 authored Aug 15, 2024
1 parent 52f5e0f commit 0c50e12
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "ethereum-package"]
path = ethereum-package
url = https://github.com/lambdaclass/ethereum-package.git
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ $(OUTPUT_DIR)/libp2p_port: $(PORT_SOURCES) $(PROTOBUF_GO_FILES)
GRAFANA_DASHBOARDS_DIR = ./metrics/grafana/provisioning/dashboards

# Root directory of ethereum-package
KURTOSIS_DIR ?= ../ethereum-package
KURTOSIS_DIR ?= ./ethereum-package
# Grafana configuration directory for dashboards
KURTOSIS_GRAFANA_DASHBOARDS_DIR ?= $(KURTOSIS_DIR)/static_files/grafana-config/dashboards
# Secret cookie for the lambdaconsesus IEX node built for usage with kurtosis
Expand All @@ -58,11 +58,9 @@ KURTOSIS_SERVICE ?= cl-3-lambda-geth
# 💻 kurtosis.setup: @ Setup the kurtosis environment
kurtosis.setup: kurtosis.setup.ethereum-package kurtosis.setup.grafana kurtosis.setup.lambdaconsensus

#💻 kurtosis.setup.ethereum-package: @ Clones the lambda ethereum-package and check out the current active branch
#💻 kurtosis.setup.ethereum-package: @ Downloads the lambda ethereum-package content
kurtosis.setup.ethereum-package:
git clone https://github.com/lambdaclass/ethereum-package.git $(KURTOSIS_DIR) && \
cd $(KURTOSIS_DIR) && \
git checkout lecc-integration
git submodule update --init --recursive

# 💻 kurtosis.setup.grafana: @ Copies the grafana dashboards to the ethereum-package folder under grafana-config
kurtosis.setup.grafana:
Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ As stated in the `ethereum-package` README:
After kurtosis is installed, we need to do three setup steps.

1. Clone the lambdaclass ethereum-package fork and checkout a particular branch
1. Download the lambdaclass ethereum-package fork submodule's content.
2. Copy our Grafana custom dashboards to be able to look at them
3. Build the Docker image of the service

Expand All @@ -238,11 +238,10 @@ or executed each at a time

```bash
make kurtosis.setup.ethereum-package
# git clone https://github.com/lambdaclass/ethereum-package.git ../ethereum-package && \
# cd ../ethereum-package && git checkout lecc-integration
# git submodule update --init --recursive

make kurtosis.setup.grafana
# cp -r ./metrics/grafana/provisioning/dashboards/* ../ethereum-package/static_files/grafana-config/dashboards/lambdaconsensus
# cp -r ./metrics/grafana/provisioning/dashboards/* ./ethereum-package/static_files/grafana-config/dashboards/lambdaconsensus

make kurtosis.setup.lambdaconsensus
# docker build --build-arg IEX_ARGS="--sname lambdaconsensus --cookie secret" -t lambda_ethereum_consensus .
Expand All @@ -254,7 +253,6 @@ make kurtosis.setup.lambdaconsensus
After that, we will be ready to tweak the configuration.

```bash
# assumming you are still in the lambda_ethereum_consensus repo, you can modify the configuration through
vim network_params.yaml
```

Expand Down Expand Up @@ -283,7 +281,7 @@ For starting the local environment after the setup run:
make kurtosis.start

# which executes
kurtosis run --enclave lambdanet ../ethereum-package --args-file network_params.yaml
kurtosis run --enclave lambdanet ./ethereum-package --args-file network_params.yaml
```

Then, you can connect to the service (running docker instance) with the following:
Expand Down
1 change: 1 addition & 0 deletions ethereum-package
Submodule ethereum-package added at 477164

0 comments on commit 0c50e12

Please sign in to comment.