diff --git a/scripts/proposals/ArbOS50AIP/data.json b/scripts/proposals/ArbOS50AIP/data.json index 075992d3..6a7b70fa 100644 --- a/scripts/proposals/ArbOS50AIP/data.json +++ b/scripts/proposals/ArbOS50AIP/data.json @@ -12,11 +12,11 @@ "0xd3f7381fD955dD9C019A9775c8DbF7c390F4cE3d", "0x12A132e2341aE7D24cF77Ada0b5503E11A15a447", "0x114637D5cB4BaE22c94F822c984F5cA6013284Da", - "0x08aA1648fC9d862a28Aad015EEAa1Ee2C2483838", - "0xd3f7381fD955dD9C019A9775c8DbF7c390F4cE3d" + "0x8e91b13EB6234083894B66a3cB6a61aCEcE74397", + "0x36E3BbEF91D182b47DAb09E8AC3a4EA9C524fBab" ], "arbSysSendTxToL1Args": { "l1Timelock": "0xE6841D92B0C345144506576eC13ECf5103aC7f49", - "calldata": "0x8f2a0bb000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000000002077333cfae015cc520076eba7142c5cb29dc69d0e16c026dac7aae7b7b2cc1d000000000000000000000000000000000000000000000000000000000003f48000000000000000000000000000000000000000000000000000000000000000060000000000000000000000003fffbadaf827559da092217e474760e2b2c3cedd0000000000000000000000003fffbadaf827559da092217e474760e2b2c3cedd000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000580000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000653e31e11769a9c6fee825e4bc822753de2286b700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000d3f7381fd955dd9c019a9775c8dbf7c390f4ce3d00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000004dbd4fc535ac27206064b68ffcf827b0a60bab3f000000000000000000000000cf57572261c7c2bcf21ffd220ea7d1a27d40a82700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd00000000000000000000000012a132e2341ae7d24cf77ada0b5503e11a15a44700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000c4448b71118c9071bcb9734a0eac55d18a15394900000000000000000000000086a02dd71363c440b21f4c0e5b2ad01ffe1a748200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000114637d5cb4bae22c94f822c984f5ca6013284da00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000004dbd4fc535ac27206064b68ffcf827b0a60bab3f000000000000000000000000cf57572261c7c2bcf21ffd220ea7d1a27d40a82700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd00000000000000000000000008aa1648fc9d862a28aad015eeaa1ee2c248383800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000c4448b71118c9071bcb9734a0eac55d18a15394900000000000000000000000086a02dd71363c440b21f4c0e5b2ad01ffe1a748200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000d3f7381fd955dd9c019a9775c8dbf7c390f4ce3d00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + "calldata": "0x8f2a0bb000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000072d0d6bb2a5a6adf4546da200e2d446fc571221a60edd39890132df7fa474ba1000000000000000000000000000000000000000000000000000000000003f48000000000000000000000000000000000000000000000000000000000000000060000000000000000000000003fffbadaf827559da092217e474760e2b2c3cedd0000000000000000000000003fffbadaf827559da092217e474760e2b2c3cedd000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000580000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000653e31e11769a9c6fee825e4bc822753de2286b700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000d3f7381fd955dd9c019a9775c8dbf7c390f4ce3d00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000004dbd4fc535ac27206064b68ffcf827b0a60bab3f000000000000000000000000cf57572261c7c2bcf21ffd220ea7d1a27d40a82700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd00000000000000000000000012a132e2341ae7d24cf77ada0b5503e11a15a44700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000c4448b71118c9071bcb9734a0eac55d18a15394900000000000000000000000086a02dd71363c440b21f4c0e5b2ad01ffe1a748200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000114637d5cb4bae22c94f822c984f5ca6013284da00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000004dbd4fc535ac27206064b68ffcf827b0a60bab3f000000000000000000000000cf57572261c7c2bcf21ffd220ea7d1a27d40a82700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd0000000000000000000000008e91b13eb6234083894b66a3cb6a61acece7439700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000c4448b71118c9071bcb9734a0eac55d18a15394900000000000000000000000086a02dd71363c440b21f4c0e5b2ad01ffe1a748200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd00000000000000000000000036e3bbef91d182b47dab09e8ac3a4ea9c524fbab00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } } \ No newline at end of file diff --git a/src/gov-action-contracts/AIPs/ArbOS50/ArbOS50SettingsAction.sol b/src/gov-action-contracts/AIPs/ArbOS50/ArbOS50SettingsAction.sol index 4559792e..a6f1bfe6 100644 --- a/src/gov-action-contracts/AIPs/ArbOS50/ArbOS50SettingsAction.sol +++ b/src/gov-action-contracts/AIPs/ArbOS50/ArbOS50SettingsAction.sol @@ -5,7 +5,6 @@ import "@openzeppelin/contracts/utils/Address.sol"; // Interfaces interface IArbOwner { - function setMinimumL2BaseFee(uint256 minBaseFeeWei) external; function setParentGasFloorPerToken(uint64 floorPerToken) external; function addChainOwner(address newOwner) external; } @@ -16,14 +15,12 @@ interface IArbSys { /// @notice Settings to be applied on Arbitrum One are Arbitrum Nova after the ArbOS 50 upgrade /// These settings include: -/// - Setting a new minimum L2 base fee in wei /// - Setting the new gas floor per token /// - Adding the ResourceConstraintManager as a chain owner /// @dev Identical copies of this contract will be deployed on Arbitrum One and Arbitrum Nova /// @dev This contract is to be used after the chain has been successfully upgraded to ArbOS 50, /// otherwise the call to setParentGasFloorPerToken will fail and the transaction will revert. contract ArbOS50SettingsAction { - uint256 public constant NEW_MIN_BASE_FEE = 0.02 gwei; uint64 public constant NEW_FLOOR_PER_TOKEN = 10; address public immutable resourceConstraintManagerAddress; @@ -54,9 +51,6 @@ contract ArbOS50SettingsAction { // Create ArbOwner precompile interface IArbOwner arbOwner = IArbOwner(ARB_OWNER_ADDRESS); - // Set the minimum L2 base fee - arbOwner.setMinimumL2BaseFee(NEW_MIN_BASE_FEE); - // Set the new gas floor per token arbOwner.setParentGasFloorPerToken(NEW_FLOOR_PER_TOKEN); diff --git a/test/signatures/ArbOS50SettingsAction b/test/signatures/ArbOS50SettingsAction index 07a9c5d1..ec6a81e4 100644 --- a/test/signatures/ArbOS50SettingsAction +++ b/test/signatures/ArbOS50SettingsAction @@ -8,8 +8,6 @@ |------------------------------------+------------| | NEW_FLOOR_PER_TOKEN() | cc1278a6 | |------------------------------------+------------| -| NEW_MIN_BASE_FEE() | a59faf8e | -|------------------------------------+------------| | getArbOSVersion() | 17628539 | |------------------------------------+------------| | perform() | b147f40c |