permissionless 0.2.9 → 0.2.11

package/_types/types/pimlico.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pimlico.d.ts","sourceRoot":"","sources":["../../types/pimlico.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pimlico.d.ts","sourceRoot":"","sources":["../../types/pimlico.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7D,KAAK,2CAA2C,GAAG;IAC/C,IAAI,EAAE;QACF,YAAY,EAAE,GAAG,CAAA;QACjB,oBAAoB,EAAE,GAAG,CAAA;KAC5B,CAAA;IACD,QAAQ,EAAE;QACN,YAAY,EAAE,GAAG,CAAA;QACjB,oBAAoB,EAAE,GAAG,CAAA;KAC5B,CAAA;IACD,IAAI,EAAE;QACF,YAAY,EAAE,GAAG,CAAA;QACjB,oBAAoB,EAAE,GAAG,CAAA;KAC5B,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACrC,MAAM,EACA,WAAW,GACX,eAAe,GACf,WAAW,GACX,UAAU,GACV,UAAU,GACV,UAAU,GACV,QAAQ,CAAA;IACd,eAAe,EAAE,IAAI,GAAG,IAAI,CAAA;CAC/B,CAAA;AAED,KAAK,6BAA6B,GAAG;IACjC,MAAM,EAAE;QACJ,SAAS,EAAE,OAAO,CAAA;QAClB,KAAK,EAAE,OAAO,CAAA;QACd,SAAS,EAAE,GAAG,CAAA;QACd,YAAY,EAAE,GAAG,CAAA;QACjB,uBAAuB,EAAE,GAAG,CAAA;QAC5B,WAAW,CAAC,EAAE,GAAG,CAAA;QACjB,aAAa,CAAC,EAAE,GAAG,CAAA;KACtB,EAAE,CAAA;CACN,CAAA;AAED,MAAM,MAAM,gBAAgB,CACxB,iBAAiB,SAAS,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,IACvD;IACA;QACI,MAAM,EAAE,kCAAkC,CAAA;QAC1C,UAAU,EAAE,EAAE,CAAA;QACd,UAAU,EAAE,2CAA2C,CAAA;KAC1D;IACD;QACI,MAAM,EAAE,gCAAgC,CAAA;QACxC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACxB,UAAU,EAAE,0BAA0B,CAAA;KACzC;IACD;QACI,MAAM,EAAE,qCAAqC,CAAA;QAC7C,UAAU,EAAE;YACR,uBAAuB,EAAE,GAAG;YAC5B,eAAe,EAAE,OAAO;YACxB,UAAU,EAAE,OAAO;SACtB,CAAA;QACD,UAAU,EAAE,IAAI,CAAA;KACnB;IACD;QACI,MAAM,EAAE,yBAAyB,CAAA;QACjC,UAAU,EAAE;YACR,aAAa,EAAE,KAAK,CACd,CAAC,iBAAiB,SAAS,KAAK,GAC1B,SAAS,CACL,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,EACvB,cAAc,GACd,oBAAoB,GACpB,sBAAsB,CAC3B,GACD,KAAK,CAAC,GACZ,CAAC,iBAAiB,SAAS,KAAK,GAC1B,SAAS,CACL,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,EACvB,cAAc,GACd,oBAAoB,GACpB,sBAAsB,GACtB,+BAA+B,GAC/B,yBAAyB,CAC9B,GACD,KAAK,CAAC,CACjB;YACD,UAAU,EAAE,OAAO;YACnB,QAAQ,CAAC,EAAE;gBACP,mBAAmB,CAAC,EAAE,MAAM,CAAA;aAC/B;SACJ,CAAA;QACD,UAAU,EAAE,iBAAiB,SAAS,KAAK,GACrC;YACI,gBAAgB,EAAE,GAAG,CAAA;YACrB,kBAAkB,EAAE,GAAG,CAAA;YACvB,oBAAoB,EAAE,GAAG,CAAA;YACzB,YAAY,EAAE,GAAG,CAAA;YACjB,SAAS,CAAC,EAAE,KAAK,CAAA;YACjB,6BAA6B,CAAC,EAAE,KAAK,CAAA;YACrC,uBAAuB,CAAC,EAAE,KAAK,CAAA;YAC/B,aAAa,CAAC,EAAE,KAAK,CAAA;SACxB,GACD;YACI,kBAAkB,EAAE,GAAG,CAAA;YACvB,oBAAoB,EAAE,GAAG,CAAA;YACzB,YAAY,EAAE,GAAG,CAAA;YACjB,SAAS,EAAE,OAAO,CAAA;YAClB,6BAA6B,EAAE,GAAG,CAAA;YAClC,uBAAuB,EAAE,GAAG,CAAA;YAC5B,aAAa,EAAE,GAAG,CAAA;YAClB,gBAAgB,CAAC,EAAE,KAAK,CAAA;SAC3B,CAAA;KACV;IACD;QACI,MAAM,EAAE,gCAAgC,CAAA;QACxC,UAAU,EAAE;YACR,aAAa,EAAE,aAAa,CAAC,iBAAiB,EAAE,GAAG,CAAC;YACpD,UAAU,EAAE,OAAO;YACnB,oBAAoB,EAAE,MAAM,EAAE;SACjC,CAAA;QACD,UAAU,EAAE;YACR,mBAAmB,EAAE,MAAM,CAAA;YAC3B,IAAI,EAAE;gBACF,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;gBACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;gBACrB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;gBACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;aAC7B,CAAA;SACJ,EAAE,CAAA;KACN;IACD;QACI,MAAM,EAAE,wBAAwB,CAAA;QAChC,UAAU,EAAE,CAAC;YAAE,MAAM,EAAE,OAAO,EAAE,CAAA;SAAE,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;QACtE,UAAU,EAAE,6BAA6B,CAAA;KAC5C;CACJ,CAAA"}

