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
c627cc85
Unverified
Commit
c627cc85
authored
Sep 14, 2021
by
elenadimitrova
Committed by
Kelvin Fichter
Nov 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename iOVM_L2ERC20Bridge.sol to IL2ERC20Bridge
parent
858b3dfc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
L1StandardBridge.sol
...ges/contracts/contracts/L1/messaging/L1StandardBridge.sol
+3
-3
IL2ERC20Bridge.sol
packages/contracts/contracts/L2/messaging/IL2ERC20Bridge.sol
+2
-2
OVM_L2StandardBridge.sol
...contracts/contracts/L2/messaging/OVM_L2StandardBridge.sol
+5
-5
L1StandardBridge.spec.ts
...acts/test/contracts/L1/messaging/L1StandardBridge.spec.ts
+1
-1
OVM_L2StandardBridge.spec.ts
.../test/contracts/L2/messaging/OVM_L2StandardBridge.spec.ts
+1
-1
No files found.
packages/contracts/contracts/L1/messaging/L1StandardBridge.sol
View file @
c627cc85
...
...
@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2;
/* Interface Imports */
import { IL1StandardBridge } from "./IL1StandardBridge.sol";
import { IL1ERC20Bridge } from "./IL1ERC20Bridge.sol";
import {
iOVM_L2ERC20Bridge } from "../../L2/messaging/iOVM_
L2ERC20Bridge.sol";
import {
IL2ERC20Bridge } from "../../L2/messaging/I
L2ERC20Bridge.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
/* Library Imports */
...
...
@@ -158,7 +158,7 @@ contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled {
// Construct calldata for finalizeDeposit call
bytes memory message =
abi.encodeWithSelector(
iOVM_
L2ERC20Bridge.finalizeDeposit.selector,
I
L2ERC20Bridge.finalizeDeposit.selector,
address(0),
Lib_PredeployAddresses.OVM_ETH,
_from,
...
...
@@ -249,7 +249,7 @@ contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled {
// Construct calldata for _l2Token.finalizeDeposit(_to, _amount)
bytes memory message = abi.encodeWithSelector(
iOVM_
L2ERC20Bridge.finalizeDeposit.selector,
I
L2ERC20Bridge.finalizeDeposit.selector,
_l1Token,
_l2Token,
_from,
...
...
packages/contracts/contracts/L2/messaging/
iOVM_
L2ERC20Bridge.sol
→
packages/contracts/contracts/L2/messaging/
I
L2ERC20Bridge.sol
View file @
c627cc85
...
...
@@ -3,9 +3,9 @@ pragma solidity >0.5.0;
pragma experimental ABIEncoderV2;
/**
* @title
iOVM_
L2ERC20Bridge
* @title
I
L2ERC20Bridge
*/
interface
iOVM_
L2ERC20Bridge {
interface
I
L2ERC20Bridge {
/**********
* Events *
...
...
packages/contracts/contracts/L2/messaging/OVM_L2StandardBridge.sol
View file @
c627cc85
...
...
@@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2;
/* Interface Imports */
import { IL1StandardBridge } from "../../L1/messaging/IL1StandardBridge.sol";
import { IL1ERC20Bridge } from "../../L1/messaging/IL1ERC20Bridge.sol";
import {
iOVM_L2ERC20Bridge } from "./iOVM_
L2ERC20Bridge.sol";
import {
IL2ERC20Bridge } from "./I
L2ERC20Bridge.sol";
/* Library Imports */
import { ERC165Checker } from "@openzeppelin/contracts/introspection/ERC165Checker.sol";
...
...
@@ -26,7 +26,7 @@ import { IL2StandardERC20 } from "../../libraries/standards/IL2StandardERC20.sol
*
* Runtime target: OVM
*/
contract OVM_L2StandardBridge is
iOVM_
L2ERC20Bridge, OVM_CrossDomainEnabled {
contract OVM_L2StandardBridge is
I
L2ERC20Bridge, OVM_CrossDomainEnabled {
/********************************
* External Contract References *
...
...
@@ -56,7 +56,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
***************/
/**
* @inheritdoc
iOVM_
L2ERC20Bridge
* @inheritdoc
I
L2ERC20Bridge
*/
function withdraw(
address _l2Token,
...
...
@@ -79,7 +79,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
}
/**
* @inheritdoc
iOVM_
L2ERC20Bridge
* @inheritdoc
I
L2ERC20Bridge
*/
function withdrawTo(
address _l2Token,
...
...
@@ -167,7 +167,7 @@ contract OVM_L2StandardBridge is iOVM_L2ERC20Bridge, OVM_CrossDomainEnabled {
************************************/
/**
* @inheritdoc
iOVM_
L2ERC20Bridge
* @inheritdoc
I
L2ERC20Bridge
*/
function finalizeDeposit(
address _l1Token,
...
...
packages/contracts/test/contracts/L1/messaging/L1StandardBridge.spec.ts
View file @
c627cc85
...
...
@@ -45,7 +45,7 @@ describe('L1StandardBridge', () => {
)
// get an L2ER20Bridge Interface
IL2ERC20Bridge
=
getContractInterface
(
'
iOVM_
L2ERC20Bridge
'
)
IL2ERC20Bridge
=
getContractInterface
(
'
I
L2ERC20Bridge
'
)
aliceAddress
=
await
alice
.
getAddress
()
bobsAddress
=
await
bob
.
getAddress
()
...
...
packages/contracts/test/contracts/L2/messaging/OVM_L2StandardBridge.spec.ts
View file @
c627cc85
...
...
@@ -44,7 +44,7 @@ describe('OVM_L2StandardBridge', () => {
)
// get an L2ER20Bridge Interface
IL2ERC20Bridge
=
getContractInterface
(
'
iOVM_
L2ERC20Bridge
'
)
IL2ERC20Bridge
=
getContractInterface
(
'
I
L2ERC20Bridge
'
)
})
let
OVM_L2StandardBridge
:
Contract
...
...
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