fix: do not support 7702/5792 for 4337 AA accounts

demo/vue-app-new/src/components/X402Tester.vue

@@ -4,12 +4,12 @@ import { useSwitchChain } from "@wagmi/vue";
 import { useX402Fetch } from "@web3auth/modal/x402/vue";
 import { useChain, useWeb3Auth } from "@web3auth/modal/vue";
 import { CHAIN_NAMESPACES } from "@web3auth/no-modal";
-import { ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 
 const BASE_SEPOLIA_CHAIN_ID = "0x14a34"; // 84532
 const SOLANA_DEVNET_CHAIN_ID = "0x67"; // 103
 const SOLANA_DEVNET_CAIP_CHAIN_ID = `solana:${Number(SOLANA_DEVNET_CHAIN_ID)}`;
-const DEFAULT_X402_URL = import.meta.env.VITE_APP_X402_TEST_CONTENT_URL || "https://x402.org/protected";
+const DEFAULT_X402_URL = "https://web3auth-dev-demo-x420.sapphire-dev-2-1.authnetwork.dev";
 
 const { isConnected, connection, web3Auth } = useWeb3Auth();
 const { chainId, chainNamespace } = useChain();
@@ -19,6 +19,8 @@ const emit = defineEmits<{
   (e: "print-to-console", title: string, payload?: unknown): void;
 }>();
 
+const eip155Chains = computed(() => web3Auth.value?.coreOptions.chains?.filter((c) => c.chainNamespace === CHAIN_NAMESPACES.EIP155) || []);
+
 const url = ref(DEFAULT_X402_URL);
 const fetchLoading = ref(false);
 
@@ -45,9 +47,13 @@ watch(
 const onSwitchToBaseSepolia = async () => {
   fetchLoading.value = true;
   try {
-    await switchChainAsync({ chainId: parseInt(BASE_SEPOLIA_CHAIN_ID, 16) });
+    const newChain = eip155Chains.value.find((c) => c.chainId === BASE_SEPOLIA_CHAIN_ID);
+    if (!newChain) throw new Error(`Unsupported chainId: ${BASE_SEPOLIA_CHAIN_ID}`);
+    const data = await switchChainAsync({ chainId: Number(newChain.chainId) });
+    emit("print-to-console", "switchedChain", { chainId: data.id });
   } catch (err) {
-    emit("print-to-console", "x402 network error", err instanceof Error ? err.message : String(err));
+    console.error("Error", err);
+    emit("print-to-console", "switchedChain error", err instanceof Error ? err.message : String(err));
   } finally {
     fetchLoading.value = false;
   }

packages/no-modal/src/connectors/auth-connector/authConnector.ts

@@ -378,7 +378,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> implements IAuthConne
     });
     if (!citadelUserInfo?.accounts?.length) return [];
 
-    const currentChainNamespace = this.solanaWallet.accounts.length > 0 ? CHAIN_NAMESPACES.SOLANA : "evm"; // Note: citadel chain namespace is "evm" for EVM chains
+    const currentChainNamespace = this.solanaWallet?.accounts.length > 0 ? CHAIN_NAMESPACES.SOLANA : "evm"; // Note: citadel chain namespace is "evm" for EVM chains
     const filteredLinkedAccounts: LinkedAccountInfo[] = [];
     for (const account of citadelUserInfo.accounts) {
       const { chainNamespace, isPrimary, accountType } = account;

packages/no-modal/src/providers/account-abstraction-provider/providers/AccountAbstractionProvider.ts

@@ -18,7 +18,7 @@ import { type BundlerClient, createBundlerClient, createPaymasterClient, type Pa
 
 import { CHAIN_NAMESPACES, type CustomChainConfig, type IProvider, WalletInitializationError } from "../../../base";
 import { BaseProvider, type BaseProviderConfig, type BaseProviderState } from "../../../providers/base-provider";
-import { createAaMiddleware, createEoaMiddleware, providerAsMiddleware } from "../rpc/ethRpcMiddlewares";
+import { createAaMiddleware, createEip7702And5792MiddlewareForAaProvider, createEoaMiddleware, providerAsMiddleware } from "../rpc/ethRpcMiddlewares";
 import { getProviderHandlers } from "./utils";
 
 interface AccountAbstractionProviderConfig extends BaseProviderConfig {
@@ -80,7 +80,10 @@ class AccountAbstractionProvider extends BaseProvider<AccountAbstractionProvider
   }
 
   public async setupProvider(eoaProvider: IProvider): Promise<void> {
-    const { currentChain } = this;
+    const currentChain = this.currentChain;
+    if (!currentChain) {
+      throw WalletInitializationError.invalidProviderConfigError(`AA chain config not found for chain ${this.chainId}`);
+    }
     const { chainNamespace } = currentChain;
     if (chainNamespace !== this.PROVIDER_CHAIN_NAMESPACE) throw WalletInitializationError.incompatibleChainNameSpace("Invalid chain namespace");
     const bundlerAndPaymasterConfig = this.config.smartAccountChainsConfig.find((config) => config.chainId === currentChain.chainId);
@@ -154,8 +157,12 @@ class AccountAbstractionProvider extends BaseProvider<AccountAbstractionProvider
       eoaProvider,
       handlers: providerHandlers,
     });
+
+    // middleware to handle EIP-7702 and EIP-5792 methods,
+    // currently, we do not support EIP-7702 and EIP-5792 methods for account abstraction provider
+    const eip7702And5792Middleware = await createEip7702And5792MiddlewareForAaProvider();
     const eoaMiddleware = providerAsMiddleware(eoaProvider);
-    const engine = JRPCEngineV2.create({ middleware: [aaMiddleware, eoaMiddleware] });
+    const engine = JRPCEngineV2.create({ middleware: [aaMiddleware, eip7702And5792Middleware, eoaMiddleware] });
     const provider = providerFromEngineV2(engine);
     this.updateProviderEngineProxy(provider);
     eoaProvider.once("chainChanged", (chainId) => {

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

@@ -1,5 +1,12 @@
-import { METHOD_TYPES } from "@toruslabs/ethereum-controllers";
-import { createScaffoldMiddlewareV2, type JRPCRequest, type MiddlewareConstraint, type MiddlewareParams, rpcErrors } from "@web3auth/auth";
+import { EIP_5792_METHODS, EIP_7702_METHODS, METHOD_TYPES } from "@toruslabs/ethereum-controllers";
+import {
+  createScaffoldMiddlewareV2,
+  type JRPCRequest,
+  type MiddlewareConstraint,
+  type MiddlewareParams,
+  providerErrors,
+  rpcErrors,
+} from "@web3auth/auth";
 
 import { IProvider } from "../../../base";
 import { IEthProviderHandlers, MessageParams, TransactionParams, TypedMessageParams } from "../../ethereum-provider";
@@ -210,6 +217,18 @@ export async function createEoaMiddleware({ aaProvider }: { aaProvider: IProvide
   });
 }
 
+export async function createEip7702And5792MiddlewareForAaProvider(): Promise<MiddlewareConstraint> {
+  const eip5792Methods = Object.values(EIP_5792_METHODS);
+  const eip7702Methods = Object.values(EIP_7702_METHODS);
+  const eip7702And5792Methods: string[] = [...eip5792Methods, ...eip7702Methods];
+  return async ({ request, next }) => {
+    if (eip7702And5792Methods.includes(request.method as string)) {
+      throw providerErrors.unsupportedMethod(`${request.method} is not supported for account abstraction provider`);
+    }
+    return next(request);
+  };
+}
+
 export function providerAsMiddleware(provider: IProvider): MiddlewareConstraint {
   return async ({ request }) => {
     return provider.request({ method: request.method, params: request.params });

packages/no-modal/src/react/wagmi/provider.ts

@@ -9,13 +9,13 @@ import {
   CreateConnectorFn,
   fallback,
   http,
+  injected,
   useConfig as useWagmiConfig,
   useConnectionEffect,
   useReconnect,
   WagmiProvider as WagmiProviderBase,
   webSocket,
 } from "wagmi";
-import { injected } from "wagmi/connectors";
 
 import { CHAIN_NAMESPACES, CustomChainConfig, IProvider, log, WalletInitializationError, WEB3AUTH_CONNECTOR_ID } from "../../base";
 import { useWeb3Auth, useWeb3AuthDisconnect } from "../hooks";

packages/no-modal/src/vue/wagmi/provider.ts

@@ -1,4 +1,4 @@
-import { type Config, type Connection, type Connector, type CreateConnectorFn, hydrate } from "@wagmi/core";
+import { type Config, type Connection, type Connector, type CreateConnectorFn, hydrate, injected } from "@wagmi/core";
 import {
   configKey,
   createConfig as createWagmiConfig,
@@ -7,7 +7,6 @@ import {
   useConnectionEffect,
   useReconnect,
 } from "@wagmi/vue";
-import { injected } from "@wagmi/vue/connectors";
 import { randomId } from "@web3auth/auth";
 import { type Chain, defineChain, fallback, http, isAddress as isEvmAddress, webSocket } from "viem";
 import { defineComponent, h, PropType, provide, ref, shallowRef, watch } from "vue";