Merge pull request #382 from pimlicolabs/fix/unpackPaymasterAndData

Fix paymasterAndDataSize
pimlicolabs · Dec 18, 2024 · c844866 · c844866
2 parents 028b203 + c94f4ce
commit c844866
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.changeset/calm-brooms-flow.md b/.changeset/calm-brooms-flow.md
@@ -0,0 +1,5 @@
+---
+"@pimlico/alto": patch
+---
+
+Version updated till Dec 18
diff --git a/src/utils/userop.ts b/src/utils/userop.ts
@@ -27,6 +27,7 @@ import {
     pad,
     parseAbi,
     parseEventLogs,
+    size,
     slice,
     toHex,
     zeroAddress
@@ -132,11 +133,15 @@ export function unpackPaymasterAndData(paymasterAndData: Hex) {
             paymasterData: null
         }
     }
+
+    const paymasterAndDataSize = size(paymasterAndData)
+
     return {
         paymaster: getAddress(slice(paymasterAndData, 0, 20)),
         paymasterVerificationGasLimit: BigInt(slice(paymasterAndData, 20, 36)),
         paymasterPostOpGasLimit: BigInt(slice(paymasterAndData, 36, 52)),
-        paymasterData: slice(paymasterAndData, 52)
+        paymasterData:
+            paymasterAndDataSize > 52 ? slice(paymasterAndData, 52) : null
     }
 }