Merge branch 'master' into bvander/deploy-to-k8s-dev

This commit is contained in:
Blair Vanderlugt 2021-08-25 08:57:39 -07:00
commit 415d64a4bd
25 changed files with 128 additions and 105 deletions

View File

@ -101,14 +101,14 @@ class DispatchSyncer:
LockEnum.QUEUE, LockEnum.QUEUE,
tx['from'], tx['from'],
], ],
queue=queue, queue=config.get('CELERY_QUEUE'),
) )
s_send = celery.signature( s_send = celery.signature(
'cic_eth.eth.tx.send', 'cic_eth.eth.tx.send',
[ [
self.chain_spec.asdict(), self.chain_spec.asdict(),
], ],
queue=queue, queue=config.get('CELERY_QUEUE'),
) )
s_check.link(s_send) s_check.link(s_send)
t = s_check.apply_async() t = s_check.apply_async()

View File

@ -20,7 +20,7 @@ def get_balances(address: str,
asynchronous: bool = False, asynchronous: bool = False,
callback_param: any = None, callback_param: any = None,
callback_queue='cic-ussd', callback_queue='cic-ussd',
callback_task='cic_ussd.tasks.callback_handler.process_balances_callback') -> Optional[list]: callback_task='cic_ussd.tasks.callback_handler.balances_callback') -> Optional[list]:
"""This function queries cic-eth for an account's balances, It provides a means to receive the balance either """This function queries cic-eth for an account's balances, It provides a means to receive the balance either
asynchronously or synchronously.. It returns a dictionary containing the network, outgoing and incoming balances. asynchronously or synchronously.. It returns a dictionary containing the network, outgoing and incoming balances.
:param address: Ethereum address of an account. :param address: Ethereum address of an account.

View File

@ -117,18 +117,18 @@ def transaction_actors(transaction: dict) -> Tuple[Dict, Dict]:
return recipient_transaction_data, sender_transaction_data return recipient_transaction_data, sender_transaction_data
def validate_transaction_account(session: Session, transaction: dict) -> Account: def validate_transaction_account(blockchain_address: str, role: str, session: Session) -> Account:
"""This function checks whether the blockchain address specified in a parsed transaction object resolves to an """This function checks whether the blockchain address specified in a parsed transaction object resolves to an
account object in the ussd system. account object in the ussd system.
:param session: Database session object. :param blockchain_address:
:type session: Session :type blockchain_address:
:param transaction: Parsed transaction data object. :param role:
:type transaction: dict :type role:
:param session:
:type session:
:return: :return:
:rtype: :rtype:
""" """
blockchain_address = transaction.get('blockchain_address')
role = transaction.get('role')
session = SessionBase.bind_session(session) session = SessionBase.bind_session(session)
account = session.query(Account).filter_by(blockchain_address=blockchain_address).first() account = session.query(Account).filter_by(blockchain_address=blockchain_address).first()
if not account: if not account:

View File

@ -67,6 +67,7 @@ def resume_last_ussd_session(last_state: str) -> Document:
'exit', 'exit',
'exit_invalid_pin', 'exit_invalid_pin',
'exit_invalid_new_pin', 'exit_invalid_new_pin',
'exit_invalid_recipient',
'exit_invalid_request', 'exit_invalid_request',
'exit_pin_blocked', 'exit_pin_blocked',
'exit_pin_mismatch', 'exit_pin_mismatch',

View File

