github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-01-09 22:18:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: add address(0) check for constructors. (#1010)

Browse Source 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
This commit is contained in:
Luke Ma
2023-12-11 16:49:29 +08:00
committed by GitHub
parent 566fb23b9d
commit bf2692b7cb
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/src/L1/L1ScrollMessenger.sol
View File

@@ -95,6 +95,9 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
address _rollup,
address _messageQueue
) public initializer {
if (_counterpart == address(0) || _rollup == address(0) || _messageQueue == address(0)) {
revert ErrZeroAddress();
}
ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, _feeVault);
rollup = _rollup;

3
contracts/src/L2/L2ScrollMessenger.sol
View File

@@ -49,12 +49,15 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
***************/
constructor(address _messageQueue) {
if (_messageQueue == address(0)) revert ErrZeroAddress();
_disableInitializers();
messageQueue = _messageQueue;
}
function initialize(address _counterpart) external initializer {
if (_counterpart == address(0)) revert ErrZeroAddress();
ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, address(0));
}

5
contracts/src/libraries/IScrollMessenger.sol
View File

@@ -3,6 +3,11 @@
pragma solidity ^0.8.16;
interface IScrollMessenger {
/***********
* Errors *
***********/
error ErrZeroAddress();
/**********
* Events *
**********/

2
contracts/src/test/L1GatewayTestBase.t.sol
View File

@@ -82,7 +82,7 @@ abstract contract L1GatewayTestBase is DSTestPlus {
verifier = new MockRollupVerifier();
// Deploy L2 contracts
l2Messenger = new L2ScrollMessenger(address(0));
l2Messenger = new L2ScrollMessenger(address(1));
// Initialize L1 contracts
l1Messenger.initialize(address(l2Messenger), feeVault, address(rollup), address(messageQueue));