Return penalty to staker if target chain has already progressed #576
Conversation
hobofan
changed the title
|
@sarvesh-ost Done! |
|
@deepesh-kn I incorporated all your feedback, execpt for the one I left a comment for. |
|
@sarvesh-ost I moved the |
|
@sarvesh-ost @deepesh-kn Ready for review ;) |
There was a problem hiding this comment.
Changes looks good for progressStakeWithProof. 🙌
As requested by @deepesh-kn , Similar feature is required for progressRedeemWithProof.
Refer : #409
|
Oh wow, completely overlooked that 🙈 |
|
@sarvesh-ost @deepesh-kn I added the version for |
contracts/gateway/EIP20CoGateway.sol
Outdated
| @@ -546,8 +546,9 @@ contract EIP20CoGateway is GatewayBase { | |||
| ); | |||
|
|
|||
| MessageBus.Message storage message = messages[_messageHash]; | |||
| MessageBus.MessageStatus outboxMessageStatus = | |||
| messageBox.outbox[_messageHash]; | |||
There was a problem hiding this comment.
| messageBox.outbox[_messageHash]; | |
| messageBox.outbox[_messageHash]; |
contracts/gateway/EIP20CoGateway.sol
Outdated
| return; | ||
| } | ||
|
|
||
| // Penalty charged to staker for revert redeem. |
There was a problem hiding this comment.
| // Penalty charged to staker for revert redeem. | |
| // Penalty charged to redeemer for revert redeem. |
|
|
||
| const expectedFinalFacilitatorETHBalance = initialFacilitatorEthBalance | ||
| .add(bountyAmount) | ||
| .subn(tx.receipt.gasUsed); |
There was a problem hiding this comment.
Should this not be multiplied with gas price?
There was a problem hiding this comment.
The gas price is set to 1 in truffle.js, which I think is the reason that it works. But yeah, in theory it would need to be multiplied with the gas price.
- Align with inbox/outbox naming - Moved returning penalty after progressStakeInternal and collect relevant values before that
FIXES #409
Waiting for #578 being merged.