[TSv4] ZkSync AA & Default Factory (thirdweb-dev#3232)

Author: 0xFirekeeper

.changeset/eleven-poems-hammer.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/wallets": patch
+---
+
+[TSv4] ZkSync Smart Wallet Support

.changeset/heavy-birds-fail.md

@@ -0,0 +1,6 @@
+---
+"@thirdweb-dev/unity-js-bridge": patch
+"@thirdweb-dev/react": patch
+---
+
+Default account factory support

legacy_packages/react/src/evm/hooks/wallets/useSmartWallet.ts

@@ -10,6 +10,7 @@ import {
 import type { SmartWalletConfigOptions } from "../../../wallet/wallets/smartWallet/types";
 import {
   getSmartWalletAddress,
+  DEFAULT_FACTORY_ADDRESS,
   type SmartWalletConnectionArgs,
 } from "@thirdweb-dev/wallets/evm/wallets/smart-wallet";
 import { useCallback } from "react";
@@ -226,7 +227,7 @@ export function useSmartWallet<W extends WalletInstance>(
     async (args: { personalWalletAddress: string; data?: BytesLike }) => {
       return getSmartWalletAddress(
         context.activeChain,
-        options.factoryAddress,
+        options.factoryAddress || DEFAULT_FACTORY_ADDRESS,
         args.personalWalletAddress,
         args.data,
       );

legacy_packages/unity-js-bridge/src/thirdweb-bridge.ts

@@ -173,7 +173,7 @@ class ThirdwebBridge implements TWBridge {
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_PLATFORM = "unity";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
-      (globalThis as any).X_SDK_VERSION = "4.15.2";
+      (globalThis as any).X_SDK_VERSION = "4.16.1";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_OS = browser?.os ?? "unknown";
     }

legacy_packages/wallets/src/evm/connectors/smart-wallet/index.ts

@@ -12,7 +12,11 @@ import {
   TransactionOptions,
   UserOpOptions,
 } from "./types";
-import { ACCOUNT_CORE_ABI, ENTRYPOINT_ADDRESS } from "./lib/constants";
+import {
+  ACCOUNT_CORE_ABI,
+  ENTRYPOINT_ADDRESS,
+  DEFAULT_FACTORY_ADDRESS,
+} from "./lib/constants";
 import { EVMWallet } from "../../interfaces";
 import { ERC4337EthersSigner } from "./lib/erc4337-signer";
 import { BigNumber, constants, ethers, providers, utils } from "ethers";
@@ -69,7 +73,7 @@ export class SmartWalletConnector extends Connector<SmartWalletConnectionArgs> {
             this.config.secretKey,
           ),
       gasless: config.gasless,
-      factoryAddress: config.factoryAddress,
+      factoryAddress: config.factoryAddress || DEFAULT_FACTORY_ADDRESS,
       accountAddress: params.accountAddress,
       factoryInfo: {
         createAccount:
@@ -538,6 +542,9 @@ export class SmartWalletConnector extends Connector<SmartWalletConnectionArgs> {
    * @returns The account factory contract.
    */
   async getFactoryContract(): Promise<SmartContract> {
+    if (!this.config.factoryAddress) {
+      throw new Error("Factory address not set!");
+    }
     const sdk = ThirdwebSDK.fromSigner(
       await this.getSigner(),
       this.config.chain,

legacy_packages/wallets/src/evm/connectors/smart-wallet/lib/constants.ts

@@ -1,6 +1,8 @@
 export const ENTRYPOINT_ADDRESS = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"; // v0.6
 export const ERC6551_REGISTRY = "0x02101dfB77FDE026414827Fdc604ddAF224F0921";
 export const MANAGED_ACCOUNT_GAS_BUFFER = 50000;
+export const DEFAULT_FACTORY_ADDRESS =
+  "0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00";
 
 export const ACCOUNT_CORE_ABI = [
   {

legacy_packages/wallets/src/evm/connectors/smart-wallet/lib/http-rpc-client.ts

@@ -3,7 +3,11 @@ import { UserOperationStruct } from "@account-abstraction/contracts";
 import { isTwUrl } from "../../../utils/url";
 import { hexlifyUserOp } from "./utils";
 import { setAnalyticsHeaders } from "../../../utils/headers";
-import { EstimateUserOpGasRawResult, EstimateUserOpGasResult } from "../types";
+import {
+  EstimateUserOpGasRawResult,
+  EstimateUserOpGasResult,
+  ZkTransactionInput,
+} from "../types";
 import { MANAGED_ACCOUNT_GAS_BUFFER } from "./constants";
 
 export const DEBUG = false; // TODO set as public flag
@@ -85,6 +89,9 @@ export class HttpRpcClient {
   }
 
   async validateChainId(): Promise<void> {
+    if (this.chainId === 300 || this.chainId === 324) {
+      return;
+    }
     // validate chainId is in sync with expected chainid
     const chain = await this.userOpJsonRpcProvider.send("eth_chainId", []);
     const bundlerChain = parseInt(chain);
@@ -162,6 +169,27 @@ export class HttpRpcClient {
     );
   }
 
+  async zkPaymasterData(
+    transactionInput: providers.TransactionRequest,
+  ): Promise<any> {
+    await this.initializing;
+    return await this.userOpJsonRpcProvider.send("zk_paymasterData", [
+      await hexlifyUserOp({
+        ...transactionInput,
+        gas: transactionInput.gasLimit,
+      }),
+    ]);
+  }
+
+  async zkBroadcastTransaction(
+    transactionInput: ZkTransactionInput,
+  ): Promise<any> {
+    await this.initializing;
+    return await this.userOpJsonRpcProvider.send("zk_broadcastTransaction", [
+      transactionInput,
+    ]);
+  }
+
   private async printUserOperation(
     method: string,
     [userOp1, entryPointAddress]: [UserOperationStruct, string],

legacy_packages/wallets/src/evm/connectors/smart-wallet/lib/utils.ts

@@ -2,7 +2,8 @@ import { BigNumber, utils } from "ethers";
 import { UserOperationStruct } from "@account-abstraction/contracts";
 
 export async function hexlifyUserOp(
-  op: Partial<UserOperationStruct>,
+  // TODO: types
+  op: Partial<UserOperationStruct | any>,
 ): Promise<any> {
   const userOp = await utils.resolveProperties(op);
   return Object.keys(userOp)

legacy_packages/wallets/src/evm/connectors/smart-wallet/types.ts

@@ -14,7 +14,7 @@ import { UserOperationStruct } from "@account-abstraction/contracts";
 
 export type SmartWalletConfig = {
   chain: ChainOrRpcUrl;
-  factoryAddress: string;
+  factoryAddress?: string;
   clientId?: string;
   secretKey?: string;
   gasless: boolean;
@@ -171,3 +171,18 @@ export type EstimateUserOpGasResult = {
   verificationGasLimit: BigNumber;
   callGasLimit: BigNumber;
 };
+
+export type ZkTransactionInput = {
+  nonce?: string;
+  from: string;
+  to: string;
+  gas: string;
+  gasPrice?: string;
+  value?: string;
+  data?: string;
+  maxFeePerGas: string;
+  maxPriorityFeePerGas: string;
+  chainId?: string;
+  signedTransaction: string;
+  paymaster: string;
+};

legacy_packages/wallets/src/evm/connectors/smart-wallet/utils.ts

@@ -1,11 +1,13 @@
 import {
   ChainOrRpcUrl,
+  getChainProvider,
   isContractDeployed,
   ThirdwebSDK,
 } from "@thirdweb-dev/sdk";
 import { BytesLike } from "ethers";
 import { ENTRYPOINT_ADDRESS } from "./lib/constants";
 import { EntryPoint__factory } from "@account-abstraction/contracts";
+import { Zksync, ZksyncSepoliaTestnet } from "@thirdweb-dev/chains";
 
 export type AccessibleSmartWallets = {
   owned: string;
@@ -99,6 +101,19 @@ export async function isSmartWalletDeployed(
   return isDeployed;
 }
 
+export async function isZkSyncChain(
+  network: ChainOrRpcUrl,
+  clientId?: string,
+  secretKey?: string,
+) {
+  const provider = getChainProvider(network, {
+    clientId,
+    secretKey,
+  });
+  const chainId = (await provider.getNetwork()).chainId;
+  return chainId === Zksync.chainId || chainId === ZksyncSepoliaTestnet.chainId;
+}
+
 /**
  * Get the associated smart wallet address for a given personal wallet address
  * @param chain - The chain to use