Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
abc2095d
Commit
abc2095d
authored
Sep 20, 2020
by
Kelvin Fichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed indenting
parent
1826d149
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
OVM_ExecutionManager.sol
...ptimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
+18
-18
.iOVM_ExecutionManager.sol.swp
...ic-ethereum/iOVM/execution/.iOVM_ExecutionManager.sol.swp
+0
-0
No files found.
packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
View file @
abc2095d
...
@@ -117,9 +117,9 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
...
@@ -117,9 +117,9 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
return;
return;
}
}
// Store our OVM_StateManager instance (significantly easier than attempting to pass the address
// Store our OVM_StateManager instance (significantly easier than attempting to pass the address
// around in calldata).
// around in calldata).
ovmStateManager = iOVM_StateManager(_ovmStateManager);
ovmStateManager = iOVM_StateManager(_ovmStateManager);
// Run the transaction, make sure to meter the gas usage.
// Run the transaction, make sure to meter the gas usage.
uint256 gasLimit = gasleft();
uint256 gasLimit = gasleft();
...
@@ -133,8 +133,8 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
...
@@ -133,8 +133,8 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
// Update the cumulative gas based on the amount of gas used.
// Update the cumulative gas based on the amount of gas used.
_updateCumulativeGas(gasUsed, _transaction.queueOrigin);
_updateCumulativeGas(gasUsed, _transaction.queueOrigin);
// Wipe the execution context.
// Wipe the execution context.
_resetContext();
_resetContext();
}
}
...
@@ -747,8 +747,8 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
...
@@ -747,8 +747,8 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
// We're stepping into a CREATE or CREATE2, so we need to update ADDRESS to point
// We're stepping into a CREATE or CREATE2, so we need to update ADDRESS to point
// to the contract's associated address and CALLER to point to the previous ADDRESS.
// to the contract's associated address and CALLER to point to the previous ADDRESS.
MessageContext memory nextMessageContext = messageContext;
MessageContext memory nextMessageContext = messageContext;
nextMessageContext.ovmCALLER = messageContext.ovmADDRESS;
nextMessageContext.ovmCALLER = messageContext.ovmADDRESS;
nextMessageContext.ovmADDRESS = _contractAddress;
nextMessageContext.ovmADDRESS = _contractAddress;
// Run `safeCREATE` in a new EVM message so that our changes can be reflected even if
// Run `safeCREATE` in a new EVM message so that our changes can be reflected even if
// `safeCREATE` reverts.
// `safeCREATE` reverts.
...
@@ -1533,20 +1533,20 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
...
@@ -1533,20 +1533,20 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager {
function _resetContext()
function _resetContext()
internal
internal
{
{
transactionContext.ovmORIGIN = address(0);
transactionContext.ovmORIGIN = address(0);
transactionContext.ovmTIMESTAMP = 0;
transactionContext.ovmTIMESTAMP = 0;
transactionContext.ovmGASLIMIT = 0;
transactionContext.ovmGASLIMIT = 0;
transactionContext.ovmTXGASLIMIT = 0;
transactionContext.ovmTXGASLIMIT = 0;
transactionContext.ovmQUEUEORIGIN = 0;
transactionContext.ovmQUEUEORIGIN = 0;
transactionRecord.ovmGasRefund = 0;
transactionRecord.ovmGasRefund = 0;
messageContext.ovmCALLER = address(0);
messageContext.ovmCALLER = address(0);
messageContext.ovmADDRESS = address(0);
messageContext.ovmADDRESS = address(0);
messageContext.isStatic = false;
messageContext.isStatic = false;
messageRecord.nuisanceGasLeft = 0;
messageRecord.nuisanceGasLeft = 0;
messageRecord.revertFlag = RevertFlag.DID_NOT_REVERT;
messageRecord.revertFlag = RevertFlag.DID_NOT_REVERT;
}
}
/**
/**
...
...
packages/contracts/contracts/optimistic-ethereum/iOVM/execution/.iOVM_ExecutionManager.sol.swp
deleted
100644 → 0
View file @
1826d149
File deleted
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment