-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
[WIP] batch transactions #82
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,6 +42,7 @@ import "@openzeppelin/contracts/utils/Create2.sol"; | |
|
||
import "./lib/Entitlements.sol"; | ||
import "./lib/BeaconSalts.sol"; | ||
import "./lib/Exec.sol"; | ||
|
||
import "./interfaces/IHookERC721VaultFactory.sol"; | ||
import "./interfaces/IHookVault.sol"; | ||
|
@@ -52,6 +53,8 @@ import "./interfaces/IWETH.sol"; | |
|
||
import "./mixin/PermissionConstants.sol"; | ||
import "./mixin/HookInstrumentERC721.sol"; | ||
import "forge-std/Test.sol"; | ||
|
||
|
||
/// @title HookCoveredCallImplV1 an implementation of covered calls on Hook | ||
/// @author Jake [email protected] | ||
|
@@ -64,7 +67,9 @@ contract HookCoveredCallImplV1 is | |
HookInstrumentERC721, | ||
ReentrancyGuard, | ||
Initializable, | ||
PermissionConstants | ||
PermissionConstants, | ||
BatchUtil, | ||
Test | ||
{ | ||
using Counters for Counters.Counter; | ||
|
||
|
@@ -139,6 +144,8 @@ contract HookCoveredCallImplV1 is | |
/// financial situation for the holder of the options. | ||
bool public marketPaused; | ||
|
||
address public execAddr; | ||
|
||
/// @dev Emitted when the market is paused or unpaused | ||
/// @param paused true if paused false otherwise | ||
event MarketPauseUpdated(bool paused); | ||
|
@@ -192,6 +199,9 @@ contract HookCoveredCallImplV1 is | |
} | ||
|
||
/// ---- Option Writer Functions ---- // | ||
function setExec(address _execAddr) public { | ||
execAddr = _execAddr; | ||
} | ||
|
||
/// @dev See {IHookCoveredCall-mintWithVault}. | ||
function mintWithVault( | ||
|
@@ -292,16 +302,23 @@ contract HookCoveredCallImplV1 is | |
uint128 strikePrice, | ||
uint32 expirationTime | ||
) external nonReentrant whenNotPaused returns (uint256) { | ||
address msgSender = msg.sender; | ||
emit log_named_address("msg.sender", msgSender); | ||
if (msg.sender == execAddr) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this should be a modifier, that way we can always just use the msgSender variable. Or an alternative would be a library or internal function somehow, and we chang all other usages to msgSender (which falls back to msg.Sender if not the trusted proxy address) |
||
msgSender = unpackTrailingParamMsgSender(); | ||
emit log_named_address("msgSender", msgSender); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should cut these logs? |
||
} | ||
|
||
address tokenOwner = IERC721(tokenAddress).ownerOf(tokenId); | ||
require( | ||
allowedUnderlyingAddress == tokenAddress, | ||
"mWE7-token not on allowlist" | ||
); | ||
|
||
require( | ||
msg.sender == tokenOwner || | ||
IERC721(tokenAddress).isApprovedForAll(tokenOwner, msg.sender) || | ||
IERC721(tokenAddress).getApproved(tokenId) == msg.sender, | ||
msgSender == tokenOwner || | ||
IERC721(tokenAddress).isApprovedForAll(tokenOwner, msgSender) || | ||
IERC721(tokenAddress).getApproved(tokenId) == msgSender, | ||
"mWE7-caller not owner or operator" | ||
); | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// SPDX-License-Identifier: UNLICENSED | ||
pragma solidity ^0.8.10; | ||
|
||
contract Exec { | ||
struct Operation { | ||
address dest; | ||
bytes data; | ||
} | ||
|
||
function batch(Operation[] calldata operations) external returns (bytes memory) { | ||
for (uint256 i = 0; i < operations.length; ++i) { | ||
Operation calldata operation = operations[i]; | ||
address destAddr = operation.dest; | ||
bytes memory dataWithSender = abi.encodePacked(operation.data, msg.sender); | ||
(bool success, bytes memory result) = destAddr.call(dataWithSender); | ||
require(success, "Delegate call failed"); | ||
return result; | ||
} | ||
} | ||
} | ||
|
||
contract BatchUtil { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can be a library? perhaps should also be in a different file? |
||
function unpackTrailingParamMsgSender() internal pure returns (address msgSender) { | ||
assembly { | ||
msgSender := shr(96, calldataload(sub(calldatasize(), 20))) | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,7 @@ import "../../HookProtocol.sol"; | |
|
||
import "../../lib/Entitlements.sol"; | ||
import "../../lib/Signatures.sol"; | ||
import "../../lib/Exec.sol"; | ||
import "../../mixin/EIP712.sol"; | ||
import "../../mixin/PermissionConstants.sol"; | ||
|
||
|
@@ -44,6 +45,7 @@ contract HookProtocolTest is Test, EIP712, PermissionConstants { | |
uint256 internal optionTokenId; | ||
address internal preApprovedOperator; | ||
HookERC721VaultFactory vaultFactory; | ||
Exec exec; | ||
|
||
event CallCreated( | ||
address writer, | ||
|
@@ -82,6 +84,7 @@ contract HookProtocolTest is Test, EIP712, PermissionConstants { | |
} | ||
|
||
function setUpFullProtocol() public { | ||
exec = new Exec(); | ||
weth = new WETH(); | ||
protocol = new HookProtocol( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. does it make sense to have |
||
admin, | ||
|
@@ -141,6 +144,9 @@ contract HookProtocolTest is Test, EIP712, PermissionConstants { | |
// make a call insturment for our token | ||
calls = IHookCoveredCall(callFactory.makeCallInstrument(address(token))); | ||
callInternal = HookCoveredCallImplV1(address(calls)); | ||
|
||
// set exec for call instrument | ||
callInternal.setExec(address(exec)); | ||
} | ||
|
||
function setUpMintOption() public { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are there functions within here, like on the OZ contracts, that pay attention to msg.Sender... do we need to update them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems likely that we want to allow only a fixed set of
external
functions call with msg.sender, but perhaps there are some like safeTransferFrom where that is not the case?