Skip to content

269 use elf parameters instead of env vars #270

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
ivandzen merged 2 commits into from
Nov 8, 2021
Merged

269 use elf parameters instead of env vars #270

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
851cd9c
get rid of ETH_TOKEN_MINT and COLLATERAL_POOL_BASE variables in sourc…
Nov 6, 2021
eb71937
edit run-proxy
Nov 6, 2021
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
edit run-proxy
  • Loading branch information
ivanl committed Nov 6, 2021
commit eb71937d983cb569c314424cb7c93ca900cd9473
29 changes: 6 additions & 23 deletions proxy/run-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ date
if [ "$CONFIG" == "ci" ]; then
[[ -z "$SOLANA_URL" ]] && export SOLANA_URL="http://solana:8899"
[[ -z "$EVM_LOADER" ]] && export EVM_LOADER=deploy
[[ -z "$ETH_TOKEN_MINT" ]] && export ETH_TOKEN_MINT=deploy
[[ -z "$COLLATERAL_POOL_BASE" ]] && export COLLATERAL_POOL_BASE=deploy
[[ -z "$NEW_USER_AIRDROP_AMOUNT" ]] && export NEW_USER_AIRDROP_AMOUNT=100
[[ -z "$EXTRA_GAS" ]] && export EXTRA_GAS=100000
[[ -z "$NEON_CLI_TIMEOUT" ]] && export NEON_CLI_TIMEOUT="0.5"
Expand All @@ -18,26 +16,20 @@ if [ "$CONFIG" == "ci" ]; then
elif [ "$CONFIG" == "local" ]; then
[[ -z "$SOLANA_URL" ]] && export SOLANA_URL="http://localhost:8899"
[[ -z "$EVM_LOADER" ]] && export EVM_LOADER=deploy
[[ -z "$ETH_TOKEN_MINT" ]] && export ETH_TOKEN_MINT=deploy
[[ -z "$COLLATERAL_POOL_BASE" ]] && export COLLATERAL_POOL_BASE=deploy
[[ -z "$NEW_USER_AIRDROP_AMOUNT" ]] && export NEW_USER_AIRDROP_AMOUNT=10
[[ -z "$EXTRA_GAS" ]] && export EXTRA_GAS=0
[[ -z "$NEON_CLI_TIMEOUT" ]] && export NEON_CLI_TIMEOUT="0.9"
[[ -z "$MINIMAL_GAS_PRICE" ]] && export MINIMAL_GAS_PRICE=0
elif [ "$CONFIG" == "devnet" ]; then
[[ -z "$SOLANA_URL" ]] && export SOLANA_URL="https://api.devnet.solana.com"
[[ -z "$EVM_LOADER" ]] && export EVM_LOADER=eeLSJgWzzxrqKv1UxtRVVH8FX3qCQWUs9QuAjJpETGU
[[ -z "$ETH_TOKEN_MINT" ]] && export ETH_TOKEN_MINT=89dre8rZjLNft7HoupGiyxu3MNftR577ZYu8bHe2kK7g
[[ -z "$COLLATERAL_POOL_BASE" ]] && export COLLATERAL_POOL_BASE=7SBdHNeF9FFYySEoszpjZXXQsAiwa5Lzpsz6nUJWusEx
[[ -z "$NEW_USER_AIRDROP_AMOUNT" ]] && export NEW_USER_AIRDROP_AMOUNT=0
[[ -z "$EXTRA_GAS" ]] && export EXTRA_GAS=90000
[[ -z "$NEON_CLI_TIMEOUT" ]] && export NEON_CLI_TIMEOUT="10"
[[ -z "$MINIMAL_GAS_PRICE" ]] && export MINIMAL_GAS_PRICE=1
elif [ "$CONFIG" == "testnet" ]; then
[[ -z "$SOLANA_URL" ]] && export SOLANA_URL="https://api.testnet.solana.com"
[[ -z "$EVM_LOADER" ]] && export EVM_LOADER=eeLSJgWzzxrqKv1UxtRVVH8FX3qCQWUs9QuAjJpETGU
[[ -z "$ETH_TOKEN_MINT" ]] && export ETH_TOKEN_MINT=89dre8rZjLNft7HoupGiyxu3MNftR577ZYu8bHe2kK7g
[[ -z "$COLLATERAL_POOL_BASE" ]] && export COLLATERAL_POOL_BASE=7SBdHNeF9FFYySEoszpjZXXQsAiwa5Lzpsz6nUJWusEx
[[ -z "$NEW_USER_AIRDROP_AMOUNT" ]] && export NEW_USER_AIRDROP_AMOUNT=0
[[ -z "$EXTRA_GAS" ]] && export EXTRA_GAS=90000
[[ -z "$NEON_CLI_TIMEOUT" ]] && export NEON_CLI_TIMEOUT="15"
Expand All @@ -48,8 +40,6 @@ fi

[[ -z "$SOLANA_URL" ]] && echo "SOLANA_URL is not set" && exit 1
[[ -z "$EVM_LOADER" ]] && echo "EVM_LOADER is not set" && exit 1
[[ -z "$ETH_TOKEN_MINT" ]] && echo "ETH_TOKEN_MINT is not set" && exit 1
[[ -z "$COLLATERAL_POOL_BASE" ]] && echo "COLLATERAL_POOL_BASE is not set" && exit 1

echo SOLANA_URL=$SOLANA_URL

Expand Down Expand Up @@ -96,22 +86,15 @@ fi
echo "EVM_LOADER=$EVM_LOADER"


if [ "$ETH_TOKEN_MINT" == "deploy" ]; then
echo "ETH_TOKEN_MINT is set to load. A new token will be created. Creating token..."
export ETH_TOKEN_MINT=$(/spl/bin/spl-token create-token --owner /spl/bin/test_token_owner -- /spl/bin/test_token_keypair | grep -Po 'Creating token \K[^\n]*')
fi

echo "A new token will be created. Creating token..."
export ETH_TOKEN_MINT=$(/spl/bin/spl-token create-token --owner /spl/bin/test_token_owner -- /spl/bin/test_token_keypair | grep -Po 'Creating token \K[^\n]*')
echo "ETH_TOKEN_MINT=$ETH_TOKEN_MINT"


if [ "$COLLATERAL_POOL_BASE" == "deploy" ]; then
echo "COLLATERAL_POOL_BASE is set to create. A new collateral pool accounts will be created. Creating accounts..."
#generate collateral pool accounts
solana -k /spl/bin/collateral-pool-keypair.json airdrop 1000
python3 /spl/bin/collateral_pool_generator.py /spl/bin/collateral-pool-keypair.json
export COLLATERAL_POOL_BASE=$(solana-keygen pubkey -f /spl/bin/collateral-pool-keypair.json)
fi

echo "A new collateral pool accounts will be created. Creating accounts..."
solana -k /spl/bin/collateral-pool-keypair.json airdrop 1000
python3 /spl/bin/collateral_pool_generator.py /spl/bin/collateral-pool-keypair.json
export COLLATERAL_POOL_BASE=$(solana-keygen pubkey -f /spl/bin/collateral-pool-keypair.json)
echo "COLLATERAL_POOL_BASE=$COLLATERAL_POOL_BASE"


Expand Down