From adb2631ab01d14bc7065200c8ebd07704b97c313 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Sat, 9 Nov 2024 09:23:47 +0800 Subject: [PATCH 1/2] Update LibEIP1559.t.sol --- .../protocol/test/layer2/LibEIP1559.t.sol | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/protocol/test/layer2/LibEIP1559.t.sol b/packages/protocol/test/layer2/LibEIP1559.t.sol index 7b140951f9c..479bfc65d09 100644 --- a/packages/protocol/test/layer2/LibEIP1559.t.sol +++ b/packages/protocol/test/layer2/LibEIP1559.t.sol @@ -100,25 +100,37 @@ contract TestLibEIP1559 is TaikoL2Test { /// forge-config: layer2.fuzz.runs = 1000 /// forge-config: layer2.fuzz.show-logs = true - function test_fuzz_ethQty(uint64 _gasTarget, uint64 _gasExcess) external pure { + function test_fuzz_ethQty(uint64 _gasTarget, uint64 _gasExcess) external { if (_gasTarget == 0) _gasTarget = 1; + uint256 result = LibEIP1559.ethQty(_gasTarget, _gasExcess); + assertTrue(result > 0); + } - LibEIP1559.ethQty(_gasTarget, _gasExcess); + /// forge-config: layer2.fuzz.runs = 2000 + /// forge-config: layer2.fuzz.show-logs = true + function test_fuzz_basefee(uint64 _gasTarget, uint64 _gasExcess) external { + uint256 result = LibEIP1559.basefee(_gasTarget, _gasExcess); + assertTrue(result >= 1); } /// forge-config: layer2.fuzz.runs = 2000 /// forge-config: layer2.fuzz.show-logs = true function test_fuzz_adjustExcess( - uint64 _gasTarget, + uint64 _oldGasTarget, uint64 _newGasTarget, - uint64 _gasExcess + uint64 _oldGasExcess ) external - pure { - if (_gasTarget == 0) _gasTarget = 1; - if (_newGasTarget == 0) _newGasTarget = 1; - LibEIP1559.adjustExcess(_gasTarget, _newGasTarget, _gasExcess); + (uint64 newGasTarget_, uint64 newGasExcess_) = + LibEIP1559.adjustExcess(_oldGasTarget, _newGasTarget, _oldGasExcess); + + if (_oldGasTarget == 0 && _newGasTarget == 0) { + assertEq(newGasTarget_, 0); + assertEq(newGasExcess_, _oldGasExcess); + } else { + assertTrue(newGasTarget_ != 0 || newGasExcess_ != 0); + } } /// forge-config: layer2.fuzz.runs = 2000 From 869808a9efed9cbf2af57189132a1d08deea4a5f Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Sat, 9 Nov 2024 09:25:29 +0800 Subject: [PATCH 2/2] Update LibEIP1559.t.sol --- packages/protocol/test/layer2/LibEIP1559.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/test/layer2/LibEIP1559.t.sol b/packages/protocol/test/layer2/LibEIP1559.t.sol index 479bfc65d09..31368b2e494 100644 --- a/packages/protocol/test/layer2/LibEIP1559.t.sol +++ b/packages/protocol/test/layer2/LibEIP1559.t.sol @@ -129,7 +129,7 @@ contract TestLibEIP1559 is TaikoL2Test { assertEq(newGasTarget_, 0); assertEq(newGasExcess_, _oldGasExcess); } else { - assertTrue(newGasTarget_ != 0 || newGasExcess_ != 0); + assertTrue(newGasTarget_ != 0); } }