Simplification & Fixes in Orchestrator and Account

src/Batcher.sol

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.23;
+
+import {IOrchestrator} from "./interfaces/IOrchestrator.sol";
+
+/// @title Batcher
+/// @notice Contract for executing multiple intents through the orchestrator in a single transaction
+/// @dev Individual intent failures do not revert the entire batch
+contract Batcher {
+    /// @notice Emitted when an intent execution fails
+    event IntentFailed(uint256 indexed index, bytes reason);
+
+    error InvalidArrayLength();
+    error ArrayLengthMismatch();
+
+    /// @notice Execute multiple intents through the orchestrator
+    /// @param orchestrator The orchestrator contract address
+    /// @param encodedIntents Array of encoded intents
+    /// @param intentGas Array of gas amounts for each intent
+    function batchExecute(
+        address orchestrator,
+        bytes[] calldata encodedIntents,
+        uint256[] calldata intentGas
+    ) external {
+        uint256 length = encodedIntents.length;
+
+        if (length == 0) revert InvalidArrayLength();
+        if (length != intentGas.length) revert ArrayLengthMismatch();
+
+        // Execute each intent
+        for (uint256 i = 0; i < length; ++i) {
+            // Encode the function call
+            bytes memory data =
+                abi.encodeWithSelector(IOrchestrator.execute.selector, encodedIntents[i]);
+
+            // Make the call with specified gas
+            (bool success, bytes memory returnData) = orchestrator.call{gas: intentGas[i]}(data);
+
+            if (!success) {
+                emit IntentFailed(i, returnData);
+            }
+        }
+    }
+}

src/IthacaAccount.sol

@@ -627,13 +627,6 @@ contract IthacaAccount is IIthacaAccount, EIP712, GuardedExecutor {
             // Set the target key hash to the payer's.
             keyHash = k;
 
-            // If this is a simulation, signature validation errors are skipped.
-            /// @dev to simulate a paymaster, state override the balance of the msg.sender
-            /// to type(uint256).max. In this case, the msg.sender is the ORCHESTRATOR.
-            if (address(ORCHESTRATOR).balance == type(uint256).max) {
-                isValid = true;
-            }
-
             if (!isValid) {
                 revert Unauthorized();
             }