change signer to smartAccountSigner

pimlicolabs · Nov 22, 2023 · bf7374b · bf7374b
1 parent 28f34bc
commit bf7374b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/src/accounts/privateKeyToSafeSmartAccount.ts b/src/accounts/privateKeyToSafeSmartAccount.ts
@@ -57,7 +57,7 @@ export async function privateKeyToSafeSmartAccount<
     const privateKeyAccount = privateKeyToAccount(privateKey)
 
     return signerToSafeSmartAccount(client, {
-        signer: privateKeyAccount,
+        smartAccountSigner: privateKeyAccount,
         safeVersion,
         entryPoint,
         addModuleLibAddress: _addModuleLibAddress,

diff --git a/src/accounts/privateKeyToSimpleSmartAccount.ts b/src/accounts/privateKeyToSimpleSmartAccount.ts
@@ -36,7 +36,7 @@ export async function privateKeyToSimpleSmartAccount<
     const privateKeyAccount = privateKeyToAccount(privateKey)
 
     return signerToSimpleSmartAccount(client, {
-        signer: privateKeyAccount,
+        smartAccountSigner: privateKeyAccount,
         factoryAddress,
         entryPoint,
         index

diff --git a/src/accounts/signerToSafeSmartAccount.ts b/src/accounts/signerToSafeSmartAccount.ts
@@ -494,7 +494,7 @@ export async function signerToSafeSmartAccount<
 >(
     client: Client<TTransport, TChain>,
     {
-        signer,
+        smartAccountSigner,
         safeVersion,
         entryPoint,
         addModuleLibAddress: _addModuleLibAddress,
@@ -508,7 +508,7 @@ export async function signerToSafeSmartAccount<
         setupTransactions = []
     }: {
         safeVersion: SafeVersion
-        signer: SmartAccountSigner
+        smartAccountSigner: SmartAccountSigner
         entryPoint: Address
         addModuleLibAddress?: Address
         safe4337ModuleAddress?: Address
@@ -528,14 +528,14 @@ export async function signerToSafeSmartAccount<
     const chainId = await getChainId(client)
 
     const viemSigner: Account =
-        signer.type === "local"
+        smartAccountSigner.type === "local"
             ? ({
-                  ...signer,
+                  ...smartAccountSigner,
                   signTransaction: (_, __) => {
                       throw new SignTransactionNotSupportedBySmartAccount()
                   }
               } as Account)
-            : (signer as Account)
+            : (smartAccountSigner as Account)
 
     const {
         addModuleLibAddress,

diff --git a/src/accounts/signerToSimpleSmartAccount.ts b/src/accounts/signerToSimpleSmartAccount.ts
@@ -106,26 +106,26 @@ export async function signerToSimpleSmartAccount<
 >(
     client: Client<TTransport, TChain>,
     {
-        signer,
+        smartAccountSigner,
         factoryAddress,
         entryPoint,
         index = 0n
     }: {
-        signer: SmartAccountSigner
+        smartAccountSigner: SmartAccountSigner
         factoryAddress: Address
         entryPoint: Address
         index?: bigint
     }
 ): Promise<SimpleSmartAccount<TTransport, TChain>> {
     const viemSigner: Account =
-        signer.type === "local"
+        smartAccountSigner.type === "local"
             ? ({
-                  ...signer,
+                  ...smartAccountSigner,
                   signTransaction: (_, __) => {
                       throw new SignTransactionNotSupportedBySmartAccount()
                   }
               } as Account)
-            : (signer as Account)
+            : (smartAccountSigner as Account)
 
     const [accountAddress, chainId] = await Promise.all([
         getAccountAddress<TTransport, TChain>({

diff --git a/test/utils.ts b/test/utils.ts
@@ -43,12 +43,14 @@ export const getSignerToSimpleSmartAccount = async () => {
 
     const publicClient = await getPublicClient()
 
-    const signer = privateKeyToAccount(process.env.TEST_PRIVATE_KEY as Hex)
+    const smartAccountSigner = privateKeyToAccount(
+        process.env.TEST_PRIVATE_KEY as Hex
+    )
 
     return await signerToSimpleSmartAccount(publicClient, {
         entryPoint: getEntryPoint(),
         factoryAddress: getFactoryAddress(),
-        signer: signer
+        smartAccountSigner: smartAccountSigner
     })
 }
 
@@ -64,11 +66,13 @@ export const getSignerToSafeSmartAccount = async (args?: {
 
     const publicClient = await getPublicClient()
 
-    const signer = privateKeyToAccount(process.env.TEST_PRIVATE_KEY as Hex)
+    const smartAccountSigner = privateKeyToAccount(
+        process.env.TEST_PRIVATE_KEY as Hex
+    )
 
     return await signerToSafeSmartAccount(publicClient, {
         entryPoint: getEntryPoint(),
-        signer: signer,
+        smartAccountSigner: smartAccountSigner,
         safeVersion: "1.4.1",
         saltNonce: 100n,
         setupTransactions: args?.setupTransactions