Skip to content

#357 log message on starting proxy #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rozhkovdmitrii merged 8 commits into from
Feb 10, 2022
Merged

#357 log message on starting proxy #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8472e8
Add startup logging into run-proxy.sh
Feb 10, 2022
a63bd6a
Add startup logging into start scripts
Feb 10, 2022
67066fd
Spit and polish
Feb 10, 2022
14f27b6
Merge branch 'develop' into 357-log-message-on-starting-proxy
Feb 10, 2022
d8cf7b2
Spit and polish
Feb 10, 2022
b5673ec
Spit and polish
Feb 10, 2022
d6fea32
Spit and polish
Feb 10, 2022
c62b4f1
Spit and polish
Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions proxy/run-indexer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/bin/bash
COMPONENT=Indexer
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} service"

if [ -z "$EVM_LOADER" ]; then
echo "Extracting EVM_LOADER address from keypair file..."
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Extracting EVM_LOADER address from keypair file..."
export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
echo "EVM_LOADER=$EVM_LOADER"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} EVM_LOADER=$EVM_LOADER"
fi
export INDEXER_MODE='true'

Expand Down
6 changes: 4 additions & 2 deletions proxy/run-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash
COMPONENT=Proxy
echo "$(date "+%F %X.%3N") I $(basename $0):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} service"

source proxy/run-set-env.sh
source proxy/run-set-env.sh ${COMPONENT}

echo run-proxy
echo "$(date "+%F %X.%3N") I $(basename $0):${LINENO} $$ ${COMPONENT}:StartScript {} run-proxy"
python3 -m proxy --hostname 0.0.0.0 --port 9090 --enable-web-server --plugins proxy.plugin.SolanaProxyPlugin $EXTRA_ARGS
8 changes: 4 additions & 4 deletions proxy/run-set-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

COMPONENT="${1:-Undefined}"
set -xeo pipefail

date
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Init environment set"

if [ "$CONFIG" == "ci" ]; then
[[ -z "$SOLANA_URL" ]] && export SOLANA_URL="http://solana:8899"
Expand Down Expand Up @@ -59,8 +59,8 @@ elif [ "$CONFIG" != "custom" ]; then
exit 1
fi

[[ -z "$SOLANA_URL" ]] && echo "SOLANA_URL is not set" && exit 1
[[ -z "$EVM_LOADER" ]] && echo "EVM_LOADER is not set" && exit 1
[[ -z "$SOLANA_URL" ]] && echo "$(date "+%F %X.%3N") E $(basename $0):${LINENO} $$ ${COMPONENT}:StartScript {} SOLANA_URL is not set" && exit 1
[[ -z "$EVM_LOADER" ]] && echo "$(date "+%F %X.%3N") E $(basename $0):${LINENO} $$ ${COMPONENT}:StartScript {} EVM_LOADER is not set" && exit 1

solana config set -u $SOLANA_URL

Expand Down
12 changes: 7 additions & 5 deletions proxy/run-test-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
#!/bin/bash
COMPONENT=Proxy
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} service"

if [ -z "$SOLANA_URL" ]; then
echo "SOLANA_URL is not set"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} SOLANA_URL is not set"
exit 1
fi

solana config set -u $SOLANA_URL

echo "Dumping evm_loader and extracting ELF parameters"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Dumping evm_loader and extracting ELF parameters"
export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
export $(/spl/bin/neon-cli --commitment confirmed --url $SOLANA_URL --evm_loader="$EVM_LOADER" neon-elf-params)

export NUM_ACCOUNTS=15
/spl/bin/create-test-accounts.sh $NUM_ACCOUNTS

echo "NEON_TOKEN_MINT=$NEON_TOKEN_MINT"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} NEON_TOKEN_MINT=$NEON_TOKEN_MINT"

for i in $(seq 1 $NUM_ACCOUNTS); do
ID_FILE="$HOME/.config/solana/id"
Expand All @@ -25,9 +27,9 @@ for i in $(seq 1 $NUM_ACCOUNTS); do
fi

