Skip to content

#356 Use same instruction iterative as bucked #357

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 5 commits into from
Dec 8, 2021
Merged

#356 Use same instruction iterative as bucked #357

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9a3d31
#354 Check result for errors
otselnik Dec 6, 2021
a447e80
#356 Continue iterative transaction step by step with same instructio…
otselnik Dec 6, 2021
1d223e4
Merge branch '354_check_result_for_errors' into 356_use_same_instruct…
otselnik Dec 6, 2021
731ecc1
Merge remote-tracking branch 'origin/develop' into 356_use_same_instr…
otselnik Dec 7, 2021
d7ccdfa
#356 refactoring
otselnik Dec 8, 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
#356 refactoring
  • Loading branch information
@otselnik
otselnik committed Dec 8, 2021
commit d7ccdfaa70d626780f467357c9c43294e17b79bd
7 changes: 3 additions & 4 deletions proxy/common_neon/transaction_sender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
from .neon_instruction import NeonInstruction
from .solana_interactor import SolanaInteractor, check_if_continue_returned, check_for_errors,\
check_if_program_exceeded_instructions, check_if_storage_is_empty_error
from .utils import get_from_dict
from ..environment import EVM_LOADER_ID
from ..plugin.eth_proto import Trx as EthTrx

Expand Down Expand Up @@ -432,7 +431,7 @@ def call_continue_step(self):
result = self.sender.send_measured_transaction(trx, self.eth_trx, 'ContinueV02')
return result
except SendTransactionError as err:
if check_if_program_exceeded_instructions(err.result['data']):
if check_if_program_exceeded_instructions(err.result):
step_count = int(step_count * 90 / 100)
else:
raise
Expand All @@ -458,9 +457,9 @@ def call_continue_bucked(self):
receipts.append(self.sender.send_transaction_unconfirmed(trx))
except SendTransactionError as err:
logger.error(f"Failed to call continue bucked, error: {err.result}")
if check_if_storage_is_empty_error(err.result['data']):
if check_if_storage_is_empty_error(err.result):
pass
elif check_if_program_exceeded_instructions(err.result['data']):
elif check_if_program_exceeded_instructions(err.result):
steps = int(steps * 90 / 100)
else:
raise
Expand Down