Commit acf84ae9 authored by Alina's avatar Alina Committed by GitHub

rm nonce check from ovmSETNONCE (#90)

parent 3273df8b
...@@ -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.
......
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