From 850f35d5404f2b818e79bba0813ec56a34c868be Mon Sep 17 00:00:00 2001 From: Dmitriy Borisenko Date: Fri, 4 Feb 2022 09:49:25 +0300 Subject: [PATCH 1/3] #543 fix airdroper --- proxy/docker-compose-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy/docker-compose-test.yml b/proxy/docker-compose-test.yml index 0c89e9ba4..9c1beb479 100644 --- a/proxy/docker-compose-test.yml +++ b/proxy/docker-compose-test.yml @@ -69,7 +69,7 @@ services: LOG_NEON_CLI_DEBUG: "YES" FUZZING_BLOCKHASH: "YES" CONFIG: ci - PP_SOLANA_URL: https://api.mainnet-beta.solana.com + PP_SOLANA_URL: https://api.devnet.solana.com hostname: proxy depends_on: postgres: @@ -124,8 +124,8 @@ services: INDEXER_ERC20_WRAPPER_WHITELIST: ANY PRICE_UPDATE_INTERVAL: 10 START_SLOT: LATEST - PP_SOLANA_URL: https://api.mainnet-beta.solana.com - PYTH_MAPPING_ACCOUNT: AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J + PP_SOLANA_URL: https://api.devnet.solana.com + PYTH_MAPPING_ACCOUNT: BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2 MAX_CONFIDENCE_INTERVAL: 0.01 hostname: airdropper entrypoint: ./run-airdropper.sh From 5fd7f9d1b33a355625d65253ea342cae492bcdf9 Mon Sep 17 00:00:00 2001 From: Dmitriy Borisenko Date: Fri, 4 Feb 2022 10:33:28 +0300 Subject: [PATCH 2/3] try fix --- proxy/indexer/airdropper.py | 2 +- proxy/testing/test_airdropper.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/proxy/indexer/airdropper.py b/proxy/indexer/airdropper.py index b9ce6b97d..f27d49f97 100644 --- a/proxy/indexer/airdropper.py +++ b/proxy/indexer/airdropper.py @@ -226,7 +226,7 @@ def get_sol_usd_price(self): if should_reload: try: - self.recent_price = self.pyth_client.get_price('SOL/USD') + self.recent_price = self.pyth_client.get_price('Crypto.SOL/USD') except Exception as err: self.warning(f'Exception occured when reading price: {err}') return None diff --git a/proxy/testing/test_airdropper.py b/proxy/testing/test_airdropper.py index 77cc2e2da..537d0a933 100644 --- a/proxy/testing/test_airdropper.py +++ b/proxy/testing/test_airdropper.py @@ -128,7 +128,7 @@ def test_failed_process_trx_with_one_airdrop_price_provider_error(self): self.mock_pyth_client.update_mapping.assert_called_once() self.mock_airdrop_ready.is_airdrop_ready.assert_called_once_with(token_airdrop_address) self.mock_airdrop_ready.register_airdrop.assert_not_called() - self.mock_pyth_client.get_price.assert_called_once_with('SOL/USD') + self.mock_pyth_client.get_price.assert_called_once_with('Crypto.SOL/USD') self.faucet.request_neon_in_galans_mock.assert_not_called() @@ -153,7 +153,7 @@ def test_failed_airdrop_contract_not_in_whitelist(self, mock_is_allowed_contract self.mock_failed_attempts.airdrop_failed.assert_not_called() self.mock_pyth_client.update_mapping.assert_called_once() mock_is_allowed_contract.assert_called_once() - self.mock_pyth_client.get_price.assert_called_once_with('SOL/USD') + self.mock_pyth_client.get_price.assert_called_once_with('Crypto.SOL/USD') self.mock_airdrop_ready.is_airdrop_ready.assert_not_called() self.mock_airdrop_ready.register_airdrop.assert_not_called() self.faucet.request_neon_in_galans_mock.assert_not_called() @@ -182,7 +182,7 @@ def test_faucet_failure(self): self.mock_failed_attempts.airdrop_failed.assert_called_once_with(str(token_airdrop_address), ANY) self.mock_pyth_client.update_mapping.assert_called_once() self.mock_airdrop_ready.is_airdrop_ready.assert_called_once_with(token_airdrop_address) - self.mock_pyth_client.get_price.assert_called_once_with('SOL/USD') + self.mock_pyth_client.get_price.assert_called_once_with('Crypto.SOL/USD') self.mock_airdrop_ready.register_airdrop.assert_not_called() json_req = {'wallet': token_airdrop_address, 'amount': airdrop_amount} self.faucet.request_neon_in_galans_mock.assert_called_once_with(json_req) @@ -206,7 +206,7 @@ def test_process_trx_with_one_airdrop_for_already_processed_address(self): self.airdropper.process_scheduled_trxs() self.mock_pyth_client.update_mapping.assert_called_once() - self.mock_pyth_client.get_price.assert_called_once_with('SOL/USD') + self.mock_pyth_client.get_price.assert_called_once_with('Crypto.SOL/USD') self.mock_failed_attempts.airdrop_failed.assert_not_called() self.mock_airdrop_ready.is_airdrop_ready.assert_called_once_with(token_airdrop_address) self.mock_airdrop_ready.register_airdrop.assert_not_called() @@ -229,7 +229,7 @@ def test_failed_airdrop_confidence_interval_too_large(self): self.airdropper.process_scheduled_trxs() self.mock_pyth_client.update_mapping.assert_called_once() - self.mock_pyth_client.get_price.assert_called_once_with('SOL/USD') + self.mock_pyth_client.get_price.assert_called_once_with('Crypto.SOL/USD') self.mock_airdrop_ready.is_airdrop_ready.assert_called_once_with(token_airdrop_address) self.mock_airdrop_ready.register_airdrop.assert_not_called() self.faucet.request_neon_in_galans_mock.assert_not_called() @@ -250,7 +250,7 @@ def test_get_price_error(self): try: self.airdropper.process_scheduled_trxs() self.mock_pyth_client.update_mapping.assert_called_once() - self.mock_pyth_client.get_price.assert_called_once_with('SOL/USD') + self.mock_pyth_client.get_price.assert_called_once_with('Crypto.SOL/USD') except Exception as err: self.fail(f'Excpected not throws exception but it does: {err}') From c66f2833c6fea69d4eb89f6fb1024a8b438caf29 Mon Sep 17 00:00:00 2001 From: Dmitriy Borisenko Date: Fri, 4 Feb 2022 10:38:07 +0300 Subject: [PATCH 3/3] remove docker compose changes --- proxy/docker-compose-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy/docker-compose-test.yml b/proxy/docker-compose-test.yml index 9c1beb479..0c89e9ba4 100644 --- a/proxy/docker-compose-test.yml +++ b/proxy/docker-compose-test.yml @@ -69,7 +69,7 @@ services: LOG_NEON_CLI_DEBUG: "YES" FUZZING_BLOCKHASH: "YES" CONFIG: ci - PP_SOLANA_URL: https://api.devnet.solana.com + PP_SOLANA_URL: https://api.mainnet-beta.solana.com hostname: proxy depends_on: postgres: @@ -124,8 +124,8 @@ services: INDEXER_ERC20_WRAPPER_WHITELIST: ANY PRICE_UPDATE_INTERVAL: 10 START_SLOT: LATEST - PP_SOLANA_URL: https://api.devnet.solana.com - PYTH_MAPPING_ACCOUNT: BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2 + PP_SOLANA_URL: https://api.mainnet-beta.solana.com + PYTH_MAPPING_ACCOUNT: AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J MAX_CONFIDENCE_INTERVAL: 0.01 hostname: airdropper entrypoint: ./run-airdropper.sh