Ndev 2522 blocked accounts

integration/tests/neon_evm/test_cancel_trx.py

@@ -2,11 +2,11 @@
 
 from .solana_utils import send_transaction, solana_client, \
     send_transaction_step_from_instruction
-from .utils.constants import TAG_FINALIZED_STATE, TAG_STATE
+from .utils.constants import TAG_FINALIZED_STATE
 from .utils.contract import make_contract_call_trx
 from .utils.storage import create_holder
 from .utils.instructions import make_Cancel
-from .utils.layouts import FINALIZED_STORAGE_ACCOUNT_INFO_LAYOUT, STORAGE_ACCOUNT_INFO_LAYOUT
+from .utils.layouts import FINALIZED_STORAGE_ACCOUNT_INFO_LAYOUT
 from .utils.transaction_checks import check_holder_account_tag
 
 
@@ -18,6 +18,8 @@ def test_cancel_trx(self, operator_keypair, rw_lock_contract, user_account, trea
         signed_tx = make_contract_call_trx(user_account, rw_lock_contract, "unchange_storage(uint8,uint8)", [1, 1])
 
         storage_account = create_holder(operator_keypair)
+        user_nonce_before_first_step = evm_loader.get_neon_nonce(user_account.eth_address)
+
         trx = send_transaction_step_from_instruction(operator_keypair, evm_loader, treasury_pool, storage_account,
                                                      signed_tx,
                                                      [rw_lock_contract.solana_address,
@@ -27,16 +29,16 @@ def test_cancel_trx(self, operator_keypair, rw_lock_contract, user_account, trea
 
         receipt = solana_client.get_transaction(trx.value)
         assert receipt.value.transaction.meta.err is None
-        check_holder_account_tag(storage_account, STORAGE_ACCOUNT_INFO_LAYOUT, TAG_STATE)
 
-        user_nonce = evm_loader.get_neon_nonce(user_account.eth_address)
+        user_nonce_after_first_step = evm_loader.get_neon_nonce(user_account.eth_address)
+        assert user_nonce_before_first_step + 1 == user_nonce_after_first_step
         trx = Transaction()
         trx.add(
             make_Cancel(evm_loader, storage_account, operator_keypair, signed_tx.hash,
                         [rw_lock_contract.solana_address,
-                        rw_lock_contract.balance_account_address,
-                        user_account.balance_account_address])
+                         rw_lock_contract.balance_account_address,
+                         user_account.balance_account_address])
         )
         send_transaction(solana_client, trx, operator_keypair)
         check_holder_account_tag(storage_account, FINALIZED_STORAGE_ACCOUNT_INFO_LAYOUT, TAG_FINALIZED_STATE)
-        assert user_nonce < evm_loader.get_neon_nonce(user_account.eth_address)
+        assert user_nonce_after_first_step == evm_loader.get_neon_nonce(user_account.eth_address)

integration/tests/neon_evm/test_holder_account.py

@@ -12,11 +12,11 @@
 from .solana_utils import solana_client, write_transaction_to_holder_account, \
     send_transaction_step_from_account, get_solana_balance, execute_transaction_steps_from_account
 from .utils.assert_messages import InstructionAsserts
-from .utils.constants import EVM_LOADER, TAG_STATE
+from .utils.constants import EVM_LOADER
 from .utils.contract import make_deployment_transaction, make_contract_call_trx
 from .utils.ethereum import make_eth_transaction
 from .utils.instructions import make_WriteHolder
-from .utils.layouts import STORAGE_ACCOUNT_INFO_LAYOUT, HOLDER_ACCOUNT_INFO_LAYOUT
+from .utils.layouts import HOLDER_ACCOUNT_INFO_LAYOUT
 from .utils.storage import create_holder, delete_holder
 
 
@@ -112,9 +112,6 @@ def test_write_to_not_finalized_holder(rw_lock_contract, user_account, evm_loade
                                        [user_account.solana_account_address,
                                         user_account.balance_account_address,
                                         rw_lock_contract.solana_address], 1, operator_keypair)
-    account_data = solana_client.get_account_info(new_holder_acc, commitment=Confirmed).value.data
-    parsed_data = STORAGE_ACCOUNT_INFO_LAYOUT.parse(account_data)
-    assert parsed_data.tag == TAG_STATE
 
     signed_tx2 = make_contract_call_trx(user_account, rw_lock_contract, "unchange_storage(uint8,uint8)", [1, 1])