@aztec/node-lib 3.0.0-nightly.20251208 → 3.0.0-nightly.20251210
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.
- package/dest/factories/l1_tx_utils.d.ts +3 -3
- package/dest/factories/l1_tx_utils.d.ts.map +1 -1
- package/dest/factories/l1_tx_utils.js +30 -4
- package/dest/stores/l1_tx_store.d.ts +2 -2
- package/dest/stores/l1_tx_store.d.ts.map +1 -1
- package/dest/stores/l1_tx_store.js +19 -11
- package/package.json +23 -21
- package/src/factories/l1_tx_utils.ts +40 -4
- package/src/stores/l1_tx_store.ts +20 -11
|
@@ -16,7 +16,7 @@ export declare function createL1TxUtilsWithBlobsFromViemWallet(clients: Extended
|
|
|
16
16
|
dateProvider?: DateProvider;
|
|
17
17
|
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
|
|
18
18
|
/**
|
|
19
|
-
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
|
|
19
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
20
20
|
*/
|
|
21
21
|
export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
22
22
|
debugMaxGasLimit?: boolean;
|
|
@@ -39,7 +39,7 @@ export declare function createL1TxUtilsFromViemWalletWithStore(clients: Extended
|
|
|
39
39
|
scope?: L1TxScope;
|
|
40
40
|
}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
|
|
41
41
|
/**
|
|
42
|
-
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
|
|
42
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
43
43
|
*/
|
|
44
44
|
export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
45
45
|
debugMaxGasLimit?: boolean;
|
|
@@ -50,4 +50,4 @@ export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient
|
|
|
50
50
|
dateProvider?: DateProvider;
|
|
51
51
|
scope?: L1TxScope;
|
|
52
52
|
}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLHdCQUF3QixFQUFFLGVBQWUsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQU14RyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFL0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUErQjdEOztHQUVHO0FBQ0gsd0JBQXNCLHNDQUFzQyxDQUMxRCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsRUFDbkMsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0NBQzdCLGtGQU9GO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IscUNBQXFDLENBQ3pELE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxTQUFTLEVBQUUsRUFDcEIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0NBQzdCLGtGQXlCRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHNDQUFzQyxDQUMxRCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsRUFDbkMsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQztDQUNuQixrREFLRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHFDQUFxQyxDQUN6RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixLQUFLLENBQUMsRUFBRSxTQUFTLENBQUM7Q0FDbkIsa0RBdUJGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMxG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AA+B7D;;GAEG;AACH,wBAAsB,sCAAsC,CAC1D,OAAO,EAAE,wBAAwB,EAAE,EACnC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,kFAOF;AAED;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,
|
|
1
|
+
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMxG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AA+B7D;;GAEG;AACH,wBAAsB,sCAAsC,CAC1D,OAAO,EAAE,wBAAwB,EAAE,EACnC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,kFAOF;AAED;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,kFAyBF;AAED;;GAEG;AACH,wBAAsB,sCAAsC,CAC1D,OAAO,EAAE,wBAAwB,EAAE,EACnC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,kDAKF;AAED;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,kDAuBF"}
|
|
@@ -31,10 +31,23 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
|
31
31
|
return clients.map((client)=>createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit));
|
|
32
32
|
}
|
|
33
33
|
/**
|
|
34
|
-
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
|
|
34
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
35
35
|
*/ export async function createL1TxUtilsWithBlobsFromEthSigner(client, signers, config, deps) {
|
|
36
36
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
37
|
-
|
|
37
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
38
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
39
|
+
const signersByAddress = new Map();
|
|
40
|
+
for (const signer of signers){
|
|
41
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
42
|
+
if (!signersByAddress.has(addressKey)) {
|
|
43
|
+
signersByAddress.set(addressKey, signer);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
47
|
+
if (uniqueSigners.length < signers.length) {
|
|
48
|
+
sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
|
|
49
|
+
}
|
|
50
|
+
return uniqueSigners.map((signer)=>createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit));
|
|
38
51
|
}
|
|
39
52
|
/**
|
|
40
53
|
* Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
|
|
@@ -43,8 +56,21 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
|
43
56
|
return clients.map((client)=>createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
|
|
44
57
|
}
|
|
45
58
|
/**
|
|
46
|
-
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
|
|
59
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
47
60
|
*/ export async function createL1TxUtilsFromEthSignerWithStore(client, signers, config, deps) {
|
|
48
61
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
49
|
-
|
|
62
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
63
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
64
|
+
const signersByAddress = new Map();
|
|
65
|
+
for (const signer of signers){
|
|
66
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
67
|
+
if (!signersByAddress.has(addressKey)) {
|
|
68
|
+
signersByAddress.set(addressKey, signer);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
72
|
+
if (uniqueSigners.length < signers.length) {
|
|
73
|
+
sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
|
|
74
|
+
}
|
|
75
|
+
return uniqueSigners.map((signer)=>createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
|
|
50
76
|
}
|
|
@@ -54,7 +54,7 @@ export declare class L1TxStore implements IL1TxStore {
|
|
|
54
54
|
* @param account - The sender account address
|
|
55
55
|
* @param stateId - The state ID to delete
|
|
56
56
|
*/
|
|
57
|
-
deleteState(account: string,
|
|
57
|
+
deleteState(account: string, ...stateIds: number[]): Promise<void>;
|
|
58
58
|
/**
|
|
59
59
|
* Clears all transaction states for a specific account.
|
|
60
60
|
* @param account - The sender account address
|
|
@@ -86,4 +86,4 @@ export declare class L1TxStore implements IL1TxStore {
|
|
|
86
86
|
*/
|
|
87
87
|
private deserializeBlobInputs;
|
|
88
88
|
}
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvbDFfdHhfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBYyxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV2RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQTJFeEU7Ozs7R0FJRztBQUNILHFCQUFhLFNBQVUsWUFBVyxVQUFVO0lBUXhDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUN0QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFSdEIsZ0JBQXVCLGNBQWMsU0FBSztJQUUxQyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBZ0M7SUFDdkQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQWdDO0lBQ3RELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFnQztJQUUvRCxZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLEdBQUcsR0FBRSxNQUEwQyxFQUtqRTtJQUVEOztPQUVHO0lBQ0ksa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBTzFEO0lBRUQ7O09BRUc7SUFDSCxPQUFPLENBQUMsT0FBTztJQUlmOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBUTVFO0lBRUQ7Ozs7O09BS0c7SUFDVSxTQUFTLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxZQUFZLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FRNUc7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBb0M3RDtJQUVEOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQTBCdkY7SUFFRDs7OztPQUlHO0lBQ1UsV0FBVyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVk5RTtJQUVEOzs7T0FHRztJQUNVLFdBQVcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FXdkQ7SUFFRDs7O09BR0c7SUFDVSxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBUy9DO0lBRUQ7O09BRUc7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsQztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGNBQWM7SUFrQ3RCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtJQTJDeEI7O09BRUc7SUFDSCxPQUFPLENBQUMsbUJBQW1CO0lBTzNCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLHFCQUFxQjtDQVk5QiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AA2ExE;;;;GAIG;AACH,qBAAa,SAAU,YAAW,UAAU;IAQxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,gBAAuB,cAAc,SAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgC;IAE/D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAA0C,EAKjE;IAED;;OAEG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO1D;IAED;;OAEG;IACH,OAAO,CAAC,OAAO;IAIf;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ5E;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ5G;IAED;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAoC7D;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA0BvF;IAED;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AA2ExE;;;;GAIG;AACH,qBAAa,SAAU,YAAW,UAAU;IAQxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,gBAAuB,cAAc,SAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgC;IAE/D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAA0C,EAKjE;IAED;;OAEG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO1D;IAED;;OAEG;IACH,OAAO,CAAC,OAAO;IAIf;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ5E;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ5G;IAED;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAoC7D;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA0BvF;IAED;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;IAED;;;OAGG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvD;IAED;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAS/C;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAED;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAY9B"}
|
|
@@ -134,22 +134,30 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
134
134
|
* Deletes a specific state and its associated blobs.
|
|
135
135
|
* @param account - The sender account address
|
|
136
136
|
* @param stateId - The state ID to delete
|
|
137
|
-
*/ async deleteState(account,
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
this.
|
|
137
|
+
*/ async deleteState(account, ...stateIds) {
|
|
138
|
+
if (stateIds.length === 0) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
await this.store.transactionAsync(async ()=>{
|
|
142
|
+
for (const stateId of stateIds){
|
|
143
|
+
const key = this.makeKey(account, stateId);
|
|
144
|
+
await this.states.delete(key);
|
|
145
|
+
await this.blobs.delete(key);
|
|
146
|
+
}
|
|
147
|
+
});
|
|
142
148
|
}
|
|
143
149
|
/**
|
|
144
150
|
* Clears all transaction states for a specific account.
|
|
145
151
|
* @param account - The sender account address
|
|
146
152
|
*/ async clearStates(account) {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
+
await this.store.transactionAsync(async ()=>{
|
|
154
|
+
const states = await this.loadStates(account);
|
|
155
|
+
for (const state of states){
|
|
156
|
+
await this.deleteState(account, state.id);
|
|
157
|
+
}
|
|
158
|
+
await this.stateIdCounter.delete(account);
|
|
159
|
+
this.log.info(`Cleared all tx states for account ${account}`);
|
|
160
|
+
});
|
|
153
161
|
}
|
|
154
162
|
/**
|
|
155
163
|
* Gets all accounts that have stored states.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/node-lib",
|
|
3
|
-
"version": "3.0.0-nightly.
|
|
3
|
+
"version": "3.0.0-nightly.20251210",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./actions": "./dest/actions/index.js",
|
|
@@ -57,28 +57,29 @@
|
|
|
57
57
|
]
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@aztec/archiver": "3.0.0-nightly.
|
|
61
|
-
"@aztec/bb-prover": "3.0.0-nightly.
|
|
62
|
-
"@aztec/blob-sink": "3.0.0-nightly.
|
|
63
|
-
"@aztec/constants": "3.0.0-nightly.
|
|
64
|
-
"@aztec/epoch-cache": "3.0.0-nightly.
|
|
65
|
-
"@aztec/ethereum": "3.0.0-nightly.
|
|
66
|
-
"@aztec/foundation": "3.0.0-nightly.
|
|
67
|
-
"@aztec/kv-store": "3.0.0-nightly.
|
|
68
|
-
"@aztec/merkle-tree": "3.0.0-nightly.
|
|
69
|
-
"@aztec/p2p": "3.0.0-nightly.
|
|
70
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
71
|
-
"@aztec/prover-client": "3.0.0-nightly.
|
|
72
|
-
"@aztec/sequencer-client": "3.0.0-nightly.
|
|
73
|
-
"@aztec/simulator": "3.0.0-nightly.
|
|
74
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
75
|
-
"@aztec/telemetry-client": "3.0.0-nightly.
|
|
76
|
-
"@aztec/validator-client": "3.0.0-nightly.
|
|
77
|
-
"@aztec/world-state": "3.0.0-nightly.
|
|
60
|
+
"@aztec/archiver": "3.0.0-nightly.20251210",
|
|
61
|
+
"@aztec/bb-prover": "3.0.0-nightly.20251210",
|
|
62
|
+
"@aztec/blob-sink": "3.0.0-nightly.20251210",
|
|
63
|
+
"@aztec/constants": "3.0.0-nightly.20251210",
|
|
64
|
+
"@aztec/epoch-cache": "3.0.0-nightly.20251210",
|
|
65
|
+
"@aztec/ethereum": "3.0.0-nightly.20251210",
|
|
66
|
+
"@aztec/foundation": "3.0.0-nightly.20251210",
|
|
67
|
+
"@aztec/kv-store": "3.0.0-nightly.20251210",
|
|
68
|
+
"@aztec/merkle-tree": "3.0.0-nightly.20251210",
|
|
69
|
+
"@aztec/p2p": "3.0.0-nightly.20251210",
|
|
70
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251210",
|
|
71
|
+
"@aztec/prover-client": "3.0.0-nightly.20251210",
|
|
72
|
+
"@aztec/sequencer-client": "3.0.0-nightly.20251210",
|
|
73
|
+
"@aztec/simulator": "3.0.0-nightly.20251210",
|
|
74
|
+
"@aztec/stdlib": "3.0.0-nightly.20251210",
|
|
75
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20251210",
|
|
76
|
+
"@aztec/validator-client": "3.0.0-nightly.20251210",
|
|
77
|
+
"@aztec/world-state": "3.0.0-nightly.20251210",
|
|
78
78
|
"tslib": "^2.4.0"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
-
"@aztec/blob-lib": "3.0.0-nightly.
|
|
81
|
+
"@aztec/blob-lib": "3.0.0-nightly.20251210",
|
|
82
|
+
"@aztec/node-keystore": "3.0.0-nightly.20251210",
|
|
82
83
|
"@jest/globals": "^30.0.0",
|
|
83
84
|
"@types/jest": "^30.0.0",
|
|
84
85
|
"@types/node": "^22.15.17",
|
|
@@ -86,7 +87,8 @@
|
|
|
86
87
|
"jest": "^30.0.0",
|
|
87
88
|
"jest-mock-extended": "^4.0.0",
|
|
88
89
|
"ts-node": "^10.9.1",
|
|
89
|
-
"typescript": "^5.3.3"
|
|
90
|
+
"typescript": "^5.3.3",
|
|
91
|
+
"viem": "npm:@aztec/viem@2.38.2"
|
|
90
92
|
},
|
|
91
93
|
"files": [
|
|
92
94
|
"dest",
|
|
@@ -65,7 +65,7 @@ export async function createL1TxUtilsWithBlobsFromViemWallet(
|
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
/**
|
|
68
|
-
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
|
|
68
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
69
69
|
*/
|
|
70
70
|
export async function createL1TxUtilsWithBlobsFromEthSigner(
|
|
71
71
|
client: ViemClient,
|
|
@@ -79,7 +79,25 @@ export async function createL1TxUtilsWithBlobsFromEthSigner(
|
|
|
79
79
|
) {
|
|
80
80
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
81
81
|
|
|
82
|
-
|
|
82
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
83
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
84
|
+
const signersByAddress = new Map<string, EthSigner>();
|
|
85
|
+
for (const signer of signers) {
|
|
86
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
87
|
+
if (!signersByAddress.has(addressKey)) {
|
|
88
|
+
signersByAddress.set(addressKey, signer);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
93
|
+
|
|
94
|
+
if (uniqueSigners.length < signers.length) {
|
|
95
|
+
sharedDeps.logger.info(
|
|
96
|
+
`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`,
|
|
97
|
+
);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
return uniqueSigners.map(signer =>
|
|
83
101
|
createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit),
|
|
84
102
|
);
|
|
85
103
|
}
|
|
@@ -103,7 +121,7 @@ export async function createL1TxUtilsFromViemWalletWithStore(
|
|
|
103
121
|
}
|
|
104
122
|
|
|
105
123
|
/**
|
|
106
|
-
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
|
|
124
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
107
125
|
*/
|
|
108
126
|
export async function createL1TxUtilsFromEthSignerWithStore(
|
|
109
127
|
client: ViemClient,
|
|
@@ -118,5 +136,23 @@ export async function createL1TxUtilsFromEthSignerWithStore(
|
|
|
118
136
|
) {
|
|
119
137
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
120
138
|
|
|
121
|
-
|
|
139
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
140
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
141
|
+
const signersByAddress = new Map<string, EthSigner>();
|
|
142
|
+
for (const signer of signers) {
|
|
143
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
144
|
+
if (!signersByAddress.has(addressKey)) {
|
|
145
|
+
signersByAddress.set(addressKey, signer);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
150
|
+
|
|
151
|
+
if (uniqueSigners.length < signers.length) {
|
|
152
|
+
sharedDeps.logger.info(
|
|
153
|
+
`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`,
|
|
154
|
+
);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
return uniqueSigners.map(signer => createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
|
|
122
158
|
}
|
|
@@ -231,11 +231,18 @@ export class L1TxStore implements IL1TxStore {
|
|
|
231
231
|
* @param account - The sender account address
|
|
232
232
|
* @param stateId - The state ID to delete
|
|
233
233
|
*/
|
|
234
|
-
public async deleteState(account: string,
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
234
|
+
public async deleteState(account: string, ...stateIds: number[]): Promise<void> {
|
|
235
|
+
if (stateIds.length === 0) {
|
|
236
|
+
return;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
await this.store.transactionAsync(async () => {
|
|
240
|
+
for (const stateId of stateIds) {
|
|
241
|
+
const key = this.makeKey(account, stateId);
|
|
242
|
+
await this.states.delete(key);
|
|
243
|
+
await this.blobs.delete(key);
|
|
244
|
+
}
|
|
245
|
+
});
|
|
239
246
|
}
|
|
240
247
|
|
|
241
248
|
/**
|
|
@@ -243,14 +250,16 @@ export class L1TxStore implements IL1TxStore {
|
|
|
243
250
|
* @param account - The sender account address
|
|
244
251
|
*/
|
|
245
252
|
public async clearStates(account: string): Promise<void> {
|
|
246
|
-
|
|
253
|
+
await this.store.transactionAsync(async () => {
|
|
254
|
+
const states = await this.loadStates(account);
|
|
247
255
|
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
256
|
+
for (const state of states) {
|
|
257
|
+
await this.deleteState(account, state.id);
|
|
258
|
+
}
|
|
251
259
|
|
|
252
|
-
|
|
253
|
-
|
|
260
|
+
await this.stateIdCounter.delete(account);
|
|
261
|
+
this.log.info(`Cleared all tx states for account ${account}`);
|
|
262
|
+
});
|
|
254
263
|
}
|
|
255
264
|
|
|
256
265
|
/**
|