Skip to content

refactor: adopt require-with-custom-error style #30

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

Merged
mfw78 merged 1 commit into from
Jul 31, 2026
Merged

refactor: adopt require-with-custom-error style #30

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
4 changes: 1 addition & 3 deletions src/ERC1271Forwarder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ abstract contract ERC1271Forwarder is ERC1271 {
(GPv2Order.Data memory order, ComposableCow.PayloadStruct memory payload) =
abi.decode(signature, (GPv2Order.Data, ComposableCow.PayloadStruct));
bytes32 domainSeparator = composableCow.domainSeparator();
if (!(GPv2Order.hash(order, domainSeparator) == _hash)) {
revert InvalidHash();
}
require(GPv2Order.hash(order, domainSeparator) == _hash, InvalidHash());

return composableCow.isValidSafeSignature(
Safe(payable(address(this))), // owner
Expand Down
23 changes: 11 additions & 12 deletions src/types/twap/libraries/TWAPOrder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,17 @@ library TWAPOrder {
* @param self The TWAP order to validate
*/
function validate(Data memory self) internal pure {
if (!(self.sellToken != self.buyToken)) revert IConditionalOrder.OrderNotValid(InvalidSameToken.selector);
if (!(address(self.sellToken) != address(0) && address(self.buyToken) != address(0))) {
revert IConditionalOrder.OrderNotValid(InvalidToken.selector);
}
if (!(self.partSellAmount > 0)) revert IConditionalOrder.OrderNotValid(InvalidPartSellAmount.selector);
if (!(self.minPartLimit > 0)) revert IConditionalOrder.OrderNotValid(InvalidMinPartLimit.selector);
if (!(self.t0 < type(uint32).max)) revert IConditionalOrder.OrderNotValid(InvalidStartTime.selector);
if (!(self.n > 1 && self.n <= type(uint32).max)) {
revert IConditionalOrder.OrderNotValid(InvalidNumParts.selector);
}
if (!(self.t > 0 && self.t <= 365 days)) revert IConditionalOrder.OrderNotValid(InvalidFrequency.selector);
if (!(self.span <= self.t)) revert IConditionalOrder.OrderNotValid(InvalidSpan.selector);
require(self.sellToken != self.buyToken, IConditionalOrder.OrderNotValid(InvalidSameToken.selector));
require(
address(self.sellToken) != address(0) && address(self.buyToken) != address(0),
IConditionalOrder.OrderNotValid(InvalidToken.selector)
);
require(self.partSellAmount > 0, IConditionalOrder.OrderNotValid(InvalidPartSellAmount.selector));
require(self.minPartLimit > 0, IConditionalOrder.OrderNotValid(InvalidMinPartLimit.selector));
require(self.t0 < type(uint32).max, IConditionalOrder.OrderNotValid(InvalidStartTime.selector));
require(self.n > 1 && self.n <= type(uint32).max, IConditionalOrder.OrderNotValid(InvalidNumParts.selector));
require(self.t > 0 && self.t <= 365 days, IConditionalOrder.OrderNotValid(InvalidFrequency.selector));
require(self.span <= self.t, IConditionalOrder.OrderNotValid(InvalidSpan.selector));
}

/**
Expand Down