Merge branch 'develop' into clabby/ctb/bump-xdm-semver

.changeset/old-poets-camp.md

+---
+'@eth-optimism/chain-mon': patch
+---
+
+Fixes a bug in the wd-mon service where a node connection failure event was not handled correctly

packages/chain-mon/src/wd-mon/service.ts

@@ -142,7 +142,7 @@ export class WithdrawalMonitor extends BaseServiceV2<Options, Metrics, State> {
         section: 'getBlockNumber',
       })
       this.metrics.nodeConnectionFailures.inc({
-        chainId: this.state.messenger.l1ChainId,
+        layer: 'l1',
         section: 'getBlockNumber',
       })
       await sleep(this.options.sleepTimeMs)

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

@@ -23,6 +23,8 @@ contract SafeCall_call_Test is CommonTest {
         vm.assume(to != address(0x000000000000000000636F6e736F6c652e6c6f67));
         // don't call the create2 deployer
         vm.assume(to != address(0x4e59b44847b379578588920cA78FbF26c0B4956C));
+        // don't call the ffi interface
+        vm.assume(to != address(0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f));
 
         assertEq(from.balance, 0, "from balance is 0");
         vm.deal(from, value);