status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More improvements to the Fluffy local testnet script (#2624) 

* More improvements to the Fluffy local testnet script.
This commit is contained in:
web3-developer 2024-09-13 20:40:48 +08:00 committed by GitHub
parent d96196d01d
commit d17ddacf39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fluffy/scripts/launch_local_testnet.sh
View File

@ -34,10 +34,14 @@ if [ ${PIPESTATUS[0]} != 4 ]; then
fi fi
OPTS="h:n:d" OPTS="h:n:d"
LONGOPTS="help,nodes:,data-dir:,run-tests,log-level:,base-port:,base-rpc-port:,trusted-block-root:,portal-bridge,base-metrics-port:,reuse-existing-data-dir,timeout:,kill-old-processes,skip-build,portal-subnetworks:,disable-state-root-validation" LONGOPTS="help,nodes:,data-dir:,run-tests,log-level:,base-port:,base-rpc-port:,trusted-block-root:,portal-bridge,base-metrics-port:,reuse-existing-data-dir,timeout:,kill-old-processes,skip-build,portal-subnetworks:,disable-state-root-validation,radius:"
# default values # default values
NUM_NODES="3"
NUM_NODES="8" # With the default radius of 254 which should result in ~1/4th
# of the data set stored on each node at least 8 nodes are recommended to
# provide complete coverage of the data set with approx replication factor of 2.
RADIUS="static:254"
DATA_DIR="local_testnet_data" DATA_DIR="local_testnet_data"
RUN_TESTS="0" RUN_TESTS="0"
LOG_LEVEL="INFO" LOG_LEVEL="INFO"
@ -78,6 +82,7 @@ E.g.: $(basename "$0") --nodes ${NUM_NODES} --data-dir "${DATA_DIR}" # defaults
--skip-build skip building the binaries (default: disabled) --skip-build skip building the binaries (default: disabled)
--portal-subnetworks comma separated list of subnetworks to enable (default: ${PORTAL_SUBNETWORKS}) --portal-subnetworks comma separated list of subnetworks to enable (default: ${PORTAL_SUBNETWORKS})
--disable-state-root-validation disable state root validation for the state subnetwork (default: disabled) --disable-state-root-validation disable state root validation for the state subnetwork (default: disabled)
--radius set the radius to be used by the nodes (default: ${RADIUS})
EOF EOF
} }
@ -155,6 +160,10 @@ while true; do
DISABLE_STATE_ROOT_VALIDATION="1" DISABLE_STATE_ROOT_VALIDATION="1"
shift shift
;; ;;
--radius)
RADIUS="$2"
shift 2
;;
--) --)
shift shift
break break
@ -297,11 +306,10 @@ for NUM_NODE in $(seq 0 $(( NUM_NODES - 1 ))); do
NODE_DATA_DIR="${DATA_DIR}/node${NUM_NODE}" NODE_DATA_DIR="${DATA_DIR}/node${NUM_NODE}"
RADIUS_ARG="--radius=${RADIUS}"
if [[ ${NUM_NODE} != ${BOOTSTRAP_NODE} ]]; then if [[ ${NUM_NODE} != ${BOOTSTRAP_NODE} ]]; then
BOOTSTRAP_ARG="--bootstrap-file=${BOOTSTRAP_ENR_FILE}" BOOTSTRAP_ARG="--bootstrap-file=${BOOTSTRAP_ENR_FILE}"
# All nodes but bootstrap node run with log. radius of 254 which should
# result in ~1/4th of the data set stored.
RADIUS_ARG="--radius=static:254"
# Wait for the bootstrap node to write out its enr file # Wait for the bootstrap node to write out its enr file
START_TIMESTAMP=$(date +%s) START_TIMESTAMP=$(date +%s)

4
fluffy/tools/portal_bridge/portal_bridge_state.nim
View File

@ -314,7 +314,7 @@ proc runBackfillGossipBlockOffersLoop(
continue continue
if verifyGossip: if verifyGossip:
#await sleepAsync(100.milliseconds) # wait for the peers to be updated await sleepAsync(100.milliseconds) # wait for the peers to be updated
for k, _ in offersMap: for k, _ in offersMap:
try: try:
let contentInfo = let contentInfo =
@ -324,7 +324,7 @@ proc runBackfillGossipBlockOffersLoop(
retryGossip = true retryGossip = true
break break
except CatchableError as e: except CatchableError as e:
error "Failed to find content with key: ", warn "Failed to find content with key: ",
contentKey = k, error = e.msg, workerId contentKey = k, error = e.msg, workerId
retryGossip = true retryGossip = true
break break