@ -4,6 +4,7 @@ from typing import Tuple
# third party imports # third party imports
import celery import celery
from phonenumbers.phonenumberutil import NumberParseException
# local imports # local imports
from cic_ussd.account.balance import get_cached_available_balance from cic_ussd.account.balance import get_cached_available_balance
@ -21,23 +22,21 @@ logg = logging.getLogger(__file__)
def is_valid_recipient(state_machine_data: Tuple[str, dict, Account, Session]) -> bool: def is_valid_recipient(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
"""This function checks that a user exists, is not the initiator of the transaction, has an active account status """This function checks that a phone number provided as the recipient of a transaction does not match the sending
and is authorized to perform standard transactions. party's own phone number.
:param state_machine_data: A tuple containing user input, a ussd session and user object. :param state_machine_data: A tuple containing user input, a ussd session and user object.
:type state_machine_data: tuple :type state_machine_data: tuple
:return: A user's validity :return: A recipient account's validity for a transaction
:rtype: bool :rtype: bool
""" """
user_input, ussd_session, account, session = state_machine_data user_input, ussd_session, account, session = state_machine_data
try:
phone_number = process_phone_number(user_input, E164Format.region) phone_number = process_phone_number(user_input, E164Format.region)
session = SessionBase.bind_session(session=session) except NumberParseException:
recipient = Account.get_by_phone_number(phone_number=phone_number, session=session) phone_number = None
SessionBase.release_session(session=session)
is_not_initiator = phone_number != account.phone_number is_not_initiator = phone_number != account.phone_number
has_active_account_status = False is_present = Account.get_by_phone_number(phone_number, session) is not None
if recipient: return phone_number is not None and phone_number.startswith('+') and is_present and is_not_initiator
has_active_account_status = recipient.get_status(session) == AccountStatus.ACTIVE.name
return is_not_initiator and has_active_account_status and recipient is not None
def is_valid_transaction_amount(state_machine_data: Tuple[str, dict, Account, Session]) -> bool: def is_valid_transaction_amount(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:

View File

@ -138,7 +138,7 @@ def transaction_balances_callback(self, result: list, param: dict, status_code:
balances_data = result[0] balances_data = result[0]
available_balance = calculate_available_balance(balances_data) available_balance = calculate_available_balance(balances_data)
transaction = param transaction = param
blockchain_address = param.get('blockchain_address') blockchain_address = transaction.get('blockchain_address')
transaction['available_balance'] = available_balance transaction['available_balance'] = available_balance
queue = self.request.delivery_info.get('routing_key') queue = self.request.delivery_info.get('routing_key')
@ -150,10 +150,10 @@ def transaction_balances_callback(self, result: list, param: dict, status_code:
) )
s_notify_account = celery.signature('cic_ussd.tasks.notifications.transaction', queue=queue) s_notify_account = celery.signature('cic_ussd.tasks.notifications.transaction', queue=queue)
if param.get('transaction_type') == 'transfer': if transaction.get('transaction_type') == 'transfer':
celery.chain(s_preferences_metadata, s_process_account_metadata, s_notify_account).apply_async() celery.chain(s_preferences_metadata, s_process_account_metadata, s_notify_account).apply_async()
if param.get('transaction_type') == 'tokengift': if transaction.get('transaction_type') == 'tokengift':
s_process_account_metadata = celery.signature( s_process_account_metadata = celery.signature(
'cic_ussd.tasks.processor.parse_transaction', [{}, transaction], queue=queue 'cic_ussd.tasks.processor.parse_transaction', [{}, transaction], queue=queue
) )
@ -184,10 +184,11 @@ def transaction_callback(result: dict, param: str, status_code: int):
source_token_value = result.get('source_token_value') source_token_value = result.get('source_token_value')
recipient_metadata = { recipient_metadata = {
"token_symbol": destination_token_symbol, "alt_blockchain_address": sender_blockchain_address,
"token_value": destination_token_value,
"blockchain_address": recipient_blockchain_address, "blockchain_address": recipient_blockchain_address,
"role": "recipient", "role": "recipient",
"token_symbol": destination_token_symbol,
"token_value": destination_token_value,
"transaction_type": param "transaction_type": param
} }
@ -201,10 +202,11 @@ def transaction_callback(result: dict, param: str, status_code: int):
if param == 'transfer': if param == 'transfer':
sender_metadata = { sender_metadata = {
"alt_blockchain_address": recipient_blockchain_address,
"blockchain_address": sender_blockchain_address, "blockchain_address": sender_blockchain_address,
"role": "sender",
"token_symbol": source_token_symbol, "token_symbol": source_token_symbol,
"token_value": source_token_value, "token_value": source_token_value,
"role": "sender",
"transaction_type": param "transaction_type": param
} }

View File

@ -29,7 +29,8 @@ def transaction(notification_data: dict):
phone_number = notification_data.get('phone_number') phone_number = notification_data.get('phone_number')
preferred_language = notification_data.get('preferred_language') preferred_language = notification_data.get('preferred_language')
token_symbol = notification_data.get('token_symbol') token_symbol = notification_data.get('token_symbol')
transaction_account_metadata = notification_data.get('metadata_id') alt_metadata_id = notification_data.get('alt_metadata_id')
metadata_id = notification_data.get('metadata_id')
transaction_type = notification_data.get('transaction_type') transaction_type = notification_data.get('transaction_type')
timestamp = datetime.datetime.now().strftime('%d-%m-%y, %H:%M %p') timestamp = datetime.datetime.now().strftime('%d-%m-%y, %H:%M %p')
@ -47,7 +48,8 @@ def transaction(notification_data: dict):
preferred_language=preferred_language, preferred_language=preferred_language,
amount=amount, amount=amount,
token_symbol=token_symbol, token_symbol=token_symbol,
tx_sender_information=transaction_account_metadata, tx_recipient_information=metadata_id,
tx_sender_information=alt_metadata_id,
timestamp=timestamp, timestamp=timestamp,
balance=balance) balance=balance)
if role == 'sender': if role == 'sender':
@ -56,6 +58,7 @@ def transaction(notification_data: dict):
preferred_language=preferred_language, preferred_language=preferred_language,
amount=amount, amount=amount,
token_symbol=token_symbol, token_symbol=token_symbol,
tx_recipient_information=transaction_account_metadata, tx_recipient_information=alt_metadata_id,
tx_sender_information=metadata_id,
timestamp=timestamp, timestamp=timestamp,
balance=balance) balance=balance)

