@arbitrum/nitro-contracts 3.0.0-alpha.0 → 3.0.0-alpha.1

package/build/contracts/src/test-helpers/ValueArrayTester.sol/ValueArrayTester.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/28754c4998b67fc9c9d6d849262cf39e.json"
+  "buildInfo": "../../../build-info/20d3c20b27a0078f8acb7ef1c538821c.json"
 }

package/out/yul/Reader4844.yul/Reader4844.json

@@ -1 +1 @@
-{"abi":null,"bytecode":{"object":"0x605b80600c6000396000f3fe346056576000803560e01c8063e83a2d8214602857631f6d6ef71460205780fd5b6020904a8152f35b50805b804990811560435760019160408260051b015201602b565b60409150602083528060205260051b0190f35b600080fd","sourceMap":"76:19:0:-:0;53:21;;50:1;41:55;50:1;105:30","linkReferences":{}},"deployedBytecode":{"object":"0x346056576000803560e01c8063e83a2d8214602857631f6d6ef71460205780fd5b6020904a8152f35b50805b804990811560435760019160408260051b015201602b565b60409150602083528060205260051b0190f35b600080fd","sourceMap":"250:11:0:-:0;247:31;;400:1;387:15;;381:4;377:26;465:486;470:10;465:486;;;1019:10;1014:216;;;1294:12;;1030:200;1213:2;1124:23;;1164:22;;1203:13;481:470;499:10;;559:271;651:26;;701:12;;;698:25;;810:1;755:10;767:2;755:10;;;751:19;744:33;803:9;539:3;;714:9;767:2;716:5;;762:2;847:13;;877;762:2;877:13;755:10;921;917:19;907:30;;262:16;274:1;264:12;","linkReferences":{}},"methodIdentifiers":{}}
+{"abi":null,"bytecode":{"object":"0x605780600a5f395ff3fe346053575f3560e01c8063e83a2d8214602757631f6d6ef714601f575f80fd5b4a5f5260205ff35b5f5b804990811560415760019160408260051b0152016029565b60409060205f528060205260051b015ff35b5f80fd","sourceMap":"65:19:0:-:0;109:21;;106:1;97:38;155:1;148:13","linkReferences":{}},"deployedBytecode":{"object":"0x346053575f3560e01c8063e83a2d8214602757631f6d6ef714601f575f80fd5b4a5f5260205ff35b5f5b804990811560415760019160408260051b0152016029565b60409060205f528060205260051b015ff35b5f80fd","sourceMap":"249:11:0:-:0;246:31;;324:1;311:15;305:4;301:26;344:467;349:10;344:467;;;833:10;828:120;;;985:1;975:12;;844:104;876:19;873:1;866:30;927:2;924:1;917:13;360:451;391:1;447:228;485:22;;535:12;;;532:25;;651:1;593:9;604:2;593:9;597:1;593:9;589:18;582:32;644:9;423:3;;548:9;789:2;550:5;706:2;703:1;696:13;730;737:2;730:13;782:1;778:9;774:18;771:1;764:29;261:16;273:1;263:12;","linkReferences":{}},"methodIdentifiers":{}}

package/package.json

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

package/src/bridge/AbsInbox.sol

@@ -6,12 +6,12 @@ pragma solidity ^0.8.4;
 
 import {
     DataTooLarge,
-    Deprecated,
     GasLimitTooLarge,
     InsufficientValue,
     InsufficientSubmissionCost,
     L1Forked,
     NotAllowedOrigin,
+    NotCodelessOrigin,
     NotRollupOrOwner,
     RetryableData
 } from "../libraries/Error.sol";
@@ -19,6 +19,7 @@ import "./IInboxBase.sol";
 import "./ISequencerInbox.sol";
 import "./IBridge.sol";
 import "../libraries/AddressAliasHelper.sol";
