only add sender override if enabled

pimlicolabs · Oct 8, 2024 · b008d6c · b008d6c
1 parent 09f2957
commit b008d6c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/src/rpc/estimation/gasEstimationHandler.ts b/src/rpc/estimation/gasEstimationHandler.ts
diff --git a/src/rpc/rpcHandler.ts b/src/rpc/rpcHandler.ts
@@ -482,7 +482,7 @@ export class RpcHandler implements IRpcEndpoint {
             userOperation,
             entryPoint,
             queuedUserOperations,
-            undefined,
+            true,
             stateOverrides
         )
 

diff --git a/src/rpc/validation/UnsafeValidator.ts b/src/rpc/validation/UnsafeValidator.ts
@@ -184,17 +184,18 @@ export class UnsafeValidator implements InterfaceValidator {
         userOperation: UserOperation,
         entryPoint: Address,
         queuedUserOperations: UserOperation[],
-        balanceOverrideEnabled?: boolean,
+        addSenderBalanceOverride: boolean,
         stateOverrides?: StateOverrides
     ): Promise<SimulateHandleOpResult<"execution">> {
         const error = await this.gasEstimationHandler.simulateHandleOp({
             userOperation,
             queuedUserOperations,
+            addSenderBalanceOverride,
+            balanceOverrideEnabled: this.balanceOverrideEnabled,
             entryPoint,
             replacedEntryPoint: false,
             targetAddress: zeroAddress,
             targetCallData: "0x",
-            balanceOverrideEnabled: balanceOverrideEnabled ?? this.balanceOverrideEnabled,
             stateOverrides
         })
 

diff --git a/src/types/interfaces.ts b/src/types/interfaces.ts
@@ -14,7 +14,7 @@ export interface InterfaceValidator {
         userOperation: UserOperation,
         entryPoint: Address,
         queuedUserOperations: UserOperation[],
-        balanceOverrideEnabled?: boolean,
+        addSenderBalanceOverride: boolean,
         stateOverrides?: StateOverrides
     ): Promise<SimulateHandleOpResult<"execution">>
     getValidationResultV06(