@aztec/p2p 0.76.4-devnet-test → 0.76.4-devnet-test-rc3
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/client/factory.d.ts +2 -0
- package/dest/client/factory.d.ts.map +1 -1
- package/dest/client/factory.js +3 -1
- package/dest/client/p2p_client.d.ts +22 -1
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +23 -1
- package/dest/index.d.ts +3 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +4 -3
- package/dest/mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.d.ts +7 -0
- package/dest/mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.d.ts.map +1 -0
- package/dest/mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.js +2 -0
- package/dest/mem_pools/epoch_proof_quote_pool/index.d.ts +4 -0
- package/dest/mem_pools/epoch_proof_quote_pool/index.d.ts.map +1 -0
- package/dest/mem_pools/epoch_proof_quote_pool/index.js +4 -0
- package/dest/mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.d.ts +12 -0
- package/dest/mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.d.ts.map +1 -0
- package/dest/mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.js +30 -0
- package/dest/mem_pools/epoch_proof_quote_pool/test_utils.d.ts +8 -0
- package/dest/mem_pools/epoch_proof_quote_pool/test_utils.d.ts.map +1 -0
- package/dest/mem_pools/epoch_proof_quote_pool/test_utils.js +21 -0
- package/dest/mem_pools/index.d.ts +2 -1
- package/dest/mem_pools/index.d.ts.map +1 -1
- package/dest/mem_pools/instrumentation.d.ts +2 -1
- package/dest/mem_pools/instrumentation.d.ts.map +1 -1
- package/dest/mem_pools/instrumentation.js +8 -1
- package/dest/mem_pools/interface.d.ts +2 -0
- package/dest/mem_pools/interface.d.ts.map +1 -1
- package/dest/msg_validators/epoch_proof_quote_validator/epoch_proof_quote_validator.d.ts +8 -0
- package/dest/msg_validators/epoch_proof_quote_validator/epoch_proof_quote_validator.d.ts.map +1 -0
- package/dest/msg_validators/epoch_proof_quote_validator/epoch_proof_quote_validator.js +16 -0
- package/dest/msg_validators/epoch_proof_quote_validator/index.d.ts +2 -0
- package/dest/msg_validators/epoch_proof_quote_validator/index.d.ts.map +1 -0
- package/dest/msg_validators/epoch_proof_quote_validator/index.js +2 -0
- package/dest/services/libp2p/libp2p_service.d.ts +17 -1
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +55 -2
- package/dest/test-helpers/make-test-p2p-clients.d.ts +3 -1
- package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
- package/dest/test-helpers/make-test-p2p-clients.js +3 -2
- package/dest/testbench/p2p_client_testbench_worker.js +10 -1
- package/package.json +9 -9
- package/src/client/factory.ts +4 -0
- package/src/client/p2p_client.ts +44 -0
- package/src/index.ts +3 -2
- package/src/mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.ts +7 -0
- package/src/mem_pools/epoch_proof_quote_pool/index.ts +3 -0
- package/src/mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.ts +41 -0
- package/src/mem_pools/epoch_proof_quote_pool/test_utils.ts +26 -0
- package/src/mem_pools/index.ts +2 -1
- package/src/mem_pools/instrumentation.ts +6 -0
- package/src/mem_pools/interface.ts +2 -0
- package/src/msg_validators/epoch_proof_quote_validator/epoch_proof_quote_validator.ts +22 -0
- package/src/msg_validators/epoch_proof_quote_validator/index.ts +1 -0
- package/src/services/libp2p/libp2p_service.ts +63 -0
- package/src/test-helpers/make-test-p2p-clients.ts +4 -0
- package/src/testbench/p2p_client_testbench_worker.ts +11 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BlockAttestation, BlockProposal, type ClientProtocolCircuitVerifier, type Gossipable, type L2BlockSource, P2PClientType, type PeerInfo, type WorldStateSynchronizer } from '@aztec/circuit-types';
|
|
1
|
+
import { BlockAttestation, BlockProposal, type ClientProtocolCircuitVerifier, EpochProofQuote, type Gossipable, type L2BlockSource, P2PClientType, type PeerInfo, type WorldStateSynchronizer } from '@aztec/circuit-types';
|
|
2
2
|
import { type EpochCacheInterface } from '@aztec/epoch-cache';
|
|
3
3
|
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
4
4
|
import { type TelemetryClient, WithTracer } from '@aztec/telemetry-client';
|
|
@@ -29,6 +29,7 @@ export declare class LibP2PService<T extends P2PClientType> extends WithTracer i
|
|
|
29
29
|
private discoveryRunningPromise?;
|
|
30
30
|
private attestationValidator;
|
|
31
31
|
private blockProposalValidator;
|
|
32
|
+
private epochProofQuoteValidator;
|
|
32
33
|
reqresp: ReqResp;
|
|
33
34
|
/**
|
|
34
35
|
* Callback for when a block is received from a peer.
|
|
@@ -116,6 +117,7 @@ export declare class LibP2PService<T extends P2PClientType> extends WithTracer i
|
|
|
116
117
|
* @param attestation - The attestation to broadcast.
|
|
117
118
|
*/
|
|
118
119
|
private broadcastAttestation;
|
|
120
|
+
private processEpochProofQuoteFromPeer;
|
|
119
121
|
/**
|
|
120
122
|
* Propagates provided message to peers.
|
|
121
123
|
* @param message - The message to propagate.
|
|
@@ -158,6 +160,13 @@ export declare class LibP2PService<T extends P2PClientType> extends WithTracer i
|
|
|
158
160
|
* @returns True if the block proposal is valid, false otherwise.
|
|
159
161
|
*/
|
|
160
162
|
private validatePropagatedBlockFromMessage;
|
|
163
|
+
/**
|
|
164
|
+
* Validate an epoch proof quote from a peer.
|
|
165
|
+
* @param propagationSource - The peer ID of the peer that sent the epoch proof quote.
|
|
166
|
+
* @param msg - The epoch proof quote message.
|
|
167
|
+
* @returns True if the epoch proof quote is valid, false otherwise.
|
|
168
|
+
*/
|
|
169
|
+
private validatePropagatedEpochProofQuoteFromMessage;
|
|
161
170
|
private validatePropagatedTx;
|
|
162
171
|
/**
|
|
163
172
|
* Create message validators for the given block number.
|
|
@@ -202,6 +211,13 @@ export declare class LibP2PService<T extends P2PClientType> extends WithTracer i
|
|
|
202
211
|
* @returns True if the block proposal is valid, false otherwise.
|
|
203
212
|
*/
|
|
204
213
|
validateBlockProposal(peerId: PeerId, block: BlockProposal): Promise<boolean>;
|
|
214
|
+
/**
|
|
215
|
+
* Validate an epoch proof quote.
|
|
216
|
+
*
|
|
217
|
+
* @param epochProofQuote - The epoch proof quote to validate.
|
|
218
|
+
* @returns True if the epoch proof quote is valid, false otherwise.
|
|
219
|
+
*/
|
|
220
|
+
validateEpochProofQuote(peerId: PeerId, epochProofQuote: EpochProofQuote): Promise<boolean>;
|
|
205
221
|
getPeerScore(peerId: PeerId): number;
|
|
206
222
|
private sendToPeers;
|
|
207
223
|
private stopLibP2P;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libp2p_service.d.ts","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,KAAK,6BAA6B,EAClC,KAAK,UAAU,EACf,KAAK,aAAa,EAElB,aAAa,EAEb,KAAK,QAAQ,EAMb,KAAK,sBAAsB,EAG5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAkC,KAAK,eAAe,EAAE,UAAU,EAAa,MAAM,yBAAyB,CAAC;AAEtH,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAa1C,OAAO,EAAgB,KAAK,MAAM,EAAwB,MAAM,mBAAmB,CAAC;AAEpF,OAAO,iBAAiB,CAAC;AAKzB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"libp2p_service.d.ts","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,KAAK,6BAA6B,EAClC,eAAe,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EAElB,aAAa,EAEb,KAAK,QAAQ,EAMb,KAAK,sBAAsB,EAG5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAkC,KAAK,eAAe,EAAE,UAAU,EAAa,MAAM,yBAAyB,CAAC;AAEtH,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAa1C,OAAO,EAAgB,KAAK,MAAM,EAAwB,MAAM,mBAAmB,CAAC;AAEpF,OAAO,iBAAiB,CAAC;AAKzB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAS7D,OAAO,EAAE,KAAK,YAAY,EAAsB,MAAM,eAAe,CAAC;AAKtE,OAAO,EAAmC,kBAAkB,EAAE,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAGnH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAmBtE;;GAEG;AACH,qBAAa,aAAa,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,UAAW,YAAW,UAAU;IAqBxF,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IAErB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,MAAM;IA9BhB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IAGjD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,wBAAwB,CAA2B;IAGpD,OAAO,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB,CAAkE;gBAGrF,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,YAAY,EAClB,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,aAAa,EAAE,aAAa,EACpC,UAAU,EAAE,mBAAmB,EACvB,aAAa,EAAE,6BAA6B,EAC5C,sBAAsB,EAAE,sBAAsB,EACtD,SAAS,EAAE,eAAe,EAClB,MAAM,yCAAqC;IAoCrD;;;;;OAKG;WACiB,GAAG,CAAC,CAAC,SAAS,aAAa,EAC7C,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,SAAS,EACjB,oBAAoB,EAAE,oBAAoB,EAC1C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,mBAAmB,EAC/B,aAAa,EAAE,6BAA6B,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,KAAK,EAAE,iBAAiB,EACxB,SAAS,EAAE,eAAe,EAC1B,MAAM,yCAAqC;IA4H7C;;;OAGG;IACU,KAAK;IAkFlB;;;OAGG;IACU,IAAI;IAqBV,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,QAAQ,EAAE;IAIrD,OAAO,CAAC,oBAAoB;IAS5B;;;;;;;;;OASG;IACH,WAAW,CAAC,WAAW,SAAS,kBAAkB,EAChD,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,GAC5D,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC;IAI7E;;;;;OAKG;IACH,gBAAgB,CAAC,WAAW,SAAS,kBAAkB,EACrD,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAC/D,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC;IAI/E;;;OAGG;IACI,MAAM,IAAI,GAAG,GAAG,SAAS;IAIzB,6BAA6B,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAK9G;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAOxB;;;;;OAKG;YACW,cAAc;IAS5B;;;;OAIG;YACW,sBAAsB;IAqBpC;;;;OAIG;YAOW,0BAA0B;IAaxC;;;;;OAKG;YAQW,oBAAoB;IA4BlC;;;OAGG;YAOW,oBAAoB;YAIpB,8BAA8B;IAW5C;;;OAGG;IACU,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,OAAO,EAAE,CAAC;YAQzC,iBAAiB;IAO/B;;;;;;;;;;;;;OAaG;YAIW,mBAAmB;IAoBjC;;;;;OAKG;YACW,+BAA+B;IAa7C;;;;;OAKG;YACW,wCAAwC;IAatD;;;;;OAKG;YACW,kCAAkC;IAahD;;;;;OAKG;YACW,4CAA4C;YAgB5C,oBAAoB;IAuBlC;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;IA2B/B;;;;;OAKG;YACW,cAAc;IA8B5B;;;;;;;;;;OAUG;YACW,wBAAwB;IAwBtC;;;;;OAKG;IAIU,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjG;;;;;OAKG;IAIU,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1F;;;;;OAKG;IAIU,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjG,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;YAI7B,WAAW;YAcX,UAAU;CAYzB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __esDecorate, __runInitializers } from "tslib";
|
|
2
|
-
import { BlockAttestation, BlockProposal, MerkleTreeId, P2PClientType, PeerErrorSeverity, TopicTypeMap, Tx, getTopicTypeForClientType, metricsTopicStrToLabels, } from '@aztec/circuit-types';
|
|
2
|
+
import { BlockAttestation, BlockProposal, EpochProofQuote, MerkleTreeId, P2PClientType, PeerErrorSeverity, TopicTypeMap, Tx, getTopicTypeForClientType, metricsTopicStrToLabels, } from '@aztec/circuit-types';
|
|
3
3
|
import { Fr } from '@aztec/circuits.js';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
5
|
import { SerialQueue } from '@aztec/foundation/queue';
|
|
@@ -17,6 +17,7 @@ import '@libp2p/kad-dht';
|
|
|
17
17
|
import { mplex } from '@libp2p/mplex';
|
|
18
18
|
import { tcp } from '@libp2p/tcp';
|
|
19
19
|
import { createLibp2p } from 'libp2p';
|
|
20
|
+
import { EpochProofQuoteValidator } from '../../msg_validators/epoch_proof_quote_validator/index.js';
|
|
20
21
|
import { AttestationValidator, BlockProposalValidator } from '../../msg_validators/index.js';
|
|
21
22
|
import { DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator, TxProofValidator, } from '../../msg_validators/tx_validator/index.js';
|
|
22
23
|
import { convertToMultiaddr } from '../../util.js';
|
|
@@ -44,6 +45,7 @@ let LibP2PService = (() => {
|
|
|
44
45
|
let _validatePropagatedTx_decorators;
|
|
45
46
|
let _validateAttestation_decorators;
|
|
46
47
|
let _validateBlockProposal_decorators;
|
|
48
|
+
let _validateEpochProofQuote_decorators;
|
|
47
49
|
return _a = class LibP2PService extends _classSuper {
|
|
48
50
|
constructor(clientType, config, node, peerDiscoveryService, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')) {
|
|
49
51
|
super(telemetry, 'LibP2PService');
|
|
@@ -67,6 +69,7 @@ let LibP2PService = (() => {
|
|
|
67
69
|
this.node.services.pubsub.score.params.appSpecificWeight = 10;
|
|
68
70
|
this.attestationValidator = new AttestationValidator(epochCache);
|
|
69
71
|
this.blockProposalValidator = new BlockProposalValidator(epochCache);
|
|
72
|
+
this.epochProofQuoteValidator = new EpochProofQuoteValidator(epochCache);
|
|
70
73
|
this.blockReceivedCallback = async (block) => {
|
|
71
74
|
this.logger.warn(`Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber.toNumber()} from peer.`, { p2pMessageIdentifier: await block.p2pMessageIdentifier() });
|
|
72
75
|
return undefined;
|
|
@@ -165,6 +168,11 @@ let LibP2PService = (() => {
|
|
|
165
168
|
invalidMessageDeliveriesWeight: -20,
|
|
166
169
|
invalidMessageDeliveriesDecay: 0.5,
|
|
167
170
|
}),
|
|
171
|
+
[EpochProofQuote.p2pTopic]: createTopicScoreParams({
|
|
172
|
+
topicWeight: 1,
|
|
173
|
+
invalidMessageDeliveriesWeight: -20,
|
|
174
|
+
invalidMessageDeliveriesDecay: 0.5,
|
|
175
|
+
}),
|
|
168
176
|
},
|
|
169
177
|
}),
|
|
170
178
|
}),
|
|
@@ -218,6 +226,7 @@ let LibP2PService = (() => {
|
|
|
218
226
|
[Tx.p2pTopic]: this.validatePropagatedTxFromMessage.bind(this),
|
|
219
227
|
[BlockAttestation.p2pTopic]: this.validatePropagatedAttestationFromMessage.bind(this),
|
|
220
228
|
[BlockProposal.p2pTopic]: this.validatePropagatedBlockFromMessage.bind(this),
|
|
229
|
+
[EpochProofQuote.p2pTopic]: this.validatePropagatedEpochProofQuoteFromMessage.bind(this),
|
|
221
230
|
};
|
|
222
231
|
// When running bandwidth benchmarks, we use send blobs of data we do not want to validate
|
|
223
232
|
// NEVER switch this off in production
|
|
@@ -353,6 +362,10 @@ let LibP2PService = (() => {
|
|
|
353
362
|
const block = BlockProposal.fromBuffer(Buffer.from(message.data));
|
|
354
363
|
await this.processBlockFromPeer(block);
|
|
355
364
|
}
|
|
365
|
+
if (message.topic == EpochProofQuote.p2pTopic) {
|
|
366
|
+
const epochProofQuote = EpochProofQuote.fromBuffer(Buffer.from(message.data));
|
|
367
|
+
await this.processEpochProofQuoteFromPeer(epochProofQuote);
|
|
368
|
+
}
|
|
356
369
|
return;
|
|
357
370
|
}
|
|
358
371
|
/**Process Attestation From Peer
|
|
@@ -403,6 +416,13 @@ let LibP2PService = (() => {
|
|
|
403
416
|
async broadcastAttestation(attestation) {
|
|
404
417
|
await this.propagate(attestation);
|
|
405
418
|
}
|
|
419
|
+
async processEpochProofQuoteFromPeer(epochProofQuote) {
|
|
420
|
+
const epoch = epochProofQuote.payload.epochToProve;
|
|
421
|
+
const prover = epochProofQuote.payload.prover.toString();
|
|
422
|
+
const p2pMessageIdentifier = await epochProofQuote.p2pMessageIdentifier();
|
|
423
|
+
this.logger.verbose(`Received epoch proof quote ${p2pMessageIdentifier} by prover ${prover} for epoch ${epoch} from external peer.`, { quote: epochProofQuote.toInspect(), p2pMessageIdentifier });
|
|
424
|
+
this.mempools.epochProofQuotePool.addQuote(epochProofQuote);
|
|
425
|
+
}
|
|
406
426
|
/**
|
|
407
427
|
* Propagates provided message to peers.
|
|
408
428
|
* @param message - The message to propagate.
|
|
@@ -495,6 +515,21 @@ let LibP2PService = (() => {
|
|
|
495
515
|
});
|
|
496
516
|
return isValid ? TopicValidatorResult.Accept : TopicValidatorResult.Reject;
|
|
497
517
|
}
|
|
518
|
+
/**
|
|
519
|
+
* Validate an epoch proof quote from a peer.
|
|
520
|
+
* @param propagationSource - The peer ID of the peer that sent the epoch proof quote.
|
|
521
|
+
* @param msg - The epoch proof quote message.
|
|
522
|
+
* @returns True if the epoch proof quote is valid, false otherwise.
|
|
523
|
+
*/
|
|
524
|
+
async validatePropagatedEpochProofQuoteFromMessage(propagationSource, msg) {
|
|
525
|
+
const epochProofQuote = EpochProofQuote.fromBuffer(Buffer.from(msg.data));
|
|
526
|
+
const isValid = await this.validateEpochProofQuote(propagationSource, epochProofQuote);
|
|
527
|
+
this.logger.trace(`validatePropagatedEpochProofQuote: ${isValid}`, {
|
|
528
|
+
[Attributes.EPOCH_NUMBER]: epochProofQuote.payload.epochToProve.toString(),
|
|
529
|
+
[Attributes.P2P_ID]: propagationSource.toString(),
|
|
530
|
+
});
|
|
531
|
+
return isValid ? TopicValidatorResult.Accept : TopicValidatorResult.Reject;
|
|
532
|
+
}
|
|
498
533
|
async validatePropagatedTx(tx, peerId) {
|
|
499
534
|
const blockNumber = (await this.l2BlockSource.getBlockNumber()) + 1;
|
|
500
535
|
const messageValidators = this.createMessageValidators(blockNumber);
|
|
@@ -631,6 +666,20 @@ let LibP2PService = (() => {
|
|
|
631
666
|
}
|
|
632
667
|
return true;
|
|
633
668
|
}
|
|
669
|
+
/**
|
|
670
|
+
* Validate an epoch proof quote.
|
|
671
|
+
*
|
|
672
|
+
* @param epochProofQuote - The epoch proof quote to validate.
|
|
673
|
+
* @returns True if the epoch proof quote is valid, false otherwise.
|
|
674
|
+
*/
|
|
675
|
+
async validateEpochProofQuote(peerId, epochProofQuote) {
|
|
676
|
+
const severity = await this.epochProofQuoteValidator.validate(epochProofQuote);
|
|
677
|
+
if (severity) {
|
|
678
|
+
this.peerManager.penalizePeer(peerId, severity);
|
|
679
|
+
return false;
|
|
680
|
+
}
|
|
681
|
+
return true;
|
|
682
|
+
}
|
|
634
683
|
getPeerScore(peerId) {
|
|
635
684
|
return this.node.services.pubsub.score.score(peerId.toString());
|
|
636
685
|
}
|
|
@@ -691,6 +740,9 @@ let LibP2PService = (() => {
|
|
|
691
740
|
_validateBlockProposal_decorators = [trackSpan('Libp2pService.validateBlockProposal', (_peerId, block) => ({
|
|
692
741
|
[Attributes.SLOT_NUMBER]: block.payload.header.globalVariables.slotNumber.toString(),
|
|
693
742
|
}))];
|
|
743
|
+
_validateEpochProofQuote_decorators = [trackSpan('Libp2pService.validateEpochProofQuote', (_peerId, epochProofQuote) => ({
|
|
744
|
+
[Attributes.EPOCH_NUMBER]: epochProofQuote.payload.epochToProve.toString(),
|
|
745
|
+
}))];
|
|
694
746
|
__esDecorate(_a, null, _processAttestationFromPeer_decorators, { kind: "method", name: "processAttestationFromPeer", static: false, private: false, access: { has: obj => "processAttestationFromPeer" in obj, get: obj => obj.processAttestationFromPeer }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
695
747
|
__esDecorate(_a, null, _processBlockFromPeer_decorators, { kind: "method", name: "processBlockFromPeer", static: false, private: false, access: { has: obj => "processBlockFromPeer" in obj, get: obj => obj.processBlockFromPeer }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
696
748
|
__esDecorate(_a, null, _broadcastAttestation_decorators, { kind: "method", name: "broadcastAttestation", static: false, private: false, access: { has: obj => "broadcastAttestation" in obj, get: obj => obj.broadcastAttestation }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
@@ -698,9 +750,10 @@ let LibP2PService = (() => {
|
|
|
698
750
|
__esDecorate(_a, null, _validatePropagatedTx_decorators, { kind: "method", name: "validatePropagatedTx", static: false, private: false, access: { has: obj => "validatePropagatedTx" in obj, get: obj => obj.validatePropagatedTx }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
699
751
|
__esDecorate(_a, null, _validateAttestation_decorators, { kind: "method", name: "validateAttestation", static: false, private: false, access: { has: obj => "validateAttestation" in obj, get: obj => obj.validateAttestation }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
700
752
|
__esDecorate(_a, null, _validateBlockProposal_decorators, { kind: "method", name: "validateBlockProposal", static: false, private: false, access: { has: obj => "validateBlockProposal" in obj, get: obj => obj.validateBlockProposal }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
753
|
+
__esDecorate(_a, null, _validateEpochProofQuote_decorators, { kind: "method", name: "validateEpochProofQuote", static: false, private: false, access: { has: obj => "validateEpochProofQuote" in obj, get: obj => obj.validateEpochProofQuote }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
701
754
|
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
702
755
|
})(),
|
|
703
756
|
_a;
|
|
704
757
|
})();
|
|
705
758
|
export { LibP2PService };
|
|
706
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":"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"}
|
|
759
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,11 @@ import { type Logger } from '@aztec/foundation/log';
|
|
|
4
4
|
import { type P2PClient } from '../client/p2p_client.js';
|
|
5
5
|
import { type P2PConfig } from '../config.js';
|
|
6
6
|
import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
|
|
7
|
+
import { type EpochProofQuotePool } from '../mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.js';
|
|
7
8
|
import { type TxPool } from '../mem_pools/tx_pool/index.js';
|
|
8
9
|
interface MakeTestP2PClientOptions {
|
|
9
10
|
mockAttestationPool: AttestationPool;
|
|
11
|
+
mockEpochProofQuotePool: EpochProofQuotePool;
|
|
10
12
|
mockTxPool: TxPool;
|
|
11
13
|
mockEpochCache: EpochCache;
|
|
12
14
|
mockWorldState: WorldStateSynchronizer;
|
|
@@ -23,7 +25,7 @@ interface MakeTestP2PClientOptions {
|
|
|
23
25
|
* @param options - The options for the client.
|
|
24
26
|
* @returns The created client.
|
|
25
27
|
*/
|
|
26
|
-
export declare function makeTestP2PClient(peerIdPrivateKey: string, port: number, peers: string[], { alwaysTrueVerifier, p2pBaseConfig, p2pConfigOverrides, mockAttestationPool, mockTxPool, mockEpochCache, mockWorldState, logger, }: MakeTestP2PClientOptions): Promise<P2PClient<P2PClientType.Full>>;
|
|
28
|
+
export declare function makeTestP2PClient(peerIdPrivateKey: string, port: number, peers: string[], { alwaysTrueVerifier, p2pBaseConfig, p2pConfigOverrides, mockAttestationPool, mockEpochProofQuotePool, mockTxPool, mockEpochCache, mockWorldState, logger, }: MakeTestP2PClientOptions): Promise<P2PClient<P2PClientType.Full>>;
|
|
27
29
|
/**
|
|
28
30
|
* Creates a number of P2P clients for testing purposes.
|
|
29
31
|
* @param numberOfPeers - The number of clients to create.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-test-p2p-clients.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-test-p2p-clients.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAKlE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAM5D,UAAU,wBAAwB;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,cAAc,EAAE,sBAAsB,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE,EACf,EACE,kBAAyB,EACzB,aAAa,EACb,kBAAuB,EACvB,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,cAAc,EACd,MAAwC,GACzC,EAAE,wBAAwB,
|
|
1
|
+
{"version":3,"file":"make-test-p2p-clients.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-test-p2p-clients.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAKlE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,+DAA+D,CAAC;AACzG,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAM5D,UAAU,wBAAwB;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,uBAAuB,EAAE,mBAAmB,CAAC;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,cAAc,EAAE,sBAAsB,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE,EACf,EACE,kBAAyB,EACzB,aAAa,EACb,kBAAuB,EACvB,mBAAmB,EACnB,uBAAuB,EACvB,UAAU,EACV,cAAc,EACd,cAAc,EACd,MAAwC,GACzC,EAAE,wBAAwB,0CA8C5B;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,4CAiBnG"}
|
|
@@ -15,7 +15,7 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
|
|
|
15
15
|
* @param options - The options for the client.
|
|
16
16
|
* @returns The created client.
|
|
17
17
|
*/
|
|
18
|
-
export async function makeTestP2PClient(peerIdPrivateKey, port, peers, { alwaysTrueVerifier = true, p2pBaseConfig, p2pConfigOverrides = {}, mockAttestationPool, mockTxPool, mockEpochCache, mockWorldState, logger = createLogger('p2p-test-client'), }) {
|
|
18
|
+
export async function makeTestP2PClient(peerIdPrivateKey, port, peers, { alwaysTrueVerifier = true, p2pBaseConfig, p2pConfigOverrides = {}, mockAttestationPool, mockEpochProofQuotePool, mockTxPool, mockEpochCache, mockWorldState, logger = createLogger('p2p-test-client'), }) {
|
|
19
19
|
const addr = `127.0.0.1:${port}`;
|
|
20
20
|
const listenAddr = `0.0.0.0:${port}`;
|
|
21
21
|
// Filter nodes so that we only dial active peers
|
|
@@ -39,6 +39,7 @@ export async function makeTestP2PClient(peerIdPrivateKey, port, peers, { alwaysT
|
|
|
39
39
|
const deps = {
|
|
40
40
|
txPool: mockTxPool,
|
|
41
41
|
attestationPool: mockAttestationPool,
|
|
42
|
+
epochProofQuotePool: mockEpochProofQuotePool,
|
|
42
43
|
store: kvStore,
|
|
43
44
|
logger,
|
|
44
45
|
};
|
|
@@ -67,4 +68,4 @@ export async function makeTestP2PClients(numberOfPeers, testConfig) {
|
|
|
67
68
|
await Promise.all(clients.map(client => client.isReady()));
|
|
68
69
|
return clients;
|
|
69
70
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS10ZXN0LXAycC1jbGllbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QtaGVscGVycy9tYWtlLXRlc3QtcDJwLWNsaWVudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFFLGFBQWEsRUFBK0IsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRixPQUFPLEVBQWUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQU1yRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxrREFBa0QsQ0FBQztBQUM3RixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDMUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzFDLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBYzNGOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUNyQyxnQkFBd0IsRUFDeEIsSUFBWSxFQUNaLEtBQWUsRUFDZixFQUNFLGtCQUFrQixHQUFHLElBQUksRUFDekIsYUFBYSxFQUNiLGtCQUFrQixHQUFHLEVBQUUsRUFDdkIsbUJBQW1CLEVBQ25CLHVCQUF1QixFQUN2QixVQUFVLEVBQ1YsY0FBYyxFQUNkLGNBQWMsRUFDZCxNQUFNLEdBQUcsWUFBWSxDQUFDLGlCQUFpQixDQUFDLEdBQ2Y7SUFFM0IsTUFBTSxJQUFJLEdBQUcsYUFBYSxJQUFJLEVBQUUsQ0FBQztJQUNqQyxNQUFNLFVBQVUsR0FBRyxXQUFXLElBQUksRUFBRSxDQUFDO0lBRXJDLGlEQUFpRDtJQUVqRCxNQUFN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
|
|
@@ -38,6 +38,13 @@ function mockAttestationPool() {
|
|
|
38
38
|
getAttestationsForSlot: () => Promise.resolve([]),
|
|
39
39
|
};
|
|
40
40
|
}
|
|
41
|
+
function mockEpochProofQuotePool() {
|
|
42
|
+
return {
|
|
43
|
+
addQuote: () => { },
|
|
44
|
+
getQuotes: () => [],
|
|
45
|
+
deleteQuotesToEpoch: () => { },
|
|
46
|
+
};
|
|
47
|
+
}
|
|
41
48
|
function mockEpochCache() {
|
|
42
49
|
return {
|
|
43
50
|
getCommittee: () => Promise.resolve([]),
|
|
@@ -60,6 +67,7 @@ process.on('message', async (msg) => {
|
|
|
60
67
|
if (type === 'START') {
|
|
61
68
|
const txPool = mockTxPool();
|
|
62
69
|
const attestationPool = mockAttestationPool();
|
|
70
|
+
const epochProofQuotePool = mockEpochProofQuotePool();
|
|
63
71
|
const epochCache = mockEpochCache();
|
|
64
72
|
const worldState = {};
|
|
65
73
|
const l2BlockSource = new MockL2BlockSource();
|
|
@@ -70,6 +78,7 @@ process.on('message', async (msg) => {
|
|
|
70
78
|
const deps = {
|
|
71
79
|
txPool,
|
|
72
80
|
attestationPool,
|
|
81
|
+
epochProofQuotePool,
|
|
73
82
|
store: kvStore,
|
|
74
83
|
logger,
|
|
75
84
|
};
|
|
@@ -113,4 +122,4 @@ process.on('message', async (msg) => {
|
|
|
113
122
|
process.exit(1);
|
|
114
123
|
}
|
|
115
124
|
});
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDJwX2NsaWVudF90ZXN0YmVuY2hfd29ya2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RiZW5jaC9wMnBfY2xpZW50X3Rlc3RiZW5jaF93b3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7R0FJRztBQUNILE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxhQUFhLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBK0IsTUFBTSxzQkFBc0IsQ0FBQztBQUVoRyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHdkQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUk5QyxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUU3RSw2QkFBNkI7QUFDN0IsU0FBUyxVQUFVO0lBQ2pCLG1CQUFtQjtJQUNuQixPQUFPO1FBQ0wsTUFBTSxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUU7UUFDL0IsV0FBVyxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDO1FBQzdDLG1CQUFtQixFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDO1FBQ3JELFdBQVcsRUFBRSxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFO1FBQ3BDLGtCQUFrQixFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUU7UUFDM0MsU0FBUyxFQUFFLEdBQUcsRUFBRSxDQUFDLE9B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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/p2p",
|
|
3
|
-
"version": "0.76.4-devnet-test",
|
|
3
|
+
"version": "0.76.4-devnet-test-rc3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -63,14 +63,14 @@
|
|
|
63
63
|
]
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@aztec/circuit-types": "0.76.4-devnet-test",
|
|
67
|
-
"@aztec/circuits.js": "0.76.4-devnet-test",
|
|
68
|
-
"@aztec/epoch-cache": "0.76.4-devnet-test",
|
|
69
|
-
"@aztec/foundation": "0.76.4-devnet-test",
|
|
70
|
-
"@aztec/kv-store": "0.76.4-devnet-test",
|
|
71
|
-
"@aztec/noir-protocol-circuits-types": "0.76.4-devnet-test",
|
|
72
|
-
"@aztec/protocol-contracts": "0.76.4-devnet-test",
|
|
73
|
-
"@aztec/telemetry-client": "0.76.4-devnet-test",
|
|
66
|
+
"@aztec/circuit-types": "0.76.4-devnet-test-rc3",
|
|
67
|
+
"@aztec/circuits.js": "0.76.4-devnet-test-rc3",
|
|
68
|
+
"@aztec/epoch-cache": "0.76.4-devnet-test-rc3",
|
|
69
|
+
"@aztec/foundation": "0.76.4-devnet-test-rc3",
|
|
70
|
+
"@aztec/kv-store": "0.76.4-devnet-test-rc3",
|
|
71
|
+
"@aztec/noir-protocol-circuits-types": "0.76.4-devnet-test-rc3",
|
|
72
|
+
"@aztec/protocol-contracts": "0.76.4-devnet-test-rc3",
|
|
73
|
+
"@aztec/telemetry-client": "0.76.4-devnet-test-rc3",
|
|
74
74
|
"@chainsafe/discv5": "9.0.0",
|
|
75
75
|
"@chainsafe/enr": "3.0.0",
|
|
76
76
|
"@chainsafe/libp2p-gossipsub": "13.0.0",
|
package/src/client/factory.ts
CHANGED
|
@@ -15,6 +15,8 @@ import { P2PClient } from '../client/p2p_client.js';
|
|
|
15
15
|
import { type P2PConfig } from '../config.js';
|
|
16
16
|
import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
|
|
17
17
|
import { InMemoryAttestationPool } from '../mem_pools/attestation_pool/memory_attestation_pool.js';
|
|
18
|
+
import { type EpochProofQuotePool } from '../mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.js';
|
|
19
|
+
import { MemoryEpochProofQuotePool } from '../mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.js';
|
|
18
20
|
import { type MemPools } from '../mem_pools/interface.js';
|
|
19
21
|
import { AztecKVTxPool, type TxPool } from '../mem_pools/tx_pool/index.js';
|
|
20
22
|
import { DiscV5Service } from '../services/discv5/discV5_service.js';
|
|
@@ -26,6 +28,7 @@ type P2PClientDeps<T extends P2PClientType> = {
|
|
|
26
28
|
txPool?: TxPool;
|
|
27
29
|
store?: AztecAsyncKVStore;
|
|
28
30
|
attestationPool?: T extends P2PClientType.Full ? AttestationPool : undefined;
|
|
31
|
+
epochProofQuotePool?: EpochProofQuotePool;
|
|
29
32
|
logger?: Logger;
|
|
30
33
|
};
|
|
31
34
|
|
|
@@ -46,6 +49,7 @@ export const createP2PClient = async <T extends P2PClientType>(
|
|
|
46
49
|
|
|
47
50
|
const mempools: MemPools<T> = {
|
|
48
51
|
txPool: deps.txPool ?? new AztecKVTxPool(store, archive, telemetry, config.archivedTxLimit),
|
|
52
|
+
epochProofQuotePool: deps.epochProofQuotePool ?? new MemoryEpochProofQuotePool(telemetry),
|
|
49
53
|
attestationPool:
|
|
50
54
|
clientType === P2PClientType.Full
|
|
51
55
|
? ((deps.attestationPool ?? new InMemoryAttestationPool(telemetry)) as T extends P2PClientType.Full
|