added contract address parameter for new owner

src/sdk/base/EtherspotWalletAPI.ts

@@ -17,6 +17,7 @@ import { BaseApiParams, BaseAccountAPI } from './BaseAccountAPI';
 export interface EtherspotWalletApiParams extends BaseApiParams {
   factoryAddress?: string;
   index?: number;
+  predefinedAccountAddress?: string;
 }
 
 /**
@@ -30,6 +31,7 @@ export class EtherspotWalletAPI extends BaseAccountAPI {
   factoryAddress?: string;
   index: number;
   accountAddress?: string;
+  predefinedAccountAddress?: string;
 
   /**
    * our account contract.
@@ -43,6 +45,17 @@ export class EtherspotWalletAPI extends BaseAccountAPI {
     super(params);
     this.factoryAddress = params.factoryAddress;
     this.index = params.index ?? 0;
+    this.predefinedAccountAddress = params.predefinedAccountAddress ?? null;
+  }
+
+  async checkAccountAddress(address: string): Promise<void> {
+    const accountContract = EtherspotWallet__factory.connect(address, this.provider);
+    if (!(await accountContract.isOwner(this.services.walletService.walletAddress))) {
+      throw new Error('the specified accountAddress does not belong to the given EOA provider')
+    }
+    else {
+      this.accountAddress = address;
+    }
   }
 
   async _getAccountContract(): Promise<EtherspotWallet | Contract> {
@@ -73,11 +86,16 @@ export class EtherspotWalletAPI extends BaseAccountAPI {
   }
 
   async getCounterFactualAddress(): Promise<string> {
+    if (this.predefinedAccountAddress) {
+      await this.checkAccountAddress(this.predefinedAccountAddress);
+    }
+    if (!this.accountAddress) {
       this.factory = EtherspotWalletFactory__factory.connect(this.factoryAddress, this.provider);
       this.accountAddress = await this.factory.getAddress(
         this.services.walletService.walletAddress,
         this.index,
       );
+    }
     return this.accountAddress;
   }
 

src/sdk/interfaces.ts

@@ -24,4 +24,5 @@ export interface SdkOptions {
   factoryWallet?: Factory;
   walletFactoryAddress?: string;
   entryPointAddress?: string;
+  accountAddress?: string;
 }

src/sdk/sdk.ts

@@ -47,6 +47,7 @@ export class PrimeSdk {
     const {
       chainId, //
       rpcProviderUrl,
+      accountAddress,
     } = optionsLike;
 
     this.chainId = chainId;
@@ -106,6 +107,7 @@ export class PrimeSdk {
         optionsLike,
         entryPointAddress,
         factoryAddress: walletFactoryAddress,
+        predefinedAccountAddress: accountAddress,
       })
     }
     this.bundler = new HttpRpcClient(optionsLike.bundlerRpcUrl, entryPointAddress, chainId);