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.

Sign up for GitHub

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

fix(protocol): fix AssignmentHook Ether payment issue #17495

Merged
merged 2 commits into from
Jun 6, 2024
Merged

fix(protocol): fix AssignmentHook Ether payment issue #17495

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876a295
Update AssignmentHook.sol
dantaik Jun 6, 2024
254da2d
Merge branch 'main' into fix-assignment-hook
davidtaikocha Jun 6, 2024
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
22 changes: 12 additions & 10 deletions packages/protocol/contracts/L1/hooks/AssignmentHook.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,20 @@ contract AssignmentHook is EssentialContract, IHook {

// The proposer irrevocably pays a fee to the assigned prover, either in
// Ether or ERC20 tokens.
if (proverFee != 0 && _meta.sender != _blk.assignedProver) {
if (proverFee != 0) {
if (assignment.feeToken == address(0)) {
// Paying Ether
// Do not check `_meta.sender != _blk.assignedProver` as Ether has been forwarded
// from TaikoL1 to this hook.
_blk.assignedProver.sendEtherAndVerify(proverFee);
} else if (assignment.feeToken == address(tko)) {
// Paying TKO
tko.transferFrom(_meta.sender, _blk.assignedProver, proverFee);
} else {
// Other ERC20
IERC20(assignment.feeToken).safeTransferFrom(
_meta.sender, _blk.assignedProver, proverFee
);
} else if (_meta.sender != _blk.assignedProver) {
if (assignment.feeToken == address(tko)) {
tko.transferFrom(_meta.sender, _blk.assignedProver, proverFee); // Paying TKO
} else {
// Other ERC20
IERC20(assignment.feeToken).safeTransferFrom(
_meta.sender, _blk.assignedProver, proverFee
);
}
}
}

Expand Down