@pimlico/alto 0.0.0-main.20250121T120414 → 0.0.0-main.20250123T120337

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 (13) hide show
  1. package/esm/rpc/nonceQueuer.d.ts +1 -1
  2. package/esm/rpc/nonceQueuer.js +14 -10
  3. package/esm/rpc/nonceQueuer.js.map +1 -1
  4. package/esm/utils/userop.d.ts +4 -0
  5. package/esm/utils/userop.js +5 -2
  6. package/esm/utils/userop.js.map +1 -1
  7. package/lib/rpc/nonceQueuer.d.ts +1 -1
  8. package/lib/rpc/nonceQueuer.js +13 -9
  9. package/lib/rpc/nonceQueuer.js.map +1 -1
  10. package/lib/utils/userop.d.ts +4 -0
  11. package/lib/utils/userop.js +7 -3
  12. package/lib/utils/userop.js.map +1 -1
  13. package/package.json +1 -1
package/esm/rpc/nonceQueuer.d.ts CHANGED
@@ -9,7 +9,7 @@ type QueuedUserOperation = {
9
9
  userOperationHash: Hash;
10
10
  mempoolUserOperation: MempoolUserOperation;
11
11
  nonceKey: bigint;
12
- nonceValue: bigint;
12
+ nonceSequence: bigint;
13
13
  addedAt: number;
14
14
  };
