chore: port nitro contracts pr (#401)

Co-authored-by: Chris Buckland <[email protected]>
Co-authored-by: Raul Jordan <[email protected]>

Author: 3 people

.gitignore

@@ -28,6 +28,7 @@ contracts/cache
 contracts/out
 contracts/formatter.sh
 contracts/build
+contracts/test/storage/*-old.dot
 
 .DS_Store
 .env

contracts/src/bridge/Bridge.sol

@@ -230,7 +230,7 @@ contract Bridge is Initializable, DelegateCallAware, IBridge {
         InOutInfo storage info = allowedDelayedInboxesMap[inbox];
         bool alreadyEnabled = info.allowed;
         emit InboxToggle(inbox, enabled);
-        if ((alreadyEnabled && enabled) || (!alreadyEnabled && !enabled)) {
+        if (alreadyEnabled == enabled) {
             return;
         }
         if (enabled) {
@@ -252,7 +252,7 @@ contract Bridge is Initializable, DelegateCallAware, IBridge {
         InOutInfo storage info = allowedOutboxesMap[outbox];
         bool alreadyEnabled = info.allowed;
         emit OutboxToggle(outbox, enabled);
-        if ((alreadyEnabled && enabled) || (!alreadyEnabled && !enabled)) {
+        if (alreadyEnabled == enabled) {
             return;
         }
         if (enabled) {

contracts/src/bridge/ISequencerInbox.sol

@@ -69,14 +69,24 @@ interface ISequencerInbox is IDelayedMessageProvider {
 
     function isBatchPoster(address) external view returns (bool);
 
+    function isSequencer(address) external view returns (bool);
+
     struct DasKeySetInfo {
         bool isValidKeyset;
         uint64 creationBlock;
     }
 
-    // https://github.com/ethereum/solidity/issues/11826
-    // function maxTimeVariation() external view returns (MaxTimeVariation calldata);
-    // function dasKeySetInfo(bytes32) external view returns (DasKeySetInfo calldata);
+    function maxTimeVariation()
+        external
+        view
+        returns (
+            uint256,
+            uint256,
+            uint256,
+            uint256
+        );
+
+    function dasKeySetInfo(bytes32) external view returns (bool, uint64);
 
     /// @notice Remove force inclusion delay after a L1 chainId fork
     function removeDelayAfterFork() external;
@@ -154,6 +164,14 @@ interface ISequencerInbox is IDelayedMessageProvider {
      */
     function invalidateKeysetHash(bytes32 ksHash) external;
 
+    /**
+     * @notice Updates whether an address is authorized to be a sequencer.
+     * @dev The IsSequencer information is used only off-chain by the nitro node to validate sequencer feed signer.
+     * @param addr the address
+     * @param isSequencer_ if the specified address should be authorized as a sequencer
+     */
+    function setIsSequencer(address addr, bool isSequencer_) external;
+
     // ---------- initializer ----------
 
     function initialize(IBridge bridge_, MaxTimeVariation calldata maxTimeVariation_) external;

contracts/src/bridge/Inbox.sol

@@ -352,7 +352,7 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
                     nonce,
                     uint256(uint160(address(100))), // ArbSys address
                     value,
-                    abi.encode(ArbSys.withdrawEth.selector, withdrawTo)
+                    abi.encodeWithSelector(ArbSys.withdrawEth.selector, withdrawTo)
                 )
             );
     }

contracts/src/bridge/SequencerInbox.sol

@@ -27,10 +27,13 @@ import "./IInbox.sol";
 import "./ISequencerInbox.sol";
 import "../rollup/IRollupLogic.sol";
 import "./Messages.sol";
+import "../precompiles/ArbGasInfo.sol";
+import "../precompiles/ArbSys.sol";
 
 import {L1MessageType_batchPostingReport} from "../libraries/MessageTypes.sol";
 import {GasRefundEnabled, IGasRefunder} from "../libraries/IGasRefunder.sol";
 import "../libraries/DelegateCallAware.sol";
