Skip to content

N
nebula
Commit 99a9ab1f authored by elenadimitrova's avatar elenadimitrova Committed by Kelvin Fichter
Browse files
Options

Remove the keyword override from interface implementations

parent f8f85124
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 61 deletions
packages/contracts/contracts/L1/messaging/L1CrossDomainMessenger.sol
View file @ 99a9ab1f
......@@ -162,7 +162,6 @@ contract L1CrossDomainMessenger is
function xDomainMessageSender()
public
override
view
returns (
address
......@@ -183,7 +182,6 @@ contract L1CrossDomainMessenger is
bytes memory _message,
uint32 _gasLimit
)
override
public
{
address ovmCanonicalTransactionChain = resolve("CanonicalTransactionChain");
......@@ -218,7 +216,6 @@ contract L1CrossDomainMessenger is
uint256 _messageNonce,
L2MessageInclusionProof memory _proof
)
override
public
nonReentrant
onlyRelayer
......@@ -292,7 +289,6 @@ contract L1CrossDomainMessenger is
uint256 _queueIndex,
uint32 _gasLimit
)
override
public
{
// Verify that the message is in the queue:
......
packages/contracts/contracts/L1/messaging/L1StandardBridge.sol
View file @ 99a9ab1f
......@@ -28,7 +28,7 @@ contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
* External Contract References *
********************************/
address public override l2TokenBridge;
address public l2TokenBridge;
// Maps L1 token to L2 token to balance of the L1 token deposited
mapping(address => mapping (address => uint256)) public deposits;
......@@ -101,7 +101,6 @@ contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
payable
onlyEOA()
{
......@@ -122,7 +121,6 @@ contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
payable
{
_initiateETHDeposit(
......@@ -184,7 +182,6 @@ contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
virtual
onlyEOA()
{
......@@ -203,7 +200,6 @@ contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
virtual
{
_initiateERC20Deposit(_l1Token, _l2Token, msg.sender, _to, _amount, _l2Gas, _data);
......@@ -280,7 +276,6 @@ contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
onlyFromCrossDomainAccount(l2TokenBridge)
{
(bool success, ) = _to.call{value: _amount}(new bytes(0));
......@@ -301,7 +296,6 @@ contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
onlyFromCrossDomainAccount(l2TokenBridge)
{
deposits[_l1Token][_l2Token] = deposits[_l1Token][_l2Token] - _amount;
......
packages/contracts/contracts/L1/rollup/CanonicalTransactionChain.sol
View file @ 99a9ab1f
......@@ -87,7 +87,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return Reference to the batch storage container.
*/
function batches()
override
public
view
returns (
......@@ -104,7 +103,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return Reference to the queue storage container.
*/
function queue()
override
public
view
returns (
......@@ -121,7 +119,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return _totalElements Total submitted elements.
*/
function getTotalElements()
override
public
view
returns (
......@@ -137,7 +134,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return _totalBatches Total submitted batches.
*/
function getTotalBatches()
override
public
view
returns (
......@@ -152,7 +148,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return Index for the next queue element.
*/
function getNextQueueIndex()
override
public
view
returns (
......@@ -168,7 +163,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return Timestamp for the last transaction.
*/
function getLastTimestamp()
override
public
view
returns (
......@@ -184,7 +178,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return Blocknumber for the last transaction.
*/
function getLastBlockNumber()
override
public
view
returns (
......@@ -203,7 +196,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
function getQueueElement(
uint256 _index
)
override
public
view
returns (
......@@ -221,7 +213,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return Number of pending queue elements.
*/
function getNumPendingQueueElements()
override
public
view
returns (
......@@ -237,7 +228,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* @return Length of the queue.
*/
function getQueueLength()
override
public
view
returns (
......@@ -260,7 +250,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
uint256 _gasLimit,
bytes memory _data
)
override
public
{
require(
......@@ -343,7 +332,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
function appendQueueBatch(
uint256 // _numQueuedTransactions
)
override
public
pure
{
......@@ -399,7 +387,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
* .param _transactionDataFields Array of raw transaction data.
*/
function appendSequencerBatch()
override
public
{
uint40 shouldStartAtElement;
......@@ -553,7 +540,6 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
Lib_OVMCodec.ChainBatchHeader memory _batchHeader,
Lib_OVMCodec.ChainInclusionProof memory _inclusionProof
)
override
public
view
returns (
......
packages/contracts/contracts/L1/rollup/ChainStorageContainer.sol
View file @ 99a9ab1f
......@@ -79,7 +79,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
function setGlobalMetadata(
bytes27 _globalMetadata
)
override
public
onlyOwner
{
......@@ -90,7 +89,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
* @inheritdoc IChainStorageContainer
*/
function getGlobalMetadata()
override
public
view
returns (
......@@ -104,7 +102,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
* @inheritdoc IChainStorageContainer
*/
function length()
override
public
view
returns (
......@@ -120,7 +117,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
function push(
bytes32 _object
)
override
public
onlyOwner
{
......@@ -134,7 +130,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
bytes32 _object,
bytes27 _globalMetadata
)
override
public
onlyOwner
{
......@@ -147,7 +142,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
function get(
uint256 _index
)
override
public
view
returns (
......@@ -163,7 +157,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
function deleteElementsAfterInclusive(
uint256 _index
)
override
public
onlyOwner
{
......@@ -179,7 +172,6 @@ contract ChainStorageContainer is IChainStorageContainer, Lib_AddressResolver {
uint256 _index,
bytes27 _globalMetadata
)
override
public
onlyOwner
{
......
packages/contracts/contracts/L1/rollup/StateCommitmentChain.sol
View file @ 99a9ab1f
......@@ -74,7 +74,6 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
* @inheritdoc IStateCommitmentChain
*/
function getTotalElements()
override
public
view
returns (
......@@ -89,7 +88,6 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
* @inheritdoc IStateCommitmentChain
*/
function getTotalBatches()
override
public
view
returns (
......@@ -103,7 +101,6 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
* @inheritdoc IStateCommitmentChain
*/
function getLastSequencerTimestamp()
override
public
view
returns (
......@@ -121,7 +118,6 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
bytes32[] memory _batch,
uint256 _shouldStartAtElement
)
override
public
{
// Fail fast in to make sure our batch roots aren't accidentally made fraudulent by the
......@@ -163,7 +159,6 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
function deleteStateBatch(
Lib_OVMCodec.ChainBatchHeader memory _batchHeader
)
override
public
{
require(
......@@ -192,7 +187,6 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
Lib_OVMCodec.ChainBatchHeader memory _batchHeader,
Lib_OVMCodec.ChainInclusionProof memory _proof
)
override
public
view
returns (
......@@ -224,7 +218,6 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
function insideFraudProofWindow(
Lib_OVMCodec.ChainBatchHeader memory _batchHeader
)
override
public
view
returns (
......
packages/contracts/contracts/L1/verification/BondManager.sol
View file @ 99a9ab1f
......@@ -28,7 +28,6 @@ contract BondManager is IBondManager, Lib_AddressResolver {
address _who,
uint256 _gasSpent
)
override
public
{}
......@@ -37,36 +36,30 @@ contract BondManager is IBondManager, Lib_AddressResolver {
address _publisher,
uint256 _timestamp
)
override
public
{}
function deposit()
override
public
{}
function startWithdrawal()
override
public
{}
function finalizeWithdrawal()
override
public
{}
function claim(
address _who
)
override
public
{}
function isCollateralized(
address _who
)
override
public
view
returns (
......@@ -81,7 +74,6 @@ contract BondManager is IBondManager, Lib_AddressResolver {
bytes32 _preStateRoot,
address _who
)
override
public
pure
returns (
......
packages/contracts/contracts/L2/messaging/L2CrossDomainMessenger.sol
View file @ 99a9ab1f
......@@ -54,7 +54,6 @@ contract L2CrossDomainMessenger is
function xDomainMessageSender()
public
override
view
returns (
address
......@@ -75,7 +74,6 @@ contract L2CrossDomainMessenger is
bytes memory _message,
uint32 _gasLimit
)
override
public
{
bytes memory xDomainCalldata = Lib_CrossDomainUtils.encodeXDomainCalldata(
......@@ -103,7 +101,6 @@ contract L2CrossDomainMessenger is
bytes memory _message,
uint256 _messageNonce
)
override
nonReentrant
public
{
......
packages/contracts/contracts/L2/messaging/L2StandardBridge.sol
View file @ 99a9ab1f
......@@ -29,7 +29,7 @@ contract L2StandardBridge is IL2ERC20Bridge, CrossDomainEnabled {
* External Contract References *
********************************/
address public override l1TokenBridge;
address public l1TokenBridge;
/***************
* Constructor *
......@@ -62,7 +62,6 @@ contract L2StandardBridge is IL2ERC20Bridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
virtual
{
_initiateWithdrawal(
......@@ -86,7 +85,6 @@ contract L2StandardBridge is IL2ERC20Bridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
virtual
{
_initiateWithdrawal(
......@@ -175,7 +173,6 @@ contract L2StandardBridge is IL2ERC20Bridge, CrossDomainEnabled {
bytes calldata _data
)
external
override
virtual
onlyFromCrossDomainAccount(l1TokenBridge)
{
......
packages/contracts/contracts/L2/predeploys/OVM_L2ToL1MessagePasser.sol
View file @ 99a9ab1f
......@@ -30,7 +30,6 @@ contract OVM_L2ToL1MessagePasser is iOVM_L2ToL1MessagePasser {
function passMessageToL1(
bytes memory _message
)
override
public
{
// Note: although this function is public, only messages sent from the
......
packages/contracts/contracts/libraries/bridge/CrossDomainEnabled.sol
View file @ 99a9ab1f
......@@ -80,7 +80,7 @@ contract CrossDomainEnabled {
return ICrossDomainMessenger(messenger);
}
/**
/**q
* Sends a message to an account on another domain
* @param _crossDomainTarget The intended recipient on the destination domain
* @param _message The data to send to the target (usually calldata to a function with
......
packages/contracts/contracts/libraries/standards/L2StandardERC20.sol
View file @ 99a9ab1f
......@@ -6,7 +6,7 @@ import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import "./IL2StandardERC20.sol";
contract L2StandardERC20 is IL2StandardERC20, ERC20 {
address public override l1Token;
address public l1Token;
address public l2Bridge;
/**
......@@ -31,7 +31,7 @@ contract L2StandardERC20 is IL2StandardERC20, ERC20 {
_;
}
function supportsInterface(bytes4 _interfaceId) public override pure returns (bool) {
function supportsInterface(bytes4 _interfaceId) public pure returns (bool) {
bytes4 firstSupportedInterface = bytes4(keccak256("supportsInterface(bytes4)")); // ERC165
bytes4 secondSupportedInterface = IL2StandardERC20.l1Token.selector
^ IL2StandardERC20.mint.selector
......@@ -39,13 +39,13 @@ contract L2StandardERC20 is IL2StandardERC20, ERC20 {
return _interfaceId == firstSupportedInterface || _interfaceId == secondSupportedInterface;
}
function mint(address _to, uint256 _amount) public virtual override onlyL2Bridge {
function mint(address _to, uint256 _amount) public virtual onlyL2Bridge {
_mint(_to, _amount);
emit Mint(_to, _amount);
}
function burn(address _from, uint256 _amount) public virtual override onlyL2Bridge {
function burn(address _from, uint256 _amount) public virtual onlyL2Bridge {
_burn(_from, _amount);
emit Burn(_from, _amount);
......
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