permissionless 0.1.12 → 0.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/README.md +1 -1
  3. package/_cjs/actions/smartAccount/prepareUserOperationRequest.js +13 -5
  4. package/_cjs/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
  5. package/_cjs/utils/getUserOperationHash.js +4 -7
  6. package/_cjs/utils/getUserOperationHash.js.map +1 -1
  7. package/_esm/actions/smartAccount/prepareUserOperationRequest.js +13 -5
  8. package/_esm/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
  9. package/_esm/utils/getUserOperationHash.js +4 -7
  10. package/_esm/utils/getUserOperationHash.js.map +1 -1
  11. package/_types/actions/smartAccount/prepareUserOperationRequest.d.ts.map +1 -1
  12. package/actions/smartAccount/prepareUserOperationRequest.ts +18 -8
  13. package/package.json +1 -1
  14. package/utils/getUserOperationHash.ts +9 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # permissionless
2
2
 
3
+ ## 0.1.14
4
+
5
+ ### Patch Changes
6
+
7
+ - 7db5e1f99b5e757cfe73962f933a640be7c591b2: Fixed packUserOp when paymaster gas limits are 0
8
+
9
+ ## 0.1.13
10
+
11
+ ### Patch Changes
12
+
13
+ - 22fadbe5122d8676cc0d2d8b6fd61e90ab516498: Fixed prepareUserOperation when either of paymaster gas limits is zero
14
+
3
15
  ## 0.1.12
4
16
 
5
17
  ### Patch Changes
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  <p align="center"><a href="https://docs.pimlico/permissionless"><img width="1000" title="Permissionless" src='https://raw.githubusercontent.com/pimlicolabs/permissionless.js/main/assets/banner.png' /></a></p>
2
2
 
3
- # Permissionless.js
3
+ # permissionless.js
4
4
 
5
5
  ![Node Version](https://img.shields.io/badge/node-20.x-green)
6
6
 
package/_cjs/actions/smartAccount/prepareUserOperationRequest.js CHANGED
@@ -34,10 +34,10 @@ async function prepareUserOperationRequestForEntryPointV06(client, args, stateOv
34
34
  userOperation.signature = await account.getDummySignature(userOperation);
35
35
  }
36
36
  if (typeof middleware === "function") {
37
- return (await middleware({
37
+ return middleware({
38
38
  userOperation,
39
39
  entryPoint: account.entryPoint
40
- }));
40
+ });
41
41
  }
42
42
  if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
43
43
  const gasPrice = await middleware.gasPrice();
@@ -66,6 +66,7 @@ async function prepareUserOperationRequestForEntryPointV06(client, args, stateOv
66
66
  sponsorUserOperationData.preVerificationGas;
67
67
  userOperation.paymasterAndData =
68
68
  sponsorUserOperationData.paymasterAndData;
69
+ return userOperation;
69
70
  }
70
71
  if (!userOperation.callGasLimit ||
71
72
  !userOperation.verificationGasLimit ||
@@ -120,10 +121,10 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
120
121
  userOperation.signature = await account.getDummySignature(userOperation);
121
122
  }
122
123
  if (typeof middleware === "function") {
123
- return (await middleware({
124
+ return middleware({
124
125
  userOperation,
125
126
  entryPoint: account.entryPoint
126
- }));
127
+ });
127
128
  }
128
129
  if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
129
130
  const gasPrice = await middleware.gasPrice();
@@ -156,11 +157,12 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
156
157
  userOperation.paymasterPostOpGasLimit =
157
158
  sponsorUserOperationData.paymasterPostOpGasLimit;
158
159
  userOperation.paymasterData = sponsorUserOperationData.paymasterData;
160
+ return userOperation;
159
161
  }
