permissionless 0.0.27 → 0.0.28

package/accounts/signerToSafeSmartAccount.ts

@@ -22,13 +22,13 @@ import {
 } from "viem"
 import { toAccount } from "viem/accounts"
 import {
-    getBytecode,
     getChainId,
     readContract,
     signMessage,
     signTypedData
 } from "viem/actions"
 import { getAccountNonce } from "../actions/public/getAccountNonce.js"
+import { isSmartAccountDeployed } from "../utils/isSmartAccountDeployed.js"
 import {
     SignTransactionNotSupportedBySmartAccount,
     type SmartAccount,
@@ -502,6 +502,7 @@ export async function signerToSafeSmartAccount<
     client: Client<TTransport, TChain>,
     {
         signer,
+        address,
         safeVersion,
         entryPoint,
         addModuleLibAddress: _addModuleLibAddress,
@@ -516,9 +517,10 @@ export async function signerToSafeSmartAccount<
         safeModules = [],
         setupTransactions = []
     }: {
-        safeVersion: SafeVersion
         signer: SmartAccountSigner<TSource, TAddress>
+        safeVersion: SafeVersion
         entryPoint: Address
+        address?: Address
         addModuleLibAddress?: Address
         safe4337ModuleAddress?: Address
         safeProxyFactoryAddress?: Address
@@ -561,21 +563,25 @@ export async function signerToSafeSmartAccount<
         multiSendCallOnlyAddress: _multiSendCallOnlyAddress
     })
 
-    const accountAddress = await getAccountAddress<TTransport, TChain>({
-        client,
-        owner: viemSigner.address,
-        addModuleLibAddress,
-        safe4337ModuleAddress,
-        safeProxyFactoryAddress,
-        safeSingletonAddress,
-        multiSendAddress,
-        saltNonce,
-        setupTransactions,
-        safeModules
-    })
+    const accountAddress =
+        address ??
+        (await getAccountAddress<TTransport, TChain>({
+            client,
+            owner: viemSigner.address,
+            addModuleLibAddress,
+            safe4337ModuleAddress,
+            safeProxyFactoryAddress,
+            safeSingletonAddress,
+            multiSendAddress,
+            saltNonce,
+            setupTransactions,
+            safeModules
+        }))
 
     if (!accountAddress) throw new Error("Account address not found")
 
+    let safeDeployed = await isSmartAccountDeployed(client, accountAddress)
+
     const account = toAccount({
         address: accountAddress,
         async signMessage({ message }) {
@@ -695,11 +701,11 @@ export async function signerToSafeSmartAccount<
             )
         },
         async getInitCode() {
-            const contractCode = await getBytecode(client, {
-                address: accountAddress
-            })
+            if (safeDeployed) return "0x"
+
+            safeDeployed = await isSmartAccountDeployed(client, accountAddress)
 
-            if ((contractCode?.length ?? 0) > 2) return "0x"
+            if (safeDeployed) return "0x"
 
             return getAccountInitCode({
                 owner: viemSigner.address,

package/accounts/signerToSimpleSmartAccount.ts

@@ -11,15 +11,11 @@ import {
     encodeFunctionData
 } from "viem"
 import { toAccount } from "viem/accounts"
-import {
-    getBytecode,
-    getChainId,
-    signMessage,
-    signTypedData
-} from "viem/actions"
+import { getChainId, signMessage, signTypedData } from "viem/actions"
 import { getAccountNonce } from "../actions/public/getAccountNonce.js"
 import { getSenderAddress } from "../actions/public/getSenderAddress.js"
 import { getUserOperationHash } from "../utils/getUserOperationHash.js"
+import { isSmartAccountDeployed } from "../utils/isSmartAccountDeployed.js"
 import {
     SignTransactionNotSupportedBySmartAccount,
     type SmartAccount,
@@ -113,12 +109,14 @@ export async function signerToSimpleSmartAccount<
         signer,
         factoryAddress,
         entryPoint,
-        index = 0n
+        index = 0n,
+        address
     }: {
         signer: SmartAccountSigner<TSource, TAddress>
         factoryAddress: Address
         entryPoint: Address
         index?: bigint
+        address?: Address
     }
 ): Promise<SimpleSmartAccount<TTransport, TChain>> {
     const viemSigner: LocalAccount = {
@@ -129,18 +127,24 @@ export async function signerToSimpleSmartAccount<
     } as LocalAccount
 
     const [accountAddress, chainId] = await Promise.all([
-        getAccountAddress<TTransport, TChain>({
-            client,
-            factoryAddress,
-            entryPoint,
-            owner: viemSigner.address,
-            index
-        }),
+        address ??
+            getAccountAddress<TTransport, TChain>({
+                client,
+                factoryAddress,
+                entryPoint,
+                owner: viemSigner.address,
+                index
+            }),
         getChainId(client)
     ])
 
     if (!accountAddress) throw new Error("Account address not found")
 
+    let smartAccountDeployed = await isSmartAccountDeployed(
+        client,
+        accountAddress
+    )
+
     const account = toAccount({
         address: accountAddress,
         async signMessage({ message }) {
@@ -189,11 +193,14 @@ export async function signerToSimpleSmartAccount<
             })
         },
         async getInitCode() {
-            const contractCode = await getBytecode(client, {
-                address: accountAddress
-            })
+            if (smartAccountDeployed) return "0x"
+
+            smartAccountDeployed = await isSmartAccountDeployed(
+                client,
+                accountAddress
+            )
 
-            if ((contractCode?.length ?? 0) > 2) return "0x"
+            if (smartAccountDeployed) return "0x"
 
             return getAccountInitCode(factoryAddress, viemSigner.address, index)
         },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "permissionless",
-    "version": "0.0.27",
+    "version": "0.0.28",
     "author": "Pimlico",
     "homepage": "https://docs.pimlico.io/permissionless",
     "repository": "github:pimlicolabs/permissionless.js",

package/utils/index.ts

@@ -9,6 +9,7 @@ import {
     type GetUserOperationHashParams,
     getUserOperationHash
 } from "./getUserOperationHash.js"
+import { isSmartAccountDeployed } from "./isSmartAccountDeployed"
 import {
     AccountOrClientNotFoundError,
     type SignUserOperationHashWithECDSAParams,
@@ -33,5 +34,6 @@ export {
     type GetUserOperationHashParams,
     signUserOperationHashWithECDSA,
     type SignUserOperationHashWithECDSAParams,
-    AccountOrClientNotFoundError
+    AccountOrClientNotFoundError,
+    isSmartAccountDeployed
 }

package/utils/isSmartAccountDeployed.ts

@@ -0,0 +1,16 @@
+import type { Address, Client } from "viem"
+import { getBytecode } from "viem/actions"
+
+export const isSmartAccountDeployed = async (
+    client: Client,
+    address: Address
+): Promise<boolean> => {
+    const contractCode = await getBytecode(client, {
+        address: address
+    })
+
+    if ((contractCode?.length ?? 0) > 2) {
+        return true
+    }
+    return false
+}