#295 iterative execution #332

otselnik · 2021-11-29T16:05:59Z

Returns USE_COMBINED_START_CONTINUE=YES to CI configuration.
Store steps_executed returned from neon-cli emulator to use in optimized continue execution.
Added 2 new strategies to IterativeTransactionSender class: call_signed_iterative_combined and call_signed_with_holder_combined for PartialCombined and PartialWithHolderCombined correspondingly.
Iterative execution tries to calculate a count of transactions needed for eth trx execution from steps returned from the emulator and sends transactions of chosen strategy type, simultaneously to solana and then waits for response with trx execution result. If there was no execution result in transaction receipts or execution failed IterativeTransactionSender tries to execute the transaction by sending continues one by one.

…toring

…d_airdrop`

rozhkovdmitrii · 2021-12-02T04:33:55Z

proxy/common_neon/neon_instruction.py



-    def create_account_with_seed_trx(self, account, seed, lamports, space):
+    def create_account_with_seed_trx(self, account, seed, lamports, space) -> Transaction:


Dima, if you get started to use annotations use them on the arguments too

Is it either eth_account, pda_account or associated_token_account

In my opinion, it is a good start, but for adding annotations everywhere, there should be a separate issue.

rozhkovdmitrii · 2021-12-02T10:23:57Z

proxy/common_neon/neon_instruction.py



-    def make_continue_instruction(self, steps, index=None) -> Transaction:
+    def make_continue_transaction(self, steps, index=None) -> Transaction:


The same. Annotations on arguments

rozhkovdmitrii · 2021-12-02T10:24:47Z

proxy/common_neon/neon_instruction.py

        ))
+
+
+    def make_partial_call_or_continue_instruction(self, steps: int = 0) -> TransactionInstruction:


Annotations

rozhkovdmitrii · 2021-12-02T10:27:59Z

proxy/common_neon/neon_instruction.py

+
+    def make_partial_call_or_continue_instruction(self, steps: int = 0) -> TransactionInstruction:
+        data = bytearray.fromhex("0D") + self.collateral_pool_index_buf + steps.to_bytes(8, byteorder="little") + self.msg
+        return TransactionInstruction(


Isn't it better if it would be separated on two parts. The part that is passed in - is too long

instraction = ... return instruction

This remark could be connected to the previous definition as well

rozhkovdmitrii · 2021-12-02T10:35:09Z

proxy/common_neon/neon_instruction.py

+        data = bytearray.fromhex("0E") + self.collateral_pool_index_buf + steps.to_bytes(8, byteorder='little')
+        if index:
+            data = data + index.to_bytes(8, byteorder="little")
+        return Transaction().add(TransactionInstruction(


transaction = Transaction() transaction.add(...) # or extend_trx_with # or instruction = make_continue_instruction return transaction()

rozhkovdmitrii · 2021-12-02T11:28:17Z

proxy/common_neon/transaction_sender.py

+                else:
+                    raise
+            except Exception as err:
+                logger.debug(str(err))


f"Failed to call continue bucked, error: {err}"

rozhkovdmitrii · 2021-12-02T11:29:09Z

proxy/common_neon/transaction_sender.py

+                    raise
+            except Exception as err:
+                logger.debug(str(err))
+                if str(err).startswith('failed to get recent blockhash'):


Another one "umbrella" - SolanaError?

rozhkovdmitrii · 2021-12-02T11:29:44Z

proxy/common_neon/transaction_sender.py

        return result['result']['transaction']['signatures'][0]
+
+
+    def call_continue_bucked(self, instruction_type):


Annotations?

rozhkovdmitrii · 2021-12-02T11:33:09Z

proxy/common_neon/transaction_sender.py

+
+
+    def collect_bucked_results(self, receipts, reason):
+        logger.debug("Collect bucked results:")


It would be better to move logging up to one level because you're already logging the logic there.

logger.debug(f"Collected bucked results: {receipts}")

This method resembles just a getter with no interaction

rozhkovdmitrii · 2021-12-02T11:34:32Z

proxy/common_neon/transaction_sender.py

+        logger.debug("receipts %s", receipts)
+        result_list = self.sender.collect_results(receipts, eth_trx=self.eth_trx, reason=reason)
+        for result in result_list:
+            # self.sender.get_measurements(result)


It is not needed more

…ution

proxy/common_neon/neon_instruction.py

* #291 extract transaction sender class * #291 move perm accs to transaction sender * #291 fix state * #291 fix errors * #291 merge fixes * #291 refactoring * #291 move EXTRA_GAS to environment * #291 capitalize CONFIRMATION_CHECK_DELAY * #291 sort imports * #291 relative paths * #291 Should be fixed in #326 * #291 testing chnages * fix storage account check * #291 rename `trx_with_create_and_airdrop` -> `make_trx_with_create_and_airdrop` * #295 fix state * #291 iterative combined * #295 do not get measurments * #291 pull request fixes * #295 turn combined instructions ON * #295 make neon_instructions return transasactions * #291 merge fix * #295 get rid of `USE_COMBINED_START_CONTINUE` * #295 requested fixes * #295 call_continue_bucked refactoring * #295 fix * #295 leave only combined iterative transactions * #295 move constants into class * #295 refactoring Co-authored-by: sinev-valentine <[email protected]>

otselnik and others added 26 commits November 15, 2021 00:52

#291 extract transaction sender class

90a4e56

#291 move perm accs to transaction sender

143913b

#291 fix state

16c9bff

#291 fix errors

f2c0303

Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring

57f3b53

#291 merge fixes

3369f67

#291 refactoring

af721bb

#291 move EXTRA_GAS to environment

e512bb8

#291 capitalize CONFIRMATION_CHECK_DELAY

8dc5e29

#291 sort imports

8dce2a5

#291 relative paths

cef8f21

#291 Should be fixed in #326

1bf8383

#291 testing chnages

9672438

fix storage account check

2d42b73

Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring

ac2755c

Merge branch '371_add_FinalizedStorage_to_check' into 291_proxy_refac…

3519c61

…toring

#291 rename trx_with_create_and_airdrop -> `make_trx_with_create_an…

