Bump the beacon_node version; Make the simulation script compatible with macOS

The shell expansion syntax used in the run_node script was not handled properly
by the bash shell shipped with macOS. In particular, it was not able to handle
range expressions involving interpolated vars:

cp foo/{$FIRST_INDEX..$LAST_INDEX} ...
This commit is contained in:
Zahary Karadjov 2019-05-14 16:31:19 +03:00
parent a0d4c3432f
commit 8da71715eb
2 changed files with 9 additions and 6 deletions

View File

@ -3,10 +3,10 @@ const
const const
versionMajor* = 0 versionMajor* = 0
versionMinor* = 1 versionMinor* = 2
versionBuild* = 10 versionBuild* = 0
semanticVersion* = 0 semanticVersion* = 1
# Bump this up every time a breaking change is introduced # Bump this up every time a breaking change is introduced
# Clients having different semantic versions won't be able # Clients having different semantic versions won't be able
# to join the same testnets. # to join the same testnets.

View File

@ -15,12 +15,15 @@ if [ "${NAT:-}" == "1" ]; then
NAT_FLAG="--nat:any" NAT_FLAG="--nat:any"
fi fi
FIRST_VALIDATOR_IDX=$(printf '%07d' $(( (NUM_VALIDATORS / ($NUM_NODES + $NUM_MISSING_NODES)) * $1 ))) FIRST_VALIDATOR_IDX=$(( (NUM_VALIDATORS / ($NUM_NODES + $NUM_MISSING_NODES)) * $1 ))
LAST_VALIDATOR_IDX=$(printf '%07d' $(( (NUM_VALIDATORS / ($NUM_NODES + $NUM_MISSING_NODES)) * ($1 + 1) - 1 ))) LAST_VALIDATOR_IDX=$(( (NUM_VALIDATORS / ($NUM_NODES + $NUM_MISSING_NODES)) * ($1 + 1) - 1 ))
mkdir -p $DATA_DIR/validators mkdir -p $DATA_DIR/validators
rm -f $DATA_DIR/validators/* rm -f $DATA_DIR/validators/*
eval cp ${VALIDATORS_DIR}/v{$FIRST_VALIDATOR_IDX..$LAST_VALIDATOR_IDX}.privkey $DATA_DIR/validators
pushd $VALIDATORS_DIR
cp $(seq -s " " -f v%07g.privkey $FIRST_VALIDATOR_IDX $LAST_VALIDATOR_IDX) $DATA_DIR/validators
popd
$BEACON_NODE_BIN \ $BEACON_NODE_BIN \
--network:$NETWORK_METADATA_FILE \ --network:$NETWORK_METADATA_FILE \