Commit abc2095d authored by Kelvin Fichter's avatar Kelvin Fichter

Fixed indenting

parent 1826d149
...@@ -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;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment