From 31cff910b189e3a9102dfdde220a42ced21814fa Mon Sep 17 00:00:00 2001 From: Kim De Mey Date: Tue, 25 Jul 2023 20:53:31 +0200 Subject: [PATCH] Rename beacon_chain_bridge to beacon_lc_bridge (#1655) --- Makefile | 4 ++-- fluffy/docs/content_seeding.md | 8 ++++---- fluffy/scripts/launch_local_testnet.sh | 4 ++-- .../beacon_lc_bridge.nim} | 4 ++-- .../beacon_lc_bridge_conf.nim} | 2 +- fluffy/tools/{bridge => beacon_lc_bridge}/nim.cfg | 0 6 files changed, 11 insertions(+), 11 deletions(-) rename fluffy/tools/{bridge/beacon_chain_bridge.nim => beacon_lc_bridge/beacon_lc_bridge.nim} (99%) rename fluffy/tools/{bridge/beacon_chain_bridge_conf.nim => beacon_lc_bridge/beacon_lc_bridge_conf.nim} (98%) rename fluffy/tools/{bridge => beacon_lc_bridge}/nim.cfg (100%) diff --git a/Makefile b/Makefile index f3159cb61..3555bbdf0 100644 --- a/Makefile +++ b/Makefile @@ -66,13 +66,13 @@ TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS)) # Fluffy debugging tools + testing tools FLUFFY_TOOLS := \ - beacon_chain_bridge \ + beacon_lc_bridge \ eth_data_exporter \ content_verifier \ blockwalk \ portalcli FLUFFY_TOOLS_DIRS := \ - fluffy/tools/bridge \ + fluffy/tools/beacon_lc_bridge \ fluffy/tools # comma-separated values for the "clean" target FLUFFY_TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(FLUFFY_TOOLS)) diff --git a/fluffy/docs/content_seeding.md b/fluffy/docs/content_seeding.md index 2e3813699..0d19c6ef5 100644 --- a/fluffy/docs/content_seeding.md +++ b/fluffy/docs/content_seeding.md @@ -89,15 +89,15 @@ Run a Fluffy node with the JSON-RPC API enabled. ./build/fluffy --rpc --table-ip-limit:1024 --bucket-ip-limit:24 ``` -Build & run the `beacon_chain_bridge`: +Build & run the `beacon_lc_bridge`: ```bash -make fluffy-tools +make beacon_lc_bridge TRUSTED_BLOCK_ROOT=0x1234567890123456789012345678901234567890123456789012345678901234 # Replace this -./build/beacon_chain_bridge --trusted-block-root=${TRUSTED_BLOCK_ROOT} +./build/beacon_lc_bridge --trusted-block-root=${TRUSTED_BLOCK_ROOT} ``` -The `beacon_chain_bridge` will start with the consensus light client sync follow +The `beacon_lc_bridge` will start with the consensus light client sync follow beacon block gossip. Once it is synced, the execution payload of new beacon blocks will be extracted and injected in the Portal network as execution headers and blocks. diff --git a/fluffy/scripts/launch_local_testnet.sh b/fluffy/scripts/launch_local_testnet.sh index c5fdded4f..75da18eb5 100755 --- a/fluffy/scripts/launch_local_testnet.sh +++ b/fluffy/scripts/launch_local_testnet.sh @@ -196,7 +196,7 @@ fi # Build the binaries BINARIES="fluffy" if [[ "${LC_BRIDGE}" == "1" ]]; then - BINARIES="${BINARIES} beacon_chain_bridge" + BINARIES="${BINARIES} beacon_lc_bridge" fi TEST_BINARIES="test_portal_testnet" $MAKE -j ${NPROC} LOG_LEVEL=TRACE ${BINARIES} @@ -325,7 +325,7 @@ done if [[ "$LC_BRIDGE" == "1" ]]; then echo "Starting bridge node." LC_BRIDGE_DATA_DIR="${DATA_DIR}/lc_bridge" - ./build/beacon_chain_bridge \ + ./build/beacon_lc_bridge \ --data-dir="${LC_BRIDGE_DATA_DIR}" \ --udp-port=$(( BASE_PORT + NUM_NODES )) \ --rpc-address="127.0.0.1" \ diff --git a/fluffy/tools/bridge/beacon_chain_bridge.nim b/fluffy/tools/beacon_lc_bridge/beacon_lc_bridge.nim similarity index 99% rename from fluffy/tools/bridge/beacon_chain_bridge.nim rename to fluffy/tools/beacon_lc_bridge/beacon_lc_bridge.nim index fc141e6ea..105057f47 100644 --- a/fluffy/tools/bridge/beacon_chain_bridge.nim +++ b/fluffy/tools/beacon_lc_bridge/beacon_lc_bridge.nim @@ -6,7 +6,7 @@ # at your option. This file may not be copied, modified, or distributed except according to those terms. # -# This beacon_chain_bridge allows for following the head of the beacon chain and +# This beacon_lc_bridge allows for following the head of the beacon chain and # seeding the latest execution block headers and bodies into the Portal network. # # The bridge does consensus light client sync and follows beacon block gossip. @@ -87,7 +87,7 @@ import ../../network/history/[history_content, history_network], ../../network/beacon_light_client/beacon_light_client_content, ../../common/common_types, - ./beacon_chain_bridge_conf + ./beacon_lc_bridge_conf from stew/objects import checkedEnumAssign from stew/byteutils import readHexChar diff --git a/fluffy/tools/bridge/beacon_chain_bridge_conf.nim b/fluffy/tools/beacon_lc_bridge/beacon_lc_bridge_conf.nim similarity index 98% rename from fluffy/tools/bridge/beacon_chain_bridge_conf.nim rename to fluffy/tools/beacon_lc_bridge/beacon_lc_bridge_conf.nim index dabc316a1..56755111c 100644 --- a/fluffy/tools/bridge/beacon_chain_bridge_conf.nim +++ b/fluffy/tools/beacon_lc_bridge/beacon_lc_bridge_conf.nim @@ -57,7 +57,7 @@ type BeaconBridgeConf* = object # Storage dataDir* {. - desc: "The directory where beacon_chain_bridge will store all data" + desc: "The directory where beacon_lc_bridge will store all data" defaultValue: defaultVerifiedProxyDataDir() defaultValueDesc: $defaultDataVerifiedProxyDirDesc abbr: "d" diff --git a/fluffy/tools/bridge/nim.cfg b/fluffy/tools/beacon_lc_bridge/nim.cfg similarity index 100% rename from fluffy/tools/bridge/nim.cfg rename to fluffy/tools/beacon_lc_bridge/nim.cfg