Skip to content

fix: account for prior withdrawals in refund amount calculation #27

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

Open
memosr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: account for prior withdrawals in refund amount calculation #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 14 additions & 11 deletions contracts/escrow_smart_contract/RefundProtocol.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,14 @@ contract RefundProtocol is EIP712 {
revert CallerNotAllowed();
}

uint256 refundAmount = payment.amount - payment.withdrawnAmount;
uint256 recipientBalance = balances[payment.to];

if (payment.amount > recipientBalance) {
if (refundAmount > recipientBalance) {
revert InsufficientFunds();
}

balances[payment.to] = recipientBalance - payment.amount;
balances[payment.to] = recipientBalance - refundAmount;

_executeRefund(paymentID, payment);
}
Expand All @@ -137,21 +138,22 @@ contract RefundProtocol is EIP712 {
function refundByArbiter(uint256 paymentID) external onlyArbiter {
Payment memory payment = payments[paymentID];

uint256 refundAmount = payment.amount - payment.withdrawnAmount;
uint256 recipientBalance = balances[payment.to];

if (payment.amount <= recipientBalance) {
balances[payment.to] = recipientBalance - payment.amount;
if (refundAmount <= recipientBalance) {
balances[payment.to] = recipientBalance - refundAmount;
return _executeRefund(paymentID, payment);
}

uint256 arbiterBalance = balances[arbiter];

if (payment.amount > arbiterBalance) {
if (refundAmount > arbiterBalance) {
revert InsufficientFunds();
}

balances[arbiter] = arbiterBalance - payment.amount;
debts[payment.to] += payment.amount;
balances[arbiter] = arbiterBalance - refundAmount;
debts[payment.to] += refundAmount;

_executeRefund(paymentID, payment);
}
Expand Down Expand Up @@ -345,11 +347,12 @@ contract RefundProtocol is EIP712 {
if (payment.refunded) {
revert PaymentRefunded(paymentID);
}
fiatToken.transfer(payment.refundTo, payment.amount);

uint256 refundAmount = payment.amount - payment.withdrawnAmount;
if (refundAmount > 0) {
fiatToken.transfer(payment.refundTo, refundAmount);
}
payments[paymentID].refunded = true;

emit Refund(paymentID, payment.refundTo, payment.amount);
emit Refund(paymentID, payment.refundTo, refundAmount);
}

/**
Expand Down