Merge remote-tracking branch 'origin/v4' into feature/DEVX-410_add-tests

bcnmy · Jan 5, 2024 · 1e0dcc5 · 1e0dcc5
2 parents 91546a6 + 342f4f1
commit 1e0dcc5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,15 +58,11 @@ artifacts
 deployments
 
 # lockfiles
-packages/core-types/package-lock.json
 packages/account/package-lock.json
-packages/common/package-lock.json
+packages/modules/package-lock.json
 packages/bundler/package-lock.json
-packages/node-client/package-lock.json
 packages/paymaster/package-lock.json
 packages/particle-auth/package-lock.json
-packages/web3-auth/package-lock.json
-packages/web3-auth-native/package-lock.json
 packages/transak/package-lock.json
 package-lock.json
 yarn.lock

diff --git a/packages/account/src/BiconomySmartAccountV2.ts b/packages/account/src/BiconomySmartAccountV2.ts
@@ -22,7 +22,7 @@ import { BaseSmartContractAccount, getChain, type BigNumberish, type UserOperati
 import { isNullOrUndefined, packUserOp } from "./utils/Utils";
 import { BaseValidationModule, ModuleInfo, SendUserOpParams, ECDSAOwnershipValidationModule } from "@biconomy/modules";
 import { IHybridPaymaster, IPaymaster, BiconomyPaymaster, SponsorUserOperationDto } from "@biconomy/paymaster";
-import { IBundler, UserOpResponse } from "@biconomy/bundler";
+import { Bundler, IBundler, UserOpResponse } from "@biconomy/bundler";
 import {
   BiconomyTokenPaymasterRequest,
   BiconomySmartAccountV2Config,
@@ -99,6 +99,15 @@ export class BiconomySmartAccountV2 extends BaseSmartContractAccount {
       this.paymaster = biconomySmartAccountConfig.paymaster;
     }
 
+    if (biconomySmartAccountConfig.bundlerUrl) {
+      this.bundler = new Bundler({
+        bundlerUrl: biconomySmartAccountConfig.bundlerUrl,
+        chainId: biconomySmartAccountConfig.chainId,
+      });
+    } else {
+      this.bundler = biconomySmartAccountConfig.bundler;
+    }
+
     const defaultFallbackHandlerAddress =
       this.factoryAddress === DEFAULT_BICONOMY_FACTORY_ADDRESS ? DEFAULT_FALLBACK_HANDLER_ADDRESS : biconomySmartAccountConfig.defaultFallbackHandler;
     if (!defaultFallbackHandlerAddress) {

diff --git a/packages/paymaster/src/BiconomyPaymaster.ts b/packages/paymaster/src/BiconomyPaymaster.ts
@@ -112,7 +112,7 @@ export class BiconomyPaymaster implements IHybridPaymaster<SponsorUserOperationD
       // const value: BigNumberish | undefined = zeroValue as any;
       return {
         to: feeTokenAddress,
-        value: "0x",
+        value: "0x00",
         data: data,
       };
     } catch (error) {