Skip to content

Refactor error handling in BasePaymentTreasury contract #29

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
mahabubAlahi wants to merge 1 commit into
base: oz-audit-fixes
Choose a base branch
from
Open

Refactor error handling in BasePaymentTreasury contract #29

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
20 changes: 10 additions & 10 deletions src/utils/BasePaymentTreasury.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,17 +1245,17 @@ abstract contract BasePaymentTreasury is
uint256 tokenId = s_paymentIdToTokenId[internalPaymentId];

if (payment.buyerId == ZERO_BYTES) {
revert PaymentTreasuryPaymentNotExist(internalPaymentId);
revert PaymentTreasuryPaymentNotExist(paymentId);
}
if (!payment.isConfirmed) {
revert PaymentTreasuryPaymentNotConfirmed(internalPaymentId);
revert PaymentTreasuryPaymentNotConfirmed(paymentId);
}
if (amountToRefund == 0 || availablePaymentAmount < amountToRefund) {
revert PaymentTreasuryPaymentNotClaimable(internalPaymentId);
revert PaymentTreasuryPaymentNotClaimable(paymentId);
}
// This function is for non-NFT payments only
if (tokenId != 0) {
revert PaymentTreasuryCryptoPayment(internalPaymentId);
revert PaymentTreasuryCryptoPayment(paymentId);
}

// Use snapshots of line item type configuration from payment creation time
Expand Down Expand Up @@ -1390,14 +1390,14 @@ abstract contract BasePaymentTreasury is
uint256 tokenId = s_paymentIdToTokenId[internalPaymentId];

if (buyerAddress == address(0)) {
revert PaymentTreasuryPaymentNotExist(internalPaymentId);
revert PaymentTreasuryPaymentNotExist(paymentId);
}
if (amountToRefund == 0 || availablePaymentAmount < amountToRefund) {
revert PaymentTreasuryPaymentNotClaimable(internalPaymentId);
revert PaymentTreasuryPaymentNotClaimable(paymentId);
}
// NFT must exist for crypto payments
if (tokenId == 0) {
revert PaymentTreasuryPaymentNotClaimable(internalPaymentId);
revert PaymentTreasuryPaymentNotClaimable(paymentId);
}

// Get NFT owner before burning
Expand Down Expand Up @@ -1449,22 +1449,22 @@ abstract contract BasePaymentTreasury is

// For goal line items and base payment, check availableConfirmedPerToken
if (availablePaymentAmount < (amountToRefund + totalGoalLineItemRefundAmount)) {
revert PaymentTreasuryPaymentNotClaimable(internalPaymentId);
revert PaymentTreasuryPaymentNotClaimable(paymentId);
}

// For non-goal line items, check that we have enough claimable balance
// (only non-instant transfer items are refundable, and only their net amounts after fees)
if (totalNonGoalLineItemRefundAmount > 0) {
uint256 availableRefundable = s_refundableNonGoalLineItemPerToken[paymentToken];
if (availableRefundable < totalNonGoalLineItemRefundAmount) {
revert PaymentTreasuryPaymentNotClaimable(internalPaymentId);
revert PaymentTreasuryPaymentNotClaimable(paymentId);
}
}

// Check that contract has enough actual balance to perform the transfer
uint256 contractBalance = IERC20(paymentToken).balanceOf(address(this));
if (contractBalance < totalRefundAmount) {
revert PaymentTreasuryPaymentNotClaimable(internalPaymentId);
revert PaymentTreasuryPaymentNotClaimable(paymentId);
}

// Update state: remove tracking for refundable line items using snapshots
Expand Down