Merge remote-tracking branch 'origin/master' into feat/trails-intent-entrypoint-desc

Author: ScreamingHawk

.gas-snapshot

@@ -47,20 +47,20 @@ TrailsIntentEntrypointTest:testNonceIncrementsOnDeposit() (gas: 91391)
 TrailsIntentEntrypointTest:testPermitAmountExcessiveWithFee() (gas: 37875)
 TrailsIntentEntrypointTest:testPermitAmountInsufficientWithFee() (gas: 36929)
 TrailsIntentEntrypointTest:testVersionConstant() (gas: 10409)
-TrailsRouterDeploymentTest:test_DeployTrailsRouter_SameAddress() (gas: 1722289)
-TrailsRouterDeploymentTest:test_DeployTrailsRouter_Success() (gas: 1712948)
-TrailsRouterDeploymentTest:test_DeployedRouter_HasCorrectConfiguration() (gas: 1712744)
-TrailsRouterShimDeploymentTest:test_DeployRouterShim_SameAddress() (gas: 7130985)
-TrailsRouterShimDeploymentTest:test_DeployRouterShim_Success() (gas: 4606895)
-TrailsRouterShimDeploymentTest:test_DeployedContract_HasCorrectConfiguration() (gas: 4606941)
+TrailsRouterDeploymentTest:test_DeployTrailsRouter_SameAddress() (gas: 1804547)
+TrailsRouterDeploymentTest:test_DeployTrailsRouter_Success() (gas: 1795047)
+TrailsRouterDeploymentTest:test_DeployedRouter_HasCorrectConfiguration() (gas: 1794843)
+TrailsRouterShimDeploymentTest:test_DeployRouterShim_SameAddress() (gas: 7376786)
+TrailsRouterShimDeploymentTest:test_DeployRouterShim_Success() (gas: 4770769)
+TrailsRouterShimDeploymentTest:test_DeployedContract_HasCorrectConfiguration() (gas: 4770815)
 TrailsRouterShimTest:testConstructorValidation() (gas: 69336)
 TrailsRouterShimTest:testForwardToRouterReturnValue() (gas: 713355)
 TrailsRouterShimTest:testRouterAddressImmutable() (gas: 1391679)
 TrailsRouterShimTest:test_constructor_revert_zeroRouter() (gas: 68984)
-TrailsRouterShimTest:test_delegatecall_forwards_and_sets_sentinel_sstore_inactive() (gas: 1715664)
+TrailsRouterShimTest:test_delegatecall_forwards_and_sets_sentinel_sstore_inactive() (gas: 1797432)
 TrailsRouterShimTest:test_delegatecall_forwards_and_sets_sentinel_tstore_active() (gas: 38392)
 TrailsRouterShimTest:test_delegatecall_router_revert_bubbles_as_RouterCallFailed() (gas: 82109)
-TrailsRouterShimTest:test_delegatecall_sets_sentinel_with_sstore_when_no_tstore() (gas: 1697892)
+TrailsRouterShimTest:test_delegatecall_sets_sentinel_with_sstore_when_no_tstore() (gas: 1779658)
 TrailsRouterShimTest:test_delegatecall_sets_sentinel_with_tstore_when_supported() (gas: 20706)
 TrailsRouterShimTest:test_direct_handleSequenceDelegateCall_reverts_not_delegatecall() (gas: 9840)
 TrailsRouterShimTest:test_forwardToRouter_return_data_handling() (gas: 729052)
