Merge branch 'master' into feat/nft-checkout-plugin

Author: tanguyenvn

demo/vue-app-new/package-lock.json

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import {
   AccountAbstractionProvider,
-  BiconomySmartAccount,
   ISmartAccount,
   KernelSmartAccount,
+  NexusSmartAccount,
   // LightSmartAccount,
   SafeSmartAccount,
   TrustSmartAccount,
@@ -97,8 +97,8 @@ const accountAbstractionProvider = computed((): IBaseProvider<IProvider> | undef
   // setup aa provider
   let smartAccountInit: ISmartAccount;
   switch (formData.smartAccountType) {
-    case "biconomy":
-      smartAccountInit = new BiconomySmartAccount();
+    case "nexus":
+      smartAccountInit = new NexusSmartAccount();
       break;
     case "kernel":
       smartAccountInit = new KernelSmartAccount();

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

@@ -28,6 +28,26 @@ export const chainConfigs: Record<ChainNamespaceType, CustomChainConfig[]> = {
       ticker: "ETH",
       tickerName: "Sepolia Testnet",
     },
+    {
+      chainNamespace: CHAIN_NAMESPACES.EIP155,
+      rpcTarget: "https://mainnet.base.org",
+      blockExplorerUrl: "https://base.blockscout.com",
+      chainId: "0x2105",
+      displayName: "Base Mainnet",
+      ticker: "ETH",
+      tickerName: "Base Ethereum",
+      logo: "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+    },
+    {
+      chainNamespace: CHAIN_NAMESPACES.EIP155,
+      rpcTarget: "https://sepolia.base.org",
+      blockExplorerUrl: "https://sepolia-explorer.base.org",
+      chainId: "0x14A34",
+      displayName: "Base Sepolia",
+      ticker: "ETH",
+      tickerName: "Base Sepolia Testnet",
+      logo: "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+    },
     {
       chainNamespace: CHAIN_NAMESPACES.EIP155,
       rpcTarget: "https://data-seed-prebsc-2-s3.binance.org:8545",
@@ -132,11 +152,11 @@ export const defaultLoginMethod: Record<LOGIN_PROVIDER_TYPE, FormConfigSettings>
   {} as Record<LOGIN_PROVIDER_TYPE, FormConfigSettings>
 );
 
-export type SmartAccountType = "safe" | "kernel" | "biconomy" | "trust";
+export type SmartAccountType = "safe" | "kernel" | "nexus" | "trust";
 
 export const SmartAccountOptions: { name: string; value: SmartAccountType }[] = [
   { name: "Safe", value: "safe" },
-  { name: "Biconomy", value: "biconomy" },
+  { name: "Nexus", value: "nexus" },
   { name: "Kernel", value: "kernel" },
   { name: "Trust", value: "trust" },
   // { name: "Light", value: "light" },

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

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Connection, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction } from "@solana/web3.js";
 import { CustomChainConfig, IProvider, log } from "@web3auth/base";
-import { SolanaWallet } from "@web3auth/solana-provider";
+import { SolanaWallet, TransactionOrVersionedTransaction } from "@web3auth/solana-provider";
 import base58 from "bs58";
 
 const getConnection = async (provider: IProvider): Promise<Connection> => {
@@ -65,7 +65,7 @@ export const signAndSendTransaction = async (provider: IProvider, uiConsole: any
       feePayer: new PublicKey(pubKey[0]),
     }).add(transactionInstruction);
 
-    const signature = await solWeb3.signAndSendTransaction(transaction);
+    const signature = await solWeb3.signAndSendTransaction(transaction as unknown as TransactionOrVersionedTransaction);
     uiConsole("signature", signature);
   } catch (error) {
     log.error("Error", error);
@@ -93,7 +93,7 @@ export const signTransaction = async (provider: IProvider, uiConsole: any) => {
       feePayer: new PublicKey(pubKey[0]),
     }).add(transactionInstruction);
 
-    const signedTx = await solWeb3.signTransaction(transaction);
+    const signedTx = await solWeb3.signTransaction(transaction as unknown as TransactionOrVersionedTransaction);
     log.info("signedTx", signedTx);
     uiConsole("signature", signedTx);
     return { signature: signedTx };
@@ -126,9 +126,9 @@ export const signAllTransactions = async (provider: IProvider, uiConsole: any) =
     log.info("blockhash", blockhash);
 
     const signedTx = await solWeb3.signAllTransactions([
-      getNewTx(publicKeys, blockhash),
-      getNewTx(publicKeys, blockhash),
-      getNewTx(publicKeys, blockhash),
+      getNewTx(publicKeys, blockhash) as unknown as TransactionOrVersionedTransaction,
+      getNewTx(publicKeys, blockhash) as unknown as TransactionOrVersionedTransaction,
+      getNewTx(publicKeys, blockhash) as unknown as TransactionOrVersionedTransaction,
     ]);
     log.info("signedTx", signedTx);
     uiConsole("signature", signedTx);

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

@@ -1,4 +1,4 @@
 {
-  "version": "9.3.2",
+  "version": "9.4.1",
   "npmClient": "npm"
 }