Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5984c19
cherrypick part of changes
Dec 1, 2021
613a469
create indexer.py
Dec 1, 2021
c0d0e6c
remove solana_receipts_update.py
Dec 1, 2021
3f6b5c4
Cherry pick files from old branch
Dec 1, 2021
0790298
add requirement
Dec 1, 2021
340c854
fix refactoring issues
Dec 1, 2021
7449b38
Fix inspection issues
Dec 1, 2021
b3dacfa
fix last issue
Dec 1, 2021
a50cd47
Merge branch '336_indexer_refactoring' into 337_сreate_base_airdroppe…
Dec 1, 2021
2b8f879
Merge remote-tracking branch 'origin/develop' into 337_сreate_base_ai…
Dec 2, 2021
f51f2ed
simplify tests
Dec 2, 2021
6678924
add test
Dec 2, 2021
5d454b7
Merge remote-tracking branch 'origin/develop' into 337_сreate_base_ai…
Dec 3, 2021
add136a
add price provider
Dec 1, 2021
9a4be44
fix PriceProvider, add test
Dec 1, 2021
07aaca8
Add tests. Check worn on all nets
Dec 1, 2021
7a46c12
refactoring
Dec 1, 2021
2fc1424
integrate price_provider into airdropper
Dec 2, 2021
d157d67
integrate price provider
Dec 2, 2021
8a6abfd
use new faucet method
Dec 3, 2021
3d4dec9
add new parameter to airdropper main
Dec 3, 2021
5c29832
Test discriptions for airdropper
Dec 3, 2021
6a4efdc
Comments for price provider tests
Dec 3, 2021
14aeeed
remove unnecessary comment
Dec 3, 2021
bd35791
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 3, 2021
ff1f557
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 6, 2021
c28ca8e
fix error
Dec 6, 2021
8c68755
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 7, 2021
5325895
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 8, 2021
a1cbad2
fix airdropper run
Dec 10, 2021
4ed6d78
remove duplicated code
Dec 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix PriceProvider, add test
  • Loading branch information
ivanl committed Dec 3, 2021
commit 9a4be44b55f13bc8e67ec78e0dd535dca8cdaafd
25 changes: 20 additions & 5 deletions proxy/indexer/price_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,31 @@
'agg.status': { 'pos': 224, 'len': 4, 'format': '<I' },
}


def _unpack_field(raw_data: bytes, field_name: str):
field = field_info.get(field_name, None)
if field is None:
raise Exception(f'Unknown field name: {field_name}')

start_idx = field['pos']
stop_idx = field['pos'] + field['len']
return struct.unpack(field['format'], raw_data[start_idx:stop_idx])[0]


price_accounts = {
'SOL/USD': 'H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG'
}

PRICE_STATUS_UNKNOWN = 0
PRICE_STATUS_TRADING = 1

class PriceProvider:
def __init__(self, solana_url, default_upd_int):
self.client = client = Client(solana_url)
self.client = Client(solana_url)
self.default_upd_int = default_upd_int
self.prices = {}


def _read_price(self, pairname):
acc_id = price_accounts.get(pairname, None)
if acc_id is None:
Expand Down Expand Up @@ -56,13 +71,13 @@ def _read_price(self, pairname):
logger.warning(f'Unknown encoding {encoding}')
return None

status = struct.unpack(data, 'agg.status')
if status != 1: # not Trading
status = _unpack_field(data, 'agg.status')
if status != PRICE_STATUS_TRADING: # not Trading
logger.warning(f'Price status is {status}')
return None

expo = struct.unpack(data, 'expo')
price = struct.unpack(data, 'agg.price')
expo = _unpack_field(data, 'expo')
price = _unpack_field(data, 'agg.price')
return price * pow(10, expo)


Expand Down
80 changes: 80 additions & 0 deletions proxy/testing/test_price_provider.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
from proxy.indexer.price_provider import PriceProvider, field_info, PRICE_STATUS_TRADING, PRICE_STATUS_UNKNOWN, price_accounts
from unittest import TestCase
from unittest.mock import patch, MagicMock, call
from datetime import datetime
from solana.rpc.api import Client
from solana.publickey import PublicKey
from struct import pack
from random import uniform


class TestPriceProvider(TestCase):
@classmethod
def setUpClass(cls) -> None:
print("Testing PriceProvider")
cls.solana_url = 'https://api.mainnet-beta.solana.com' # use contract in mainnet
cls.default_upd_int = 10


def setUp(self) -> None:
self.price_provider = PriceProvider(self.solana_url,
self.default_upd_int)

def _create_price_account_info(self, price: float, status: int):
# Follow link https://github.com/pyth-network/pyth-client-rs/blob/main/src/lib.rs
# for details on structure of pyth.network price accounts.
# Current implementation of PriceProvider uses only few fields of account
# so no need to generate all data in tests

exponent = -8 # use as default
# Fill gap between account data begining and expo field with zeros
data = b'\x00' * field_info['expo']['pos']
data += pack(field_info['expo']['format'], exponent)

raw_price = int(price / pow(10, exponent))
# fill gap between expo and agg.price fields with zeros
data += b'\x00' * (field_info['agg.price']['pos'] - len(data))
data += pack(field_info['agg.price']['format'], raw_price)

# fill gap between agg.price and agg.status fields with zeros
data += b'\x00' * (field_info['agg.status']['pos'] - len(data))
data += pack(field_info['agg.status']['format'], status)
# rest of data array is not used by PriceProvier so no need to fill it

return {
'result': {
'value': {
'data': [
data,
'base64'
]
}
}
}

@patch.object(Client, 'get_account_info')
@patch.object(datetime, 'now')
def test_success_read_price_two_times_with_small_interval(self, mock_now, mock_get_account_info):
print("Should call get_price two times but will cause only one call to get_account_info")
mock_nowtime = MagicMock()
mock_timestamp = MagicMock()
mock_nowtime.timestamp = mock_timestamp

# some random time
first_call_time = uniform(0, 100000)
# not enough time left to cause second account reload
second_call_time = first_call_time + self.default_upd_int - 1

mock_now.side_effect = [mock_nowtime, mock_nowtime]
mock_timestamp.side_effect = [ first_call_time, second_call_time]

current_price = 315.0
mock_get_account_info.side_effect = [self._create_price_account_info(current_price, PRICE_STATUS_TRADING)]

pair_name = 'SOL/USD'
self.assertEqual(self.price_provider.get_price(pair_name), current_price)
self.assertEqual(self.price_provider.get_price(pair_name), current_price)

mock_now.assert_has_calls([call(),call()])
mock_timestamp.assert_has_calls([call(), call()])
mock_get_account_info.assert_called_once_with(PublicKey(price_accounts[pair_name]))