@arbitrum/nitro-contracts 1.0.0-beta.6 → 1.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arbitrum/nitro-contracts",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "description": "Layer 2 precompiles and rollup for Arbitrum Nitro",
   "author": "Offchain Labs, Inc.",
   "license": "BUSL-1.1",

package/src/bridge/IDelayedMessageProvider.sol

@@ -7,4 +7,8 @@ pragma solidity ^0.8.0;
 interface IDelayedMessageProvider {
     /// @dev event emitted when a inbox message is added to the Bridge's delayed accumulator
     event InboxMessageDelivered(uint256 indexed messageNum, bytes data);
+
+    /// @dev event emitted when a inbox message is added to the Bridge's delayed accumulator
+    /// same as InboxMessageDelivered but the batch data is available in tx.input
+    event InboxMessageDeliveredFromOrigin(uint256 indexed messageNum);
 }

package/src/bridge/Inbox.sol

@@ -61,6 +61,7 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
     /// this modifier is not intended to use to be used for security (since this opens the allowList to
     /// a smart contract phishing risk).
     modifier onlyAllowed() {
+        // solhint-disable-next-line avoid-tx-origin
         if (allowListEnabled && !isAllowed[tx.origin]) revert NotAllowedOrigin(tx.origin);
         _;
     }
@@ -114,14 +115,23 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
     }
 
     /**
-     * @dev DEPRECATED in favor of sendL2Message
+     * @notice Send a generic L2 message to the chain
+     * @dev This method is an optimization to avoid having to emit the entirety of the messageData in a log. Instead validators are expected to be able to parse the data from the transaction's input
      * @param messageData Data of the message being sent
      */
     function sendL2MessageFromOrigin(bytes calldata messageData)
         external
+        whenNotPaused
+        onlyAllowed
         returns (uint256)
     {
-        return sendL2Message(messageData);
+        // solhint-disable-next-line avoid-tx-origin
+        if (msg.sender != tx.origin) revert NotOrigin();
+        if (messageData.length > MAX_DATA_SIZE)
+            revert DataTooLarge(messageData.length, MAX_DATA_SIZE);
+        uint256 msgNum = deliverToBridge(L2_MSG, msg.sender, keccak256(messageData));
+        emit InboxMessageDeliveredFromOrigin(msgNum);
+        return msgNum;
     }
 
     /**
@@ -130,7 +140,7 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
      * @param messageData Data of the message being sent
      */
     function sendL2Message(bytes calldata messageData)
-        public
+        external
         override
         whenNotPaused
         onlyAllowed
@@ -461,11 +471,7 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
     ) internal returns (uint256) {
         if (_messageData.length > MAX_DATA_SIZE)
             revert DataTooLarge(_messageData.length, MAX_DATA_SIZE);
-        uint256 msgNum = deliverToBridge(
-            _kind,
-            AddressAliasHelper.applyL1ToL2Alias(_sender),
-            keccak256(_messageData)
-        );
+        uint256 msgNum = deliverToBridge(_kind, _sender, keccak256(_messageData));
         emit InboxMessageDelivered(msgNum, _messageData);
         return msgNum;
     }
@@ -475,6 +481,11 @@ contract Inbox is DelegateCallAware, PausableUpgradeable, IInbox {
         address sender,
         bytes32 messageDataHash
     ) internal returns (uint256) {
-        return bridge.enqueueDelayedMessage{value: msg.value}(kind, sender, messageDataHash);
+        return
+            bridge.enqueueDelayedMessage{value: msg.value}(
+                kind,
+                AddressAliasHelper.applyL1ToL2Alias(sender),
+                messageDataHash
+            );
     }
 }

package/src/libraries/IGasRefunder.sol

@@ -23,6 +23,7 @@ abstract contract GasRefundEnabled {
             uint256 calldataSize = 0;
             // if triggered in a contract call, the spender may be overrefunded by appending dummy data to the call
             // so we check if it is a top level call, which would mean the sender paid calldata as part of tx.input
+            // solhint-disable-next-line avoid-tx-origin
             if (msg.sender == tx.origin) {
                 assembly {
                     calldataSize := calldatasize()

package/src/mocks/InboxStub.sol

@@ -28,10 +28,16 @@ contract InboxStub is IInbox {
     }
 
     /**
-     * @dev DEPRECATED in favor of sendL2Message
+     * @notice Send a generic L2 message to the chain
+     * @dev This method is an optimization to avoid having to emit the entirety of the messageData in a log. Instead validators are expected to be able to parse the data from the transaction's input
+     * @param messageData Data of the message being sent
      */
     function sendL2MessageFromOrigin(bytes calldata messageData) external returns (uint256) {
-        return sendL2Message(messageData);
+        // solhint-disable-next-line avoid-tx-origin
+        require(msg.sender == tx.origin, "origin only");
+        uint256 msgNum = deliverToBridge(L2_MSG, msg.sender, keccak256(messageData));
+        emit InboxMessageDeliveredFromOrigin(msgNum);
+        return msgNum;
     }
 
     /**
@@ -39,7 +45,7 @@ contract InboxStub is IInbox {
      * @dev This method can be used to send any type of message that doesn't require L1 validation
      * @param messageData Data of the message being sent
      */
-    function sendL2Message(bytes calldata messageData) public override returns (uint256) {
+    function sendL2Message(bytes calldata messageData) external override returns (uint256) {
         uint256 msgNum = deliverToBridge(L2_MSG, msg.sender, keccak256(messageData));
         emit InboxMessageDelivered(msgNum, messageData);
         return msgNum;

package/src/precompiles/ArbSys.sol

@@ -38,7 +38,7 @@ interface ArbSys {
      * @notice Returns 0 since Nitro has no concept of storage gas
      * @return int 0
      */
-    function getStorageGasAvailable() external returns (uint256);
+    function getStorageGasAvailable() external view returns (uint256);
 
     /**
      * @notice check if current call is coming from l1

package/src/rollup/RollupUserLogic.sol

@@ -623,6 +623,7 @@ contract RollupUserLogic is AbsRollupUserLogic, IRollupUser {
     function withdrawStakerFunds() external override onlyValidator whenNotPaused returns (uint256) {
         uint256 amount = withdrawFunds(msg.sender);
         // This is safe because it occurs after all checks and effects
+        // solhint-disable-next-line avoid-low-level-calls
         (bool success, ) = msg.sender.call{value: amount}("");
         require(success, "TRANSFER_FAILED");
         return amount;

package/src/rollup/ValidatorWallet.sol

@@ -185,6 +185,7 @@ contract ValidatorWallet is OwnableUpgradeable, DelegateCallAware, GasRefundEnab
 
     /// @dev allows the owner to withdraw eth held by this contract
     function withdrawEth(uint256 amount, address destination) external onlyOwner {
+        // solhint-disable-next-line avoid-low-level-calls
         (bool success, ) = destination.call{value: amount}("");
         if (!success) revert WithdrawEthFail(destination);
     }