#291 sort imports

proxy/common_neon/address.py

@@ -1,13 +1,14 @@
 import logging
 import random
+
+from eth_keys import keys as eth_keys
 from hashlib import sha256
-from typing import NamedTuple
 from solana.publickey import PublicKey
-from eth_keys import keys as eth_keys
 from spl.token.instructions import get_associated_token_address
+from typing import NamedTuple
 
-from proxy.environment import neon_cli, ETH_TOKEN_MINT_ID, EVM_LOADER_ID
 from proxy.common_neon.layouts import ACCOUNT_INFO_LAYOUT
+from proxy.environment import neon_cli, ETH_TOKEN_MINT_ID, EVM_LOADER_ID
 
 
 logger = logging.getLogger(__name__)

proxy/common_neon/costs.py

@@ -1,8 +1,8 @@
-from ..indexer.sql_dict import POSTGRES_USER, POSTGRES_HOST, POSTGRES_DB, POSTGRES_PASSWORD
-import psycopg2
 import base58
-from proxy.environment import EVM_LOADER_ID
+import psycopg2
 
+from proxy.environment import EVM_LOADER_ID
+from proxy.indexer.sql_dict import POSTGRES_USER, POSTGRES_HOST, POSTGRES_DB, POSTGRES_PASSWORD
 
 class SQLCost():
     def __init__(self):

proxy/common_neon/emulator_interactor.py

@@ -1,7 +1,8 @@
 import json
 import logging
+
+from proxy.common_neon.errors import EthereumError
 from proxy.environment import neon_cli
-from .errors import EthereumError
 
 
 logger = logging.getLogger(__name__)

proxy/common_neon/neon_instruction.py

@@ -1,21 +1,20 @@
+import eth_utils
 import logging
 import struct
-import eth_utils
-from construct import Bytes, Int8ul, Int64ul
-from construct import Struct as cStruct
+
+from sha3 import keccak_256
 from solana._layouts.system_instructions import SYSTEM_INSTRUCTIONS_LAYOUT, InstructionType
 from solana.publickey import PublicKey
 from solana.system_program import SYS_PROGRAM_ID
 from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY
 from solana.transaction import AccountMeta, TransactionInstruction, Transaction
 from spl.token.constants import ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID
 from spl.token.instructions import transfer2, Transfer2Params
-from sha3 import keccak_256
 
-from proxy.environment import EVM_LOADER_ID, ETH_TOKEN_MINT_ID , COLLATERAL_POOL_BASE, NEW_USER_AIRDROP_AMOUNT
-from proxy.common_neon.constants import SYSVAR_INSTRUCTION_PUBKEY, INCINERATOR_PUBKEY, KECCAK_PROGRAM, COLLATERALL_POOL_MAX
 from proxy.common_neon.address import accountWithSeed, ether2program, getTokenAddr
+from proxy.common_neon.constants import SYSVAR_INSTRUCTION_PUBKEY, INCINERATOR_PUBKEY, KECCAK_PROGRAM, COLLATERALL_POOL_MAX
 from proxy.common_neon.layouts import CREATE_ACCOUNT_LAYOUT
+from proxy.environment import EVM_LOADER_ID, ETH_TOKEN_MINT_ID , COLLATERAL_POOL_BASE, NEW_USER_AIRDROP_AMOUNT
 
 
 logger = logging.getLogger(__name__)

proxy/common_neon/solana_interactor.py

@@ -4,10 +4,12 @@
 import logging
 import re
 import time
+
 from solana.rpc.commitment import Confirmed
 from solana.rpc.types import TxOpts
+
+from proxy.common_neon.costs import update_transaction_cost
 from proxy.environment import EVM_LOADER_ID, CONFIRMATION_CHECK_DELAY
-from .costs import update_transaction_cost
 
 
 logger = logging.getLogger(__name__)

proxy/common_neon/transaction_sender.py

@@ -1,26 +1,26 @@
 import json
 import logging
 import os
-import time
 import rlp
+import time
+
 from base58 import b58encode
 from sha3 import keccak_256
 from solana.publickey import PublicKey
 from solana.rpc.api import SendTransactionError
 from solana.sysvar import *
 from solana.transaction import AccountMeta, Transaction
 
-from proxy.environment import EVM_LOADER_ID
-from proxy.plugin.eth_proto import Trx as EthTrx
+from proxy.core.acceptor.pool import new_acc_id_glob, acc_list_glob
 
-from proxy.common_neon.solana_interactor import SolanaInteractor, check_if_continue_returned, check_if_program_exceeded_instructions
-from proxy.common_neon.emulator_interactor import call_emulated
-from proxy.common_neon.neon_instruction import NeonInstruction
 from proxy.common_neon.address import accountWithSeed, AccountInfo, getTokenAddr
 from proxy.common_neon.constants import STORAGE_SIZE, EMPTY_STORAGE_TAG, ACCOUNT_SEED_VERSION
+from proxy.common_neon.emulator_interactor import call_emulated
 from proxy.common_neon.layouts import ACCOUNT_INFO_LAYOUT
-
-from ..core.acceptor.pool import new_acc_id_glob, acc_list_glob
+from proxy.common_neon.neon_instruction import NeonInstruction
+from proxy.common_neon.solana_interactor import SolanaInteractor, check_if_continue_returned, check_if_program_exceeded_instructions
+from proxy.environment import EVM_LOADER_ID
+from proxy.plugin.eth_proto import Trx as EthTrx
 
 
 logger = logging.getLogger(__name__)

proxy/indexer/solana_receipts_update.py

