From af128adf596cd8aa716f492023537a991a40b1f0 Mon Sep 17 00:00:00 2001 From: gavin Date: Fri, 5 Jul 2024 10:40:35 +0800 Subject: [PATCH 1/2] refactor(protocol): rm unused tier fee in TaikoData --- packages/protocol/contracts/L1/TaikoData.sol | 8 +------- packages/protocol/test/L1/TaikoL1TestBase.sol | 9 --------- packages/protocol/test/L1/TaikoL1TestGroupBase.sol | 4 ---- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol index c657d3f8f3..1911312d7c 100644 --- a/packages/protocol/contracts/L1/TaikoData.sol +++ b/packages/protocol/contracts/L1/TaikoData.sol @@ -38,12 +38,6 @@ library TaikoData { bool checkEOAForCalldataDA; } - /// @dev Struct representing prover fees per given tier - struct TierFee { - uint16 tier; - uint128 fee; - } - /// @dev A proof and the tier of proof it belongs to struct TierProof { uint16 tier; @@ -167,7 +161,7 @@ library TaikoData { mapping( uint64 blockId_mod_blockRingBufferSize => mapping(uint32 transitionId => TransitionState ts) - ) transitions; + ) transitions; // Ring buffer for Ether deposits bytes32 __reserve1; SlotA slotA; // slot 5 diff --git a/packages/protocol/test/L1/TaikoL1TestBase.sol b/packages/protocol/test/L1/TaikoL1TestBase.sol index 52e3653ed6..edc69ceb5c 100644 --- a/packages/protocol/test/L1/TaikoL1TestBase.sol +++ b/packages/protocol/test/L1/TaikoL1TestBase.sol @@ -119,15 +119,6 @@ abstract contract TaikoL1TestBase is TaikoTest { internal returns (TaikoData.BlockMetadata memory meta, TaikoData.EthDeposit[] memory ethDeposits) { - TaikoData.TierFee[] memory tierFees = new TaikoData.TierFee[](3); - // Register the tier fees - // Based on OPL2ConfigTier we need 3: - // - LibTiers.TIER_SGX; - // - LibTiers.TIER_OPTIMISTIC; - // - LibTiers.TIER_GUARDIAN; - tierFees[0] = TaikoData.TierFee(LibTiers.TIER_OPTIMISTIC, 1 ether); - tierFees[1] = TaikoData.TierFee(LibTiers.TIER_SGX, 1 ether); - tierFees[2] = TaikoData.TierFee(LibTiers.TIER_GUARDIAN, 0 ether); // For the test not to fail, set the message.value to the highest, the // rest will be returned // anyways diff --git a/packages/protocol/test/L1/TaikoL1TestGroupBase.sol b/packages/protocol/test/L1/TaikoL1TestGroupBase.sol index 0902555208..23483d8c62 100644 --- a/packages/protocol/test/L1/TaikoL1TestGroupBase.sol +++ b/packages/protocol/test/L1/TaikoL1TestGroupBase.sol @@ -28,10 +28,6 @@ abstract contract TaikoL1TestGroupBase is TaikoL1TestBase { internal returns (TaikoData.BlockMetadata memory meta) { - TaikoData.TierFee[] memory tierFees = new TaikoData.TierFee[](2); - tierFees[0] = TaikoData.TierFee(LibTiers.TIER_OPTIMISTIC, 1 ether); - tierFees[1] = TaikoData.TierFee(LibTiers.TIER_SGX, 2 ether); - TaikoData.HookCall[] memory hookcalls = new TaikoData.HookCall[](0); bytes memory txList = new bytes(10); bytes memory eoaSig; From 0126dc1e138c3921e2c464b11536d9adc678de75 Mon Sep 17 00:00:00 2001 From: YoGhurt111 Date: Fri, 5 Jul 2024 02:44:08 +0000 Subject: [PATCH 2/2] forge fmt & update contract layout table --- packages/protocol/contracts/L1/TaikoData.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol index 1911312d7c..9f7f12e518 100644 --- a/packages/protocol/contracts/L1/TaikoData.sol +++ b/packages/protocol/contracts/L1/TaikoData.sol @@ -161,7 +161,7 @@ library TaikoData { mapping( uint64 blockId_mod_blockRingBufferSize => mapping(uint32 transitionId => TransitionState ts) - ) transitions; + ) transitions; // Ring buffer for Ether deposits bytes32 __reserve1; SlotA slotA; // slot 5