package/_types/utils/erc20AllowanceOverride.d.ts

@@ -0,0 +1,10 @@
+import { type Address, type StateOverride } from "viem";
+export type Erc20AllowanceOverrideParameters = {
+    token: Address;
+    owner: Address;
+    spender: Address;
+    slot: bigint;
+    amount?: bigint;
+};
+export declare function erc20AllowanceOverride({ token, owner, spender, slot, amount }: Erc20AllowanceOverrideParameters): StateOverride;
+//# sourceMappingURL=erc20AllowanceOverride.d.ts.map

package/_types/utils/erc20AllowanceOverride.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"erc20AllowanceOverride.d.ts","sourceRoot":"","sources":["../../utils/erc20AllowanceOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,aAAa,EAIrB,MAAM,MAAM,CAAA;AAEb,MAAM,MAAM,gCAAgC,GAAG;IAC3C,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,OAAO,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,sBAAsB,CAAC,EACnC,KAAK,EACL,KAAK,EACL,OAAO,EACP,IAAI,EACJ,MAEC,EACJ,EAAE,gCAAgC,GAAG,aAAa,CAyClD"}

package/_types/utils/erc20BalanceOverride.d.ts

@@ -0,0 +1,9 @@
+import { type Address, type StateOverride } from "viem";
+export type Erc20BalanceOverrideParameters = {
+    token: Address;
+    owner: Address;
+    slot: bigint;
+    balance?: bigint;
+};
+export declare function erc20BalanceOverride({ token, owner, slot, balance }: Erc20BalanceOverrideParameters): StateOverride;
+//# sourceMappingURL=erc20BalanceOverride.d.ts.map

package/_types/utils/erc20BalanceOverride.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"erc20BalanceOverride.d.ts","sourceRoot":"","sources":["../../utils/erc20BalanceOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,aAAa,EAIrB,MAAM,MAAM,CAAA;AAEb,MAAM,MAAM,8BAA8B,GAAG;IACzC,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,OAAO,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,wBAAgB,oBAAoB,CAAC,EACjC,KAAK,EACL,KAAK,EACL,IAAI,EACJ,OAEC,EACJ,EAAE,8BAA8B,GAAG,aAAa,CA0BhD"}

package/_types/utils/index.d.ts

@@ -8,5 +8,7 @@ import { encodeNonce } from "./encodeNonce";
 import { type EncodeInstallModuleParameters, encodeInstallModule } from "./encodeInstallModule";
 import { getPackedUserOperation } from "./getPackedUserOperation";
 import { type EncodeCallDataParams, encode7579Calls } from "./encode7579Calls";
