From 77d95d5de6fd830c6fb71f8934e25d82593a2dcf Mon Sep 17 00:00:00 2001 From: Kelvin Fichter Date: Mon, 8 Dec 2025 17:39:38 -0500 Subject: [PATCH 1/2] fix: fuzz failure in system config test --- packages/contracts-bedrock/test/L1/SystemConfig.t.sol | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol index 9a2fac9c1d0..34925bebeaa 100644 --- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol +++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol @@ -867,15 +867,18 @@ contract SystemConfig_IsFeatureEnabled_Test is SystemConfig_TestInit { /// @notice Tests that `isFeatureEnabled` returns false for unset features. /// @param _feature The feature to check. function testFuzz_isFeatureEnabled_unsetFeature_succeeds(bytes32 _feature) external { - vm.startPrank(address(systemConfig.proxyAdmin())); + // Normalize OPTIMISM_PORTAL_INTEROP to avoid environment-dependent state + if (systemConfig.isFeatureEnabled(Features.OPTIMISM_PORTAL_INTEROP)) { + vm.prank(address(systemConfig.proxyAdmin())); + systemConfig.setFeature(Features.OPTIMISM_PORTAL_INTEROP, false); + } // Normalize CUSTOM_GAS_TOKEN to avoid environment-dependent state if (systemConfig.isFeatureEnabled(Features.CUSTOM_GAS_TOKEN)) { + vm.prank(address(systemConfig.proxyAdmin())); systemConfig.setFeature(Features.CUSTOM_GAS_TOKEN, false); } - vm.stopPrank(); - assertFalse(systemConfig.isFeatureEnabled(_feature)); } From c5818f59569a30f1c6dc0271cb55e78b6ac3fda5 Mon Sep 17 00:00:00 2001 From: Kelvin Fichter Date: Mon, 8 Dec 2025 17:45:16 -0500 Subject: [PATCH 2/2] fix: proper skip --- packages/contracts-bedrock/test/L1/SystemConfig.t.sol | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol index 34925bebeaa..0813d0512ec 100644 --- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol +++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol @@ -867,10 +867,9 @@ contract SystemConfig_IsFeatureEnabled_Test is SystemConfig_TestInit { /// @notice Tests that `isFeatureEnabled` returns false for unset features. /// @param _feature The feature to check. function testFuzz_isFeatureEnabled_unsetFeature_succeeds(bytes32 _feature) external { - // Normalize OPTIMISM_PORTAL_INTEROP to avoid environment-dependent state - if (systemConfig.isFeatureEnabled(Features.OPTIMISM_PORTAL_INTEROP)) { - vm.prank(address(systemConfig.proxyAdmin())); - systemConfig.setFeature(Features.OPTIMISM_PORTAL_INTEROP, false); + if (_feature == Features.ETH_LOCKBOX && systemConfig.isFeatureEnabled(Features.ETH_LOCKBOX)) { + // Needs to be anything but ETH_LOCKBOX because we can't turn that feature off if it's on. + vm.skip(true); } // Normalize CUSTOM_GAS_TOKEN to avoid environment-dependent state