Beneficiary Support For Redeem and UnstaKe #101
Merged
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
benjaminbollen
suggested changes
Feb 2, 2018
contracts/OpenSTUtility.sol
Outdated
| @@ -81,14 +81,14 @@ contract OpenSTUtility is Hasher, OpsManaged { | |||
| address _beneficiary, uint256 _amountUT); | |||
|
|
|||
| event RedemptionIntentDeclared(bytes32 indexed _uuid, bytes32 indexed _redemptionIntentHash, | |||
| address _token, address _redeemer, uint256 _nonce, uint256 _amount, uint256 _unlockHeight, | |||
| address _token, address _redeemer, address _beneficiary, uint256 _nonce, uint256 _amount, uint256 _unlockHeight, | |||
There was a problem hiding this comment.
to keep in line with the function signatures for redeem; can we make the order _nonce, _beneficiary?
contracts/OpenSTUtility.sol
Outdated
| amountUT: _amountBT, | ||
| unlockHeight: unlockHeight | ||
| }); | ||
|
|
||
| RedemptionIntentDeclared(_uuid, redemptionIntentHash, address(token), | ||
| msg.sender, _nonce, _amountBT, unlockHeight, chainIdValue); | ||
| msg.sender, _beneficiary, _nonce, _amountBT, unlockHeight, chainIdValue); |
There was a problem hiding this comment.
then the order here is aligned with the function signature _nonce, _beneficiary
contracts/OpenSTUtility.sol
Outdated
| amountUT: amountSTP, | ||
| unlockHeight: unlockHeight | ||
| }); | ||
|
|
||
| RedemptionIntentDeclared(uuidSTPrime, redemptionIntentHash, simpleTokenPrime, | ||
| msg.sender, _nonce, amountSTP, unlockHeight, chainIdValue); | ||
| msg.sender, _beneficiary, _nonce, amountSTP, unlockHeight, chainIdValue); |
There was a problem hiding this comment.
again order would change here
test/OpenSTUtility.js
Outdated
| @@ -111,6 +111,7 @@ contract('OpenSTUtility', function(accounts) { | |||
| const requester = "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; | |||
| const token = "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; | |||
| const redeemer = accounts[0]; | |||
| const redeemBeneficiary = accounts[0]; | |||
There was a problem hiding this comment.
- indentation
- use a new
accounts[1]
|
@benjaminbollen Requested changes done |
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.
No description provided.