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
3887b4f8
Unverified
Commit
3887b4f8
authored
Sep 13, 2021
by
elenadimitrova
Committed by
Kelvin Fichter
Nov 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename iOVM_L1ERC20Bridge to IL1ERC20Bridge
parent
68f5b45f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
IL1ERC20Bridge.sol
packages/contracts/contracts/L1/messaging/IL1ERC20Bridge.sol
+2
-2
OVM_L1StandardBridge.sol
...contracts/contracts/L1/messaging/OVM_L1StandardBridge.sol
+4
-4
iOVM_L1StandardBridge.sol
...ontracts/contracts/L1/messaging/iOVM_L1StandardBridge.sol
+2
-2
OVM_L2StandardBridge.sol
...contracts/contracts/L2/messaging/OVM_L2StandardBridge.sol
+3
-3
No files found.
packages/contracts/contracts/L1/messaging/
iOVM_
L1ERC20Bridge.sol
→
packages/contracts/contracts/L1/messaging/
I
L1ERC20Bridge.sol
View file @
3887b4f8
...
@@ -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
I
L1ERC20Bridge
*/
*/
interface
iOVM_
L1ERC20Bridge {
interface
I
L1ERC20Bridge {
/**********
/**********
* Events *
* Events *
...
...
packages/contracts/contracts/L1/messaging/OVM_L1StandardBridge.sol
View file @
3887b4f8
...
@@ -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 "./I
L1ERC20Bridge.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
I
L1ERC20Bridge
*/
*/
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
I
L1ERC20Bridge
*/
*/
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
I
L1ERC20Bridge
*/
*/
function finalizeERC20Withdrawal(
function finalizeERC20Withdrawal(
address _l1Token,
address _l1Token,
...
...
packages/contracts/contracts/L1/messaging/iOVM_L1StandardBridge.sol
View file @
3887b4f8
...
@@ -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 "./
I
L1ERC20Bridge.sol";
/**
/**
* @title iOVM_L1StandardBridge
* @title iOVM_L1StandardBridge
*/
*/
interface iOVM_L1StandardBridge is
iOVM_
L1ERC20Bridge {
interface iOVM_L1StandardBridge is
I
L1ERC20Bridge {
/**********
/**********
* Events *
* Events *
...
...
packages/contracts/contracts/L2/messaging/OVM_L2StandardBridge.sol
View file @
3887b4f8
...
@@ -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/I
L1ERC20Bridge.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,
I
L1ERC20Bridge.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,
I
L1ERC20Bridge.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
...
...
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