chore: clean up

Author: lwin-kyaw

demo/wagmi-react-app/src/components/Main.tsx

@@ -254,11 +254,11 @@ const Main = () => {
                 {
                   calls: [
                     {
-                      to: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045" as `0x${string}`,
+                      to: address as `0x${string}`,
                       value: parseEther("0.0001"),
                     },
                     {
-                      to: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045" as `0x${string}`,
+                      to: address as `0x${string}`,
                       value: parseEther("0.0002"),
                     },
                   ],

packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Utils.ts

@@ -1,10 +1,15 @@
 import { bs58 as base58 } from "@toruslabs/bs58";
-import { EIP_5792_METHODS, Eip5792GetCapabilitiesParams, Eip5792SendCallsParams } from "@toruslabs/ethereum-controllers";
+import {
+  EIP_5792_METHODS,
+  Eip5792GetCapabilitiesParams,
+  Eip5792SendCallsParams,
+  Eip5792ShowCallsStatusParams,
+} from "@toruslabs/ethereum-controllers";
 import type { ISignClient, SessionTypes } from "@walletconnect/types";
 import { getAccountsFromNamespaces, parseAccountId } from "@walletconnect/utils";
 import { type JRPCRequest, providerErrors, rpcErrors } from "@web3auth/auth";
 import { EVM_METHOD_TYPES, SOLANA_METHOD_TYPES } from "@web3auth/ws-embed";
-import { GetCapabilitiesReturnType, isHex, SendCallsReturnType, WalletGetCallsStatusReturnType } from "viem";
+import type { GetCapabilitiesReturnType, SendCallsReturnType, WalletGetCallsStatusReturnType } from "viem";
 
 import { AddEthereumChainConfig, SOLANA_CAIP_CHAIN_MAP, WalletLoginError } from "../../base";
 import type { IEthProviderHandlers, MessageParams, TransactionParams, TypedMessageParams } from "../../providers/ethereum-provider";
@@ -137,10 +142,6 @@ export function getEthProviderHandlers({ connector, chainId }: { connector: ISig
     },
     // EIP-5792: wallet_getCallsStatus
     processGetCallsStatus: async (batchId: string) => {
-      if (!isHex(batchId)) {
-        throw rpcErrors.invalidParams("Invalid batchId");
-      }
-
       const results = await sendJrpcRequest<WalletGetCallsStatusReturnType, string[]>(
         connector,
         `eip155:${chainId}`,
@@ -149,6 +150,10 @@ export function getEthProviderHandlers({ connector, chainId }: { connector: ISig
       );
       return results;
     },
+    // EIP-5792: wallet_showCallsStatus
+    processShowCallsStatus: async (batchId: Eip5792ShowCallsStatusParams) => {
+      await sendJrpcRequest<void, string[]>(connector, `eip155:${chainId}`, EIP_5792_METHODS.WALLET_SHOW_CALLS_STATUS, [batchId]);
+    },
   };
 }
 

packages/no-modal/src/providers/ethereum-provider/rpc/ethRpcMiddlewares.ts

@@ -25,6 +25,7 @@ export function createEthMiddleware(providerHandlers: IEthProviderHandlers): JRP
     processGetCapabilities,
     processSendCalls,
     processGetCallsStatus,
+    processShowCallsStatus,
   } = providerHandlers;
   const ethMiddleware = mergeMiddleware([
     createScaffoldMiddleware({
@@ -42,6 +43,7 @@ export function createEthMiddleware(providerHandlers: IEthProviderHandlers): JRP
       processGetCapabilities,
       processSendCalls,
       processGetCallsStatus,
+      processShowCallsStatus,
     }) as JRPCMiddleware<unknown, unknown>,
   ]);
   return ethMiddleware;

packages/no-modal/src/providers/ethereum-provider/rpc/interfaces.ts

@@ -1,7 +1,7 @@
-import { Eip5792GetCapabilitiesParams, Eip5792SendCallsParams } from "@toruslabs/ethereum-controllers";
+import { Eip5792GetCapabilitiesParams, Eip5792SendCallsParams, Eip5792ShowCallsStatusParams } from "@toruslabs/ethereum-controllers";
 import type { JRPCRequest } from "@web3auth/auth";
 import type { TransactionLike, TypedDataDomain, TypedDataField } from "ethers";
-import { GetCapabilitiesReturnType, SendCallsReturnType, WalletGetCallsStatusReturnType } from "viem";
+import type { GetCapabilitiesReturnType, SendCallsReturnType, WalletGetCallsStatusReturnType } from "viem";
 
 import { AddEthereumChainConfig } from "../../../base";
 export interface IEthAccountHandlers {
@@ -60,6 +60,7 @@ export interface WalletMiddlewareOptions {
   processGetCapabilities?: (req: Eip5792GetCapabilitiesParams) => Promise<GetCapabilitiesReturnType>;
   processSendCalls?: (params: Eip5792SendCallsParams) => Promise<SendCallsReturnType>;
   processGetCallsStatus?: (batchId: string) => Promise<WalletGetCallsStatusReturnType>;
+  processShowCallsStatus?: (batchId: Eip5792ShowCallsStatusParams) => Promise<void>;
 }
 
 export type IEthProviderHandlers = WalletMiddlewareOptions;

packages/no-modal/src/providers/ethereum-provider/rpc/walletMidddleware.ts

@@ -1,4 +1,4 @@
-import { Eip5792GetCapabilitiesParams, Eip5792SendCallsParams } from "@toruslabs/ethereum-controllers";
+import { Eip5792GetCapabilitiesParams, Eip5792SendCallsParams, SUPPORTED_EIP_5792_VERSIONS } from "@toruslabs/ethereum-controllers";
 import { createAsyncMiddleware, createScaffoldMiddleware, JRPCMiddleware, JRPCRequest, JRPCResponse, rpcErrors } from "@web3auth/auth";
 import { isHex, toHex } from "viem";
 
@@ -16,6 +16,7 @@ export function createWalletMiddleware({
   processGetCapabilities,
   processSendCalls,
   processGetCallsStatus,
+  processShowCallsStatus,
 }: WalletMiddlewareOptions): JRPCMiddleware<string, unknown> {
   if (!getAccounts) {
     throw new Error("opts.getAccounts is required");
@@ -221,6 +222,28 @@ export function createWalletMiddleware({
     }
 
     const params = Array.isArray(req.params) ? req.params[0] : req.params;
+    if (!params || typeof params !== "object") {
+      throw rpcErrors.invalidParams("Missing or invalid params for wallet_sendCalls");
+    }
+
+    if (!params.version || !SUPPORTED_EIP_5792_VERSIONS.includes(params.version)) {
+      throw rpcErrors.invalidParams(
+        `Invalid version: expected one of ${SUPPORTED_EIP_5792_VERSIONS.join(", ")}, got "${params.version || "undefined"}"`
+      );
+    }
+
+    if (!params.chainId) {
+      throw rpcErrors.invalidParams("Missing required field: chainId");
+    }
+
+    if (!Array.isArray(params.calls) || params.calls.length === 0) {
+      throw rpcErrors.invalidParams("calls must be a non-empty array");
+    }
+
+    const from = params.from as string | undefined;
+    if (from) {
+      await validateAndNormalizeKeyholder(from, req);
+    }
 
     const walletSendCallsParams: Eip5792SendCallsParams = {
       ...params,
@@ -236,10 +259,27 @@ export function createWalletMiddleware({
     }
 
     const batchId = Array.isArray(req.params) ? req.params[0] : (req.params as string);
+    if (!batchId || typeof batchId !== "string") {
+      throw rpcErrors.invalidParams("Missing or invalid batchId");
+    }
 
     res.result = await processGetCallsStatus(batchId);
   }
 
+  async function walletShowCallsStatusMiddleware(req: JRPCRequest<unknown>, res: JRPCResponse<unknown>): Promise<void> {
+    if (!processShowCallsStatus) {
+      throw rpcErrors.methodNotSupported();
+    }
+
+    const batchId = Array.isArray(req.params) ? req.params[0] : (req.params as string);
+    if (!batchId || typeof batchId !== "string") {
+      throw rpcErrors.invalidParams("Missing or invalid batchId");
+    }
+
+    await processShowCallsStatus(batchId);
+    res.result = true;
+  }
+
   return createScaffoldMiddleware({
     // account lookups
     eth_accounts: createAsyncMiddleware(lookupAccounts),
@@ -256,8 +296,9 @@ export function createWalletMiddleware({
     eth_signTypedData_v4: createAsyncMiddleware(signTypedDataV4),
     personal_sign: createAsyncMiddleware(personalSign),
     // EIP-5792
-    wallet_getCapabilities: createAsyncMiddleware(getWalletCapabilitiesMiddleware), // EIP-5792: Wallet Capabilities
-    wallet_sendCalls: createAsyncMiddleware(walletSendCallsMiddleware), // EIP-5792: Send Batch Calls
-    wallet_getCallsStatus: createAsyncMiddleware(walletBatchCallStatusMiddleware), // EIP-5792: Batch Call Status
+    wallet_getCapabilities: createAsyncMiddleware(getWalletCapabilitiesMiddleware),
+    wallet_sendCalls: createAsyncMiddleware(walletSendCallsMiddleware),
+    wallet_getCallsStatus: createAsyncMiddleware(walletBatchCallStatusMiddleware),
+    wallet_showCallsStatus: createAsyncMiddleware(walletShowCallsStatusMiddleware),
   });
 }