-export { transactionReceiptStatus, deepHexlify, getRequiredPrefund, toOwner, type GetRequiredPrefundReturnType, isSmartAccountDeployed, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, encodeNonce, decodeNonce, type EncodeInstallModuleParameters, encodeInstallModule, type EncodeCallDataParams, encode7579Calls };
+import { type Erc20AllowanceOverrideParameters, erc20AllowanceOverride } from "./erc20AllowanceOverride";
+import { type Erc20BalanceOverrideParameters, erc20BalanceOverride } from "./erc20BalanceOverride";
+export { transactionReceiptStatus, deepHexlify, getRequiredPrefund, toOwner, type GetRequiredPrefundReturnType, isSmartAccountDeployed, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, encodeNonce, decodeNonce, type EncodeInstallModuleParameters, encodeInstallModule, type EncodeCallDataParams, encode7579Calls, erc20AllowanceOverride, erc20BalanceOverride, type Erc20AllowanceOverrideParameters, type Erc20BalanceOverrideParameters };
 //# sourceMappingURL=index.d.ts.map

package/_types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EACH,KAAK,4BAA4B,EACjC,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EACH,KAAK,6BAA6B,EAClC,mBAAmB,EACtB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EAAE,KAAK,oBAAoB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAE9E,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,KAAK,4BAA4B,EACjC,sBAAsB,EACtB,wCAAwC,EACxC,sBAAsB,EACtB,WAAW,EACX,WAAW,EACX,KAAK,6BAA6B,EAClC,mBAAmB,EACnB,KAAK,oBAAoB,EACzB,eAAe,EAClB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EACH,KAAK,4BAA4B,EACjC,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EACH,KAAK,6BAA6B,EAClC,mBAAmB,EACtB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EAAE,KAAK,oBAAoB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EACH,KAAK,gCAAgC,EACrC,sBAAsB,EACzB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,8BAA8B,EACnC,oBAAoB,EACvB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,KAAK,4BAA4B,EACjC,sBAAsB,EACtB,wCAAwC,EACxC,sBAAsB,EACtB,WAAW,EACX,WAAW,EACX,KAAK,6BAA6B,EAClC,mBAAmB,EACnB,KAAK,oBAAoB,EACzB,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACpB,KAAK,gCAAgC,EACrC,KAAK,8BAA8B,EACtC,CAAA"}

package/actions/pimlico/getTokenQuotes.ts

