Skip to content

Commit 6386586

Browse files
authored
Merge pull request #17 from OffchainLabs/parent-chain-gas-floor
Parent chain gas floor
2 parents 2368a65 + d39e43f commit 6386586

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

ArbOwner.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ interface ArbOwner {
150150

151151
/// @notice Set how much L1 charges per non-zero byte of calldata
152152
/// @notice Available in ArbOS version 50 and above
153-
function setL1CalldataPrice(
154-
uint256 calldataPrice
153+
function setParentGasFloorPerToken(
154+
uint64 floorPerToken
155155
) external;
156156

157157
/// @notice Sets the base charge (in L1 gas) attributed to each data batch in the calldata pricer

ArbOwnerPublic.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ interface ArbOwnerPublic {
4949

5050
/// @notice Get how much L1 charges per non-zero byte of calldata
5151
/// @notice Available in ArbOS version 50 and above
52-
function getL1CalldataPrice() external view returns (uint256);
52+
function getParentGasFloorPerToken() external view returns (uint64);
5353

5454
/// @notice Get the next scheduled ArbOS version upgrade and its activation timestamp.
5555
/// @notice Returns (0, 0) if no ArbOS upgrade is scheduled.

ArbosActs.sol

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ interface ArbosActs {
4040
uint256 batchTimestamp,
4141
address batchPosterAddress,
4242
uint64 batchNumber,
43-
uint64 batchDataGas,
43+
uint64 batchCalldataLength,
44+
uint64 batchCalldataNonZeros,
45+
uint64 batchLegacyGas,
46+
uint64 batchExtraGas,
4447
uint256 l1BaseFeeWei
4548
) external;
4649

0 commit comments

Comments
 (0)