From 81ff549ec77239661c79c61a888e0fd3ae261b1c Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Dec 2024 14:25:05 +0000 Subject: [PATCH] Fixes --- clients/consensus/lighthouse/Dockerfile | 2 +- ethereum/ethereum-reth/Dockerfile | 2 +- ethereum/ethereum-reth/main.rhai | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/clients/consensus/lighthouse/Dockerfile b/clients/consensus/lighthouse/Dockerfile index fa7bf8c0..4b501abe 100644 --- a/clients/consensus/lighthouse/Dockerfile +++ b/clients/consensus/lighthouse/Dockerfile @@ -26,5 +26,5 @@ RUN git clone https://github.com/sigp/lighthouse.git && \ git checkout $LIGHTHOUSE_VERSION WORKDIR /root/lighthouse -RUN . "$HOME/.cargo/env" && make +RUN . "$HOME/.cargo/env" && cargo build diff --git a/ethereum/ethereum-reth/Dockerfile b/ethereum/ethereum-reth/Dockerfile index 3e1ab011..ddb62fe3 100644 --- a/ethereum/ethereum-reth/Dockerfile +++ b/ethereum/ethereum-reth/Dockerfile @@ -17,6 +17,6 @@ COPY --from=reth-build /root/reth/target/maxperf/reth /root/bin/ COPY --from=lighthouse-build /root/lighthouse/target/release/lighthouse /root/bin/ COPY ./Caddyfile.template /var/lib/babel/templates/ -COPY ./reth.rhai /var/lib/babel/plugin/reth.rhai +COPY ./reth.rhai /var/lib/babel/plugin/ COPY ./main.rhai /var/lib/babel/plugin/ COPY ./config-alloy.template /var/lib/babel/templates/config-alloy.template \ No newline at end of file diff --git a/ethereum/ethereum-reth/main.rhai b/ethereum/ethereum-reth/main.rhai index ada3c693..8e5700b0 100644 --- a/ethereum/ethereum-reth/main.rhai +++ b/ethereum/ethereum-reth/main.rhai @@ -73,7 +73,26 @@ const PLUGIN_CONFIG = #{ ${global::RETH_EXTRA_ARGS}`, shutdown_timeout_secs: 120, use_blockchain_data: true, + log_timestamp: false, }, + #{ + name: "lighthouse", + run_sh: `RUST_LOG=info /root/bin/lighthouse bn \ + --network ${global::NET.networkname} \ + --datadir ${global::LIGHTHOUSE_DIR} \ + --checkpoint-sync-url ${global::NET.url} \ + --disable-deposit-contract-sync --http \ + --http-address 127.0.0.1 --http-port 5052 \ + --execution-endpoint http://127.0.0.1:8551 \ + --execution-jwt ${global::HOME}/jwt.hex \ + --metrics --metrics-port 9002 --prune-blobs false \ + --reconstruct-historic-states --block-cache-size 64 \ + --genesis-backfill --historic-state-cache-size 4 \ + --disable-backfill-rate-limiting`, + shutdown_timeout_secs: 120, + use_blockchain_data: true, + log_timestamp: false, + }, ], alternative_download: #{ run_sh: "echo dummy" @@ -96,7 +115,6 @@ fn application_status() { } } - fn height() { parse_hex(run_jrpc(#{host: global::API_HOST, method: "eth_blockNumber"}).expect(200).result) }