@arbitrum/nitro-contracts 1.2.0 → 1.3.0

package/src/libraries/Error.sol

@@ -167,9 +167,6 @@ error BadSequencerNumber(uint256 stored, uint256 received);
 /// @dev The sequence message number provided to this message was inconsistent with the previous one
 error BadSequencerMessageNumber(uint256 stored, uint256 received);
 
-/// @dev The batch data has the inbox authenticated bit set, but the batch data was not authenticated by the inbox
-error DataNotAuthenticated();
-
 /// @dev Tried to create an already valid Data Availability Service keyset
 error AlreadyValidDASKeyset(bytes32);
 
@@ -188,15 +185,9 @@ error InitParamZero(string name);
 /// @dev Thrown when data hashes where expected but not where present on the tx
 error MissingDataHashes();
 
-/// @dev Thrown when the data blob meta data is invalid
-error InvalidBlobMetadata();
-
 /// @dev Thrown when rollup is not updated with updateRollupAddress
 error RollupNotChanged();
 
-/// @dev Batch data was empty when non empty was expected
-error EmptyBatchData();
-
 /// @dev Unsupported header flag was provided
 error InvalidHeaderFlag(bytes1);
 
@@ -205,3 +196,6 @@ error NativeTokenMismatch();
 
 /// @dev Thrown when a deprecated function is called
 error Deprecated();
+
+/// @dev Thrown when any component of maxTimeVariation is over uint64
+error BadMaxTimeVariation();

package/src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol

@@ -0,0 +1,29 @@
+// Copyright 2021-2022, Offchain Labs, Inc.
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
+// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity ^0.8.0;
+
+import "../precompiles/ArbSys.sol";
+
+contract PendingBlkTimeAndNrAdvanceCheck {
+    uint256 immutable deployedAt;
+    uint256 immutable deployedAtBlock;
+    ArbSys constant ARB_SYS = ArbSys(address(100));
+
+    constructor() {
+        deployedAt = block.timestamp;
+        deployedAtBlock = ARB_SYS.arbBlockNumber();
+    }
+
+    function isAdvancing() external {
+        require(block.timestamp > deployedAt, "Time didn't advance");
+        require(ARB_SYS.arbBlockNumber() > deployedAtBlock, "Block didn't advance");
+    }
+
+    function checkArbBlockHashReturnsLatest(bytes32 expected) external {
+        bytes32 gotBlockHash = ARB_SYS.arbBlockHash(ARB_SYS.arbBlockNumber() - 1);
+        require(gotBlockHash != bytes32(0), "ZERO_BLOCK_HASH");
+        require(gotBlockHash == expected, "WRONG_BLOCK_HASH");
+    }
+}

package/src/mocks/SequencerInboxStub.sol

@@ -19,10 +19,10 @@ contract SequencerInboxStub is SequencerInbox {
     ) SequencerInbox(maxDataSize_, reader4844_, isUsingFeeToken_) {
         bridge = bridge_;
         rollup = IOwnable(msg.sender);
-        delayBlocks = maxTimeVariation_.delayBlocks;
-        futureBlocks = maxTimeVariation_.futureBlocks;
-        delaySeconds = maxTimeVariation_.delaySeconds;
-        futureSeconds = maxTimeVariation_.futureSeconds;
+        delayBlocks = uint64(maxTimeVariation_.delayBlocks);
+        futureBlocks = uint64(maxTimeVariation_.futureBlocks);
+        delaySeconds = uint64(maxTimeVariation_.delaySeconds);
+        futureSeconds = uint64(maxTimeVariation_.futureSeconds);
         isBatchPoster[sequencer_] = true;
     }
 

package/src/osp/IOneStepProofEntry.sol

@@ -11,6 +11,16 @@ library OneStepProofEntryLib {
 }
 
 interface IOneStepProofEntry {
+    function getStartMachineHash(bytes32 globalStateHash, bytes32 wasmModuleRoot)
+        external
+        pure
+        returns (bytes32);
+
+    function getEndMachineHash(MachineStatus status, bytes32 globalStateHash)
+        external
+        pure
+        returns (bytes32);
+
     function proveOneStep(
         ExecutionContext calldata execCtx,
         uint256 machineStep,

package/src/osp/OneStepProofEntry.sol

@@ -31,6 +31,53 @@ contract OneStepProofEntry is IOneStepProofEntry {
         proverHostIo = proverHostIo_;
     }
 
+    // Copied from ChallengeLib.sol
+    function getStartMachineHash(bytes32 globalStateHash, bytes32 wasmModuleRoot)
+        external
+        pure
+        returns (bytes32)
+    {
+        // Start the value stack with the function call ABI for the entrypoint
+        Value[] memory startingValues = new Value[](3);
+        startingValues[0] = ValueLib.newRefNull();
+        startingValues[1] = ValueLib.newI32(0);
+        startingValues[2] = ValueLib.newI32(0);
+        ValueArray memory valuesArray = ValueArray({inner: startingValues});
+        ValueStack memory values = ValueStack({proved: valuesArray, remainingHash: 0});
+        ValueStack memory internalStack;
+        StackFrameWindow memory frameStack;
+
+        Machine memory mach = Machine({
+            status: MachineStatus.RUNNING,
+            valueStack: values,
+            internalStack: internalStack,
+            frameStack: frameStack,
+            globalStateHash: globalStateHash,
+            moduleIdx: 0,
+            functionIdx: 0,
+            functionPc: 0,
+            modulesRoot: wasmModuleRoot
+        });
+        return mach.hash();
+    }
+
+    // Copied from ChallengeLib.sol
+    function getEndMachineHash(MachineStatus status, bytes32 globalStateHash)
+        external
+        pure
+        returns (bytes32)
+    {
+        if (status == MachineStatus.FINISHED) {
+            return keccak256(abi.encodePacked("Machine finished:", globalStateHash));
+        } else if (status == MachineStatus.ERRORED) {
+            return keccak256(abi.encodePacked("Machine errored:"));
+        } else if (status == MachineStatus.TOO_FAR) {
+            return keccak256(abi.encodePacked("Machine too far:"));
+        } else {
+            revert("BAD_BLOCK_STATUS");
+        }
+    }
+
     function proveOneStep(
         ExecutionContext calldata execCtx,
         uint256 machineStep,