Skip to content

test(recurring): accept and reject EIP-1271 batch signatures #1759

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

Closed
LeoSlrRf wants to merge 1 commit into from
Closed

test(recurring): accept and reject EIP-1271 batch signatures #1759

Show file tree
Hide file tree
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
124 changes: 7 additions & 117 deletions packages/smart-contracts/src/contracts/ERC20RecurringPaymentProxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran
error ERC20RecurringPaymentProxy__ZeroAddress();
error ERC20RecurringPaymentProxy__TransferFailed();
error ERC20RecurringPaymentProxy__ShortPull();
error ERC20RecurringPaymentProxy__UnexpectedBalance();
error ERC20RecurringPaymentProxy__ZeroScheduleId();
error ERC20RecurringPaymentProxy__InvalidDueTimes();
error ERC20RecurringPaymentProxy__TooManyLegs();
Expand All @@ -39,15 +40,6 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran

bytes32 public constant RELAYER_ROLE = keccak256('RELAYER_ROLE');

/* keccak256 of the typed-data struct with relayerFee field */
bytes32 private constant _PERMIT_TYPEHASH =
keccak256(
'SchedulePermit(address subscriber,address token,address recipient,'
'address feeAddress,uint128 amount,uint128 feeAmount,uint128 relayerFee,'
'uint32 periodSeconds,uint32 firstPayment,uint8 totalPayments,'
'uint256 nonce,uint256 deadline,bool strictOrder)'
);

bytes32 private constant _LEG_TYPEHASH =
keccak256('Leg(address recipient,uint128 amount,bytes8 paymentReference)');

Expand All @@ -68,22 +60,6 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran

IERC20FeeProxy public erc20FeeProxy;

struct SchedulePermit {
address subscriber;
address token;
address recipient;
address feeAddress;
uint128 amount;
uint128 feeAmount;
uint128 relayerFee;
uint32 periodSeconds;
uint32 firstPayment;
uint8 totalPayments;
uint256 nonce;
uint256 deadline;
bool strictOrder;
}

struct Leg {
address recipient;
uint128 amount;
Expand Down Expand Up @@ -118,16 +94,6 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran
erc20FeeProxy = IERC20FeeProxy(erc20FeeProxyAddress);
}

function _hashSchedule(SchedulePermit calldata p) private view returns (bytes32) {
bytes32 structHash = keccak256(abi.encode(_PERMIT_TYPEHASH, p));

return _hashTypedDataV4(structHash);
}

function hashSchedule(SchedulePermit calldata p) public view returns (bytes32) {
return _hashSchedule(p);
}

function _hashUint32Array(uint32[] calldata values) private pure returns (bytes32) {
bytes32[] memory words = new bytes32[](values.length);
for (uint256 i = 0; i < values.length; ++i) {
Expand Down Expand Up @@ -183,29 +149,6 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran
}
}

function _scheduleKeyFromPermit(SchedulePermit calldata p) private pure returns (bytes32) {
return
keccak256(
abi.encode(
p.subscriber,
p.token,
p.recipient,
p.feeAddress,
p.amount,
p.feeAmount,
p.relayerFee,
p.periodSeconds,
p.firstPayment,
p.totalPayments,
p.strictOrder
)
);
}

function scheduleKeyFromPermit(SchedulePermit calldata p) public pure returns (bytes32) {
return _scheduleKeyFromPermit(p);
}

function _scheduleKeyFromBatch(SchedulePermitBatch calldata p) private pure returns (bytes32) {
if (p.scheduleId == bytes32(0)) revert ERC20RecurringPaymentProxy__ZeroScheduleId();
return
Expand Down Expand Up @@ -297,8 +240,8 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran
IERC20 token,
address from,
uint256 amount
) private {
uint256 balanceBefore = token.balanceOf(address(this));
) private returns (uint256 balanceBefore) {
balanceBefore = token.balanceOf(address(this));
if (!token.safeTransferFrom(from, address(this), amount)) {
revert ERC20RecurringPaymentProxy__TransferFailed();
}
Expand Down Expand Up @@ -371,51 +314,6 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran
}
}

function _proxyTransfer(SchedulePermit calldata p, bytes calldata paymentReference) private {
erc20FeeProxy.transferFromWithReferenceAndFee(
p.token,
p.recipient,
p.amount,
paymentReference,
p.feeAmount,
p.feeAddress
);
}

function triggerRecurringPayment(
SchedulePermit calldata p,
bytes calldata signature,
uint8 index,
bytes calldata paymentReference
) external whenNotPaused onlyRole(RELAYER_ROLE) nonReentrant {
bytes32 digest = _hashSchedule(p);

_assertSigner(p.subscriber, digest, signature);
if (block.timestamp > p.deadline) revert ERC20RecurringPaymentProxy__SignatureExpired();

if (index == 0) revert ERC20RecurringPaymentProxy__IndexOutOfBounds();
if (index > p.totalPayments) revert ERC20RecurringPaymentProxy__IndexOutOfBounds();

bytes32 scheduleKey = _scheduleKeyFromPermit(p);
_assertNotCancelled(scheduleKey);
_assertOrder(scheduleKey, index, p.strictOrder);
_assertUnpaid(scheduleKey, index);

uint256 execTime = uint256(p.firstPayment) + uint256(index - 1) * p.periodSeconds;
if (block.timestamp < execTime) revert ERC20RecurringPaymentProxy__NotDueYet();

_assertNonZeroRecipient(p.feeAddress, p.feeAmount);

uint256 total = p.amount + p.feeAmount + p.relayerFee;

IERC20 token = IERC20(p.token);
_pullExact(token, p.subscriber, total);
_approveFeeProxy(token, erc20FeeProxy, p.amount + p.feeAmount);
_proxyTransfer(p, paymentReference);
_payRelayer(token, p.relayerFee);
_markPaid(scheduleKey, index, p.strictOrder);
}

function triggerRecurringPaymentBatch(
SchedulePermitBatch calldata p,
bytes calldata signature,
Expand Down Expand Up @@ -465,25 +363,17 @@ contract ERC20RecurringPaymentProxy is EIP712, AccessControl, Pausable, Reentran

IERC20 token = IERC20(p.token);
IERC20FeeProxy proxy = erc20FeeProxy;
_pullExact(token, p.subscriber, payerTotal);
uint256 baseline = _pullExact(token, p.subscriber, payerTotal);
_approveFeeProxy(token, proxy, legsSum);
if (useInitial) {
_settleLegs(proxy, p.token, p.initialLegs);
} else {
_settleLegs(proxy, p.token, p.recurringLegs);
}
_payRelayer(token, p.relayerFee);
}

/**
* @notice Blocks further triggers for this single-fee schedule.
* @dev Does not revoke the subscriber's ERC-20 allowance to this contract. A relayer can
* still collect a due cycle if they include a trigger in the same block ahead of
* cancel. Also `approve` this proxy to 0 (or decrease) in the same wallet batch.
*/
function cancelSchedule(SchedulePermit calldata p) external {
_assertSubscriber(p.subscriber);
_cancel(_scheduleKeyFromPermit(p));
if (token.balanceOf(address(this)) != baseline) {
revert ERC20RecurringPaymentProxy__UnexpectedBalance();
}
}

/**
Expand Down
Loading