160
162
  if (!userOperation.callGasLimit ||
161
163
  !userOperation.verificationGasLimit ||
162
164
  !userOperation.preVerificationGas) {
163
- const gasParameters = await (0, getAction_1.getAction)(client, estimateUserOperationGas_1.estimateUserOperationGas)({
165
+ const gasParameters = await (0, getAction_1.getAction)(client, (estimateUserOperationGas_1.estimateUserOperationGas))({
164
166
  userOperation,
165
167
  entryPoint: account.entryPoint
166
168
  }, stateOverrides);
@@ -170,6 +172,12 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
170
172
  gasParameters.verificationGasLimit;
171
173
  userOperation.preVerificationGas =
172
174
  userOperation.preVerificationGas || gasParameters.preVerificationGas;
175
+ userOperation.paymasterPostOpGasLimit =
176
+ userOperation.paymasterPostOpGasLimit ||
177
+ gasParameters.paymasterPostOpGasLimit;
178
+ userOperation.paymasterPostOpGasLimit =
179
+ userOperation.paymasterPostOpGasLimit ||
180
+ gasParameters.paymasterPostOpGasLimit;
173
181
  }
174
182
  return userOperation;
175
183
  }
package/_cjs/actions/smartAccount/prepareUserOperationRequest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
package/_cjs/utils/getUserOperationHash.js CHANGED
@@ -36,19 +36,16 @@ function packUserOp({ userOperation, entryPoint: entryPointAddress }) {
36
36
  ? (0, viem_1.concat)([userOperation.factory, userOperation.factoryData])
37
37
  : "0x");
38
38
  const hashedCallData = (0, viem_1.keccak256)(userOperation.callData);
39
- const hashedPaymasterAndData = (0, viem_1.keccak256)(userOperation.paymaster &&
40
- userOperation.paymasterVerificationGasLimit &&
41
- userOperation.paymasterPostOpGasLimit &&
42
- userOperation.paymasterData
39
+ const hashedPaymasterAndData = (0, viem_1.keccak256)(userOperation.paymaster
43
40
  ? (0, viem_1.concat)([
44
41
  userOperation.paymaster,
45
- (0, viem_1.pad)((0, viem_1.toHex)(userOperation.paymasterVerificationGasLimit), {
42
+ (0, viem_1.pad)((0, viem_1.toHex)(userOperation.paymasterVerificationGasLimit || 0n), {
46
43
  size: 16
47
44
  }),
48
- (0, viem_1.pad)((0, viem_1.toHex)(userOperation.paymasterPostOpGasLimit), {
45
+ (0, viem_1.pad)((0, viem_1.toHex)(userOperation.paymasterPostOpGasLimit || 0n), {
49
46
  size: 16
50
47
  }),
51
- userOperation.paymasterData
48
+ userOperation.paymasterData || "0x"
52
49
  ])
53
50
  : "0x");
54
51
  return (0, viem_1.encodeAbiParameters)([
package/_cjs/utils/getUserOperationHash.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getUserOperationHash.js","sourceRoot":"","sources":["../../utils/getUserOperationHash.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getUserOperationHash.js","sourceRoot":"","sources":["../../utils/getUserOperationHash.ts"],"names":[],"mappings":"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"}
package/_esm/actions/smartAccount/prepareUserOperationRequest.js CHANGED
@@ -31,10 +31,10 @@ async function prepareUserOperationRequestForEntryPointV06(client, args, stateOv
31
31
  userOperation.signature = await account.getDummySignature(userOperation);
32
32
  }
33
33
  if (typeof middleware === "function") {
34
- return (await middleware({
34
+ return middleware({
35
35
  userOperation,
36
36
  entryPoint: account.entryPoint
37
- }));
37
+ });
38
38
  }
39
39
  if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
40
40
  const gasPrice = await middleware.gasPrice();
@@ -63,6 +63,7 @@ async function prepareUserOperationRequestForEntryPointV06(client, args, stateOv
63
63
  sponsorUserOperationData.preVerificationGas;
64
64
  userOperation.paymasterAndData =
65
65
  sponsorUserOperationData.paymasterAndData;
66
+ return userOperation;
66
67
  }
67
68
  if (!userOperation.callGasLimit ||
68
69
  !userOperation.verificationGasLimit ||
@@ -117,10 +118,10 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
117
118
  userOperation.signature = await account.getDummySignature(userOperation);
118
119
  }
119
120
  if (typeof middleware === "function") {
120
- return (await middleware({
121
+ return middleware({
121
122
  userOperation,
122
123
  entryPoint: account.entryPoint
123
- }));
124
+ });
124
125
  }
125
126
  if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
126
127
  const gasPrice = await middleware.gasPrice();
@@ -153,11 +154,12 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
153
154
  userOperation.paymasterPostOpGasLimit =
154
155
  sponsorUserOperationData.paymasterPostOpGasLimit;
155
156
  userOperation.paymasterData = sponsorUserOperationData.paymasterData;
157
+ return userOperation;
156
158
  }
157
159
  if (!userOperation.callGasLimit ||
158
160
  !userOperation.verificationGasLimit ||
159
161
  !userOperation.preVerificationGas) {
160
- const gasParameters = await getAction(client, estimateUserOperationGas)({
162
+ const gasParameters = await getAction(client, (estimateUserOperationGas))({
161
163
  userOperation,
162
164
  entryPoint: account.entryPoint
163
165
  }, stateOverrides);
@@ -167,6 +169,12 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
167
169
  gasParameters.verificationGasLimit;
168
170
  userOperation.preVerificationGas =
169
171
  userOperation.preVerificationGas || gasParameters.preVerificationGas;
172
+ userOperation.paymasterPostOpGasLimit =
173
+ userOperation.paymasterPostOpGasLimit ||
174
+ gasParameters.paymasterPostOpGasLimit;
175
+ userOperation.paymasterPostOpGasLimit =
176
+ userOperation.paymasterPostOpGasLimit ||
177
+ gasParameters.paymasterPostOpGasLimit;
170
178
  }
171
179
  return userOperation;
172
180
  }
package/_esm/actions/smartAccount/prepareUserOperationRequest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
package/_esm/utils/getUserOperationHash.js CHANGED
@@ -33,19 +33,16 @@ function packUserOp({ userOperation, entryPoint: entryPointAddress }) {
33
33
  ? concat([userOperation.factory, userOperation.factoryData])
34
34
  : "0x");
35
35
  const hashedCallData = keccak256(userOperation.callData);
36
- const hashedPaymasterAndData = keccak256(userOperation.paymaster &&
37
- userOperation.paymasterVerificationGasLimit &&
38
- userOperation.paymasterPostOpGasLimit &&
39
- userOperation.paymasterData
36
+ const hashedPaymasterAndData = keccak256(userOperation.paymaster
40
37
  ? concat([
41
38
  userOperation.paymaster,
42
- pad(toHex(userOperation.paymasterVerificationGasLimit), {
39
+ pad(toHex(userOperation.paymasterVerificationGasLimit || 0n), {
43
40
  size: 16
44
41
  }),
45
- pad(toHex(userOperation.paymasterPostOpGasLimit), {
42
+ pad(toHex(userOperation.paymasterPostOpGasLimit || 0n), {
46
43
  size: 16
47
44
  }),
48
- userOperation.paymasterData
45
+ userOperation.paymasterData || "0x"
49
46
  ])
50
47
  : "0x");
51
48
  return encodeAbiParameters([
package/_esm/utils/getUserOperationHash.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getUserOperationHash.js","sourceRoot":"","sources":["../../utils/getUserOperationHash.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getUserOperationHash.js","sourceRoot":"","sources":["../../utils/getUserOperationHash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AAGzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAEjE,SAAS,UAAU,CAAgC,EAC/C,aAAa,EACb,UAAU,EAAE,iBAAiB,EAIhC;IACG,IAAI,wBAAwB,CAAC,iBAAiB,EAAE,aAAa,CAAC,EAAE,CAAC;QAC7D,MAAM,cAAc,GAAG,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QACxD,MAAM,cAAc,GAAG,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QACxD,MAAM,sBAAsB,GAAG,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAA;QAExE,OAAO,mBAAmB,CACtB;YACI,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnB,EAAE,IAAI,EAAE,SAAS,EAAE;SACtB,EACD;YACI,aAAa,CAAC,MAAiB;YAC/B,aAAa,CAAC,KAAK;YACnB,cAAc;YACd,cAAc;YACd,aAAa,CAAC,YAAY;YAC1B,aAAa,CAAC,oBAAoB;YAClC,aAAa,CAAC,kBAAkB;YAChC,aAAa,CAAC,YAAY;YAC1B,aAAa,CAAC,oBAAoB;YAClC,sBAAsB;SACzB,CACJ,CAAA;IACL,CAAC;IAED,MAAM,cAAc,GAAG,SAAS,CAC5B,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,WAAW;QAC9C,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;QAC5D,CAAC,CAAC,IAAI,CACb,CAAA;IACD,MAAM,cAAc,GAAG,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IACxD,MAAM,sBAAsB,GAAG,SAAS,CACpC,aAAa,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC;YACH,aAAa,CAAC,SAAS;YACvB,GAAG,CACC,KAAK,CAAC,aAAa,CAAC,6BAA6B,IAAI,EAAE,CAAC,EACxD;gBACI,IAAI,EAAE,EAAE;aACX,CACJ;YACD,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,uBAAuB,IAAI,EAAE,CAAC,EAAE;gBACpD,IAAI,EAAE,EAAE;aACX,CAAC;YACF,aAAa,CAAC,aAAa,IAAI,IAAI;SACtC,CAAC;QACJ,CAAC,CAAC,IAAI,CACb,CAAA;IAED,OAAO,mBAAmB,CACtB;QACI,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;KACtB,EACD;QACI,aAAa,CAAC,MAAiB;QAC/B,aAAa,CAAC,KAAK;QACnB,cAAc;QACd,cAAc;QACd,MAAM,CAAC;YACH,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAAE;gBAC3C,IAAI,EAAE,EAAE;aACX,CAAC;YACF,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;SACvD,CAAC;QACF,aAAa,CAAC,kBAAkB;QAChC,MAAM,CAAC;YACH,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAAE;gBAC3C,IAAI,EAAE,EAAE;aACX,CAAC;YACF,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;SACvD,CAAC;QACF,sBAAsB;KACzB,CACJ,CAAA;AACL,CAAC;AAQD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAgC,EAChE,aAAa,EACb,UAAU,EAAE,iBAAiB,EAC7B,OAAO,EAC8B,EAAQ,EAAE;IAC/C,MAAM,OAAO,GAAG,mBAAmB,CAC/B,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAC/D;QACI,SAAS,CACL,UAAU,CAAa;YACnB,aAAa;YACb,UAAU,EAAE,iBAAiB;SAChC,CAAC,CACL;QACD,iBAAiB;QACjB,MAAM,CAAC,OAAO,CAAC;KAClB,CACa,CAAA;IAElB,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;AAC7B,CAAC,CAAA"}
package/_types/actions/smartAccount/prepareUserOperationRequest.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"prepareUserOperationRequest.d.ts","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareUserOperationRequest.d.ts","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
package/actions/smartAccount/prepareUserOperationRequest.ts CHANGED
@@ -149,13 +149,13 @@ async function prepareUserOperationRequestForEntryPointV06<
149
149
  }
150
150
 
151
151
  if (typeof middleware === "function") {
152
- return (await middleware({
152
+ return middleware({
153
153
  userOperation,
154
154
  entryPoint: account.entryPoint
155
155
  } as {
156
156
  userOperation: UserOperation<GetEntryPointVersion<entryPoint>>
157
157
  entryPoint: entryPoint
158
- })) as PrepareUserOperationRequestReturnType<entryPoint>
158
+ }) as Promise<PrepareUserOperationRequestReturnType<entryPoint>>
159
159
  }
160
160
 
161
161
  if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
@@ -201,6 +201,7 @@ async function prepareUserOperationRequestForEntryPointV06<
201
201
  sponsorUserOperationData.preVerificationGas
202
202
  userOperation.paymasterAndData =
203
203
  sponsorUserOperationData.paymasterAndData
204
+ return userOperation as PrepareUserOperationRequestReturnType<entryPoint>
204
205
  }
205
206
 
206
207
  if (
@@ -291,13 +292,13 @@ async function prepareUserOperationRequestEntryPointV07<
291
292
  }
292
293
 
293
294
  if (typeof middleware === "function") {
294
- return (await middleware({
295
+ return middleware({
295
296
  userOperation,
296
297
  entryPoint: account.entryPoint
297
298
  } as {
298
299
  userOperation: UserOperation<GetEntryPointVersion<entryPoint>>
299
300
  entryPoint: entryPoint
300
- })) as PrepareUserOperationRequestReturnType<entryPoint>
301
+ }) as Promise<PrepareUserOperationRequestReturnType<entryPoint>>
301
302
  }
302
303
 
303
304
  if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
@@ -349,6 +350,8 @@ async function prepareUserOperationRequestEntryPointV07<
349
350
  userOperation.paymasterPostOpGasLimit =
350
351
  sponsorUserOperationData.paymasterPostOpGasLimit
351
352
  userOperation.paymasterData = sponsorUserOperationData.paymasterData
353
+
354
+ return userOperation as PrepareUserOperationRequestReturnType<entryPoint>
352
355
  }
353
356
 
354
357
  if (
@@ -356,13 +359,13 @@ async function prepareUserOperationRequestEntryPointV07<
356
359
  !userOperation.verificationGasLimit ||
357
360
  !userOperation.preVerificationGas
358
361
  ) {
359
- const gasParameters = await getAction(client, estimateUserOperationGas)(
362
+ const gasParameters = await getAction(
363
+ client,
364
+ estimateUserOperationGas<ENTRYPOINT_ADDRESS_V07_TYPE>
365
+ )(
360
366
  {
361
367
  userOperation,
362
368
  entryPoint: account.entryPoint
363
- } as {
364
- userOperation: UserOperation<GetEntryPointVersion<entryPoint>>
365
- entryPoint: entryPoint
366
369
  },
367
370
  stateOverrides
368
371
  )
@@ -373,6 +376,13 @@ async function prepareUserOperationRequestEntryPointV07<
373
376
  gasParameters.verificationGasLimit
374
377
  userOperation.preVerificationGas =
375
378
  userOperation.preVerificationGas || gasParameters.preVerificationGas
379
+
380
+ userOperation.paymasterPostOpGasLimit =
381
+ userOperation.paymasterPostOpGasLimit ||
382
+ gasParameters.paymasterPostOpGasLimit
383
+ userOperation.paymasterPostOpGasLimit =
384
+ userOperation.paymasterPostOpGasLimit ||
385
+ gasParameters.paymasterPostOpGasLimit
376
386
  }
377
387
 
378
388
  return userOperation as PrepareUserOperationRequestReturnType<entryPoint>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "permissionless",
3
- "version": "0.1.12",
3
+ "version": "0.1.14",
4
4
  "author": "Pimlico",
5
5
  "homepage": "https://docs.pimlico.io/permissionless",
6
6
  "repository": "github:pimlicolabs/permissionless.js",
package/utils/getUserOperationHash.ts CHANGED
@@ -51,19 +51,19 @@ function packUserOp<entryPoint extends EntryPoint>({
51
51
  )
52
52
  const hashedCallData = keccak256(userOperation.callData)
53
53
  const hashedPaymasterAndData = keccak256(
54
- userOperation.paymaster &&
55
- userOperation.paymasterVerificationGasLimit &&
56
- userOperation.paymasterPostOpGasLimit &&
57
- userOperation.paymasterData
54
+ userOperation.paymaster
58
55
  ? concat([
59
56
  userOperation.paymaster,
60
- pad(toHex(userOperation.paymasterVerificationGasLimit), {
57
+ pad(
58
+ toHex(userOperation.paymasterVerificationGasLimit || 0n),
59
+ {
60
+ size: 16
61
+ }
62
+ ),
63
+ pad(toHex(userOperation.paymasterPostOpGasLimit || 0n), {
61
64
  size: 16
62
65
  }),
63
- pad(toHex(userOperation.paymasterPostOpGasLimit), {
64
- size: 16
65
- }),
66
- userOperation.paymasterData
66
+ userOperation.paymasterData || "0x"
67
67
  ])
68
68
  : "0x"
69
69
  )