From 80e6cae1695f2cf6e1dfd09b71530331545276ef Mon Sep 17 00:00:00 2001 From: Robert Martin-Legene <robert@nic.ar> Date: Mon, 30 Sep 2019 18:10:18 -0300 Subject: [PATCH] Problemas general el genesis --- bin/generate-genesis-block.sh | 7 ++++--- bin/libbfa.sh | 8 +++----- bin/singlestart.sh | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/generate-genesis-block.sh b/bin/generate-genesis-block.sh index 12100e2..a5f3442 100755 --- a/bin/generate-genesis-block.sh +++ b/bin/generate-genesis-block.sh @@ -1,11 +1,12 @@ -#!/bin/bash +#!/bin/bash -x # Robert Martin-Legene <robert@nic.ar> if [ -z "${BFAHOME}" ]; then echo "\$BFAHOME not set. Did you source bfa/bin/env ?" >&2; exit 1; fi source ${BFAHOME}/bin/libbfa.sh || exit 1 -if [ ! -d "${BFANODEDIR}" -o ! -d "${BFANODEDIR}/geth/chaindata" ] +if [ -d "${BFANODEDIR}/geth/chaindata" ] then + mkdir -p "${BFANODEDIR}" echo "Node is not initialised. Initialising with genesis." - geth --cache 0 --datadir "${BFANODEDIR}" --networkid ${BFANETWORKID} init "${BFANETWORKDIR}/genesis.json" + geth --config "${BFANETWORKDIR}/config.toml" --cache 0 init "${BFANETWORKDIR}/genesis.json" fi diff --git a/bin/libbfa.sh b/bin/libbfa.sh index eeacdc5..b7a3487 100644 --- a/bin/libbfa.sh +++ b/bin/libbfa.sh @@ -65,7 +65,6 @@ function geth_exec geth_attach --exec "$1" </dev/null } -rpc_counter=0 function geth_rpc { local params= connectstring= cmd=$1 @@ -159,6 +158,7 @@ function contractSendTx function bfainit { + rpc_counter=0 ############### # bfainit # test -n "${BFAHOME}" -a \ @@ -175,10 +175,6 @@ function bfainit # # BFANODEDIR test -n "$BFANODEDIR" || BFANODEDIR="${BFANETWORKDIR}/node" - if [ ! -d "${BFANODEDIR}" -o ! -d "${BFANODEDIR}/geth/chaindata" ] - then - generate-genesis-block.sh - fi # # Default to IPC connections, because we have more geth modules available. true ${BFASOCKETTYPE:=ipc} @@ -196,6 +192,8 @@ function bfainit echo "Unknown socket type. Supported types are http, ws, ipc" >&2 exit 1 esac + # + generate-genesis-block.sh } if [ -z "$SOURCED_BFAINIT_SH" ] diff --git a/bin/singlestart.sh b/bin/singlestart.sh index 9963ecf..d8fb623 100755 --- a/bin/singlestart.sh +++ b/bin/singlestart.sh @@ -88,7 +88,8 @@ PIDIDX[$!]="log.sh" exec > ${LOGPIPE} 2>&1 echo "*** Starting geth." -geth --config ${BFATOML} --gcmode archive --allow-insecure-unlock & +# "NoPruning=true" means "--gcmode archive" +geth --config ${BFATOML} & PIDIDX[$!]="geth" # bootnode -- GitLab