Skip to content

Commit 7018602

Browse files
author
hurstelm
committed
fix(arbitration): change of how safeSend() was executed
1 parent 9273b3d commit 7018602

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

contracts/src/arbitration/KlerosCoreBase.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
807807
// No one was coherent, send the rewards to the governor.
808808
if (round.feeToken == NATIVE_CURRENCY) {
809809
// The dispute fees were paid in ETH
810-
SafeSend.safeSend(payable(governor), round.totalFeesForJurors, wNative);
810+
payable(governor).safeSend(round.totalFeesForJurors, wNative);
811811
} else {
812812
// The dispute fees were paid in ERC20
813813
round.feeToken.safeTransfer(governor, round.totalFeesForJurors);
@@ -859,7 +859,7 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
859859
pinakion.safeTransfer(account, pnkReward);
860860
if (round.feeToken == NATIVE_CURRENCY) {
861861
// The dispute fees were paid in ETH
862-
SafeSend.safeSend(payable(account), feeReward, wNative);
862+
payable(account).safeSend(feeReward, wNative);
863863
} else {
864864
// The dispute fees were paid in ERC20
865865
round.feeToken.safeTransfer(account, feeReward);
@@ -885,7 +885,7 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
885885
if (leftoverFeeReward != 0) {
886886
if (round.feeToken == NATIVE_CURRENCY) {
887887
// The dispute fees were paid in ETH
888-
SafeSend.safeSend(payable(governor), leftoverFeeReward, wNative);
888+
payable(governor).safeSend(leftoverFeeReward, wNative);
889889
} else {
890890
// The dispute fees were paid in ERC20
891891
round.feeToken.safeTransfer(governor, leftoverFeeReward);

contracts/src/arbitration/KlerosGovernor.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ contract KlerosGovernor is IArbitrableV2 {
244244
emit ListSubmitted(submissions.length - 1, msg.sender, sessions.length - 1, _description);
245245

246246
uint256 remainder = msg.value - submission.deposit;
247-
if (remainder > 0) SafeSend.safeSend(payable(msg.sender), remainder, wNative);
247+
if (remainder > 0) payable(msg.sender).safeSend(remainder, wNative);
248248

249249
reservedETH += submission.deposit;
250250
}
@@ -284,7 +284,7 @@ contract KlerosGovernor is IArbitrableV2 {
284284
submission.approvalTime = block.timestamp;
285285
uint256 sumDeposit = session.sumDeposit;
286286
session.sumDeposit = 0;
287-
SafeSend.safeSend(submission.submitter, sumDeposit, wNative);
287+
submission.submitter.safeSend(sumDeposit, wNative);
288288
lastApprovalTime = block.timestamp;
289289
session.status = Status.Resolved;
290290
sessions.push();
@@ -318,7 +318,7 @@ contract KlerosGovernor is IArbitrableV2 {
318318
Submission storage submission = submissions[session.submittedLists[_ruling - 1]];
319319
submission.approved = true;
320320
submission.approvalTime = block.timestamp;
321-
SafeSend.safeSend(submission.submitter, session.sumDeposit, wNative);
321+
submission.submitter.safeSend(session.sumDeposit, wNative);
322322
}
323323
// If the ruling is "0" the reserved funds of this session become expendable.
324324
reservedETH -= session.sumDeposit;

contracts/src/arbitration/devtools/KlerosCoreRuler.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ contract KlerosCoreRuler is IArbitratorV2, UUPSProxiable, Initializable {
531531
round.sumFeeRewardPaid += feeReward;
532532
if (round.feeToken == NATIVE_CURRENCY) {
533533
// The dispute fees were paid in ETH
534-
SafeSend.safeSend(payable(account), feeReward, wNative);
534+
payable(account).safeSend(feeReward, wNative);
535535
} else {
536536
// The dispute fees were paid in ERC20
537537
round.feeToken.safeTransfer(account, feeReward);

contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
418418
core.appeal{value: appealCost}(_coreDisputeID, dispute.numberOfChoices, dispute.extraData);
419419
}
420420

421-
if (msg.value > contribution) SafeSend.safeSend(payable(msg.sender), msg.value - contribution, wNative);
421+
if (msg.value > contribution) payable(msg.sender).safeSend(msg.value - contribution, wNative);
422422
}
423423

424424
/// @dev Allows those contributors who attempted to fund an appeal round to withdraw any reimbursable fees or rewards after the dispute gets resolved.
@@ -463,7 +463,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
463463
round.contributions[_beneficiary][_choice] = 0;
464464

465465
if (amount != 0) {
466-
SafeSend.safeSend(_beneficiary, amount, wNative); // Deliberate use of send to prevent reverting fallback. It's the user's responsibility to accept ETH.
466+
_beneficiary.safeSend(amount, wNative); // Deliberate use of send to prevent reverting fallback. It's the user's responsibility to accept ETH.
467467
emit Withdrawal(_coreDisputeID, _coreRoundID, _choice, _beneficiary, amount);
468468
}
469469
}

contracts/src/arbitration/university/KlerosCoreUniversity.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
799799
// No one was coherent, send the rewards to the governor.
800800
if (round.feeToken == NATIVE_CURRENCY) {
801801
// The dispute fees were paid in ETH
802-
SafeSend.safeSend(payable(governor), round.totalFeesForJurors, wNative);
802+
payable(governor).safeSend(round.totalFeesForJurors, wNative);
803803
} else {
804804
// The dispute fees were paid in ERC20
805805
round.feeToken.safeTransfer(governor, round.totalFeesForJurors);
@@ -851,7 +851,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
851851
pinakion.safeTransfer(account, pnkReward);
852852
if (round.feeToken == NATIVE_CURRENCY) {
853853
// The dispute fees were paid in ETH
854-
SafeSend.safeSend(payable(account), feeReward, wNative);
854+
payable(account).safeSend(feeReward, wNative);
855855
} else {
856856
// The dispute fees were paid in ERC20
857857
round.feeToken.safeTransfer(account, feeReward);
@@ -877,7 +877,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
877877
if (leftoverFeeReward != 0) {
878878
if (round.feeToken == NATIVE_CURRENCY) {
879879
// The dispute fees were paid in ETH
880-
SafeSend.safeSend(payable(governor), leftoverFeeReward, wNative);
880+
payable(governor).safeSend(leftoverFeeReward, wNative);
881881
} else {
882882
// The dispute fees were paid in ERC20
883883
round.feeToken.safeTransfer(governor, leftoverFeeReward);

0 commit comments

Comments
 (0)