Skip to content
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

Jump to bottom

fix: relayOrderLib hash() order #8

Merged
merged 1 commit into from
Nov 29, 2023
Merged

fix: relayOrderLib hash() order #8

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
2 changes: 1 addition & 1 deletion .forge-snapshots/RelayOrderReactorIntegrationTest-testExecute.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
301333
303406
2 changes: 1 addition & 1 deletion .forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteWithNativeAsOutput.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
306617
309001
2 changes: 1 addition & 1 deletion .forge-snapshots/RelayOrderReactorIntegrationTest-testPermitAndExecute.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
348870
350945
12 changes: 11 additions & 1 deletion src/lib/RelayOrderLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ library RelayOrderLib {
/// @param order the order to hash
/// @return the eip-712 order hash
function hash(RelayOrder memory order) internal pure returns (bytes32) {
return keccak256(abi.encode(ORDER_TYPE_HASH, order.info.hash(), hash(order.inputs), hash(order.outputs)));
return keccak256(
abi.encode(
ORDER_TYPE_HASH,
order.info.hash(),
order.decayStartTime,
order.decayEndTime,
order.actions,
hash(order.inputs),
hash(order.outputs)
)
);
}
}
Loading