+import "../libraries/ArbitrumChecker.sol";
 import {MAX_DATA_SIZE} from "../libraries/Constants.sol";
 
 /**
@@ -64,6 +67,11 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
 
     uint256 internal immutable deployTimeChainId = block.chainid;
 
+    mapping(address => bool) public isSequencer;
+
+    // If the chain this SequencerInbox is deployed on is an Arbitrum chain.
+    bool internal immutable hostChainIsArbitrum = ArbitrumChecker.runningOnArbitrum();
+
     function _chainIdChanged() internal view returns (bool) {
         return deployTimeChainId != block.chainid;
     }
@@ -385,13 +393,29 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
             // this msg isn't included in the current sequencer batch, but instead added to
             // the delayed messages queue that is yet to be included
             address batchPoster = msg.sender;
-            bytes memory spendingReportMsg = abi.encodePacked(
-                block.timestamp,
-                batchPoster,
-                dataHash,
-                seqMessageIndex,
-                block.basefee
-            );
+            bytes memory spendingReportMsg;
+            if (hostChainIsArbitrum) {
+                // Include extra gas for the host chain's L1 gas charging
+                uint256 l1Fees = ArbGasInfo(address(0x6c)).getCurrentTxL1GasFees();
+                uint256 extraGas = l1Fees / block.basefee;
+                require(extraGas <= type(uint64).max, "L1_GAS_NOT_UINT64");
+                spendingReportMsg = abi.encodePacked(
+                    block.timestamp,
+                    batchPoster,
+                    dataHash,
+                    seqMessageIndex,
+                    block.basefee,
+                    uint64(extraGas)
+                );
+            } else {
+                spendingReportMsg = abi.encodePacked(
+                    block.timestamp,
+                    batchPoster,
+                    dataHash,
+                    seqMessageIndex,
+                    block.basefee
+                );
+            }
             uint256 msgNum = bridge.submitBatchSpendingReport(
                 batchPoster,
                 keccak256(spendingReportMsg)
@@ -431,9 +455,13 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         require(keysetBytes.length < 64 * 1024, "keyset is too large");
 
         if (dasKeySetInfo[ksHash].isValidKeyset) revert AlreadyValidDASKeyset(ksHash);
+        uint256 creationBlock = block.number;
+        if (hostChainIsArbitrum) {
+            creationBlock = ArbSys(address(100)).arbBlockNumber();
+        }
         dasKeySetInfo[ksHash] = DasKeySetInfo({
             isValidKeyset: true,
-            creationBlock: uint64(block.number)
+            creationBlock: uint64(creationBlock)
         });
         emit SetValidKeyset(ksHash, keysetBytes);
         emit OwnerFunctionCalled(2);
@@ -450,6 +478,12 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         emit OwnerFunctionCalled(3);
     }
 
+    /// @inheritdoc ISequencerInbox
+    function setIsSequencer(address addr, bool isSequencer_) external onlyRollupOwner {
+        isSequencer[addr] = isSequencer_;
+        emit OwnerFunctionCalled(4);
+    }
+
     function isValidKeysetHash(bytes32 ksHash) external view returns (bool) {
         return dasKeySetInfo[ksHash].isValidKeyset;
     }

contracts/src/libraries/AdminFallbackProxy.sol

@@ -107,13 +107,13 @@ contract AdminFallbackProxy is Proxy, DoubleLogicERC1967Upgrade {
      * Only the `adminAddr` is able to use the `adminLogic` functions
      * All other addresses can interact with the `userLogic` functions
      */
-    constructor(
+    function _initialize(
         address adminLogic,
         bytes memory adminData,
         address userLogic,
         bytes memory userData,
         address adminAddr
-    ) payable {
+    ) internal {
         assert(_ADMIN_SLOT == bytes32(uint256(keccak256("eip1967.proxy.admin")) - 1));
         assert(
             _IMPLEMENTATION_SLOT == bytes32(uint256(keccak256("eip1967.proxy.implementation")) - 1)

contracts/src/libraries/ArbitrumChecker.sol

@@ -0,0 +1,16 @@
+// Copyright 2021-2022, Offchain Labs, Inc.
+// For license information, see https://github.com/nitro/blob/master/LICENSE
+// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity ^0.8.0;
+
+import "../precompiles/ArbSys.sol";
+
+library ArbitrumChecker {
+    function runningOnArbitrum() internal view returns (bool) {
+        (bool ok, bytes memory data) = address(100).staticcall(
+            abi.encodeWithSelector(ArbSys.arbOSVersion.selector)
+        );
+        return ok && data.length == 32;
+    }
+}

contracts/src/libraries/IGasRefunder.sol

@@ -21,10 +21,7 @@ abstract contract GasRefundEnabled {
         uint256 startGasLeft = gasleft();
         _;
         if (address(gasRefunder) != address(0)) {
-            uint256 calldataSize;
-            assembly {
-                calldataSize := calldatasize()
-            }
+            uint256 calldataSize = msg.data.length;
             uint256 calldataWords = (calldataSize + 31) / 32;
             // account for the CALLDATACOPY cost of the proxy contract, including the memory expansion cost
             // memory_expansion_cost = (memory_size_word ** 2) / 512 + (3 * memory_size_word)

contracts/src/mocks/BridgeStub.sol

@@ -139,7 +139,7 @@ contract BridgeStub is IBridge {
         InOutInfo storage info = allowedDelayedInboxesMap[inbox];
         bool alreadyEnabled = info.allowed;
         emit InboxToggle(inbox, enabled);
-        if ((alreadyEnabled && enabled) || (!alreadyEnabled && !enabled)) {
+        if (alreadyEnabled == enabled) {
             return;
         }
         if (enabled) {

contracts/src/mocks/Simple.sol

@@ -24,6 +24,8 @@ contract Simple {
     }
 
     function incrementRedeem() external {
+        require(msg.sender == tx.origin, "SENDER_NOT_ORIGIN");
+        require(ArbSys(address(0x64)).wasMyCallersAddressAliased(), "NOT_ALIASED");
         counter++;
         emit RedeemedEvent(msg.sender, ArbRetryableTx(address(110)).getCurrentRedeemer());
     }
@@ -37,6 +39,10 @@ contract Simple {
         return block.number;
     }
 
+    function getBlockDifficulty() external view returns (uint256) {
+        return block.difficulty;
+    }
+
     function noop() external pure {}
 
     function pleaseRevert() external pure {