Commit 3887b4f8 authored by elenadimitrova's avatar elenadimitrova Committed by Kelvin Fichter

Rename iOVM_L1ERC20Bridge to IL1ERC20Bridge

parent 68f5b45f
...@@ -3,9 +3,9 @@ pragma solidity >0.5.0; ...@@ -3,9 +3,9 @@ pragma solidity >0.5.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
/** /**
* @title iOVM_L1ERC20Bridge * @title IL1ERC20Bridge
*/ */
interface iOVM_L1ERC20Bridge { interface IL1ERC20Bridge {
/********** /**********
* Events * * Events *
......
...@@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2; ...@@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2;
/* Interface Imports */ /* Interface Imports */
import { iOVM_L1StandardBridge } from "./iOVM_L1StandardBridge.sol"; import { iOVM_L1StandardBridge } from "./iOVM_L1StandardBridge.sol";
import { iOVM_L1ERC20Bridge } from "./iOVM_L1ERC20Bridge.sol"; import { IL1ERC20Bridge } from "./IL1ERC20Bridge.sol";
import { iOVM_L2ERC20Bridge } from "../../L2/messaging/iOVM_L2ERC20Bridge.sol"; import { iOVM_L2ERC20Bridge } from "../../L2/messaging/iOVM_L2ERC20Bridge.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
...@@ -178,7 +178,7 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled { ...@@ -178,7 +178,7 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled {
} }
/** /**
* @inheritdoc iOVM_L1ERC20Bridge * @inheritdoc IL1ERC20Bridge
*/ */
function depositERC20( function depositERC20(
address _l1Token, address _l1Token,
...@@ -196,7 +196,7 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled { ...@@ -196,7 +196,7 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled {
} }
/** /**
* @inheritdoc iOVM_L1ERC20Bridge * @inheritdoc IL1ERC20Bridge
*/ */
function depositERC20To( function depositERC20To(
address _l1Token, address _l1Token,
...@@ -294,7 +294,7 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled { ...@@ -294,7 +294,7 @@ contract OVM_L1StandardBridge is iOVM_L1StandardBridge, OVM_CrossDomainEnabled {
} }
/** /**
* @inheritdoc iOVM_L1ERC20Bridge * @inheritdoc IL1ERC20Bridge
*/ */
function finalizeERC20Withdrawal( function finalizeERC20Withdrawal(
address _l1Token, address _l1Token,
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
pragma solidity >0.5.0; pragma solidity >0.5.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "./iOVM_L1ERC20Bridge.sol"; import "./IL1ERC20Bridge.sol";
/** /**
* @title iOVM_L1StandardBridge * @title iOVM_L1StandardBridge
*/ */
interface iOVM_L1StandardBridge is iOVM_L1ERC20Bridge { interface iOVM_L1StandardBridge is IL1ERC20Bridge {
/********** /**********
* Events * * Events *
......
...@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2; ...@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
/* Interface Imports */ /* Interface Imports */
import { iOVM_L1StandardBridge } from "../../L1/messaging/iOVM_L1StandardBridge.sol"; import { iOVM_L1StandardBridge } from "../../L1/messaging/iOVM_L1StandardBridge.sol";
import { iOVM_L1ERC20Bridge } from "../../L1/messaging/iOVM_L1ERC20Bridge.sol"; import { IL1ERC20Bridge } from "../../L1/messaging/IL1ERC20Bridge.sol";
import { iOVM_L2ERC20Bridge } from "./iOVM_L2ERC20Bridge.sol"; import { iOVM_L2ERC20Bridge } from "./iOVM_L2ERC20Bridge.sol";
/* Library Imports */ /* Library Imports */
...@@ -142,7 +142,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled { ...@@ -142,7 +142,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
); );
} else { } else {
message = abi.encodeWithSelector( message = abi.encodeWithSelector(
iOVM_L1ERC20Bridge.finalizeERC20Withdrawal.selector, IL1ERC20Bridge.finalizeERC20Withdrawal.selector,
l1Token, l1Token,
_l2Token, _l2Token,
_from, _from,
...@@ -202,7 +202,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled { ...@@ -202,7 +202,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
// There is no way to prevent malicious token contracts altogether, but this does limit // There is no way to prevent malicious token contracts altogether, but this does limit
// user error and mitigate some forms of malicious contract behavior. // user error and mitigate some forms of malicious contract behavior.
bytes memory message = abi.encodeWithSelector( bytes memory message = abi.encodeWithSelector(
iOVM_L1ERC20Bridge.finalizeERC20Withdrawal.selector, IL1ERC20Bridge.finalizeERC20Withdrawal.selector,
_l1Token, _l1Token,
_l2Token, _l2Token,
_to, // switched the _to and _from here to bounce back the deposit to the sender _to, // switched the _to and _from here to bounce back the deposit to the sender
......
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