#291 Proxy refactoring #324

otselnik · 2021-11-23T20:04:45Z

Changes:

Environment variables acquiring moved to proxy.environment.py
Environment variables name capitalized
proxy/common_neon/transaction_sender.py TransactionSender class is responsible for preparing transaction execution and handling send errors
create_account_list_by_emulate should be moved out of TransactionSender to own module or class
init_perm_accs free_perm_accs create_account_with_seed create_multiple_accounts_with_seed functions should be extracted out of TransactionSender class too later
proxy/common_neon/transaction_sender.py NoniterativeTransactionSender responsible for creating and sending transactions of non-iterative execution
proxy/common_neon/transaction_sender.py IterativeTransactionSender responsible for iterative execution. It creates and sends transactions of iterative execution and controls transaction flow in the iterative process
proxy/common_neon/neon_instruction.py NeonInstruction forms solana instructions/transactions
proxy/common_neon/solana_interactor.py contains classes and functions for interaction with the Solana cluster and process its responses
proxy/common_neon/solana_interactor.py SolanaInteractor is responsible for sending transactions to the Solana and waiting for responses, It also provides functions to get the Solana state
proxy/common_neon/costs.py contains SQLCost class and functions to process transaction costs
proxy/common_neon/address.py functions to manipulate with addresses
proxy/common_neon/emulator_interactor.py functions to work with neon-cli emulation. create_account_list_by_emulate should be move here I gues
proxy/common_neon/layouts.py
proxy/common_neon/errors.py
proxy/common_neon/constants.py

proxy/plugin/solana_rest_api_tools.py

proxy/common_neon/address.py

proxy/common_neon/emulator_interactor.py

proxy/common_neon/neon_instruction.py

proxy/common_neon/solana_interactor.py

proxy/common_neon/transaction_sender.py

proxy/indexer/solana_receipts_update.py

proxy/indexer/utils.py

proxy/plugin/solana_rest_api.py

…toring

…d_airdrop`

rozhkovdmitrii · 2021-11-25T10:48:29Z

proxy/common_neon/neon_instruction.py

+        return self
+
+
+    def create_collateral_pool_address(self, collateral_pool_index):


@staticmethod

rozhkovdmitrii · 2021-11-25T10:49:25Z

proxy/common_neon/address.py

+    def __bytes__(self): return self.data
+
+
+def accountWithSeed(base, seed, program=PublicKey(EVM_LOADER_ID)):


program redundant

rozhkovdmitrii · 2021-11-25T10:49:53Z

proxy/common_neon/address.py

+
+def accountWithSeed(base, seed, program=PublicKey(EVM_LOADER_ID)):
+    result = PublicKey(sha256(bytes(base) + bytes(seed) + bytes(program)).digest())
+    logger.debug('accountWithSeed %s', str(result))


logging here redundant

rozhkovdmitrii · 2021-11-25T11:10:20Z

proxy/common_neon/neon_instruction.py

+        )
+
+
+    def make_create_eth_account_trx(self, eth_address, code_acc=None):


Original definition is:

def make_create_eth_account_trx(signer: SolanaAccount, eth_address: EthereumAddress, evm_loader_id, code_acc=None) \ -> Tuple[Transaction, PublicKey]:

rozhkovdmitrii · 2021-11-25T11:21:47Z

proxy/common_neon/neon_instruction.py

+
+class NeonInstruction:
+    def __init__(self, operator):
+        self.operator = operator


self.operator_pda_account: SolanaAccount = operator_pda_account

rozhkovdmitrii · 2021-11-25T11:22:32Z

proxy/common_neon/neon_instruction.py

+class NeonInstruction:
+    def __init__(self, operator):
+        self.operator = operator
+        self.operator_token = getTokenAddr(self.operator)


operator_associated_token_address: PulicKey = ...

rozhkovdmitrii · 2021-11-25T11:29:12Z

proxy/common_neon/neon_instruction.py

+
+
+    def make_transfer_instruction(self, associated_token_account: PublicKey) -> TransactionInstruction:
+        owner_associated_token_account = getTokenAddr(self.operator)


Already have operator_token )

rozhkovdmitrii · 2021-11-25T11:40:16Z

proxy/common_neon/transaction_sender.py

+        for acc_desc in output_json["accounts"]:
+            if acc_desc["new"] == False:
+
+                address = bytes.fromhex(acc_desc["address"][2:])


It was dropped from develop branch before

rozhkovdmitrii · 2021-11-25T12:50:48Z

proxy/common_neon/solana_interactor.py

+            elapsed_time += CONFIRMATION_CHECK_DELAY
+        #if not resp["result"]:
+        raise RuntimeError("could not confirm transaction: ", tx_sig)
+        #return resp


was removed from develop before

rozhkovdmitrii · 2021-11-25T12:51:02Z

proxy/common_neon/solana_interactor.py

+                    return
+            time.sleep(CONFIRMATION_CHECK_DELAY)
+            elapsed_time += CONFIRMATION_CHECK_DELAY
+        #if not resp["result"]:


was removed from here before

rozhkovdmitrii · 2021-11-25T12:51:14Z

proxy/common_neon/solana_interactor.py

+                status = resp['result']['value'][0]
+                if status and (status['confirmationStatus'] == 'finalized' or \
+                status['confirmationStatus'] == 'confirmed' and status['confirmations'] >= confirmations):
+    #            logger.debug('Confirmed transaction:', resp)


was removed from here before

rozhkovdmitrii · 2021-11-25T13:16:25Z

proxy/common_neon/transaction_sender.py

+            result = self.call_continue_step()
+            signature = check_if_continue_returned(result)
+            if signature:
+                return signature


~~The same as return check_if_continue_returned(result)?~~

In other case you should check it like that:

if signature is not None:

and return None explicitly

s-medvedev · 2021-12-02T11:23:24Z

proxy/common_neon/neon_instruction.py

+        self.operator_pda_account = operator
+        self.operator_associated_token_address = getTokenAddr(self.operator_pda_account)


I suggest renaming back.
We can talk about PDA (Program Derived Address) account only when it is built this way. For the operator's account, it's not correct, because the operator uses their own Solana account, which can't be PDA. So, this name confuse.
Which information gives operator_associated_token_address? I think operator_neon_balance will be better in this case.

Yeah, you're right!
I propose instead of associated_token_address use operator_neon_address here and neon_address everywhere it is needed.

So, what in the end?
operator_associated_token_address -> operator_neon_balance
associated_token_address -> neon_address or neon_balance?

operator_neon_address i think. getTokenAddr actually doesn't return a balance )

Let's stop on operator_neon_address

* #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` * #291 pull request fixes * #291 merge fix * #291 rename operator and associated token accounts Co-authored-by: sinev-valentine <[email protected]>

