diff --git a/local-network/configs/besu/log4j2.xml b/local-network/configs/besu/log4j2.xml index 6364c7fd..6309ddbb 100644 --- a/local-network/configs/besu/log4j2.xml +++ b/local-network/configs/besu/log4j2.xml @@ -10,7 +10,7 @@ - + diff --git a/local-network/configs/geth/geth.yml b/local-network/configs/geth/geth.yml index 5a4656c5..7f4fe47c 100644 --- a/local-network/configs/geth/geth.yml +++ b/local-network/configs/geth/geth.yml @@ -8,8 +8,6 @@ services: - ./run-geth.sh:/tmp/run.sh:ro env_file: - ../ec-common/peers.env - logging: - driver: none healthcheck: test: 'wget -qO /dev/null --header "content-type: application/json" --post-data {\"jsonrpc\":\"2.0\",\"method\":\"eth_blockNumber\",\"params\":[],\"id\":1} http://127.0.0.1:8545' interval: 5s diff --git a/local-network/configs/geth/run-geth.sh b/local-network/configs/geth/run-geth.sh index c022c6b8..b608afd0 100755 --- a/local-network/configs/geth/run-geth.sh +++ b/local-network/configs/geth/run-geth.sh @@ -9,7 +9,7 @@ IP=$(echo "$IP_RAW" | cut -d/ -f1) NETWORK=$(echo "$IP_RAW" | xargs ipcalc -n | awk -F= '{print $2}') PREFIX=$(echo "$IP_RAW" | xargs ipcalc -p | awk -F= '{print $2}') -tee /root/logs/bootnode.log < { if (isContractSetupResponse.result.value) { logger.info('The contract is already set up.'); } else { - const setupTxResult = await wavesApi1.transactions.broadcast(tx); - await wavesUtils.waitForTxn(wavesApi1, setupTxResult.id); + await wavesApi1.transactions.broadcast(tx); + await wavesUtils.waitForTxn(wavesApi1, tx.id); } }; @@ -88,6 +89,15 @@ export async function setup(force: boolean): Promise { logger.info('Wait Waves 1 node'); await wavesUtils.waitForUp(wavesApi1); + logger.info('Wait Waves node has at least one peer'); // Otherwise we can have problems with rollbacks + let connectedPeers = 0; + do { + await common.sleep(2000); + connectedPeers = (await wavesApi1.peers.fetchConnected()).peers.length; + } while (connectedPeers < 1); + + logger.info(`Waves nodes peers: ${connectedPeers}`); + logger.info('Set staking contract balances'); const isNew = await scSetBalances(); const waitTime = 3000;// To eliminate micro fork issue