Philip/default token integration
This commit is contained in:
parent
b02cdee1bd
commit
6d44863a49
@ -36,6 +36,7 @@ from cic_eth.eth import (
|
|||||||
from cic_eth.admin import (
|
from cic_eth.admin import (
|
||||||
debug,
|
debug,
|
||||||
ctrl,
|
ctrl,
|
||||||
|
token
|
||||||
)
|
)
|
||||||
from cic_eth.queue import (
|
from cic_eth.queue import (
|
||||||
query,
|
query,
|
||||||
|
@ -38,3 +38,13 @@ class MetadataStoreError(Exception):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class SeppukuError(Exception):
|
||||||
|
"""Exception base class for all errors that should cause system shutdown"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class InitializationError(Exception):
|
||||||
|
"""Exception raised when initialization state is insufficient to run component"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ from typing import Optional
|
|||||||
# third party imports
|
# third party imports
|
||||||
import celery
|
import celery
|
||||||
from sqlalchemy import desc
|
from sqlalchemy import desc
|
||||||
|
from cic_eth.api import Api
|
||||||
from tinydb.table import Document
|
from tinydb.table import Document
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
@ -15,7 +16,7 @@ from cic_ussd.balance import BalanceManager, compute_operational_balance, get_ca
|
|||||||
from cic_ussd.chain import Chain
|
from cic_ussd.chain import Chain
|
||||||
from cic_ussd.db.models.account import AccountStatus, Account
|
from cic_ussd.db.models.account import AccountStatus, Account
|
||||||
from cic_ussd.db.models.ussd_session import UssdSession
|
from cic_ussd.db.models.ussd_session import UssdSession
|
||||||
from cic_ussd.error import MetadataNotFoundError
|
from cic_ussd.error import MetadataNotFoundError, SeppukuError
|
||||||
from cic_ussd.menu.ussd_menu import UssdMenu
|
from cic_ussd.menu.ussd_menu import UssdMenu
|
||||||
from cic_ussd.metadata import blockchain_address_to_metadata_pointer
|
from cic_ussd.metadata import blockchain_address_to_metadata_pointer
|
||||||
from cic_ussd.phone_number import get_user_by_phone_number
|
from cic_ussd.phone_number import get_user_by_phone_number
|
||||||
@ -28,6 +29,38 @@ from cic_types.models.person import generate_metadata_pointer, get_contact_data_
|
|||||||
logg = logging.getLogger(__name__)
|
logg = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def get_default_token_data():
|
||||||
|
chain_str = Chain.spec.__str__()
|
||||||
|
cic_eth_api = Api(chain_str=chain_str)
|
||||||
|
default_token_request_task = cic_eth_api.default_token()
|
||||||
|
default_token_data = default_token_request_task.get()
|
||||||
|
return default_token_data
|
||||||
|
|
||||||
|
|
||||||
|
def retrieve_token_symbol(chain_str: str = Chain.spec.__str__()):
|
||||||
|
"""
|
||||||
|
:param chain_str:
|
||||||
|
:type chain_str:
|
||||||
|
:return:
|
||||||
|
:rtype:
|
||||||
|
"""
|
||||||
|
cache_key = create_cached_data_key(
|
||||||
|
identifier=chain_str.encode('utf-8'),
|
||||||
|
salt=':cic.default_token_data'
|
||||||
|
)
|
||||||
|
cached_data = get_cached_data(key=cache_key)
|
||||||
|
if cached_data:
|
||||||
|
default_token_data = json.loads(cached_data)
|
||||||
|
return default_token_data.get('symbol')
|
||||||
|
else:
|
||||||
|
logg.warning('Cached default token data not found. Attempting retrieval from default token API')
|
||||||
|
default_token_data = get_default_token_data()
|
||||||
|
if default_token_data:
|
||||||
|
return default_token_data.get('symbol')
|
||||||
|
else:
|
||||||
|
raise SeppukuError(f'Could not retrieve default token for: {chain_str}')
|
||||||
|
|
||||||
|
|
||||||
def process_pin_authorization(display_key: str, user: Account, **kwargs) -> str:
|
def process_pin_authorization(display_key: str, user: Account, **kwargs) -> str:
|
||||||
"""
|
"""
|
||||||
This method provides translation for all ussd menu entries that follow the pin authorization pattern.
|
This method provides translation for all ussd menu entries that follow the pin authorization pattern.
|
||||||
@ -73,7 +106,9 @@ def process_exit_insufficient_balance(display_key: str, user: Account, ussd_sess
|
|||||||
# compile response data
|
# compile response data
|
||||||
user_input = ussd_session.get('user_input').split('*')[-1]
|
user_input = ussd_session.get('user_input').split('*')[-1]
|
||||||
transaction_amount = to_wei(value=int(user_input))
|
transaction_amount = to_wei(value=int(user_input))
|
||||||
token_symbol = 'GFT'
|
|
||||||
|
# get default data
|
||||||
|
token_symbol = retrieve_token_symbol()
|
||||||
|
|
||||||
recipient_phone_number = ussd_session.get('session_data').get('recipient_phone_number')
|
recipient_phone_number = ussd_session.get('session_data').get('recipient_phone_number')
|
||||||
recipient = get_user_by_phone_number(phone_number=recipient_phone_number)
|
recipient = get_user_by_phone_number(phone_number=recipient_phone_number)
|
||||||
@ -102,7 +137,7 @@ def process_exit_successful_transaction(display_key: str, user: Account, ussd_se
|
|||||||
:rtype: str
|
:rtype: str
|
||||||
"""
|
"""
|
||||||
transaction_amount = to_wei(int(ussd_session.get('session_data').get('transaction_amount')))
|
transaction_amount = to_wei(int(ussd_session.get('session_data').get('transaction_amount')))
|
||||||
token_symbol = 'GFT'
|
token_symbol = retrieve_token_symbol()
|
||||||
recipient_phone_number = ussd_session.get('session_data').get('recipient_phone_number')
|
recipient_phone_number = ussd_session.get('session_data').get('recipient_phone_number')
|
||||||
recipient = get_user_by_phone_number(phone_number=recipient_phone_number)
|
recipient = get_user_by_phone_number(phone_number=recipient_phone_number)
|
||||||
tx_recipient_information = define_account_tx_metadata(user=recipient)
|
tx_recipient_information = define_account_tx_metadata(user=recipient)
|
||||||
@ -137,7 +172,7 @@ def process_transaction_pin_authorization(user: Account, display_key: str, ussd_
|
|||||||
tx_recipient_information = define_account_tx_metadata(user=recipient)
|
tx_recipient_information = define_account_tx_metadata(user=recipient)
|
||||||
tx_sender_information = define_account_tx_metadata(user=user)
|
tx_sender_information = define_account_tx_metadata(user=user)
|
||||||
|
|
||||||
token_symbol = 'GFT'
|
token_symbol = retrieve_token_symbol()
|
||||||
user_input = ussd_session.get('session_data').get('transaction_amount')
|
user_input = ussd_session.get('session_data').get('transaction_amount')
|
||||||
transaction_amount = to_wei(value=int(user_input))
|
transaction_amount = to_wei(value=int(user_input))
|
||||||
logg.debug('Requires integration to determine user tokens.')
|
logg.debug('Requires integration to determine user tokens.')
|
||||||
@ -168,29 +203,30 @@ def process_account_balances(user: Account, display_key: str, ussd_session: dict
|
|||||||
logg.debug('Requires call to retrieve tax and bonus amounts')
|
logg.debug('Requires call to retrieve tax and bonus amounts')
|
||||||
tax = ''
|
tax = ''
|
||||||
bonus = ''
|
bonus = ''
|
||||||
|
token_symbol = retrieve_token_symbol()
|
||||||
return translation_for(
|
return translation_for(
|
||||||
key=display_key,
|
key=display_key,
|
||||||
preferred_language=user.preferred_language,
|
preferred_language=user.preferred_language,
|
||||||
operational_balance=operational_balance,
|
operational_balance=operational_balance,
|
||||||
tax=tax,
|
tax=tax,
|
||||||
bonus=bonus,
|
bonus=bonus,
|
||||||
token_symbol='GFT'
|
token_symbol=token_symbol
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def format_transactions(transactions: list, preferred_language: str):
|
def format_transactions(transactions: list, preferred_language: str, token_symbol: str):
|
||||||
|
|
||||||
formatted_transactions = ''
|
formatted_transactions = ''
|
||||||
if len(transactions) > 0:
|
if len(transactions) > 0:
|
||||||
for transaction in transactions:
|
for transaction in transactions:
|
||||||
|
|
||||||
recipient_phone_number = transaction.get('recipient_phone_number')
|
recipient_phone_number = transaction.get('recipient_phone_number')
|
||||||
sender_phone_number = transaction.get('sender_phone_number')
|
sender_phone_number = transaction.get('sender_phone_number')
|
||||||
value = transaction.get('to_value')
|
value = transaction.get('to_value')
|
||||||
timestamp = transaction.get('timestamp')
|
timestamp = transaction.get('timestamp')
|
||||||
action_tag = transaction.get('action_tag')
|
action_tag = transaction.get('action_tag')
|
||||||
direction = transaction.get('direction')
|
direction = transaction.get('direction')
|
||||||
token_symbol = 'GFT'
|
token_symbol = token_symbol
|
||||||
|
|
||||||
if action_tag == 'SENT' or action_tag == 'ULITUMA':
|
if action_tag == 'SENT' or action_tag == 'ULITUMA':
|
||||||
formatted_transactions += f'{action_tag} {value} {token_symbol} {direction} {recipient_phone_number} {timestamp}.\n'
|
formatted_transactions += f'{action_tag} {value} {token_symbol} {direction} {recipient_phone_number} {timestamp}.\n'
|
||||||
@ -254,6 +290,8 @@ def process_account_statement(user: Account, display_key: str, ussd_session: dic
|
|||||||
key = create_cached_data_key(identifier=identifier, salt='cic.statement')
|
key = create_cached_data_key(identifier=identifier, salt='cic.statement')
|
||||||
transactions = get_cached_data(key=key)
|
transactions = get_cached_data(key=key)
|
||||||
|
|
||||||
|
token_symbol = retrieve_token_symbol()
|
||||||
|
|
||||||
first_transaction_set = []
|
first_transaction_set = []
|
||||||
middle_transaction_set = []
|
middle_transaction_set = []
|
||||||
last_transaction_set = []
|
last_transaction_set = []
|
||||||
@ -277,7 +315,8 @@ def process_account_statement(user: Account, display_key: str, ussd_session: dic
|
|||||||
preferred_language=user.preferred_language,
|
preferred_language=user.preferred_language,
|
||||||
first_transaction_set=format_transactions(
|
first_transaction_set=format_transactions(
|
||||||
transactions=first_transaction_set,
|
transactions=first_transaction_set,
|
||||||
preferred_language=user.preferred_language
|
preferred_language=user.preferred_language,
|
||||||
|
token_symbol=token_symbol
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif display_key == 'ussd.kenya.middle_transaction_set':
|
elif display_key == 'ussd.kenya.middle_transaction_set':
|
||||||
@ -286,7 +325,8 @@ def process_account_statement(user: Account, display_key: str, ussd_session: dic
|
|||||||
preferred_language=user.preferred_language,
|
preferred_language=user.preferred_language,
|
||||||
middle_transaction_set=format_transactions(
|
middle_transaction_set=format_transactions(
|
||||||
transactions=middle_transaction_set,
|
transactions=middle_transaction_set,
|
||||||
preferred_language=user.preferred_language
|
preferred_language=user.preferred_language,
|
||||||
|
token_symbol=token_symbol
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -296,7 +336,8 @@ def process_account_statement(user: Account, display_key: str, ussd_session: dic
|
|||||||
preferred_language=user.preferred_language,
|
preferred_language=user.preferred_language,
|
||||||
last_transaction_set=format_transactions(
|
last_transaction_set=format_transactions(
|
||||||
transactions=last_transaction_set,
|
transactions=last_transaction_set,
|
||||||
preferred_language=user.preferred_language
|
preferred_language=user.preferred_language,
|
||||||
|
token_symbol=token_symbol
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -312,11 +353,12 @@ def process_start_menu(display_key: str, user: Account):
|
|||||||
:return: Corresponding translation text response
|
:return: Corresponding translation text response
|
||||||
:rtype: str
|
:rtype: str
|
||||||
"""
|
"""
|
||||||
|
token_symbol = retrieve_token_symbol()
|
||||||
chain_str = Chain.spec.__str__()
|
chain_str = Chain.spec.__str__()
|
||||||
blockchain_address = user.blockchain_address
|
blockchain_address = user.blockchain_address
|
||||||
balance_manager = BalanceManager(address=blockchain_address,
|
balance_manager = BalanceManager(address=blockchain_address,
|
||||||
chain_str=chain_str,
|
chain_str=chain_str,
|
||||||
token_symbol='GFT')
|
token_symbol=token_symbol)
|
||||||
|
|
||||||
# get balances synchronously for display on start menu
|
# get balances synchronously for display on start menu
|
||||||
balances_data = balance_manager.get_balances()
|
balances_data = balance_manager.get_balances()
|
||||||
@ -340,9 +382,6 @@ def process_start_menu(display_key: str, user: Account):
|
|||||||
# retrieve and cache account's statement
|
# retrieve and cache account's statement
|
||||||
retrieve_account_statement(blockchain_address=blockchain_address)
|
retrieve_account_statement(blockchain_address=blockchain_address)
|
||||||
|
|
||||||
# TODO [Philip]: figure out how to get token symbol from a metadata layer of sorts.
|
|
||||||
token_symbol = 'GFT'
|
|
||||||
|
|
||||||
return translation_for(
|
return translation_for(
|
||||||
key=display_key,
|
key=display_key,
|
||||||
preferred_language=user.preferred_language,
|
preferred_language=user.preferred_language,
|
||||||
@ -375,6 +414,13 @@ def process_request(user_input: str, user: Account, ussd_session: Optional[dict]
|
|||||||
:return: A ussd menu's corresponding text value.
|
:return: A ussd menu's corresponding text value.
|
||||||
:rtype: Document
|
:rtype: Document
|
||||||
"""
|
"""
|
||||||
|
# retrieve metadata before any transition
|
||||||
|
key = generate_metadata_pointer(
|
||||||
|
identifier=blockchain_address_to_metadata_pointer(blockchain_address=user.blockchain_address),
|
||||||
|
cic_type='cic.person'
|
||||||
|
)
|
||||||
|
person_metadata = get_cached_data(key=key)
|
||||||
|
|
||||||
if ussd_session:
|
if ussd_session:
|
||||||
if user_input == "0":
|
if user_input == "0":
|
||||||
return UssdMenu.parent_menu(menu_name=ussd_session.get('state'))
|
return UssdMenu.parent_menu(menu_name=ussd_session.get('state'))
|
||||||
@ -382,29 +428,12 @@ def process_request(user_input: str, user: Account, ussd_session: Optional[dict]
|
|||||||
successive_state = next_state(ussd_session=ussd_session, user=user, user_input=user_input)
|
successive_state = next_state(ussd_session=ussd_session, user=user, user_input=user_input)
|
||||||
return UssdMenu.find_by_name(name=successive_state)
|
return UssdMenu.find_by_name(name=successive_state)
|
||||||
else:
|
else:
|
||||||
|
|
||||||
key = generate_metadata_pointer(
|
|
||||||
identifier=blockchain_address_to_metadata_pointer(blockchain_address=user.blockchain_address),
|
|
||||||
cic_type='cic.person'
|
|
||||||
)
|
|
||||||
|
|
||||||
# retrieve and cache account's metadata
|
|
||||||
s_query_person_metadata = celery.signature(
|
|
||||||
'cic_ussd.tasks.metadata.query_person_metadata',
|
|
||||||
[user.blockchain_address]
|
|
||||||
)
|
|
||||||
s_query_person_metadata.apply_async(queue='cic-ussd')
|
|
||||||
|
|
||||||
if user.has_valid_pin():
|
if user.has_valid_pin():
|
||||||
last_ussd_session = retrieve_most_recent_ussd_session(phone_number=user.phone_number)
|
last_ussd_session = retrieve_most_recent_ussd_session(phone_number=user.phone_number)
|
||||||
|
|
||||||
if last_ussd_session:
|
if last_ussd_session:
|
||||||
# get metadata
|
|
||||||
person_metadata = get_cached_data(key=key)
|
|
||||||
|
|
||||||
# get last state
|
# get last state
|
||||||
last_state = last_ussd_session.state
|
last_state = last_ussd_session.state
|
||||||
|
|
||||||
# if last state is account_creation_prompt and metadata exists, show start menu
|
# if last state is account_creation_prompt and metadata exists, show start menu
|
||||||
if last_state in [
|
if last_state in [
|
||||||
'account_creation_prompt',
|
'account_creation_prompt',
|
||||||
|
@ -17,6 +17,7 @@ from cic_ussd.chain import Chain
|
|||||||
from cic_ussd.db import dsn_from_config
|
from cic_ussd.db import dsn_from_config
|
||||||
from cic_ussd.db.models.base import SessionBase
|
from cic_ussd.db.models.base import SessionBase
|
||||||
from cic_ussd.encoder import PasswordEncoder
|
from cic_ussd.encoder import PasswordEncoder
|
||||||
|
from cic_ussd.error import InitializationError
|
||||||
from cic_ussd.files.local_files import create_local_file_data_stores, json_file_parser
|
from cic_ussd.files.local_files import create_local_file_data_stores, json_file_parser
|
||||||
from cic_ussd.menu.ussd_menu import UssdMenu
|
from cic_ussd.menu.ussd_menu import UssdMenu
|
||||||
from cic_ussd.metadata.signer import Signer
|
from cic_ussd.metadata.signer import Signer
|
||||||
@ -25,7 +26,8 @@ from cic_ussd.operations import (define_response_with_content,
|
|||||||
process_menu_interaction_requests,
|
process_menu_interaction_requests,
|
||||||
define_multilingual_responses)
|
define_multilingual_responses)
|
||||||
from cic_ussd.phone_number import process_phone_number
|
from cic_ussd.phone_number import process_phone_number
|
||||||
from cic_ussd.redis import InMemoryStore
|
from cic_ussd.processor import get_default_token_data
|
||||||
|
from cic_ussd.redis import cache_data, create_cached_data_key, InMemoryStore
|
||||||
from cic_ussd.requests import (get_request_endpoint,
|
from cic_ussd.requests import (get_request_endpoint,
|
||||||
get_request_method)
|
get_request_method)
|
||||||
from cic_ussd.runnable.server_base import exportable_parser, logg
|
from cic_ussd.runnable.server_base import exportable_parser, logg
|
||||||
@ -107,6 +109,20 @@ Chain.spec = chain_spec
|
|||||||
UssdStateMachine.states = states
|
UssdStateMachine.states = states
|
||||||
UssdStateMachine.transitions = transitions
|
UssdStateMachine.transitions = transitions
|
||||||
|
|
||||||
|
# retrieve default token data
|
||||||
|
default_token_data = get_default_token_data()
|
||||||
|
chain_str = Chain.spec.__str__()
|
||||||
|
|
||||||
|
# cache default token for re-usability
|
||||||
|
if default_token_data:
|
||||||
|
cache_key = create_cached_data_key(
|
||||||
|
identifier=chain_str.encode('utf-8'),
|
||||||
|
salt=':cic.default_token_data'
|
||||||
|
)
|
||||||
|
cache_data(key=cache_key, data=json.dumps(default_token_data))
|
||||||
|
else:
|
||||||
|
raise InitializationError(f'Default token data for: {chain_str} not found.')
|
||||||
|
|
||||||
|
|
||||||
def application(env, start_response):
|
def application(env, start_response):
|
||||||
"""Loads python code for application to be accessible over web server
|
"""Loads python code for application to be accessible over web server
|
||||||
|
Loading…
Reference in New Issue
Block a user