Skip to content

#295 iterative execution #332

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 38 commits into from
Dec 6, 2021
Merged

#295 iterative execution #332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
90a4e56
#291 extract transaction sender class
otselnik Nov 14, 2021
143913b
#291 move perm accs to transaction sender
otselnik Nov 16, 2021
16c9bff
#291 fix state
otselnik Nov 22, 2021
f2c0303
#291 fix errors
otselnik Nov 23, 2021
57f3b53
Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring
otselnik Nov 23, 2021
3369f67
#291 merge fixes
otselnik Nov 23, 2021
af721bb
#291 refactoring
otselnik Nov 23, 2021
e512bb8
#291 move EXTRA_GAS to environment
otselnik Nov 23, 2021
8dc5e29
#291 capitalize CONFIRMATION_CHECK_DELAY
otselnik Nov 23, 2021
8dce2a5
#291 sort imports
otselnik Nov 23, 2021
cef8f21
#291 relative paths
otselnik Nov 24, 2021
1bf8383
#291 Should be fixed in #326
otselnik Nov 24, 2021
9672438
#291 testing chnages
otselnik Nov 24, 2021
2d42b73
fix storage account check
sinev-valentine Nov 24, 2021
ac2755c
Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring
otselnik Nov 24, 2021
3519c61
Merge branch '371_add_FinalizedStorage_to_check' into 291_proxy_refac…
otselnik Nov 24, 2021
bf313a2
#291 rename `trx_with_create_and_airdrop` -> `make_trx_with_create_an…
otselnik Nov 24, 2021
3093fcc
Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring
otselnik Nov 24, 2021
e3c4e33
#295 fix state
otselnik Nov 24, 2021
9b57e53
#291 iterative combined
otselnik Nov 25, 2021
ccffcf4
#295 do not get measurments
otselnik Nov 25, 2021
4d685db
#291 pull request fixes
otselnik Nov 25, 2021
6f63338
Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring
otselnik Nov 25, 2021
4546926
Merge branch '291_proxy_refactoring' into 295_iterative_execution
otselnik Nov 25, 2021
7befc6b
#295 turn combined instructions ON
otselnik Nov 29, 2021
b5010f8
#295 make neon_instructions return transasactions
otselnik Nov 29, 2021
5ebf76a
Merge remote-tracking branch 'origin/develop' into 291_proxy_refactoring
otselnik Dec 2, 2021
b464b1e
#291 merge fix
otselnik Dec 2, 2021
79088c6
#295 get rid of `USE_COMBINED_START_CONTINUE`
otselnik Dec 2, 2021
52173a0
Merge branch '291_proxy_refactoring' into 295_iterative_execution
otselnik Dec 2, 2021
4fe15e9
#295 requested fixes
otselnik Dec 2, 2021
607e74e
Merge remote-tracking branch 'origin/develop' into 295_iterative_exec…
otselnik Dec 2, 2021
d9f762a
#295 call_continue_bucked refactoring
otselnik Dec 2, 2021
842ec7d
#295 fix
otselnik Dec 3, 2021
78de121
#295 leave only combined iterative transactions
otselnik Dec 3, 2021
47cf219
#295 move constants into class
otselnik Dec 3, 2021
0eebc1f
#295 refactoring
otselnik Dec 3, 2021
cec7a38
Merge remote-tracking branch 'origin/develop' into 295_iterative_exec…
otselnik 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
Prev Previous commit
Next Next commit
#295 make neon_instructions return transasactions
  • Loading branch information
@otselnik
otselnik committed Nov 29, 2021
commit b5010f8d065a8d9278767a629f6aae1deac561aa
18 changes: 9 additions & 9 deletions proxy/common_neon/neon_instruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,18 @@ def create_collateral_pool_address(collateral_pool_index):
return accountWithSeed(PublicKey(COLLATERAL_POOL_BASE), str.encode(seed))


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

@rozhkovdmitrii rozhkovdmitrii Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Dima, if you get started to use annotations use them on the arguments too
  2. Is it either eth_account, pda_account or associated_token_account

Copy link
Contributor Author

@otselnik otselnik Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

seed_str = str(seed, 'utf8')
logger.debug("createAccountWithSeedTrx base(%s) account(%s) seed(%s)", type(self.operator_pda_account),account, seed_str)
return TransactionInstruction(
return Transaction().add(TransactionInstruction(
keys=[
AccountMeta(pubkey=self.operator_pda_account, is_signer=True, is_writable=True),
AccountMeta(pubkey=account, is_signer=False, is_writable=True),
AccountMeta(pubkey=self.operator_pda_account, is_signer=True, is_writable=False),
],
program_id=SYS_PROGRAM_ID,
data=create_account_with_seed_layout(self.operator_pda_account, seed_str, lamports, space)
)
))


def make_create_eth_account_trx(self, eth_address: EthereumAddress, code_acc=None) -> Tuple[Transaction, PublicKey]:
Expand Down Expand Up @@ -301,7 +301,7 @@ def make_partial_call_instruction(self) -> TransactionInstruction:

