Commit a6ba9be8 authored by elenadimitrova's avatar elenadimitrova

Review fixes

parent cf2c832c
...@@ -214,7 +214,8 @@ contract OVM_L1CrossDomainMessenger is ...@@ -214,7 +214,8 @@ contract OVM_L1CrossDomainMessenger is
ovmCanonicalTransactionChain, ovmCanonicalTransactionChain,
l2CrossDomainMessenger, l2CrossDomainMessenger,
xDomainCalldata, xDomainCalldata,
_gasLimit); _gasLimit
);
emit SentMessage(xDomainCalldata); emit SentMessage(xDomainCalldata);
} }
...@@ -338,7 +339,8 @@ contract OVM_L1CrossDomainMessenger is ...@@ -338,7 +339,8 @@ contract OVM_L1CrossDomainMessenger is
canonicalTransactionChain, canonicalTransactionChain,
l2CrossDomainMessenger, l2CrossDomainMessenger,
xDomainCalldata, xDomainCalldata,
_gasLimit); _gasLimit
);
} }
......
...@@ -70,8 +70,9 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled { ...@@ -70,8 +70,9 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled {
* Depositing * * Depositing *
**************/ **************/
/// @dev Modifier requiring sender to be EOA. This check could be bypassed by a malicious /** @dev Modifier requiring sender to be EOA. This check could be bypassed by a malicious
// contract via initcode, but it takes care of the user error we want to avoid. * contract via initcode, but it takes care of the user error we want to avoid.
*/
modifier onlyEOA() { modifier onlyEOA() {
// Used to stop deposits from contracts (avoid accidentally lost tokens) // Used to stop deposits from contracts (avoid accidentally lost tokens)
require(!Address.isContract(msg.sender), "Account not EOA"); require(!Address.isContract(msg.sender), "Account not EOA");
......
...@@ -346,6 +346,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad ...@@ -346,6 +346,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
// TEMPORARY: Disable `appendQueueBatch` for minnet // TEMPORARY: Disable `appendQueueBatch` for minnet
revert("appendQueueBatch is currently disabled."); revert("appendQueueBatch is currently disabled.");
// solhint-disable max-line-length
// _numQueuedTransactions = Math.min(_numQueuedTransactions, getNumPendingQueueElements()); // _numQueuedTransactions = Math.min(_numQueuedTransactions, getNumPendingQueueElements());
// require( // require(
// _numQueuedTransactions > 0, // _numQueuedTransactions > 0,
...@@ -360,7 +361,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad ...@@ -360,7 +361,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
// Lib_OVMCodec.QueueElement memory el = getQueueElement(nextQueueIndex); // Lib_OVMCodec.QueueElement memory el = getQueueElement(nextQueueIndex);
// require( // require(
// el.timestamp + forceInclusionPeriodSeconds < block.timestamp, // el.timestamp + forceInclusionPeriodSeconds < block.timestamp,
// "Queue transactions cannot be submitted during the sequencer inclusion period." // "Queue transactions cannot be submitted during the sequencer inclusion period."
// ); // );
// } // }
// leaves[i] = _getQueueLeafHash(nextQueueIndex); // leaves[i] = _getQueueLeafHash(nextQueueIndex);
...@@ -382,6 +383,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad ...@@ -382,6 +383,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
// _numQueuedTransactions, // _numQueuedTransactions,
// getTotalElements() // getTotalElements()
// ); // );
// solhint-enable max-line-length
} }
/** /**
......
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