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

Implement pre- and post-interactions in assembly #212

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement pre- and post-interactions in assembly #212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04f79ce
Implement pre- and post-interactions in assembly
k06a Feb 15, 2023
0903b79
Merge branch 'develop' into feature/assembly-interactions
ZumZoom Feb 21, 2023
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
76 changes: 39 additions & 37 deletions contracts/OrderMixin.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,25 +305,26 @@ abstract contract OrderMixin is IOrderMixin, EIP712, OnlyWethReceiver, Predicate
listener = address(bytes20(data));
data = data[20:];
}
IPreInteraction(listener).preInteraction(
order, orderHash, msg.sender, makingAmount, takingAmount, data
);
// TODO: implement in assembly
// bytes4 selector = IPreInteraction.preInteraction.selector;

// IPreInteraction(listener).preInteraction(order, orderHash, msg.sender, makingAmount, takingAmount, data);
bytes4 selector = IPreInteraction.preInteraction.selector;
/// @solidity memory-safe-assembly
// assembly { // solhint-disable-line no-inline-assembly
// let ptr := mload(0x40)
// mstore(ptr, selector)
// calldatacopy(add(ptr, 4), order, 0xe0) // 7 * 0x20
// mstore(add(ptr, 0xe4), orderHash)
// mstore(add(ptr, 0x104), caller())
// mstore(add(ptr, 0x124), makingAmount)
// mstore(add(ptr, 0x144), takingAmount)
// if iszero(call(gas(), shr(96, calldataload(extension)), 0, ptr, 0x164, 0, 0)) {
// returndatacopy(ptr, 0, returndatasize())
// revert(ptr, returndatasize())
// }
// }
assembly { // solhint-disable-line no-inline-assembly
let ptr := mload(0x40)
mstore(ptr, selector)
calldatacopy(add(ptr, 4), order, 0xe0) // 7 * 0x20
mstore(add(ptr, 0xe4), orderHash)
mstore(add(ptr, 0x104), caller())
mstore(add(ptr, 0x124), makingAmount)
mstore(add(ptr, 0x144), takingAmount)
mstore(add(ptr, 0x164), 0x180)
mstore(add(ptr, 0x184), data.length)
calldatacopy(add(ptr, 0x1a4), data.offset, data.length)
if iszero(call(gas(), listener, 0, ptr, add(0x1a4, data.length), 0, 0)) {
returndatacopy(ptr, 0, returndatasize())
revert(ptr, returndatasize())
}
}
}

// Maker => Taker
Expand Down Expand Up @@ -384,25 +385,26 @@ abstract contract OrderMixin is IOrderMixin, EIP712, OnlyWethReceiver, Predicate
listener = address(bytes20(data));
data = data[20:];
}
IPostInteraction(listener).postInteraction(
order, orderHash, msg.sender, makingAmount, takingAmount, data
);
// TODO: implement in assembly
// bytes4 selector = IPostInteraction.postInteraction.selector;
// /// @solidity memory-safe-assembly
// assembly { // solhint-disable-line no-inline-assembly
// let ptr := mload(0x40)
// mstore(ptr, selector)
// calldatacopy(add(ptr, 4), order, 0xe0) // 7 * 0x20
// mstore(add(ptr, 0xe4), orderHash)
// mstore(add(ptr, 0x104), caller())
// mstore(add(ptr, 0x124), makingAmount)
// mstore(add(ptr, 0x144), takingAmount)
// if iszero(call(gas(), shr(96, calldataload(extension)), 0, ptr, 0x164, 0, 0)) {
// returndatacopy(ptr, 0, returndatasize())
// revert(ptr, returndatasize())
// }
// }

// IPostInteraction(listener).postInteraction(order, orderHash, msg.sender, makingAmount, takingAmount, data);
bytes4 selector = IPostInteraction.postInteraction.selector;
/// @solidity memory-safe-assembly
assembly { // solhint-disable-line no-inline-assembly
let ptr := mload(0x40)
mstore(ptr, selector)
calldatacopy(add(ptr, 4), order, 0xe0) // 7 * 0x20
mstore(add(ptr, 0xe4), orderHash)
mstore(add(ptr, 0x104), caller())
mstore(add(ptr, 0x124), makingAmount)
mstore(add(ptr, 0x144), takingAmount)
mstore(add(ptr, 0x164), 0x180)
mstore(add(ptr, 0x184), data.length)
calldatacopy(add(ptr, 0x1a4), data.offset, data.length)
if iszero(call(gas(), listener, 0, ptr, add(0x1a4, data.length), 0, 0)) {
returndatacopy(ptr, 0, returndatasize())
revert(ptr, returndatasize())
}
}
}

emit OrderFilled(orderHash, makingAmount);
Expand Down