@arbitrum/nitro-contracts 3.0.0-alpha.2 → 3.0.0-beta.1

package/build/contracts/src/rollup/ValidatorWallet.sol/ValidatorWallet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/rollup/ValidatorWalletCreator.sol/ValidatorWalletCreator.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/Deserialize.sol/Deserialize.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/GlobalState.sol/GlobalStateLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/Instructions.sol/Instructions.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/Machine.sol/MachineLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/MerkleProof.sol/MerkleProofLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/Module.sol/ModuleLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/ModuleMemory.sol/ModuleMemoryLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/ModuleMemoryCompact.sol/ModuleMemoryCompactLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/MultiStack.sol/MultiStackLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/PcArray.sol/PcArrayLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/StackFrame.sol/StackFrameLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/Value.sol/ValueLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/ValueArray.sol/ValueArrayLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/build/contracts/src/state/ValueStack.sol/ValueStackLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/a354aaf7cb79bc63f750c0ca36db8cc9.json"
+  "buildInfo": "../../../build-info/333933d304b0c599711e6e34df65b848.json"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arbitrum/nitro-contracts",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-beta.1",
   "description": "Layer 2 precompiles and rollup for Arbitrum Nitro",
   "author": "Offchain Labs, Inc.",
   "license": "BUSL-1.1",
@@ -52,7 +52,7 @@
     "create-rollup-testnode": "hardhat run scripts/local-deployment/deployCreatorAndCreateRollup.ts",
     "script:bold-prepare": "hardhat run ./scripts/prepareBoldUpgrade.ts",
     "script:bold-populate-lookup": "hardhat run ./scripts/populateLookup.ts",
