mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-16 19:32:55 +00:00
Merge branch 'sigp:stable' into book-cli
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
ARG CROSS_BASE_IMAGE
|
||||
FROM $CROSS_BASE_IMAGE
|
||||
|
||||
RUN apt-get update -y && apt-get upgrade -y
|
||||
|
||||
RUN apt-get install -y unzip && \
|
||||
PB_REL="https://github.com/protocolbuffers/protobuf/releases" && \
|
||||
curl -L $PB_REL/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip -o protoc.zip && \
|
||||
unzip protoc.zip -d /usr && \
|
||||
chmod +x /usr/bin/protoc
|
||||
|
||||
RUN apt-get install -y cmake clang-3.9
|
||||
|
||||
ENV PROTOC=/usr/bin/protoc
|
||||
@@ -9,5 +9,5 @@ set -Eeuo pipefail
|
||||
source ./vars.env
|
||||
|
||||
if [ -d $DATADIR ]; then
|
||||
rm -r $DATADIR
|
||||
rm -rf $DATADIR
|
||||
fi
|
||||
|
||||
@@ -103,7 +103,7 @@ echo "executing: ./setup.sh >> $LOG_DIR/setup.log"
|
||||
./setup.sh >> $LOG_DIR/setup.log 2>&1
|
||||
|
||||
# Update future hardforks time in the EL genesis file based on the CL genesis time
|
||||
GENESIS_TIME=$(lcli pretty-ssz state_merge $TESTNET_DIR/genesis.ssz | jq | grep -Po 'genesis_time": "\K.*\d')
|
||||
GENESIS_TIME=$(lcli pretty-ssz --testnet-dir $TESTNET_DIR BeaconState $TESTNET_DIR/genesis.ssz | jq | grep -Po 'genesis_time": "\K.*\d')
|
||||
echo $GENESIS_TIME
|
||||
CAPELLA_TIME=$((GENESIS_TIME + (CAPELLA_FORK_EPOCH * 32 * SECONDS_PER_SLOT)))
|
||||
echo $CAPELLA_TIME
|
||||
|
||||
Reference in New Issue
Block a user