Upgrade foundry version in CI

ops/docker/ci-builder/Dockerfile

@@ -16,7 +16,7 @@ WORKDIR /opt/foundry
 # Only diff from upstream docker image is this clone instead
 # of COPY. We select a specific commit to use.
 RUN git clone https://github.com/foundry-rs/foundry.git . \
-    && git checkout da2392e58bb8a7fefeba46b40c4df1afad8ccd22
+  && git checkout 3b1129b5bc43ba22a9bcf4e4323c5a9df0023140
 
 RUN source $HOME/.profile && \
     cargo build --release && \

packages/contracts-bedrock/README.md

@@ -59,7 +59,7 @@ We work on this repository with a combination of [Hardhat](https://hardhat.org)
 1. Install Foundry by following [the instructions located here](https://getfoundry.sh/).
    A specific version must be used.
    ```shell
-   foundryup -C da2392e58bb8a7fefeba46b40c4df1afad8ccd22
+   foundryup -C 3b1129b5bc43ba22a9bcf4e4323c5a9df0023140
    ```
 2. Install node modules with yarn (v1) and Node.js (16+):
 

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

@@ -474,17 +474,6 @@ contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
             hex""
         );
 
-        // the L1 bridge should call L1CrossDomainMessenger.sendMessage
-        vm.expectCall(
-            address(L1Messenger),
-            abi.encodeWithSelector(
-                CrossDomainMessenger.sendMessage.selector,
-                address(L2Bridge),
-                message,
-                10000
-            )
-        );
-
         bytes memory innerMessage = abi.encodeWithSelector(
             CrossDomainMessenger.relayMessage.selector,
             nonce,
@@ -496,18 +485,6 @@ contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
         );
 
         uint64 baseGas = L1Messenger.baseGas(message, 10000);
-        vm.expectCall(
-            address(op),
-            abi.encodeWithSelector(
-                OptimismPortal.depositTransaction.selector,
-                address(L2Messenger),
-                0,
-                baseGas,
-                false,
-                innerMessage
-            )
-        );
-
         bytes memory opaqueData = abi.encodePacked(
             uint256(0),
             uint256(0),
@@ -516,6 +493,11 @@ contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
             innerMessage
         );
 
+        deal(address(L1Token), alice, 100000, true);
+
+        vm.prank(alice);
+        L1Token.approve(address(L1Bridge), type(uint256).max);
+
         // Should emit both the bedrock and legacy events
         vm.expectEmit(true, true, true, true, address(L1Bridge));
         emit ERC20DepositInitiated(address(L1Token), address(L2Token), alice, bob, 1000, hex"");
@@ -535,11 +517,28 @@ contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
         vm.expectEmit(true, true, true, true, address(L1Messenger));
         emit SentMessageExtension1(address(L1Bridge), 0);
 
-        deal(address(L1Token), alice, 100000, true);
-
-        vm.prank(alice);
-        L1Token.approve(address(L1Bridge), type(uint256).max);
-
+        // the L1 bridge should call L1CrossDomainMessenger.sendMessage
+        vm.expectCall(
+            address(L1Messenger),
+            abi.encodeWithSelector(
+                CrossDomainMessenger.sendMessage.selector,
+                address(L2Bridge),
+                message,
+                10000
+            )
+        );
+        // The L1 XDM should call OptimismPortal.depositTransaction
+        vm.expectCall(
+            address(op),
+            abi.encodeWithSelector(
+                OptimismPortal.depositTransaction.selector,
+                address(L2Messenger),
+                0,
+                baseGas,
+                false,
+                innerMessage
+            )
+        );
         vm.expectCall(
             address(L1Token),
             abi.encodeWithSelector(ERC20.transferFrom.selector, alice, address(L1Bridge), 1000)