View File

@ -11,6 +11,7 @@ from chainlib.hash import strip_0x
from cic_ussd.account.statement import get_cached_statement from cic_ussd.account.statement import get_cached_statement
from cic_ussd.account.transaction import aux_transaction_data, validate_transaction_account from cic_ussd.account.transaction import aux_transaction_data, validate_transaction_account
from cic_ussd.cache import cache_data, cache_data_key from cic_ussd.cache import cache_data, cache_data_key
from cic_ussd.db.models.account import Account
from cic_ussd.db.models.base import SessionBase from cic_ussd.db.models.base import SessionBase
@ -72,13 +73,17 @@ def parse_transaction(preferences: dict, transaction: dict) -> dict:
preferred_language = preferences.get('preferred_language') preferred_language = preferences.get('preferred_language')
if not preferred_language: if not preferred_language:
preferred_language = i18n.config.get('fallback') preferred_language = i18n.config.get('fallback')
transaction['preferred_language'] = preferred_language
transaction = aux_transaction_data(preferred_language, transaction) transaction = aux_transaction_data(preferred_language, transaction)
session = SessionBase.create_session() session = SessionBase.create_session()
account = validate_transaction_account(session, transaction) role = transaction.get('role')
metadata_id = account.standard_metadata_id() alt_blockchain_address = transaction.get('alt_blockchain_address')
transaction['metadata_id'] = metadata_id blockchain_address = transaction.get('blockchain_address')
account = validate_transaction_account(blockchain_address, role, session)
alt_account = session.query(Account).filter_by(blockchain_address=alt_blockchain_address).first()
if alt_account:
transaction['alt_metadata_id'] = alt_account.standard_metadata_id()
transaction['metadata_id'] = account.standard_metadata_id()
transaction['phone_number'] = account.phone_number transaction['phone_number'] = account.phone_number
session.commit()
session.close() session.close()
return transaction return transaction

View File

@ -13,11 +13,5 @@ redis==3.5.3
semver==2.13.0 semver==2.13.0
SQLAlchemy==1.3.20 SQLAlchemy==1.3.20
tinydb==4.2.0 tinydb==4.2.0
phonenumbers==8.12.12
redis==3.5.3
celery==4.4.7
python-i18n[YAML]==0.3.9
pyxdg==0.27
bcrypt==3.2.0
uWSGI==2.0.19.1
transitions==0.8.4 transitions==0.8.4
uWSGI==2.0.19.1

