Lint

packages/contracts-bedrock/.gas-snapshot

@@ -23,19 +23,19 @@ CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34861)
 CrossDomainOwnable2_Test:test_onlyOwner_notMessenger_reverts() (gas: 8416)
 CrossDomainOwnable2_Test:test_onlyOwner_notOwner2_reverts() (gas: 64332)
 CrossDomainOwnable2_Test:test_onlyOwner_notOwner_reverts() (gas: 16588)
-CrossDomainOwnable2_Test:test_onlyOwner_succeeds() (gas: 77766)
-CrossDomainOwnable3_Test:test_constructor_succeeds() (gas: 10510)
-CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notMessenger_reverts() (gas: 28311)
-CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notOwner2_reverts() (gas: 78170)
-CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notOwner_reverts() (gas: 32000)
-CrossDomainOwnable3_Test:test_crossDomainTransferOwnership_succeeds() (gas: 95748)
-CrossDomainOwnable3_Test:test_localOnlyOwner_notOwner_reverts() (gas: 13237)
-CrossDomainOwnable3_Test:test_localOnlyOwner_succeeds() (gas: 35197)
-CrossDomainOwnable3_Test:test_localTransferOwnership_succeeds() (gas: 52084)
-CrossDomainOwnable3_Test:test_transferOwnershipNoLocal_succeeds() (gas: 48565)
-CrossDomainOwnable3_Test:test_transferOwnership_noLocal_zeroAddress_reverts() (gas: 12039)
+CrossDomainOwnable2_Test:test_onlyOwner_succeeds() (gas: 79009)
+CrossDomainOwnable3_Test:test_constructor_succeeds() (gas: 10576)
+CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notMessenger_reverts() (gas: 28289)
+CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notOwner2_reverts() (gas: 79391)
+CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notOwner_reverts() (gas: 31978)
+CrossDomainOwnable3_Test:test_crossDomainTransferOwnership_succeeds() (gas: 96969)
+CrossDomainOwnable3_Test:test_localOnlyOwner_notOwner_reverts() (gas: 13215)
+CrossDomainOwnable3_Test:test_localOnlyOwner_succeeds() (gas: 35220)
+CrossDomainOwnable3_Test:test_localTransferOwnership_succeeds() (gas: 52128)
+CrossDomainOwnable3_Test:test_transferOwnershipNoLocal_succeeds() (gas: 48632)
+CrossDomainOwnable3_Test:test_transferOwnership_noLocalZeroAddress_reverts() (gas: 12037)
 CrossDomainOwnable3_Test:test_transferOwnership_notOwner_reverts() (gas: 13414)
-CrossDomainOwnable3_Test:test_transferOwnership_zeroAddress_reverts() (gas: 12058)
+CrossDomainOwnable3_Test:test_transferOwnership_zeroAddress_reverts() (gas: 12036)
 DeployerWhitelist_Test:test_owner_succeeds() (gas: 7538)
 DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33395)
 FeeVault_Test:test_constructor_succeeds() (gas: 10647)
@@ -394,6 +394,8 @@ RLPWriter_writeUint_Test:test_writeUint_smallint3_succeeds() (gas: 7256)
 RLPWriter_writeUint_Test:test_writeUint_smallint4_succeeds() (gas: 7280)
 RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7258)
 RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7726)
+ReentrancyGuard_Test:test_perMessageNonReentrant_diffHash_succeeds() (gas: 54413)
+ReentrancyGuard_Test:test_perMessageNonReentrant_sameHash_reverts() (gas: 54179)
 ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8983)
 ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008119)
 ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18148)

packages/contracts-bedrock/contracts/libraries/ReentrancyGuard.sol

@@ -20,8 +20,8 @@ contract ReentrancyGuard {
 
             // Check if the reentrancy lock for the `_msgHash` is set. If so, revert.
             if sload(_hashMsgHash) {
-                // MEMORY SAFETY: We're reverting, so it's fine that we're clobbering the free memory
-                // pointer.
+                // MEMORY SAFETY: We're reverting, so it's fine that we're clobbering the free
+                // memory pointer.
 
                 // Store selector for "Error(string)" in scratch space
                 mstore(0x00, 0x08c379a0)

packages/contracts-bedrock/contracts/test/CrossDomainOwnable3.t.sol

@@ -149,7 +149,7 @@ contract CrossDomainOwnable3_Test is Messenger_Initializer {
         setter.transferOwnership({ _owner: address(0), _isLocal: true });
     }
 
-    function test_transferOwnership_noLocal_zeroAddress_reverts() public {
+    function test_transferOwnership_noLocalZeroAddress_reverts() public {
         vm.prank(setter.owner());
         vm.expectRevert("Ownable: new owner is the zero address");
         setter.transferOwnership(address(0));

packages/contracts-bedrock/contracts/test/ReentrancyGuard.t.sol

@@ -14,7 +14,11 @@ contract ReentrancyGuard_Test is Test {
         reentrant = new NonReentrant();
     }
 
-    function test_perMessageNonReentrant_reverts() public {
+    function test_perMessageNonReentrant_diffHash_succeeds() public {
+        reentrant.noReentrance(bytes32(0));
+    }
+
+    function test_perMessageNonReentrant_sameHash_reverts() public {
         vm.expectRevert("ReentrancyGuard: reentrant call");
         reentrant.noReentrance(MSG_HASH);
     }
@@ -25,17 +29,15 @@ contract ReentrancyGuard_Test is Test {
 }
 
 contract NonReentrant is ReentrancyGuard {
+    bool onlyOnce;
+
     function noReentrance(bytes32 _hash) external perMessageNonReentrant(_hash) {
+        // Only allow the following call back to the sender occur once.
+        if (onlyOnce) return;
+        onlyOnce = true;
+
         assembly {
-            let success := call(
-                gas(),
-                caller(),
-                0,
-                0,
-                0,
-                0,
-                0
-            )
+            let success := call(gas(), caller(), 0, 0, 0, 0, 0)
             returndatacopy(0x00, 0x00, returndatasize())
             switch success
             case 0 {