permissionless 0.0.12 → 0.0.13

package/_types/clients/decorators/smartAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smartAccount.d.ts","sourceRoot":"","sources":["../../../clients/decorators/smartAccount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"smartAccount.d.ts","sourceRoot":"","sources":["../../../clients/decorators/smartAccount.ts"],"names":[],"mappings":"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"}

package/_types/clients/pimlico.d.ts

@@ -20,7 +20,7 @@ export type PimlicoPaymasterClient = Client<Transport, Chain | undefined, Accoun
  *
  * const pimlicoBundlerClient = createPimlicoBundlerClient({
  *   chain: mainnet,
- *   transport: http("https://api.pimlico.io/v1/goerli/rpc?apikey=YOUR_API_KEY_HERE"),
+ *   transport: http("https://api.pimlico.io/v2/goerli/rpc?apikey=YOUR_API_KEY_HERE"),
  * })
  */
 export declare const createPimlicoBundlerClient: <transport extends Transport, chain extends Chain | undefined = undefined>(parameters: {

package/_types/clients/stackup.d.ts

@@ -19,7 +19,7 @@ export type StackupPaymasterClient = Client<Transport, Chain | undefined, Accoun
  *
  * const stackupPaymasterClient = createStackupPaymasterClient({
  *   chain: mainnet,
- *   transport: http("https://api.stackup.sh/v1/paymaster/YOUR_API_KEY_HERE"),
+ *   transport: http("https://api.stackup.sh/v2/paymaster/YOUR_API_KEY_HERE"),
  * })
  */
 export declare const createStackupPaymasterClient: <transport extends Transport, chain extends Chain | undefined = undefined>(parameters: {

package/_types/types/index.d.ts

@@ -19,4 +19,5 @@ export type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
 export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+export type UnionOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
 //# sourceMappingURL=index.d.ts.map

package/_types/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,YAAY,EAAE,aAAa,EAAE,CAAA;AAE7B,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAA;AAE5D,MAAM,MAAM,6BAA6B,CACrC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,IAC1D,WAAW,CAAC,QAAQ,CAAC,SAAS,IAAI,GAChC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;CAAE,GACnE;IAAE,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEzE,MAAM,MAAM,mBAAmB,CAC3B,QAAQ,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,IACpE,WAAW,CAAC,QAAQ,CAAC,SAAS,IAAI,GAChC;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,GACzB;IAAE,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAEhC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACvB,GAAG,EAAE,CAAA;AAEN,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,YAAY,EAAE,aAAa,EAAE,CAAA;AAE7B,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAA;AAE5D,MAAM,MAAM,6BAA6B,CACrC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,IAC1D,WAAW,CAAC,QAAQ,CAAC,SAAS,IAAI,GAChC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;CAAE,GACnE;IAAE,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEzE,MAAM,MAAM,mBAAmB,CAC3B,QAAQ,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,IACpE,WAAW,CAAC,QAAQ,CAAC,SAAS,IAAI,GAChC;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,GACzB;IAAE,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAEhC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACvB,GAAG,EAAE,CAAA;AAEN,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAG9E,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,GACvD,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GACV,KAAK,CAAA"}

package/accounts/index.ts

@@ -1,14 +1,33 @@
+import { privateKeyToSimpleSmartAccount } from "./privateKeyToSimpleSmartAccount.js"
+
 import {
-    type PrivateKeySimpleSmartAccount,
-    SignTransactionNotSupportedBySmartAccount,
-    privateKeyToSimpleSmartAccount
-} from "./privateKeyToSimpleSmartAccount.js"
+    type SimpleSmartAccount,
+    signerToSimpleSmartAccount
+} from "./signerToSimpleSmartAccount.js"
 
-import { type SmartAccount } from "./types.js"
+import { privateKeyToSafeSmartAccount } from "./privateKeyToSafeSmartAccount.js"
+
+import {
+    type SafeSmartAccount,
+    type SafeVersion,
+    signerToSafeSmartAccount
+} from "./signerToSafeSmartAccount.js"
+
+import {
+    SignTransactionNotSupportedBySmartAccount,
+    type SmartAccount,
+    type SmartAccountSigner
+} from "./types.js"
 
 export {
+    type SafeVersion,
+    type SmartAccountSigner,
+    type SafeSmartAccount,
+    signerToSafeSmartAccount,
+    type SimpleSmartAccount,
+    signerToSimpleSmartAccount,
     SignTransactionNotSupportedBySmartAccount,
-    type PrivateKeySimpleSmartAccount,
     privateKeyToSimpleSmartAccount,
-    type SmartAccount
+    type SmartAccount,
+    privateKeyToSafeSmartAccount
 }

package/accounts/privateKeyToSafeSmartAccount.ts

@@ -0,0 +1,73 @@
+import {
+    type Address,
+    type Chain,
+    type Client,
+    type Hex,
+    type Transport
+} from "viem"
+import { privateKeyToAccount } from "viem/accounts"
+import {
+    type SafeSmartAccount,
+    type SafeVersion,
+    signerToSafeSmartAccount
+} from "./signerToSafeSmartAccount.js"
+
+/**
+ * @description Creates an Simple Account from a private key.
+ *
+ * @returns A Private Key Simple Account.
+ */
+export async function privateKeyToSafeSmartAccount<
+    TTransport extends Transport = Transport,
+    TChain extends Chain | undefined = Chain | undefined
+>(
+    client: Client<TTransport, TChain>,
+    {
+        privateKey,
+        safeVersion,
+        entryPoint,
+        addModuleLibAddress: _addModuleLibAddress,
+        safe4337ModuleAddress: _safe4337ModuleAddress,
+        safeProxyFactoryAddress: _safeProxyFactoryAddress,
+        safeSingletonAddress: _safeSingletonAddress,
+        multiSendAddress: _multiSendAddress,
+        multiSendCallOnlyAddress: _multiSendCallOnlyAddress,
+        saltNonce = 0n,
+        safeModules = [],
+        setupTransactions = []
+    }: {
+        safeVersion: SafeVersion
+        privateKey: Hex
+        entryPoint: Address
+        addModuleLibAddress?: Address
+        safe4337ModuleAddress?: Address
+        safeProxyFactoryAddress?: Address
+        safeSingletonAddress?: Address
+        multiSendAddress?: Address
+        multiSendCallOnlyAddress?: Address
+        saltNonce?: bigint
+        setupTransactions?: {
+            to: Address
+            data: Address
+            value: bigint
+        }[]
+        safeModules?: Address[]
+    }
+): Promise<SafeSmartAccount<TTransport, TChain>> {
+    const privateKeyAccount = privateKeyToAccount(privateKey)
+
+    return signerToSafeSmartAccount(client, {
+        signer: privateKeyAccount,
+        safeVersion,
+        entryPoint,
+        addModuleLibAddress: _addModuleLibAddress,
+        safe4337ModuleAddress: _safe4337ModuleAddress,
+        safeProxyFactoryAddress: _safeProxyFactoryAddress,
+        safeSingletonAddress: _safeSingletonAddress,
+        multiSendAddress: _multiSendAddress,
+        multiSendCallOnlyAddress: _multiSendCallOnlyAddress,
+        saltNonce,
+        safeModules,
+        setupTransactions
+    })
+}

package/accounts/privateKeyToSimpleSmartAccount.ts

@@ -1,104 +1,15 @@
 import {
     type Address,
-    BaseError,
     type Chain,
     type Client,
     type Hex,
-    type Transport,
-    concatHex,
-    encodeFunctionData
+    type Transport
 } from "viem"
-import { privateKeyToAccount, toAccount } from "viem/accounts"
-import { getBytecode, getChainId } from "viem/actions"
-import { getAccountNonce } from "../actions/public/getAccountNonce.js"
-import { getSenderAddress } from "../actions/public/getSenderAddress.js"
-import { getUserOperationHash } from "../utils/getUserOperationHash.js"
-import { type SmartAccount } from "./types.js"
-
-export class SignTransactionNotSupportedBySmartAccount extends BaseError {
-    override name = "SignTransactionNotSupportedBySmartAccount"
-    constructor({ docsPath }: { docsPath?: string } = {}) {
-        super(
-            [
-                "A smart account cannot sign or send transaction, it can only sign message or userOperation.",
-                "Please send user operation instead."
-            ].join("\n"),
-            {
-                docsPath,
-                docsSlug: "account"
-            }
-        )
-    }
-}
-
-export type PrivateKeySimpleSmartAccount<
-    transport extends Transport = Transport,
-    chain extends Chain | undefined = Chain | undefined
-> = SmartAccount<"privateKeySimpleSmartAccount", transport, chain>
-
-const getAccountInitCode = async (
-    factoryAddress: Address,
-    owner: Address,
-    index = 0n
-): Promise<Hex> => {
-    if (!owner) throw new Error("Owner account not found")
-
-    return concatHex([
-        factoryAddress,
-        encodeFunctionData({
-            abi: [
-                {
-                    inputs: [
-                        {
-                            internalType: "address",
-                            name: "owner",
-                            type: "address"
-                        },
-                        {
-                            internalType: "uint256",
-                            name: "salt",
-                            type: "uint256"
-                        }
-                    ],
-                    name: "createAccount",
-                    outputs: [
-                        {
-                            internalType: "contract SimpleAccount",
-                            name: "ret",
-                            type: "address"
-                        }
-                    ],
-                    stateMutability: "nonpayable",
-                    type: "function"
-                }
-            ],
-            functionName: "createAccount",
-            args: [owner, index]
-        }) as Hex
-    ])
-}
-
-const getAccountAddress = async <
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined
->({
-    client,
-    factoryAddress,
-    entryPoint,
-    owner
-}: {
-    client: Client<TTransport, TChain>
-    factoryAddress: Address
-    owner: Address
-    entryPoint: Address
-}): Promise<Address> => {
-    const initCode = await getAccountInitCode(factoryAddress, owner)
-
-    return getSenderAddress(client, {
-        initCode,
-        entryPoint
-    })
-}
+import { privateKeyToAccount } from "viem/accounts"
+import {
+    type SimpleSmartAccount,
+    signerToSimpleSmartAccount
+} from "./signerToSimpleSmartAccount.js"
 
 /**
  * @description Creates an Simple Account from a private key.
@@ -113,108 +24,21 @@ export async function privateKeyToSimpleSmartAccount<
     {
         privateKey,
         factoryAddress,
-        entryPoint
+        entryPoint,
+        index = 0n
     }: {
         privateKey: Hex
         factoryAddress: Address
         entryPoint: Address
+        index?: bigint
     }
-): Promise<PrivateKeySimpleSmartAccount<TTransport, TChain>> {
+): Promise<SimpleSmartAccount<TTransport, TChain>> {
     const privateKeyAccount = privateKeyToAccount(privateKey)
 
-    const [accountAddress, chainId] = await Promise.all([
-        getAccountAddress<TTransport, TChain>({
-            client,
-            factoryAddress,
-            entryPoint,
-            owner: privateKeyAccount.address
-        }),
-        getChainId(client)
-    ])
-
-    if (!accountAddress) throw new Error("Account address not found")
-
-    const account = toAccount({
-        address: accountAddress,
-        async signMessage({ message }) {
-            return privateKeyAccount.signMessage({ message })
-        },
-        async signTransaction(_, __) {
-            throw new SignTransactionNotSupportedBySmartAccount()
-        },
-        async signTypedData(typedData) {
-            return privateKeyAccount.signTypedData({ ...typedData, privateKey })
-        }
+    return signerToSimpleSmartAccount(client, {
+        signer: privateKeyAccount,
+        factoryAddress,
+        entryPoint,
+        index
     })
-
-    return {
-        ...account,
-        client: client,
-        publicKey: accountAddress,
-        entryPoint: entryPoint,
-        source: "privateKeySimpleSmartAccount",
-        async getNonce() {
-            return getAccountNonce(client, {
-                sender: accountAddress,
-                entryPoint: entryPoint
-            })
-        },
-        async signUserOperation(userOperation) {
-            return account.signMessage({
-                message: {
-                    raw: getUserOperationHash({
-                        userOperation,
-                        entryPoint: entryPoint,
-                        chainId: chainId
-                    })
-                }
-            })
-        },
-        async getInitCode() {
-            const contractCode = await getBytecode(client, {
-                address: accountAddress
-            })
-
-            if ((contractCode?.length ?? 0) > 2) return "0x"
-
-            return getAccountInitCode(factoryAddress, privateKeyAccount.address)
-        },
-        async encodeDeployCallData(_) {
-            throw new Error("Simple account doesn't support account deployment")
-        },
-        async encodeCallData({ to, value, data }) {
-            return encodeFunctionData({
-                abi: [
-                    {
-                        inputs: [
-                            {
-                                internalType: "address",
-                                name: "dest",
-                                type: "address"
-                            },
-                            {
-                                internalType: "uint256",
-                                name: "value",
-                                type: "uint256"
-                            },
-                            {
-                                internalType: "bytes",
-                                name: "func",
-                                type: "bytes"
-                            }
-                        ],
-                        name: "execute",
-                        outputs: [],
-                        stateMutability: "nonpayable",
-                        type: "function"
-                    }
-                ],
-                functionName: "execute",
-                args: [to, value, data]
-            })
-        },
-        async getDummySignature() {
-            return "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c"
-        }
-    }
 }