Skip to content

Refactor invoice validation using reusable modifiers #94

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
Sana9058 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor invoice validation using reusable modifiers #94

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
64 changes: 44 additions & 20 deletions contracts/src/Chainvoice.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,27 @@ contract Chainvoice {
require(msg.sender == owner, "Only owner can call");
_;
}
modifier validInvoice(uint256 invoiceId) {
require(invoiceId < invoices.length, "Invalid invoice ID");
_;
}

modifier invoiceActive(uint256 invoiceId) {
require(!invoices[invoiceId].isPaid, "Already paid");
require(!invoices[invoiceId].isCancelled, "Invoice is cancelled");
_;
}

modifier onlyCreator(uint256 invoiceId) {
require(msg.sender == invoices[invoiceId].from, "Only invoice creator");
_;
}

modifier onlyPayer(uint256 invoiceId) {
require(msg.sender == invoices[invoiceId].to, "Not authorized");
_;
}


// Simple non-reentrancy guard
bool private _entered;
Expand Down Expand Up @@ -182,33 +203,35 @@ contract Chainvoice {
}

// ========== Cancel single invoice ==========
function cancelInvoice(uint256 invoiceId) external {
require(invoiceId < invoices.length, "Invalid invoice ID");
InvoiceDetails storage invoice = invoices[invoiceId];

require(msg.sender == invoice.from, "Only invoice creator can cancel");
require(!invoice.isPaid && !invoice.isCancelled, "Invoice not cancellable");

invoice.isCancelled = true;
function cancelInvoice(uint256 invoiceId)
external
validInvoice(invoiceId)
onlyCreator(invoiceId)
invoiceActive(invoiceId)
{
invoices[invoiceId].isCancelled = true;

emit InvoiceCancelled(
invoiceId,
invoice.from,
invoice.to,
invoice.tokenAddress
invoices[invoiceId].from,
invoices[invoiceId].to,
invoices[invoiceId].tokenAddress
);
}

// ========== Pay single invoice ==========
function payInvoice(uint256 invoiceId) external payable nonReentrant {
require(invoiceId < invoices.length, "Invalid invoice ID");

// ========== Pay single invoice ==========
function payInvoice(uint256 invoiceId)
external
payable
nonReentrant
validInvoice(invoiceId)
onlyPayer(invoiceId)
invoiceActive(invoiceId)
{
InvoiceDetails storage invoice = invoices[invoiceId];
require(msg.sender == invoice.to, "Not authorized");
require(!invoice.isPaid, "Already paid");
require(!invoice.isCancelled, "Invoice is cancelled");

// Effects first for CEI (mark paid, bump fees), then interactions

// Effects first (CEI)
invoice.isPaid = true;

if (invoice.tokenAddress == address(0)) {
Expand Down Expand Up @@ -243,6 +266,7 @@ contract Chainvoice {
);
}


// ========== Batch pay (all-or-nothing) ==========
function payInvoicesBatch(uint256[] calldata invoiceIds) external payable nonReentrant {
uint256 n = invoiceIds.length;
Expand Down Expand Up @@ -324,9 +348,9 @@ contract Chainvoice {
)
external
view
validInvoice(invoiceId)
returns (bool canPay, uint256 payerBalance, uint256 allowanceAmount)
{
require(invoiceId < invoices.length, "Invalid invoice ID");
InvoiceDetails memory invoice = invoices[invoiceId];

if (invoice.isCancelled) {
Expand Down