add deposit override during estimations

src/rpc/estimation/gasEstimationHandler.ts

@@ -2,27 +2,47 @@ import type { UserOperation } from "@alto/types"
 import type { StateOverrides, UserOperationV07 } from "@alto/types"
 import { deepHexlify, isVersion06 } from "@alto/utils"
 import type { Hex } from "viem"
-import { toHex, type Address, parseEther } from "viem"
+import {
+    toHex,
+    type Address,
+    parseEther,
+    keccak256,
+    encodeAbiParameters
+} from "viem"
 import { GasEstimatorV06 } from "./gasEstimationsV06"
 import { GasEstimatorV07 } from "./gasEstimationsV07"
 import type { SimulateHandleOpResult } from "./types"
 import type { AltoConfig } from "../../createConfig"
 
 function getStateOverrides({
-    addSenderBalanceOverride,
+    addSenderDepositOverride,
     userOperation,
+    entryPoint,
     stateOverrides = {}
 }: {
-    addSenderBalanceOverride: boolean
+    addSenderDepositOverride: boolean
     stateOverrides: StateOverrides
+    entryPoint: Address
     userOperation: UserOperation
 }) {
     const result: StateOverrides = { ...stateOverrides }
+    const balanceOverride = parseEther("1000000")
 
-    if (addSenderBalanceOverride) {
-        result[userOperation.sender] = {
-            ...deepHexlify(stateOverrides?.[userOperation.sender] || {}),
-            balance: toHex(parseEther("1000000"))
+    if (addSenderDepositOverride) {
+        // Add deposit override.
+        const depositsMappingSlot = keccak256(
+            encodeAbiParameters(
+                [{ type: "address" }, { type: "uint256" }],
+                [userOperation.sender, 0n]
+            )
+        )
+
+        result[entryPoint] = {
+            ...deepHexlify(stateOverrides?.[entryPoint] || {}),
+            stateDiff: {
+                ...(stateOverrides?.[entryPoint]?.stateDiff || {}),
+                [depositsMappingSlot]: toHex(balanceOverride, { size: 32 })
+            }
         }
     }
 
@@ -42,17 +62,17 @@ export class GasEstimationHandler {
     simulateHandleOp({
         userOperation,
         queuedUserOperations,
-        addSenderBalanceOverride,
-        balanceOverrideEnabled,
+        addSenderDepositOverride,
+        stateOverrideEnabled,
         entryPoint,
         targetAddress,
         targetCallData,
         stateOverrides = {}
     }: {
         userOperation: UserOperation
         queuedUserOperations: UserOperation[]
-        addSenderBalanceOverride: boolean
-        balanceOverrideEnabled: boolean
+        addSenderDepositOverride: boolean
+        stateOverrideEnabled: boolean
         entryPoint: Address
         targetAddress: Address
         targetCallData: Hex
@@ -61,11 +81,12 @@ export class GasEstimationHandler {
         let finalStateOverride = undefined
 
         // Add balance override only for v0.6 userOperations (so that prefund check during simulation passes).
-        if (balanceOverrideEnabled && isVersion06(userOperation)) {
+        if (stateOverrideEnabled && isVersion06(userOperation)) {
             finalStateOverride = getStateOverrides({
                 userOperation,
-                addSenderBalanceOverride,
-                stateOverrides
+                addSenderDepositOverride,
+                stateOverrides,
+                entryPoint
             })
         }
 

src/rpc/rpcHandler.ts

@@ -1064,7 +1064,7 @@ export class RpcHandler implements IRpcEndpoint {
             userOperation: simulationUserOperation,
             entryPoint,
             queuedUserOperations,
-            addSenderBalanceOverride: true,
+            addSenderDepositOverride: true,
             stateOverrides: deepHexlify(stateOverrides)
         })
 
@@ -1185,7 +1185,7 @@ export class RpcHandler implements IRpcEndpoint {
                 },
                 entryPoint,
                 queuedUserOperations,
-                addSenderBalanceOverride: false,
+                addSenderDepositOverride: false,
                 stateOverrides: deepHexlify(stateOverrides)
             })
         }

src/rpc/validation/UnsafeValidator.ts

@@ -155,20 +155,20 @@ export class UnsafeValidator implements InterfaceValidator {
         userOperation,
         entryPoint,
         queuedUserOperations,
-        addSenderBalanceOverride,
+        addSenderDepositOverride,
         stateOverrides
     }: {
         userOperation: UserOperation
         entryPoint: Address
         queuedUserOperations: UserOperation[]
-        addSenderBalanceOverride: boolean
+        addSenderDepositOverride: boolean
         stateOverrides?: StateOverrides
     }): Promise<SimulateHandleOpResult<"execution">> {
         const error = await this.gasEstimationHandler.simulateHandleOp({
             userOperation,
             queuedUserOperations,
-            addSenderBalanceOverride,
-            balanceOverrideEnabled: this.config.balanceOverride,
+            addSenderDepositOverride,
+            stateOverrideEnabled: this.config.balanceOverride,
             entryPoint,
             targetAddress: zeroAddress,
             targetCallData: "0x",

src/types/interfaces.ts

@@ -14,7 +14,7 @@ export interface InterfaceValidator {
         userOperation: UserOperation
         entryPoint: Address
         queuedUserOperations: UserOperation[]
-        addSenderBalanceOverride: boolean
+        addSenderDepositOverride: boolean
         stateOverrides?: StateOverrides
     }): Promise<SimulateHandleOpResult<"execution">>