@@ -25,6 +25,8 @@ export type GetTokenQuotesReturnType = {
     postOpGas: bigint
     exchangeRate: bigint
     exchangeRateNativeToUsd: bigint
+    balanceSlot?: bigint
+    allowanceSlot?: bigint
 }[]
 
 /**
@@ -62,6 +64,12 @@ export const getTokenQuotes = async <
 
     return res.quotes.map((quote) => ({
         ...quote,
+        balanceSlot: quote.balanceSlot
+            ? hexToBigInt(quote.balanceSlot)
+            : undefined,
+        allowanceSlot: quote.allowanceSlot
+            ? hexToBigInt(quote.allowanceSlot)
+            : undefined,
         postOpGas: hexToBigInt(quote.postOpGas),
         exchangeRate: hexToBigInt(quote.exchangeRate),
         exchangeRateNativeToUsd: hexToBigInt(quote.exchangeRateNativeToUsd)

package/actions/public/getSenderAddress.ts

@@ -133,6 +133,18 @@ export const getSenderAddress = async (
                 err instanceof UnknownRpcError
         )
 
+        if (!revertError) {
+            const cause = (e as ContractFunctionExecutionErrorType).cause as any
+            const errorName = cause?.data?.errorName ?? ""
+            if (
+                errorName === "SenderAddressResult" &&
+                cause?.data?.args &&
+                cause?.data?.args[0]
+            ) {
+                return cause.data?.args[0] as Address
+            }
+        }
+
         if (revertError instanceof ContractFunctionRevertedError) {
             const errorName = revertError.data?.errorName ?? ""
             if (

package/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.test.ts

@@ -191,5 +191,93 @@ describe.each(getCoreSmartAccounts())(
                 expect(FINAL_ETH_BALANCE).toEqual(INTIAL_ETH_BALANCE) // There should be no ETH balance change
             }
         )
+
+        testWithRpc.skipIf(!supportsEntryPointV07)(
+            "prepareUserOperationForErc20Paymaster_v07",
+            async ({ rpc }) => {
+                const { anvilRpc } = rpc
+
+                const account = (
+                    await getSmartAccountClient({
+                        entryPoint: {
+                            version: "0.7"
+                        },
+                        ...rpc
+                    })
+                ).account
+
+                const publicClient = getPublicClient(anvilRpc)
+
+                const pimlicoClient = createPimlicoClient({
+                    transport: http(rpc.paymasterRpc),
+                    entryPoint: {
+                        address: entryPoint07Address,
+                        version: "0.7"
+                    }
+                })
+
+                const smartAccountClient = createSmartAccountClient({
+                    // @ts-ignore
+                    client: getPublicClient(anvilRpc),
+                    account,
+                    paymaster: pimlicoClient,
+                    chain: foundry,
+                    userOperation: {
+                        prepareUserOperation:
+                            prepareUserOperationForErc20Paymaster(
+                                pimlicoClient,
+                                {
+                                    balanceOverride: true
+                                }
+                            )
+                    },
+                    bundlerTransport: http(rpc.altoRpc)
+                })
+
+                const INITIAL_TOKEN_BALANCE = parseEther("100")
+                const INTIAL_ETH_BALANCE = await publicClient.getBalance({
+                    address: smartAccountClient.account.address
+                })
+
+                sudoMintTokens({
+                    amount: INITIAL_TOKEN_BALANCE,
+                    to: smartAccountClient.account.address,
+                    anvilRpc
+                })
+
+                const opHash = await smartAccountClient.sendUserOperation({
+                    calls: [
+                        {
+                            to: zeroAddress,
+                            data: "0x",
+                            value: 0n
+                        }
+                    ],
+                    paymasterContext: {
+                        token: ERC20_ADDRESS
+                    }
+                })
+
+                const receipt =
+                    await smartAccountClient.waitForUserOperationReceipt({
+                        hash: opHash
+                    })
+
+                expect(receipt).toBeTruthy()
+                expect(receipt).toBeTruthy()
+                expect(receipt.success).toBeTruthy()
+
+                const FINAL_TOKEN_BALANCE = await tokenBalanceOf(
+                    smartAccountClient.account.address,
+                    rpc.anvilRpc
+                )
+                const FINAL_ETH_BALANCE = await publicClient.getBalance({
+                    address: smartAccountClient.account.address
+                })
+
+                expect(FINAL_TOKEN_BALANCE).toBeLessThan(INITIAL_TOKEN_BALANCE) // Token balance should be deducted
+                expect(FINAL_ETH_BALANCE).toEqual(INTIAL_ETH_BALANCE) // There should be no ETH balance change
+            }
+        )
     }
 )

package/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.ts

@@ -3,6 +3,7 @@ import {
     type Chain,
     type Client,
     type ContractFunctionParameters,
+    RpcError,
     type Transport,
     encodeFunctionData,
     erc20Abi,
@@ -24,9 +25,21 @@ import { getChainId as getChainId_ } from "viem/actions"
 import { readContract } from "viem/actions"
 import { getAction, parseAccount } from "viem/utils"
 import { getTokenQuotes } from "../../../actions/pimlico"
+import { erc20AllowanceOverride, erc20BalanceOverride } from "../../../utils"
 
 export const prepareUserOperationForErc20Paymaster =
-    (pimlicoClient: Client) =>
+    (
+        pimlicoClient: Client,
+        {
+            balanceOverride = false,
+            balanceSlot: _balanceSlot,
+            allowanceSlot: _allowanceSlot
+        }: {
+            balanceOverride?: boolean
+            balanceSlot?: bigint
+            allowanceSlot?: bigint
+        } = {}
+    ) =>
     async <
         account extends SmartAccount | undefined,
         const calls extends readonly unknown[],
@@ -95,6 +108,13 @@ export const prepareUserOperationForErc20Paymaster =
                 entryPointAddress: account.entryPoint.address
             })
 
+            if (quotes.length === 0) {
+                throw new RpcError(new Error("Quotes not found"), {
+                    shortMessage:
+                        "client didn't return token quotes, check if the token is supported"
+                })
+            }
+
             const {
                 postOpGas,
                 exchangeRate,
@@ -118,9 +138,55 @@ export const prepareUserOperationForErc20Paymaster =
             }
 
             ////////////////////////////////////////////////////////////////////////////////
+
             // Call prepareUserOperation
             ////////////////////////////////////////////////////////////////////////////////
 
+            const allowanceSlot = _allowanceSlot ?? quotes[0].allowanceSlot
+            const balanceSlot = _balanceSlot ?? quotes[0].balanceSlot
+
+            const hasSlot = allowanceSlot && balanceSlot
+
+            if (!hasSlot && balanceOverride) {
+                throw new Error(
+                    `balanceOverride is not supported for token ${token}, provide custom slot for balance & allowance overrides`
+                )
+            }
+
+            const balanceStateOverride =
+                balanceOverride && balanceSlot
+                    ? erc20BalanceOverride({
+                          token,
+                          owner: account.address,
+                          slot: balanceSlot
+                      })[0]
+                    : undefined
+
+            const allowanceStateOverride =
+                balanceOverride && allowanceSlot
+                    ? erc20AllowanceOverride({
+                          token,
+                          owner: account.address,
+                          spender: paymasterERC20Address,
+                          slot: allowanceSlot
+                      })[0]
+                    : undefined
+
+            parameters.stateOverride =
+                balanceOverride &&
+                balanceStateOverride &&
+                allowanceStateOverride // allowanceSlot && balanceSlot is cuz of TypeScript :/
+                    ? (parameters.stateOverride ?? []).concat([
+                          {
+                              address: token,
+                              stateDiff: [
+                                  ...(allowanceStateOverride.stateDiff ?? []),
+                                  ...(balanceStateOverride.stateDiff ?? [])
+                              ]
+                          }
+                      ])
+                    : parameters.stateOverride
+
             const userOperation = await getAction(
                 client,
                 prepareUserOperation,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "permissionless",
-    "version": "0.2.9",
+    "version": "0.2.11",
     "author": "Pimlico",
     "homepage": "https://docs.pimlico.io/permissionless",
     "repository": "github:pimlicolabs/permissionless.js",
@@ -11,7 +11,13 @@
     "type": "module",
     "sideEffects": false,
     "description": "A utility library for working with ERC-4337",
-    "keywords": ["ethereum", "erc-4337", "eip-4337", "paymaster", "bundler"],
+    "keywords": [
+        "ethereum",
+        "erc-4337",
+        "eip-4337",
+        "paymaster",
+        "bundler"
+    ],
     "license": "MIT",
     "exports": {
         ".": {
@@ -71,6 +77,6 @@
         }
     },
     "peerDependencies": {
-        "viem": "^2.21.2"
+        "viem": "^2.21.22"
     }
 }

package/types/pimlico.ts

@@ -35,6 +35,8 @@ type GetTokenQuotesWithBigIntAsHex = {
         postOpGas: Hex
         exchangeRate: Hex
         exchangeRateNativeToUsd: Hex
+        balanceSlot?: Hex
+        allowanceSlot?: Hex
     }[]
 }
 

package/utils/erc20AllowanceOverride.test.ts

@@ -0,0 +1,59 @@
+import { toHex } from "viem"
+import { describe, expect, test } from "vitest"
+import {
+    type Erc20AllowanceOverrideParameters,
+    erc20AllowanceOverride
+} from "./erc20AllowanceOverride"
+
+describe("erc20AllowanceOverride", () => {
+    test("should return the correct structure for valid inputs", () => {
+        const params = {
+            token: "0xTokenAddress",
+            owner: "0xOwnerAddress",
+            spender: "0xSpenderAddress",
+            slot: BigInt(1),
+            amount: BigInt(100)
+        } as const
+
+        const result = erc20AllowanceOverride(params)
+
+        expect(result).toEqual([
+            {
+                address: params.token,
+                stateDiff: [
+                    {
+                        slot: expect.any(String), // Slot will be a keccak256 hash
+                        value: toHex(params.amount)
+                    }
+                ]
+            }
+        ])
+    })
+
+    test("should use the default amount when none is provided", () => {
+        const params: Erc20AllowanceOverrideParameters = {
+            token: "0xTokenAddress",
+            owner: "0xOwnerAddress",
+            spender: "0xSpenderAddress",
+            slot: BigInt(1)
+        }
+
+        const result = erc20AllowanceOverride(params)
+
+        const expectedDefaultAmount = BigInt(
+            "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        )
+
+        expect(result).toEqual([
+            {
+                address: params.token,
+                stateDiff: [
+                    {
+                        slot: expect.any(String), // Slot will be a keccak256 hash
+                        value: toHex(expectedDefaultAmount)
+                    }
+                ]
+            }
+        ])
+    })
+})

package/utils/erc20AllowanceOverride.ts

@@ -0,0 +1,66 @@
+import {
+    type Address,
+    type StateOverride,
+    encodeAbiParameters,
+    keccak256,
+    toHex
+} from "viem"
+
+export type Erc20AllowanceOverrideParameters = {
+    token: Address
+    owner: Address
+    spender: Address
+    slot: bigint
+    amount?: bigint
+}
+
+export function erc20AllowanceOverride({
+    token,
+    owner,
+    spender,
+    slot,
+    amount = BigInt(
+        "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+    )
+}: Erc20AllowanceOverrideParameters): StateOverride {
+    const smartAccountErc20AllowanceSlot = keccak256(
+        encodeAbiParameters(
+            [
+                {
+                    type: "address"
+                },
+                {
+                    type: "bytes32"
+                }
+            ],
+            [
+                spender,
+                keccak256(
+                    encodeAbiParameters(
+                        [
+                            {
+                                type: "address"
+                            },
+                            {
+                                type: "uint256"
+                            }
+                        ],
+                        [owner, BigInt(slot)]
+                    )
+                )
+            ]
+        )
+    )
+
+    return [
+        {
+            address: token,
+            stateDiff: [
+                {
+                    slot: smartAccountErc20AllowanceSlot,
+                    value: toHex(amount)
+                }
+            ]
+        }
+    ]
+}

package/utils/erc20BalanceOverride.test.ts

@@ -0,0 +1,57 @@
+import { toHex } from "viem"
+import { describe, expect, test } from "vitest"
+import {
+    type Erc20BalanceOverrideParameters,
+    erc20BalanceOverride
+} from "./erc20BalanceOverride"
+
+describe("erc20BalanceOverride", () => {
+    test("should return the correct structure for valid inputs", () => {
+        const params = {
+            token: "0xTokenAddress",
+            owner: "0xOwnerAddress",
+            slot: BigInt(1),
+            balance: BigInt(1000)
+        } as const
+
+        const result = erc20BalanceOverride(params)
+
+        expect(result).toEqual([
+            {
+                address: params.token,
+                stateDiff: [
+                    {
+                        slot: expect.any(String), // Slot will be a keccak256 hash
+                        value: toHex(params.balance)
+                    }
+                ]
+            }
+        ])
+    })
+
+    test("should use the default balance when none is provided", () => {
+        const params: Erc20BalanceOverrideParameters = {
+            token: "0xTokenAddress",
+            owner: "0xOwnerAddress",
+            slot: BigInt(1)
+        }
+
+        const result = erc20BalanceOverride(params)
+
+        const expectedDefaultBalance = BigInt(
+            "0x100000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        )
+
+        expect(result).toEqual([
+            {
+                address: params.token,
+                stateDiff: [
+                    {
+                        slot: expect.any(String), // Slot will be a keccak256 hash
+                        value: toHex(expectedDefaultBalance)
+                    }
+                ]
+            }
+        ])
+    })
+})

package/utils/erc20BalanceOverride.ts

@@ -0,0 +1,49 @@
+import {
+    type Address,
+    type StateOverride,
+    encodeAbiParameters,
+    keccak256,
+    toHex
+} from "viem"
+
+export type Erc20BalanceOverrideParameters = {
+    token: Address
+    owner: Address
+    slot: bigint
+    balance?: bigint
+}
+
+export function erc20BalanceOverride({
+    token,
+    owner,
+    slot,
+    balance = BigInt(
+        "0x100000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+    )
+}: Erc20BalanceOverrideParameters): StateOverride {
+    const smartAccountErc20BalanceSlot = keccak256(
+        encodeAbiParameters(
+            [
+                {
+                    type: "address"
+                },
+                {
+                    type: "uint256"
+                }
+            ],
+            [owner, slot]
+        )
+    )
+
+    return [
+        {
+            address: token,
+            stateDiff: [
+                {
+                    slot: smartAccountErc20BalanceSlot,
+                    value: toHex(balance)
+                }
+            ]
+        }
+    ]
+}

package/utils/index.ts

@@ -17,6 +17,14 @@ import {
 import { getPackedUserOperation } from "./getPackedUserOperation"
 
 import { type EncodeCallDataParams, encode7579Calls } from "./encode7579Calls"
+import {
+    type Erc20AllowanceOverrideParameters,
+    erc20AllowanceOverride
+} from "./erc20AllowanceOverride"
+import {
+    type Erc20BalanceOverrideParameters,
+    erc20BalanceOverride
+} from "./erc20BalanceOverride"
 
 export {
     transactionReceiptStatus,
@@ -32,5 +40,9 @@ export {
     type EncodeInstallModuleParameters,
     encodeInstallModule,
     type EncodeCallDataParams,
-    encode7579Calls
+    encode7579Calls,
+    erc20AllowanceOverride,
+    erc20BalanceOverride,
+    type Erc20AllowanceOverrideParameters,
+    type Erc20BalanceOverrideParameters
 }