@arbitrum/nitro-contracts 1.0.0-beta.5 → 1.0.0-beta.8

package/src/precompiles/ArbAggregator.sol

@@ -7,45 +7,35 @@ pragma solidity >=0.4.21 <0.9.0;
 /// @title Provides aggregators and their users methods for configuring how they participate in L1 aggregation.
 /// @notice Precompiled contract that exists in every Arbitrum chain at 0x000000000000000000000000000000000000006d
 interface ArbAggregator {
-    /// @notice Get the preferred aggregator for an address.
-    /// @param addr The address to fetch aggregator for
-    /// @return (preferredAggregatorAddress, isDefault)
-    ///     isDefault is true if addr is set to prefer the default aggregator
+    /// @notice Deprecated, customization of preferred aggregator is no longer supported
+    /// @notice Get the address of an arbitrarily chosen batch poster.
+    /// @param addr ignored
+    /// @return (batchPosterAddress, true)
     function getPreferredAggregator(address addr) external view returns (address, bool);
 
-    /// @notice Set the caller's preferred aggregator.
-    /// @param prefAgg If prefAgg is zero, this sets the caller to prefer the default aggregator
-    function setPreferredAggregator(address prefAgg) external;
-
+    /// @notice Deprecated, there is no longer a single preferred aggregator, use getBatchPosters instead
     /// @notice Get default aggregator.
     function getDefaultAggregator() external view returns (address);
 
-    /// @notice Set the preferred aggregator.
-    /// This reverts unless called by the aggregator, its fee collector, or a chain owner
-    /// @param newDefault New default aggregator
-    function setDefaultAggregator(address newDefault) external;
-
-    /// @notice Get the aggregator's compression ratio
-    /// @param aggregator The aggregator to fetch the compression ratio for
-    /// @return The compression ratio, measured in basis points
-    function getCompressionRatio(address aggregator) external view returns (uint64);
-
-    /// @notice Set the aggregator's compression ratio
-    /// This reverts unless called by the aggregator, its fee collector, or a chain owner
-    /// @param aggregator The aggregator to set the compression ratio for
-    /// @param ratio The compression ratio, measured in basis points
-    function setCompressionRatio(address aggregator, uint64 ratio) external;
-
-    /// @notice Get the address where fees to aggregator are sent.
-    /// @param aggregator The aggregator to get the fee collector for
-    /// @return The fee collectors address. This will often but not always be the same as the aggregator's address.
-    function getFeeCollector(address aggregator) external view returns (address);
-
-    /// @notice Set the address where fees to aggregator are sent.
-    /// This reverts unless called by the aggregator, its fee collector, or a chain owner
-    /// @param aggregator The aggregator to set the fee collector for
+    /// @notice Get a list of all current batch posters
+    /// @return Batch poster addresses
+    function getBatchPosters() external view returns (address[] memory);
+
+    /// @notice Adds newBatchPoster as a batch poster
+    /// This reverts unless called by a chain owner
+    /// @param newBatchPoster New batch poster
+    function addBatchPoster(address newBatchPoster) external;
+
+    /// @notice Get the address where fees to batchPoster are sent.
+    /// @param batchPoster The batch poster to get the fee collector for
+    /// @return The fee collectors address. This will sometimes but not always be the same as the batch poster's address.
+    function getFeeCollector(address batchPoster) external view returns (address);
+
+    /// @notice Set the address where fees to batchPoster are sent.
+    /// This reverts unless called by the batch poster, its fee collector, or a chain owner
+    /// @param batchPoster The batch poster to set the fee collector for
     /// @param newFeeCollector The new fee collector to set
-    function setFeeCollector(address aggregator, address newFeeCollector) external;
+    function setFeeCollector(address batchPoster, address newFeeCollector) external;
 
     /// @notice Deprecated, always returns zero
     /// @notice Get the tx base fee (in approximate L1 gas) for aggregator

package/src/precompiles/ArbBLS.sol

@@ -4,50 +4,8 @@
 
 pragma solidity >=0.4.21 <0.9.0;
 
-/// @title Provides a registry of BLS public keys for accounts.
+/// @title Disabled precompile, formerly used to register BLS public keys.
 /// @notice Precompiled contract that exists in every Arbitrum chain at 0x0000000000000000000000000000000000000067.
 interface ArbBLS {
-    /// @notice Deprecated -- equivalent to registerAltBN128
-    function register(
-        uint256 x0,
-        uint256 x1,
-        uint256 y0,
-        uint256 y1
-    ) external; // DEPRECATED
 
-    /// @notice Deprecated -- equivalent to getAltBN128
-    function getPublicKey(address addr)
-        external
-        view
-        returns (
-            uint256,
-            uint256,
-            uint256,
-            uint256
-        ); // DEPRECATED
-
-    /// @notice Associate an AltBN128 public key with the caller's address
-    function registerAltBN128(
-        uint256 x0,
-        uint256 x1,
-        uint256 y0,
-        uint256 y1
-    ) external;
-
-    /// @notice Get the AltBN128 public key associated with an address (revert if there isn't one)
-    function getAltBN128(address addr)
-        external
-        view
-        returns (
-            uint256,
-            uint256,
-            uint256,
-            uint256
-        );
-
-    /// @notice Associate a BLS 12-381 public key with the caller's address
-    function registerBLS12381(bytes calldata key) external;
-
-    /// @notice Get the BLS 12-381 public key associated with an address (revert if there isn't one)
-    function getBLS12381(address addr) external view returns (bytes memory);
 }

package/src/precompiles/ArbGasInfo.sol

@@ -75,7 +75,7 @@ interface ArbGasInfo {
             uint256
         );
 
-    /// @notice Get the gas accounting parameters
+    /// @notice Get the gas accounting parameters. `gasPoolMax` is always zero, as the exponential pricing model has no such notion.
     /// @return (speedLimitPerSecond, gasPoolMax, maxTxGasLimit)
     function getGasAccountingParams()
         external
@@ -89,21 +89,6 @@ interface ArbGasInfo {
     /// @notice Get the minimum gas price needed for a tx to succeed
     function getMinimumGasPrice() external view returns (uint256);
 
-    /// @notice Get the number of seconds worth of the speed limit the gas pool contains
-    function getGasPoolSeconds() external view returns (uint64);
-
-    /// @notice Get the target fullness in bips the pricing model will try to keep the pool at
-    function getGasPoolTarget() external view returns (uint64);
-
-    /// @notice Get the extent in bips to which the pricing model favors filling the pool over increasing speeds
-    function getGasPoolWeight() external view returns (uint64);
-
-    /// @notice Get ArbOS's estimate of the amount of gas being burnt per second
-    function getRateEstimate() external view returns (uint64);
-
-    /// @notice Get how slowly ArbOS updates its estimate the amount of gas being burnt per second
-    function getRateEstimateInertia() external view returns (uint64);
-
     /// @notice Get ArbOS's estimate of the L1 basefee in wei
     function getL1BaseFeeEstimate() external view returns (uint256);
 
@@ -116,9 +101,6 @@ interface ArbGasInfo {
     /// @notice Get L1 gas fees paid by the current transaction
     function getCurrentTxL1GasFees() external view returns (uint256);
 
-    /// @notice Get the amount of gas remaining in the gas pool
-    function getGasPool() external view returns (int64);
-
     /// @notice Get the backlogged amount of gas burnt in excess of the speed limit
     function getGasBacklog() external view returns (uint64);
 
@@ -127,4 +109,13 @@ interface ArbGasInfo {
 
     /// @notice Get the forgivable amount of backlogged gas ArbOS will ignore when raising the basefee
     function getGasBacklogTolerance() external view returns (uint64);
+
+    /// @notice Returns the surplus of funds for L1 batch posting payments (may be negative).
+    function getL1PricingSurplus() external view returns (int256);
+
+    /// @notice Returns the base charge (in L1 gas) attributed to each data batch in the calldata pricer
+    function getPerBatchGasCharge() external view returns (int64);
+
+    /// @notice Returns the cost amortization cap in basis points
+    function getAmortizedCostCapBips() external view returns (uint64);
 }

package/src/precompiles/ArbOwner.sol

@@ -24,9 +24,6 @@ interface ArbOwner {
     /// @notice Retrieves the list of chain owners
     function getAllChainOwners() external view returns (address[] memory);
 
-    /// @notice Set the L1 basefee estimate directly, bypassing the autoregression
-    function setL1BaseFeeEstimate(uint256 priceInWei) external;
-
     /// @notice Set how slowly ArbOS updates its estimate of the L1 basefee
     function setL1BaseFeeEstimateInertia(uint64 inertia) external;
 
@@ -39,18 +36,6 @@ interface ArbOwner {
     /// @notice Set the computational speed limit for the chain
     function setSpeedLimit(uint64 limit) external;
 
-    /// @notice Set the number of seconds worth of the speed limit the gas pool contains
-    function setGasPoolSeconds(uint64 factor) external;
-
-    /// @notice Set the target fullness in bips the pricing model will try to keep the pool at
-    function setGasPoolTarget(uint64 target) external;
-
-    /// @notice Set the extent in bips to which the pricing model favors filling the pool over increasing speeds
-    function setGasPoolWeight(uint64 weight) external;
-
-    /// @notice Set how slowly ArbOS updates its estimate the amount of gas being burnt per second
-    function setRateEstimateInertia(uint64 inertia) external;
-
     /// @notice Set the maximum size a tx (and block) can be
     function setMaxTxGasLimit(uint64 limit) external;
 
@@ -69,6 +54,27 @@ interface ArbOwner {
     /// @notice Upgrades ArbOS to the requested version at the requested timestamp
     function scheduleArbOSUpgrade(uint64 newVersion, uint64 timestamp) external;
 
+    /// @notice Sets equilibration units parameter for L1 price adjustment algorithm
+    function setL1PricingEquilibrationUnits(uint256 equilibrationUnits) external;
+
+    /// @notice Sets inertia parameter for L1 price adjustment algorithm
+    function setL1PricingInertia(uint64 inertia) external;
+
+    /// @notice Sets reward recipient address for L1 price adjustment algorithm
+    function setL1PricingRewardRecipient(address recipient) external;
+
+    /// @notice Sets reward amount for L1 price adjustment algorithm, in wei per unit
+    function setL1PricingRewardRate(uint64 weiPerUnit) external;
+
+    /// @notice Set how much ArbOS charges per L1 gas spent on transaction data.
+    function setL1PricePerUnit(uint256 pricePerUnit) external;
+
+    /// @notice Sets the base charge (in L1 gas) attributed to each data batch in the calldata pricer
+    function setPerBatchGasCharge(int64 cost) external;
+
+    /// @notice Sets the cost amortization cap in basis points
+    function setAmortizedCostCapBips(uint64 cap) external;
+
     // Emitted when a successful call is made to this precompile
     event OwnerActs(bytes4 indexed method, address indexed owner, bytes data);
 }

package/src/precompiles/ArbRetryableTx.sol

@@ -55,6 +55,13 @@ interface ArbRetryableTx {
      */
     function cancel(bytes32 ticketId) external;
 
+    /**
+     * @notice Gets the redeemer of the current retryable redeem attempt.
+     * Returns the zero address if the current transaction is not a retryable redeem attempt.
+     * If this is an auto-redeem, returns the fee refund address of the retryable.
+     */
+    function getCurrentRedeemer() external view returns (address);
+
     /**
      * @notice Do not call. This method represents a retryable submission to aid explorers.
      * Calling it will always revert.
@@ -80,7 +87,9 @@ interface ArbRetryableTx {
         bytes32 indexed retryTxHash,
         uint64 indexed sequenceNum,
         uint64 donatedGas,
-        address gasDonor
+        address gasDonor,
+        uint256 maxRefund,
+        uint256 submissionFeeRefund
     );
     event Canceled(bytes32 indexed ticketId);
 

package/src/precompiles/ArbSys.sol

@@ -36,13 +36,13 @@ interface ArbSys {
 
     /**
      * @notice Returns 0 since Nitro has no concept of storage gas
-     * @return int 0
+     * @return uint 0
      */
-    function getStorageGasAvailable() external returns (uint256);
+    function getStorageGasAvailable() external view returns (uint256);
 
     /**
-     * @notice check if current call is coming from l1
-     * @return true if the caller of this was called directly from L1
+     * @notice check if current call is top level (meaning it was triggered by an EoA or a L1 contract)
+     * @return true if current execution frame is not a call by another L2 contract
      */
     function isTopLevelCall() external view returns (bool);
 

package/src/precompiles/ArbosActs.sol

@@ -26,16 +26,23 @@ interface ArbosActs {
     /**
      * @notice ArbOS "calls" this when starting a block
      * @param l1BaseFee the L1 BaseFee
-     * @param l2BaseFeeLastBlock the L2 BaseFee in the last block's header
      * @param l1BlockNumber the L1 block number
      * @param timePassed number of seconds since the last block
      */
     function startBlock(
         uint256 l1BaseFee,
-        uint256 l2BaseFeeLastBlock,
         uint64 l1BlockNumber,
+        uint64 l2BlockNumber,
         uint64 timePassed
     ) external;
 
+    function batchPostingReport(
+        uint256 batchTimestamp,
+        address batchPosterAddress,
+        uint64 batchNumber,
+        uint64 batchDataGas,
+        uint256 l1BaseFeeWei
+    ) external;
+
     error CallerNotArbOS();
 }

package/src/rollup/BridgeCreator.sol

@@ -9,40 +9,40 @@ import "../bridge/SequencerInbox.sol";
 import "../bridge/ISequencerInbox.sol";
 import "../bridge/Inbox.sol";
 import "../bridge/Outbox.sol";
-import "./RollupEventBridge.sol";
+import "./RollupEventInbox.sol";
 
 import "../bridge/IBridge.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
 contract BridgeCreator is Ownable {
-    Bridge public delayedBridgeTemplate;
+    Bridge public bridgeTemplate;
     SequencerInbox public sequencerInboxTemplate;
     Inbox public inboxTemplate;
-    RollupEventBridge public rollupEventBridgeTemplate;
+    RollupEventInbox public rollupEventInboxTemplate;
     Outbox public outboxTemplate;
 
     event TemplatesUpdated();
 
     constructor() Ownable() {
-        delayedBridgeTemplate = new Bridge();
+        bridgeTemplate = new Bridge();
         sequencerInboxTemplate = new SequencerInbox();
         inboxTemplate = new Inbox();
-        rollupEventBridgeTemplate = new RollupEventBridge();
+        rollupEventInboxTemplate = new RollupEventInbox();
         outboxTemplate = new Outbox();
     }
 
     function updateTemplates(
-        address _delayedBridgeTemplate,
+        address _bridgeTemplate,
         address _sequencerInboxTemplate,
         address _inboxTemplate,
-        address _rollupEventBridgeTemplate,
+        address _rollupEventInboxTemplate,
         address _outboxTemplate
     ) external onlyOwner {
-        delayedBridgeTemplate = Bridge(_delayedBridgeTemplate);
+        bridgeTemplate = Bridge(_bridgeTemplate);
         sequencerInboxTemplate = SequencerInbox(_sequencerInboxTemplate);
         inboxTemplate = Inbox(_inboxTemplate);
-        rollupEventBridgeTemplate = RollupEventBridge(_rollupEventBridgeTemplate);
+        rollupEventInboxTemplate = RollupEventInbox(_rollupEventInboxTemplate);
         outboxTemplate = Outbox(_outboxTemplate);
 
         emit TemplatesUpdated();
@@ -50,10 +50,10 @@ contract BridgeCreator is Ownable {
 
     struct CreateBridgeFrame {
         ProxyAdmin admin;
-        Bridge delayedBridge;
+        Bridge bridge;
         SequencerInbox sequencerInbox;
         Inbox inbox;
-        RollupEventBridge rollupEventBridge;
+        RollupEventInbox rollupEventInbox;
         Outbox outbox;
     }
 
@@ -67,16 +67,14 @@ contract BridgeCreator is Ownable {
             Bridge,
             SequencerInbox,
             Inbox,
-            RollupEventBridge,
+            RollupEventInbox,
             Outbox
         )
     {
         CreateBridgeFrame memory frame;
         {
-            frame.delayedBridge = Bridge(
-                address(
-                    new TransparentUpgradeableProxy(address(delayedBridgeTemplate), adminProxy, "")
-                )
+            frame.bridge = Bridge(
+                address(new TransparentUpgradeableProxy(address(bridgeTemplate), adminProxy, ""))
             );
             frame.sequencerInbox = SequencerInbox(
                 address(
@@ -86,10 +84,10 @@ contract BridgeCreator is Ownable {
             frame.inbox = Inbox(
                 address(new TransparentUpgradeableProxy(address(inboxTemplate), adminProxy, ""))
             );
-            frame.rollupEventBridge = RollupEventBridge(
+            frame.rollupEventInbox = RollupEventInbox(
                 address(
                     new TransparentUpgradeableProxy(
-                        address(rollupEventBridgeTemplate),
+                        address(rollupEventInboxTemplate),
                         adminProxy,
                         ""
                     )
@@ -100,20 +98,17 @@ contract BridgeCreator is Ownable {
             );
         }
 
-        frame.delayedBridge.initialize();
-        frame.sequencerInbox.initialize(IBridge(frame.delayedBridge), rollup, maxTimeVariation);
-        frame.inbox.initialize(IBridge(frame.delayedBridge));
-        frame.rollupEventBridge.initialize(address(frame.delayedBridge), rollup);
-        frame.outbox.initialize(rollup, IBridge(frame.delayedBridge));
-
-        frame.delayedBridge.setInbox(address(frame.inbox), true);
-        frame.delayedBridge.transferOwnership(rollup);
+        frame.bridge.initialize(IOwnable(rollup));
+        frame.sequencerInbox.initialize(IBridge(frame.bridge), maxTimeVariation);
+        frame.inbox.initialize(IBridge(frame.bridge), ISequencerInbox(frame.sequencerInbox));
+        frame.rollupEventInbox.initialize(IBridge(frame.bridge));
+        frame.outbox.initialize(IBridge(frame.bridge));
 
         return (
-            frame.delayedBridge,
+            frame.bridge,
             frame.sequencerInbox,
             frame.inbox,
-            frame.rollupEventBridge,
+            frame.rollupEventInbox,
             frame.outbox
         );
     }

package/src/rollup/IRollupCore.sol

@@ -59,13 +59,13 @@ interface IRollupCore {
 
     function wasmModuleRoot() external view returns (bytes32);
 
-    function delayedBridge() external view returns (IBridge);
+    function bridge() external view returns (IBridge);
 
-    function sequencerBridge() external view returns (ISequencerInbox);
+    function sequencerInbox() external view returns (ISequencerInbox);
 
     function outbox() external view returns (IOutbox);
 
-    function rollupEventBridge() external view returns (IRollupEventBridge);
+    function rollupEventInbox() external view returns (IRollupEventInbox);
 
     function challengeManager() external view returns (IChallengeManager);
 

package/src/rollup/{IRollupEventBridge.sol → IRollupEventInbox.sol}

@@ -6,10 +6,10 @@ pragma solidity ^0.8.0;
 
 import "../bridge/IBridge.sol";
 
-interface IRollupEventBridge {
+interface IRollupEventInbox {
     function bridge() external view returns (IBridge);
 
-    function initialize(address _bridge, address _rollup) external;
+    function initialize(IBridge _bridge) external;
 
     function rollup() external view returns (address);
 

package/src/rollup/IRollupLogic.sol

@@ -8,8 +8,9 @@ import "./RollupLib.sol";
 import "./IRollupCore.sol";
 import "../bridge/ISequencerInbox.sol";
 import "../bridge/IOutbox.sol";
+import "../bridge/IOwnable.sol";
 
-interface IRollupUserAbs is IRollupCore {
+interface IRollupUserAbs is IRollupCore, IOwnable {
     /// @dev the user logic just validated configuration and shouldn't write to state during init
     /// this allows the admin logic to ensure consistency on parameters.
     function initialize(address stakeToken) external view;
@@ -52,7 +53,18 @@ interface IRollupUserAbs is IRollupCore {
 
     function requireUnresolved(uint256 nodeNum) external view;
 
-    function withdrawStakerFunds(address payable destination) external returns (uint256);
+    function withdrawStakerFunds() external returns (uint256);
+
+    function createChallenge(
+        address[2] calldata stakers,
+        uint64[2] calldata nodeNums,
+        MachineStatus[2] calldata machineStatuses,
+        GlobalState[2] calldata globalStates,
+        uint64 numBlocks,
+        bytes32 secondExecutionHash,
+        uint256[2] calldata proposedTimes,
+        bytes32[2] calldata wasmModuleRoots
+    ) external;
 }
 
 interface IRollupUser is IRollupUserAbs {
@@ -107,7 +119,7 @@ interface IRollupAdmin {
      * @param _inbox Inbox contract to add or remove
      * @param _enabled New status of inbox
      */
-    function setInbox(address _inbox, bool _enabled) external;
+    function setDelayedInbox(address _inbox, bool _enabled) external;
 
     /**
      * @notice Pause interaction with the rollup contract
@@ -166,21 +178,6 @@ interface IRollupAdmin {
      */
     function setStakeToken(address newStakeToken) external;
 
-    /**
-     * @notice Set max time variation from actual time for sequencer inbox
-     * @param maxTimeVariation the maximum time variation parameters
-     */
-    function setSequencerInboxMaxTimeVariation(
-        ISequencerInbox.MaxTimeVariation memory maxTimeVariation
-    ) external;
-
-    /**
-     * @notice Updates whether an address is authorized to be a batch poster at the sequencer inbox
-     * @param addr the address
-     * @param isBatchPoster if the specified address should be authorized as a batch poster
-     */
-    function setIsBatchPoster(address addr, bool isBatchPoster) external;
-
     /**
      * @notice Upgrades the implementation of a beacon controlled by the rollup
      * @param beacon address of beacon to be upgraded
@@ -212,4 +209,10 @@ interface IRollupAdmin {
      * @param newWasmModuleRoot new module root
      */
     function setWasmModuleRoot(bytes32 newWasmModuleRoot) external;
+
+    /**
+     * @notice set a new sequencer inbox contract
+     * @param _sequencerInbox new address of sequencer inbox
+     */
+    function setSequencerInbox(address _sequencerInbox) external;
 }