Merge F2F

.github/workflows/docker-merge-f2f.yml

@@ -0,0 +1,45 @@
+name: docker merge f2f
+
+on:
+    push:
+        branches:
+            - merge-f2f
+
+env:
+    DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+    IMAGE_NAME: ${{ github.repository_owner}}/lighthouse
+    LCLI_IMAGE_NAME: ${{ github.repository_owner }}/lcli
+    BRANCH_NAME: merge-f2f
+
+jobs:
+    build-docker-amd64:
+        runs-on: ubuntu-18.04
+        steps:
+            - uses: actions/checkout@v2
+            - name: Update Rust
+              run: rustup update stable
+            - name: Dockerhub login
+              run: |
+                  echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
+            - name: Build AMD64 dockerfile (with push)
+              run: |
+                  docker build \
+                      --build-arg PORTABLE=true \
+                      --tag ${IMAGE_NAME}:${BRANCH_NAME} \
+                      --file ./Dockerfile .
+                  docker push ${IMAGE_NAME}:${BRANCH_NAME}
+    build-docker-lcli:
+        runs-on: ubuntu-18.04
+        steps:
+            - uses: actions/checkout@v2
+            - name: Dockerhub login
+              run: |
+                  echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
+            - name: Build lcli dockerfile (with push)
+              run: |
+                  docker build \
+                      --build-arg PORTABLE=true \
+                      --tag ${LCLI_IMAGE_NAME}:${BRANCH_NAME} \
+                      --file ./lcli/Dockerfile .
+                  docker push ${LCLI_IMAGE_NAME}:${BRANCH_NAME}

Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "beacon_node/client",
     "beacon_node/eth1",
     "beacon_node/lighthouse_network",
+    "beacon_node/execution_layer",
     "beacon_node/http_api",
     "beacon_node/http_metrics",
     "beacon_node/network",

Makefile

@@ -23,9 +23,9 @@ FORKS=phase0 altair
 # Binaries will most likely be found in `./target/release`
 install:
 ifeq ($(PORTABLE), true)
-	cargo install --path lighthouse --force --locked --features portable
+	cargo install --path lighthouse --force --locked --features portable,spec-minimal
 else
-	cargo install --path lighthouse --force --locked
+	cargo install --path lighthouse --force --locked --features spec-minimal
 endif
 
 # Builds the lcli binary in release (optimized).

beacon_node/beacon_chain/Cargo.toml

@@ -3,6 +3,7 @@ name = "beacon_chain"
 version = "0.2.0"
 authors = ["Paul Hauner <[email protected]>", "Age Manning <[email protected]>"]
 edition = "2018"
+autotests = false # using a single test binary compiles faster
 
 [features]
 default = ["participation_metrics"]
@@ -55,3 +56,9 @@ slasher = { path = "../../slasher" }
 eth2 = { path = "../../common/eth2" }
 strum = { version = "0.21.0", features = ["derive"] }
 logging = { path = "../../common/logging" }
+execution_layer = { path = "../execution_layer" }
+sensitive_url = { path = "../../common/sensitive_url" }
+
+[[test]]
+name = "beacon_chain_tests"
+path = "tests/main.rs"