Merge branch 'develop' into 435_computable_gas_price

proxy/environment.py

@@ -1,4 +1,5 @@
 from decimal import Decimal
+import json
 import os
 import subprocess
 from logged_groups import logged_group, LogMng

proxy/plugin/solana_rest_api.py

@@ -35,7 +35,7 @@
 from ..common_neon.errors import EthereumError
 from ..common_neon.eth_proto import Trx as EthTrx
 from ..core.acceptor.pool import proxy_id_glob
-from ..environment import neon_cli, solana_cli, SOLANA_URL, PP_SOLANA_URL, ACCOUNT_PERMISSION_UPDATE_INT
+from ..environment import neon_cli, get_solana_accounts, SOLANA_URL, PP_SOLANA_URL, ACCOUNT_PERMISSION_UPDATE_INT
 from ..indexer.indexer_db import IndexerDB, PendingTxError
 from .gas_price_calculator import GasPriceCalculator
 from ..common_neon.account_whitelist import AccountWhitelist
@@ -59,8 +59,6 @@ def __init__(self):
         self.db = IndexerDB()
         self.db.set_client(self.client)
 
-        self.account_whitelist = AccountWhitelist(self.client, self.signer, ACCOUNT_PERMISSION_UPDATE_INT)
-
         if PP_SOLANA_URL == SOLANA_URL:
             self.gas_price_calculator = GasPriceCalculator(self.client)
         else: