Skip to content

Commit 58c6008

Browse files
committed
chore: deprecate old method
1 parent ecca913 commit 58c6008

File tree

2 files changed

+12
-42
lines changed

2 files changed

+12
-42
lines changed

src/bridge/SequencerInbox.sol

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import {
2929
NotOwner,
3030
RollupNotChanged,
3131
EmptyBatchData,
32-
InvalidHeaderFlag
32+
InvalidHeaderFlag,
33+
Deprecated
3334
} from "../libraries/Error.sol";
3435
import "./IBridge.sol";
3536
import "./IInboxBase.sol";
@@ -313,48 +314,14 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
313314
);
314315
}
315316

316-
/// @dev Deprecated in favor of the variant specifying message counts for consistency
317+
/// @dev Deprecated, kept for abi generation and will be removed in the future
317318
function addSequencerL2BatchFromOrigin(
318-
uint256 sequenceNumber,
319-
bytes calldata data,
320-
uint256 afterDelayedMessagesRead,
321-
IGasRefunder gasRefunder
322-
) external refundsGas(gasRefunder, IReader4844(address(0))) {
323-
// solhint-disable-next-line avoid-tx-origin
324-
if (msg.sender != tx.origin) revert NotOrigin();
325-
if (!isBatchPoster[msg.sender]) revert NotBatchPoster();
326-
327-
(bytes32 dataHash, IBridge.TimeBounds memory timeBounds) = formCallDataHash(
328-
data,
329-
afterDelayedMessagesRead
330-
);
331-
// Reformat the stack to prevent "Stack too deep"
332-
uint256 sequenceNumber_ = sequenceNumber;
333-
IBridge.TimeBounds memory timeBounds_ = timeBounds;
334-
bytes32 dataHash_ = dataHash;
335-
uint256 dataLength = data.length;
336-
uint256 afterDelayedMessagesRead_ = afterDelayedMessagesRead;
337-
(
338-
uint256 seqMessageIndex,
339-
bytes32 beforeAcc,
340-
bytes32 delayedAcc,
341-
bytes32 afterAcc
342-
) = addSequencerL2BatchImpl(dataHash_, afterDelayedMessagesRead_, dataLength, 0, 0);
343-
344-
// ~uint256(0) is type(uint256).max, but ever so slightly cheaper
345-
if (seqMessageIndex != sequenceNumber_ && sequenceNumber_ != ~uint256(0)) {
346-
revert BadSequencerNumber(seqMessageIndex, sequenceNumber_);
347-
}
348-
349-
emit SequencerBatchDelivered(
350-
sequenceNumber_,
351-
beforeAcc,
352-
afterAcc,
353-
delayedAcc,
354-
totalDelayedMessagesRead,
355-
timeBounds_,
356-
IBridge.BatchDataLocation.TxInput
357-
);
319+
uint256,
320+
bytes calldata,
321+
uint256,
322+
IGasRefunder
323+
) external pure {
324+
revert Deprecated();
358325
}
359326

360327
function addSequencerL2BatchFromOrigin(

src/libraries/Error.sol

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,6 @@ error EmptyBatchData();
196196

197197
/// @dev Unsupported header flag was provided
198198
error InvalidHeaderFlag(bytes1);
199+
200+
/// @dev Thrown when a deprecated function is called
201+
error Deprecated();

0 commit comments

Comments
 (0)