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

Remove ExecutionManager#executeTransactionRaw #70

Merged
merged 6 commits into from
Apr 7, 2020
Merged

Remove ExecutionManager#executeTransactionRaw #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0e8e39
Add executeTransaction and executePersistedTransaction helpers
masonforest Apr 2, 2020
1af8a30
Pass more tests
masonforest Apr 2, 2020
790d140
Pass all call-opcodes tests
masonforest Apr 2, 2020
8a31147
Pass "Context opcodes" tests
masonforest Apr 6, 2020
9f7ae82
Fix last failing test and lint
masonforest Apr 6, 2020
b268886
Remove unused
masonforest Apr 6, 2020
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
46 changes: 0 additions & 46 deletions packages/ovm/src/contracts/ExecutionManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,52 +104,6 @@ contract ExecutionManager is FullStateManager {
incrementOvmContractNonce(addr);
}

/**
* @notice Execute a transaction which will return the result of the call instead of the updated storage.
* Note: This should only be used with a Web3 `call` operation, otherwise you may accidentally save changes to the state.
* Note: This is a raw function, so there are no listed (ABI-encoded) inputs / outputs.
* Below format of the bytes expected as input and written as output:
* calldata: variable-length bytes:
* [methodID (bytes4)]
* [timestamp (uint)]
* [queueOrigin (uint)]
* [ovmEntrypointAddress (address as bytes32 (left-padded, big-endian))]
* [callBytes (bytes (variable length))]
* returndata: [variable-length bytes returned from call]
*/
function executeTransactionRaw() external {
uint _timestamp;
uint _queueOrigin;
uint _callSize;
bytes memory callBytes;
address _ovmEntrypoint;
assembly {
// populate timestamp and queue origin from calldata
_timestamp := calldataload(0x04)
// skip method ID (bytes4) and timestamp (bytes32)
_queueOrigin := calldataload(0x24)

callBytes := mload(0x40)
// set callsize: total param size minus 2 uints (methodId bytes are repurposed)
_callSize := sub(calldatasize, 0x40)
mstore(0x40, add(callBytes, _callSize))

_ovmEntrypoint := calldataload(0x44)
calldatacopy(add(callBytes, 0x20), 0x64, sub(_callSize, 0x04))
mstore(callBytes, sub(_callSize, 0x20))
}

return executeTransaction(
_timestamp,
_queueOrigin,
_ovmEntrypoint,
callBytes,
ZERO_ADDRESS,
ZERO_ADDRESS,
true
);
}

/********************
* Execute EOA Calls *
********************/
Expand Down
Loading