View File

@ -75,17 +75,21 @@ def test_transaction_actors(activated_account, transaction_result, valid_recipie
def test_validate_transaction_account(activated_account, init_database, transactions_list): def test_validate_transaction_account(activated_account, init_database, transactions_list):
sample_transaction = transactions_list[0] sample_transaction = transactions_list[0]
recipient_transaction, sender_transaction = transaction_actors(sample_transaction) recipient_transaction, sender_transaction = transaction_actors(sample_transaction)
recipient_account = validate_transaction_account(init_database, recipient_transaction) recipient_account = validate_transaction_account(
sender_account = validate_transaction_account(init_database, sender_transaction) recipient_transaction.get('blockchain_address'), recipient_transaction.get('role'), init_database)
sender_account = validate_transaction_account(
sender_transaction.get('blockchain_address'), sender_transaction.get('role'), init_database)
assert isinstance(recipient_account, Account) assert isinstance(recipient_account, Account)
assert isinstance(sender_account, Account) assert isinstance(sender_account, Account)
sample_transaction = transactions_list[1] sample_transaction = transactions_list[1]
recipient_transaction, sender_transaction = transaction_actors(sample_transaction) recipient_transaction, sender_transaction = transaction_actors(sample_transaction)
with pytest.raises(UnknownUssdRecipient) as error: with pytest.raises(UnknownUssdRecipient) as error:
validate_transaction_account(init_database, recipient_transaction) validate_transaction_account(
recipient_transaction.get('blockchain_address'), recipient_transaction.get('role'), init_database)
assert str( assert str(
error.value) == f'Tx for recipient: {recipient_transaction.get("blockchain_address")} has no matching account in the system.' error.value) == f'Tx for recipient: {recipient_transaction.get("blockchain_address")} has no matching account in the system.'
validate_transaction_account(init_database, sender_transaction) validate_transaction_account(
sender_transaction.get('blockchain_address'), sender_transaction.get('role'), init_database)
assert f'Tx from sender: {sender_transaction.get("blockchain_address")} has no matching account in system.' assert f'Tx from sender: {sender_transaction.get("blockchain_address")} has no matching account in system.'

View File

@ -30,8 +30,6 @@ def test_is_valid_recipient(activated_account,
valid_recipient): valid_recipient):
state_machine = ('0112365478', generic_ussd_session, valid_recipient, init_database) state_machine = ('0112365478', generic_ussd_session, valid_recipient, init_database)
assert is_valid_recipient(state_machine) is False assert is_valid_recipient(state_machine) is False
state_machine = (pending_account.phone_number, generic_ussd_session, valid_recipient, init_database)
assert is_valid_recipient(state_machine) is False
state_machine = (valid_recipient.phone_number, generic_ussd_session, activated_account, init_database) state_machine = (valid_recipient.phone_number, generic_ussd_session, activated_account, init_database)
assert is_valid_recipient(state_machine) is True assert is_valid_recipient(state_machine) is True

View File

