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

Fixed launch_local_testnet; Renamed validator_keygen to keystore_directories

This commit is contained in:
Zahary Karadjov 2020-06-03 14:40:14 +03:00 committed by zah
parent e3378e52ac
commit a75c632f7a
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_chain/beacon_node.nim
View File

@ -25,7 +25,7 @@ import
beacon_node_common, beacon_node_types, block_pools/block_pools_types, beacon_node_common, beacon_node_types, block_pools/block_pools_types,
nimbus_binary_common, nimbus_binary_common,
mainchain_monitor, version, ssz/[merkleization], sszdump, mainchain_monitor, version, ssz/[merkleization], sszdump,
sync_protocol, request_manager, validator_keygen, interop, statusbar, sync_protocol, request_manager, keystore_directories, interop, statusbar,
sync_manager, state_transition, sync_manager, state_transition,
validator_duties, validator_api, attestation_aggregation validator_duties, validator_api, attestation_aggregation

0
beacon_chain/validator_keygen.nim → beacon_chain/keystore_directories.nim
View File

2
beacon_chain/validator_client.nim
View File

@ -21,7 +21,7 @@ import
eth2_network, eth2_discovery, validator_pool, beacon_node_types, eth2_network, eth2_discovery, validator_pool, beacon_node_types,
nimbus_binary_common, nimbus_binary_common,
version, ssz/merkleization, version, ssz/merkleization,
sync_manager, validator_keygen, sync_manager, keystore_directories,
spec/eth2_apis/validator_callsigs_types, spec/eth2_apis/validator_callsigs_types,
eth2_json_rpc_serialization eth2_json_rpc_serialization

2
beacon_chain/validator_duties.nim
View File

@ -20,7 +20,7 @@ import
# Local modules # Local modules
spec/[datatypes, digest, crypto, beaconstate, helpers, validator, network], spec/[datatypes, digest, crypto, beaconstate, helpers, validator, network],
conf, time, validator_pool, state_transition, conf, time, validator_pool, state_transition,
attestation_pool, block_pool, eth2_network, validator_keygen, attestation_pool, block_pool, eth2_network, keystore_directories,
beacon_node_common, beacon_node_types, nimbus_binary_common, beacon_node_common, beacon_node_types, nimbus_binary_common,
mainchain_monitor, version, ssz/merkleization, interop, mainchain_monitor, version, ssz/merkleization, interop,
attestation_aggregation, sync_manager, sszdump attestation_aggregation, sync_manager, sszdump

11
scripts/launch_local_testnet.sh
View File

@ -181,8 +181,8 @@ dump_logs() {
PIDS="" PIDS=""
NODES_WITH_VALIDATORS=${NODES_WITH_VALIDATORS:-4} NODES_WITH_VALIDATORS=${NODES_WITH_VALIDATORS:-4}
SYSTEM_VALIDATORS=$((TOTAL_VALIDATORS - USER_VALIDATORS)) SYSTEM_VALIDATORS=$(( TOTAL_VALIDATORS - USER_VALIDATORS ))
VALIDATORS_PER_NODE=$((SYSTEM_VALIDATORS / NODES_WITH_VALIDATORS)) VALIDATORS_PER_NODE=$(( SYSTEM_VALIDATORS / NODES_WITH_VALIDATORS ))
BOOTSTRAP_TIMEOUT=10 # in seconds BOOTSTRAP_TIMEOUT=10 # in seconds
for NUM_NODE in $(seq 0 $((NUM_NODES - 1))); do for NUM_NODE in $(seq 0 $((NUM_NODES - 1))); do
@ -210,14 +210,15 @@ for NUM_NODE in $(seq 0 $((NUM_NODES - 1))); do
mkdir -p "${NODE_DATA_DIR}/secrets" mkdir -p "${NODE_DATA_DIR}/secrets"
if [[ $NUM_NODE -lt $NODES_WITH_VALIDATORS ]]; then if [[ $NUM_NODE -lt $NODES_WITH_VALIDATORS ]]; then
for VALIDATOR in $(ls ${DEPOSITS_DIR}/* | tail -n +$(( $USER_VALIDATORS + ($VALIDATORS_PER_NODE * $NUM_NODE) + 1 )) | head -n $VALIDATORS_PER_NODE); do for VALIDATOR in $(ls ${DEPOSITS_DIR} | tail -n +$(( $USER_VALIDATORS + ($VALIDATORS_PER_NODE * $NUM_NODE) + 1 )) | head -n $VALIDATORS_PER_NODE); do
cp -ar "$VALIDATOR" "${NODE_DATA_DIR}/validators/" cp -ar "${DEPOSITS_DIR}/$VALIDATOR" "${NODE_DATA_DIR}/validators/"
cp -a "${SECRETS_DIR}/${VALIDATOR}" "${NODE_DATA_DIR}/secrets" cp -a "${SECRETS_DIR}/${VALIDATOR}" "${NODE_DATA_DIR}/secrets"
done done
fi fi
./build/beacon_node \ ./build/beacon_node \
--nat:extip:127.0.0.1 \ --non-interactive \
--nat:extip:127.0.0.1 \
--log-level="${LOG_LEVEL}" \ --log-level="${LOG_LEVEL}" \
--tcp-port=$(( BASE_PORT + NUM_NODE )) \ --tcp-port=$(( BASE_PORT + NUM_NODE )) \
--udp-port=$(( BASE_PORT + NUM_NODE )) \ --udp-port=$(( BASE_PORT + NUM_NODE )) \