bf313a2

…d_airdrop`

Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring

3093fcc

#295 fix state

e3c4e33

#291 iterative combined

9b57e53

#295 do not get measurments

ccffcf4

#291 pull request fixes

4d685db

Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring

6f63338

Merge branch '291_proxy_refactoring' into 295_iterative_execution

4546926

#295 turn combined instructions ON

7befc6b

#295 make neon_instructions return transasactions

b5010f8

otselnik self-assigned this Nov 29, 2021

otselnik requested review from rozhkovdmitrii, s-medvedev and sinev-valentine November 29, 2021 16:22

otselnik requested a review from vasiliy-zaznobin November 29, 2021 16:22

otselnik added 4 commits December 2, 2021 10:53

Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring

5ebf76a

#291 merge fix

b464b1e

#295 get rid of USE_COMBINED_START_CONTINUE

79088c6

Merge branch '291_proxy_refactoring' into 295_iterative_execution

52173a0

rozhkovdmitrii reviewed Dec 2, 2021

View reviewed changes

rozhkovdmitrii linked an issue Dec 2, 2021 that may be closed by this pull request

Add combined iterative transactions to sender class #295

Closed

#295 requested fixes

4fe15e9

Base automatically changed from 291_proxy_refactoring to develop December 2, 2021 13:47

otselnik added 7 commits December 2, 2021 20:46

Merge remote-tracking branch 'origin/develop' into 295_iterative_exec…

607e74e

…ution

#295 call_continue_bucked refactoring

d9f762a

#295 fix

842ec7d

#295 leave only combined iterative transactions

78de121

#295 move constants into class

47cf219

#295 refactoring

0eebc1f

Merge remote-tracking branch 'origin/develop' into 295_iterative_exec…

cec7a38

…ution

vasiliy-zaznobin reviewed Dec 6, 2021

View reviewed changes

proxy/common_neon/neon_instruction.py Show resolved Hide resolved

s-medvedev approved these changes Dec 6, 2021

View reviewed changes

s-medvedev merged commit 4045e90 into develop Dec 6, 2021

s-medvedev deleted the 295_iterative_execution branch December 6, 2021 18:07

s-medvedev mentioned this pull request Dec 8, 2021

Calculate iteration count by getting steps from an emulator. #241

Closed



		def create_account_with_seed_trx(self, account, seed, lamports, space):
		def create_account_with_seed_trx(self, account, seed, lamports, space) -> Transaction:



		def make_continue_instruction(self, steps, index=None) -> Transaction:
		def make_continue_transaction(self, steps, index=None) -> Transaction:

		))


		def make_partial_call_or_continue_instruction(self, steps: int = 0) -> TransactionInstruction:

		return result['result']['transaction']['signatures'][0]


		def call_continue_bucked(self, instruction_type):



		def collect_bucked_results(self, receipts, reason):
		logger.debug("Collect bucked results:")

#295 iterative execution #332

#295 iterative execution #332

Uh oh!

Conversation

otselnik commented Nov 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rozhkovdmitrii Dec 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

otselnik commented Nov 29, 2021 •

edited

Loading

rozhkovdmitrii Dec 2, 2021 •

edited

Loading