Skip to content

Add magic salt to skip invalidation #32

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add magic salt to skip invalidation #32

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e123dd9
Add magic salt to skip invalidation and allow only transferFrom selector
k06a Jun 18, 2021
96ef7a9
Merge branch 'master' into feature/magic-salt-and-single-selector
ZumZoom Sep 27, 2021
9de208c
wip
ZumZoom Sep 27, 2021
ca56ac5
Merge branch 'master' into feature/magic-salt-and-single-selector
ZumZoom Sep 27, 2021
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
15 changes: 12 additions & 3 deletions contracts/LimitOrderProtocol.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ contract LimitOrderProtocol is
"OrderRFQ(uint256 info,address makerAsset,address takerAsset,bytes makerAssetData,bytes takerAssetData)"
);

uint256 constant public MAGIC_SALT_SKIPPING_INVALIDATION = 0xDEF1DEF1;

uint256 constant private _FROM_INDEX = 0;
uint256 constant private _TO_INDEX = 1;
uint256 constant private _AMOUNT_INDEX = 2;
Expand Down Expand Up @@ -198,7 +200,7 @@ contract LimitOrderProtocol is
uint256 expiration = uint128(order.info) >> 64;
require(expiration == 0 || block.timestamp <= expiration, "LOP: order expired"); // solhint-disable-line not-rely-on-time

{ // Stack too deep
if (uint64(order.info) != MAGIC_SALT_SKIPPING_INVALIDATION) {
// Validate double spend
address maker = order.makerAssetData.decodeAddress(_FROM_INDEX);
uint256 invalidatorSlot = uint64(order.info) >> 8;
Expand Down Expand Up @@ -283,7 +285,7 @@ contract LimitOrderProtocol is

{ // Stack too deep
uint256 remainingMakerAmount;
{ // Stack too deep
if (uint64(order.salt) != MAGIC_SALT_SKIPPING_INVALIDATION) {
bool orderExists;
(orderExists, remainingMakerAmount) = _remaining[orderHash].trySub(1);
if (!orderExists) {
Expand All @@ -296,6 +298,9 @@ contract LimitOrderProtocol is
}
}
}
else {
remainingMakerAmount = order.makerAssetData.decodeUint256(_AMOUNT_INDEX);
}

// Check if order is valid
if (order.predicate.length > 0) {
Expand Down Expand Up @@ -327,7 +332,11 @@ contract LimitOrderProtocol is
// Update remaining amount in storage
unchecked {
remainingMakerAmount = remainingMakerAmount - makingAmount;
_remaining[orderHash] = remainingMakerAmount + 1;
}
if (uint64(order.salt) != MAGIC_SALT_SKIPPING_INVALIDATION) {
unchecked {
_remaining[orderHash] = remainingMakerAmount + 1;
}
}
emit OrderFilled(msg.sender, orderHash, remainingMakerAmount);
}
Expand Down