Feat/wallet service aa

demo/vue-app-new/package.json

@@ -36,6 +36,7 @@
     "@web3auth/torus-solana-adapter": "file:../../packages/adapters/torus-solana-adapter",
     "@web3auth/wallet-connect-v2-adapter": "file:../../packages/adapters/wallet-connect-v2-adapter",
     "@web3auth/wallet-services-plugin": "file:../../packages/plugins/wallet-services-plugin",
+    "@web3auth/ws-embed": "file:../../web3auth-ws-embed-3.1.2.tgz",
     "bs58": "^5.0.0",
     "ethers": "^6.13.3",
     "vue": "^3.5.11",

demo/vue-app-new/src/MainView.vue

@@ -36,9 +36,18 @@ const externalAdapters = ref<IAdapter<unknown>[]>([]);
 
 const walletPlugins = computed(() => {
   if (formData.chainNamespace !== CHAIN_NAMESPACES.EIP155 || !formData.walletPlugin.enable) return [];
-  const { logoDark, logoLight } = formData.walletPlugin;
+  const { logoDark, logoLight, confirmationStrategy } = formData.walletPlugin;
   const walletServicesPlugin = new WalletServicesPlugin({
-    walletInitOptions: { whiteLabel: { showWidgetButton: true, logoDark: logoDark || "logo", logoLight: logoLight || "logo" } },
+    walletInitOptions: {
+      whiteLabel: { showWidgetButton: true, logoDark: logoDark || "logo", logoLight: logoLight || "logo" },
+      walletUrls: {
+        production: {
+          url: "https://develop-wallet.web3auth.io",
+          logLevel: "debug",
+        },
+      },
+      confirmationStrategy,
+    },
   });
   return [walletServicesPlugin];
 });

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

@@ -16,6 +16,12 @@ import {
   signTypedMessage,
 } from "../services/ethHandlers";
 import { signAllTransactions, signAndSendTransaction, signMessage, signTransaction as signSolTransaction } from "../services/solHandlers";
+import {
+  walletSendEth,
+  walletSignPersonalMessage,
+  walletSignTransaction as walletSignEthTransaction,
+  walletSignTypedMessage,
+} from "../services/walletServiceHandlers";
 import { formDataStore } from "../store/form";
 
 const { t } = useI18n({ useScope: "global" });
@@ -48,19 +54,6 @@ const isDisplay = (name: string): boolean => {
   }
 };
 
-const showWalletUI = async () => {
-  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
-  await walletPlugin.showWalletUi();
-};
-const showCheckout = async () => {
-  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
-  await walletPlugin.showCheckout();
-};
-const showWalletConnectScanner = async () => {
-  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
-  await walletPlugin.showWalletConnectScanner();
-};
-
 const clearConsole = () => {
   const el = document.querySelector("#console>pre");
   const h1 = document.querySelector("#console>h1");
@@ -91,6 +84,33 @@ const printToConsole = (...args: unknown[]) => {
   }
 };
 
+// Wallet Services
+const showWalletUI = async () => {
+  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
+  await walletPlugin.showWalletUi();
+};
+const showCheckout = async () => {
+  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
+  await walletPlugin.showCheckout();
+};
+const showWalletConnectScanner = async () => {
+  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
+  await walletPlugin.showWalletConnectScanner();
+};
+const onWalletSignPersonalMessage = async () => {
+  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
+  await walletSignPersonalMessage(walletPlugin.wsEmbedInstance.provider, printToConsole);
+};
+const onWalletSignTypedData_v4 = async () => {
+  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
+  await walletSignTypedMessage(walletPlugin.wsEmbedInstance.provider, printToConsole);
+};
+const onWalletSendEth = async () => {
+  const walletPlugin = web3Auth.value?.getPlugin(WALLET_PLUGINS.WALLET_SERVICES) as WalletServicesPlugin;
+  await walletSendEth(walletPlugin.wsEmbedInstance.provider, printToConsole);
+};
+
+// Ethereum Provider
 const onGetUserInfo = async () => {
   printToConsole("User Info", userInfo.value);
 };