@ -24,7 +24,8 @@ def test_transaction(celery_session_worker,
phone_number = notification_data.get('phone_number') phone_number = notification_data.get('phone_number')
preferred_language = notification_data.get('preferred_language') preferred_language = notification_data.get('preferred_language')
token_symbol = notification_data.get('token_symbol') token_symbol = notification_data.get('token_symbol')
transaction_account_metadata = notification_data.get('metadata_id') alt_metadata_id = notification_data.get('alt_metadata_id')
metadata_id = notification_data.get('metadata_id')
timestamp = datetime.datetime.now().strftime('%d-%m-%y, %H:%M %p') timestamp = datetime.datetime.now().strftime('%d-%m-%y, %H:%M %p')
s_transaction = celery.signature( s_transaction = celery.signature(
'cic_ussd.tasks.notifications.transaction', [notification_data] 'cic_ussd.tasks.notifications.transaction', [notification_data]
@ -36,7 +37,8 @@ def test_transaction(celery_session_worker,
preferred_language=preferred_language, preferred_language=preferred_language,
amount=amount, amount=amount,
token_symbol=token_symbol, token_symbol=token_symbol,
tx_recipient_information=transaction_account_metadata, tx_recipient_information=alt_metadata_id,
tx_sender_information=metadata_id,
timestamp=timestamp, timestamp=timestamp,
balance=balance) balance=balance)
assert mock_notifier_api.get('message') == message assert mock_notifier_api.get('message') == message
@ -52,7 +54,8 @@ def test_transaction(celery_session_worker,
preferred_language=preferred_language, preferred_language=preferred_language,
amount=amount, amount=amount,
token_symbol=token_symbol, token_symbol=token_symbol,
tx_sender_information=transaction_account_metadata, tx_recipient_information=metadata_id,
tx_sender_information=alt_metadata_id,
timestamp=timestamp, timestamp=timestamp,
balance=balance) balance=balance)
assert mock_notifier_api.get('message') == message assert mock_notifier_api.get('message') == message

View File

@ -5,12 +5,18 @@ import random
import pytest import pytest
# local import # local import
from cic_ussd.account.balance import get_cached_available_balance
# tests imports # tests imports
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def notification_data(activated_account, cache_person_metadata, cache_preferences, preferences): def notification_data(activated_account,
cache_person_metadata,
cache_preferences,
cache_balances,
preferences,
valid_recipient):
return { return {
'blockchain_address': activated_account.blockchain_address, 'blockchain_address': activated_account.blockchain_address,
'token_symbol': 'GFT', 'token_symbol': 'GFT',
@ -18,6 +24,7 @@ def notification_data(activated_account, cache_person_metadata, cache_preference
'role': 'sender', 'role': 'sender',
'action_tag': 'Sent', 'action_tag': 'Sent',
'direction_tag': 'To', 'direction_tag': 'To',
'alt_metadata_id': valid_recipient.standard_metadata_id(),
'metadata_id': activated_account.standard_metadata_id(), 'metadata_id': activated_account.standard_metadata_id(),
'phone_number': activated_account.phone_number, 'phone_number': activated_account.phone_number,
'available_balance': 50.0, 'available_balance': 50.0,

View File

@ -2,9 +2,9 @@ en:
account_successfully_created: |- account_successfully_created: |-
You have been registered on Sarafu Network! To use dial *384*96# on Safaricom and *483*96# on other networks. For help %{support_phone}. You have been registered on Sarafu Network! To use dial *384*96# on Safaricom and *483*96# on other networks. For help %{support_phone}.
received_tokens: |- received_tokens: |-
Successfully received %{amount} %{token_symbol} from %{tx_sender_information} %{timestamp}. New balance is %{balance} %{token_symbol}. Successfully received %{amount} %{token_symbol} from %{tx_sender_information} %{timestamp} to %{tx_recipient_information}. New balance is %{balance} %{token_symbol}.
sent_tokens: |- sent_tokens: |-
Successfully sent %{amount} %{token_symbol} to %{tx_recipient_information} %{timestamp}. New balance is %{balance} %{token_symbol}. Successfully sent %{amount} %{token_symbol} to %{tx_recipient_information} %{timestamp} from %{tx_sender_information}. New balance is %{balance} %{token_symbol}.
terms: |- terms: |-
By using the service, you agree to the terms and conditions at http://grassecon.org/tos By using the service, you agree to the terms and conditions at http://grassecon.org/tos
upsell_unregistered_recipient: |- upsell_unregistered_recipient: |-

View File

@ -2,9 +2,9 @@ sw:
account_successfully_created: |- account_successfully_created: |-
Umesajiliwa kwa huduma ya Sarafu! Kutumia bonyeza *384*96# Safaricom ama *483*46# kwa utandao tofauti. Kwa Usaidizi %{support_phone}. Umesajiliwa kwa huduma ya Sarafu! Kutumia bonyeza *384*96# Safaricom ama *483*46# kwa utandao tofauti. Kwa Usaidizi %{support_phone}.
received_tokens: |- received_tokens: |-
Umepokea %{amount} %{token_symbol} kutoka kwa %{tx_sender_information} %{timestamp}. Salio lako ni %{balance} %{token_symbol}. Umepokea %{amount} %{token_symbol} kutoka kwa %{tx_sender_information} %{timestamp} ikapokewa na %{tx_recipient_information}. Salio lako ni %{balance} %{token_symbol}.
sent_tokens: |- sent_tokens: |-
Umetuma %{amount} %{token_symbol} kwa %{tx_recipient_information} %{timestamp}. Salio lako ni %{balance} %{token_symbol}. Umetuma %{amount} %{token_symbol} kwa %{tx_recipient_information} %{timestamp} kutoka kwa %{tx_sender_information}. Salio lako ni %{balance} %{token_symbol}.
terms: |- terms: |-
Kwa kutumia hii huduma, umekubali sheria na masharti yafuatayo http://grassecon.org/tos Kwa kutumia hii huduma, umekubali sheria na masharti yafuatayo http://grassecon.org/tos
upsell_unregistered_recipient: |- upsell_unregistered_recipient: |-

View File

@ -7,10 +7,8 @@ en:
3. Help 3. Help
initial_pin_entry: |- initial_pin_entry: |-
CON Please enter a new four number PIN for your account. CON Please enter a new four number PIN for your account.
0. Back
initial_pin_confirmation: |- initial_pin_confirmation: |-
CON Enter your four number PIN again CON Enter your four number PIN again
0. Back
enter_given_name: |- enter_given_name: |-
CON Enter first name CON Enter first name
0. Back 0. Back
@ -183,7 +181,7 @@ en:
exit_pin_mismatch: |- exit_pin_mismatch: |-
END The new PIN does not match the one you entered. Please try again. For help, call %{support_phone}. END The new PIN does not match the one you entered. Please try again. For help, call %{support_phone}.
exit_invalid_recipient: |- exit_invalid_recipient: |-
CON Recipient phone number is incorrect. CON Recipient's phone number is not registered or is invalid:
00. Retry 00. Retry
99. Exit 99. Exit
exit_successful_transaction: |- exit_successful_transaction: |-

View File

@ -7,13 +7,10 @@ sw:
3. Help 3. Help
initial_pin_entry: |- initial_pin_entry: |-
CON Tafadhali weka pin mpya yenye nambari nne kwa akaunti yako CON Tafadhali weka pin mpya yenye nambari nne kwa akaunti yako
0. Nyuma
initial_pin_confirmation: |- initial_pin_confirmation: |-
CON Weka PIN yako tena CON Weka PIN yako tena
0. Nyuma
enter_given_name: |- enter_given_name: |-
CON Weka jina lako la kwanza CON Weka jina lako la kwanza
0. Nyuma
enter_family_name: |- enter_family_name: |-
CON Weka jina lako la mwisho CON Weka jina lako la mwisho
0. Nyuma 0. Nyuma

View File

@ -140,8 +140,11 @@ class TrafficRouter:
for k in keys: for k in keys:
if len(k) > 8 and k[:8] == 'TRAFFIC_': if len(k) > 8 and k[:8] == 'TRAFFIC_':
v = int(dct.get(k)) v = int(dct.get(k))
self.add(k[8:].lower(), v) if v == 0:
logg.debug('skipping traffic item {} with weight {}'.format(k, v))
else:
logg.debug('found traffic item {} weight {}'.format(k, v)) logg.debug('found traffic item {} weight {}'.format(k, v))
self.add(k[8:].lower(), v)
# TODO: This will not work well with big networks. The provisioner should use lazy loading and LRU instead. # TODO: This will not work well with big networks. The provisioner should use lazy loading and LRU instead.

View File

@ -0,0 +1,3 @@
[celery]
broker_url = redis://localhost:63379
result_url = redis://localhost:63379

View File

@ -0,0 +1,3 @@
[redis]
host = localhost
port = 63379

View File

@ -0,0 +1,2 @@
[rpc]
http_provider = http://localhost:63545

View File

@ -0,0 +1,4 @@
[traffic]
#local.noop_traffic = 1
local.account = 2
local.transfer = 2

View File

@ -17,14 +17,10 @@ from chainlib.eth.gas import RPCGasOracle
from chainlib.eth.nonce import RPCNonceOracle from chainlib.eth.nonce import RPCNonceOracle
from chainlib.eth.block import block_latest from chainlib.eth.block import block_latest
from hexathon import strip_0x from hexathon import strip_0x
from cic_base import ( import chainlib.eth.cli
argparse, import cic_eth.cli
config, from cic_eth.cli.chain import chain_interface
log, from chainlib.eth.constant import ZERO_ADDRESS
rpc,
signer as signer_funcs,
)
from cic_base.eth.syncer import chain_interface
# local imports # local imports
#import common #import common
@ -42,42 +38,45 @@ from cmd.cache import (
# common basics # common basics
script_dir = os.path.realpath(os.path.dirname(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
logg = log.create() traffic_schema_dir = os.path.join(script_dir, 'data', 'config')
argparser = argparse.create(script_dir, argparse.full_template) logging.basicConfig(level=logging.WARNING)
argparser = argparse.add(argparser, add_traffic_args, 'traffic') logg = logging.getLogger()
args = argparse.parse(argparser, logg)
config = config.create(args.c, args, args.env_prefix)
# map custom args to local config entries arg_flags = cic_eth.cli.argflag_std_read | cic_eth.cli.Flag.WALLET
batchsize = args.batch_size local_arg_flags = cic_eth.cli.argflag_local_taskcallback | cic_eth.cli.argflag_local_chain
if batchsize < 1: argparser = cic_eth.cli.ArgumentParser(arg_flags)
batchsize = 1 argparser.add_argument('--batch-size', default=10, type=int, help='number of events to process simultaneously')
logg.info('batch size {}'.format(batchsize)) argparser.process_local_flags(local_arg_flags)
config.add(batchsize, '_BATCH_SIZE', True) args = argparser.parse_args()
config.add(args.redis_host_callback, '_REDIS_HOST_CALLBACK', True) extra_args = {
config.add(args.redis_port_callback, '_REDIS_PORT_CALLBACK', True) 'batch_size': None,
}
config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags, base_config_dir=traffic_schema_dir, extra_args=extra_args)
config.add(args.y, '_KEYSTORE_FILE', True) wallet = chainlib.eth.cli.Wallet()
wallet.from_config(config)
config.add(args.q, '_CELERY_QUEUE', True) rpc = chainlib.eth.cli.Rpc(wallet=wallet)
conn = rpc.connect_by_config(config)
logg.debug(config) chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
class NetworkError(Exception):
pass
chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
def main(): def main():
# create signer (not currently in use, but needs to be accessible for custom traffic item generators) # create signer (not currently in use, but needs to be accessible for custom traffic item generators)
(signer_address, signer) = signer_funcs.from_keystore(config.get('_KEYSTORE_FILE')) signer = rpc.get_signer()
signer_address = rpc.get_sender_address()
# connect to celery # connect to celery
celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL')) celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL'))
# set up registry # set up registry
rpc.setup(config.get('CIC_CHAIN_SPEC'), config.get('ETH_PROVIDER')) # replace with HTTPConnection when registry has been so refactored
conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
#registry = registry.init_legacy(config, w3)
CICRegistry.address = config.get('CIC_REGISTRY_ADDRESS') CICRegistry.address = config.get('CIC_REGISTRY_ADDRESS')
registry = CICRegistry(chain_spec, conn) registry = CICRegistry(chain_spec, conn)
@ -91,7 +90,7 @@ def main():
handler = TrafficSyncHandler(config, traffic_router, conn) handler = TrafficSyncHandler(config, traffic_router, conn)
# Set up syncer # Set up syncer
syncer_backend = MemBackend(config.get('CIC_CHAIN_SPEC'), 0) syncer_backend = MemBackend(config.get('CHAIN_SPEC'), 0)
o = block_latest() o = block_latest()
r = conn.do(o) r = conn.do(o)
block_offset = int(strip_0x(r), 16) + 1 block_offset = int(strip_0x(r), 16) + 1
@ -99,26 +98,28 @@ def main():
# get relevant registry entries # get relevant registry entries
token_registry = registry.lookup('TokenRegistry') token_registry = registry.lookup('TokenRegistry')
if token_registry == ZERO_ADDRESS:
raise NetworkError('TokenRegistry value missing from contract registry {}'.format(config.get('CIC_REGISTRY_ADDRESS')))
logg.info('using token registry {}'.format(token_registry)) logg.info('using token registry {}'.format(token_registry))
token_cache = TokenRegistryCache(chain_spec, token_registry) token_cache = TokenRegistryCache(chain_spec, token_registry)
account_registry = registry.lookup('AccountRegistry') account_registry = registry.lookup('AccountRegistry')
if account_registry == ZERO_ADDRESS:
raise NetworkError('AccountRegistry value missing from contract registry {}'.format(config.get('CIC_REGISTRY_ADDRESS')))
logg.info('using account registry {}'.format(account_registry)) logg.info('using account registry {}'.format(account_registry))
account_cache = AccountRegistryCache(chain_spec, account_registry) account_cache = AccountRegistryCache(chain_spec, account_registry)
# Set up provisioner for common task input data # Set up provisioner for common task input data
#TrafficProvisioner.oracles['token']= common.registry.TokenOracle(w3, config.get('CIC_CHAIN_SPEC'), registry)
#TrafficProvisioner.oracles['account'] = common.registry.AccountsOracle(w3, config.get('CIC_CHAIN_SPEC'), registry)
TrafficProvisioner.oracles['token'] = token_cache TrafficProvisioner.oracles['token'] = token_cache
TrafficProvisioner.oracles['account'] = account_cache TrafficProvisioner.oracles['account'] = account_cache
TrafficProvisioner.default_aux = { TrafficProvisioner.default_aux = {
'chain_spec': config.get('CIC_CHAIN_SPEC'), 'chain_spec': config.get('CHAIN_SPEC'),
'registry': registry, 'registry': registry,
'redis_host_callback': config.get('_REDIS_HOST_CALLBACK'), 'redis_host_callback': config.get('_REDIS_HOST_CALLBACK'),
'redis_port_callback': config.get('_REDIS_PORT_CALLBACK'), 'redis_port_callback': config.get('_REDIS_PORT_CALLBACK'),
'redis_db': config.get('REDIS_DB'), 'redis_db': config.get('REDIS_DB'),
'api_queue': config.get('_CELERY_QUEUE'), 'api_queue': config.get('CELERY_QUEUE'),
} }
syncer = HeadSyncer(syncer_backend, chain_interface, block_callback=handler.refresh) syncer = HeadSyncer(syncer_backend, chain_interface, block_callback=handler.refresh)

View File

@ -1,4 +0,0 @@
[traffic]
#local.noop_traffic = 2
#local.account = 2
local.transfer = 2

View File

@ -4,10 +4,10 @@ cic-types~=0.1.0a14
crypto-dev-signer>=0.4.15a1,<=0.4.15 crypto-dev-signer>=0.4.15a1,<=0.4.15
faker==4.17.1 faker==4.17.1
chainsyncer~=0.0.6a1 chainsyncer~=0.0.6a1
chainlib-eth~=0.0.9a3 chainlib-eth~=0.0.9a4
eth-address-index~=0.2.3a4 eth-address-index~=0.2.3a4
eth-contract-registry~=0.6.3a3 eth-contract-registry~=0.6.3a3
eth-accounts-index~=0.1.2a2 eth-accounts-index~=0.1.2a3
eth-erc20~=0.1.2a2 eth-erc20~=0.1.2a2
erc20-faucet~=0.3.2a2 erc20-faucet~=0.3.2a2
psycopg2==2.8.6 psycopg2==2.8.6