Skip to content
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0c48fed
solana:v1.7.9-testnet
vasiliy-zaznobin Nov 15, 2021
ae4fb77
Merge remote-tracking branch 'origin/develop' into solana_v1.7.9-testnet
vasiliy-zaznobin Nov 15, 2021
88557a0
all uniswap tests
vasiliy-zaznobin Nov 16, 2021
45c8ae2
Expand debug output for ExecuteTrxFromAccountDataIterative
vasiliy-zaznobin Dec 1, 2021
d87bbdb
Merge remote-tracking branch 'origin/develop' into neon-swap
vasiliy-zaznobin Dec 1, 2021
dddf1e9
Use %s
vasiliy-zaznobin Dec 1, 2021
d815fb5
SOLANA_REVISION:=v1.7.9-testnet
vasiliy-zaznobin Dec 1, 2021
3adb0c3
Use str()
vasiliy-zaznobin Dec 1, 2021
54e6446
Use __dict__
vasiliy-zaznobin Dec 1, 2021
114aac7
Add the 'method' json field in a response
vasiliy-zaznobin Dec 2, 2021
45deb61
Add the 'method' json field in a response as in the request
vasiliy-zaznobin Dec 3, 2021
e8c35b3
Add the request['method'] only in debug output, but in a responce
vasiliy-zaznobin Dec 3, 2021
2c77be1
Add the request['method'] only if exists else '---'
vasiliy-zaznobin Dec 3, 2021
234526c
Introduce DEBUG_SENDING_SOLANA_TRANSACTION
vasiliy-zaznobin Dec 3, 2021
64eaed9
Use string type for DEBUG_SENDING_SOLANA_TRANSACTION
vasiliy-zaznobin Dec 3, 2021
3996c99
Rename DEBUG_SENDING_SOLANA_TRANSACTION to LOG_SENDING_SOLANA_TRANSAC…
vasiliy-zaznobin Dec 3, 2021
c6841cf
Merge remote-tracking branch 'origin/develop' into 349-Improve_neon-p…
vasiliy-zaznobin Dec 6, 2021
fcb96c5
Move LOG_SENDING_SOLANA_TRANSACTION to environment.py after merging d…
vasiliy-zaznobin Dec 6, 2021
e8bbbf1
Merge remote-tracking branch 'origin/develop' into 349-Improve_neon-p…
vasiliy-zaznobin Dec 6, 2021
9a3ee4c
Remove some code that is used for debugging
vasiliy-zaznobin Dec 6, 2021
fc0c495
#351 fix canceller droping running transactions
otselnik Dec 6, 2021
139a5a7
Merge remote-tracking branch 'origin/351_canceller_fix' into 349-Impr…
vasiliy-zaznobin Dec 6, 2021
537f08c
Merge remote-tracking branch 'origin/373_solana_v1.7.9-testnet' into …
vasiliy-zaznobin Dec 6, 2021
5faa5ee
Fix after merging
vasiliy-zaznobin Dec 6, 2021
4df95a5
Merge branch '349-Improve_neon-proxy_logging_to_filter_a_request_and_…
vasiliy-zaznobin Dec 6, 2021
75eceb2
Fix after merging
vasiliy-zaznobin Dec 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
10 changes: 5 additions & 5 deletions proxy/common_neon/solana_interactor.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
from solana.rpc.types import TxOpts

from .costs import update_transaction_cost
from ..environment import EVM_LOADER_ID, CONFIRMATION_CHECK_DELAY

from ..environment import EVM_LOADER_ID, CONFIRMATION_CHECK_DELAY, LOG_SENDING_SOLANA_TRANSACTION

logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
Expand Down Expand Up @@ -88,14 +87,15 @@ def collect_result(self, reciept, eth_trx, reason=None):
update_transaction_cost(result, eth_trx, reason)
return result


def send_measured_transaction(self, trx, eth_trx, reason):
if LOG_SENDING_SOLANA_TRANSACTION:
logger.debug("send_measured_transaction for reason %s: %s ", reason, trx.__dict__)
result = self.send_transaction(trx, eth_trx, reason=reason)
self.get_measurements(result)
return result


# Do not rename this function! This name used in CI measurements (see function `cleanup_docker` in .buildkite/steps/deploy-test.sh)
# Do not rename this function! This name used in CI measurements (see function `cleanup_docker` in
# .buildkite/steps/deploy-test.sh)
def get_measurements(self, result):
try:
measurements = self.extract_measurements_from_receipt(result)
Expand Down