if [ "$(spl-token balance --owner "$ID_FILE" "$NEON_TOKEN_MINT" || echo '0')" == "0" ]; then
echo 'Create balance and mint token'
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Create balance and mint token"
TOKEN_ACCOUNT=$( (spl-token create-account --owner "$ID_FILE" "$NEON_TOKEN_MINT" || true) | grep -Po 'Creating account \K[^\n]*')
echo "TOKEN_ACCOUNT=$TOKEN_ACCOUNT"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} TOKEN_ACCOUNT=$TOKEN_ACCOUNT"
spl-token mint "$NEON_TOKEN_MINT" 10000000 --owner /spl/bin/evm_loader-keypair.json -- "$TOKEN_ACCOUNT"
fi
done
Expand Down
6 changes: 4 additions & 2 deletions run-airdropper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/bin/bash
COMPONENT=Airdropper
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} service"

if [ -z "$EVM_LOADER" ]; then
echo "Extracting EVM_LOADER address from keypair file..."
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Extracting EVM_LOADER address from keypair file..."
export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
echo "EVM_LOADER=$EVM_LOADER"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} EVM_LOADER=$EVM_LOADER"
fi
export AIRDROPPER_MODE='true'
[[ -z "$FINALIZED" ]] && export FINALIZED="confirmed"
Expand Down
13 changes: 7 additions & 6 deletions run-faucet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
#!/bin/sh

COMPONENT=Faucet
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} service"
if [ -z "$SOLANA_URL" ]; then
echo "SOLANA_URL is not set"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} SOLANA_URL is not set"
exit 1
fi

echo "Extracting NEON-EVM's ELF parameters"
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Extracting NEON-EVM's ELF parameters"
export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
export $(/spl/bin/neon-cli --commitment confirmed --url $SOLANA_URL --evm_loader="$EVM_LOADER" neon-elf-params)

BALANCE=$(solana balance | tr '.' '\t'| tr '[:space:]' '\t' | cut -f1)
if [ "$BALANCE" -eq 0 ]; then
echo "SOL balance is 0"
echo "$(date "+%F %X.%3N") W $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} SOL balance is 0"
exit 1
fi

if [ "$(spl-token balance "$NEON_TOKEN_MINT" || echo 0)" -eq 0 ]; then
echo "NEON balance is 0"
echo "$(date "+%F %X.%3N") W $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} NEON balance is 0"
exit 1
fi

faucet run
faucet run
2 changes: 2 additions & 0 deletions run-test-airdropper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
COMPONENT=Airdropper
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} service"

[[ -z "$FINALIZED" ]] && export FINALIZED="confirmed"
export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
Expand Down
14 changes: 8 additions & 6 deletions run-test-faucet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
#!/bin/bash
COMPONENT=Faucet
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Start ${COMPONENT} service"

if [ -z "$SOLANA_URL" ]; then
echo "SOLANA_URL is not set"
echo "$(date "+%F %X.%3N") E $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} SOLANA_URL is not set"
exit 1
fi

if [ -z "$TEST_FAUCET_INIT_NEON_BALANCE" ]; then
echo "TEST_FAUCET_INIT_NEON_BALANCE is not set"
echo "$(date "+%F %X.%3N") E $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} TEST_FAUCET_INIT_NEON_BALANCE is not set"
exit 1
fi

solana config set -u "$SOLANA_URL"

echo "Extracting NEON-EVM's ELF parameters"
echo "$(date "+%F %X.%3N") E $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Extracting NEON-EVM's ELF parameters"
export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
export $(/spl/bin/neon-cli --commitment confirmed --url $SOLANA_URL --evm_loader="$EVM_LOADER" neon-elf-params)

echo "Generating new account for operate with faucet service"
echo "$(date "+%F %X.%3N") E $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Generating new account for operate with faucet service"
rm /$HOME/.config/solana/id.json
/spl/bin/create-test-accounts.sh 1

if [ "$(spl-token balance "$NEON_TOKEN_MINT" || echo 0)" -eq 0 ]; then
echo 'Create balance and mint token'
echo "$(date "+%F %X.%3N") E $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Create balance and mint token"
TOKEN_ACCOUNT=$( (spl-token create-account "$NEON_TOKEN_MINT" || true) | grep -Po 'Creating account \K[^\n]*')
echo "TOKEN_ACCOUNT=$TOKEN_ACCOUNT"
echo "$(date "+%F %X.%3N") E $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} TOKEN_ACCOUNT=$TOKEN_ACCOUNT"
spl-token mint "$NEON_TOKEN_MINT" $TEST_FAUCET_INIT_NEON_BALANCE --owner /spl/bin/evm_loader-keypair.json -- "$TOKEN_ACCOUNT"
fi

Expand Down