@@ -206,6 +226,13 @@ const onSignPersonalMsg = async () => {
           <Button block size="xs" pill class="mb-2" @click="showCheckout">
             {{ $t("app.buttons.btnShowCheckout") }}
           </Button>
+          <Button block size="xs" pill class="mb-2" @click="onWalletSignPersonalMessage">
+            {{ t("app.buttons.btnSignPersonalMsg") }}
+          </Button>
+          <Button block size="xs" pill class="mb-2" @click="onWalletSignTypedData_v4">
+            {{ t("app.buttons.btnSignTypedData_v4") }}
+          </Button>
+          <Button block size="xs" pill class="mb-2" @click="onWalletSendEth">{{ t("app.buttons.btnSendEth") }}</Button>
         </Card>
         <Card v-if="isDisplay('ethServices')" class="px-4 py-4 gap-4 !h-auto lg:!h-[calc(100dvh_-_240px)]" :shadow="false">
           <div class="mb-2 text-xl font-bold leading-tight text-left">Sample Transaction</div>

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

@@ -4,7 +4,15 @@ import { ADAPTER_STATUS, CHAIN_NAMESPACES, ChainNamespaceType, log } from "@web3
 import { useWeb3Auth } from "@web3auth/modal-vue-composables";
 import { computed, InputHTMLAttributes, ref } from "vue";
 
-import { chainConfigs, chainNamespaceOptions, languageOptions, loginProviderOptions, networkOptions, SmartAccountOptions } from "../config";
+import {
+  chainConfigs,
+  chainNamespaceOptions,
+  confirmationStrategyOptions,
+  languageOptions,
+  loginProviderOptions,
+  networkOptions,
+  SmartAccountOptions,
+} from "../config";
 import { formDataStore } from "../store/form";
 
 const formData = formDataStore;
@@ -350,6 +358,15 @@ const onChainNamespaceChange = (value: string) => {
           :placeholder="$t('app.walletPlugin.logoDark')"
           class="sm:col-span-2"
         />
+        <Select
+          v-model="formData.walletPlugin.confirmationStrategy"
+          data-testid="selectLoginProviders"
+          :label="$t('app.walletPlugin.confirmationStrategy')"
+          :aria-label="$t('app.walletPlugin.confirmationStrategy')"
+          :placeholder="$t('app.walletPlugin.confirmationStrategy')"
+          :options="confirmationStrategyOptions"
+          class=""
+        />
       </Card>
       <Card v-if="isActiveTab(4)" class="grid grid-cols-1 gap-2 px-4 py-4" :shadow="false">
         <Toggle

demo/vue-app-new/src/config.ts

@@ -1,6 +1,7 @@
 import { LANGUAGE_TYPE, LANGUAGES, LOGIN_PROVIDER, LOGIN_PROVIDER_TYPE, WhiteLabelData } from "@web3auth/auth";
 import { CHAIN_NAMESPACES, ChainNamespaceType, CustomChainConfig, WEB3AUTH_NETWORK, WEB3AUTH_NETWORK_TYPE } from "@web3auth/base";
 import { SignTypedDataMessageV4 } from "@web3auth/ethereum-provider";
+import { CONFIRMATION_STRATEGY, CONFIRMATION_STRATEGY_TYPE } from "@web3auth/wallet-services-plugin";
 
 import { FormConfigSettings } from "./interfaces";
 
@@ -184,6 +185,7 @@ export type FormData = {
     enable: boolean;
     logoDark: string;
     logoLight: string;
+    confirmationStrategy: Exclude<CONFIRMATION_STRATEGY_TYPE, "popup">;
   };
   useAccountAbstractionProvider: boolean;
   useAAWithExternalWallet?: boolean;
@@ -240,3 +242,9 @@ export const getV4TypedData = (chainId: string): SignTypedDataMessageV4 => ({
     contents: "Hello, Bob!",
   },
 });
+
+export const confirmationStrategyOptions: { name: string; value: string }[] = [
+  { name: "Modal", value: CONFIRMATION_STRATEGY.MODAL },
+  { name: "Auto Approve", value: CONFIRMATION_STRATEGY.AUTO_APPROVE },
+  { name: "Default", value: CONFIRMATION_STRATEGY.DEFAULT },
+];

demo/vue-app-new/src/services/walletServiceHandlers.ts

@@ -0,0 +1,96 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { log } from "@web3auth/base";
+import { verifyMessage as eipVerifyMessage } from "@web3auth/sign-in-with-ethereum";
+import { WalletServicesPlugin } from "@web3auth/wallet-services-plugin";
+import { BrowserProvider, parseEther } from "ethers";
+
+import { getV4TypedData } from "../config";
+
+export const walletSignPersonalMessage = async (provider: WalletServicesPlugin["provider"], uiConsole: any) => {
+  try {
+    const ethProvider = new BrowserProvider(provider);
+    const signer = await ethProvider.getSigner();
+    const account = await signer.getAddress();
+    const from = account;
+
+    const originalMessage = "Example `personal_sign` messages";
+
+    // Sign the message
+    const signedMessage = await signer.signMessage(originalMessage);
+
+    const valid = await eipVerifyMessage({
+      provider: ethProvider,
+      message: originalMessage,
+      signature: signedMessage,
+      signer: from,
+    });
+
+    uiConsole(`Success`, { signedMessage, verify: valid });
+  } catch (error) {
+    log.error("Error", error);
+    uiConsole("Error", error instanceof Error ? error.message : error);
+  }
+};
+
+export const walletSignTypedMessage = async (provider: WalletServicesPlugin["provider"], uiConsole: any) => {
+  try {
+    const ethProvider = new BrowserProvider(provider);
+    const signer = await ethProvider.getSigner();
+    const account = await signer.getAddress();
+    const from = account;
+    const typedData = getV4TypedData(provider.chainId);
+
+    const signedMessage = await signer.signTypedData(typedData.domain, typedData.types, typedData.message);
+
+    const valid = await eipVerifyMessage({
+      provider: ethProvider,
+      typedData,
+      signature: signedMessage,
+      signer: from,
+    });
+
+    uiConsole(`Success`, { signedMessage, verify: valid });
+  } catch (error) {
+    log.error("Error", error);
+    uiConsole("Error", error instanceof Error ? error.message : error);
+  }
+};
+
+export const walletSendEth = async (provider: WalletServicesPlugin["provider"], uiConsole: any) => {
+  try {
+    const ethProvider = new BrowserProvider(provider);
+    const signer = await ethProvider.getSigner();
+    const account = await signer.getAddress();
+    const txRes = await signer.sendTransaction({
+      from: account,
+      to: account,
+      value: parseEther("0.01"),
+    });
+    // check for big int before logging to not break the stringify
+    uiConsole("txRes", txRes.toJSON());
+  } catch (error) {
+    log.info("error", error);
+    uiConsole("error", error instanceof Error ? error.message : error);
+  }
+};
+
+export const walletSignTransaction = async (provider: WalletServicesPlugin["provider"], uiConsole: any) => {
+  try {
+    const ethProvider = new BrowserProvider(provider);
+    const accounts = await provider.request({ method: "eth_accounts" });
+    const smartAccountAddress = accounts[0];
+    const signer = await ethProvider.getSigner(smartAccountAddress);
+    const account = await signer.getAddress();
+    // only supported with social logins (openlogin adapter)
+    const serializedTx = await signer.signTransaction({
+      from: account,
+      to: account,
+      value: parseEther("0.01"),
+    });
+
+    uiConsole("serialized user operation", serializedTx);
+  } catch (error) {
+    log.info("error", error);
+    uiConsole("error", error instanceof Error ? error.message : error);
+  }
+};

demo/vue-app-new/src/store/form.ts

@@ -21,6 +21,7 @@ export const formDataStore = reactive<FormData>({
     enable: false,
     logoLight: "",
     logoDark: "",
+    confirmationStrategy: "default",
   },
   useAccountAbstractionProvider: false,
   useAAWithExternalWallet: true,

demo/vue-app-new/src/translations/en.json

@@ -14,7 +14,8 @@
     "walletPlugin": {
       "title": "Wallet Service Plugin",
       "logoLight": "Logo Light",
-      "logoDark": "Logo Dark"
+      "logoDark": "Logo Dark",
+      "confirmationStrategy": "Confirmation Strategy"
     },
     "accountAbstractionProvider": {
       "title": "Account Abstraction Provider",
@@ -49,7 +50,6 @@
       "sessionTime": "Session Time"
     },
     "chainNamespace": "Chain namespace",
-
     "w3aStatus": "Web3Auth status ::::: {status}",
     "isConnected": "Is connected ::::: {isConnected}",
     "isInitialized": "Is initialized ::::: {isInitialized}",

packages/plugins/wallet-services-plugin/package.json

@@ -34,10 +34,11 @@
     "@toruslabs/ethereum-controllers": "^6.3.2"
   },
   "dependencies": {
+    "@web3auth/account-abstraction-provider": "^9.3.1",
     "@web3auth/auth": "^9.5.3",
     "@web3auth/base": "^9.4.5",
     "@web3auth/no-modal": "^9.4.5",
-    "@web3auth/ws-embed": "^3.1.6",
+    "@web3auth/ws-embed": "file:../../../web3auth-ws-embed-3.1.2.tgz",
     "loglevel": "^1.9.2"
   },
   "peerDependencies": {

packages/plugins/wallet-services-plugin/src/plugin.ts

@@ -1,5 +1,6 @@
 import { type BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import type { EthereumProviderConfig } from "@toruslabs/ethereum-controllers";
+import { AccountAbstractionProvider } from "@web3auth/account-abstraction-provider";
 import { SafeEventEmitter, type WhiteLabelData } from "@web3auth/auth";
 import {
   ADAPTER_EVENTS,
@@ -20,7 +21,7 @@ import {
   WALLET_ADAPTERS,
   WalletServicesPluginError,
 } from "@web3auth/base";
-import WsEmbed, { CtorArgs, WsEmbedParams } from "@web3auth/ws-embed";
+import WsEmbed, { AccountAbstractionConfig, CtorArgs, WsEmbedParams } from "@web3auth/ws-embed";
 
 type WsPluginEmbedParams = Omit<WsEmbedParams, "buildEnv" | "enableLogging" | "chainConfig" | "confirmationStrategy"> & {
   /**
@@ -98,11 +99,34 @@ export class WalletServicesPlugin extends SafeEventEmitter implements IPlugin {
     if (!connectedChainConfig.ticker) throw WalletServicesPluginError.invalidParams("ticker is required in chainConfig");
     if (!connectedChainConfig.tickerName) throw WalletServicesPluginError.invalidParams("tickerName is required in chainConfig");
 
+    const enableAccountAbstraction =
+      web3auth.coreOptions.useAAWithExternalWallet &&
+      (web3auth.connectedAdapterName === WALLET_ADAPTERS.AUTH ||
+        (web3auth.connectedAdapterName !== WALLET_ADAPTERS.AUTH && web3auth.coreOptions.useAAWithExternalWallet));
+
+    let accountAbstractionConfig: AccountAbstractionConfig;
+
+    if (enableAccountAbstraction) {
+      const smartAccountAddress = (web3auth.coreOptions.accountAbstractionProvider as AccountAbstractionProvider)?.smartAccount.address;
+      const smartAccountType = (web3auth.coreOptions.accountAbstractionProvider as AccountAbstractionProvider)?.config.smartAccountInit.name;
+      const paymasterConfig = (web3auth.coreOptions.accountAbstractionProvider as AccountAbstractionProvider)?.config?.paymasterConfig;
+      const bundlerConfig = (web3auth.coreOptions.accountAbstractionProvider as AccountAbstractionProvider)?.config?.bundlerConfig;
+
+      // TODO: fix this type casting when we start using accountAbstractionController
+      accountAbstractionConfig = {
+        smartAccountAddress: smartAccountAddress || undefined,
+        smartAccountType: smartAccountType || undefined,
+        paymasterConfig: paymasterConfig || undefined,
+        bundlerConfig: bundlerConfig || undefined,
+      } as AccountAbstractionConfig;
+    }
+
     const finalInitOptions = {
       ...this.walletInitOptions,
       chainConfig: connectedChainConfig as EthereumProviderConfig,
       enableLogging: this.web3auth.coreOptions?.enableLogging,
       whiteLabel: mergedWhitelabelSettings,
+      accountAbstractionConfig,
     };
 
     await this.wsEmbedInstance.init(finalInitOptions);