@aztec/aztec-node 1.0.0-nightly.20250617 → 1.0.0-nightly.20250619
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/aztec-node/server.d.ts +1 -1
- package/dest/aztec-node/server.d.ts.map +1 -1
- package/dest/aztec-node/server.js +18 -19
- package/package.json +29 -26
- package/src/aztec-node/server.ts +32 -38
|
@@ -9,7 +9,7 @@ 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';
|
|
12
|
-
import type
|
|
12
|
+
import { type InBlock, type L2Block, type L2BlockNumber, type L2BlockSource, type PublishedL2Block } from '@aztec/stdlib/block';
|
|
13
13
|
import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress, NodeInfo, ProtocolContractAddresses } from '@aztec/stdlib/contract';
|
|
14
14
|
import type { GasFees } from '@aztec/stdlib/gas';
|
|
15
15
|
import type { AztecNode, AztecNodeAdmin, GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
|
|
@@ -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,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,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ import { BlockBuilder, GlobalVariableBuilder, SequencerClient, createValidatorFo
|
|
|
27
27
|
import { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
28
28
|
import { EpochPruneWatcher, SlasherClient } from '@aztec/slasher';
|
|
29
29
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
30
|
+
import { L2BlockHash } from '@aztec/stdlib/block';
|
|
30
31
|
import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
|
|
31
32
|
import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
32
33
|
import { P2PClientType } from '@aztec/stdlib/p2p';
|
|
@@ -204,7 +205,7 @@ import { NodeMetrics } from './node_metrics.js';
|
|
|
204
205
|
let l1Client;
|
|
205
206
|
if (config.publisherPrivateKey) {
|
|
206
207
|
// we can still run a slasher client if a private key is provided
|
|
207
|
-
l1Client = createExtendedL1Client(config.l1RpcUrls, config.publisherPrivateKey, ethereumChain.chainInfo);
|
|
208
|
+
l1Client = createExtendedL1Client(config.l1RpcUrls, config.publisherPrivateKey.getValue(), ethereumChain.chainInfo);
|
|
208
209
|
l1TxUtils = new L1TxUtilsWithBlobs(l1Client, log, config);
|
|
209
210
|
slasherClient = await SlasherClient.new(config, config.l1Contracts, l1TxUtils, watchers, dateProvider);
|
|
210
211
|
slasherClient.start();
|
|
@@ -503,13 +504,13 @@ import { NodeMetrics } from './node_metrics.js';
|
|
|
503
504
|
return undefined;
|
|
504
505
|
}
|
|
505
506
|
const blockHashIndex = uniqueBlockNumbers.indexOf(blockNumber);
|
|
506
|
-
const blockHash = blockHashes[blockHashIndex]
|
|
507
|
+
const blockHash = blockHashes[blockHashIndex];
|
|
507
508
|
if (!blockHash) {
|
|
508
509
|
return undefined;
|
|
509
510
|
}
|
|
510
511
|
return {
|
|
511
512
|
l2BlockNumber: Number(blockNumber),
|
|
512
|
-
l2BlockHash: blockHash,
|
|
513
|
+
l2BlockHash: L2BlockHash.fromField(blockHash),
|
|
513
514
|
data: index
|
|
514
515
|
};
|
|
515
516
|
});
|
|
@@ -552,15 +553,17 @@ import { NodeMetrics } from './node_metrics.js';
|
|
|
552
553
|
* @param l1ToL2Message - The l1ToL2Message to get the index / sibling path for.
|
|
553
554
|
* @returns A tuple of the index and the sibling path of the L1ToL2Message (undefined if not found).
|
|
554
555
|
*/ async getL1ToL2MessageMembershipWitness(blockNumber, l1ToL2Message) {
|
|
555
|
-
const
|
|
556
|
-
|
|
556
|
+
const db = await this.#getWorldState(blockNumber);
|
|
557
|
+
const [witness] = await db.findSiblingPaths(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
|
|
558
|
+
l1ToL2Message
|
|
559
|
+
]);
|
|
560
|
+
if (!witness) {
|
|
557
561
|
return undefined;
|
|
558
562
|
}
|
|
559
|
-
|
|
560
|
-
const siblingPath = await committedDb.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, index);
|
|
563
|
+
// REFACTOR: Return a MembershipWitness object
|
|
561
564
|
return [
|
|
562
|
-
index,
|
|
563
|
-
|
|
565
|
+
witness.index,
|
|
566
|
+
witness.path
|
|
564
567
|
];
|
|
565
568
|
}
|
|
566
569
|
/**
|
|
@@ -603,22 +606,18 @@ import { NodeMetrics } from './node_metrics.js';
|
|
|
603
606
|
* @returns The nullifier membership witness (if found).
|
|
604
607
|
*/ async getNullifierMembershipWitness(blockNumber, nullifier) {
|
|
605
608
|
const db = await this.#getWorldState(blockNumber);
|
|
606
|
-
const
|
|
609
|
+
const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [
|
|
607
610
|
nullifier.toBuffer()
|
|
608
|
-
])
|
|
609
|
-
if (!
|
|
611
|
+
]);
|
|
612
|
+
if (!witness) {
|
|
610
613
|
return undefined;
|
|
611
614
|
}
|
|
612
|
-
const
|
|
613
|
-
const
|
|
614
|
-
const [leafPreimage, siblingPath] = await Promise.all([
|
|
615
|
-
leafPreimagePromise,
|
|
616
|
-
siblingPathPromise
|
|
617
|
-
]);
|
|
615
|
+
const { index, path } = witness;
|
|
616
|
+
const leafPreimage = await db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
|
|
618
617
|
if (!leafPreimage) {
|
|
619
618
|
return undefined;
|
|
620
619
|
}
|
|
621
|
-
return new NullifierMembershipWitness(
|
|
620
|
+
return new NullifierMembershipWitness(index, leafPreimage, path);
|
|
622
621
|
}
|
|
623
622
|
/**
|
|
624
623
|
* Returns a low nullifier membership witness for a given nullifier at a given block.
|
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.20250619",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -59,31 +59,34 @@
|
|
|
59
59
|
"setupFiles": [
|
|
60
60
|
"../../foundation/src/jest/setup.mjs"
|
|
61
61
|
],
|
|
62
|
-
"testEnvironment": "../../foundation/src/jest/env.mjs"
|
|
62
|
+
"testEnvironment": "../../foundation/src/jest/env.mjs",
|
|
63
|
+
"setupFilesAfterEnv": [
|
|
64
|
+
"../../foundation/src/jest/setupAfterEnv.mjs"
|
|
65
|
+
]
|
|
63
66
|
},
|
|
64
67
|
"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.
|
|
68
|
+
"@aztec/archiver": "1.0.0-nightly.20250619",
|
|
69
|
+
"@aztec/bb-prover": "1.0.0-nightly.20250619",
|
|
70
|
+
"@aztec/blob-sink": "1.0.0-nightly.20250619",
|
|
71
|
+
"@aztec/constants": "1.0.0-nightly.20250619",
|
|
72
|
+
"@aztec/epoch-cache": "1.0.0-nightly.20250619",
|
|
73
|
+
"@aztec/ethereum": "1.0.0-nightly.20250619",
|
|
74
|
+
"@aztec/foundation": "1.0.0-nightly.20250619",
|
|
75
|
+
"@aztec/kv-store": "1.0.0-nightly.20250619",
|
|
76
|
+
"@aztec/l1-artifacts": "1.0.0-nightly.20250619",
|
|
77
|
+
"@aztec/merkle-tree": "1.0.0-nightly.20250619",
|
|
78
|
+
"@aztec/node-lib": "1.0.0-nightly.20250619",
|
|
79
|
+
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250619",
|
|
80
|
+
"@aztec/p2p": "1.0.0-nightly.20250619",
|
|
81
|
+
"@aztec/protocol-contracts": "1.0.0-nightly.20250619",
|
|
82
|
+
"@aztec/prover-client": "1.0.0-nightly.20250619",
|
|
83
|
+
"@aztec/sequencer-client": "1.0.0-nightly.20250619",
|
|
84
|
+
"@aztec/simulator": "1.0.0-nightly.20250619",
|
|
85
|
+
"@aztec/slasher": "1.0.0-nightly.20250619",
|
|
86
|
+
"@aztec/stdlib": "1.0.0-nightly.20250619",
|
|
87
|
+
"@aztec/telemetry-client": "1.0.0-nightly.20250619",
|
|
88
|
+
"@aztec/validator-client": "1.0.0-nightly.20250619",
|
|
89
|
+
"@aztec/world-state": "1.0.0-nightly.20250619",
|
|
87
90
|
"koa": "^2.16.1",
|
|
88
91
|
"koa-router": "^12.0.0",
|
|
89
92
|
"tslib": "^2.4.0",
|
|
@@ -91,10 +94,10 @@
|
|
|
91
94
|
},
|
|
92
95
|
"devDependencies": {
|
|
93
96
|
"@jest/globals": "^30.0.0",
|
|
94
|
-
"@types/jest": "^
|
|
97
|
+
"@types/jest": "^30.0.0",
|
|
95
98
|
"@types/node": "^22.15.17",
|
|
96
99
|
"jest": "^30.0.0",
|
|
97
|
-
"jest-mock-extended": "^
|
|
100
|
+
"jest-mock-extended": "^4.0.0",
|
|
98
101
|
"ts-node": "^10.9.1",
|
|
99
102
|
"typescript": "^5.3.3"
|
|
100
103
|
},
|
package/src/aztec-node/server.ts
CHANGED
|
@@ -47,7 +47,14 @@ import {
|
|
|
47
47
|
import { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
48
48
|
import { EpochPruneWatcher, SlasherClient, type Watcher } from '@aztec/slasher';
|
|
49
49
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
50
|
-
import
|
|
50
|
+
import {
|
|
51
|
+
type InBlock,
|
|
52
|
+
type L2Block,
|
|
53
|
+
L2BlockHash,
|
|
54
|
+
type L2BlockNumber,
|
|
55
|
+
type L2BlockSource,
|
|
56
|
+
type PublishedL2Block,
|
|
57
|
+
} from '@aztec/stdlib/block';
|
|
51
58
|
import type {
|
|
52
59
|
ContractClassPublic,
|
|
53
60
|
ContractDataSource,
|
|
@@ -329,7 +336,11 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
329
336
|
|
|
330
337
|
if (config.publisherPrivateKey) {
|
|
331
338
|
// we can still run a slasher client if a private key is provided
|
|
332
|
-
l1Client = createExtendedL1Client(
|
|
339
|
+
l1Client = createExtendedL1Client(
|
|
340
|
+
config.l1RpcUrls,
|
|
341
|
+
config.publisherPrivateKey.getValue(),
|
|
342
|
+
ethereumChain.chainInfo,
|
|
343
|
+
);
|
|
333
344
|
l1TxUtils = new L1TxUtilsWithBlobs(l1Client, log, config);
|
|
334
345
|
slasherClient = await SlasherClient.new(config, config.l1Contracts, l1TxUtils, watchers, dateProvider);
|
|
335
346
|
slasherClient.start();
|
|
@@ -720,13 +731,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
720
731
|
return undefined;
|
|
721
732
|
}
|
|
722
733
|
const blockHashIndex = uniqueBlockNumbers.indexOf(blockNumber);
|
|
723
|
-
const blockHash = blockHashes[blockHashIndex]
|
|
734
|
+
const blockHash = blockHashes[blockHashIndex];
|
|
724
735
|
if (!blockHash) {
|
|
725
736
|
return undefined;
|
|
726
737
|
}
|
|
727
738
|
return {
|
|
728
739
|
l2BlockNumber: Number(blockNumber),
|
|
729
|
-
l2BlockHash: blockHash,
|
|
740
|
+
l2BlockHash: L2BlockHash.fromField(blockHash),
|
|
730
741
|
data: index,
|
|
731
742
|
};
|
|
732
743
|
});
|
|
@@ -765,10 +776,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
765
776
|
archive: Fr,
|
|
766
777
|
): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined> {
|
|
767
778
|
const committedDb = await this.#getWorldState(blockNumber);
|
|
768
|
-
const [pathAndIndex] = await committedDb.findSiblingPaths<MerkleTreeId.ARCHIVE,
|
|
769
|
-
MerkleTreeId.ARCHIVE,
|
|
770
|
-
[archive],
|
|
771
|
-
);
|
|
779
|
+
const [pathAndIndex] = await committedDb.findSiblingPaths<MerkleTreeId.ARCHIVE>(MerkleTreeId.ARCHIVE, [archive]);
|
|
772
780
|
return pathAndIndex === undefined
|
|
773
781
|
? undefined
|
|
774
782
|
: MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
|
|
@@ -779,10 +787,10 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
779
787
|
noteHash: Fr,
|
|
780
788
|
): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT> | undefined> {
|
|
781
789
|
const committedDb = await this.#getWorldState(blockNumber);
|
|
782
|
-
const [pathAndIndex] = await committedDb.findSiblingPaths<
|
|
790
|
+
const [pathAndIndex] = await committedDb.findSiblingPaths<MerkleTreeId.NOTE_HASH_TREE>(
|
|
783
791
|
MerkleTreeId.NOTE_HASH_TREE,
|
|
784
|
-
|
|
785
|
-
|
|
792
|
+
[noteHash],
|
|
793
|
+
);
|
|
786
794
|
return pathAndIndex === undefined
|
|
787
795
|
? undefined
|
|
788
796
|
: MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
|
|
@@ -798,16 +806,14 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
798
806
|
blockNumber: L2BlockNumber,
|
|
799
807
|
l1ToL2Message: Fr,
|
|
800
808
|
): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>] | undefined> {
|
|
801
|
-
const
|
|
802
|
-
|
|
809
|
+
const db = await this.#getWorldState(blockNumber);
|
|
810
|
+
const [witness] = await db.findSiblingPaths(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [l1ToL2Message]);
|
|
811
|
+
if (!witness) {
|
|
803
812
|
return undefined;
|
|
804
813
|
}
|
|
805
|
-
|
|
806
|
-
|
|
807
|
-
|
|
808
|
-
index,
|
|
809
|
-
);
|
|
810
|
-
return [index, siblingPath];
|
|
814
|
+
|
|
815
|
+
// REFACTOR: Return a MembershipWitness object
|
|
816
|
+
return [witness.index, witness.path];
|
|
811
817
|
}
|
|
812
818
|
|
|
813
819
|
/**
|
|
@@ -868,24 +874,18 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
868
874
|
nullifier: Fr,
|
|
869
875
|
): Promise<NullifierMembershipWitness | undefined> {
|
|
870
876
|
const db = await this.#getWorldState(blockNumber);
|
|
871
|
-
const
|
|
872
|
-
if (!
|
|
877
|
+
const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [nullifier.toBuffer()]);
|
|
878
|
+
if (!witness) {
|
|
873
879
|
return undefined;
|
|
874
880
|
}
|
|
875
881
|
|
|
876
|
-
const
|
|
877
|
-
const
|
|
878
|
-
MerkleTreeId.NULLIFIER_TREE,
|
|
879
|
-
BigInt(index),
|
|
880
|
-
);
|
|
881
|
-
|
|
882
|
-
const [leafPreimage, siblingPath] = await Promise.all([leafPreimagePromise, siblingPathPromise]);
|
|
883
|
-
|
|
882
|
+
const { index, path } = witness;
|
|
883
|
+
const leafPreimage = await db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
|
|
884
884
|
if (!leafPreimage) {
|
|
885
885
|
return undefined;
|
|
886
886
|
}
|
|
887
887
|
|
|
888
|
-
return new NullifierMembershipWitness(
|
|
888
|
+
return new NullifierMembershipWitness(index, leafPreimage as NullifierLeafPreimage, path);
|
|
889
889
|
}
|
|
890
890
|
|
|
891
891
|
/**
|
|
@@ -917,10 +917,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
917
917
|
}
|
|
918
918
|
const preimageData = (await committedDb.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index))!;
|
|
919
919
|
|
|
920
|
-
const siblingPath = await committedDb.getSiblingPath
|
|
921
|
-
MerkleTreeId.NULLIFIER_TREE,
|
|
922
|
-
BigInt(index),
|
|
923
|
-
);
|
|
920
|
+
const siblingPath = await committedDb.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, BigInt(index));
|
|
924
921
|
return new NullifierMembershipWitness(BigInt(index), preimageData as NullifierLeafPreimage, siblingPath);
|
|
925
922
|
}
|
|
926
923
|
|
|
@@ -934,10 +931,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
|
|
|
934
931
|
MerkleTreeId.PUBLIC_DATA_TREE,
|
|
935
932
|
lowLeafResult.index,
|
|
936
933
|
)) as PublicDataTreeLeafPreimage;
|
|
937
|
-
const path = await committedDb.getSiblingPath
|
|
938
|
-
MerkleTreeId.PUBLIC_DATA_TREE,
|
|
939
|
-
lowLeafResult.index,
|
|
940
|
-
);
|
|
934
|
+
const path = await committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
|
|
941
935
|
return new PublicDataWitness(lowLeafResult.index, preimage, path);
|
|
942
936
|
}
|
|
943
937
|
}
|