Changes after rebase

contracts/gas-snapshots/functions.gas-snapshot

@@ -1,5 +1,7 @@
 FunctionsBilling_EstimateCost:test_EstimateCost_RevertsIfGasPriceAboveCeiling() (gas: 32391)
 FunctionsBilling_EstimateCost:test_EstimateCost_Success() (gas: 52979)
+FunctionsBilling_OracleWithdrawAll:test_OracleWithdrawAll_RevertIfNotOwner() (gas: 13274)
+FunctionsBilling_OracleWithdrawAll:test_OracleWithdrawAll_SuccessPaysTransmittersWithBalance() (gas: 147058)
 FunctionsOracle_sendRequest:testEmptyRequestDataReverts() (gas: 13452)
 FunctionsOracle_setDONPublicKey:testEmptyPublicKeyReverts() (gas: 10974)
 FunctionsOracle_setDONPublicKey:testOnlyOwnerReverts() (gas: 11255)
@@ -11,16 +13,17 @@ FunctionsOracle_setRegistry:testSetRegistrySuccess() (gas: 35791)
 FunctionsOracle_setRegistry:testSetRegistry_gas() (gas: 31987)
 FunctionsOracle_typeAndVersion:testTypeAndVersionSuccess() (gas: 6905)
 FunctionsRouter_Constructor:test_Constructor_Success() (gas: 12073)
-FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedCostExceedsCommitment() (gas: 48299)
-FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedInsufficientGas() (gas: 38830)
-FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedInvalidCommitment() (gas: 36239)
+FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedCostExceedsCommitment() (gas: 48277)
+FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedInsufficientGas() (gas: 38808)
+FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedInvalidCommitment() (gas: 36217)
 FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedInvalidRequestId() (gas: 35161)
 FunctionsRouter_Fulfill:test_Fulfill_RequestNotProcessedSubscriptionBalanceInvariant() (gas: 210)
 FunctionsRouter_Fulfill:test_Fulfill_RevertIfNotCommittedCoordinator() (gas: 28015)
 FunctionsRouter_Fulfill:test_Fulfill_RevertIfPaused() (gas: 33206)
-FunctionsRouter_Fulfill:test_Fulfill_SuccessFulfilled() (gas: 103393)
-FunctionsRouter_Fulfill:test_Fulfill_SuccessUserCallbackReverts() (gas: 1762917)
-FunctionsRouter_Fulfill:test_Fulfill_SuccessUserCallbackRunsOutOfGas() (gas: 205990)
+FunctionsRouter_Fulfill:test_Fulfill_SuccessClientNoLongerExists() (gas: 93612)
+FunctionsRouter_Fulfill:test_Fulfill_SuccessFulfilled() (gas: 103408)
+FunctionsRouter_Fulfill:test_Fulfill_SuccessUserCallbackReverts() (gas: 1762929)
+FunctionsRouter_Fulfill:test_Fulfill_SuccessUserCallbackRunsOutOfGas() (gas: 206005)
 FunctionsRouter_GetAdminFee:test_GetAdminFee_Success() (gas: 17842)
 FunctionsRouter_GetAllowListId:test_GetAllowListId_Success() (gas: 12883)
 FunctionsRouter_GetConfig:test_GetConfig_Success() (gas: 31332)
@@ -44,7 +47,7 @@ FunctionsRouter_SendRequest:test_SendRequest_RevertIfConsumerNotAllowed() (gas:
 FunctionsRouter_SendRequest:test_SendRequest_RevertIfDuplicateRequestId() (gas: 192424)
 FunctionsRouter_SendRequest:test_SendRequest_RevertIfEmptyData() (gas: 29382)
 FunctionsRouter_SendRequest:test_SendRequest_RevertIfIncorrectDonId() (gas: 57929)
-FunctionsRouter_SendRequest:test_SendRequest_RevertIfInsufficientSubscriptionBalance() (gas: 186036)
+FunctionsRouter_SendRequest:test_SendRequest_RevertIfInsufficientSubscriptionBalance() (gas: 186033)
 FunctionsRouter_SendRequest:test_SendRequest_RevertIfInvalidCallbackGasLimit() (gas: 48353)
 FunctionsRouter_SendRequest:test_SendRequest_RevertIfInvalidDonId() (gas: 25038)
 FunctionsRouter_SendRequest:test_SendRequest_RevertIfNoSubscription() (gas: 29088)
@@ -58,7 +61,7 @@ FunctionsRouter_SendRequestToProposed:test_SendRequestToProposed_RevertIfInvalid
 FunctionsRouter_SendRequestToProposed:test_SendRequestToProposed_RevertIfNoSubscription() (gas: 35718)
 FunctionsRouter_SendRequestToProposed:test_SendRequestToProposed_RevertIfPaused() (gas: 40788)
 FunctionsRouter_SendRequestToProposed:test_SendRequestToProposed_Success() (gas: 204484)
-FunctionsRouter_SendRequestToProposed:test_SendRequest_RevertIfInsufficientSubscriptionBalance() (gas: 192600)
+FunctionsRouter_SendRequestToProposed:test_SendRequest_RevertIfInsufficientSubscriptionBalance() (gas: 192597)
 FunctionsRouter_SetAllowListId:test_SetAllowListId_Success() (gas: 30666)
 FunctionsRouter_SetAllowListId:test_UpdateConfig_RevertIfNotOwner() (gas: 13402)
 FunctionsRouter_Unpause:test_Unpause_RevertIfNotOwner() (gas: 13294)

contracts/src/v0.8/functions/tests/1_0_0/Setup.t.sol

@@ -324,7 +324,7 @@ contract FunctionsMultipleFulfillmentsSetup is FunctionsFulfillmentSetup {
     // Get actual cost from RequestProcessed event log
     Vm.Log[] memory entriesAfterFulfill2 = vm.getRecordedLogs();
     (uint96 totalCostJuels2, , , , , ) = abi.decode(
-      entriesAfterFulfill2[1].data,
+      entriesAfterFulfill2[2].data,
       (uint96, address, FunctionsResponse.FulfillResult, bytes, bytes, bytes)
     );
     // totalCostJuels = costWithoutCallbackJuels + adminFee + callbackGasCostJuels
@@ -383,7 +383,7 @@ contract FunctionsMultipleFulfillmentsSetup is FunctionsFulfillmentSetup {
     // Get actual cost from RequestProcessed event log
     Vm.Log[] memory entriesAfterFulfill3 = vm.getRecordedLogs();
     (uint96 totalCostJuels3, , , , , ) = abi.decode(
-      entriesAfterFulfill3[1].data,
+      entriesAfterFulfill3[2].data,
       (uint96, address, FunctionsResponse.FulfillResult, bytes, bytes, bytes)
     );