+import "../libraries/CallerChecker.sol";
 import "../libraries/DelegateCallAware.sol";
 import {
     L1MessageType_submitRetryableTx,
@@ -136,9 +137,14 @@ abstract contract AbsInbox is DelegateCallAware, PausableUpgradeable, IInboxBase
 
     /// @inheritdoc IInboxBase
     function sendL2MessageFromOrigin(
-        bytes calldata
-    ) external pure returns (uint256) {
-        revert Deprecated();
+        bytes calldata messageData
+    ) external whenNotPaused onlyAllowed returns (uint256) {
+        if (_chainIdChanged()) revert L1Forked();
+        if (!CallerChecker.isCallerCodelessOrigin()) revert NotCodelessOrigin();
+        if (messageData.length > maxDataSize) revert DataTooLarge(messageData.length, maxDataSize);
+        uint256 msgNum = _deliverToBridge(L2_MSG, msg.sender, keccak256(messageData), 0);
+        emit InboxMessageDeliveredFromOrigin(msgNum);
+        return msgNum;
     }
 
     /// @inheritdoc IInboxBase

package/src/bridge/IInboxBase.sol

@@ -16,9 +16,13 @@ interface IInboxBase is IDelayedMessageProvider {
 
     function maxDataSize() external view returns (uint256);
 
-    /// @dev Deprecated due to EIP-3074
+    /**
+     * @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
+        bytes calldata messageData
     ) external returns (uint256);
 
     /**

package/src/bridge/Inbox.sol

@@ -109,6 +109,7 @@ contract Inbox is AbsInbox, IInbox {
         if (!_chainIdChanged()) revert NotForked();
         // solhint-disable-next-line avoid-tx-origin
         if (msg.sender != tx.origin) revert NotOrigin();
+        // no code size check required because we only want to know if msg.sender is an EOA to undo alias
         // arbos will discard unsigned tx with gas limit too large
         if (gasLimit > type(uint64).max) {
             revert GasLimitTooLarge();
@@ -142,6 +143,7 @@ contract Inbox is AbsInbox, IInbox {
         if (!_chainIdChanged()) revert NotForked();
         // solhint-disable-next-line avoid-tx-origin
         if (msg.sender != tx.origin) revert NotOrigin();
+        // no code size check required because we only want to know if msg.sender is an EOA to undo alias
         // arbos will discard unsigned tx with gas limit too large
         if (gasLimit > type(uint64).max) {
             revert GasLimitTooLarge();
@@ -174,6 +176,7 @@ contract Inbox is AbsInbox, IInbox {
         if (!_chainIdChanged()) revert NotForked();
         // solhint-disable-next-line avoid-tx-origin
         if (msg.sender != tx.origin) revert NotOrigin();
+        // no code size check required because we only want to know if msg.sender is an EOA to undo alias
         // arbos will discard unsigned tx with gas limit too large
         if (gasLimit > type(uint64).max) {
             revert GasLimitTooLarge();

package/src/bridge/SequencerInbox.sol

@@ -19,6 +19,7 @@ import {
     NoSuchKeyset,
     NotForked,
     NotBatchPosterManager,
+    NotCodelessOrigin,
     RollupNotChanged,
     DataBlobsNotSupported,
     InitParamZero,
@@ -42,6 +43,7 @@ import "../rollup/IRollupLogic.sol";
 import "./Messages.sol";
 import "../precompiles/ArbGasInfo.sol";
 import "../precompiles/ArbSys.sol";
+import "../libraries/CallerChecker.sol";
 import "../libraries/IReader4844.sol";
 
 import "../libraries/DelegateCallAware.sol";
@@ -333,8 +335,7 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         uint256 prevMessageCount,
         uint256 newMessageCount
     ) external refundsGas(gasRefunder, IReader4844(address(0))) {
-        // solhint-disable-next-line avoid-tx-origin
-        if (msg.sender != tx.origin) revert NotOrigin();
+        if (!CallerChecker.isCallerCodelessOrigin()) revert NotCodelessOrigin();
         if (!isBatchPoster[msg.sender]) revert NotBatchPoster();
         if (isDelayProofRequired(afterDelayedMessagesRead)) revert DelayProofRequired();
 
@@ -387,8 +388,7 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         uint256 newMessageCount,
         DelayProof calldata delayProof
     ) external refundsGas(gasRefunder, IReader4844(address(0))) {
-        // solhint-disable-next-line avoid-tx-origin
-        if (msg.sender != tx.origin) revert NotOrigin();
+        if (!CallerChecker.isCallerCodelessOrigin()) revert NotCodelessOrigin();
         if (!isBatchPoster[msg.sender]) revert NotBatchPoster();
         if (!isDelayBufferable) revert NotDelayBufferable();
 
@@ -436,10 +436,9 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         if (hostChainIsArbitrum) revert DataBlobsNotSupported();
 
         // submit a batch spending report to refund the entity that produced the blob batch data
-        // same as using calldata, we only submit spending report if the caller is the origin of the tx
+        // same as using calldata, we only submit spending report if the caller is the origin and is codeless
         // such that one cannot "double-claim" batch posting refund in the same tx
-        // solhint-disable-next-line avoid-tx-origin
-        if (msg.sender == tx.origin && !isUsingFeeToken) {
+        if (CallerChecker.isCallerCodelessOrigin() && !isUsingFeeToken) {
             submitBatchSpendingReport(dataHash, seqMessageIndex, block.basefee, blobGas);
         }
     }
@@ -450,7 +449,7 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         uint256 afterDelayedMessagesRead,
         uint256 prevMessageCount,
         uint256 newMessageCount,
-        bool isFromOrigin
+        bool isFromCodelessOrigin
     ) internal {
         (bytes32 dataHash, IBridge.TimeBounds memory timeBounds) =
             formCallDataHash(data, afterDelayedMessagesRead);
@@ -458,7 +457,7 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         addSequencerL2BatchImpl(
             dataHash,
             afterDelayedMessagesRead,
-            isFromOrigin ? data.length : 0,
+            isFromCodelessOrigin ? data.length : 0,
             prevMessageCount,
             newMessageCount
         );
@@ -475,12 +474,12 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
             delayedAcc,
             totalDelayedMessagesRead,
             timeBounds,
-            isFromOrigin
+            isFromCodelessOrigin
                 ? IBridge.BatchDataLocation.TxInput
                 : IBridge.BatchDataLocation.SeparateBatchEvent
         );
 
-        if (!isFromOrigin) {
+        if (!isFromCodelessOrigin) {
             emit SequencerBatchData(seqMessageIndex, data);
         }
     }

package/src/challengeV2/EdgeChallengeManager.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.17;
 
 import "../rollup/Assertion.sol";
 import "./libraries/UintUtilsLib.sol";
-import "./IAssertionChain.sol";
+import "./IEdgeChallengeManager.sol";
 import "./libraries/EdgeChallengeManagerLib.sol";
 import "../libraries/Constants.sol";
 import "../state/Machine.sol";
@@ -14,230 +14,6 @@ import "../state/Machine.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-/// @title EdgeChallengeManager interface
-interface IEdgeChallengeManager {
-    /// @notice Initialize the EdgeChallengeManager. EdgeChallengeManagers are upgradeable
-    ///         so use the initializer paradigm
-    /// @param _assertionChain              The assertion chain contract
-    /// @param _challengePeriodBlocks       The amount of cumulative time an edge must spend unrivaled before it can be confirmed
-    ///                                     This should be the censorship period + the cumulative amount of time needed to do any
-    ///                                     offchain calculation. We currently estimate around 10 mins for each layer zero edge and 1
-    ///                                     one minute for each other edge.
-    /// @param _oneStepProofEntry           The one step proof logic
-    /// @param layerZeroBlockEdgeHeight     The end height of layer zero edges of type Block
-    /// @param layerZeroBigStepEdgeHeight   The end height of layer zero edges of type BigStep
-    /// @param layerZeroSmallStepEdgeHeight The end height of layer zero edges of type SmallStep
-    /// @param _stakeToken                  The token that stake will be provided in when creating zero layer block edges
-    /// @param _excessStakeReceiver         The address that excess stake will be sent to when 2nd+ block edge is created
-    /// @param _numBigStepLevel             The number of bigstep levels
-    /// @param _stakeAmounts                The stake amount for each level. (first element is for block level)
-    function initialize(
-        IAssertionChain _assertionChain,
-        uint64 _challengePeriodBlocks,
-        IOneStepProofEntry _oneStepProofEntry,
-        uint256 layerZeroBlockEdgeHeight,
-        uint256 layerZeroBigStepEdgeHeight,
-        uint256 layerZeroSmallStepEdgeHeight,
-        IERC20 _stakeToken,
-        address _excessStakeReceiver,
-        uint8 _numBigStepLevel,
-        uint256[] calldata _stakeAmounts
-    ) external;
-
-    function challengePeriodBlocks() external view returns (uint64);
-
-    /// @notice The one step proof resolver used to decide between rival SmallStep edges of length 1
-    function oneStepProofEntry() external view returns (IOneStepProofEntry);
-
-    /// @notice Performs necessary checks and creates a new layer zero edge
-    /// @param args             Edge creation args
-    function createLayerZeroEdge(
-        CreateEdgeArgs calldata args
-    ) external returns (bytes32);
-
-    /// @notice Bisect an edge. This creates two child edges:
-    ///         lowerChild: has the same start root and height as this edge, but a different end root and height
-    ///         upperChild: has the same end root and height as this edge, but a different start root and height
-    ///         The lower child end root and height are equal to the upper child start root and height. This height
-    ///         is the mandatoryBisectionHeight.
-    ///         The lower child may already exist, however it's not possible for the upper child to exist as that would
-    ///         mean that the edge has already been bisected
-    /// @param edgeId               Edge to bisect
-    /// @param bisectionHistoryRoot The new history root to be used in the lower and upper children
-    /// @param prefixProof          A proof to show that the bisectionHistoryRoot commits to a prefix of the current endHistoryRoot
-    /// @return lowerChildId        The id of the newly created lower child edge
-    /// @return upperChildId        The id of the newly created upper child edge
-    function bisectEdge(
-        bytes32 edgeId,
-        bytes32 bisectionHistoryRoot,
-        bytes calldata prefixProof
-    ) external returns (bytes32, bytes32);
-
-    /// @notice An edge can be confirmed if the total amount of time it and a single chain of its direct ancestors
-    ///         has spent unrivaled is greater than the challenge period.
-    /// @dev    Edges inherit time from their parents, so the sum of unrivaled timers is compared against the threshold.
-    ///         Given that an edge cannot become unrivaled after becoming rivaled, once the threshold is passed
-    ///         it will always remain passed. The direct ancestors of an edge are linked by parent-child links for edges
-    ///         of the same level, and claimId-edgeId links for zero layer edges that claim an edge in the level below.
-    ///         This method also includes the amount of time the assertion being claimed spent without a sibling
-    /// @param edgeId                   The id of the edge to confirm
-    function confirmEdgeByTime(
-        bytes32 edgeId,
-        AssertionStateData calldata claimStateData
-    ) external;
-
-    /// @notice Update multiple edges' timer cache by their children. Equivalent to calling updateTimerCacheByChildren for each edge.
-    ///         May update timer cache above maximum if the last edge's timer cache was below maximumCachedTime.
-    ///         Revert when the last edge's timer cache is already equal to or above maximumCachedTime.
-    /// @param edgeIds           The ids of the edges to update
-    /// @param maximumCachedTime The maximum amount of cached time allowed on the last edge (β∗)
-    function multiUpdateTimeCacheByChildren(
-        bytes32[] calldata edgeIds,
-        uint256 maximumCachedTime
-    ) external;
-
-    /// @notice Update an edge's timer cache by its children.
-    ///         Sets the edge's timer cache to its timeUnrivaled + (minimum timer cache of its children).
-    ///         May update timer cache above maximum if the last edge's timer cache was below maximumCachedTime.
-    ///         Revert when the edge's timer cache is already equal to or above maximumCachedTime.
-    /// @param edgeId            The id of the edge to update
-    /// @param maximumCachedTime The maximum amount of cached time allowed on the edge (β∗)
-    function updateTimerCacheByChildren(bytes32 edgeId, uint256 maximumCachedTime) external;
-
-    /// @notice Given a one step fork edge and an edge with matching claim id,
-    ///         set the one step fork edge's timer cache to its timeUnrivaled + claiming edge's timer cache.
-    ///         May update timer cache above maximum if the last edge's timer cache was below maximumCachedTime.
-    ///         Revert when the edge's timer cache is already equal to or above maximumCachedTime.
-    /// @param edgeId            The id of the edge to update
-    /// @param claimingEdgeId    The id of the edge which has a claimId equal to edgeId
-    /// @param maximumCachedTime The maximum amount of cached time allowed on the edge (β∗)
-    function updateTimerCacheByClaim(
-        bytes32 edgeId,
-        bytes32 claimingEdgeId,
-        uint256 maximumCachedTime
-    ) external;
-
-    /// @notice Confirm an edge by executing a one step proof
-    /// @dev    One step proofs can only be executed against edges that have length one and of type SmallStep
-    /// @param edgeId                       The id of the edge to confirm
-    /// @param oneStepData                  Input data to the one step proof
-    /// @param prevConfig                     Data about the config set in prev
-    /// @param beforeHistoryInclusionProof  Proof that the state which is the start of the edge is committed to by the startHistoryRoot
-    /// @param afterHistoryInclusionProof   Proof that the state which is the end of the edge is committed to by the endHistoryRoot
-    function confirmEdgeByOneStepProof(
-        bytes32 edgeId,
-        OneStepData calldata oneStepData,
-        ConfigData calldata prevConfig,
-        bytes32[] calldata beforeHistoryInclusionProof,
-        bytes32[] calldata afterHistoryInclusionProof
-    ) external;
-
-    /// @notice When zero layer block edges are created a stake is also provided
-    ///         The stake on this edge can be refunded if the edge is confirme
-    function refundStake(
-        bytes32 edgeId
-    ) external;
-
-    /// @notice Zero layer edges have to be a fixed height.
-    ///         This function returns the end height for a given edge type
-    function getLayerZeroEndHeight(
-        EdgeType eType
-    ) external view returns (uint256);
-
-    /// @notice Calculate the unique id of an edge
-    /// @param level            The level of the edge
-    /// @param originId         The origin id of the edge
-    /// @param startHeight      The start height of the edge
-    /// @param startHistoryRoot The start history root of the edge
-    /// @param endHeight        The end height of the edge
-    /// @param endHistoryRoot   The end history root of the edge
-    function calculateEdgeId(
-        uint8 level,
-        bytes32 originId,
-        uint256 startHeight,
-        bytes32 startHistoryRoot,
-        uint256 endHeight,
-        bytes32 endHistoryRoot
-    ) external pure returns (bytes32);
-
-    /// @notice Calculate the mutual id of the edge
-    ///         Edges that are rivals share the same mutual id
-    /// @param level            The level of the edge
-    /// @param originId         The origin id of the edge
-    /// @param startHeight      The start height of the edge
-    /// @param startHistoryRoot The start history root of the edge
-    /// @param endHeight        The end height of the edge
-    function calculateMutualId(
-        uint8 level,
-        bytes32 originId,
-        uint256 startHeight,
-        bytes32 startHistoryRoot,
-        uint256 endHeight
-    ) external pure returns (bytes32);
-
-    /// @notice Has the edge already been stored in the manager
-    function edgeExists(
-        bytes32 edgeId
-    ) external view returns (bool);
-
-    /// @notice Get full edge data for an edge
-    function getEdge(
-        bytes32 edgeId
-    ) external view returns (ChallengeEdge memory);
-
-    /// @notice The length of the edge, from start height to end height
-    function edgeLength(
-        bytes32 edgeId
-    ) external view returns (uint256);
-
-    /// @notice Does this edge currently have one or more rivals
-    ///         Rival edges share the same mutual id
-    function hasRival(
-        bytes32 edgeId
-    ) external view returns (bool);
-
-    /// @notice The confirmed rival of this mutual id
-    ///         Returns 0 if one does not exist
-    function confirmedRival(
-        bytes32 mutualId
-    ) external view returns (bytes32);
-
-    /// @notice Does the edge have at least one rival, and it has length one
-    function hasLengthOneRival(
-        bytes32 edgeId
-    ) external view returns (bool);
-
-    /// @notice The amount of time this edge has spent without rivals
-    ///         This value is increasing whilst an edge is unrivaled, once a rival is created
-    ///         it is fixed. If an edge has rivals from the moment it is created then it will have
-    ///         a zero time unrivaled
-    function timeUnrivaled(
-        bytes32 edgeId
-    ) external view returns (uint256);
-
-    /// @notice Get the id of the prev assertion that this edge is originates from
-    /// @dev    Uses the parent chain to traverse upwards SmallStep->BigStep->Block->Assertion
-    ///         until it gets to the origin assertion
-    function getPrevAssertionHash(
-        bytes32 edgeId
-    ) external view returns (bytes32);
-
-    /// @notice Fetch the raw first rival record for the given mutual id
-    /// @dev    Returns 0 if there is no edge with the given mutual id
-    ///         Returns a magic value if there is one edge but it is unrivaled
-    ///         Returns the id of the second edge created with the mutual id, if > 1 exists
-    function firstRival(
-        bytes32 mutualId
-    ) external view returns (bytes32);
-
-    /// @notice True if an account has made a layer zero edge with the given mutual id.
-    ///         This is only tracked when the validator whitelist is enabled
-    function hasMadeLayerZeroRival(
-        address account,
-        bytes32 mutualId
-    ) external view returns (bool);
-}
-
 /// @title  A challenge manager that uses edge structures to decide between Assertions
 /// @notice When two assertions are created that have the same predecessor the protocol needs to decide which of the two is correct
 ///         This challenge manager allows the staker who has created the valid assertion to enforce that it will be confirmed, and all

package/src/challengeV2/IAssertionChain.sol

@@ -2,7 +2,7 @@
 // For license information, see https://github.com/offchainlabs/bold/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 //
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.0;
 
 import "../bridge/IBridge.sol";
 import "../osp/IOneStepProofEntry.sol";