-    "script:bold-local-execute": "hardhat run ./scripts/testLocalExecuteBoldUpgrade.ts",
+    "script:bold-local-execute": "hardhat run ./scripts/executeBoldUpgrade.ts",
     "deploy-cachemanager-testnode": "hardhat run scripts/local-deployment/deployCacheManager.ts"
   },
   "dependencies": {
@@ -64,7 +64,6 @@
   },
   "private": false,
   "devDependencies": {
-    "@arbitrum/nitro-contracts-2.0.0": "npm:@arbitrum/nitro-contracts@2.0.0-beta.0",
     "@arbitrum/sdk": "^3.4.1",
     "@ethersproject/providers": "^5.7.2",
     "@nomicfoundation/hardhat-verify": "^2.0.9",

package/src/bridge/AbsBridge.sol

@@ -121,8 +121,8 @@ abstract contract AbsBridge is Initializable, DelegateCallAware, IBridge {
         }
         sequencerReportedSubMessageCount = newMessageCount;
         seqMessageIndex = sequencerInboxAccs.length;
-        if (sequencerInboxAccs.length > 0) {
-            beforeAcc = sequencerInboxAccs[sequencerInboxAccs.length - 1];
+        if (seqMessageIndex > 0) {
+            beforeAcc = sequencerInboxAccs[seqMessageIndex - 1];
         }
         if (afterDelayedMessagesRead > 0) {
             delayedAcc = delayedInboxAccs[afterDelayedMessagesRead - 1];

package/src/bridge/ERC20Bridge.sol

@@ -78,7 +78,9 @@ contract ERC20Bridge is AbsBridge, IERC20Bridge {
         uint256 amount
     ) internal override {
         // fetch native token from Inbox
-        IERC20(nativeToken).safeTransferFrom(msg.sender, address(this), amount);
+        if (amount > 0) {
+            IERC20(nativeToken).safeTransferFrom(msg.sender, address(this), amount);
+        }
     }
 
     function _executeLowLevelCall(
@@ -95,7 +97,9 @@ contract ERC20Bridge is AbsBridge, IERC20Bridge {
         }
 
         // first release native token
-        IERC20(_nativeToken).safeTransfer(to, value);
+        if (value > 0) {
+            IERC20(_nativeToken).safeTransfer(to, value);
+        }
         success = true;
 
         // if there's data do additional contract call. Make sure that call is not used to

package/src/express-lane-auction/Balance.sol

@@ -0,0 +1,137 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import "./Errors.sol";
+
+/// @notice Account balance and the round at which it can be withdrawn
+///         Balances are withdrawn as part of a two step process - initiation and finalization
+///         This is so that a bidder can't withdraw their balance after making a bid
+///         Instead, if they initiate their withdrawal in round r, they must wait until the beginning of
+///         round r+2 before they can withdraw the balance. In the mean time their balance can be used to
+///         resolve an auction if it is part of a valid bid, however the auctioneer may choose to
+///         reject bids from accounts with an initiated balance withdrawal
+struct Balance {
+    /// @notice The amount of balance in the account
+    uint256 balance;
+    /// @notice The round at which all of the balance can be withdrawn
+    ///         Is set to uint64.max when no withdrawal has been intiated
+    uint64 withdrawalRound;
+}
+
+/// @notice Balance mutation and view functionality. This is in it's own library so that we can
+//          reason about and test how the different ways balance mutations interact with each other
+library BalanceLib {
+    /// @notice The available balance at the supplied round. Returns 0 if a withdrawal has been initiated and has
+    ///         past the withdrawal round.
+    /// @param bal The balance to query
+    /// @param round The round to check the balance in
+    function balanceAtRound(Balance storage bal, uint64 round) internal view returns (uint256) {
+        return bal.balance - withdrawableBalanceAtRound(bal, round);
+    }
+
+    /// @notice The withdrawable balance at the supplied round. If a withdrawal has been initiated, the
+    ///         supplied round is past the withdrawal round and has yet to be finalized, then the balance
+    ///         of this account is returned. Otherwise 0.
+    /// @param bal The balance to query
+    /// @param round The round to check the withdrawable balance in
+    function withdrawableBalanceAtRound(
+        Balance storage bal,
+        uint64 round
+    ) internal view returns (uint256) {
+        return round >= bal.withdrawalRound ? bal.balance : 0;
+    }
+
+    /// @notice Increase a balance by a specified amount
+    ///         Will cancel a withdrawal if called after a withdrawal has been initiated
+    /// @param bal The balance info
+    /// @param amount The amount to increase the balance by
+    function increase(Balance storage bal, uint256 amount) internal {
+        // no point increasing if no amount is being supplied
+        if (amount == 0) {
+            revert ZeroAmount();
+        }
+
+        // if the balance have never been used before then balance and withdrawal round will be 0
+        // in this case we initialize the balance by setting the withdrawal round into the future
+        // if a withdrawal for the balance has been initialized (withdrawal round != 0 and != max)
+        // then we cancel that initiated withdrawal. We do this since if a increase is being made that
+        // means a user wishes to increase their balance, not withdraw it.
+        if (bal.withdrawalRound != type(uint64).max) {
+            bal.withdrawalRound = type(uint64).max;
+        }
+
+        bal.balance += amount;
+    }
+
+    /// @notice Reduce a balance immediately. The balance must already be greater than the amount
+    ///         and a withdrawal has been initiated for this balance it must be occuring in
+    ///         a round after the supplied round. Withdrawals earlier than that will block this reduce.
+    /// @param bal The balance to reduce
+    /// @param amount The amount to reduce by
+    /// @param round The round to check withdrawals against. A withdrawal after this round will be ignored
+    ///              and the balance reduced anyway, withdrawals before or on this round will be respected
+    ///              and the reduce will revert
+    function reduce(Balance storage bal, uint256 amount, uint64 round) internal {
+        uint256 balRnd = balanceAtRound(bal, round);
+        // we add a zero check since it's possible for the amount to be zero
+        // but even in that case the user must have some balance
+        // to enforce that parties that havent done the deposit step cannot take part in the auction
+        if (balRnd == 0 || balRnd < amount) {
+            revert InsufficientBalance(amount, balRnd);
+        }
+
+        bal.balance -= amount;
+    }
+
+    /// @notice Initiate a withdrawal. A withdrawal is a reduction of the full amount.
+    ///         Withdrawal is a two step process initialization and finalization. Finalization is only
+    ///         after the supplied round parameter. The expected usage is to specify a round that is 2
+    ///         in the future to ensure that the balance cannot be reduced unexpectedly without notice.
+    //          An external observer can see that a withdrawal has been initiated, and will therefore
+    ///         be able to take it into account and not rely on the balance being there.
+    ///         In the case of the auction contract this allows the bidders to withdraw their
+    ///         balance, but an auctioneer will know not to accept there bids in the mean time
+    /// @param bal The balance to iniate a reduction on
+    /// @param round The round that the withdrawal will be available in. Cannot be specified as the max round
+    function initiateWithdrawal(Balance storage bal, uint64 round) internal {
+        if (bal.balance == 0) {
+            revert ZeroAmount();
+        }
+
+        if (round == type(uint64).max) {
+            // we use max round to specify that a withdrawal is not taking place
+            // so we dont allow it as a withdrawal round. In practice max round should never
+            // be reached so this isnt an issue, we just put this here as an additional
+            // safety check
+            revert WithdrawalMaxRound();
+        }
+
+        if (bal.withdrawalRound != type(uint64).max) {
+            revert WithdrawalInProgress();
+        }
+
+        bal.withdrawalRound = round;
+    }
+
+    /// @notice Finalize an already initialized withdrawal. Reduces the balance to 0.
+    ///         Can only be called two round after the withdrawal was initiated.
+    /// @param bal The balance to finalize
+    /// @param round The round to check whether withdrawal is valid in. Usually the current round. Cannot be max round.
+    function finalizeWithdrawal(Balance storage bal, uint64 round) internal returns (uint256) {
+        if (round == type(uint64).max) {
+            // we use max round to specify that a withdrawal is not taking place
+            // so we dont allow it as a withdrawal round. In practice max round should never
+            // be reached so this isnt an issue, we just put this here as an additional
+            // safety check
+            revert WithdrawalMaxRound();
+        }
+
+        uint256 withdrawableBalance = withdrawableBalanceAtRound(bal, round);
+        if (withdrawableBalance == 0) {
+            revert NothingToWithdraw();
+        }
+
+        bal.balance = 0;
+        return withdrawableBalance;
+    }
+}

package/src/express-lane-auction/Burner.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import {ERC20BurnableUpgradeable} from
+    "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";
+import "./Errors.sol";
+
+/// @notice A simple contract that can burn any tokens that are transferred to it
+///         Token must support the ERC20BurnableUpgradeable.burn(uint256) interface
+contract Burner {
+    ERC20BurnableUpgradeable public immutable token;
+
+    constructor(
+        address _token
+    ) {
+        if (_token == address(0)) {
+            revert ZeroAddress();
+        }
+        token = ERC20BurnableUpgradeable(_token);
+    }
+
+    /// @notice Can be called at any time by anyone to burn any tokens held by this burner
+    function burn() external {
+        token.burn(token.balanceOf(address(this)));
+    }
+}

package/src/express-lane-auction/ELCRound.sol

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import "./Errors.sol";
+
+/// @notice When an auction round is resolved a new express lane controller is chosen for that round
+///         An elc round stores that selected express lane controller against the round number
+struct ELCRound {
+    /// @notice The express lane controller for this round
+    address expressLaneController;
+    /// @notice The round number
+    uint64 round;
+}
+
+/// @notice Latest resolved express lane controller auction rounds
+//          Only the two latest resolved rounds are stored
+library LatestELCRoundsLib {
+    /// @notice The last resolved express lane controller round, and its index in the array
+    /// @param rounds The stored resolved rounds
+    /// @return The last resolved elc round
+    /// @return The index of that last resolved round within the supplied array
+    function latestELCRound(
+        ELCRound[2] storage rounds
+    ) internal view returns (ELCRound storage, uint8) {
+        ELCRound storage latestRound = rounds[0];
+        uint8 index = 0;
+        if (latestRound.round < rounds[1].round) {
+            latestRound = rounds[1];
+            index = 1;
+        }
+        return (latestRound, index);
+    }
+
+    /// @notice Finds the elc round that matches the supplied round. Reverts if no matching round found.
+    /// @param latestResolvedRounds The resolved elc rounds
+    /// @param round The round number to find a resolved round for
+    function resolvedRound(
+        ELCRound[2] storage latestResolvedRounds,
+        uint64 round
+    ) internal view returns (ELCRound storage) {
+        if (latestResolvedRounds[0].round == round) {
+            return latestResolvedRounds[0];
+        } else if (latestResolvedRounds[1].round == round) {
+            return latestResolvedRounds[1];
+        } else {
+            // not resolved or too old
+            revert RoundNotResolved(round);
+        }
+    }
+
+    /// @notice Set a resolved round into the array, overwriting the oldest resolved round
+    ///         in the array.
+    /// @param latestResolvedRounds The resolved rounds aray
+    /// @param round The round to resolve
+    /// @param expressLaneController The new express lane controller for that round
+    function setResolvedRound(
+        ELCRound[2] storage latestResolvedRounds,
+        uint64 round,
+        address expressLaneController
+    ) internal {
+        (ELCRound storage lastRoundResolved, uint8 index) = latestELCRound(latestResolvedRounds);
+        if (lastRoundResolved.round >= round) {
+            revert RoundAlreadyResolved(round);
+        }
+
+        // dont replace the newest round, use the oldest slot
+        uint8 oldestRoundIndex = index ^ 1;
+        latestResolvedRounds[oldestRoundIndex] = ELCRound(expressLaneController, round);
+    }
+}

package/src/express-lane-auction/Errors.sol

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+error InsufficientBalance(uint256 amountRequested, uint256 balance);
+error InsufficientBalanceAcc(address account, uint256 amountRequested, uint256 balance);
+error RoundDurationTooShort();
+error NothingToWithdraw();
+error ZeroAmount();
+error ZeroBiddingToken();
+error WithdrawalInProgress();
+error WithdrawalMaxRound();
+error RoundAlreadyResolved(uint64 round);
+error SameBidder();
+error BidsWrongOrder();
+error TieBidsWrongOrder();
+error AuctionNotClosed();
+error ReservePriceTooLow(uint256 reservePrice, uint256 minReservePrice);
+error ReservePriceNotMet(uint256 bidAmount, uint256 reservePrice);
+error ReserveBlackout();
+error RoundTooOld(uint64 round, uint64 currentRound);
+error RoundNotResolved(uint64 round);
+error NotExpressLaneController(uint64 round, address controller, address sender);
+error FixedTransferor(uint64 fixedUntilRound);
+error NotTransferor(uint64 round, address expectedTransferor, address msgSender);
+error InvalidNewRound(uint64 currentRound, uint64 newRound);
+error InvalidNewStart(uint64 currentStart, uint64 newStart);
+error RoundTooLong(uint64 roundDurationSeconds);
+error ZeroAuctionClosingSeconds();
+error NegativeOffset();
+error NegativeRoundStart(int64 roundStart);
+error ZeroAddress();