otselnik added 10 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

otselnik self-assigned this Nov 23, 2021

otselnik requested review from anton-lisanin, mich-master, rozhkovdmitrii, s-medvedev, sinev-valentine, vakond and vasiliy-zaznobin November 23, 2021 21:03

rozhkovdmitrii suggested changes Nov 24, 2021

View reviewed changes

otselnik and others added 8 commits November 24, 2021 13:50

#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

rozhkovdmitrii approved these changes Nov 25, 2021

View reviewed changes

rozhkovdmitrii self-requested a review November 25, 2021 12:51

rozhkovdmitrii previously approved these changes Nov 25, 2021

View reviewed changes

#291 pull request fixes

4d685db

otselnik dismissed rozhkovdmitrii’s stale review via 4d685db November 25, 2021 16:55

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

6f63338

rozhkovdmitrii previously approved these changes Nov 26, 2021

View reviewed changes

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

5ebf76a

otselnik dismissed rozhkovdmitrii’s stale review via 5ebf76a December 2, 2021 07:53

#291 merge fix

b464b1e

s-medvedev reviewed Dec 2, 2021

View reviewed changes

#291 rename operator and associated token accounts

75c8e9a

s-medvedev approved these changes Dec 2, 2021

View reviewed changes

s-medvedev merged commit e74e568 into develop Dec 2, 2021

s-medvedev deleted the 291_proxy_refactoring branch December 2, 2021 13:47

otselnik mentioned this pull request Dec 6, 2021

373 solana v1.7.9 testnet #296

Closed

		return self


		def create_collateral_pool_address(self, collateral_pool_index):

		def __bytes__(self): return self.data


		def accountWithSeed(base, seed, program=PublicKey(EVM_LOADER_ID)):

		)


		def make_create_eth_account_trx(self, eth_address, code_acc=None):



		def make_transfer_instruction(self, associated_token_account: PublicKey) -> TransactionInstruction:
		owner_associated_token_account = getTokenAddr(self.operator)

		self.operator_pda_account = operator
		self.operator_associated_token_address = getTokenAddr(self.operator_pda_account)

#291 Proxy refactoring #324

#291 Proxy refactoring #324

Uh oh!

Conversation

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

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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 Nov 25, 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!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

otselnik commented Nov 23, 2021 •

edited

Loading

rozhkovdmitrii Nov 25, 2021 •

edited

Loading