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
beca1aa5
Commit
beca1aa5
authored
Jul 07, 2022
by
Maurelian
Committed by
Mark Tyneway
Jul 07, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style(ctb): Remove underscores from event args
parent
3855d105
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
162 additions
and
163 deletions
+162
-163
L1StandardBridge.sol
packages/contracts-bedrock/contracts/L1/L1StandardBridge.sol
+40
-40
L2OutputOracle.sol
packages/contracts-bedrock/contracts/L1/L2OutputOracle.sol
+12
-13
L2StandardBridge.sol
packages/contracts-bedrock/contracts/L2/L2StandardBridge.sol
+36
-36
AddressManager.sol
...ges/contracts-bedrock/contracts/legacy/AddressManager.sol
+1
-1
CommonTest.t.sol
packages/contracts-bedrock/contracts/test/CommonTest.t.sol
+64
-64
L2OutputOracle.t.sol
...ges/contracts-bedrock/contracts/test/L2OutputOracle.t.sol
+3
-3
OptimismMintableERC20.t.sol
...tracts-bedrock/contracts/test/OptimismMintableERC20.t.sol
+2
-2
OptimismMintableTokenFactory.t.sol
...bedrock/contracts/test/OptimismMintableTokenFactory.t.sol
+4
-4
No files found.
packages/contracts-bedrock/contracts/L1/L1StandardBridge.sol
View file @
beca1aa5
...
...
@@ -22,72 +22,72 @@ contract L1StandardBridge is StandardBridge, Initializable {
* @custom:legacy
* @notice Emitted whenever a deposit of ETH from L1 into L2 is initiated.
*
* @param
_
from Address of the depositor.
* @param
_
to Address of the recipient on L2.
* @param
_
amount Amount of ETH deposited.
* @param
_
extraData Extra data attached to the deposit.
* @param from Address of the depositor.
* @param to Address of the recipient on L2.
* @param amount Amount of ETH deposited.
* @param extraData Extra data attached to the deposit.
*/
event ETHDepositInitiated(
address indexed
_
from,
address indexed
_
to,
uint256
_
amount,
bytes
_
extraData
address indexed from,
address indexed to,
uint256 amount,
bytes extraData
);
/**
* @custom:legacy
* @notice Emitted whenever a withdrawal of ETH from L2 to L1 is finalized.
*
* @param
_
from Address of the withdrawer.
* @param
_
to Address of the recipient on L1.
* @param
_
amount Amount of ETH withdrawn.
* @param
_
extraData Extra data attached to the withdrawal.
* @param from Address of the withdrawer.
* @param to Address of the recipient on L1.
* @param amount Amount of ETH withdrawn.
* @param extraData Extra data attached to the withdrawal.
*/
event ETHWithdrawalFinalized(
address indexed
_
from,
address indexed
_
to,
uint256
_
amount,
bytes
_
extraData
address indexed from,
address indexed to,
uint256 amount,
bytes extraData
);
/**
* @custom:legacy
* @notice Emitted whenever an ERC20 deposit is initiated.
*
* @param
_
l1Token Address of the token on L1.
* @param
_
l2Token Address of the corresponding token on L2.
* @param
_
from Address of the depositor.
* @param
_
to Address of the recipient on L2.
* @param
_
amount Amount of the ERC20 deposited.
* @param
_
extraData Extra data attached to the deposit.
* @param l1Token Address of the token on L1.
* @param l2Token Address of the corresponding token on L2.
* @param from Address of the depositor.
* @param to Address of the recipient on L2.
* @param amount Amount of the ERC20 deposited.
* @param extraData Extra data attached to the deposit.
*/
event ERC20DepositInitiated(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
extraData
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes extraData
);
/**
* @custom:legacy
* @notice Emitted whenever an ERC20 withdrawal is finalized.
*
* @param
_
l1Token Address of the token on L1.
* @param
_
l2Token Address of the corresponding token on L2.
* @param
_
from Address of the withdrawer.
* @param
_
to Address of the recipient on L1.
* @param
_
amount Amount of the ERC20 withdrawn.
* @param
_
extraData Extra data attached to the withdrawal.
* @param l1Token Address of the token on L1.
* @param l2Token Address of the corresponding token on L2.
* @param from Address of the withdrawer.
* @param to Address of the recipient on L1.
* @param amount Amount of the ERC20 withdrawn.
* @param extraData Extra data attached to the withdrawal.
*/
event ERC20WithdrawalFinalized(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
extraData
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes extraData
);
/**
...
...
packages/contracts-bedrock/contracts/L1/L2OutputOracle.sol
View file @
beca1aa5
...
...
@@ -30,31 +30,30 @@ contract L2OutputOracle is OwnableUpgradeable {
uint256 timestamp;
}
// TODO: Events should NOT be underscore prefixed.
/**
* @notice Emitted when an output is appended.
*
* @param
_
l2Output The output root.
* @param
_
l1Timestamp The L1 timestamp when appended.
* @param
_
l2BlockNumber The L2 block number of the output root.
* @param l2Output The output root.
* @param l1Timestamp The L1 timestamp when appended.
* @param l2BlockNumber The L2 block number of the output root.
*/
event L2OutputAppended(
bytes32 indexed
_
l2Output,
uint256 indexed
_
l1Timestamp,
uint256 indexed
_
l2BlockNumber
bytes32 indexed l2Output,
uint256 indexed l1Timestamp,
uint256 indexed l2BlockNumber
);
/**
* @notice Emitted when an output is deleted.
*
* @param
_
l2Output The output root.
* @param
_
l1Timestamp The L1 timestamp when appended.
* @param
_
l2BlockNumber The L2 block number of the output root.
* @param l2Output The output root.
* @param l1Timestamp The L1 timestamp when appended.
* @param l2BlockNumber The L2 block number of the output root.
*/
event L2OutputDeleted(
bytes32 indexed
_
l2Output,
uint256 indexed
_
l1Timestamp,
uint256 indexed
_
l2BlockNumber
bytes32 indexed l2Output,
uint256 indexed l1Timestamp,
uint256 indexed l2BlockNumber
);
/**
...
...
packages/contracts-bedrock/contracts/L2/L2StandardBridge.sol
View file @
beca1aa5
...
...
@@ -22,60 +22,60 @@ contract L2StandardBridge is StandardBridge {
* @custom:legacy
* @notice Emitted whenever a withdrawal from L2 to L1 is initiated.
*
* @param
_
l1Token Address of the token on L1.
* @param
_
l2Token Address of the corresponding token on L2.
* @param
_
from Address of the withdrawer.
* @param
_
to Address of the recipient on L1.
* @param
_
amount Amount of the ERC20 withdrawn.
* @param
_
extraData Extra data attached to the withdrawal.
* @param l1Token Address of the token on L1.
* @param l2Token Address of the corresponding token on L2.
* @param from Address of the withdrawer.
* @param to Address of the recipient on L1.
* @param amount Amount of the ERC20 withdrawn.
* @param extraData Extra data attached to the withdrawal.
*/
event WithdrawalInitiated(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
extraData
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes extraData
);
/**
* @custom:legacy
* @notice Emitted whenever an ERC20 deposit is finalized.
*
* @param
_
l1Token Address of the token on L1.
* @param
_
l2Token Address of the corresponding token on L2.
* @param
_
from Address of the depositor.
* @param
_
to Address of the recipient on L2.
* @param
_
amount Amount of the ERC20 deposited.
* @param
_
extraData Extra data attached to the deposit.
* @param l1Token Address of the token on L1.
* @param l2Token Address of the corresponding token on L2.
* @param from Address of the depositor.
* @param to Address of the recipient on L2.
* @param amount Amount of the ERC20 deposited.
* @param extraData Extra data attached to the deposit.
*/
event DepositFinalized(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
extraData
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes extraData
);
/**
* @custom:legacy
* @notice Emitted whenever a deposit fails.
*
* @param
_
l1Token Address of the token on L1.
* @param
_
l2Token Address of the corresponding token on L2.
* @param
_
from Address of the depositor.
* @param
_
to Address of the recipient on L2.
* @param
_
amount Amount of the ERC20 deposited.
* @param
_
extraData Extra data attached to the deposit.
* @param l1Token Address of the token on L1.
* @param l2Token Address of the corresponding token on L2.
* @param from Address of the depositor.
* @param to Address of the recipient on L2.
* @param amount Amount of the ERC20 deposited.
* @param extraData Extra data attached to the deposit.
*/
event DepositFailed(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
extraData
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes extraData
);
/**
...
...
packages/contracts-bedrock/contracts/legacy/AddressManager.sol
View file @
beca1aa5
...
...
@@ -12,7 +12,7 @@ contract AddressManager is Ownable {
* Events *
**********/
event AddressSet(string indexed
_name, address _newAddress, address _
oldAddress);
event AddressSet(string indexed
name, address newAddress, address
oldAddress);
/*************
* Variables *
...
...
packages/contracts-bedrock/contracts/test/CommonTest.t.sol
View file @
beca1aa5
...
...
@@ -231,103 +231,103 @@ contract Bridge_Initializer is Messenger_Initializer {
OptimismMintableERC20 RemoteL1Token;
event ETHDepositInitiated(
address indexed
_
from,
address indexed
_
to,
uint256
_
amount,
bytes
_
data
address indexed from,
address indexed to,
uint256 amount,
bytes data
);
event ETHWithdrawalFinalized(
address indexed
_
from,
address indexed
_
to,
uint256
_
amount,
bytes
_
data
address indexed from,
address indexed to,
uint256 amount,
bytes data
);
event ERC20DepositInitiated(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes data
);
event ERC20WithdrawalFinalized(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes data
);
event WithdrawalInitiated(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes data
);
event DepositFinalized(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes data
);
event DepositFailed(
address indexed
_
l1Token,
address indexed
_
l2Token,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed l1Token,
address indexed l2Token,
address indexed from,
address to,
uint256 amount,
bytes data
);
event ETHBridgeInitiated(
address indexed
_
from,
address indexed
_
to,
uint256
_
amount,
bytes
_
data
address indexed from,
address indexed to,
uint256 amount,
bytes data
);
event ETHBridgeFinalized(
address indexed
_
from,
address indexed
_
to,
uint256
_
amount,
bytes
_
data
address indexed from,
address indexed to,
uint256 amount,
bytes data
);
event ERC20BridgeInitiated(
address indexed
_
localToken,
address indexed
_
remoteToken,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed localToken,
address indexed remoteToken,
address indexed from,
address to,
uint256 amount,
bytes data
);
event ERC20BridgeFinalized(
address indexed
_
localToken,
address indexed
_
remoteToken,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed localToken,
address indexed remoteToken,
address indexed from,
address to,
uint256 amount,
bytes data
);
event ERC20BridgeFailed(
address indexed
_
localToken,
address indexed
_
remoteToken,
address indexed
_
from,
address
_
to,
uint256
_
amount,
bytes
_
data
address indexed localToken,
address indexed remoteToken,
address indexed from,
address to,
uint256 amount,
bytes data
);
function setUp() public virtual override {
...
...
packages/contracts-bedrock/contracts/test/L2OutputOracle.t.sol
View file @
beca1aa5
...
...
@@ -250,9 +250,9 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
*****************************/
event L2OutputDeleted(
bytes32 indexed
_
l2Output,
uint256 indexed
_
l1Timestamp,
uint256 indexed
_
l2BlockNumber
bytes32 indexed l2Output,
uint256 indexed l1Timestamp,
uint256 indexed l2BlockNumber
);
function test_deleteL2Output() external {
...
...
packages/contracts-bedrock/contracts/test/OptimismMintableERC20.t.sol
View file @
beca1aa5
...
...
@@ -6,8 +6,8 @@ import "../universal/SupportedInterfaces.sol";
import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
contract OptimismMintableERC20_Test is Bridge_Initializer {
event Mint(address indexed
_account, uint256 _
amount);
event Burn(address indexed
_account, uint256 _
amount);
event Mint(address indexed
account, uint256
amount);
event Burn(address indexed
account, uint256
amount);
function setUp() public override {
super.setUp();
...
...
packages/contracts-bedrock/contracts/test/OptimismMintableTokenFactory.t.sol
View file @
beca1aa5
...
...
@@ -5,11 +5,11 @@ import { Bridge_Initializer } from "./CommonTest.t.sol";
import { LibRLP } from "./RLP.t.sol";
contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
event StandardL2TokenCreated(address indexed
_remoteToken, address indexed _
localToken);
event StandardL2TokenCreated(address indexed
remoteToken, address indexed
localToken);
event OptimismMintableTokenCreated(
address indexed
_
localToken,
address indexed
_
remoteToken,
address
_
deployer
address indexed localToken,
address indexed remoteToken,
address deployer
);
function setUp() public override {
...
...
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