AccountMeta(pubkey=SYSVAR_INSTRUCTION_PUBKEY, is_signer=False, is_writable=False),
] + obligatory_accounts
)
)


def make_iterative_call_transaction(self, length_before: int = 0) -> Transaction:
Expand All @@ -311,7 +311,7 @@ def make_iterative_call_transaction(self, length_before: int = 0) -> Transaction
return trx


def make_call_from_account_instruction(self) -> Transaction:
def make_call_from_account_transaction(self) -> Transaction:
return Transaction().add(TransactionInstruction(
program_id = EVM_LOADER_ID,
data = bytearray.fromhex("16") + self.collateral_pool_index_buf + int(0).to_bytes(8, byteorder="little"),
Expand All @@ -332,7 +332,7 @@ def make_call_from_account_instruction(self) -> Transaction:
))


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

@rozhkovdmitrii rozhkovdmitrii Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same. Annotations on arguments

data = bytearray.fromhex("14") + self.collateral_pool_index_buf + steps.to_bytes(8, byteorder="little")
if index:
data = data + index.to_bytes(8, byteorder="little")
Expand All @@ -356,7 +356,7 @@ def make_continue_instruction(self, steps, index=None) -> Transaction:
))


def make_cancel_instruction(self) -> Transaction:
def make_cancel_transaction(self) -> Transaction:
return Transaction().add(TransactionInstruction(
program_id = EVM_LOADER_ID,
data = bytearray.fromhex("15") + self.eth_trx.nonce.to_bytes(8, 'little'),
Expand Down Expand Up @@ -408,7 +408,7 @@ def make_partial_call_or_continue_from_account_data(self, steps, index=None) ->
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 TransactionInstruction(
return Transaction().add(TransactionInstruction(
Copy link
Contributor

@rozhkovdmitrii rozhkovdmitrii Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

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

program_id = EVM_LOADER_ID,
data = data,
keys = [
Expand All @@ -425,4 +425,4 @@ def make_partial_call_or_continue_from_account_data(self, steps, index=None) ->

AccountMeta(pubkey=SYSVAR_INSTRUCTION_PUBKEY, is_signer=False, is_writable=False),
] + obligatory_accounts
)
))
8 changes: 4 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 @@ -365,7 +365,7 @@ def call_signed_with_holder_acc(self):
self.create_accounts_for_trx_if_needed()

logger.debug("ExecuteTrxFromAccountDataIterative:")
call_txs = self.instruction.make_call_from_account_instruction()
call_txs = self.instruction.make_call_from_account_transaction()
self.sender.send_measured_transaction(call_txs, self.eth_trx, 'ExecuteTrxFromAccountDataIterativeV02')

return self.call_continue(CONTINUE_REGULAR)
Expand Down Expand Up @@ -438,7 +438,7 @@ def call_continue_step_by_step(self):
def call_continue_step(self):
step_count = self.steps
while step_count > 0:
trx = self.instruction.make_continue_instruction(step_count)
trx = self.instruction.make_continue_transaction(step_count)

logger.debug("Step count {}".format(step_count))
try:
Expand All @@ -453,7 +453,7 @@ def call_continue_step(self):


def call_cancel(self):
trx = self.instruction.make_cancel_instruction()
trx = self.instruction.make_cancel_transaction()
Copy link
Contributor

@rozhkovdmitrii rozhkovdmitrii Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stay look wierd.
trx = Transaction();
cancel_instruction = self.instraction.make_cancel_instruction()
trx.add(cancel_instruction)

Here it's not a big work to follow DIP, because instruction shouldn't know any about a transaction

Copy link
Contributor Author

@otselnik otselnik Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you want you can use this function the same way and it will work.

trx = Transaction();
cancel_instruction = self.instraction.make_cancel_transaction()
trx.add(cancel_instruction)

For me shorter - better

Copy link
Contributor

@rozhkovdmitrii rozhkovdmitrii Dec 3, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"shorter" tends to get write-only code for us


logger.debug("Cancel")
result = self.sender.send_measured_transaction(trx, self.eth_trx, 'CancelWithNonce')
Expand All @@ -475,7 +475,7 @@ def call_continue_bucked(self, instruction_type):
try:
Copy link
Contributor

@rozhkovdmitrii rozhkovdmitrii Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method is too heave, you can isolate some logically independent parts

trx = Transaction()
if instruction_type == CONTINUE_REGULAR:
trx = self.instruction.make_continue_instruction(steps, index)
trx = self.instruction.make_continue_transaction(steps, index)
Copy link
Contributor

@rozhkovdmitrii rozhkovdmitrii Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, try pleas to get rid off transaction knowledge inside neon_instruction class

elif instruction_type == CONTINUE_COMBINED:
trx = self.instruction.make_partial_call_or_continue_transaction(steps - index)
elif instruction_type == CONTINUE_HOLDER_COMB:
Expand Down