@@ -1,12 +1,14 @@
 import base58
-import rlp
 import json
+import logging
 import os
+import rlp
 import time
-import logging
-from solana.rpc.api import Client
+
 from multiprocessing.dummy import Pool as ThreadPool
+from solana.rpc.api import Client
 from typing import Dict, Union
+
 from proxy.environment import SOLANA_URL, EVM_LOADER_ID
 
 

proxy/indexer/utils.py

@@ -3,9 +3,10 @@
 import json
 import logging
 import os
-import rlp
 import psycopg2
+import rlp
 import subprocess
+
 from eth_utils import big_endian_to_int
 from ethereum.transactions import Transaction as EthTrx
 from ethereum.utils import sha3
@@ -14,17 +15,16 @@
 from solana.rpc.api import Client
 from solana.rpc.commitment import Confirmed
 from solana.rpc.types import TxOpts
+from solana.system_program import SYS_PROGRAM_ID
+from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY
 from solana.transaction import AccountMeta, Transaction, TransactionInstruction
 from spl.token.constants import TOKEN_PROGRAM_ID
 from spl.token.instructions import get_associated_token_address
 from web3.auto.gethdev import w3
-from solana.system_program import SYS_PROGRAM_ID
-from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY
-
-from proxy.environment import SOLANA_URL, EVM_LOADER_ID, ETH_TOKEN_MINT_ID
 
 from proxy.common_neon.constants import SYSVAR_INSTRUCTION_PUBKEY, INCINERATOR_PUBKEY, KECCAK_PROGRAM
 from proxy.common_neon.layouts import STORAGE_ACCOUNT_INFO_LAYOUT
+from proxy.environment import SOLANA_URL, EVM_LOADER_ID, ETH_TOKEN_MINT_ID
 
 
 logger = logging.getLogger(__name__)

proxy/plugin/solana_rest_api.py

@@ -8,36 +8,36 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
+import base58
 import copy
-import json
-import unittest
 import eth_utils
-import rlp
-import os
+import json
 import logging
-from typing import List, Tuple, Optional
-from solana.account import Account as sol_Account
+import rlp
+import threading
+import traceback
+import unittest
+
 from ..common.utils import build_http_response
 from ..http.codes import httpStatusCodes
 from ..http.parser import HttpParser
 from ..http.websocket import WebsocketFrame
 from ..http.server import HttpWebServerBasePlugin, httpProtocolTypes
-from .eth_proto import Trx as EthTrx
+from solana.account import Account as sol_Account
 from solana.rpc.api import Client as SolanaClient, SendTransactionError as SolanaTrxError
-import base58
-import traceback
-import threading
-from .solana_rest_api_tools import getAccountInfo, \
-    call_signed, neon_config_load, get_token_balance_or_airdrop
 from solana.rpc.commitment import Confirmed
+from typing import List, Tuple, Optional
 from web3 import Web3
-from proxy.core.acceptor.pool import proxy_id_glob
-from proxy.indexer.utils import get_trx_results, LogDB
-from proxy.indexer.sql_dict import SQLDict
-from proxy.environment import neon_cli, solana_cli, SOLANA_URL, MINIMAL_GAS_PRICE, EXTRA_GAS
-from proxy.common_neon.emulator_interactor import call_emulated
+
+from .eth_proto import Trx as EthTrx
+from .solana_rest_api_tools import getAccountInfo, call_signed, neon_config_load, get_token_balance_or_airdrop
 from proxy.common_neon.address import EthereumAddress
+from proxy.common_neon.emulator_interactor import call_emulated
 from proxy.common_neon.errors import EthereumError
+from proxy.core.acceptor.pool import proxy_id_glob
+from proxy.environment import neon_cli, solana_cli, SOLANA_URL, MINIMAL_GAS_PRICE, EXTRA_GAS
+from proxy.indexer.sql_dict import SQLDict
+from proxy.indexer.utils import get_trx_results, LogDB
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

proxy/plugin/solana_rest_api_tools.py

@@ -1,21 +1,20 @@
-import logging
-import random
 import base64
+import logging
+
 from datetime import datetime
+from solana.account import Account as SolanaAccount
 from solana.publickey import PublicKey
-from solana.rpc.commitment import Confirmed
 from solana.rpc.api import Client as SolanaClient
-from solana.account import Account as SolanaAccount
-from proxy.common_neon.neon_instruction import NeonInstruction
-
+from solana.rpc.commitment import Confirmed
 
-from proxy.environment import read_elf_params, TIMEOUT_TO_RELOAD_NEON_CONFIG, NEW_USER_AIRDROP_AMOUNT
-from proxy.common_neon.transaction_sender import TransactionSender
-from proxy.common_neon.solana_interactor import SolanaInteractor
 from proxy.common_neon.address import ether2program, getTokenAddr, EthereumAddress, AccountInfo
-from proxy.common_neon.layouts import ACCOUNT_INFO_LAYOUT
 from proxy.common_neon.errors import SolanaAccountNotFoundError, SolanaErrors
+from proxy.common_neon.layouts import ACCOUNT_INFO_LAYOUT
+from proxy.common_neon.neon_instruction import NeonInstruction
+from proxy.common_neon.solana_interactor import SolanaInteractor
+from proxy.common_neon.transaction_sender import TransactionSender
 from proxy.common_neon.utils import get_from_dict
+from proxy.environment import read_elf_params, TIMEOUT_TO_RELOAD_NEON_CONFIG, NEW_USER_AIRDROP_AMOUNT
 
 
 logger = logging.getLogger(__name__)