From 35e3e4b6a7403f4959e32a7d4f0cd1f6cb54b36d Mon Sep 17 00:00:00 2001 From: Sneh Koul <35871990+Sneh1999@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:04:17 -0500 Subject: [PATCH] Merging last two commits of the celestia-integration branch (#35) * add names (#33) (cherry picked from commit 998a4372818adfecc5bb865de9231d34d8cb9eaa) * Add names to the deprecated functions to not break abi (#34) * Add names to the deprecated functions to not break abi * remove unwanted changes (cherry picked from commit 418efece692278c36c9c8901513d92cf6ae05dc8) --- src/bridge/SequencerInbox.sol | 23 +++++++++++++---------- src/rollup/BridgeCreator.sol | 8 ++++---- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/bridge/SequencerInbox.sol b/src/bridge/SequencerInbox.sol index 7cff95e2..62c81010 100644 --- a/src/bridge/SequencerInbox.sol +++ b/src/bridge/SequencerInbox.sol @@ -179,7 +179,10 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox Deprecated because we created another `initialize` function that accepts the `EspressoTEEVerifier` contract address as a parameter which is used by the `SequencerInbox` contract to verify the TEE attestation quote. */ - function initialize(IBridge, ISequencerInbox.MaxTimeVariation calldata) external onlyDelegated { + function initialize( + IBridge bridge_, + ISequencerInbox.MaxTimeVariation calldata maxTimeVariation_ + ) external onlyDelegated { revert Deprecated(); } @@ -335,10 +338,10 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox /// @dev Deprecated, kept for abi generation and will be removed in the future function addSequencerL2BatchFromOrigin( - uint256, - bytes calldata, - uint256, - IGasRefunder + uint256 sequencerNumber, + bytes calldata data, + uint256 afterDelayedMessagesRead, + IGasRefunder gasRefunder ) external pure { revert Deprecated(); } @@ -348,12 +351,12 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox to verify that the batch is posted by the batch poster running in TEE. */ function addSequencerL2BatchFromOrigin( - uint256, - bytes calldata, - uint256, + uint256 sequenceNumber, + bytes calldata data, + uint256 afterDelayedMessagesRead, IGasRefunder gasRefunder, - uint256, - uint256 + uint256 prevMessageCount, + uint256 newMessageCount ) external refundsGas(gasRefunder, IReader4844(address(0))) { revert Deprecated(); } diff --git a/src/rollup/BridgeCreator.sol b/src/rollup/BridgeCreator.sol index 3228f199..19fcac2f 100644 --- a/src/rollup/BridgeCreator.sol +++ b/src/rollup/BridgeCreator.sol @@ -86,10 +86,10 @@ contract BridgeCreator is Ownable { * been posted by a batch poster running in the TEE. */ function createBridge( - address, - address, - address, - ISequencerInbox.MaxTimeVariation calldata + address adminProxy, + address rollup, + address nativeToken, + ISequencerInbox.MaxTimeVariation calldata maxTimeVariation ) external returns (BridgeContracts memory) { revert Deprecated(); }