refactor(ctb): Standardize on not caching the length in a for-loop

packages/contracts-bedrock/.gas-snapshot

@@ -306,26 +306,31 @@ LegacyERC20ETH_Test:test_transfer_doesNotExist_reverts() (gas: 10755)
 LegacyMessagePasser_Test:test_passMessageToL1_succeeds() (gas: 34524)
 LibPosition_Test:test_pos_correctness_succeeds() (gas: 38689)
 LivenessGuard_CheckAfterExecution_TestFails:test_checkAfterExecution_callerIsNotSafe_revert() (gas: 8553)
-LivenessGuard_CheckTx_Test:test_checkTransaction_succeeds() (gas: 234784)
-LivenessGuard_CheckTx_TestFails:test_checkTransaction_callerIsNotSafe_revert() (gas: 10343)
-LivenessGuard_Constructor_Test:test_constructor_works() (gas: 1163577)
+LivenessGuard_CheckTx_Test:test_checkTransaction_succeeds() (gas: 228306)
+LivenessGuard_CheckTx_TestFails:test_checkTransaction_callerIsNotSafe_revert() (gas: 10380)
+LivenessGuard_Constructor_Test:test_constructor_works() (gas: 1174506)
 LivenessGuard_Getters_Test:test_getters_works() (gas: 10662)
-LivenessGuard_ShowLiveness_Test:test_showLiveness_succeeds() (gas: 29584)
+LivenessGuard_OwnerManagement_Test:test_addOwner_succeeds() (gas: 272723)
+LivenessGuard_OwnerManagement_Test:test_removeOwner_succeeds() (gas: 241108)
+LivenessGuard_OwnerManagement_Test:test_swapOwner_succeeds() (gas: 279720)
+LivenessGuard_ShowLiveness_Test:test_showLiveness_succeeds() (gas: 28831)
 LivenessGuard_ShowLiveness_TestFail:test_showLiveness_callIsNotSafeOwner_reverts() (gas: 18770)
-LivenessModule_Constructor_Test:test_constructor_minOwnersGreaterThanOwners_reverts() (gas: 83531)
-LivenessModule_Constructor_Test:test_constructor_wrongThreshold_reverts() (gas: 92808)
+LivenessModule_CanRemove_Test:test_canRemove_works() (gas: 33026)
+LivenessModule_CanRemove_TestFail:test_canRemove_notSafeOwner_reverts() (gas: 20489)
+LivenessModule_Constructor_Test:test_constructor_minOwnersGreaterThanOwners_reverts() (gas: 83623)
+LivenessModule_Constructor_Test:test_constructor_wrongThreshold_reverts() (gas: 92901)
 LivenessModule_Get75PercentThreshold_Test:test_get75PercentThreshold_Works() (gas: 26339)
-LivenessModule_Getters_Test:test_getters_works() (gas: 14807)
-LivenessModule_RemoveOwners_Test:test_removeOwners_allOwners_succeeds() (gas: 346743)
-LivenessModule_RemoveOwners_Test:test_removeOwners_oneOwner_succeeds() (gas: 127161)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_belowMinButNotEmptied_reverts() (gas: 301067)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_differentArrayLengths_reverts() (gas: 10536)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_guardChanged_reverts() (gas: 1741747)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_invalidThreshold_reverts() (gas: 67238)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_ownerHasShownLivenessRecently_reverts() (gas: 91661)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_ownerHasSignedRecently_reverts() (gas: 638440)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_swapToFallBackOwner_reverts() (gas: 310105)
-LivenessModule_RemoveOwners_TestFail:test_removeOwners_wrongPreviousOwner_reverts() (gas: 70465)
+LivenessModule_Getters_Test:test_getters_works() (gas: 14853)
+LivenessModule_RemoveOwners_Test:test_removeOwners_allOwners_succeeds() (gas: 1311942)
+LivenessModule_RemoveOwners_Test:test_removeOwners_oneOwner_succeeds() (gas: 130731)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_belowMinButNotEmptied_reverts() (gas: 1265044)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_differentArrayLengths_reverts() (gas: 10547)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_guardChanged_reverts() (gas: 2820629)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_invalidThreshold_reverts() (gas: 69358)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_ownerHasShownLivenessRecently_reverts() (gas: 77817)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_ownerHasSignedRecently_reverts() (gas: 614867)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_swapToFallBackOwner_reverts() (gas: 1273705)
+LivenessModule_RemoveOwners_TestFail:test_removeOwners_wrongPreviousOwner_reverts() (gas: 73954)
 MIPS_Test:test_add_succeeds() (gas: 122932)
 MIPS_Test:test_addiSign_succeeds() (gas: 122923)
 MIPS_Test:test_addi_succeeds() (gas: 123120)

packages/contracts-bedrock/src/Safe/LivenessGuard.sol

@@ -87,8 +87,7 @@ contract LivenessGuard is ISemver, BaseGuard {
         // Cache the set of owners prior to execution.
         // This will be used in the checkAfterExecution method.
         address[] memory owners = SAFE.getOwners();
-        uint256 ownersLength = owners.length;
-        for (uint256 i = 0; i < ownersLength; i++) {
+        for (uint256 i = 0; i < owners.length; i++) {
             ownersBefore.add(owners[i]);
         }
 
@@ -141,8 +140,8 @@ contract LivenessGuard is ISemver, BaseGuard {
 
         // Now iterate over the remaining ownersBefore entries. Any remaining addresses are no longer an owner, so we
         // delete them from the lastLive mapping.
-        uint256 ownersBeforeLength = ownersBefore.length();
-        for (uint256 i = 0; i < ownersBeforeLength; i++) {
+        // uint256 ownersBeforeLength = ownersBefore.length();
+        for (uint256 i = 0; i < ownersBefore.length(); i++) {
             address ownerBefore = ownersBefore.at(i);
             delete lastLive[ownerBefore];
         }