Skip to content

Commit ef7b403

Browse files
icemelonicemelon
committed
Merge branch 'feat/new_bridge_contracts' of https://github.com/scroll-tech/scroll into feat/new_bridge_contracts
2 parents 2f0552b + 9d6a271 commit ef7b403

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
lines changed

‎contracts/docs/apis/L1GatewayRouter.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ Emitted when the address of default ERC20 Gateway is updated.
486486

487487
| Name | Type | Description |
488488
|---|---|---|
489-
| defaultERC20Gateway `indexed` | address | The address of new default ERC20 Gateway. |
489+
| defaultERC20Gateway `indexed` | address | undefined |
490490

491491
### SetERC20Gateway
492492

@@ -502,8 +502,8 @@ Emitted when the `gateway` for `token` is updated.
502502

503503
| Name | Type | Description |
504504
|---|---|---|
505-
| token `indexed` | address | The address of token updated. |
506-
| gateway `indexed` | address | The corresponding address of gateway updated. |
505+
| token `indexed` | address | undefined |
506+
| gateway `indexed` | address | undefined |
507507

508508
### SetETHGateway
509509

@@ -519,7 +519,7 @@ Emitted when the address of ETH Gateway is updated.
519519

520520
| Name | Type | Description |
521521
|---|---|---|
522-
| ethGateway `indexed` | address | The address of new ETH Gateway. |
522+
| ethGateway `indexed` | address | undefined |
523523

524524

525525

‎contracts/docs/apis/L2GatewayRouter.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ Emitted when the address of default ERC20 Gateway is updated.
468468

469469
| Name | Type | Description |
470470
|---|---|---|
471-
| defaultERC20Gateway `indexed` | address | The address of new default ERC20 Gateway. |
471+
| defaultERC20Gateway `indexed` | address | undefined |
472472

473473
### SetERC20Gateway
474474

@@ -484,8 +484,8 @@ Emitted when the `gateway` for `token` is updated.
484484

485485
| Name | Type | Description |
486486
|---|---|---|
487-
| token `indexed` | address | The address of token updated. |
488-
| gateway `indexed` | address | The corresponding address of gateway updated. |
487+
| token `indexed` | address | undefined |
488+
| gateway `indexed` | address | undefined |
489489

490490
### SetETHGateway
491491

@@ -501,7 +501,7 @@ Emitted when the address of ETH Gateway is updated.
501501

502502
| Name | Type | Description |
503503
|---|---|---|
504-
| ethGateway `indexed` | address | The address of new ETH Gateway. |
504+
| ethGateway `indexed` | address | undefined |
505505

506506
### WithdrawERC20
507507

‎contracts/src/L1/gateways/IL1GatewayRouter.sol‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,21 @@ pragma solidity ^0.8.0;
55
import { IL1ETHGateway } from "./IL1ETHGateway.sol";
66
import { IL1ERC20Gateway } from "./IL1ERC20Gateway.sol";
77

8-
interface IL1GatewayRouter is IL1ETHGateway, IL1ERC20Gateway {}
8+
interface IL1GatewayRouter is IL1ETHGateway, IL1ERC20Gateway {
9+
/**********
10+
* Events *
11+
**********/
12+
13+
/// @notice Emitted when the address of ETH Gateway is updated.
14+
/// @param ethGateway The address of new ETH Gateway.
15+
event SetETHGateway(address indexed ethGateway);
16+
17+
/// @notice Emitted when the address of default ERC20 Gateway is updated.
18+
/// @param defaultERC20Gateway The address of new default ERC20 Gateway.
19+
event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
20+
21+
/// @notice Emitted when the `gateway` for `token` is updated.
22+
/// @param token The address of token updated.
23+
/// @param gateway The corresponding address of gateway updated.
24+
event SetERC20Gateway(address indexed token, address indexed gateway);
25+
}

‎contracts/src/L1/gateways/L1GatewayRouter.sol‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@ import { IL1GatewayRouter } from "./IL1GatewayRouter.sol";
1717
/// @dev One can also use this contract to query L1/L2 token address mapping.
1818
/// In the future, ERC-721 and ERC-1155 tokens will be added to the router too.
1919
contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
20-
/**********
21-
* Events *
22-
**********/
23-
24-
/// @notice Emitted when the address of ETH Gateway is updated.
25-
/// @param ethGateway The address of new ETH Gateway.
26-
event SetETHGateway(address indexed ethGateway);
27-
28-
/// @notice Emitted when the address of default ERC20 Gateway is updated.
29-
/// @param defaultERC20Gateway The address of new default ERC20 Gateway.
30-
event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
31-
32-
/// @notice Emitted when the `gateway` for `token` is updated.
33-
/// @param token The address of token updated.
34-
/// @param gateway The corresponding address of gateway updated.
35-
event SetERC20Gateway(address indexed token, address indexed gateway);
36-
3720
/*************
3821
* Variables *
3922
*************/

‎contracts/src/L2/gateways/IL2GatewayRouter.sol‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,21 @@ pragma solidity ^0.8.0;
55
import { IL2ETHGateway } from "./IL2ETHGateway.sol";
66
import { IL2ERC20Gateway } from "./IL2ERC20Gateway.sol";
77

8-
interface IL2GatewayRouter is IL2ETHGateway, IL2ERC20Gateway {}
8+
interface IL2GatewayRouter is IL2ETHGateway, IL2ERC20Gateway {
9+
/**********
10+
* Events *
11+
**********/
12+
13+
/// @notice Emitted when the address of ETH Gateway is updated.
14+
/// @param ethGateway The address of new ETH Gateway.
15+
event SetETHGateway(address indexed ethGateway);
16+
17+
/// @notice Emitted when the address of default ERC20 Gateway is updated.
18+
/// @param defaultERC20Gateway The address of new default ERC20 Gateway.
19+
event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
20+
21+
/// @notice Emitted when the `gateway` for `token` is updated.
22+
/// @param token The address of token updated.
23+
/// @param gateway The corresponding address of gateway updated.
24+
event SetERC20Gateway(address indexed token, address indexed gateway);
25+
}

‎contracts/src/L2/gateways/L2GatewayRouter.sol‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,6 @@ import { IScrollStandardERC20 } from "../../libraries/token/IScrollStandardERC20
1818
/// @dev One can also use this contract to query L1/L2 token address mapping.
1919
/// In the future, ERC-721 and ERC-1155 tokens will be added to the router too.
2020
contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
21-
/**********
22-
* Events *
23-
**********/
24-
25-
/// @notice Emitted when the address of ETH Gateway is updated.
26-
/// @param ethGateway The address of new ETH Gateway.
27-
event SetETHGateway(address indexed ethGateway);
28-
29-
/// @notice Emitted when the address of default ERC20 Gateway is updated.
30-
/// @param defaultERC20Gateway The address of new default ERC20 Gateway.
31-
event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
32-
33-
/// @notice Emitted when the `gateway` for `token` is updated.
34-
/// @param token The address of token updated.
35-
/// @param gateway The corresponding address of gateway updated.
36-
event SetERC20Gateway(address indexed token, address indexed gateway);
37-
3821
/*************
3922
* Variables *
4023
*************/

0 commit comments

Comments
 (0)