Merge pull request #312 from pimlicolabs/fix/erc20-overrides

Fix/erc20 overrides
pimlicolabs · Oct 25, 2024 · ef3b889 · ef3b889
2 parents 5dce3a9 + 25ee9a9
commit ef3b889
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.changeset/small-horses-sniff.md b/.changeset/small-horses-sniff.md
@@ -0,0 +1,5 @@
+---
+"permissionless": patch
+---
+
+Fixed when slot overrides returned from pimlico_getTokenQuotes are zero
diff --git a/packages/permissionless/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.ts b/packages/permissionless/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.ts
@@ -138,15 +138,16 @@ export const prepareUserOperationForErc20Paymaster =
             }
 
             ////////////////////////////////////////////////////////////////////////////////
-
             // Call prepareUserOperation
             ////////////////////////////////////////////////////////////////////////////////
 
             const allowanceSlot = _allowanceSlot ?? quotes[0].allowanceSlot
             const balanceSlot = _balanceSlot ?? quotes[0].balanceSlot
 
-            const hasSlot =
-                allowanceSlot !== undefined && balanceSlot !== undefined
+            const hasAllowanceSlot = allowanceSlot !== undefined
+            const hasBalanceSlot = balanceSlot !== undefined
+
+            const hasSlot = hasAllowanceSlot && hasBalanceSlot
 
             if (!hasSlot && balanceOverride) {
                 throw new Error(
@@ -155,7 +156,7 @@ export const prepareUserOperationForErc20Paymaster =
             }
 
             const balanceStateOverride =
-                balanceOverride && balanceSlot
+                balanceOverride && hasBalanceSlot
                     ? erc20BalanceOverride({
                           token,
                           owner: account.address,
@@ -164,7 +165,7 @@ export const prepareUserOperationForErc20Paymaster =
                     : undefined
 
             const allowanceStateOverride =
-                balanceOverride && allowanceSlot
+                balanceOverride && hasAllowanceSlot
                     ? erc20AllowanceOverride({
                           token,
                           owner: account.address,