Skip to content

Commit 1ce497b

Browse files
committed
legacy: 9a1b541
1 parent 1d60251 commit 1ce497b

File tree

109 files changed

+2066
-4299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+2066
-4299
lines changed

contracts/src/bridge/Bridge.sol

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
pragma solidity ^0.8.4;
@@ -63,11 +63,6 @@ contract Bridge is Initializable, DelegateCallAware, IBridge {
6363
rollup = rollup_;
6464
}
6565

66-
/// @notice Allows the proxy owner to set the rollup address
67-
function updateRollupAddress(IOwnable _rollup) external onlyDelegated onlyProxyOwner {
68-
rollup = _rollup;
69-
}
70-
7166
modifier onlyRollupOrOwner() {
7267
if (msg.sender != address(rollup)) {
7368
address rollupOwner = rollup.owner();

contracts/src/bridge/IBridge.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
// solhint-disable-next-line compiler-version
@@ -112,6 +112,4 @@ interface IBridge {
112112
// ---------- initializer ----------
113113

114114
function initialize(IOwnable rollup_) external;
115-
116-
function updateRollupAddress(IOwnable _rollup) external;
117115
}

contracts/src/bridge/IDelayedMessageProvider.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
// solhint-disable-next-line compiler-version

contracts/src/bridge/IInbox.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
// solhint-disable-next-line compiler-version

contracts/src/bridge/IOutbox.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
// solhint-disable-next-line compiler-version
@@ -28,8 +28,6 @@ interface IOutbox {
2828
function OUTBOX_VERSION() external view returns (uint128); // the outbox version
2929

3030
function updateSendRoot(bytes32 sendRoot, bytes32 l2BlockHash) external;
31-
32-
function updateRollupAddress() external;
3331

3432
/// @notice When l2ToL1Sender returns a nonzero address, the message was originated by an L2 account
3533
/// When the return value is zero, that means this is a system message

contracts/src/bridge/IOwnable.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
// solhint-disable-next-line compiler-version

contracts/src/bridge/ISequencerInbox.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
// solhint-disable-next-line compiler-version
@@ -175,6 +175,4 @@ interface ISequencerInbox is IDelayedMessageProvider {
175175
// ---------- initializer ----------
176176

177177
function initialize(IBridge bridge_, MaxTimeVariation calldata maxTimeVariation_) external;
178-
179-
function updateRollupAddress() external;
180178
}

contracts/src/bridge/Inbox.sol

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
pragma solidity ^0.8.4;
@@ -527,7 +527,6 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
527527
);
528528
}
529529

530-
531530
function _deliverMessage(
532531
uint8 _kind,
533532
address _sender,

contracts/src/bridge/Messages.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
pragma solidity ^0.8.0;

contracts/src/bridge/Outbox.sol

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2021-2022, Offchain Labs, Inc.
2-
// For license information, see https://github.com/nitro/blob/master/LICENSE
2+
// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
33
// SPDX-License-Identifier: BUSL-1.1
44

55
pragma solidity ^0.8.4;
@@ -68,11 +68,6 @@ contract Outbox is DelegateCallAware, IOutbox {
6868
rollup = address(_bridge.rollup());
6969
}
7070

71-
/// @notice Allows the proxy owner to set the rollup address
72-
function updateRollupAddress() external onlyDelegated onlyProxyOwner {
73-
rollup = address(bridge.rollup());
74-
}
75-
7671
function updateSendRoot(bytes32 root, bytes32 l2BlockHash) external {
7772
if (msg.sender != rollup) revert NotRollup(msg.sender, rollup);
7873
roots[root] = l2BlockHash;

0 commit comments

Comments
 (0)