@aztec/pxe 0.8.7 → 0.8.8
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/config/index.d.ts +3 -3
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +4 -2
- package/dest/note_processor/note_processor.d.ts +18 -4
- package/dest/note_processor/note_processor.d.ts.map +1 -1
- package/dest/note_processor/note_processor.js +13 -5
- package/dest/pxe_service/pxe_service.d.ts +2 -1
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +9 -4
- package/dest/synchronizer/synchronizer.d.ts +2 -1
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +16 -8
- package/package.json +8 -8
- package/src/config/index.ts +7 -4
- package/src/note_processor/note_processor.ts +26 -5
- package/src/pxe_service/pxe_service.ts +9 -4
- package/src/synchronizer/synchronizer.ts +15 -10
package/dest/config/index.d.ts
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
* Configuration settings for the PXE Service.
|
|
3
3
|
*/
|
|
4
4
|
export interface PXEServiceConfig {
|
|
5
|
-
/**
|
|
6
|
-
* The interval to wait between polling for new blocks.
|
|
7
|
-
*/
|
|
5
|
+
/** The interval to wait between polling for new blocks. */
|
|
8
6
|
l2BlockPollingIntervalMS: number;
|
|
7
|
+
/** L2 block to start scanning from */
|
|
8
|
+
l2StartingBlock: number;
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
11
11
|
* Creates an instance of PXEServiceConfig out of environment variables using sensible defaults for integration testing if not set.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2DAA2D;IAC3D,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC;IACtC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,CAOtD;AAED;;GAEG;AACH,wBAAgB,cAAc;;;EAK7B"}
|
package/dest/config/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { INITIAL_L2_BLOCK_NUM } from '@aztec/types';
|
|
1
2
|
import { readFileSync } from 'fs';
|
|
2
3
|
import { dirname, resolve } from 'path';
|
|
3
4
|
import { fileURLToPath } from 'url';
|
|
@@ -5,9 +6,10 @@ import { fileURLToPath } from 'url';
|
|
|
5
6
|
* Creates an instance of PXEServiceConfig out of environment variables using sensible defaults for integration testing if not set.
|
|
6
7
|
*/
|
|
7
8
|
export function getPXEServiceConfig() {
|
|
8
|
-
const { PXE_BLOCK_POLLING_INTERVAL_MS } = process.env;
|
|
9
|
+
const { PXE_BLOCK_POLLING_INTERVAL_MS, PXE_L2_STARTING_BLOCK } = process.env;
|
|
9
10
|
return {
|
|
10
11
|
l2BlockPollingIntervalMS: PXE_BLOCK_POLLING_INTERVAL_MS ? +PXE_BLOCK_POLLING_INTERVAL_MS : 1000,
|
|
12
|
+
l2StartingBlock: PXE_L2_STARTING_BLOCK ? +PXE_L2_STARTING_BLOCK : INITIAL_L2_BLOCK_NUM,
|
|
11
13
|
};
|
|
12
14
|
}
|
|
13
15
|
/**
|
|
@@ -18,4 +20,4 @@ export function getPackageInfo() {
|
|
|
18
20
|
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
|
|
19
21
|
return { version, name };
|
|
20
22
|
}
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ2xDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFZcEM7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CO0lBQ2pDLE1BQU0sRUFBRSw2QkFBNkIsRUFBRSxxQkFBcUIsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7SUFFN0UsT0FBTztRQUNMLHdCQUF3QixFQUFFLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxJQUFJO1FBQy9GLGVBQWUsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsb0JBQW9CO0tBQ3ZGLENBQUM7QUFDSixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsY0FBYztJQUM1QixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztJQUMvRixNQUFNLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFFL0UsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUMzQixDQUFDIn0=
|
|
@@ -1,5 +1,15 @@
|
|
|
1
|
+
import { Timer } from '@aztec/foundation/timer';
|
|
1
2
|
import { AztecNode, KeyStore, L2BlockContext, L2BlockL2Logs, PublicKey } from '@aztec/types';
|
|
2
3
|
import { Database } from '../database/index.js';
|
|
4
|
+
/** Accumulated stats for a note processor. */
|
|
5
|
+
type NoteProcessorStats = {
|
|
6
|
+
/** How many notes have been seen and trial-decrypted. */
|
|
7
|
+
seen: number;
|
|
8
|
+
/** How many notes were successfully decrypted. */
|
|
9
|
+
decrypted: number;
|
|
10
|
+
/** How many notes failed processing. */
|
|
11
|
+
failed: number;
|
|
12
|
+
};
|
|
3
13
|
/**
|
|
4
14
|
* NoteProcessor is responsible for decrypting logs and converting them to notes via their originating contracts
|
|
5
15
|
* before storing them against their owner.
|
|
@@ -12,17 +22,20 @@ export declare class NoteProcessor {
|
|
|
12
22
|
private keyStore;
|
|
13
23
|
private db;
|
|
14
24
|
private node;
|
|
25
|
+
private startingBlock;
|
|
15
26
|
private simulator;
|
|
16
27
|
private log;
|
|
17
|
-
/**
|
|
18
|
-
* The latest L2 block number that the note processor has synchronized to.
|
|
19
|
-
*/
|
|
28
|
+
/** The latest L2 block number that the note processor has synchronized to. */
|
|
20
29
|
private syncedToBlock;
|
|
30
|
+
/** Keeps track of processing time since an instance is created. */
|
|
31
|
+
readonly timer: Timer;
|
|
32
|
+
/** Stats accumulated for this processor. */
|
|
33
|
+
readonly stats: NoteProcessorStats;
|
|
21
34
|
constructor(
|
|
22
35
|
/**
|
|
23
36
|
* The public counterpart to the private key to be used in note decryption.
|
|
24
37
|
*/
|
|
25
|
-
publicKey: PublicKey, keyStore: KeyStore, db: Database, node: AztecNode, simulator?: import("@aztec/acir-simulator").AcirSimulator, log?: import("@aztec/foundation/log").DebugLogger);
|
|
38
|
+
publicKey: PublicKey, keyStore: KeyStore, db: Database, node: AztecNode, startingBlock: number, simulator?: import("@aztec/acir-simulator").AcirSimulator, log?: import("@aztec/foundation/log").DebugLogger);
|
|
26
39
|
/**
|
|
27
40
|
* Check if the NoteProcessor is synchronized with the remote block number.
|
|
28
41
|
* The function queries the remote block number from the AztecNode and compares it with the syncedToBlock value in the NoteProcessor.
|
|
@@ -75,4 +88,5 @@ export declare class NoteProcessor {
|
|
|
75
88
|
*/
|
|
76
89
|
private processBlocksAndNoteSpendingInfo;
|
|
77
90
|
}
|
|
91
|
+
export {};
|
|
78
92
|
//# sourceMappingURL=note_processor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE/G,OAAO,EAAE,QAAQ,EAAuB,MAAM,sBAAsB,CAAC;AAiBrE;;;GAGG;AACH,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE/G,OAAO,EAAE,QAAQ,EAAuB,MAAM,sBAAsB,CAAC;AAiBrE,+CAA+C;AAC/C,KAAK,kBAAkB,GAAG;IACxB,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;GAGG;AACH,qBAAa,aAAa;IAWtB;;OAEG;aACa,SAAS,EAAE,SAAS;IACpC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAnBb,8EAA8E;IAC9E,OAAO,CAAC,aAAa,CAAK;IAE1B,mEAAmE;IACnE,SAAgB,KAAK,EAAE,KAAK,CAAe;IAE3C,4CAA4C;IAC5C,SAAgB,KAAK,EAAE,kBAAkB,CAAwC;;IAG/E;;OAEG;IACa,SAAS,EAAE,SAAS,EAC5B,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,MAAM,EACrB,SAAS,gDAAuC,EAChD,GAAG,8CAA4C;IAKzD;;;;;;OAMG;IACU,cAAc;IAK3B;;OAEG;IACH,IAAW,MAAM;;MAEhB;IAED;;;;;;;;;OASG;IACU,OAAO,CAAC,eAAe,EAAE,cAAc,EAAE,EAAE,oBAAoB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoF7G;;;;;;;;;;;;;;OAcG;YACW,yBAAyB;IA+DvC;;;;;;;;OAQG;YACW,gCAAgC;CAuB/C"}
|
|
@@ -3,6 +3,7 @@ import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/abis';
|
|
|
3
3
|
import { Grumpkin } from '@aztec/circuits.js/barretenberg';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
|
+
import { Timer } from '@aztec/foundation/timer';
|
|
6
7
|
import { NoteSpendingInfo } from '@aztec/types';
|
|
7
8
|
import { getAcirSimulator } from '../simulator/index.js';
|
|
8
9
|
/**
|
|
@@ -14,17 +15,21 @@ export class NoteProcessor {
|
|
|
14
15
|
/**
|
|
15
16
|
* The public counterpart to the private key to be used in note decryption.
|
|
16
17
|
*/
|
|
17
|
-
publicKey, keyStore, db, node, simulator = getAcirSimulator(db, node, keyStore), log = createDebugLogger('aztec:
|
|
18
|
+
publicKey, keyStore, db, node, startingBlock, simulator = getAcirSimulator(db, node, keyStore), log = createDebugLogger('aztec:note_processor')) {
|
|
18
19
|
this.publicKey = publicKey;
|
|
19
20
|
this.keyStore = keyStore;
|
|
20
21
|
this.db = db;
|
|
21
22
|
this.node = node;
|
|
23
|
+
this.startingBlock = startingBlock;
|
|
22
24
|
this.simulator = simulator;
|
|
23
25
|
this.log = log;
|
|
24
|
-
/**
|
|
25
|
-
* The latest L2 block number that the note processor has synchronized to.
|
|
26
|
-
*/
|
|
26
|
+
/** The latest L2 block number that the note processor has synchronized to. */
|
|
27
27
|
this.syncedToBlock = 0;
|
|
28
|
+
/** Keeps track of processing time since an instance is created. */
|
|
29
|
+
this.timer = new Timer();
|
|
30
|
+
/** Stats accumulated for this processor. */
|
|
31
|
+
this.stats = { seen: 0, decrypted: 0, failed: 0 };
|
|
32
|
+
this.syncedToBlock = this.startingBlock - 1;
|
|
28
33
|
}
|
|
29
34
|
/**
|
|
30
35
|
* Check if the NoteProcessor is synchronized with the remote block number.
|
|
@@ -82,6 +87,7 @@ export class NoteProcessor {
|
|
|
82
87
|
const excludedIndices = new Set();
|
|
83
88
|
for (const functionLogs of txFunctionLogs) {
|
|
84
89
|
for (const logs of functionLogs.logs) {
|
|
90
|
+
this.stats.seen++;
|
|
85
91
|
const noteSpendingInfo = NoteSpendingInfo.fromEncryptedBuffer(logs, privateKey, curve);
|
|
86
92
|
if (noteSpendingInfo) {
|
|
87
93
|
// We have successfully decrypted the data.
|
|
@@ -97,8 +103,10 @@ export class NoteProcessor {
|
|
|
97
103
|
index,
|
|
98
104
|
publicKey: this.publicKey,
|
|
99
105
|
});
|
|
106
|
+
this.stats.decrypted++;
|
|
100
107
|
}
|
|
101
108
|
catch (e) {
|
|
109
|
+
this.stats.failed++;
|
|
102
110
|
this.log.warn(`Could not process note because of "${e}". Skipping note...`);
|
|
103
111
|
}
|
|
104
112
|
}
|
|
@@ -203,4 +211,4 @@ https://github.com/AztecProtocol/aztec-packages/issues/1641`;
|
|
|
203
211
|
});
|
|
204
212
|
}
|
|
205
213
|
}
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9wcm9jZXNzb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZV9wcm9jZXNzb3Ivbm90ZV9wcm9jZXNzb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSwwQkFBMEIsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3pHLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRCxPQUFPLEVBQXNELGdCQUFnQixFQUFhLE1BQU0sY0FBYyxDQUFDO0FBRy9HLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBMEJ6RDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sYUFBYTtJQVV4QjtJQUNFOztPQUVHO0lBQ2EsU0FBb0IsRUFDNUIsUUFBa0IsRUFDbEIsRUFBWSxFQUNaLElBQWUsRUFDZixhQUFxQixFQUNyQixZQUFZLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDLEVBQ2hELE1BQU0saUJBQWlCLENBQUMsc0JBQXNCLENBQUM7UUFOdkMsY0FBUyxHQUFULFNBQVMsQ0FBVztRQUM1QixhQUFRLEdBQVIsUUFBUSxDQUFVO1FBQ2xCLE9BQUUsR0FBRixFQUFFLENBQVU7UUFDWixTQUFJLEdBQUosSUFBSSxDQUFXO1FBQ2Ysa0JBQWEsR0FBYixhQUFhLENBQVE7UUFDckIsY0FBUyxHQUFULFNBQVMsQ0FBdUM7UUFDaEQsUUFBRyxHQUFILEdBQUcsQ0FBNEM7UUFu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
|
|
@@ -34,7 +34,7 @@ export declare class PXEService implements PXE {
|
|
|
34
34
|
*/
|
|
35
35
|
stop(): Promise<void>;
|
|
36
36
|
addAuthWitness(witness: AuthWitness): Promise<void>;
|
|
37
|
-
registerAccount(privKey: GrumpkinPrivateKey, partialAddress: PartialAddress): Promise<
|
|
37
|
+
registerAccount(privKey: GrumpkinPrivateKey, partialAddress: PartialAddress): Promise<CompleteAddress>;
|
|
38
38
|
getRegisteredAccounts(): Promise<CompleteAddress[]>;
|
|
39
39
|
getRegisteredAccount(address: AztecAddress): Promise<CompleteAddress | undefined>;
|
|
40
40
|
registerRecipient(recipient: CompleteAddress): Promise<void>;
|
|
@@ -66,5 +66,6 @@ export declare class PXEService implements PXE {
|
|
|
66
66
|
[k: string]: number;
|
|
67
67
|
};
|
|
68
68
|
}>;
|
|
69
|
+
getKeyStore(): KeyStore;
|
|
69
70
|
}
|
|
70
71
|
//# sourceMappingURL=pxe_service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":";AAQA,OAAO,EACL,YAAY,EAEZ,eAAe,EAGf,kBAAkB,EAGlB,cAAc,EAEf,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AAGrD,OAAO,EACL,WAAW,EACX,SAAS,EAET,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { padArrayEnd } from '@aztec/foundation/collection';
|
|
|
8
8
|
import { Fr, Point } from '@aztec/foundation/fields';
|
|
9
9
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
10
10
|
import NoirVersion from '@aztec/noir-compiler/noir-version';
|
|
11
|
-
import { ContractData, ExtendedContractData,
|
|
11
|
+
import { ContractData, ExtendedContractData, LogType, MerkleTreeId, SimulationError, Tx, TxL2Logs, TxReceipt, TxStatus, getNewContractPublicFunctions, isNoirCallStackUnresolved, toContractDao, } from '@aztec/types';
|
|
12
12
|
import { getPackageInfo } from '../config/index.js';
|
|
13
13
|
import { ContractDataOracle } from '../contract_data_oracle/index.js';
|
|
14
14
|
import { KernelOracle } from '../kernel_oracle/index.js';
|
|
@@ -37,7 +37,8 @@ export class PXEService {
|
|
|
37
37
|
* @returns A promise that resolves when the server has started successfully.
|
|
38
38
|
*/
|
|
39
39
|
async start() {
|
|
40
|
-
|
|
40
|
+
const { l2BlockPollingIntervalMS, l2StartingBlock } = this.config;
|
|
41
|
+
await this.synchronizer.start(l2StartingBlock, 1, l2BlockPollingIntervalMS);
|
|
41
42
|
const info = await this.getNodeInfo();
|
|
42
43
|
this.log.info(`Started PXE connected to chain ${info.chainId} version ${info.protocolVersion}`);
|
|
43
44
|
}
|
|
@@ -60,13 +61,14 @@ export class PXEService {
|
|
|
60
61
|
const wasAdded = await this.db.addCompleteAddress(completeAddress);
|
|
61
62
|
if (wasAdded) {
|
|
62
63
|
const pubKey = this.keyStore.addAccount(privKey);
|
|
63
|
-
this.synchronizer.addAccount(pubKey, this.keyStore);
|
|
64
|
+
this.synchronizer.addAccount(pubKey, this.keyStore, this.config.l2StartingBlock);
|
|
64
65
|
this.log.info(`Registered account ${completeAddress.address.toString()}`);
|
|
65
66
|
this.log.debug(`Registered account\n ${completeAddress.toReadableString()}`);
|
|
66
67
|
}
|
|
67
68
|
else {
|
|
68
69
|
this.log.info(`Account:\n "${completeAddress.address.toString()}"\n already registered.`);
|
|
69
70
|
}
|
|
71
|
+
return completeAddress;
|
|
70
72
|
}
|
|
71
73
|
async getRegisteredAccounts() {
|
|
72
74
|
// Get complete addresses of both the recipients and the accounts
|
|
@@ -307,6 +309,9 @@ export class PXEService {
|
|
|
307
309
|
getSyncStatus() {
|
|
308
310
|
return Promise.resolve(this.synchronizer.getSyncStatus());
|
|
309
311
|
}
|
|
312
|
+
getKeyStore() {
|
|
313
|
+
return this.keyStore;
|
|
314
|
+
}
|
|
310
315
|
}
|
|
311
316
|
_PXEService_instances = new WeakSet(), _PXEService_getFunctionCall = async function _PXEService_getFunctionCall(functionName, args, to) {
|
|
312
317
|
const contract = await this.db.getContract(to);
|
|
@@ -467,4 +472,4 @@ async function _PXEService_enrichSimulationError(err) {
|
|
|
467
472
|
}
|
|
468
473
|
}));
|
|
469
474
|
};
|
|
470
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe_service.js","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}
|
|
475
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe_service.js","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,9 +49,10 @@ export declare class Synchronizer {
|
|
|
49
49
|
*
|
|
50
50
|
* @param publicKey - The public key for the account.
|
|
51
51
|
* @param keyStore - The key store.
|
|
52
|
+
* @param startingBlock - The block where to start scanning for notes for this accounts.
|
|
52
53
|
* @returns A promise that resolves once the account is added to the Synchronizer.
|
|
53
54
|
*/
|
|
54
|
-
addAccount(publicKey: PublicKey, keyStore: KeyStore): void;
|
|
55
|
+
addAccount(publicKey: PublicKey, keyStore: KeyStore, startingBlock: number): void;
|
|
55
56
|
/**
|
|
56
57
|
* Checks if the specified account is synchronized.
|
|
57
58
|
* @param account - The aztec address for which to query the sync status.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuC,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIlG,OAAO,EAAE,SAAS,EAAwB,QAAQ,
|
|
1
|
+
{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuC,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIlG,OAAO,EAAE,SAAS,EAAwB,QAAQ,EAA0C,MAAM,cAAc,CAAC;AAEjH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD;;;;;;GAMG;AACH,qBAAa,YAAY;IAUX,OAAO,CAAC,IAAI;IAAa,OAAO,CAAC,EAAE;IAT/C,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,uBAAuB,CAAuB;gBAElC,IAAI,EAAE,SAAS,EAAU,EAAE,EAAE,QAAQ,EAAE,SAAS,SAAK;IAIzE;;;;;;;;OAQG;IACU,KAAK,CAAC,IAAI,SAAuB,EAAE,KAAK,SAAI,EAAE,aAAa,SAAO;cA2B/D,WAAW;cAUX,IAAI,CAAC,KAAK,SAAI,EAAE,aAAa,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cA0DpD,wBAAwB,CAAC,KAAK,SAAI,EAAE,aAAa,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YA6D1E,qBAAqB;IAoBnC;;;;;;OAMG;IACU,IAAI;IAOjB;;;;;;;;;OASG;IACI,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM;IAOjF;;;;;;;OAOG;IACU,0BAA0B,CAAC,OAAO,EAAE,YAAY;IAc7D;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;;;;CAMrB"}
|
|
@@ -2,7 +2,7 @@ import { CircuitsWasm, Fr, HistoricBlockData } from '@aztec/circuits.js';
|
|
|
2
2
|
import { computeGlobalsHash } from '@aztec/circuits.js/abis';
|
|
3
3
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { InterruptableSleep } from '@aztec/foundation/sleep';
|
|
5
|
-
import { INITIAL_L2_BLOCK_NUM, L2BlockContext, LogType } from '@aztec/types';
|
|
5
|
+
import { INITIAL_L2_BLOCK_NUM, L2BlockContext, L2BlockL2Logs, LogType } from '@aztec/types';
|
|
6
6
|
import { NoteProcessor } from '../note_processor/index.js';
|
|
7
7
|
/**
|
|
8
8
|
* The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
|
|
@@ -102,7 +102,8 @@ export class Synchronizer {
|
|
|
102
102
|
// Update latest tree roots from the most recent block
|
|
103
103
|
const latestBlock = blockContexts[blockContexts.length - 1];
|
|
104
104
|
await this.setBlockDataFromBlock(latestBlock);
|
|
105
|
-
|
|
105
|
+
const logCount = L2BlockL2Logs.getTotalLogCount(encryptedLogs);
|
|
106
|
+
this.log(`Forwarding ${logCount} encrypted logs and blocks to ${this.noteProcessors.length} note processors`);
|
|
106
107
|
for (const noteProcessor of this.noteProcessors) {
|
|
107
108
|
await noteProcessor.process(blockContexts, encryptedLogs);
|
|
108
109
|
}
|
|
@@ -146,10 +147,17 @@ export class Synchronizer {
|
|
|
146
147
|
encryptedLogs = encryptedLogs.slice(0, blocks.length);
|
|
147
148
|
}
|
|
148
149
|
const blockContexts = blocks.map(block => new L2BlockContext(block));
|
|
149
|
-
|
|
150
|
+
const logCount = L2BlockL2Logs.getTotalLogCount(encryptedLogs);
|
|
151
|
+
this.log(`Forwarding ${logCount} encrypted logs and blocks to note processor in catch up mode`);
|
|
150
152
|
await noteProcessor.process(blockContexts, encryptedLogs);
|
|
151
153
|
if (noteProcessor.status.syncedToBlock === this.synchedToBlock) {
|
|
152
154
|
// Note processor caught up, move it to `noteProcessors` from `noteProcessorsToCatchUp`.
|
|
155
|
+
this.log(`Note processor for ${noteProcessor.publicKey.toString()} has caught up`, {
|
|
156
|
+
eventName: 'note-processor-caught-up',
|
|
157
|
+
publicKey: noteProcessor.publicKey.toString(),
|
|
158
|
+
duration: noteProcessor.timer.ms(),
|
|
159
|
+
...noteProcessor.stats,
|
|
160
|
+
});
|
|
153
161
|
this.noteProcessorsToCatchUp.shift();
|
|
154
162
|
this.noteProcessors.push(noteProcessor);
|
|
155
163
|
}
|
|
@@ -189,14 +197,14 @@ export class Synchronizer {
|
|
|
189
197
|
*
|
|
190
198
|
* @param publicKey - The public key for the account.
|
|
191
199
|
* @param keyStore - The key store.
|
|
200
|
+
* @param startingBlock - The block where to start scanning for notes for this accounts.
|
|
192
201
|
* @returns A promise that resolves once the account is added to the Synchronizer.
|
|
193
202
|
*/
|
|
194
|
-
addAccount(publicKey, keyStore) {
|
|
203
|
+
addAccount(publicKey, keyStore, startingBlock) {
|
|
195
204
|
const processor = this.noteProcessors.find(x => x.publicKey.equals(publicKey));
|
|
196
|
-
if (processor)
|
|
205
|
+
if (processor)
|
|
197
206
|
return;
|
|
198
|
-
|
|
199
|
-
this.noteProcessorsToCatchUp.push(new NoteProcessor(publicKey, keyStore, this.db, this.node));
|
|
207
|
+
this.noteProcessorsToCatchUp.push(new NoteProcessor(publicKey, keyStore, this.db, this.node, startingBlock));
|
|
200
208
|
}
|
|
201
209
|
/**
|
|
202
210
|
* Checks if the specified account is synchronized.
|
|
@@ -238,4 +246,4 @@ export class Synchronizer {
|
|
|
238
246
|
};
|
|
239
247
|
}
|
|
240
248
|
}
|
|
241
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAE,EAAE,EAAE,iBAAiB,EAAa,MAAM,oBAAoB,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAe,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAa,oBAAoB,EAAY,cAAc,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGlG,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D;;;;;;GAMG;AACH,MAAM,OAAO,YAAY;IAUvB,YAAoB,IAAe,EAAU,EAAY,EAAE,SAAS,GAAG,EAAE;QAArD,SAAI,GAAJ,IAAI,CAAW;QAAU,OAAE,GAAF,EAAE,CAAU;QARjD,mBAAc,GAAoB,EAAE,CAAC;QACrC,uBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAC9C,YAAO,GAAG,KAAK,CAAC;QAChB,2BAAsB,GAAG,CAAC,CAAC;QAC3B,mBAAc,GAAG,CAAC,CAAC;QAEnB,4BAAuB,GAAoB,EAAE,CAAC;QAGpD,IAAI,CAAC,GAAG,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAC7G,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,oBAAoB,EAAE,KAAK,GAAG,CAAC,EAAE,aAAa,GAAG,IAAI;QAC7E,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,gDAAgD,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;SAC1G;QACD,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC;QAE/B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,OAAO,EAAE;gBACnB,IAAI,IAAI,CAAC,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC3C,4GAA4G;oBAC5G,MAAM,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;iBAC3D;qBAAM;oBACL,yEAAyE;oBACzE,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;iBACvC;aACF;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtB,CAAC;IAES,KAAK,CAAC,WAAW;QACzB,MAAM,CAAC,WAAW,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,sBAAsB,GAAG,WAAW,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAClD,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;IACxD,CAAC;IAES,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,aAAa,GAAG,IAAI;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;QACrC,IAAI;YACF,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBACzB,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBACnD,OAAO;aACR;YAED,IAAI,eAAe,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAChF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBACnD,OAAO;aACR;YAED,mGAAmG;YACnG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YACrE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAClB,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBACnD,OAAO;aACR;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE;gBAC1C,2DAA2D;gBAC3D,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;aACvD;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,eAAe,CAAC,MAAM,EAAE;gBAC5C,6DAA6D;gBAC7D,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;aAC3D;YAED,wBAAwB;YACxB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBAC1B,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBACtD,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YAEH,iCAAiC;YACjC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YAErE,sDAAsD;YACtD,MAAM,WAAW,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC5D,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;YAE9C,IAAI,CAAC,GAAG,CACN,cAAc,aAAa,CAAC,MAAM,iCAAiC,IAAI,CAAC,cAAc,CAAC,MAAM,kBAAkB,CAChH,CAAC;YACF,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC/C,MAAM,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;aAC3D;YAED,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;SAChD;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YAClD,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;SACpD;IACH,CAAC;IAES,KAAK,CAAC,wBAAwB,CAAC,KAAK,GAAG,CAAC,EAAE,aAAa,GAAG,IAAI;QACtE,MAAM,aAAa,GAAG,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;QACtD,IAAI,aAAa,CAAC,MAAM,CAAC,aAAa,KAAK,IAAI,CAAC,cAAc,EAAE;YAC9D,gDAAgD;YAChD,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACxC,OAAO;SACR;QAED,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC;QACpD,6EAA6E;QAC7E,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;QAExD,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,8BAA8B,CAAC,CAAC;SAC1E;QAED,IAAI;YACF,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBACzB,0GAA0G;gBAC1G,oBAAoB;gBACpB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;aACjE;YAED,mGAAmG;YACnG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YACrE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAClB,0GAA0G;gBAC1G,oBAAoB;gBACpB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;aACzD;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE;gBAC1C,2DAA2D;gBAC3D,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;aACvD;YAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YAErE,IAAI,CAAC,GAAG,CAAC,cAAc,aAAa,CAAC,MAAM,+DAA+D,CAAC,CAAC;YAC5G,MAAM,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YAE1D,IAAI,aAAa,CAAC,MAAM,CAAC,aAAa,KAAK,IAAI,CAAC,cAAc,EAAE;gBAC9D,wFAAwF;gBACxF,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,CAAC;gBACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;SACpD;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,WAA2B;QAC7D,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC;QAC9B,IAAI,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,sBAAsB;YAAE,OAAO;QAEvD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAChF,MAAM,SAAS,GAAG,IAAI,iBAAiB,CACrC,KAAK,CAAC,0BAA0B,CAAC,IAAI,EACrC,KAAK,CAAC,wBAAwB,CAAC,IAAI,EACnC,KAAK,CAAC,uBAAuB,CAAC,IAAI,EAClC,KAAK,CAAC,6BAA6B,CAAC,IAAI,EACxC,KAAK,CAAC,6BAA6B,CAAC,IAAI,EACxC,EAAE,CAAC,IAAI,EAAE,oCAAoC;QAC7C,KAAK,CAAC,qBAAqB,EAC3B,WAAW,CACZ,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,cAAc,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtB,CAAC;IAED;;;;;;;;OAQG;IACI,UAAU,CAAC,SAAoB,EAAE,QAAkB;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/E,IAAI,SAAS,EAAE;YACb,OAAO;SACR;QAED,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAChG,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,0BAA0B,CAAC,OAAqB;QAC3D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,gCAAgC,CAAC,CAAC;SAChH;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/F,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CACb,sDAAsD,OAAO,gDAAgD,CAC9G,CAAC;SACH;QACD,OAAO,MAAM,SAAS,CAAC,cAAc,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,yBAAyB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,OAAO,MAAM,IAAI,IAAI,CAAC,cAAc,CAAC;IACvC,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;SAC1G,CAAC;IACJ,CAAC;CACF"}
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/pxe",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.8",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"bin": "./dest/bin/index.js",
|
|
@@ -32,13 +32,13 @@
|
|
|
32
32
|
"rootDir": "./src"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@aztec/acir-simulator": "0.8.
|
|
36
|
-
"@aztec/circuits.js": "0.8.
|
|
37
|
-
"@aztec/ethereum": "0.8.
|
|
38
|
-
"@aztec/foundation": "0.8.
|
|
39
|
-
"@aztec/key-store": "0.8.
|
|
40
|
-
"@aztec/noir-compiler": "0.8.
|
|
41
|
-
"@aztec/types": "0.8.
|
|
35
|
+
"@aztec/acir-simulator": "0.8.8",
|
|
36
|
+
"@aztec/circuits.js": "0.8.8",
|
|
37
|
+
"@aztec/ethereum": "0.8.8",
|
|
38
|
+
"@aztec/foundation": "0.8.8",
|
|
39
|
+
"@aztec/key-store": "0.8.8",
|
|
40
|
+
"@aztec/noir-compiler": "0.8.8",
|
|
41
|
+
"@aztec/types": "0.8.8",
|
|
42
42
|
"koa": "^2.14.2",
|
|
43
43
|
"koa-router": "^12.0.0",
|
|
44
44
|
"lodash.omit": "^4.5.0",
|
package/src/config/index.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { INITIAL_L2_BLOCK_NUM } from '@aztec/types';
|
|
2
|
+
|
|
1
3
|
import { readFileSync } from 'fs';
|
|
2
4
|
import { dirname, resolve } from 'path';
|
|
3
5
|
import { fileURLToPath } from 'url';
|
|
@@ -6,20 +8,21 @@ import { fileURLToPath } from 'url';
|
|
|
6
8
|
* Configuration settings for the PXE Service.
|
|
7
9
|
*/
|
|
8
10
|
export interface PXEServiceConfig {
|
|
9
|
-
/**
|
|
10
|
-
* The interval to wait between polling for new blocks.
|
|
11
|
-
*/
|
|
11
|
+
/** The interval to wait between polling for new blocks. */
|
|
12
12
|
l2BlockPollingIntervalMS: number;
|
|
13
|
+
/** L2 block to start scanning from */
|
|
14
|
+
l2StartingBlock: number;
|
|
13
15
|
}
|
|
14
16
|
|
|
15
17
|
/**
|
|
16
18
|
* Creates an instance of PXEServiceConfig out of environment variables using sensible defaults for integration testing if not set.
|
|
17
19
|
*/
|
|
18
20
|
export function getPXEServiceConfig(): PXEServiceConfig {
|
|
19
|
-
const { PXE_BLOCK_POLLING_INTERVAL_MS } = process.env;
|
|
21
|
+
const { PXE_BLOCK_POLLING_INTERVAL_MS, PXE_L2_STARTING_BLOCK } = process.env;
|
|
20
22
|
|
|
21
23
|
return {
|
|
22
24
|
l2BlockPollingIntervalMS: PXE_BLOCK_POLLING_INTERVAL_MS ? +PXE_BLOCK_POLLING_INTERVAL_MS : 1000,
|
|
25
|
+
l2StartingBlock: PXE_L2_STARTING_BLOCK ? +PXE_L2_STARTING_BLOCK : INITIAL_L2_BLOCK_NUM,
|
|
23
26
|
};
|
|
24
27
|
}
|
|
25
28
|
|
|
@@ -3,6 +3,7 @@ import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/abis';
|
|
|
3
3
|
import { Grumpkin } from '@aztec/circuits.js/barretenberg';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
|
+
import { Timer } from '@aztec/foundation/timer';
|
|
6
7
|
import { AztecNode, KeyStore, L2BlockContext, L2BlockL2Logs, NoteSpendingInfo, PublicKey } from '@aztec/types';
|
|
7
8
|
|
|
8
9
|
import { Database, NoteSpendingInfoDao } from '../database/index.js';
|
|
@@ -22,16 +23,30 @@ interface ProcessedData {
|
|
|
22
23
|
noteSpendingInfoDaos: NoteSpendingInfoDao[];
|
|
23
24
|
}
|
|
24
25
|
|
|
26
|
+
/** Accumulated stats for a note processor. */
|
|
27
|
+
type NoteProcessorStats = {
|
|
28
|
+
/** How many notes have been seen and trial-decrypted. */
|
|
29
|
+
seen: number;
|
|
30
|
+
/** How many notes were successfully decrypted. */
|
|
31
|
+
decrypted: number;
|
|
32
|
+
/** How many notes failed processing. */
|
|
33
|
+
failed: number;
|
|
34
|
+
};
|
|
35
|
+
|
|
25
36
|
/**
|
|
26
37
|
* NoteProcessor is responsible for decrypting logs and converting them to notes via their originating contracts
|
|
27
38
|
* before storing them against their owner.
|
|
28
39
|
*/
|
|
29
40
|
export class NoteProcessor {
|
|
30
|
-
/**
|
|
31
|
-
* The latest L2 block number that the note processor has synchronized to.
|
|
32
|
-
*/
|
|
41
|
+
/** The latest L2 block number that the note processor has synchronized to. */
|
|
33
42
|
private syncedToBlock = 0;
|
|
34
43
|
|
|
44
|
+
/** Keeps track of processing time since an instance is created. */
|
|
45
|
+
public readonly timer: Timer = new Timer();
|
|
46
|
+
|
|
47
|
+
/** Stats accumulated for this processor. */
|
|
48
|
+
public readonly stats: NoteProcessorStats = { seen: 0, decrypted: 0, failed: 0 };
|
|
49
|
+
|
|
35
50
|
constructor(
|
|
36
51
|
/**
|
|
37
52
|
* The public counterpart to the private key to be used in note decryption.
|
|
@@ -40,9 +55,12 @@ export class NoteProcessor {
|
|
|
40
55
|
private keyStore: KeyStore,
|
|
41
56
|
private db: Database,
|
|
42
57
|
private node: AztecNode,
|
|
58
|
+
private startingBlock: number,
|
|
43
59
|
private simulator = getAcirSimulator(db, node, keyStore),
|
|
44
|
-
private log = createDebugLogger('aztec:
|
|
45
|
-
) {
|
|
60
|
+
private log = createDebugLogger('aztec:note_processor'),
|
|
61
|
+
) {
|
|
62
|
+
this.syncedToBlock = this.startingBlock - 1;
|
|
63
|
+
}
|
|
46
64
|
|
|
47
65
|
/**
|
|
48
66
|
* Check if the NoteProcessor is synchronized with the remote block number.
|
|
@@ -114,6 +132,7 @@ export class NoteProcessor {
|
|
|
114
132
|
const excludedIndices: Set<number> = new Set();
|
|
115
133
|
for (const functionLogs of txFunctionLogs) {
|
|
116
134
|
for (const logs of functionLogs.logs) {
|
|
135
|
+
this.stats.seen++;
|
|
117
136
|
const noteSpendingInfo = NoteSpendingInfo.fromEncryptedBuffer(logs, privateKey, curve);
|
|
118
137
|
if (noteSpendingInfo) {
|
|
119
138
|
// We have successfully decrypted the data.
|
|
@@ -134,7 +153,9 @@ export class NoteProcessor {
|
|
|
134
153
|
index,
|
|
135
154
|
publicKey: this.publicKey,
|
|
136
155
|
});
|
|
156
|
+
this.stats.decrypted++;
|
|
137
157
|
} catch (e) {
|
|
158
|
+
this.stats.failed++;
|
|
138
159
|
this.log.warn(`Could not process note because of "${e}". Skipping note...`);
|
|
139
160
|
}
|
|
140
161
|
}
|
|
@@ -32,7 +32,6 @@ import {
|
|
|
32
32
|
DeployedContract,
|
|
33
33
|
ExtendedContractData,
|
|
34
34
|
FunctionCall,
|
|
35
|
-
INITIAL_L2_BLOCK_NUM,
|
|
36
35
|
KeyStore,
|
|
37
36
|
L2Block,
|
|
38
37
|
L2BlockL2Logs,
|
|
@@ -93,7 +92,8 @@ export class PXEService implements PXE {
|
|
|
93
92
|
* @returns A promise that resolves when the server has started successfully.
|
|
94
93
|
*/
|
|
95
94
|
public async start() {
|
|
96
|
-
|
|
95
|
+
const { l2BlockPollingIntervalMS, l2StartingBlock } = this.config;
|
|
96
|
+
await this.synchronizer.start(l2StartingBlock, 1, l2BlockPollingIntervalMS);
|
|
97
97
|
const info = await this.getNodeInfo();
|
|
98
98
|
this.log.info(`Started PXE connected to chain ${info.chainId} version ${info.protocolVersion}`);
|
|
99
99
|
}
|
|
@@ -114,17 +114,18 @@ export class PXEService implements PXE {
|
|
|
114
114
|
return this.db.addAuthWitness(witness.requestHash, witness.witness);
|
|
115
115
|
}
|
|
116
116
|
|
|
117
|
-
public async registerAccount(privKey: GrumpkinPrivateKey, partialAddress: PartialAddress) {
|
|
117
|
+
public async registerAccount(privKey: GrumpkinPrivateKey, partialAddress: PartialAddress): Promise<CompleteAddress> {
|
|
118
118
|
const completeAddress = await CompleteAddress.fromPrivateKeyAndPartialAddress(privKey, partialAddress);
|
|
119
119
|
const wasAdded = await this.db.addCompleteAddress(completeAddress);
|
|
120
120
|
if (wasAdded) {
|
|
121
121
|
const pubKey = this.keyStore.addAccount(privKey);
|
|
122
|
-
this.synchronizer.addAccount(pubKey, this.keyStore);
|
|
122
|
+
this.synchronizer.addAccount(pubKey, this.keyStore, this.config.l2StartingBlock);
|
|
123
123
|
this.log.info(`Registered account ${completeAddress.address.toString()}`);
|
|
124
124
|
this.log.debug(`Registered account\n ${completeAddress.toReadableString()}`);
|
|
125
125
|
} else {
|
|
126
126
|
this.log.info(`Account:\n "${completeAddress.address.toString()}"\n already registered.`);
|
|
127
127
|
}
|
|
128
|
+
return completeAddress;
|
|
128
129
|
}
|
|
129
130
|
|
|
130
131
|
public async getRegisteredAccounts(): Promise<CompleteAddress[]> {
|
|
@@ -647,4 +648,8 @@ export class PXEService implements PXE {
|
|
|
647
648
|
public getSyncStatus() {
|
|
648
649
|
return Promise.resolve(this.synchronizer.getSyncStatus());
|
|
649
650
|
}
|
|
651
|
+
|
|
652
|
+
public getKeyStore() {
|
|
653
|
+
return this.keyStore;
|
|
654
|
+
}
|
|
650
655
|
}
|
|
@@ -2,7 +2,7 @@ import { AztecAddress, CircuitsWasm, Fr, HistoricBlockData, PublicKey } from '@a
|
|
|
2
2
|
import { computeGlobalsHash } from '@aztec/circuits.js/abis';
|
|
3
3
|
import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { InterruptableSleep } from '@aztec/foundation/sleep';
|
|
5
|
-
import { AztecNode, INITIAL_L2_BLOCK_NUM, KeyStore, L2BlockContext, LogType } from '@aztec/types';
|
|
5
|
+
import { AztecNode, INITIAL_L2_BLOCK_NUM, KeyStore, L2BlockContext, L2BlockL2Logs, LogType } from '@aztec/types';
|
|
6
6
|
|
|
7
7
|
import { Database } from '../database/index.js';
|
|
8
8
|
import { NoteProcessor } from '../note_processor/index.js';
|
|
@@ -119,9 +119,8 @@ export class Synchronizer {
|
|
|
119
119
|
const latestBlock = blockContexts[blockContexts.length - 1];
|
|
120
120
|
await this.setBlockDataFromBlock(latestBlock);
|
|
121
121
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
);
|
|
122
|
+
const logCount = L2BlockL2Logs.getTotalLogCount(encryptedLogs);
|
|
123
|
+
this.log(`Forwarding ${logCount} encrypted logs and blocks to ${this.noteProcessors.length} note processors`);
|
|
125
124
|
for (const noteProcessor of this.noteProcessors) {
|
|
126
125
|
await noteProcessor.process(blockContexts, encryptedLogs);
|
|
127
126
|
}
|
|
@@ -173,11 +172,18 @@ export class Synchronizer {
|
|
|
173
172
|
|
|
174
173
|
const blockContexts = blocks.map(block => new L2BlockContext(block));
|
|
175
174
|
|
|
176
|
-
|
|
175
|
+
const logCount = L2BlockL2Logs.getTotalLogCount(encryptedLogs);
|
|
176
|
+
this.log(`Forwarding ${logCount} encrypted logs and blocks to note processor in catch up mode`);
|
|
177
177
|
await noteProcessor.process(blockContexts, encryptedLogs);
|
|
178
178
|
|
|
179
179
|
if (noteProcessor.status.syncedToBlock === this.synchedToBlock) {
|
|
180
180
|
// Note processor caught up, move it to `noteProcessors` from `noteProcessorsToCatchUp`.
|
|
181
|
+
this.log(`Note processor for ${noteProcessor.publicKey.toString()} has caught up`, {
|
|
182
|
+
eventName: 'note-processor-caught-up',
|
|
183
|
+
publicKey: noteProcessor.publicKey.toString(),
|
|
184
|
+
duration: noteProcessor.timer.ms(),
|
|
185
|
+
...noteProcessor.stats,
|
|
186
|
+
});
|
|
181
187
|
this.noteProcessorsToCatchUp.shift();
|
|
182
188
|
this.noteProcessors.push(noteProcessor);
|
|
183
189
|
}
|
|
@@ -228,15 +234,14 @@ export class Synchronizer {
|
|
|
228
234
|
*
|
|
229
235
|
* @param publicKey - The public key for the account.
|
|
230
236
|
* @param keyStore - The key store.
|
|
237
|
+
* @param startingBlock - The block where to start scanning for notes for this accounts.
|
|
231
238
|
* @returns A promise that resolves once the account is added to the Synchronizer.
|
|
232
239
|
*/
|
|
233
|
-
public addAccount(publicKey: PublicKey, keyStore: KeyStore) {
|
|
240
|
+
public addAccount(publicKey: PublicKey, keyStore: KeyStore, startingBlock: number) {
|
|
234
241
|
const processor = this.noteProcessors.find(x => x.publicKey.equals(publicKey));
|
|
235
|
-
if (processor)
|
|
236
|
-
return;
|
|
237
|
-
}
|
|
242
|
+
if (processor) return;
|
|
238
243
|
|
|
239
|
-
this.noteProcessorsToCatchUp.push(new NoteProcessor(publicKey, keyStore, this.db, this.node));
|
|
244
|
+
this.noteProcessorsToCatchUp.push(new NoteProcessor(publicKey, keyStore, this.db, this.node, startingBlock));
|
|
240
245
|
}
|
|
241
246
|
|
|
242
247
|
/**
|