15
15
  export declare class NonceQueuer {
package/esm/rpc/nonceQueuer.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { EntryPointV06Abi, EntryPointV07Abi, deriveUserOperation } from "../types/index.js";
2
- import { getNonceKeyAndValue, getUserOperationHash, isVersion06 } from "../utils/index.js";
2
+ import { encodeNonce, getNonceKeyAndValue, getUserOperationHash, isVersion06 } from "../utils/index.js";
3
3
  import { getContract } from "viem";
4
4
  export class NonceQueuer {
5
5
  queuedUserOperations = [];
@@ -42,17 +42,17 @@ export class NonceQueuer {
42
42
  }
43
43
  add(mempoolUserOperation, entryPoint) {
44
44
  const userOperation = deriveUserOperation(mempoolUserOperation);
45
- const [nonceKey, nonceValue] = getNonceKeyAndValue(userOperation.nonce);
46
- const hash = getUserOperationHash(deriveUserOperation(mempoolUserOperation), entryPoint, this.config.publicClient.chain.id);
45
+ const [nonceKey, nonceSequence] = getNonceKeyAndValue(userOperation.nonce);
46
+ const userOperationHash = getUserOperationHash(deriveUserOperation(mempoolUserOperation), entryPoint, this.config.publicClient.chain.id);
47
47
  this.queuedUserOperations.push({
48
48
  entryPoint,
49
- userOperationHash: hash,
50
- mempoolUserOperation: mempoolUserOperation,
51
- nonceKey: nonceKey,
52
- nonceValue: nonceValue,
49
+ userOperationHash,
50
+ mempoolUserOperation,
51
+ nonceKey,
52
+ nonceSequence,
53
53
  addedAt: Date.now()
54
54
  });
55
- this.eventManager.emitQueued(hash);
55
+ this.eventManager.emitQueued(userOperationHash);
56
56
  }
57
57
  resubmitUserOperation(mempoolUserOperation, entryPoint) {
58
58
  const userOperation = mempoolUserOperation;
@@ -130,8 +130,12 @@ export class NonceQueuer {
130
130
  this.logger.error({ error: result.error }, "error fetching nonce");
131
131
  continue;
132
132
  }
133
- const onchainNonceValue = result.result;
134
- if (onchainNonceValue === qop.nonceValue) {
133
+ const onchainNonce = result.result;
134
+ const qopNonce = encodeNonce({
135
+ nonceSequence: qop.nonceSequence,
136
+ nonceKey: qop.nonceKey
137
+ });
138
+ if (onchainNonce === qopNonce) {
135
139
  currentOutstandingOps.push(qop);
136
140
  }
137
141
  }
package/esm/rpc/nonceQueuer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nonceQueuer.js","sourceRoot":"","sources":["../../rpc/nonceQueuer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"nonceQueuer.js","sourceRoot":"","sources":["../../rpc/nonceQueuer.ts"],"names":[],"mappings":"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"}
package/esm/utils/userop.d.ts CHANGED
@@ -58,6 +58,10 @@ export declare const getUserOperationHashV06: (userOperation: UserOperationV06,
58
58
  export declare const getUserOperationHashV07: (userOperation: PackedUserOperation, entryPointAddress: Address, chainId: number) => `0x${string}`;
59
59
  export declare const getUserOperationHash: (userOperation: UserOperation, entryPointAddress: Address, chainId: number) => `0x${string}`;
60
60
  export declare const getNonceKeyAndValue: (nonce: bigint) => bigint[];
61
+ export declare const encodeNonce: ({ nonceKey, nonceSequence }: {
62
+ nonceKey: bigint;
63
+ nonceSequence: bigint;
64
+ }) => bigint;
61
65
  export declare function toUnpackedUserOperation(packedUserOperation: PackedUserOperation): UserOperationV07;
62
66
  export declare const getRequiredPrefund: (userOperation: UserOperation) => bigint;
63
67
  export declare function parseUserOperationReceipt(userOpHash: Hex, receipt: TransactionReceipt): {
package/esm/utils/userop.js CHANGED
@@ -367,8 +367,11 @@ export const getUserOperationHash = (userOperation, entryPointAddress, chainId)
367
367
  };
368
368
  export const getNonceKeyAndValue = (nonce) => {
369
369
  const nonceKey = nonce >> 64n; // first 192 bits of nonce
370
- const userOperationNonceValue = nonce & 0xffffffffffffffffn; // last 64 bits of nonce
371
- return [nonceKey, userOperationNonceValue];
370
+ const nonceSequence = nonce & 0xffffffffffffffffn; // last 64 bits of nonce
371
+ return [nonceKey, nonceSequence];
372
+ };
373
+ export const encodeNonce = ({ nonceKey, nonceSequence }) => {
374
+ return (nonceKey << 64n) | nonceSequence;
372
375
  };
373
376
  export function toUnpackedUserOperation(packedUserOperation) {
374
377
  const { factory, factoryData } = unPackInitCode(packedUserOperation.initCode);
package/esm/utils/userop.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}
package/lib/rpc/nonceQueuer.d.ts CHANGED
@@ -9,7 +9,7 @@ type QueuedUserOperation = {
9
9
  userOperationHash: Hash;
10
10
  mempoolUserOperation: MempoolUserOperation;
11
11
  nonceKey: bigint;
12
- nonceValue: bigint;
12
+ nonceSequence: bigint;
13
13
  addedAt: number;
14
14
  };
15
15
  export declare class NonceQueuer {
package/lib/rpc/nonceQueuer.js CHANGED
@@ -45,17 +45,17 @@ class NonceQueuer {
45
45
  }
46
46
  add(mempoolUserOperation, entryPoint) {
47
47
  const userOperation = (0, types_1.deriveUserOperation)(mempoolUserOperation);
48
- const [nonceKey, nonceValue] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
49
- const hash = (0, utils_1.getUserOperationHash)((0, types_1.deriveUserOperation)(mempoolUserOperation), entryPoint, this.config.publicClient.chain.id);
48
+ const [nonceKey, nonceSequence] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
49
+ const userOperationHash = (0, utils_1.getUserOperationHash)((0, types_1.deriveUserOperation)(mempoolUserOperation), entryPoint, this.config.publicClient.chain.id);
50
50
  this.queuedUserOperations.push({
51
51
  entryPoint,
52
- userOperationHash: hash,
53
- mempoolUserOperation: mempoolUserOperation,
54
- nonceKey: nonceKey,
55
- nonceValue: nonceValue,
52
+ userOperationHash,
53
+ mempoolUserOperation,
54
+ nonceKey,
55
+ nonceSequence,
56
56
  addedAt: Date.now()
57
57
  });
58
- this.eventManager.emitQueued(hash);
58
+ this.eventManager.emitQueued(userOperationHash);
59
59
  }
60
60
  resubmitUserOperation(mempoolUserOperation, entryPoint) {
61
61
  const userOperation = mempoolUserOperation;
@@ -133,8 +133,12 @@ class NonceQueuer {
133
133
  this.logger.error({ error: result.error }, "error fetching nonce");
134
134
  continue;
135
135
  }
136
- const onchainNonceValue = result.result;
137
- if (onchainNonceValue === qop.nonceValue) {
136
+ const onchainNonce = result.result;
137
+ const qopNonce = (0, utils_1.encodeNonce)({
138
+ nonceSequence: qop.nonceSequence,
139
+ nonceKey: qop.nonceKey
140
+ });
141
+ if (onchainNonce === qopNonce) {
138
142
  currentOutstandingOps.push(qop);
139
143
  }
140
144
  }
package/lib/rpc/nonceQueuer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nonceQueuer.js","sourceRoot":"","sources":["../../rpc/nonceQueuer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"nonceQueuer.js","sourceRoot":"","sources":["../../rpc/nonceQueuer.ts"],"names":[],"mappings":"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"}
package/lib/utils/userop.d.ts CHANGED
@@ -58,6 +58,10 @@ export declare const getUserOperationHashV06: (userOperation: UserOperationV06,
58
58
  export declare const getUserOperationHashV07: (userOperation: PackedUserOperation, entryPointAddress: Address, chainId: number) => `0x${string}`;
59
59
  export declare const getUserOperationHash: (userOperation: UserOperation, entryPointAddress: Address, chainId: number) => `0x${string}`;
60
60
  export declare const getNonceKeyAndValue: (nonce: bigint) => bigint[];
61
+ export declare const encodeNonce: ({ nonceKey, nonceSequence }: {
62
+ nonceKey: bigint;
63
+ nonceSequence: bigint;
64
+ }) => bigint;
61
65
  export declare function toUnpackedUserOperation(packedUserOperation: PackedUserOperation): UserOperationV07;
62
66
  export declare const getRequiredPrefund: (userOperation: UserOperation) => bigint;
63
67
  export declare function parseUserOperationReceipt(userOpHash: Hex, receipt: TransactionReceipt): {
package/lib/utils/userop.js CHANGED
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.parseUserOperationReceipt = exports.getRequiredPrefund = exports.toUnpackedUserOperation = exports.getNonceKeyAndValue = exports.getUserOperationHash = exports.getUserOperationHashV07 = exports.getUserOperationHashV06 = exports.getBundleStatus = exports.getAddressFromInitCodeOrPaymasterAndData = exports.deepHexlify = exports.toPackedUserOperation = exports.unpackPaymasterAndData = exports.getPaymasterAndData = exports.unpackGasLimits = exports.getGasLimits = exports.unpackAccountGasLimits = exports.getAccountGasLimits = exports.unPackInitCode = exports.getInitCode = exports.isVersion07 = exports.isVersion06 = void 0;
26
+ exports.parseUserOperationReceipt = exports.getRequiredPrefund = exports.toUnpackedUserOperation = exports.encodeNonce = exports.getNonceKeyAndValue = exports.getUserOperationHash = exports.getUserOperationHashV07 = exports.getUserOperationHashV06 = exports.getBundleStatus = exports.getAddressFromInitCodeOrPaymasterAndData = exports.deepHexlify = exports.toPackedUserOperation = exports.unpackPaymasterAndData = exports.getPaymasterAndData = exports.unpackGasLimits = exports.getGasLimits = exports.unpackAccountGasLimits = exports.getAccountGasLimits = exports.unPackInitCode = exports.getInitCode = exports.isVersion07 = exports.isVersion06 = void 0;
27
27
  const types_1 = require("../types/index.js");
28
28
  const sentry = __importStar(require("@sentry/node"));
29
29
  const viem_1 = require("viem");
@@ -410,10 +410,14 @@ const getUserOperationHash = (userOperation, entryPointAddress, chainId) => {
410
410
  exports.getUserOperationHash = getUserOperationHash;
411
411
  const getNonceKeyAndValue = (nonce) => {
412
412
  const nonceKey = nonce >> 64n; // first 192 bits of nonce
413
- const userOperationNonceValue = nonce & 0xffffffffffffffffn; // last 64 bits of nonce
414
- return [nonceKey, userOperationNonceValue];
413
+ const nonceSequence = nonce & 0xffffffffffffffffn; // last 64 bits of nonce
414
+ return [nonceKey, nonceSequence];
415
415
  };
416
416
  exports.getNonceKeyAndValue = getNonceKeyAndValue;
417
+ const encodeNonce = ({ nonceKey, nonceSequence }) => {
418
+ return (nonceKey << 64n) | nonceSequence;
419
+ };
420
+ exports.encodeNonce = encodeNonce;
417
421
  function toUnpackedUserOperation(packedUserOperation) {
418
422
  const { factory, factoryData } = unPackInitCode(packedUserOperation.initCode);
419
423
  const { callGasLimit, verificationGasLimit } = unpackAccountGasLimits(packedUserOperation.accountGasLimits);
package/lib/utils/userop.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pimlico/alto",
3
- "version": "0.0.0-main.20250121T120414",
3
+ "version": "0.0.0-main.20250123T120337",
4
4
  "description": "A performant and modular ERC-4337 Bundler written in Typescript",
5
5
  "repository": "https://github.com/pimlicolabs/alto.git",
6
6
  "author": "Pimlico",