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
acf84ae9
Commit
acf84ae9
authored
Dec 02, 2020
by
Alina
Committed by
GitHub
Dec 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rm nonce check from ovmSETNONCE (#90)
parent
3273df8b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
OVM_ExecutionManager.sol
...ptimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
+6
-10
No files found.
packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
View file @
acf84ae9
...
@@ -410,10 +410,6 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
...
@@ -410,10 +410,6 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
override
override
public
public
{
{
if (_nonce <= ovmGETNONCE()) {
return;
}
_setAccountNonce(ovmADDRESS(), _nonce);
_setAccountNonce(ovmADDRESS(), _nonce);
}
}
...
@@ -745,7 +741,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
...
@@ -745,7 +741,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
)
)
override
override
public
public
{
{
// Since this function is public, anyone can attempt to directly call it. We need to make
// Since this function is public, anyone can attempt to directly call it. We need to make
// sure that the OVM_ExecutionManager itself is the only party that can actually try to
// sure that the OVM_ExecutionManager itself is the only party that can actually try to
// call this function.
// call this function.
...
@@ -896,7 +892,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
...
@@ -896,7 +892,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
)
)
{
{
// EVM precompiles have the same address on L1 and L2 --> no trie lookup neededgit s.
// EVM precompiles have the same address on L1 and L2 --> no trie lookup neededgit s.
address codeContractAddress =
address codeContractAddress =
uint(_contract) < 100
uint(_contract) < 100
? _contract
? _contract
: _getAccountEthAddress(_contract);
: _getAccountEthAddress(_contract);
...
@@ -1009,7 +1005,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
...
@@ -1009,7 +1005,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
);
);
}
}
/******************************************
/******************************************
* Internal Functions: State Manipulation *
* Internal Functions: State Manipulation *
******************************************/
******************************************/
...
@@ -1154,7 +1150,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
...
@@ -1154,7 +1150,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
_checkContractStorageLoad(_contract, _key);
_checkContractStorageLoad(_contract, _key);
return ovmStateManager.getContractStorage(_contract, _key);
return ovmStateManager.getContractStorage(_contract, _key);
}
}
/**
/**
* Sets the value of a storage slot.
* Sets the value of a storage slot.
* @param _contract Address of the contract to modify.
* @param _contract Address of the contract to modify.
...
@@ -1431,7 +1427,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
...
@@ -1431,7 +1427,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
assembly {
assembly {
revert(add(revertdata, 0x20), mload(revertdata))
revert(add(revertdata, 0x20), mload(revertdata))
}
}
}
}
/**
/**
...
@@ -1493,7 +1489,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
...
@@ -1493,7 +1489,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
/************************************
/************************************
* Internal Functions: Gas Metering *
* Internal Functions: Gas Metering *
************************************/
************************************/
/**
/**
* Checks whether a transaction needs to start a new epoch and does so if necessary.
* Checks whether a transaction needs to start a new epoch and does so if necessary.
* @param _timestamp Transaction timestamp.
* @param _timestamp Transaction timestamp.
...
...
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