wrapped OUSD API #206
wrapped OUSD API #206
Conversation
| @@ -125,6 +126,36 @@ def maybe_store_transfer_record(log, block): | |||
|
|
|||
| return transfer | |||
|
|
|||
| def maybe_store_wrap_transfer_record(log, block): | |||
There was a problem hiding this comment.
Pretty cool that you are also storing WOUSD transafers. This will surely be useful for other use cases
There was a problem hiding this comment.
Great work on this one @rolandpo. Left some suggestions on how to improve code maintainability.
| @@ -755,6 +758,114 @@ def process_transaction(transaction): | |||
|
|
|||
| return analyzed_transactions | |||
|
|
|||
| def ensure_analyzed_wrap_transactions(from_block, to_block, start_time, end_time, account='all'): | |||
There was a problem hiding this comment.
Huge amount of code seems to overlap between this function and ensure_analyzed_transactions. I think it would make sense to create a new function that has an extra bool is_ousd:
__ensure_transaction_analysis(from_block, to_block, start_time, end_time, account='all', mode):
is_ousd = mode === 'ousd'
.... (rest of code)
and both functions can call the newly created function:
def ensure_analyzed_transactions(from_block, to_block, start_time, end_time, account='all'):
__ensure_transaction_analysis(from_block, to_block, start_time, end_time, account, 'ousd'
def ensure_analyzed_wrap_transactions(from_block, to_block, start_time, end_time, account='all'):
__ensure_transaction_analysis(from_block, to_block, start_time, end_time, account, 'wousd'
This way you can reduce the duplicated code and increase maintainability -> There is less overall code to maintain and when you make a change in one of the functions you don't need to keep in mind that you need to make change in the other one that has duplicated code as well
|
think that's sorted now |
| @@ -679,54 +685,108 @@ def process_transaction(transaction): | |||
| sent_eth = transaction.data['value'] != '0x0' | |||
| transfer_ousd_out = False | |||
| transfer_ousd_in = False | |||
| transfer_wousd_out = False | |||
There was a problem hiding this comment.
this can further be reduced in size and complexity. I would not introduce new booleans here. Rather make the existing ones more general:
transfer_ousd_out -> transfer_token_out where token can be OUSD / WOUSD
transfer_ousd_in -> transfer_token_in where token can be OUSD / WOUSD
...
| transfer_coin_out = False | ||
| transfer_coin_in = False | ||
| ousd_transfer_from = None | ||
| ousd_transfer_to = None | ||
| ousd_transfer_amount = None | ||
| wousd_transfer_from = None | ||
| wousd_transfer_to = None | ||
| wousd_transfer_amount = None | ||
| transfer_log_count = 0 | ||
|
|
||
| for log in logs: | ||
| if log.topic_0 == TRANSFER: | ||
| transfer_log_count += 1 | ||
| is_ousd_token = log.address == '0x2a8e1e676ec238d8a992307b495b45b3feaa5e86' |
There was a problem hiding this comment.
this would become then:
is_token = is_ousd ? log.address == '0x2a8e...' : log.address == '0xd2af...'
| transfer_ousd_in = True | ||
| else: | ||
| transfer_coin_in = True | ||
| if is_ousd: |
There was a problem hiding this comment.
Most of additional boolean branching below would also be reduced:
if is_token:
token_transfer_from = from_address
....
| if is_ousd: | ||
| if transfer_log_count > 0: | ||
| if transfer_ousd_in: | ||
| classification = 'transfer_in' |
There was a problem hiding this comment.
This line would become:
classification = is_ousd ? 'transfer_in' : 'transfer_in_wousd'
| wrap_receive_wousd = transfer_wousd_in and transfer_coin_out | ||
| wrap_send_wousd = transfer_wousd_out and transfer_coin_in | ||
|
|
||
| if is_ousd: |
There was a problem hiding this comment.
no need for this if statement I think
|
makes sense for sure, that should be fixed now |
|
replaced by #362 |
Adding wrapped OUSD transaction history functionality along with new API URL to be used with wOUSD history tab in the dapp
Connected PR: OriginProtocol/origin-dollar#995