@aztec/p2p 4.0.0-nightly.20260107 → 4.0.0-nightly.20260108
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/p2p_client.d.ts +2 -2
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +3 -2
- package/dest/services/libp2p/libp2p_service.d.ts +2 -1
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +54 -13
- package/dest/services/peer-manager/peer_manager.d.ts +2 -2
- package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_manager.js +1 -385
- package/package.json +14 -14
- package/src/client/p2p_client.ts +9 -18
- package/src/services/libp2p/libp2p_service.ts +73 -13
- package/src/services/peer-manager/peer_manager.ts +1 -2
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
3
3
|
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
4
|
-
import type
|
|
4
|
+
import { type EthAddress, type L2BlockSource, type L2BlockStreamEvent, type L2Tips } from '@aztec/stdlib/block';
|
|
5
5
|
import type { ContractDataSource } from '@aztec/stdlib/contract';
|
|
6
6
|
import { type PeerInfo } from '@aztec/stdlib/interfaces/server';
|
|
7
7
|
import { BlockAttestation, type BlockProposal, type P2PClientType } from '@aztec/stdlib/p2p';
|
|
@@ -196,4 +196,4 @@ export declare class P2PClient<T extends P2PClientType = P2PClientType.Full> ext
|
|
|
196
196
|
markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
|
|
197
197
|
handleAuthRequestFromPeer(authRequest: AuthRequest, peerId: PeerId): Promise<StatusMessage>;
|
|
198
198
|
}
|
|
199
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
199
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDJwX2NsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9wMnBfY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFzQyxNQUFNLGlCQUFpQixDQUFDO0FBQzdGLE9BQU8sRUFDTCxLQUFLLFVBQVUsRUFHZixLQUFLLGFBQWEsRUFFbEIsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxNQUFNLEVBQ1osTUFBTSxxQkFBcUIsQ0FBQztBQUM3QixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWpFLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBVyxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLGFBQWEsRUFBRSxLQUFLLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEVBQWMsS0FBSyxlQUFlLEVBQUUsVUFBVSxFQUFpQyxNQUFNLHlCQUF5QixDQUFDO0FBRXRILE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBdUIsTUFBTSxjQUFjLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixD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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"p2p_client.d.ts","sourceRoot":"","sources":["../../src/client/p2p_client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAsC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"p2p_client.d.ts","sourceRoot":"","sources":["../../src/client/p2p_client.ts"],"names":[],"mappings":"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"}
|
|
@@ -375,9 +375,10 @@ import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constant
|
|
|
375
375
|
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
376
376
|
import { createLogger } from '@aztec/foundation/log';
|
|
377
377
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
378
|
+
import { L2BlockStream } from '@aztec/stdlib/block';
|
|
378
379
|
import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
379
380
|
import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
380
|
-
import { Attributes,
|
|
381
|
+
import { Attributes, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
|
|
381
382
|
import { getP2PDefaultConfig } from '../config.js';
|
|
382
383
|
import { ReqRespSubProtocol } from '../services/reqresp/interface.js';
|
|
383
384
|
import { chunkTxHashesRequest } from '../services/reqresp/protocols/tx.js';
|
|
@@ -645,7 +646,7 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
|
|
|
645
646
|
initBlockStream(startingBlock) {
|
|
646
647
|
if (!this.blockStream) {
|
|
647
648
|
const { blockRequestBatchSize: batchSize, blockCheckIntervalMS: pollIntervalMS } = this.config;
|
|
648
|
-
this.blockStream = new
|
|
649
|
+
this.blockStream = new L2BlockStream(this.l2BlockSource, this, this, createLogger(`${this.log.module}:l2-block-stream`), {
|
|
649
650
|
batchSize,
|
|
650
651
|
pollIntervalMS,
|
|
651
652
|
startingBlock
|
|
@@ -54,6 +54,7 @@ export declare class LibP2PService<T extends P2PClientType = P2PClientType.Full>
|
|
|
54
54
|
private blockReceivedCallback;
|
|
55
55
|
private gossipSubEventHandler;
|
|
56
56
|
private instrumentation;
|
|
57
|
+
private telemetry;
|
|
57
58
|
protected logger: Logger;
|
|
58
59
|
constructor(clientType: T, config: P2PConfig, node: PubSubLibp2p, peerDiscoveryService: PeerDiscoveryService, reqresp: ReqRespInterface, peerManager: PeerManagerInterface, mempools: MemPools, archiver: L2BlockSource & ContractDataSource, epochCache: EpochCacheInterface, proofVerifier: ClientProtocolCircuitVerifier, worldStateSynchronizer: WorldStateSynchronizer, telemetry: TelemetryClient, logger?: Logger);
|
|
59
60
|
updateConfig(config: Partial<P2PReqRespConfig>): void;
|
|
@@ -172,4 +173,4 @@ export declare class LibP2PService<T extends P2PClientType = P2PClientType.Full>
|
|
|
172
173
|
private stopLibP2P;
|
|
173
174
|
}
|
|
174
175
|
export {};
|
|
175
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
176
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlicDJwX3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9saWJwMnAvbGlicDJwX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUk5RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQTZDLE1BQU0sdUJBQXVCLENBQUM7QUFHL0YsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQVcsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxRQUFRLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN2SCxPQUFPLEVBQ0wsZ0JBQWdCLEVBQ2hCLGFBQWEsRUFDYixLQUFLLFVBQVUsRUFDZixhQUFhLEVBR2IsU0FBUyxFQUlWLE1BQU0sbUJBQW1CLENBQUM7QUFFM0IsT0FBTyxFQUFFLEVBQUUsRUFBMEQsTUFBTSxrQkFBa0IsQ0FBQztBQUc5RixPQUFPLEVBSUwsS0FBSyxlQUFlLEVBQ3BCLFVBQVUsRUFFWCxNQUFNLHlCQUF5QixDQUFDO0FBY2pDLE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBNEIsS0FBSyxNQUFNLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUk5RyxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHekMsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFakQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFpQjdELE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBc0IsTUFBTSxlQUFlLENBQUM7QUFNdEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUd6RSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzdELE9BQU8sRUFFTCxLQUFLLGdCQUFnQixFQUNyQixrQkFBa0IsRUFDbEIsS0FBSyx5QkFBeUIsRUFFOUIsS0FBSyw0QkFBNEIsRUFDakMsS0FBSyxjQUFjLEVBRXBCLE1BQU0seUJBQXlCLENBQUM7QUFHakMsT0FBTyxFQUNMLFdBQVcsRUFHWCxhQUFhLEVBS2QsTUFBTSwrQkFBK0IsQ0FBQztBQUV2QyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxVQUFVLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFZaEcsS0FBSywrQkFBK0IsQ0FBQyxDQUFDLElBQ2xDO0lBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsb0JBQW9CLEVBQUUsb0JBQW9CLENBQUMsTUFBTSxDQUFDLENBQUE7Q0FBRSxHQUM5RTtJQUFFLEdBQUcsQ0FBQyxFQUFFLFNBQVMsQ0FBQztJQUFDLE1BQU0sRUFBRSxvQkFBb0IsQ0FBQyxNQUFNLENBQUE7Q0FBRSxDQUFDO0FBRTdEOztHQUVHO0FBQ0gscUJBQWEsYUFBYSxDQUFDLENBQUMsU0FBUyxhQUFhLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBRSxTQUFRLFVBQVcsWUFBVyxVQUFVO0lBNkI3RyxPQUFPLENBQUMsVUFBVTtJQUNsQixPQUFPLENBQUMsTUFBTTtJQUNkLFNBQVMsQ0FBQyxJQUFJLEVBQUUsWUFBWTtJQUM1QixPQUFPLENBQUMsb0JBQW9CO0lBQzVCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLFdBQVc7SUFDbkIsU0FBUyxDQUFDLFFBQVEsRUFBRSxRQUFRO0lBQzVCLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxhQUFhO0lBQ3JCLE9BQU8sQ0FBQyxzQkFBc0I7SUF0Q2hDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFpQjtJQUNqRCxPQUFPLENBQUMsbUJBQW1CLENBQTBGO0lBR3JILE9BQU8sQ0FBQyxvQkFBb0IsQ0FBdUI7SUFDbkQsT0FBTyxDQUFDLHNCQUFzQixDQUF5QjtJQUV2RCxPQUFPLENBQUMsZUFBZSxDQUFNO0lBQzdCLE9BQU8sQ0FBQyxZQUFZLENBQThEO0lBRWxGLE9BQU8sQ0FBQyxTQUFTLENBQTZEO0lBRTlFOzs7O09BSUc7SUFDSCxPQUFPLENBQUMscUJBQXFCLENBQTJCO0lBRXhELE9BQU8sQ0FBQyxxQkFBcUIsQ0FBNkM7SUFFMUUsT0FBTyxDQUFDLGVBQWUsQ0FBcUI7SUFFNUMsT0FBTyxDQUFDLFNBQVMsQ0FBa0I7SUFFbkMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFekIsWUFDVSxVQUFVLEVBQUUsQ0FBQyxFQUNiLE1BQU0sRUFBRSxTQUFTLEVBQ2YsSUFBSSxFQUFFLFlBQVksRUFDcEIsb0JBQW9CLEVBQUUsb0JBQW9CLEVBQzFDLE9BQU8sRUFBRSxnQkFBZ0IsRUFDekIsV0FBVyxFQUFFLG9CQUFvQixFQUMvQixRQUFRLEVBQUUsUUFBUSxFQUNwQixRQUFRLEVBQUUsYUFBYSxHQUFHLGtCQUFrQixFQUM1QyxVQUFVLEVBQUUsbUJBQW1CLEVBQy9CLGFBQWEsRUFBRSw2QkFBNkIsRUFDNUMsc0JBQXNCLEVBQUUsc0JBQXNCLEVBQ3RELFNBQVMsRUFBRSxlQUFlLEVBQzFCLE1BQU0sR0FBRSxNQUEyQyxFQXdDcEQ7SUFFTSxZQUFZLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxRQUVwRDtJQUVEOzs7OztPQUtHO0lBQ0gsT0FBb0IsR0FBRyxDQUFDLENBQUMsU0FBUyxhQUFhLEVBQzdDLFVBQVUsRUFBRSxDQUFDLEVBQ2IsTUFBTSxFQUFFLFNBQVMsRUFDakIsTUFBTSxFQUFFLE1BQU0sRUFDZCxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsUUFBUSxDQUFDO1FBQ25CLGFBQWEsRUFBRSxhQUFhLEdBQUcsa0JBQWtCLENBQUM7UUFDbEQsVUFBVSxFQUFFLG1CQUFtQixDQUFDO1FBQ2hDLGFBQWEsRUFBRSw2QkFBNkIsQ0FBQztRQUM3QyxzQkFBc0IsRUFBRSxzQkFBc0IsQ0FBQztRQUMvQyxTQUFTLEVBQUUsaUJBQWlCLENBQUM7UUFDN0IsU0FBUyxFQUFFLGVBQWUsQ0FBQztRQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO1FBQ2YsY0FBYyxFQUFFLE1BQU0sQ0FBQztLQUN4Qiw2QkEyTkY7SUFFRDs7O09BR0c7SUFDVSxLQUFLLGtCQXlFakI7SUFFRDs7O09BR0c7SUFDVSxJQUFJLGtCQWdCaEI7SUFFRCxxQkFBcUIsQ0FDbkIsV0FBVyxFQUFFLGtCQUFrQixFQUMvQixPQUFPLEVBQUUseUJBQXlCLEVBQ2xDLFNBQVMsQ0FBQyxFQUFFLDRCQUE0QixDQUFDLGtCQUFrQixDQUFDLEdBQzNELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFZjtJQUVNLDhCQUE4QixDQUFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBRWpFO0lBRU0sUUFBUSxDQUFDLGNBQWMsQ0FBQyxFQUFFLE9BQU8sR0FBRyxRQUFRLEVBQUUsQ0FFcEQ7SUFFRCxPQUFPLENBQUMsb0JBQW9CO0lBYTVCOzs7OztPQUtHO0lBQ0gsZ0JBQWdCLENBQUMsV0FBVyxTQUFTLGtCQUFrQixFQUNyRCxRQUFRLEVBQUUsV0FBVyxFQUNyQixRQUFRLEVBQUUsWUFBWSxDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQ2hFLFlBQVksRUFBRSxNQUFNLEdBQUcsU0FBUyxHQUMvQixPQUFPLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FFbEU7SUFFRDs7O09BR0c7SUFDSSxNQUFNLElBQUksR0FBRyxHQUFHLFNBQVMsQ0FFL0I7SUFFTSw2QkFBNkIsQ0FBQyxRQUFRLEVBQUUsd0JBQXdCLFFBRXRFO0lBRUQ7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtZQWFWLGNBQWM7SUFZNUI7Ozs7T0FJRztJQUNILFNBQVMsQ0FBQywwQkFBMEIsQ0FDbEMsR0FBRyxFQUFFLE9BQU8sRUFDWixLQUFLLEVBQUUsTUFBTSxFQUNiLE1BQU0sRUFBRSxNQUFNLEdBQ2I7UUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDO1FBQUMsU0FBUyxDQUFDLEVBQUUsU0FBUyxDQUFBO0tBQUUsQ0E2QjVDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsT0FBTyxDQUFDLDJCQUEyQjtJQWNuQzs7OztPQUlHO0lBQ0gsVUFBZ0Isc0JBQXNCLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQWtGakY7SUFFRCxVQUFnQix1QkFBdUIsQ0FBQyxDQUFDLEVBQ3ZDLGNBQWMsRUFBRSxNQUFNLE9BQU8sQ0FBQywrQkFBK0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUNqRSxLQUFLLEVBQUUsTUFBTSxFQUNiLE1BQU0sRUFBRSxNQUFNLEVBQ2QsU0FBUyxFQUFFLFNBQVMsR0FDbkIsT0FBTyxDQUFDLCtCQUErQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBb0I3QztJQUVELFVBQWdCLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkF3Q2xGO1lBUWEsMEJBQTBCO1lBK0QxQixvQkFBb0I7WUFzRHBCLHlCQUF5QjtZQXFEekIsb0JBQW9CO0lBSWxDOzs7T0FHRztJQUNVLFNBQVMsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE9BQU8sRUFBRSxDQUFDLGlCQU10RDtZQVlhLHlCQUF5QjtZQWdHekIsb0JBQW9CO1lBa0NwQixzQkFBc0I7SUFpQ3BDLE9BQU8sQ0FBQywwQkFBMEI7WUFhcEIsbUJBQW1CO1lBdUJuQixvQkFBb0I7WUE0QnBCLFVBQVU7SUFXWCxRQUFRLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FpQjlDO1lBWWEsdUJBQXVCO1lBOEJ2QixjQUFjO1lBdUNkLHdCQUF3QjtJQXVCdEM7Ozs7O09BS0c7SUFNVSxtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUWhHO0lBRUQ7Ozs7O09BS0c7SUFJVSxxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVN6RjtJQUVNLFlBQVksQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FFMUM7SUFFTSx5QkFBeUIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUVqRztZQUVhLFdBQVc7WUFjWCxVQUFVO0NBWXpCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libp2p_service.d.ts","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,EAAE,KAAK,MAAM,EAA6C,MAAM,uBAAuB,CAAC;AAG/F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGzD,OAAO,KAAK,EAAE,UAAU,EAAW,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,KAAK,EAAE,6BAA6B,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACvH,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,KAAK,UAAU,EACf,aAAa,EAGb,SAAS,EAIV,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,EAAE,EAA0D,MAAM,kBAAkB,CAAC;AAG9F,OAAO,
|
|
1
|
+
{"version":3,"file":"libp2p_service.d.ts","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -384,7 +384,7 @@ import { BlockAttestation, BlockProposal, P2PClientType, P2PMessage, PeerErrorSe
|
|
|
384
384
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
385
385
|
import { Tx } from '@aztec/stdlib/tx';
|
|
386
386
|
import { compressComponentVersions } from '@aztec/stdlib/versioning';
|
|
387
|
-
import { Attributes, OtelMetricsAdapter, WithTracer, trackSpan } from '@aztec/telemetry-client';
|
|
387
|
+
import { Attributes, OtelMetricsAdapter, SpanStatusCode, WithTracer, trackSpan } from '@aztec/telemetry-client';
|
|
388
388
|
import { gossipsub } from '@chainsafe/libp2p-gossipsub';
|
|
389
389
|
import { createPeerScoreParams, createTopicScoreParams } from '@chainsafe/libp2p-gossipsub/score';
|
|
390
390
|
import { SignaturePolicy } from '@chainsafe/libp2p-gossipsub/types';
|
|
@@ -514,9 +514,11 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
|
|
|
514
514
|
*/ blockReceivedCallback;
|
|
515
515
|
gossipSubEventHandler;
|
|
516
516
|
instrumentation;
|
|
517
|
+
telemetry;
|
|
517
518
|
logger;
|
|
518
519
|
constructor(clientType, config, node, peerDiscoveryService, reqresp, peerManager, mempools, archiver, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')){
|
|
519
520
|
super(telemetry, 'LibP2PService'), this.clientType = clientType, this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.reqresp = reqresp, this.peerManager = peerManager, this.mempools = mempools, this.archiver = archiver, this.epochCache = epochCache, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.msgIdSeenValidators = (_initProto(this), {}), this.protocolVersion = '', this.topicStrings = {};
|
|
521
|
+
this.telemetry = telemetry;
|
|
520
522
|
// Create child logger with fisherman prefix if in fisherman mode
|
|
521
523
|
this.logger = config.fishermanMode ? logger.createChild('[FISHERMAN]') : logger;
|
|
522
524
|
this.instrumentation = new P2PInstrumentation(telemetry, 'LibP2PService');
|
|
@@ -860,7 +862,9 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
|
|
|
860
862
|
if (!this.node.services.pubsub) {
|
|
861
863
|
throw new Error('Pubsub service not available.');
|
|
862
864
|
}
|
|
863
|
-
const
|
|
865
|
+
const isBlockProposal = topic === this.topicStrings[TopicType.block_proposal];
|
|
866
|
+
const traceContext = this.config.debugP2PInstrumentMessages && isBlockProposal ? this.telemetry.getTraceContext() : undefined;
|
|
867
|
+
const p2pMessage = P2PMessage.fromGossipable(message, this.config.debugP2PInstrumentMessages, traceContext);
|
|
864
868
|
const result = await this.node.services.pubsub.publish(topic, p2pMessage.toMessageData());
|
|
865
869
|
return result.recipients.length;
|
|
866
870
|
}
|
|
@@ -933,22 +937,59 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
|
|
|
933
937
|
if (!preValidationResult.result) {
|
|
934
938
|
return;
|
|
935
939
|
}
|
|
940
|
+
// Determine topic type for attributes
|
|
936
941
|
if (msg.topic === this.topicStrings[TopicType.tx]) {
|
|
937
942
|
topicType = TopicType.tx;
|
|
938
|
-
|
|
939
|
-
}
|
|
940
|
-
if (msg.topic === this.topicStrings[TopicType.block_attestation]) {
|
|
943
|
+
} else if (msg.topic === this.topicStrings[TopicType.block_attestation]) {
|
|
941
944
|
topicType = TopicType.block_attestation;
|
|
942
|
-
|
|
943
|
-
await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
|
|
944
|
-
}
|
|
945
|
-
}
|
|
946
|
-
if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
945
|
+
} else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
947
946
|
topicType = TopicType.block_proposal;
|
|
948
|
-
await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
|
|
949
947
|
}
|
|
950
|
-
|
|
951
|
-
|
|
948
|
+
// Process the message, optionally within a linked span for trace propagation
|
|
949
|
+
const processMessage = async ()=>{
|
|
950
|
+
if (msg.topic === this.topicStrings[TopicType.tx]) {
|
|
951
|
+
await this.handleGossipedTx(p2pMessage.payload, msgId, source);
|
|
952
|
+
}
|
|
953
|
+
if (msg.topic === this.topicStrings[TopicType.block_attestation]) {
|
|
954
|
+
if (this.clientType === P2PClientType.Full) {
|
|
955
|
+
await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
|
|
956
|
+
}
|
|
957
|
+
}
|
|
958
|
+
if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
959
|
+
await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
|
|
960
|
+
}
|
|
961
|
+
};
|
|
962
|
+
const latency = p2pMessage.timestamp !== undefined ? msgReceivedTime - p2pMessage.timestamp.getTime() : undefined;
|
|
963
|
+
const propagatedContext = p2pMessage.traceContext ? this.telemetry.extractPropagatedContext(p2pMessage.traceContext) : undefined;
|
|
964
|
+
if (propagatedContext) {
|
|
965
|
+
await this.tracer.startActiveSpan('LibP2PService.processMessage', {
|
|
966
|
+
attributes: {
|
|
967
|
+
[Attributes.TOPIC_NAME]: topicType,
|
|
968
|
+
[Attributes.PEER_ID]: source.toString()
|
|
969
|
+
}
|
|
970
|
+
}, propagatedContext, async (span)=>{
|
|
971
|
+
try {
|
|
972
|
+
await processMessage();
|
|
973
|
+
span.setStatus({
|
|
974
|
+
code: SpanStatusCode.OK
|
|
975
|
+
});
|
|
976
|
+
} catch (err) {
|
|
977
|
+
span.setStatus({
|
|
978
|
+
code: SpanStatusCode.ERROR,
|
|
979
|
+
message: String(err)
|
|
980
|
+
});
|
|
981
|
+
if (typeof err === 'string' || err && err instanceof Error) {
|
|
982
|
+
span.recordException(err);
|
|
983
|
+
}
|
|
984
|
+
throw err;
|
|
985
|
+
} finally{
|
|
986
|
+
span.end();
|
|
987
|
+
}
|
|
988
|
+
});
|
|
989
|
+
} else {
|
|
990
|
+
await processMessage();
|
|
991
|
+
}
|
|
992
|
+
if (latency !== undefined && topicType !== undefined) {
|
|
952
993
|
this.instrumentation.recordMessageLatency(topicType, latency);
|
|
953
994
|
}
|
|
954
995
|
return;
|
|
@@ -3,7 +3,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
|
3
3
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
4
4
|
import type { PeerInfo, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
5
5
|
import type { PeerErrorSeverity } from '@aztec/stdlib/p2p';
|
|
6
|
-
import {
|
|
6
|
+
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
7
7
|
import type { PeerId } from '@libp2p/interface';
|
|
8
8
|
import type { P2PConfig } from '../../config.js';
|
|
9
9
|
import type { FullLibp2p } from '../../util.js';
|
|
@@ -171,4 +171,4 @@ export declare class PeerManager implements PeerManagerInterface {
|
|
|
171
171
|
handleAuthRequestFromPeer(_authRequest: AuthRequest, peerId: PeerId): Promise<StatusMessage>;
|
|
172
172
|
private updateAuthenticatedPeers;
|
|
173
173
|
}
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
174
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVlcl9tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvcGVlci1tYW5hZ2VyL3BlZXJfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRzlELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBR2hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN4RixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFjLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBTTVELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRWpELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVoRCxPQUFPLEVBQUUsV0FBVyxFQUFnQixNQUFNLDhCQUE4QixDQUFDO0FBQ3pFLE9BQU8sRUFBRSxhQUFhLEVBQXVCLE1BQU0saUNBQWlDLENBQUM7QUFDckYsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFM0QsT0FBTyxFQUFrQixLQUFLLFdBQVcsRUFBRSxNQUFNLG1C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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peer_manager.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/peer_manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"peer_manager.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/peer_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,382 +1,8 @@
|
|
|
1
|
-
function applyDecs2203RFactory() {
|
|
2
|
-
function createAddInitializerMethod(initializers, decoratorFinishedRef) {
|
|
3
|
-
return function addInitializer(initializer) {
|
|
4
|
-
assertNotFinished(decoratorFinishedRef, "addInitializer");
|
|
5
|
-
assertCallable(initializer, "An initializer");
|
|
6
|
-
initializers.push(initializer);
|
|
7
|
-
};
|
|
8
|
-
}
|
|
9
|
-
function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
|
|
10
|
-
var kindStr;
|
|
11
|
-
switch(kind){
|
|
12
|
-
case 1:
|
|
13
|
-
kindStr = "accessor";
|
|
14
|
-
break;
|
|
15
|
-
case 2:
|
|
16
|
-
kindStr = "method";
|
|
17
|
-
break;
|
|
18
|
-
case 3:
|
|
19
|
-
kindStr = "getter";
|
|
20
|
-
break;
|
|
21
|
-
case 4:
|
|
22
|
-
kindStr = "setter";
|
|
23
|
-
break;
|
|
24
|
-
default:
|
|
25
|
-
kindStr = "field";
|
|
26
|
-
}
|
|
27
|
-
var ctx = {
|
|
28
|
-
kind: kindStr,
|
|
29
|
-
name: isPrivate ? "#" + name : name,
|
|
30
|
-
static: isStatic,
|
|
31
|
-
private: isPrivate,
|
|
32
|
-
metadata: metadata
|
|
33
|
-
};
|
|
34
|
-
var decoratorFinishedRef = {
|
|
35
|
-
v: false
|
|
36
|
-
};
|
|
37
|
-
ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
|
|
38
|
-
var get, set;
|
|
39
|
-
if (kind === 0) {
|
|
40
|
-
if (isPrivate) {
|
|
41
|
-
get = desc.get;
|
|
42
|
-
set = desc.set;
|
|
43
|
-
} else {
|
|
44
|
-
get = function() {
|
|
45
|
-
return this[name];
|
|
46
|
-
};
|
|
47
|
-
set = function(v) {
|
|
48
|
-
this[name] = v;
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
|
-
} else if (kind === 2) {
|
|
52
|
-
get = function() {
|
|
53
|
-
return desc.value;
|
|
54
|
-
};
|
|
55
|
-
} else {
|
|
56
|
-
if (kind === 1 || kind === 3) {
|
|
57
|
-
get = function() {
|
|
58
|
-
return desc.get.call(this);
|
|
59
|
-
};
|
|
60
|
-
}
|
|
61
|
-
if (kind === 1 || kind === 4) {
|
|
62
|
-
set = function(v) {
|
|
63
|
-
desc.set.call(this, v);
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
ctx.access = get && set ? {
|
|
68
|
-
get: get,
|
|
69
|
-
set: set
|
|
70
|
-
} : get ? {
|
|
71
|
-
get: get
|
|
72
|
-
} : {
|
|
73
|
-
set: set
|
|
74
|
-
};
|
|
75
|
-
try {
|
|
76
|
-
return dec(value, ctx);
|
|
77
|
-
} finally{
|
|
78
|
-
decoratorFinishedRef.v = true;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
function assertNotFinished(decoratorFinishedRef, fnName) {
|
|
82
|
-
if (decoratorFinishedRef.v) {
|
|
83
|
-
throw new Error("attempted to call " + fnName + " after decoration was finished");
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
function assertCallable(fn, hint) {
|
|
87
|
-
if (typeof fn !== "function") {
|
|
88
|
-
throw new TypeError(hint + " must be a function");
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
function assertValidReturnValue(kind, value) {
|
|
92
|
-
var type = typeof value;
|
|
93
|
-
if (kind === 1) {
|
|
94
|
-
if (type !== "object" || value === null) {
|
|
95
|
-
throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
|
|
96
|
-
}
|
|
97
|
-
if (value.get !== undefined) {
|
|
98
|
-
assertCallable(value.get, "accessor.get");
|
|
99
|
-
}
|
|
100
|
-
if (value.set !== undefined) {
|
|
101
|
-
assertCallable(value.set, "accessor.set");
|
|
102
|
-
}
|
|
103
|
-
if (value.init !== undefined) {
|
|
104
|
-
assertCallable(value.init, "accessor.init");
|
|
105
|
-
}
|
|
106
|
-
} else if (type !== "function") {
|
|
107
|
-
var hint;
|
|
108
|
-
if (kind === 0) {
|
|
109
|
-
hint = "field";
|
|
110
|
-
} else if (kind === 10) {
|
|
111
|
-
hint = "class";
|
|
112
|
-
} else {
|
|
113
|
-
hint = "method";
|
|
114
|
-
}
|
|
115
|
-
throw new TypeError(hint + " decorators must return a function or void 0");
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
|
|
119
|
-
var decs = decInfo[0];
|
|
120
|
-
var desc, init, value;
|
|
121
|
-
if (isPrivate) {
|
|
122
|
-
if (kind === 0 || kind === 1) {
|
|
123
|
-
desc = {
|
|
124
|
-
get: decInfo[3],
|
|
125
|
-
set: decInfo[4]
|
|
126
|
-
};
|
|
127
|
-
} else if (kind === 3) {
|
|
128
|
-
desc = {
|
|
129
|
-
get: decInfo[3]
|
|
130
|
-
};
|
|
131
|
-
} else if (kind === 4) {
|
|
132
|
-
desc = {
|
|
133
|
-
set: decInfo[3]
|
|
134
|
-
};
|
|
135
|
-
} else {
|
|
136
|
-
desc = {
|
|
137
|
-
value: decInfo[3]
|
|
138
|
-
};
|
|
139
|
-
}
|
|
140
|
-
} else if (kind !== 0) {
|
|
141
|
-
desc = Object.getOwnPropertyDescriptor(base, name);
|
|
142
|
-
}
|
|
143
|
-
if (kind === 1) {
|
|
144
|
-
value = {
|
|
145
|
-
get: desc.get,
|
|
146
|
-
set: desc.set
|
|
147
|
-
};
|
|
148
|
-
} else if (kind === 2) {
|
|
149
|
-
value = desc.value;
|
|
150
|
-
} else if (kind === 3) {
|
|
151
|
-
value = desc.get;
|
|
152
|
-
} else if (kind === 4) {
|
|
153
|
-
value = desc.set;
|
|
154
|
-
}
|
|
155
|
-
var newValue, get, set;
|
|
156
|
-
if (typeof decs === "function") {
|
|
157
|
-
newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
|
|
158
|
-
if (newValue !== void 0) {
|
|
159
|
-
assertValidReturnValue(kind, newValue);
|
|
160
|
-
if (kind === 0) {
|
|
161
|
-
init = newValue;
|
|
162
|
-
} else if (kind === 1) {
|
|
163
|
-
init = newValue.init;
|
|
164
|
-
get = newValue.get || value.get;
|
|
165
|
-
set = newValue.set || value.set;
|
|
166
|
-
value = {
|
|
167
|
-
get: get,
|
|
168
|
-
set: set
|
|
169
|
-
};
|
|
170
|
-
} else {
|
|
171
|
-
value = newValue;
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
} else {
|
|
175
|
-
for(var i = decs.length - 1; i >= 0; i--){
|
|
176
|
-
var dec = decs[i];
|
|
177
|
-
newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
|
|
178
|
-
if (newValue !== void 0) {
|
|
179
|
-
assertValidReturnValue(kind, newValue);
|
|
180
|
-
var newInit;
|
|
181
|
-
if (kind === 0) {
|
|
182
|
-
newInit = newValue;
|
|
183
|
-
} else if (kind === 1) {
|
|
184
|
-
newInit = newValue.init;
|
|
185
|
-
get = newValue.get || value.get;
|
|
186
|
-
set = newValue.set || value.set;
|
|
187
|
-
value = {
|
|
188
|
-
get: get,
|
|
189
|
-
set: set
|
|
190
|
-
};
|
|
191
|
-
} else {
|
|
192
|
-
value = newValue;
|
|
193
|
-
}
|
|
194
|
-
if (newInit !== void 0) {
|
|
195
|
-
if (init === void 0) {
|
|
196
|
-
init = newInit;
|
|
197
|
-
} else if (typeof init === "function") {
|
|
198
|
-
init = [
|
|
199
|
-
init,
|
|
200
|
-
newInit
|
|
201
|
-
];
|
|
202
|
-
} else {
|
|
203
|
-
init.push(newInit);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
if (kind === 0 || kind === 1) {
|
|
210
|
-
if (init === void 0) {
|
|
211
|
-
init = function(instance, init) {
|
|
212
|
-
return init;
|
|
213
|
-
};
|
|
214
|
-
} else if (typeof init !== "function") {
|
|
215
|
-
var ownInitializers = init;
|
|
216
|
-
init = function(instance, init) {
|
|
217
|
-
var value = init;
|
|
218
|
-
for(var i = 0; i < ownInitializers.length; i++){
|
|
219
|
-
value = ownInitializers[i].call(instance, value);
|
|
220
|
-
}
|
|
221
|
-
return value;
|
|
222
|
-
};
|
|
223
|
-
} else {
|
|
224
|
-
var originalInitializer = init;
|
|
225
|
-
init = function(instance, init) {
|
|
226
|
-
return originalInitializer.call(instance, init);
|
|
227
|
-
};
|
|
228
|
-
}
|
|
229
|
-
ret.push(init);
|
|
230
|
-
}
|
|
231
|
-
if (kind !== 0) {
|
|
232
|
-
if (kind === 1) {
|
|
233
|
-
desc.get = value.get;
|
|
234
|
-
desc.set = value.set;
|
|
235
|
-
} else if (kind === 2) {
|
|
236
|
-
desc.value = value;
|
|
237
|
-
} else if (kind === 3) {
|
|
238
|
-
desc.get = value;
|
|
239
|
-
} else if (kind === 4) {
|
|
240
|
-
desc.set = value;
|
|
241
|
-
}
|
|
242
|
-
if (isPrivate) {
|
|
243
|
-
if (kind === 1) {
|
|
244
|
-
ret.push(function(instance, args) {
|
|
245
|
-
return value.get.call(instance, args);
|
|
246
|
-
});
|
|
247
|
-
ret.push(function(instance, args) {
|
|
248
|
-
return value.set.call(instance, args);
|
|
249
|
-
});
|
|
250
|
-
} else if (kind === 2) {
|
|
251
|
-
ret.push(value);
|
|
252
|
-
} else {
|
|
253
|
-
ret.push(function(instance, args) {
|
|
254
|
-
return value.call(instance, args);
|
|
255
|
-
});
|
|
256
|
-
}
|
|
257
|
-
} else {
|
|
258
|
-
Object.defineProperty(base, name, desc);
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
function applyMemberDecs(Class, decInfos, metadata) {
|
|
263
|
-
var ret = [];
|
|
264
|
-
var protoInitializers;
|
|
265
|
-
var staticInitializers;
|
|
266
|
-
var existingProtoNonFields = new Map();
|
|
267
|
-
var existingStaticNonFields = new Map();
|
|
268
|
-
for(var i = 0; i < decInfos.length; i++){
|
|
269
|
-
var decInfo = decInfos[i];
|
|
270
|
-
if (!Array.isArray(decInfo)) continue;
|
|
271
|
-
var kind = decInfo[1];
|
|
272
|
-
var name = decInfo[2];
|
|
273
|
-
var isPrivate = decInfo.length > 3;
|
|
274
|
-
var isStatic = kind >= 5;
|
|
275
|
-
var base;
|
|
276
|
-
var initializers;
|
|
277
|
-
if (isStatic) {
|
|
278
|
-
base = Class;
|
|
279
|
-
kind = kind - 5;
|
|
280
|
-
staticInitializers = staticInitializers || [];
|
|
281
|
-
initializers = staticInitializers;
|
|
282
|
-
} else {
|
|
283
|
-
base = Class.prototype;
|
|
284
|
-
protoInitializers = protoInitializers || [];
|
|
285
|
-
initializers = protoInitializers;
|
|
286
|
-
}
|
|
287
|
-
if (kind !== 0 && !isPrivate) {
|
|
288
|
-
var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
|
|
289
|
-
var existingKind = existingNonFields.get(name) || 0;
|
|
290
|
-
if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
|
|
291
|
-
throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
|
|
292
|
-
} else if (!existingKind && kind > 2) {
|
|
293
|
-
existingNonFields.set(name, kind);
|
|
294
|
-
} else {
|
|
295
|
-
existingNonFields.set(name, true);
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
|
|
299
|
-
}
|
|
300
|
-
pushInitializers(ret, protoInitializers);
|
|
301
|
-
pushInitializers(ret, staticInitializers);
|
|
302
|
-
return ret;
|
|
303
|
-
}
|
|
304
|
-
function pushInitializers(ret, initializers) {
|
|
305
|
-
if (initializers) {
|
|
306
|
-
ret.push(function(instance) {
|
|
307
|
-
for(var i = 0; i < initializers.length; i++){
|
|
308
|
-
initializers[i].call(instance);
|
|
309
|
-
}
|
|
310
|
-
return instance;
|
|
311
|
-
});
|
|
312
|
-
}
|
|
313
|
-
}
|
|
314
|
-
function applyClassDecs(targetClass, classDecs, metadata) {
|
|
315
|
-
if (classDecs.length > 0) {
|
|
316
|
-
var initializers = [];
|
|
317
|
-
var newClass = targetClass;
|
|
318
|
-
var name = targetClass.name;
|
|
319
|
-
for(var i = classDecs.length - 1; i >= 0; i--){
|
|
320
|
-
var decoratorFinishedRef = {
|
|
321
|
-
v: false
|
|
322
|
-
};
|
|
323
|
-
try {
|
|
324
|
-
var nextNewClass = classDecs[i](newClass, {
|
|
325
|
-
kind: "class",
|
|
326
|
-
name: name,
|
|
327
|
-
addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
|
|
328
|
-
metadata
|
|
329
|
-
});
|
|
330
|
-
} finally{
|
|
331
|
-
decoratorFinishedRef.v = true;
|
|
332
|
-
}
|
|
333
|
-
if (nextNewClass !== undefined) {
|
|
334
|
-
assertValidReturnValue(10, nextNewClass);
|
|
335
|
-
newClass = nextNewClass;
|
|
336
|
-
}
|
|
337
|
-
}
|
|
338
|
-
return [
|
|
339
|
-
defineMetadata(newClass, metadata),
|
|
340
|
-
function() {
|
|
341
|
-
for(var i = 0; i < initializers.length; i++){
|
|
342
|
-
initializers[i].call(newClass);
|
|
343
|
-
}
|
|
344
|
-
}
|
|
345
|
-
];
|
|
346
|
-
}
|
|
347
|
-
}
|
|
348
|
-
function defineMetadata(Class, metadata) {
|
|
349
|
-
return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
|
|
350
|
-
configurable: true,
|
|
351
|
-
enumerable: true,
|
|
352
|
-
value: metadata
|
|
353
|
-
});
|
|
354
|
-
}
|
|
355
|
-
return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
|
|
356
|
-
if (parentClass !== void 0) {
|
|
357
|
-
var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
|
|
358
|
-
}
|
|
359
|
-
var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
|
|
360
|
-
var e = applyMemberDecs(targetClass, memberDecs, metadata);
|
|
361
|
-
if (!classDecs.length) defineMetadata(targetClass, metadata);
|
|
362
|
-
return {
|
|
363
|
-
e: e,
|
|
364
|
-
get c () {
|
|
365
|
-
return applyClassDecs(targetClass, classDecs, metadata);
|
|
366
|
-
}
|
|
367
|
-
};
|
|
368
|
-
};
|
|
369
|
-
}
|
|
370
|
-
function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
|
|
371
|
-
return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
|
|
372
|
-
}
|
|
373
|
-
var _dec, _initProto;
|
|
374
1
|
import { makeEthSignDigest, tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
|
|
375
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
376
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
377
4
|
import { bufferToHex } from '@aztec/foundation/string';
|
|
378
5
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
379
|
-
import { trackSpan } from '@aztec/telemetry-client';
|
|
380
6
|
import { peerIdFromString } from '@libp2p/peer-id';
|
|
381
7
|
import { ENR } from '@nethermindeth/enr';
|
|
382
8
|
import { inspect } from 'util';
|
|
@@ -394,7 +20,6 @@ const MAX_CACHED_PEER_AGE_MS = 5 * 60 * 1000; // 5 minutes
|
|
|
394
20
|
const FAILED_PEER_BAN_TIME_MS = 5 * 60 * 1000; // 5 minutes timeout after failing MAX_DIAL_ATTEMPTS
|
|
395
21
|
const GOODBYE_DIAL_TIMEOUT_MS = 1000;
|
|
396
22
|
const FAILED_AUTH_HANDSHAKE_EXPIRY_MS = 60 * 60 * 1000; // 1 hour
|
|
397
|
-
_dec = trackSpan('PeerManager.heartbeat');
|
|
398
23
|
export class PeerManager {
|
|
399
24
|
libP2PNode;
|
|
400
25
|
peerDiscoveryService;
|
|
@@ -406,15 +31,6 @@ export class PeerManager {
|
|
|
406
31
|
protocolVersion;
|
|
407
32
|
epochCache;
|
|
408
33
|
dateProvider;
|
|
409
|
-
static{
|
|
410
|
-
({ e: [_initProto] } = _apply_decs_2203_r(this, [
|
|
411
|
-
[
|
|
412
|
-
_dec,
|
|
413
|
-
2,
|
|
414
|
-
"heartbeat"
|
|
415
|
-
]
|
|
416
|
-
], []));
|
|
417
|
-
}
|
|
418
34
|
cachedPeers;
|
|
419
35
|
heartbeatCounter;
|
|
420
36
|
displayPeerCountsPeerHeartbeat;
|
|
@@ -443,7 +59,7 @@ export class PeerManager {
|
|
|
443
59
|
this.protocolVersion = protocolVersion;
|
|
444
60
|
this.epochCache = epochCache;
|
|
445
61
|
this.dateProvider = dateProvider;
|
|
446
|
-
this.cachedPeers =
|
|
62
|
+
this.cachedPeers = new Map();
|
|
447
63
|
this.heartbeatCounter = 0;
|
|
448
64
|
this.displayPeerCountsPeerHeartbeat = 0;
|
|
449
65
|
this.timedOutPeers = new Map();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/p2p",
|
|
3
|
-
"version": "4.0.0-nightly.
|
|
3
|
+
"version": "4.0.0-nightly.20260108",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -67,17 +67,17 @@
|
|
|
67
67
|
]
|
|
68
68
|
},
|
|
69
69
|
"dependencies": {
|
|
70
|
-
"@aztec/constants": "4.0.0-nightly.
|
|
71
|
-
"@aztec/epoch-cache": "4.0.0-nightly.
|
|
72
|
-
"@aztec/ethereum": "4.0.0-nightly.
|
|
73
|
-
"@aztec/foundation": "4.0.0-nightly.
|
|
74
|
-
"@aztec/kv-store": "4.0.0-nightly.
|
|
75
|
-
"@aztec/noir-contracts.js": "4.0.0-nightly.
|
|
76
|
-
"@aztec/noir-protocol-circuits-types": "4.0.0-nightly.
|
|
77
|
-
"@aztec/protocol-contracts": "4.0.0-nightly.
|
|
78
|
-
"@aztec/simulator": "4.0.0-nightly.
|
|
79
|
-
"@aztec/stdlib": "4.0.0-nightly.
|
|
80
|
-
"@aztec/telemetry-client": "4.0.0-nightly.
|
|
70
|
+
"@aztec/constants": "4.0.0-nightly.20260108",
|
|
71
|
+
"@aztec/epoch-cache": "4.0.0-nightly.20260108",
|
|
72
|
+
"@aztec/ethereum": "4.0.0-nightly.20260108",
|
|
73
|
+
"@aztec/foundation": "4.0.0-nightly.20260108",
|
|
74
|
+
"@aztec/kv-store": "4.0.0-nightly.20260108",
|
|
75
|
+
"@aztec/noir-contracts.js": "4.0.0-nightly.20260108",
|
|
76
|
+
"@aztec/noir-protocol-circuits-types": "4.0.0-nightly.20260108",
|
|
77
|
+
"@aztec/protocol-contracts": "4.0.0-nightly.20260108",
|
|
78
|
+
"@aztec/simulator": "4.0.0-nightly.20260108",
|
|
79
|
+
"@aztec/stdlib": "4.0.0-nightly.20260108",
|
|
80
|
+
"@aztec/telemetry-client": "4.0.0-nightly.20260108",
|
|
81
81
|
"@chainsafe/libp2p-gossipsub": "13.0.0",
|
|
82
82
|
"@chainsafe/libp2p-noise": "^15.0.0",
|
|
83
83
|
"@chainsafe/libp2p-yamux": "^6.0.2",
|
|
@@ -104,8 +104,8 @@
|
|
|
104
104
|
"xxhash-wasm": "^1.1.0"
|
|
105
105
|
},
|
|
106
106
|
"devDependencies": {
|
|
107
|
-
"@aztec/archiver": "4.0.0-nightly.
|
|
108
|
-
"@aztec/world-state": "4.0.0-nightly.
|
|
107
|
+
"@aztec/archiver": "4.0.0-nightly.20260108",
|
|
108
|
+
"@aztec/world-state": "4.0.0-nightly.20260108",
|
|
109
109
|
"@jest/globals": "^30.0.0",
|
|
110
110
|
"@types/jest": "^30.0.0",
|
|
111
111
|
"@types/node": "^22.15.17",
|
package/src/client/p2p_client.ts
CHANGED
|
@@ -3,28 +3,21 @@ import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
5
5
|
import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
|
|
6
|
-
import
|
|
7
|
-
EthAddress,
|
|
8
|
-
L2BlockId,
|
|
9
|
-
L2BlockNew,
|
|
10
|
-
L2BlockSource,
|
|
6
|
+
import {
|
|
7
|
+
type EthAddress,
|
|
8
|
+
type L2BlockId,
|
|
9
|
+
type L2BlockNew,
|
|
10
|
+
type L2BlockSource,
|
|
11
11
|
L2BlockStream,
|
|
12
|
-
L2BlockStreamEvent,
|
|
13
|
-
L2Tips,
|
|
12
|
+
type L2BlockStreamEvent,
|
|
13
|
+
type L2Tips,
|
|
14
14
|
} from '@aztec/stdlib/block';
|
|
15
15
|
import type { ContractDataSource } from '@aztec/stdlib/contract';
|
|
16
16
|
import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
17
17
|
import { type PeerInfo, tryStop } from '@aztec/stdlib/interfaces/server';
|
|
18
18
|
import { BlockAttestation, type BlockProposal, type P2PClientType } from '@aztec/stdlib/p2p';
|
|
19
19
|
import type { Tx, TxHash } from '@aztec/stdlib/tx';
|
|
20
|
-
import {
|
|
21
|
-
Attributes,
|
|
22
|
-
type TelemetryClient,
|
|
23
|
-
TraceableL2BlockStream,
|
|
24
|
-
WithTracer,
|
|
25
|
-
getTelemetryClient,
|
|
26
|
-
trackSpan,
|
|
27
|
-
} from '@aztec/telemetry-client';
|
|
20
|
+
import { Attributes, type TelemetryClient, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
|
|
28
21
|
|
|
29
22
|
import type { PeerId } from '@libp2p/interface';
|
|
30
23
|
import type { ENR } from '@nethermindeth/enr';
|
|
@@ -335,12 +328,10 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
|
|
|
335
328
|
private initBlockStream(startingBlock?: BlockNumber) {
|
|
336
329
|
if (!this.blockStream) {
|
|
337
330
|
const { blockRequestBatchSize: batchSize, blockCheckIntervalMS: pollIntervalMS } = this.config;
|
|
338
|
-
this.blockStream = new
|
|
331
|
+
this.blockStream = new L2BlockStream(
|
|
339
332
|
this.l2BlockSource,
|
|
340
333
|
this,
|
|
341
334
|
this,
|
|
342
|
-
this.telemetry.getTracer('P2PL2BlockStream'),
|
|
343
|
-
'P2PL2BlockStream',
|
|
344
335
|
createLogger(`${this.log.module}:l2-block-stream`),
|
|
345
336
|
{ batchSize, pollIntervalMS, startingBlock },
|
|
346
337
|
);
|
|
@@ -28,7 +28,14 @@ import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
|
28
28
|
import { Tx, type TxHash, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
|
|
29
29
|
import type { UInt64 } from '@aztec/stdlib/types';
|
|
30
30
|
import { compressComponentVersions } from '@aztec/stdlib/versioning';
|
|
31
|
-
import {
|
|
31
|
+
import {
|
|
32
|
+
Attributes,
|
|
33
|
+
OtelMetricsAdapter,
|
|
34
|
+
SpanStatusCode,
|
|
35
|
+
type TelemetryClient,
|
|
36
|
+
WithTracer,
|
|
37
|
+
trackSpan,
|
|
38
|
+
} from '@aztec/telemetry-client';
|
|
32
39
|
|
|
33
40
|
import {
|
|
34
41
|
type GossipSub,
|
|
@@ -144,6 +151,8 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
|
|
|
144
151
|
|
|
145
152
|
private instrumentation: P2PInstrumentation;
|
|
146
153
|
|
|
154
|
+
private telemetry: TelemetryClient;
|
|
155
|
+
|
|
147
156
|
protected logger: Logger;
|
|
148
157
|
|
|
149
158
|
constructor(
|
|
@@ -162,6 +171,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
|
|
|
162
171
|
logger: Logger = createLogger('p2p:libp2p_service'),
|
|
163
172
|
) {
|
|
164
173
|
super(telemetry, 'LibP2PService');
|
|
174
|
+
this.telemetry = telemetry;
|
|
165
175
|
|
|
166
176
|
// Create child logger with fisherman prefix if in fisherman mode
|
|
167
177
|
this.logger = config.fishermanMode ? logger.createChild('[FISHERMAN]') : logger;
|
|
@@ -622,7 +632,10 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
|
|
|
622
632
|
if (!this.node.services.pubsub) {
|
|
623
633
|
throw new Error('Pubsub service not available.');
|
|
624
634
|
}
|
|
625
|
-
const
|
|
635
|
+
const isBlockProposal = topic === this.topicStrings[TopicType.block_proposal];
|
|
636
|
+
const traceContext =
|
|
637
|
+
this.config.debugP2PInstrumentMessages && isBlockProposal ? this.telemetry.getTraceContext() : undefined;
|
|
638
|
+
const p2pMessage = P2PMessage.fromGossipable(message, this.config.debugP2PInstrumentMessages, traceContext);
|
|
626
639
|
const result = await this.node.services.pubsub.publish(topic, p2pMessage.toMessageData());
|
|
627
640
|
return result.recipients.length;
|
|
628
641
|
}
|
|
@@ -707,23 +720,70 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
|
|
|
707
720
|
return;
|
|
708
721
|
}
|
|
709
722
|
|
|
723
|
+
// Determine topic type for attributes
|
|
710
724
|
if (msg.topic === this.topicStrings[TopicType.tx]) {
|
|
711
725
|
topicType = TopicType.tx;
|
|
712
|
-
|
|
713
|
-
}
|
|
714
|
-
if (msg.topic === this.topicStrings[TopicType.block_attestation]) {
|
|
726
|
+
} else if (msg.topic === this.topicStrings[TopicType.block_attestation]) {
|
|
715
727
|
topicType = TopicType.block_attestation;
|
|
716
|
-
|
|
717
|
-
await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
|
|
718
|
-
}
|
|
719
|
-
}
|
|
720
|
-
if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
728
|
+
} else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
721
729
|
topicType = TopicType.block_proposal;
|
|
722
|
-
await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
|
|
723
730
|
}
|
|
724
731
|
|
|
725
|
-
|
|
726
|
-
|
|
732
|
+
// Process the message, optionally within a linked span for trace propagation
|
|
733
|
+
const processMessage = async () => {
|
|
734
|
+
if (msg.topic === this.topicStrings[TopicType.tx]) {
|
|
735
|
+
await this.handleGossipedTx(p2pMessage.payload, msgId, source);
|
|
736
|
+
}
|
|
737
|
+
if (msg.topic === this.topicStrings[TopicType.block_attestation]) {
|
|
738
|
+
if (this.clientType === P2PClientType.Full) {
|
|
739
|
+
await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
|
|
740
|
+
}
|
|
741
|
+
}
|
|
742
|
+
if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
743
|
+
await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
|
|
744
|
+
}
|
|
745
|
+
};
|
|
746
|
+
|
|
747
|
+
const latency = p2pMessage.timestamp !== undefined ? msgReceivedTime - p2pMessage.timestamp.getTime() : undefined;
|
|
748
|
+
const propagatedContext = p2pMessage.traceContext
|
|
749
|
+
? this.telemetry.extractPropagatedContext(p2pMessage.traceContext)
|
|
750
|
+
: undefined;
|
|
751
|
+
|
|
752
|
+
if (propagatedContext) {
|
|
753
|
+
await this.tracer.startActiveSpan(
|
|
754
|
+
'LibP2PService.processMessage',
|
|
755
|
+
{
|
|
756
|
+
attributes: {
|
|
757
|
+
[Attributes.TOPIC_NAME]: topicType!,
|
|
758
|
+
[Attributes.PEER_ID]: source.toString(),
|
|
759
|
+
},
|
|
760
|
+
},
|
|
761
|
+
propagatedContext,
|
|
762
|
+
async span => {
|
|
763
|
+
try {
|
|
764
|
+
await processMessage();
|
|
765
|
+
span.setStatus({
|
|
766
|
+
code: SpanStatusCode.OK,
|
|
767
|
+
});
|
|
768
|
+
} catch (err) {
|
|
769
|
+
span.setStatus({
|
|
770
|
+
code: SpanStatusCode.ERROR,
|
|
771
|
+
message: String(err),
|
|
772
|
+
});
|
|
773
|
+
if (typeof err === 'string' || (err && err instanceof Error)) {
|
|
774
|
+
span.recordException(err);
|
|
775
|
+
}
|
|
776
|
+
throw err;
|
|
777
|
+
} finally {
|
|
778
|
+
span.end();
|
|
779
|
+
}
|
|
780
|
+
},
|
|
781
|
+
);
|
|
782
|
+
} else {
|
|
783
|
+
await processMessage();
|
|
784
|
+
}
|
|
785
|
+
|
|
786
|
+
if (latency !== undefined && topicType !== undefined) {
|
|
727
787
|
this.instrumentation.recordMessageLatency(topicType, latency);
|
|
728
788
|
}
|
|
729
789
|
|
|
@@ -7,7 +7,7 @@ import { bufferToHex } from '@aztec/foundation/string';
|
|
|
7
7
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
8
8
|
import type { PeerInfo, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
9
9
|
import type { PeerErrorSeverity } from '@aztec/stdlib/p2p';
|
|
10
|
-
import {
|
|
10
|
+
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
11
11
|
|
|
12
12
|
import type { Connection, PeerId } from '@libp2p/interface';
|
|
13
13
|
import { peerIdFromString } from '@libp2p/peer-id';
|
|
@@ -161,7 +161,6 @@ export class PeerManager implements PeerManagerInterface {
|
|
|
161
161
|
return this.metrics.tracer;
|
|
162
162
|
}
|
|
163
163
|
|
|
164
|
-
@trackSpan('PeerManager.heartbeat')
|
|
165
164
|
public async heartbeat() {
|
|
166
165
|
this.heartbeatCounter++;
|
|
167
166
|
this.peerScoring.decayAllScores();
|