@aztec/aztec-node 1.0.0-nightly.20250613 → 1.0.0-nightly.20250614
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.
|
@@ -5,7 +5,7 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
5
5
|
import { type Logger } from '@aztec/foundation/log';
|
|
6
6
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
7
7
|
import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
|
|
8
|
-
import { type P2P } from '@aztec/p2p';
|
|
8
|
+
import { type P2P, type P2PClientDeps } from '@aztec/p2p';
|
|
9
9
|
import { SequencerClient, type SequencerPublisher } from '@aztec/sequencer-client';
|
|
10
10
|
import { EpochPruneWatcher, SlasherClient } from '@aztec/slasher';
|
|
11
11
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
@@ -16,6 +16,7 @@ import type { AztecNode, AztecNodeAdmin, GetContractClassLogsResponse, GetPublic
|
|
|
16
16
|
import { type ClientProtocolCircuitVerifier, type L2LogsSource, type ProverConfig, type SequencerConfig, type Service, type WorldStateSyncStatus, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
17
17
|
import type { LogFilter, PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs';
|
|
18
18
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
19
|
+
import { P2PClientType } from '@aztec/stdlib/p2p';
|
|
19
20
|
import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
|
|
20
21
|
import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
|
|
21
22
|
import { type BlockHeader, type GlobalVariableBuilder as GlobalVariableBuilderInterface, type IndexedTxEffect, PublicSimulationOutput, Tx, type TxHash, TxReceipt, type TxValidationResult } from '@aztec/stdlib/tx';
|
|
@@ -64,8 +65,10 @@ export declare class AztecNodeService implements AztecNode, AztecNodeAdmin, Trac
|
|
|
64
65
|
publisher?: SequencerPublisher;
|
|
65
66
|
dateProvider?: DateProvider;
|
|
66
67
|
blobSinkClient?: BlobSinkClientInterface;
|
|
68
|
+
p2pClientDeps?: P2PClientDeps<P2PClientType.Full>;
|
|
67
69
|
}, options?: {
|
|
68
70
|
prefilledPublicData?: PublicDataTreeLeaf[];
|
|
71
|
+
dontStartSequencer?: boolean;
|
|
69
72
|
}): Promise<AztecNodeService>;
|
|
70
73
|
/**
|
|
71
74
|
* Returns the sequencer client instance.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EACL,cAAc,EAEd,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAEL,KAAK,mBAAmB,EAKzB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAS,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EACL,cAAc,EAEd,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAEL,KAAK,mBAAmB,EAKzB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAS,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EACL,KAAK,GAAG,EACR,KAAK,aAAa,EAInB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAGL,eAAe,EACf,KAAK,kBAAkB,EAExB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAgB,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5G,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,2BAA2B,EAC3B,QAAQ,EACR,yBAAyB,EAC1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EACV,SAAS,EACT,cAAc,EACd,4BAA4B,EAC5B,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,OAAO,EACZ,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAE5B,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAyB,kBAAkB,EAA8B,MAAM,qBAAqB,CAAC;AACjH,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAClG,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,qBAAqB,IAAI,8BAA8B,EAC5D,KAAK,eAAe,EACpB,sBAAsB,EACtB,EAAE,EACF,KAAK,MAAM,EACX,SAAS,EAET,KAAK,kBAAkB,EACxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD;;GAEG;AACH,qBAAa,gBAAiB,YAAW,SAAS,EAAE,cAAc,EAAE,SAAS;;IAYzE,SAAS,CAAC,MAAM,EAAE,eAAe;IACjC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG;IACjC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,YAAY;IAC3C,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IACzD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;IAC3D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;IACjE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS;IACzD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS;IAC3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,GAAG,SAAS;IAC3D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS;IACnE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM;IACpC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAClC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,8BAA8B;IACxE,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IA5Bb,OAAO,CAAC,OAAO,CAAc;IAG7B,OAAO,CAAC,mBAAmB,CAAS;IAGpC,OAAO,CAAC,OAAO,CAAkC;IAEjD,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGnB,MAAM,EAAE,eAAe,EACd,SAAS,EAAE,GAAG,EACd,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,EAC7C,UAAU,EAAE,YAAY,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,mBAAmB,EAAE,mBAAmB,EACxC,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,EAAE,eAAe,GAAG,SAAS,EACtC,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,EACxC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,EAChD,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,qBAAqB,EAAE,8BAA8B,EACvD,cAAc,EAAE,MAAM,EAC/B,aAAa,EAAE,6BAA6B,EAC5C,SAAS,GAAE,eAAsC,EACjD,GAAG,SAAuB;IAUvB,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAK9D,SAAS;IAIhB;;;;OAIG;WACiB,aAAa,CAC/B,WAAW,EAAE,eAAe,EAC5B,IAAI,GAAE;QACJ,SAAS,CAAC,EAAE,eAAe,CAAC;QAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,kBAAkB,CAAC;QAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;QAC5B,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,aAAa,CAAC,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;KAC9C,EACN,OAAO,GAAE;QACP,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;QAC3C,kBAAkB,CAAC,EAAE,OAAO,CAAC;KACzB,GACL,OAAO,CAAC,gBAAgB,CAAC;IA6M5B;;;OAGG;IACI,YAAY,IAAI,eAAe,GAAG,SAAS;IAI3C,cAAc,IAAI,aAAa;IAI/B,qBAAqB,IAAI,kBAAkB;IAI3C,MAAM,IAAI,GAAG;IAIpB;;;OAGG;IACI,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAItD,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAInD;;;OAGG;IACI,OAAO;IAID,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAsB7C;;;;OAIG;IACU,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAInE;;;;;OAKG;IACU,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIzF;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAInD;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpD;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC;;;OAGG;IACI,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC;;;OAGG;IACI,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAIlE,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI3F;;;;;OAKG;IACI,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAIzE;;;;;;OAMG;IACI,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;IAIjF;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhE;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC;IAI9E;;;OAGG;IACU,MAAM,CAAC,EAAE,EAAE,EAAE;IAqBb,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAkBtD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAIxE;;OAEG;IACU,IAAI;IAejB;;;;;OAKG;IACI,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAI5D,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAI3D;;;;OAIG;IACU,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAI5D;;;;;;;OAOG;IACU,iBAAiB,CAC5B,WAAW,EAAE,aAAa,EAC1B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,EAAE,EAAE,GACf,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;IA2D3C;;;;;OAKG;IACU,uBAAuB,CAClC,WAAW,EAAE,aAAa,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAKrD;;;;;OAKG;IACU,sBAAsB,CACjC,WAAW,EAAE,aAAa,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAKxC,2BAA2B,CACtC,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,EAAE,GACV,OAAO,CAAC,iBAAiB,CAAC,OAAO,cAAc,CAAC,GAAG,SAAS,CAAC;IAWnD,4BAA4B,CACvC,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,EAAE,GACX,OAAO,CAAC,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,GAAG,SAAS,CAAC;IAWvE;;;;;OAKG;IACU,iCAAiC,CAC5C,WAAW,EAAE,aAAa,EAC1B,aAAa,EAAE,EAAE,GAChB,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,GAAG,SAAS,CAAC;IAa9E;;;;OAIG;IACU,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvE;;;;OAIG;IACU,iBAAiB,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;IAKvF;;;;;OAKG;IACU,qBAAqB,CAChC,WAAW,EAAE,aAAa,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,CAAC,OAAO,cAAc,CAAC,CAAC;IAK9C;;;;;OAKG;IACU,wBAAwB,CACnC,WAAW,EAAE,aAAa,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,CAAC,OAAO,uBAAuB,CAAC,CAAC;IAKvD;;;;;OAKG;IACU,6BAA6B,CACxC,WAAW,EAAE,aAAa,EAC1B,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAsBlD;;;;;;;;;;;;;OAaG;IACU,gCAAgC,CAC3C,WAAW,EAAE,aAAa,EAC1B,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAmB5C,oBAAoB,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAkB5G;;;;;;;;;;OAUG;IACU,kBAAkB,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAe1G;;;OAGG;IACU,cAAc,CAAC,WAAW,GAAE,aAAwB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAMpG;;;QAGI;IAIS,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,kBAAkB,UAAQ,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAqExF,SAAS,CACpB,EAAE,EAAE,EAAE,EACN,EAAE,YAAY,EAAE,kBAAkB,EAAE,GAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAC;QAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAO,GAClG,OAAO,CAAC,kBAAkB,CAAC;IAgBjB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,GAAG,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/E,4BAA4B,IAAI,OAAO,CAAC,yBAAyB,CAAC;IASlE,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQzB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC;IAIxC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCpD,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAMhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CA6CnC"}
|
|
@@ -157,7 +157,7 @@ import { NodeMetrics } from './node_metrics.js';
|
|
|
157
157
|
dateProvider
|
|
158
158
|
});
|
|
159
159
|
// create the tx pool and the p2p client, which will need the l2 block source
|
|
160
|
-
const p2pClient = await createP2PClient(P2PClientType.Full, config, archiver, proofVerifier, worldStateSynchronizer, epochCache, packageVersion, telemetry);
|
|
160
|
+
const p2pClient = await createP2PClient(P2PClientType.Full, config, archiver, proofVerifier, worldStateSynchronizer, epochCache, packageVersion, telemetry, deps.p2pClientDeps);
|
|
161
161
|
// Start world state and wait for it to sync to the archiver.
|
|
162
162
|
await worldStateSynchronizer.start();
|
|
163
163
|
// Start p2p. Note that it depends on world state to be running.
|
|
@@ -229,6 +229,10 @@ import { NodeMetrics } from './node_metrics.js';
|
|
|
229
229
|
blobSinkClient
|
|
230
230
|
});
|
|
231
231
|
}
|
|
232
|
+
if (!options.dontStartSequencer && sequencer) {
|
|
233
|
+
await sequencer.start();
|
|
234
|
+
log.verbose(`Sequencer started`);
|
|
235
|
+
}
|
|
232
236
|
return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, new GlobalVariableBuilder(config), packageVersion, proofVerifier, telemetry, log);
|
|
233
237
|
}
|
|
234
238
|
/**
|
|
@@ -526,23 +530,17 @@ import { NodeMetrics } from './node_metrics.js';
|
|
|
526
530
|
}
|
|
527
531
|
async getArchiveMembershipWitness(blockNumber, archive) {
|
|
528
532
|
const committedDb = await this.#getWorldState(blockNumber);
|
|
529
|
-
const [
|
|
533
|
+
const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.ARCHIVE, [
|
|
530
534
|
archive
|
|
531
535
|
]);
|
|
532
|
-
|
|
533
|
-
return undefined;
|
|
534
|
-
}
|
|
535
|
-
return MembershipWitness.fromSiblingPath(index, await committedDb.getSiblingPath(MerkleTreeId.ARCHIVE, index));
|
|
536
|
+
return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
|
|
536
537
|
}
|
|
537
538
|
async getNoteHashMembershipWitness(blockNumber, noteHash) {
|
|
538
539
|
const committedDb = await this.#getWorldState(blockNumber);
|
|
539
|
-
const [
|
|
540
|
+
const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.NOTE_HASH_TREE, [
|
|
540
541
|
noteHash
|
|
541
542
|
]);
|
|
542
|
-
|
|
543
|
-
return undefined;
|
|
544
|
-
}
|
|
545
|
-
return MembershipWitness.fromSiblingPath(index, await committedDb.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, index));
|
|
543
|
+
return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
|
|
546
544
|
}
|
|
547
545
|
/**
|
|
548
546
|
* Returns the index and a sibling path for a leaf in the committed l1 to l2 data tree.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec-node",
|
|
3
|
-
"version": "1.0.0-nightly.
|
|
3
|
+
"version": "1.0.0-nightly.20250614",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -62,28 +62,28 @@
|
|
|
62
62
|
"testEnvironment": "../../foundation/src/jest/env.mjs"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@aztec/archiver": "1.0.0-nightly.
|
|
66
|
-
"@aztec/bb-prover": "1.0.0-nightly.
|
|
67
|
-
"@aztec/blob-sink": "1.0.0-nightly.
|
|
68
|
-
"@aztec/constants": "1.0.0-nightly.
|
|
69
|
-
"@aztec/epoch-cache": "1.0.0-nightly.
|
|
70
|
-
"@aztec/ethereum": "1.0.0-nightly.
|
|
71
|
-
"@aztec/foundation": "1.0.0-nightly.
|
|
72
|
-
"@aztec/kv-store": "1.0.0-nightly.
|
|
73
|
-
"@aztec/l1-artifacts": "1.0.0-nightly.
|
|
74
|
-
"@aztec/merkle-tree": "1.0.0-nightly.
|
|
75
|
-
"@aztec/node-lib": "1.0.0-nightly.
|
|
76
|
-
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.
|
|
77
|
-
"@aztec/p2p": "1.0.0-nightly.
|
|
78
|
-
"@aztec/protocol-contracts": "1.0.0-nightly.
|
|
79
|
-
"@aztec/prover-client": "1.0.0-nightly.
|
|
80
|
-
"@aztec/sequencer-client": "1.0.0-nightly.
|
|
81
|
-
"@aztec/simulator": "1.0.0-nightly.
|
|
82
|
-
"@aztec/slasher": "1.0.0-nightly.
|
|
83
|
-
"@aztec/stdlib": "1.0.0-nightly.
|
|
84
|
-
"@aztec/telemetry-client": "1.0.0-nightly.
|
|
85
|
-
"@aztec/validator-client": "1.0.0-nightly.
|
|
86
|
-
"@aztec/world-state": "1.0.0-nightly.
|
|
65
|
+
"@aztec/archiver": "1.0.0-nightly.20250614",
|
|
66
|
+
"@aztec/bb-prover": "1.0.0-nightly.20250614",
|
|
67
|
+
"@aztec/blob-sink": "1.0.0-nightly.20250614",
|
|
68
|
+
"@aztec/constants": "1.0.0-nightly.20250614",
|
|
69
|
+
"@aztec/epoch-cache": "1.0.0-nightly.20250614",
|
|
70
|
+
"@aztec/ethereum": "1.0.0-nightly.20250614",
|
|
71
|
+
"@aztec/foundation": "1.0.0-nightly.20250614",
|
|
72
|
+
"@aztec/kv-store": "1.0.0-nightly.20250614",
|
|
73
|
+
"@aztec/l1-artifacts": "1.0.0-nightly.20250614",
|
|
74
|
+
"@aztec/merkle-tree": "1.0.0-nightly.20250614",
|
|
75
|
+
"@aztec/node-lib": "1.0.0-nightly.20250614",
|
|
76
|
+
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250614",
|
|
77
|
+
"@aztec/p2p": "1.0.0-nightly.20250614",
|
|
78
|
+
"@aztec/protocol-contracts": "1.0.0-nightly.20250614",
|
|
79
|
+
"@aztec/prover-client": "1.0.0-nightly.20250614",
|
|
80
|
+
"@aztec/sequencer-client": "1.0.0-nightly.20250614",
|
|
81
|
+
"@aztec/simulator": "1.0.0-nightly.20250614",
|
|
82
|
+
"@aztec/slasher": "1.0.0-nightly.20250614",
|
|
83
|
+
"@aztec/stdlib": "1.0.0-nightly.20250614",
|
|
84
|
+
"@aztec/telemetry-client": "1.0.0-nightly.20250614",
|
|
85
|
+
"@aztec/validator-client": "1.0.0-nightly.20250614",
|
|
86
|
+
"@aztec/world-state": "1.0.0-nightly.20250614",
|
|
87
87
|
"koa": "^2.16.1",
|
|
88
88
|
"koa-router": "^12.0.0",
|
|
89
89
|
"tslib": "^2.4.0",
|
package/src/aztec-node/server.ts
CHANGED
|
@@ -29,7 +29,13 @@ import { count } from '@aztec/foundation/string';
|
|
|
29
29
|
import { DateProvider, Timer } from '@aztec/foundation/timer';
|
|
30
30
|
import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
|
|
31
31
|
import { trySnapshotSync, uploadSnapshot } from '@aztec/node-lib/actions';
|
|
32
|
-
import {
|
|
32
|
+
import {
|
|
33
|
+
type P2P,
|
|
34
|
+
type P2PClientDeps,
|
|
35
|
+
TxCollector,
|
|
36
|
+
createP2PClient,
|
|
37
|
+
getDefaultAllowedSetupFunctions,
|
|
38
|
+
} from '@aztec/p2p';
|
|
33
39
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
34
40
|
import {
|
|
35
41
|
BlockBuilder,
|
|
@@ -167,9 +173,11 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
167
173
|
publisher?: SequencerPublisher;
|
|
168
174
|
dateProvider?: DateProvider;
|
|
169
175
|
blobSinkClient?: BlobSinkClientInterface;
|
|
176
|
+
p2pClientDeps?: P2PClientDeps<P2PClientType.Full>;
|
|
170
177
|
} = {},
|
|
171
178
|
options: {
|
|
172
179
|
prefilledPublicData?: PublicDataTreeLeaf[];
|
|
180
|
+
dontStartSequencer?: boolean;
|
|
173
181
|
} = {},
|
|
174
182
|
): Promise<AztecNodeService> {
|
|
175
183
|
const config = { ...inputConfig }; // Copy the config so we dont mutate the input object
|
|
@@ -248,6 +256,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
248
256
|
epochCache,
|
|
249
257
|
packageVersion,
|
|
250
258
|
telemetry,
|
|
259
|
+
deps.p2pClientDeps,
|
|
251
260
|
);
|
|
252
261
|
|
|
253
262
|
// Start world state and wait for it to sync to the archiver.
|
|
@@ -348,6 +357,11 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
348
357
|
});
|
|
349
358
|
}
|
|
350
359
|
|
|
360
|
+
if (!options.dontStartSequencer && sequencer) {
|
|
361
|
+
await sequencer.start();
|
|
362
|
+
log.verbose(`Sequencer started`);
|
|
363
|
+
}
|
|
364
|
+
|
|
351
365
|
return new AztecNodeService(
|
|
352
366
|
config,
|
|
353
367
|
p2pClient,
|
|
@@ -747,11 +761,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
747
761
|
archive: Fr,
|
|
748
762
|
): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined> {
|
|
749
763
|
const committedDb = await this.#getWorldState(blockNumber);
|
|
750
|
-
const [
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
return
|
|
764
|
+
const [pathAndIndex] = await committedDb.findSiblingPaths<MerkleTreeId.ARCHIVE, typeof ARCHIVE_HEIGHT>(
|
|
765
|
+
MerkleTreeId.ARCHIVE,
|
|
766
|
+
[archive],
|
|
767
|
+
);
|
|
768
|
+
return pathAndIndex === undefined
|
|
769
|
+
? undefined
|
|
770
|
+
: MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
|
|
755
771
|
}
|
|
756
772
|
|
|
757
773
|
public async getNoteHashMembershipWitness(
|
|
@@ -759,14 +775,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
759
775
|
noteHash: Fr,
|
|
760
776
|
): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT> | undefined> {
|
|
761
777
|
const committedDb = await this.#getWorldState(blockNumber);
|
|
762
|
-
const [
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
return
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
);
|
|
778
|
+
const [pathAndIndex] = await committedDb.findSiblingPaths<
|
|
779
|
+
MerkleTreeId.NOTE_HASH_TREE,
|
|
780
|
+
typeof NOTE_HASH_TREE_HEIGHT
|
|
781
|
+
>(MerkleTreeId.NOTE_HASH_TREE, [noteHash]);
|
|
782
|
+
return pathAndIndex === undefined
|
|
783
|
+
? undefined
|
|
784
|
+
: MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
|
|
770
785
|
}
|
|
771
786
|
|
|
772
787
|
/**
|