Skip to content

Reject unprofitable transactions (min_gas_price) #257

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
s-medvedev merged 3 commits into from
Nov 2, 2021
Merged

Reject unprofitable transactions (min_gas_price) #257

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5400b5
min gas_price impl
sinev-valentine Oct 29, 2021
4290956
skip test_canceled
sinev-valentine Nov 1, 2021
c109d86
unskip test_canceled
sinev-valentine Nov 2, 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
Next Next commit
min gas_price impl
  • Loading branch information
@sinev-valentine
sinev-valentine committed Oct 29, 2021
commit f5400b56f5fb3ab4a496b62a01780e9064f8d5d9
7 changes: 5 additions & 2 deletions proxy/plugin/solana_rest_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import threading
from .solana_rest_api_tools import EthereumAddress, create_account_with_seed, evm_loader_id, getTokens, \
getAccountInfo, solana_cli, call_signed, solana_url, call_emulated, \
Trx, EthereumError, create_collateral_pool_address, getTokenAddr, STORAGE_SIZE, neon_config_load
Trx, EthereumError, create_collateral_pool_address, getTokenAddr, STORAGE_SIZE, neon_config_load, MINIMAL_GAS_PRICE
from solana.rpc.commitment import Commitment, Confirmed
from web3 import Web3
import logging
Expand Down Expand Up @@ -113,7 +113,7 @@ def net_version(self):
return str(int(chainId,base=16))

def eth_gasPrice(self):
return hex(1*10**9)
return hex(MINIMAL_GAS_PRICE)

def eth_estimateGas(self, param):
try:
Expand Down Expand Up @@ -387,6 +387,9 @@ def eth_sendRawTransaction(self, rawTrx):
logger.debug('eth_sendRawTransaction rawTrx=%s', rawTrx)
trx = EthTrx.fromString(bytearray.fromhex(rawTrx[2:]))
logger.debug("%s", json.dumps(trx.as_dict(), cls=JsonEncoder, indent=3))
if trx.gasPrice < MINIMAL_GAS_PRICE:
raise Exception("The transaction gasPrice is less then the minimum allowable value ({}<{})".format(trx.gasPrice, MINIMAL_GAS_PRICE))

eth_signature = '0x' + bytes(Web3.keccak(bytes.fromhex(rawTrx[2:]))).hex()

sender = trx.sender()
Expand Down
1 change: 1 addition & 0 deletions proxy/plugin/solana_rest_api_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
USE_COMBINED_START_CONTINUE = os.environ.get("USE_COMBINED_START_CONTINUE", "YES") == "YES"
CONTINUE_COUNT_FACTOR = int(os.environ.get("CONTINUE_COUNT_FACTOR", "3"))
TIMEOUT_TO_RELOAD_NEON_CONFIG = int(os.environ.get("TIMEOUT_TO_RELOAD_NEON_CONFIG", "3600"))
MINIMAL_GAS_PRICE=int(os.environ.get("MINIMAL_GAS_PRICE", 1))*10**9

ACCOUNT_SEED_VERSION=b'\1'

Expand Down
4 changes: 4 additions & 0 deletions proxy/run-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ if [ "$CONFIG" == "ci" ]; then
[[ -z "$NEON_CLI_TIMEOUT" ]] && export NEON_CLI_TIMEOUT="0.5"
[[ -z "$USE_COMBINED_START_CONTINUE" ]] && export USE_COMBINED_START_CONTINUE="YES"
[[ -z "$CONTINUE_COUNT_FACTOR" ]] && export CONTINUE_COUNT_FACTOR="3"
[[ -z "$MINIMAL_GAS_PRICE" ]] && export MINIMAL_GAS_PRICE=0
elif [ "$CONFIG" == "local" ]; then
[[ -z "$SOLANA_URL" ]] && export SOLANA_URL="http://localhost:8899"
[[ -z "$EVM_LOADER" ]] && export EVM_LOADER=deploy
Expand All @@ -24,6 +25,7 @@ elif [ "$CONFIG" == "local" ]; then
[[ -z "$NEON_CHAIN_ID" ]] && export NEON_CHAIN_ID=0x6f
[[ -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
Expand All @@ -33,6 +35,7 @@ elif [ "$CONFIG" == "devnet" ]; then
[[ -z "$NEON_CHAIN_ID" ]] && export NEON_CHAIN_ID=0x6e
[[ -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
Expand All @@ -42,6 +45,7 @@ elif [ "$CONFIG" == "testnet" ]; then
[[ -z "$NEON_CHAIN_ID" ]] && export NEON_CHAIN_ID=0x6f
[[ -z "$EXTRA_GAS" ]] && export EXTRA_GAS=90000
[[ -z "$NEON_CLI_TIMEOUT" ]] && export NEON_CLI_TIMEOUT="15"
[[ -z "$MINIMAL_GAS_PRICE" ]] && export MINIMAL_GAS_PRICE="1"
elif [ "$CONFIG" != "custom" ]; then
exit 1
fi
Expand Down