Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compare: vs nitro-contracts develop #362

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions contracts/src/bridge/Bridge.sol
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ contract Bridge is Initializable, DelegateCallAware, IBridge {
rollup = rollup_;
}

/// @notice Allows the proxy owner to set the rollup address
function updateRollupAddress(IOwnable _rollup) external onlyDelegated onlyProxyOwner {
rollup = _rollup;
}

modifier onlyRollupOrOwner() {
if (msg.sender != address(rollup)) {
address rollupOwner = rollup.owner();
Expand Down
2 changes: 0 additions & 2 deletions contracts/src/bridge/IBridge.sol
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,4 @@ interface IBridge {
// ---------- initializer ----------

function initialize(IOwnable rollup_) external;

function updateRollupAddress(IOwnable _rollup) external;
}
2 changes: 0 additions & 2 deletions contracts/src/bridge/IOutbox.sol
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ interface IOutbox {
function OUTBOX_VERSION() external view returns (uint128); // the outbox version

function updateSendRoot(bytes32 sendRoot, bytes32 l2BlockHash) external;

function updateRollupAddress() external;

/// @notice When l2ToL1Sender returns a nonzero address, the message was originated by an L2 account
/// When the return value is zero, that means this is a system message
Expand Down
2 changes: 0 additions & 2 deletions contracts/src/bridge/ISequencerInbox.sol
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,4 @@ interface ISequencerInbox is IDelayedMessageProvider {
// ---------- initializer ----------

function initialize(IBridge bridge_, MaxTimeVariation calldata maxTimeVariation_) external;

function updateRollupAddress() external;
}
1 change: 0 additions & 1 deletion contracts/src/bridge/Inbox.sol
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,6 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
);
}


function _deliverMessage(
uint8 _kind,
address _sender,
Expand Down
5 changes: 0 additions & 5 deletions contracts/src/bridge/Outbox.sol
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ contract Outbox is DelegateCallAware, IOutbox {
rollup = address(_bridge.rollup());
}

/// @notice Allows the proxy owner to set the rollup address
function updateRollupAddress() external onlyDelegated onlyProxyOwner {
rollup = address(bridge.rollup());
}

function updateSendRoot(bytes32 root, bytes32 l2BlockHash) external {
if (msg.sender != rollup) revert NotRollup(msg.sender, rollup);
roots[root] = l2BlockHash;
Expand Down
5 changes: 0 additions & 5 deletions contracts/src/bridge/SequencerInbox.sol
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,6 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
maxTimeVariation = maxTimeVariation_;
}

/// @notice Allows the proxy owner to set the rollup address
function updateRollupAddress() external onlyDelegated onlyProxyOwner {
rollup = bridge.rollup();
}

function getTimeBounds() internal view virtual returns (TimeBounds memory) {
TimeBounds memory bounds;
if (block.timestamp > maxTimeVariation.delaySeconds) {
Expand Down
73 changes: 0 additions & 73 deletions contracts/src/challenge/IOldChallengeManager.sol

This file was deleted.

129 changes: 0 additions & 129 deletions contracts/src/challenge/OldChallengeLib.sol

This file was deleted.

Loading
Loading