Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/Fix: Add simulated transaction fee to calculations.csv and fix compute logic #549

Merged
merged 57 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
42b174e
Add transaction fee to report
vkresch Jan 29, 2022
cc5f9b7
Added regression test
vkresch Feb 2, 2022
44d5f52
Merge branch 'master' into feature/transaction_fee_report
jdsika Feb 8, 2022
f2f5ff7
Adjust fee computation logic
amzid Feb 20, 2022
fe26165
fix black
jdsika Feb 21, 2022
d5be022
Merge branch 'master' into feature/transaction_fee_report
jdsika Feb 24, 2022
4eff263
review completed for fixing payment logic
jdsika Feb 24, 2022
05bd8a7
Review 2
jdsika Feb 28, 2022
331baff
removed kt accounts as payment address
jdsika Feb 28, 2022
b7464ce
added correct payment amount calculation
jdsika Feb 28, 2022
e5f940c
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 1, 2022
337115a
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 3, 2022
40dced7
replaced XTZ with tez, fixed CSV writer
jdsika Mar 3, 2022
fa310db
stuff
jdsika Mar 3, 2022
a6cc651
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 3, 2022
e5adf45
fixed type error in transaction content
jdsika Mar 3, 2022
09afd35
fix black
jdsika Mar 3, 2022
8fe119c
add descriptions to payment report
jdsika Mar 3, 2022
406d6ca
black fix
jdsika Mar 4, 2022
552ed80
minor changes to descritpions and convertion fix
jdsika Mar 4, 2022
a3290ca
made the operation hash consistent
jdsika Mar 7, 2022
8fc2bc9
fixed pass by reference for mutable objects
jdsika Mar 10, 2022
a245b7c
Fix partial tests
vkresch Mar 13, 2022
b8634e4
Fix number future payable cycles
vkresch Mar 14, 2022
869f2f5
removed legacy transaction_fee and replaced it with delegator_transac…
jdsika Mar 14, 2022
e38e48c
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 14, 2022
b7fa463
added instructions for vs code, changed to tez to mutez for consitenc…
jdsika Mar 14, 2022
7c210bd
readded check again and added .DONE for simulations as well
jdsika Mar 14, 2022
ce29426
changed formatting for mutez, removed redundant MUTEZ definitions
jdsika Mar 14, 2022
22edd54
fix lintq
nicolasochem Mar 14, 2022
8d0a7f7
fixed loggings, fixed int( ) conversions
jdsika Mar 15, 2022
762219b
Merge branch 'feature/transaction_fee_report' of https://github.com/t…
jdsika Mar 15, 2022
1f3df99
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 16, 2022
829e32d
fix black
jdsika Mar 16, 2022
7c8eeaa
minior changes
jdsika Mar 16, 2022
d8932d4
fix black and test_attempt_single_batch_tz/kt
jdsika Mar 16, 2022
132cc37
fix typos and moved a TODO into an issue
jdsika Mar 16, 2022
e3b97e5
harmonized type casts in reports
jdsika Mar 17, 2022
3d0a7a0
< threshold payments now correctly set to DONE, Removed magic numbers…
jdsika Mar 17, 2022
f9b7630
added burn fee remark to docs. added logger.info at keyboard interrup…
jdsika Mar 18, 2022
7ff6aa8
added type cast
jdsika Mar 18, 2022
deab106
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 18, 2022
df544bc
moved transaction fees from payment report to calculations report
jdsika Mar 18, 2022
09a40da
Merge branch 'feature/transaction_fee_report' of https://github.com/t…
jdsika Mar 18, 2022
5885ad7
changed .desc from None to empty string in calculations report
jdsika Mar 18, 2022
5c82fdb
fixed test_retry_producer.py by adapting test.csv to new format
jdsika Mar 21, 2022
92489a5
disabled flaky test
jdsika Mar 21, 2022
5de02a8
Expect zero payout amount
vkresch Mar 22, 2022
f4cfc92
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 22, 2022
3b050cb
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 23, 2022
7337b07
fixed bug which resulted in wrong parsing of atphase
jdsika Mar 23, 2022
d7ffada
fixed type cast
jdsika Mar 23, 2022
b570c16
replaced amount with adjusted_amount in webhook plugin
jdsika Mar 23, 2022
65a2ddb
fix "not in payment log" status in calculation (#572)
nicolasochem Mar 25, 2022
ee535ef
Merge branch 'master' into feature/transaction_fee_report
jdsika Mar 25, 2022
48e14ad
fixed webhook test
jdsika Mar 25, 2022
0c5afa8
added error messages for failed operations in payments csv
jdsika Mar 25, 2022
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
2 changes: 2 additions & 0 deletions src/model/reward_log.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ def __init__(
self.service_fee_rate = 0
self.service_fee_ratio = 0
self.amount = 0
self.delegate_transaction_fee = 0
self.delegator_transaction_fee = 0
self.parents = None

self.paid = PaymentStatus.UNDEFINED
Expand Down
Loading