Merge branch 'main' into validator-state-management-refactor

Author: rodrigo-o

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ethereum-package"]
+	path = ethereum-package
+	url = https://github.com/lambdaclass/ethereum-package.git

Makefile

@@ -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
@@ -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:

README.md

@@ -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
 
@@ -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 .
@@ -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
 ```
 
@@ -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:

ethereum-package

@@ -31,7 +31,7 @@
   "hpax": {:hex, :hpax, "1.0.0", "28dcf54509fe2152a3d040e4e3df5b265dcb6cb532029ecbacf4ce52caea3fd2", [:mix], [], "hexpm", "7f1314731d711e2ca5fdc7fd361296593fc2542570b3105595bb0bc6d0fad601"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
-  "joken": {:hex, :joken, "2.6.1", "2ca3d8d7f83bf7196296a3d9b2ecda421a404634bfc618159981a960020480a1", [:mix], [{:jose, "~> 1.11.9", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "ab26122c400b3d254ce7d86ed066d6afad27e70416df947cdcb01e13a7382e68"},
+  "joken": {:hex, :joken, "2.6.2", "5daaf82259ca603af4f0b065475099ada1b2b849ff140ccd37f4b6828ca6892a", [:mix], [{:jose, "~> 1.11.10", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "5134b5b0a6e37494e46dbf9e4dad53808e5e787904b7c73972651b51cce3d72b"},
   "jose": {:hex, :jose, "1.11.10", "a903f5227417bd2a08c8a00a0cbcc458118be84480955e8d251297a425723f83", [:mix, :rebar3], [], "hexpm", "0d6cd36ff8ba174db29148fc112b5842186b68a90ce9fc2b3ec3afe76593e614"},
   "logfmt_ex": {:hex, :logfmt_ex, "0.4.2", "e337b6072bd21ad61d8bbe38d9c591b5a8e4869ceba4967699d027baedf2eec8", [:mix], [], "hexpm", "7fad3704383d4595adf0da873e72c8b393120e67b1257f9102da881fde9d4249"},
   "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"},