diff --git a/discovery-provider/default_config.ini b/discovery-provider/default_config.ini index 0b0e5a31c6f..c85bcdc5201 100644 --- a/discovery-provider/default_config.ini +++ b/discovery-provider/default_config.ini @@ -31,7 +31,7 @@ eth_provider_url = http://audius_ganache_cli_eth_contracts:8545 [solana] track_listen_count_address = 7K3UpbZViPnQDLn2DAM853B9J5GBxd1L1rLHy4KqSmWG signer_group_address = FbfwE8ZmVdwUbbEXdq4ofhuUEiAxeSk5kaoYrJJekpnZ -endpoint = https://audius.rpcpool.com,https://api.mainnet-beta.solana.com,https://solana-api.projectserum.com +endpoint = https://audius.rpcpool.com user_bank_min_slot = 0 user_bank_program_address = waudio_program_address = diff --git a/discovery-provider/src/app.py b/discovery-provider/src/app.py index 6cd3302f3d8..fd6eb88e22b 100644 --- a/discovery-provider/src/app.py +++ b/discovery-provider/src/app.py @@ -165,7 +165,7 @@ def create_celery(test_config=None): eth_web3 = Web3(MultiProvider(shared_config["web3"]["eth_provider_url"])) # Initialize Solana web3 provider - solana_client_manager = SolanaClientManager() + solana_client_manager = SolanaClientManager(shared_config["solana"]["endpoint"]) global registry global user_factory diff --git a/discovery-provider/src/solana/solana_client_manager.py b/discovery-provider/src/solana/solana_client_manager.py index 8b751939ab5..79160526902 100644 --- a/discovery-provider/src/solana/solana_client_manager.py +++ b/discovery-provider/src/solana/solana_client_manager.py @@ -12,8 +12,6 @@ logger = logging.getLogger(__name__) -SOLANA_ENDPOINTS = shared_config["solana"]["endpoint"] - # maximum number of times to retry get_confirmed_transaction call DEFAULT_MAX_RETRIES = 5 # number of seconds to wait between calls to get_confirmed_transaction @@ -21,8 +19,8 @@ class SolanaClientManager: - def __init__(self) -> None: - self.endpoints = SOLANA_ENDPOINTS.split(",") + def __init__(self, solana_endpoints) -> None: + self.endpoints = solana_endpoints.split(",") self.clients = [Client(endpoint) for endpoint in self.endpoints] def get_client(self, randomize=False) -> Client: diff --git a/discovery-provider/src/solana/solana_client_manager_test.py b/discovery-provider/src/solana/solana_client_manager_test.py index cd3342015b4..aa8eb65385f 100644 --- a/discovery-provider/src/solana/solana_client_manager_test.py +++ b/discovery-provider/src/solana/solana_client_manager_test.py @@ -2,7 +2,7 @@ from src.solana.solana_client_manager import SolanaClientManager from unittest import mock -solana_client_manager = SolanaClientManager() +solana_client_manager = SolanaClientManager("https://audius.rpcpool.com,https://api.mainnet-beta.solana.com,https://solana-api.projectserum.com") @mock.patch("solana.rpc.api.Client")