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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge branch 'develop' into 357-log-message-on-starting-proxy 
# Conflicts:
#	proxy/run-test-proxy.sh
  • Loading branch information
rozhkovdmitrii committed Feb 10, 2022
commit 14f27b6c298534c6ef94b4aecb334f3aa510d46a
9 changes: 3 additions & 6 deletions proxy/run-test-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ export NUM_ACCOUNTS=15
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Create test accounts: ${NUM_ACCOUNTS}"
Copy link
Contributor

@ivandzen ivandzen Feb 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is no need to log here because this message will duplicate one produced by create-test-accounts.sh

Copy link
Contributor Author

@rozhkovdmitrii rozhkovdmitrii Feb 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

/spl/bin/create-test-accounts.sh $NUM_ACCOUNTS

[[ -z "$NEW_USER_AIRDROP_AMOUNT" ]] && export NEW_USER_AIRDROP_AMOUNT=100
echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} NEW_USER_AIRDROP_AMOUNT=${NEW_USER_AIRDROP_AMOUNT}"

echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} 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 @@ -33,8 +30,8 @@ for i in $(seq 1 $NUM_ACCOUNTS); do
if [ "$(spl-token balance --owner "$ID_FILE" "$NEON_TOKEN_MINT" || echo '0')" == "0" ]; then
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 "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} TOKEN_ACCOUNT=$TOKEN_ACCOUNT"
spl-token mint "$NEON_TOKEN_MINT" $(("$NEW_USER_AIRDROP_AMOUNT"*100000)) --owner /spl/bin/evm_loader-keypair.json -- "$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
You are viewing a condensed version of this merge commit. You can view the full changes here.