pr cleanup for chunks

Author: ultraviolet10

apps/iframe/src/components/requests/WalletSendCalls.tsx

@@ -6,13 +6,12 @@ import {
     type EIP1193RequestResult,
     EIP1193UnauthorizedError,
     EIP1193UnsupportedMethodError,
-    HappyWalletCapability,
     type Msgs,
     type PopupMsgs,
     getEIP1193ErrorObjectFromCode,
     requestPayloadIsHappyMethod,
 } from "@happy.tech/wallet-common"
-import { type Address, type Client, type Hex, InternalRpcError, InvalidAddressError, isAddress } from "viem"
+import { type Client, InvalidAddressError, isAddress } from "viem"
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts"
 import {
     checkIsSessionKeyModuleInstalled,
@@ -178,57 +177,6 @@ export async function dispatchHandlers(request: PopupMsgs[Msgs.PopupApprove]) {
             return accountSessionKey.address
         }
 
-        // EIP-5792
-        case "wallet_sendCalls": {
-            if (!user) throw new EIP1193UnauthorizedError()
-
-            const callsData = request.payload.params?.[0]
-            if (!callsData) throw new InternalRpcError(new Error("Invalid request payload"))
-
-            if (user.address !== callsData.from) {
-                // MAY reject the request if the from address does not match the enabled account
-                throw new InternalRpcError(new Error("Sender address does not match enabled account"))
-            }
-
-            // validate that no unsupported capability is sent through
-            const allowedCapabilities = new Set([HappyWalletCapability.BoopPaymaster])
-            if (callsData.capabilities) {
-                for (const capability of Object.keys(callsData.capabilities)) {
-                    if (!allowedCapabilities.has(capability as HappyWalletCapability)) {
-                        throw new InternalRpcError(new Error("Invalid capability"))
-                    }
-                }
-            }
-
-            // extract specified paymaster address from capabilities
-            const boopPaymasterAddress: Address | undefined = callsData.capabilities?.boopPaymaster?.address
-            let userOpHash: Hex | null = null
-
-            for (const call of callsData.calls) {
-                const { to, value, data, chainId } = call
-
-                if (chainId !== getCurrentChain().chainId)
-                    throw new InternalRpcError(new Error("Invalid chainId detected"))
-
-                if (!to) throw new Error("Missing 'to' address in transaction call")
-
-                userOpHash = await sendUserOp({
-                    user,
-                    tx: { to, value, data },
-                    validator: contractAddresses.ECDSAValidator,
-                    paymaster: boopPaymasterAddress,
-                    signer: async (userOp, smartAccountClient) =>
-                        await smartAccountClient.account.signUserOperation(userOp),
-                })
-            }
-
-            return userOpHash
-        }
-
-        case "wallet_showCallsStatus": {
-            return undefined
-        }
-
         default:
             return await sendToWalletClient(request)
     }

apps/iframe/src/requests/approved.ts

@@ -5,7 +5,6 @@ import {
     EIP1193UnauthorizedError,
     EIP1193UnsupportedMethodError,
     EIP1193UserRejectedRequestError,
-    HappyWalletCapability,
     type Msgs,
     type ProviderMsgsFromApp,
     requestPayloadIsHappyMethod,
@@ -15,11 +14,9 @@ import {
     type Address,
     type Client,
     type Hash,
-    InternalRpcError,
     InvalidAddressError,
     type Transaction,
     type TransactionReceipt,
-    type WalletCapabilities,
     hexToBigInt,
     isAddress,
     parseSignature,
@@ -42,7 +39,6 @@ import { getUser } from "#src/state/user"
 import { getWalletClient } from "#src/state/walletClient"
 import type { AppURL } from "#src/utils/appURL"
 import { checkIfRequestRequiresConfirmation } from "#src/utils/checkIfRequestRequiresConfirmation"
-import { convertUserOpReceiptToCallStatus } from "./modules/boop-batcher/helpers"
 import { sendResponse } from "./sendResponse"
 import { appForSourceID, checkAuthenticated } from "./utils"
 
@@ -273,50 +269,6 @@ export async function dispatchHandlers(request: ProviderMsgsFromApp[Msgs.Request
             // The app may have bypassed the permission check, but this doesn't do anything.
             return null
 
-        // EIP-5792
-        case "wallet_getCapabilities": {
-            // This method SHOULD return an error if the user has not
-            // already authorized a connection between the application and
-            // the requested address.
-            checkAuthenticated()
-            const queryAddress = request.payload.params?.[0]
-            if (!queryAddress) {
-                throw new Error("Missing address parameter")
-            }
-
-            const currentChainId = getCurrentChain().chainId
-
-            const capabilities: WalletCapabilities = {
-                [currentChainId]: Object.fromEntries(
-                    Object.values(HappyWalletCapability).map((capability) => [capability, { supported: true }]),
-                ),
-            }
-
-            // c.f. https://www.eip5792.xyz/reference/getCapabilities#returns
-            return capabilities
-        }
-
-        // this method only returns a subset of the fields that eth_getTransactionReceipt returns
-        case "wallet_getCallsStatus": {
-            // TODO if the batch was atomic, this handler MUST return only a single receipt
-            try {
-                const [hash] = request.payload.params as Hash[]
-                if (!hash) {
-                    throw new InternalRpcError(new Error("Transaction hash is missing."))
-                }
-                const smartAccountClient = (await getSmartAccountClient()) as ExtendedSmartAccountClient
-
-                const userOpReceipt = await smartAccountClient.waitForUserOperationReceipt({
-                    hash: hash,
-                })
-
-                return convertUserOpReceiptToCallStatus(userOpReceipt ? [userOpReceipt] : null)
-            } catch (error) {
-                console.error(error)
-                throw error
-            }
-        }
-
         case HappyMethodNames.REQUEST_SESSION_KEY: {
             const user = getUser()
             const targetContractAddress = request.payload.params[0] as Address

apps/iframe/src/requests/modules/boop-batcher/helpers.ts

@@ -4,7 +4,6 @@ import { createLazyFileRoute } from "@tanstack/react-router"
 import { useCallback, useEffect, useState } from "react"
 import { HappyRequestSessionKey } from "#src/components/requests/HappyRequestSessionKey.js"
 import { HappyUseAbi } from "#src/components/requests/HappyUseAbi"
-import { WalletSendCalls } from "#src/components/requests/WalletSendCalls"
 import { DotLinearWaveLoader } from "../components/loaders/DotLinearWaveLoader"
 import { EthRequestAccounts } from "../components/requests/EthRequestAccounts"
 import { EthSendTransaction } from "../components/requests/EthSendTransaction"
@@ -137,8 +136,6 @@ function Request() {
             return <HappyUseAbi {...props} />
         case HappyMethodNames.REQUEST_SESSION_KEY:
             return <HappyRequestSessionKey {...props} />
-        case "wallet_sendCalls":
-            return <WalletSendCalls {...props} />
         default:
             return (
                 <main>

apps/iframe/src/requests/permissionless.ts

@@ -66,8 +66,6 @@ const safeList = new Set([
     "wallet_revokePermissions", // https://github.com/MetaMask/metamask-improvement-proposals/blob/main/MIPs/mip-2.md
     "web3_clientVersion",
     "web3_sha3",
-    "wallet_getCapabilities",
-    "wallet_getCallsStatus",
 ])
 
 /**
@@ -118,8 +116,6 @@ const unsafeList = new Set([
     // cryptography
     "eth_decrypt",
     "eth_getEncryptionPublicKey",
-    "wallet_sendCalls",
-    "wallet_showCallsStatus",
 ])
 
 /**