@@ -73,11 +73,11 @@ TrailsRouterShimTest:test_handleSequenceDelegateCall_with_eth_value() (gas: 3210
 TrailsRouterShimTest:test_handleSequenceDelegateCall_zero_call_value() (gas: 26873)
 TrailsRouterShimTest:test_sentinel_setting_with_different_op_hashes() (gas: 36405)
 TrailsRouterTest:testDelegateCallWithETH() (gas: 326063)
-TrailsRouterTest:testExecute_WithFailingMulticall() (gas: 450208)
+TrailsRouterTest:testExecute_WithFailingMulticall() (gas: 450176)
 TrailsRouterTest:testHandleSequenceDelegateCall_InjectAndCall() (gas: 72545)
 TrailsRouterTest:testHandleSequenceDelegateCall_RefundAndSweep() (gas: 85300)
 TrailsRouterTest:testHandleSequenceDelegateCall_Sweep() (gas: 48605)
-TrailsRouterTest:testHandleSequenceDelegateCall_ValidateOpHashAndSweep() (gas: 59682)
+TrailsRouterTest:testHandleSequenceDelegateCall_ValidateOpHashAndSweep() (gas: 59890)
 TrailsRouterTest:testInjectAndCall_NoReplacementNeeded() (gas: 989297)
 TrailsRouterTest:testInjectAndCall_WithReplacement() (gas: 995954)
 TrailsRouterTest:testInjectAndCall_WithTokenZeroBalance() (gas: 647003)
@@ -87,7 +87,7 @@ TrailsRouterTest:testInjectSweepAndCall_WithETH_TargetCallFails() (gas: 57470)
 TrailsRouterTest:testInjectSweepAndCall_WithETH_ZeroBalance() (gas: 12588)
 TrailsRouterTest:testInjectSweepAndCall_WithToken_TargetCallFails() (gas: 995574)
 TrailsRouterTest:testInjectSweepAndCall_WithToken_ZeroBalance() (gas: 648071)
-TrailsRouterTest:testInsufficientEthValidation() (gas: 25250)
+TrailsRouterTest:testInsufficientEthValidation() (gas: 25178)
 TrailsRouterTest:testNativeTransferFailure() (gas: 86597)
 TrailsRouterTest:testRefundAndSweep_FullRefund() (gas: 56088)
 TrailsRouterTest:testRefundAndSweep_PartialRefundERC20() (gas: 88307)
@@ -98,43 +98,43 @@ TrailsRouterTest:testRevertWhen_injectSweepAndCall_InsufficientAllowance() (gas:
 TrailsRouterTest:testRevertWhen_injectSweepAndCall_NoEthSent() (gas: 15756)
 TrailsRouterTest:testSweepAndCallETH() (gas: 78594)
 TrailsRouterTest:testValidateOpHashAndSweep_WithoutSentinel() (gas: 16410)
-TrailsRouterTest:test_Execute_FromContract_ShouldPreserveContractAsSender() (gas: 24565)
-TrailsRouterTest:test_Execute_FromEOA_ShouldPreserveEOAAsSender() (gas: 29209)
-TrailsRouterTest:test_Execute_WithMultipleCalls() (gas: 30915)
+TrailsRouterTest:test_Execute_FromContract_ShouldPreserveContractAsSender() (gas: 24521)
+TrailsRouterTest:test_Execute_FromEOA_ShouldPreserveEOAAsSender() (gas: 29166)
+TrailsRouterTest:test_Execute_WithMultipleCalls() (gas: 30765)
 TrailsRouterTest:test_Multicall3Address_IsCorrect() (gas: 6570)
 TrailsRouterTest:test_ReceiveETH_ShouldAcceptETH() (gas: 18098)
-TrailsRouterTest:test_RevertWhen_allowFailure_true_allCalls() (gas: 102266)
-TrailsRouterTest:test_RevertWhen_allowFailure_true_firstOfMultipleCalls() (gas: 100768)
-TrailsRouterTest:test_RevertWhen_allowFailure_true_lastOfMultipleCalls() (gas: 101419)
-TrailsRouterTest:test_RevertWhen_allowFailure_true_middleOfMultipleCalls() (gas: 100984)
-TrailsRouterTest:test_RevertWhen_allowFailure_true_singleCall() (gas: 97574)
-TrailsRouterTest:test_RevertWhen_execute_withETH_allowFailure_true() (gas: 24234)
-TrailsRouterTest:test_RevertWhen_pullAmountAndExecute_InsufficientAllowance() (gas: 28634)
-TrailsRouterTest:test_RevertWhen_pullAndExecute_InsufficientAllowance() (gas: 31314)
-TrailsRouterTest:test_RevertWhen_pullAndExecute_allowFailure_true() (gas: 98753)
+TrailsRouterTest:test_RevertWhen_allowFailure_true_allCalls() (gas: 102005)
+TrailsRouterTest:test_RevertWhen_allowFailure_true_firstOfMultipleCalls() (gas: 100507)
+TrailsRouterTest:test_RevertWhen_allowFailure_true_lastOfMultipleCalls() (gas: 101158)
+TrailsRouterTest:test_RevertWhen_allowFailure_true_middleOfMultipleCalls() (gas: 100723)
+TrailsRouterTest:test_RevertWhen_allowFailure_true_singleCall() (gas: 97502)
+TrailsRouterTest:test_RevertWhen_execute_withETH_allowFailure_true() (gas: 24163)
+TrailsRouterTest:test_RevertWhen_pullAmountAndExecute_InsufficientAllowance() (gas: 28562)
+TrailsRouterTest:test_RevertWhen_pullAndExecute_InsufficientAllowance() (gas: 31242)
+TrailsRouterTest:test_RevertWhen_pullAndExecute_allowFailure_true() (gas: 98681)
 TrailsRouterTest:test_amount_offset_out_of_bounds() (gas: 278820)
 TrailsRouterTest:test_direct_sweep_reverts_not_delegatecall() (gas: 12139)
 TrailsRouterTest:test_handleSequenceDelegateCall_dispatches_to_sweep_native() (gas: 50425)
 TrailsRouterTest:test_handleSequenceDelegateCall_invalid_selector_reverts() (gas: 10290)
 TrailsRouterTest:test_native_transfer_failed() (gas: 89620)
-TrailsRouterTest:test_no_tokens_to_pull() (gas: 650574)
+TrailsRouterTest:test_no_tokens_to_pull() (gas: 650507)
 TrailsRouterTest:test_no_tokens_to_sweep() (gas: 909059)
 TrailsRouterTest:test_placeholder_mismatch() (gas: 279474)
-TrailsRouterTest:test_pullAmountAndExecute_WithETH_InsufficientEthSent() (gas: 26845)
-TrailsRouterTest:test_pullAmountAndExecute_WithETH_ShouldTransferAndExecute() (gas: 37385)
-TrailsRouterTest:test_pullAmountAndExecute_WithToken_ShouldTransferAndExecute() (gas: 74041)
-TrailsRouterTest:test_pullAmountAndExecute_WithValidToken_ShouldTransferAndExecute() (gas: 73689)
-TrailsRouterTest:test_pullAndExecute_WithETH_NoEthSent() (gas: 18411)
-TrailsRouterTest:test_pullAndExecute_WithETH_ShouldTransferAndExecute() (gas: 38399)
-TrailsRouterTest:test_pullAndExecute_WithFailingMulticall() (gas: 494387)
-TrailsRouterTest:test_pullAndExecute_WithValidToken_ShouldTransferFullBalanceAndExecute() (gas: 72465)
+TrailsRouterTest:test_pullAmountAndExecute_WithETH_InsufficientEthSent() (gas: 26773)
+TrailsRouterTest:test_pullAmountAndExecute_WithETH_ShouldTransferAndExecute() (gas: 37339)
+TrailsRouterTest:test_pullAmountAndExecute_WithToken_ShouldTransferAndExecute() (gas: 73999)
+TrailsRouterTest:test_pullAmountAndExecute_WithValidToken_ShouldTransferAndExecute() (gas: 73647)
+TrailsRouterTest:test_pullAndExecute_WithETH_NoEthSent() (gas: 18344)
+TrailsRouterTest:test_pullAndExecute_WithETH_ShouldTransferAndExecute() (gas: 38356)
+TrailsRouterTest:test_pullAndExecute_WithFailingMulticall() (gas: 494357)
+TrailsRouterTest:test_pullAndExecute_WithValidToken_ShouldTransferFullBalanceAndExecute() (gas: 72432)
 TrailsRouterTest:test_refundAndSweep_erc20_partialRefund() (gas: 110365)
 TrailsRouterTest:test_refundAndSweep_native_partialRefund() (gas: 92161)
 TrailsRouterTest:test_success_sentinel_not_set() (gas: 15750)
 TrailsRouterTest:test_sweep_erc20Token() (gas: 77703)
 TrailsRouterTest:test_sweep_nativeToken() (gas: 49961)
-TrailsRouterTest:test_validateOpHashAndSweep_native_success() (gas: 62092)
-TrailsRouterTest:test_validateOpHashAndSweep_native_success_tstore() (gas: 130257)
+TrailsRouterTest:test_validateOpHashAndSweep_native_success() (gas: 62300)
+TrailsRouterTest:test_validateOpHashAndSweep_native_success_tstore() (gas: 130651)
 TrailsSentinelLibTest:test_Constants_DoNotChange() (gas: 735)
 TrailsSentinelLibTest:test_SentinelNamespace_Computation() (gas: 328)
 TrailsSentinelLibTest:test_SentinelNamespace_Constant() (gas: 548)

src/TrailsRouter.sol

@@ -361,19 +361,29 @@ contract TrailsRouter is IDelegatedExtension, ITrailsRouter, DelegatecallGuard,
 
         bytes4 selector = bytes4(callData[0:4]);
 
-        // Only allow `aggregate3Value` calls (0x174dea71)
-        if (selector != 0x174dea71) {
-            revert InvalidFunctionSelector(selector);
-        }
-
-        // Decode and validate the Call3Value[] array to ensure allowFailure=false for all calls
-        IMulticall3.Call3Value[] memory calls = abi.decode(callData[4:], (IMulticall3.Call3Value[]));
-
-        // Iterate through all calls and verify allowFailure is false
-        for (uint256 i = 0; i < calls.length; i++) {
-            if (calls[i].allowFailure) {
-                revert AllowFailureMustBeFalse(i);
+        // Only allow `aggregate3Value` or `aggregate3` (0x174dea71 or 0x82ad56cb)
+        if (selector == 0x174dea71) {
+            // Decode and validate the Call3Value[] array to ensure allowFailure=false for all calls
+            IMulticall3.Call3Value[] memory calls = abi.decode(callData[4:], (IMulticall3.Call3Value[]));
+
+            // Iterate through all calls and verify allowFailure is false
+            for (uint256 i = 0; i < calls.length; i++) {
+                if (calls[i].allowFailure) {
+                    revert AllowFailureMustBeFalse(i);
+                }
             }
+        } else if (selector == 0x82ad56cb) {
+            // Decode and validate the Call3[] array to ensure allowFailure=false for all calls
+            IMulticall3.Call3[] memory calls = abi.decode(callData[4:], (IMulticall3.Call3[]));
+
+            // Iterate through all calls and verify allowFailure is false
+            for (uint256 i = 0; i < calls.length; i++) {
+                if (calls[i].allowFailure) {
+                    revert AllowFailureMustBeFalse(i);
+                }
+            }
+        } else {
+            revert InvalidFunctionSelector(selector);
         }
     }
 }