Add support for EP7.0 and Etherspot's Modular accounts

src/sdk/base/BaseAccountAPI.ts

@@ -466,7 +466,7 @@ export abstract class BaseAccountAPI {
    * Sign the filled userOp.
    * @param userOp the UserOperation to sign (with signature field ignored)
    */
-  async signUserOp(userOp: any): Promise<any> {
+  async signUserOp(userOp: UserOperation): Promise<UserOperation> {
     if (this.paymasterAPI != null) {
       const paymasterAndData = await this.paymasterAPI.getPaymasterAndData(userOp);
       userOp.paymasterAndData = paymasterAndData.result.paymasterAndData;

src/sdk/base/ERC4337EthersProvider.ts

@@ -113,7 +113,7 @@ export class ERC4337EthersProvider extends BaseProvider {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       wait: async (confirmations?: number): Promise<TransactionReceipt> => {
         const transactionReceipt = await waitPromise;
-        if (userOp.factory != null) {
+        if (userOp.factory != null && userOp.factory.length > 0) {
           // checking if the wallet has been deployed by the transaction; it must be if we are here
           await this.smartAccountAPI.checkAccountPhantom();
         }

src/sdk/base/EtherspotWalletAPI.ts

@@ -57,10 +57,7 @@ export class EtherspotWalletAPI extends BaseAccountAPI {
       throw new Error('the module is already installed')
     }
 
-    const installModuleInterface = new ethers.utils.Interface(['function installModule(uint256 moduleTypeId,address module,bytes initData)']);
-    const installModuleData = installModuleInterface.encodeFunctionData('installModule', [moduleTypeId, module, initData]);
-
-    return installModuleData;
+    return accountContract.interface.encodeFunctionData('installModule', [moduleTypeId, module, initData]);
   }
 
   async uninstallModule(moduleTypeId: MODULE_TYPE, module: string, deinitData: string): Promise<string> {
@@ -69,10 +66,7 @@ export class EtherspotWalletAPI extends BaseAccountAPI {
       throw new Error('the module is not installed in the wallet')
     }
 
-    const uninstallModuleInterface = new ethers.utils.Interface(['function uninstallModule(uint256 moduleTypeId,address module,bytes deInitData)']);
-    const uninstallModuleData = uninstallModuleInterface.encodeFunctionData('uninstallModule', [moduleTypeId, module, deinitData]);
-
-    return uninstallModuleData;
+    return accountContract.interface.encodeFunctionData('uninstallModule', [moduleTypeId, module, deinitData]);
   }
 
   async checkAccountAddress(address: string): Promise<void> {

src/sdk/base/HttpRpcClient.ts

@@ -51,7 +51,7 @@ export class HttpRpcClient {
     }
   }
 
-  async getVerificationGasInfo(tx: any): Promise<any> {
+  async getVerificationGasInfo(tx: UserOperationStruct): Promise<any> {
     const hexifiedUserOp = deepHexlify(await resolveProperties(tx));
     try {
       const response = await this.userOpJsonRpcProvider.send('eth_estimateUserOperationGas', [hexifiedUserOp, this.entryPointAddress]);

src/sdk/base/VerifyingPaymasterAPI.ts

@@ -47,6 +47,9 @@ export class VerifyingPaymasterAPI extends PaymasterAPI {
       // A dummy value here is required in order to calculate a correct preVerificationGas value.
       paymasterData: DUMMY_PAYMASTER_AND_DATA,
       signature: userOp.signature ?? '0x',
+      paymaster: userOp?.paymaster,
+      paymasterVerificationGasLimit: userOp?.paymasterVerificationGasLimit,
+      paymasterPostOpGasLimit: userOp?.paymasterPostOpGasLimit,
     };
     const op = await ethers.utils.resolveProperties(pmOp);
     op.preVerificationGas = calcPreVerificationGas(op);

src/sdk/common/ERC4337Utils.ts

@@ -18,6 +18,7 @@ export interface UserOperation {
   paymasterVerificationGasLimit?: BigNumberish
   paymasterPostOpGasLimit?: BigNumberish
   paymasterData?: BytesLike
+  paymasterAndData?: BytesLike
   signature: BytesLike
 }