Payroll: revert to old way of obtaining exchange rate and add more clarity #821
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| // and applied allocation percentage | ||
| uint256 tokenAmount = _totalAmount.mul(exchangeRate).mul(tokenAllocation); | ||
| // Divide by 100 for the allocation and by ONE for the exchange rate precision | ||
| tokenAmount = tokenAmount / (100 * ONE); |
There was a problem hiding this comment.
Thanks for adding all these comments :)
| @@ -12,6 +12,11 @@ module.exports = (artifacts, web3) => { | |||
| const DAI_RATE = formatRate(1) // 1 DAI = 1 USD | |||
| const ANT_RATE = formatRate(0.5) // 1 ANT = 0.5 USD | |||
|
|
|||
| function exchangedAmount(amount, rate, tokenAllocation) { | |||
| // Mimic EVM calculation and truncation for token conversion | |||
| return amount.mul(rate).mul(inverseRate).div(ONE.div(100)).trunc() | |||
There was a problem hiding this comment.
I think inverseRate is not declared, shouldn't it be tokenAllocation?
There was a problem hiding this comment.
🤦♂️ forgot to push. It's here now: 2795a19
sohkai
force-pushed
the
payroll-fix-exchange-rate
branch
from
7ede1b4 to
2795a19
Compare
izqui
approved these changes
Apr 26, 2019
| // and applied allocation percentage | ||
| uint256 tokenAmount = _totalAmount.mul(exchangeRate).mul(tokenAllocation); | ||
| // Divide by 100 for the allocation and by ONE for the exchange rate precision | ||
| tokenAmount = tokenAmount / (100 * ONE); | ||
|
|
||
| finance.newImmediatePayment(token, employeeAddress, tokenAmount, paymentReference); | ||
| emit SendPayment(employeeAddress, token, tokenAmount, paymentReference); |
There was a problem hiding this comment.
While we are at it let's log the exchange rate used as it would be really helpful if we ever need to debug something.
There was a problem hiding this comment.
Don't worry, I haven't forgot 😉. Will do in another PR.
sohkai
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts to the old way of calculating the payment amount and tries to make it more obvious.