chore: rename to CalldataChecker

OffchainLabs · Oct 8, 2024 · 779c837 · 779c837
1 parent 13036a6
commit 779c837
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/bridge/AbsInbox.sol b/src/bridge/AbsInbox.sol
@@ -19,7 +19,7 @@ import "./IInboxBase.sol";
 import "./ISequencerInbox.sol";
 import "./IBridge.sol";
 import "../libraries/AddressAliasHelper.sol";
-import "../libraries/CallerChecker.sol";
+import "../libraries/CalldataChecker.sol";
 import "../libraries/DelegateCallAware.sol";
 import {
     L1MessageType_submitRetryableTx,
@@ -140,7 +140,7 @@ abstract contract AbsInbox is DelegateCallAware, PausableUpgradeable, IInboxBase
         bytes calldata messageData
     ) external whenNotPaused onlyAllowed returns (uint256) {
         if (_chainIdChanged()) revert L1Forked();
-        if (!CallerChecker.isCalldataSameAsTx()) revert CalldataNotSameAsTx();
+        if (!CalldataChecker.isCalldataSameAsTx()) revert CalldataNotSameAsTx();
         if (messageData.length > maxDataSize) revert DataTooLarge(messageData.length, maxDataSize);
         uint256 msgNum = _deliverToBridge(L2_MSG, msg.sender, keccak256(messageData), 0);
         emit InboxMessageDeliveredFromOrigin(msgNum);

diff --git a/src/bridge/SequencerInbox.sol b/src/bridge/SequencerInbox.sol
@@ -43,7 +43,7 @@ import "../rollup/IRollupLogic.sol";
 import "./Messages.sol";
 import "../precompiles/ArbGasInfo.sol";
 import "../precompiles/ArbSys.sol";
-import "../libraries/CallerChecker.sol";
+import "../libraries/CalldataChecker.sol";
 import "../libraries/IReader4844.sol";
 
 import "../libraries/DelegateCallAware.sol";
@@ -335,7 +335,7 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         uint256 prevMessageCount,
         uint256 newMessageCount
     ) external refundsGas(gasRefunder, IReader4844(address(0))) {
-        if (!CallerChecker.isCalldataSameAsTx()) revert CalldataNotSameAsTx();
+        if (!CalldataChecker.isCalldataSameAsTx()) revert CalldataNotSameAsTx();
         if (!isBatchPoster[msg.sender]) revert NotBatchPoster();
         if (isDelayProofRequired(afterDelayedMessagesRead)) revert DelayProofRequired();
 
@@ -388,7 +388,7 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         uint256 newMessageCount,
         DelayProof calldata delayProof
     ) external refundsGas(gasRefunder, IReader4844(address(0))) {
-        if (!CallerChecker.isCalldataSameAsTx()) revert CalldataNotSameAsTx();
+        if (!CalldataChecker.isCalldataSameAsTx()) revert CalldataNotSameAsTx();
         if (!isBatchPoster[msg.sender]) revert NotBatchPoster();
         if (!isDelayBufferable) revert NotDelayBufferable();
 
@@ -438,7 +438,7 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
         // submit a batch spending report to refund the entity that produced the blob batch data
         // same as using calldata, we only submit spending report if the caller is the origin of the tx
         // such that one cannot "double-claim" batch posting refund in the same tx
-        if (CallerChecker.isCalldataSameAsTx() && !isUsingFeeToken) {
+        if (CalldataChecker.isCalldataSameAsTx() && !isUsingFeeToken) {
             submitBatchSpendingReport(dataHash, seqMessageIndex, block.basefee, blobGas);
         }
     }

diff --git a/src/libraries/CallerChecker.sol → src/libraries/CalldataChecker.sol b/src/libraries/CallerChecker.sol → src/libraries/CalldataChecker.sol
diff --git a/src/libraries/GasRefundEnabled.sol b/src/libraries/GasRefundEnabled.sol
@@ -7,7 +7,7 @@ pragma solidity ^0.8.0;
 
 import "./IReader4844.sol";
 import "./IGasRefunder.sol";
-import "../libraries/CallerChecker.sol";
+import "../libraries/CalldataChecker.sol";
 
 abstract contract GasRefundEnabled {
     uint256 internal immutable gasPerBlob = 2 ** 17;
@@ -25,7 +25,7 @@ abstract contract GasRefundEnabled {
             startGasLeft += calldataWords * 6 + (calldataWords ** 2) / 512;
             // if triggered in a contract call, the spender may be overrefunded by appending dummy data to the call
             // so we check if it is a top level call, which would mean the sender paid calldata as part of tx.input
-            if (!CallerChecker.isCalldataSameAsTx()) {
+            if (!CalldataChecker.isCalldataSameAsTx()) {
                 // We can't be sure if this calldata came from the top level tx,
                 // so to be safe we tell the gas refunder there was no calldata.
                 calldataSize = 0;