diff --git a/evm_loader/deploy-evm.sh b/evm_loader/deploy-evm.sh index f431a1b5b..e89df5c6d 100755 --- a/evm_loader/deploy-evm.sh +++ b/evm_loader/deploy-evm.sh @@ -11,7 +11,7 @@ if [ -z "$EVM_LOADER" ]; then exit 1 fi -echo "Deployed from " $(solana address) " with " $(solana balance) +echo "Deploying from " $(solana address) " with " $(solana balance) if [ "$SKIP_EVM_DEPLOY" != "YES" ]; then echo "Deploying evm_loader at address $EVM_LOADER..." if ! solana program deploy --url $SOLANA_URL \ @@ -20,6 +20,7 @@ if [ "$SKIP_EVM_DEPLOY" != "YES" ]; then echo "Failed to deploy evm_loader" exit 1 fi + echo "Deployed evm_loader at address $EVM_LOADER..." sleep 30 else echo "Skip deploying of evm_loader" @@ -28,4 +29,4 @@ fi echo "Deployed finished from " $(solana address) " with " $(solana balance) neon-cli --url $SOLANA_URL --evm_loader $EVM_LOADER \ --keypair evm_loader-keypair.json \ - --loglevel warn init-environment --send-trx --keys-dir keys/ \ No newline at end of file + --loglevel warn init-environment --send-trx --keys-dir keys/ diff --git a/evm_loader/wait-for-neon.sh b/evm_loader/wait-for-neon.sh index f3d2da8aa..3554fb277 100755 --- a/evm_loader/wait-for-neon.sh +++ b/evm_loader/wait-for-neon.sh @@ -8,13 +8,16 @@ set -euo pipefail if [ $# -eq 0 ]; then if neon-cli --url $SOLANA_URL --evm_loader $EVM_LOADER --loglevel off init-environment > /dev/null; then + echo "Executed neon-cli init-environment successfully" exit 0 fi else WAIT_TIME=$1 echo "Waiting $WAIT_TIME seconds for NeonEVM to be available at $SOLANA_URL:$EVM_LOADER" for i in $(seq 1 $WAIT_TIME); do + echo "Try neon-cli init-environment count=$i" if neon-cli --url $SOLANA_URL --evm_loader $EVM_LOADER --loglevel off init-environment > /dev/null; then + echo "Executed neon-cli init-environment successfully after count=$i" exit 0 fi sleep 1 @@ -22,4 +25,4 @@ else fi echo "unable to connect to NeonEVM at $SOLANA_URL:$EVM_LOADER" -exit 1 \ No newline at end of file +exit 1 diff --git a/evm_loader/wait-for-solana.sh b/evm_loader/wait-for-solana.sh index 072911fa4..081873b49 100755 --- a/evm_loader/wait-for-solana.sh +++ b/evm_loader/wait-for-solana.sh @@ -9,12 +9,14 @@ else WAIT_TIME=$1 echo "Waiting $WAIT_TIME seconds for solana cluster to be available at $SOLANA_URL" for i in $(seq 1 $WAIT_TIME); do - if solana -u $SOLANA_URL cluster-version >/dev/null 2>&1; then exit 0; fi + echo "Try solana cluster-version count=$i" + if solana -u $SOLANA_URL cluster-version; then + echo "Executed solana cluster-version successfully after count=$i" + exit 0 + fi sleep 1 done fi echo "unable to connect to solana cluster $SOLANA_URL" exit 1 - -