@aztec/p2p 0.56.0 → 0.57.0
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/attestation_pool/attestation_pool.d.ts +2 -1
- package/dest/attestation_pool/attestation_pool.d.ts.map +1 -1
- package/dest/attestation_pool/memory_attestation_pool.d.ts +2 -1
- package/dest/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
- package/dest/attestation_pool/memory_attestation_pool.js +42 -10
- package/dest/attestation_pool/mocks.d.ts +2 -1
- package/dest/attestation_pool/mocks.d.ts.map +1 -1
- package/dest/attestation_pool/mocks.js +2 -3
- package/dest/client/index.d.ts +4 -1
- package/dest/client/index.d.ts.map +1 -1
- package/dest/client/index.js +7 -3
- package/dest/client/p2p_client.d.ts +25 -6
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +28 -13
- package/dest/epoch_proof_quote_pool/epoch_proof_quote_pool.d.ts +7 -0
- package/dest/epoch_proof_quote_pool/epoch_proof_quote_pool.d.ts.map +1 -0
- package/dest/epoch_proof_quote_pool/epoch_proof_quote_pool.js +2 -0
- package/dest/epoch_proof_quote_pool/index.d.ts +4 -0
- package/dest/epoch_proof_quote_pool/index.d.ts.map +1 -0
- package/dest/epoch_proof_quote_pool/index.js +4 -0
- package/dest/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.d.ts +10 -0
- package/dest/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.d.ts.map +1 -0
- package/dest/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.js +22 -0
- package/dest/epoch_proof_quote_pool/test_utils.d.ts +8 -0
- package/dest/epoch_proof_quote_pool/test_utils.d.ts.map +1 -0
- package/dest/epoch_proof_quote_pool/test_utils.js +21 -0
- package/dest/index.d.ts +4 -3
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +5 -4
- package/dest/service/libp2p_service.js +3 -3
- package/dest/service/reqresp/reqresp.d.ts +0 -1
- package/dest/service/reqresp/reqresp.d.ts.map +1 -1
- package/dest/service/reqresp/reqresp.js +7 -4
- package/package.json +10 -6
- package/src/attestation_pool/attestation_pool.ts +2 -1
- package/src/attestation_pool/memory_attestation_pool.ts +50 -12
- package/src/attestation_pool/mocks.ts +5 -2
- package/src/client/index.ts +20 -3
- package/src/client/p2p_client.ts +46 -13
- package/src/epoch_proof_quote_pool/epoch_proof_quote_pool.ts +7 -0
- package/src/epoch_proof_quote_pool/index.ts +3 -0
- package/src/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.ts +26 -0
- package/src/epoch_proof_quote_pool/test_utils.ts +26 -0
- package/src/index.ts +4 -3
- package/src/service/libp2p_service.ts +2 -2
- package/src/service/reqresp/reqresp.ts +9 -5
- package/dest/client/mocks.d.ts +0 -65
- package/dest/client/mocks.d.ts.map +0 -1
- package/dest/client/mocks.js +0 -106
- package/src/client/mocks.ts +0 -129
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { EpochProofQuote, EpochProofQuotePayload } from '@aztec/circuit-types';
|
|
2
|
+
import { EthAddress } from '@aztec/circuits.js';
|
|
3
|
+
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
4
|
+
import { Secp256k1Signer, randomBigInt, randomInt } from '@aztec/foundation/crypto';
|
|
5
|
+
export function makeRandomEpochProofQuotePayload() {
|
|
6
|
+
return EpochProofQuotePayload.from({
|
|
7
|
+
basisPointFee: randomInt(10000),
|
|
8
|
+
bondAmount: 1000000000000000000n,
|
|
9
|
+
epochToProve: randomBigInt(1000000n),
|
|
10
|
+
prover: EthAddress.random(),
|
|
11
|
+
validUntilSlot: randomBigInt(1000000n),
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
export function makeRandomEpochProofQuote(payload) {
|
|
15
|
+
const signer = Secp256k1Signer.random();
|
|
16
|
+
return {
|
|
17
|
+
quote: EpochProofQuote.new(Buffer32.random(), payload ?? makeRandomEpochProofQuotePayload(), signer),
|
|
18
|
+
signer,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lcG9jaF9wcm9vZl9xdW90ZV9wb29sL3Rlc3RfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQy9FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDcEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFcEYsTUFBTSxVQUFVLGdDQUFnQztJQUM5QyxPQUFPLHNCQUFzQixDQUFDLElBQUksQ0FBQztRQUNqQyxhQUFhLEVBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQztRQUMvQixVQUFVLEVBQUUsb0JBQW9CO1FBQ2hDLFlBQVksRUFBRSxZQUFZLENBQUMsUUFBUSxDQUFDO1FBQ3BDLE1BQU0sRUFBRSxVQUFVLENBQUMsTUFBTSxFQUFFO1FBQzNCLGNBQWMsRUFBRSxZQUFZLENBQUMsUUFBUSxDQUFDO0tBQ3ZDLENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRCxNQUFNLFVBQVUseUJBQXlCLENBQUMsT0FBZ0M7SUFJeEUsTUFBTSxNQUFNLEdBQUcsZUFBZSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBRXhDLE9BQU87UUFDTCxLQUFLLEVBQUUsZUFBZSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxJQUFJLGdDQUFnQyxFQUFFLEVBQUUsTUFBTSxDQUFDO1FBQ3BHLE1BQU07S0FDUCxDQUFDO0FBQ0osQ0FBQyJ9
|
package/dest/index.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
export * from './attestation_pool/index.js';
|
|
2
|
+
export * from './bootstrap/bootstrap.js';
|
|
1
3
|
export * from './client/index.js';
|
|
2
4
|
export * from './config.js';
|
|
3
|
-
export * from './
|
|
4
|
-
export * from './attestation_pool/index.js';
|
|
5
|
+
export * from './epoch_proof_quote_pool/index.js';
|
|
5
6
|
export * from './service/index.js';
|
|
6
|
-
export * from './
|
|
7
|
+
export * from './tx_pool/index.js';
|
|
7
8
|
export * from './tx_validator/index.js';
|
|
8
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
export * from './attestation_pool/index.js';
|
|
2
|
+
export * from './bootstrap/bootstrap.js';
|
|
1
3
|
export * from './client/index.js';
|
|
2
4
|
export * from './config.js';
|
|
3
|
-
export * from './
|
|
4
|
-
export * from './attestation_pool/index.js';
|
|
5
|
+
export * from './epoch_proof_quote_pool/index.js';
|
|
5
6
|
export * from './service/index.js';
|
|
6
|
-
export * from './
|
|
7
|
+
export * from './tx_pool/index.js';
|
|
7
8
|
export * from './tx_validator/index.js';
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyx5QkFBeUIsQ0FBQyJ9
|
|
@@ -118,12 +118,12 @@ export class LibP2PService {
|
|
|
118
118
|
await this.discoveryRunningPromise?.stop();
|
|
119
119
|
this.logger.debug('Stopping peer discovery service...');
|
|
120
120
|
await this.peerDiscoveryService.stop();
|
|
121
|
+
this.logger.debug('Request response service stopped...');
|
|
122
|
+
await this.reqresp.stop();
|
|
121
123
|
this.logger.debug('Stopping LibP2P...');
|
|
122
124
|
await this.stopLibP2P();
|
|
123
125
|
this.logger.info('LibP2P service stopped');
|
|
124
126
|
this.logger.debug('Stopping request response service...');
|
|
125
|
-
await this.reqresp.stop();
|
|
126
|
-
this.logger.debug('Request response service stopped...');
|
|
127
127
|
}
|
|
128
128
|
/**
|
|
129
129
|
* Creates an instance of the LibP2P service.
|
|
@@ -429,4 +429,4 @@ export class LibP2PService {
|
|
|
429
429
|
}
|
|
430
430
|
}
|
|
431
431
|
}
|
|
432
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../src/service/libp2p_service.ts"],"names":[],"mappings":"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"}
|
|
432
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../src/service/libp2p_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ export declare class ReqResp {
|
|
|
20
20
|
protected readonly libp2p: Libp2p;
|
|
21
21
|
private peerManager;
|
|
22
22
|
protected readonly logger: Logger;
|
|
23
|
-
private abortController;
|
|
24
23
|
private overallRequestTimeoutMs;
|
|
25
24
|
private individualRequestTimeoutMs;
|
|
26
25
|
private subProtocolHandlers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reqresp.d.ts","sourceRoot":"","sources":["../../../src/service/reqresp/reqresp.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uBAAuB,CAAC;AAGvE,OAAO,EAA2B,KAAK,MAAM,EAAe,MAAM,mBAAmB,CAAC;AAEtF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIrC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EACjC,KAAK,cAAc,EAEpB,MAAM,gBAAgB,CAAC;AAGxB;;;;;;;;;;GAUG;AACH,qBAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"reqresp.d.ts","sourceRoot":"","sources":["../../../src/service/reqresp/reqresp.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uBAAuB,CAAC;AAGvE,OAAO,EAA2B,KAAK,MAAM,EAAe,MAAM,mBAAmB,CAAC;AAEtF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIrC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EACjC,KAAK,cAAc,EAEpB,MAAM,gBAAgB,CAAC;AAGxB;;;;;;;;;;GAUG;AACH,qBAAa,OAAO;IAYoB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IAAE,OAAO,CAAC,WAAW;IAX5F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,uBAAuB,CAAS;IACxC,OAAO,CAAC,0BAA0B,CAAS;IAG3C,OAAO,CAAC,mBAAmB,CAA6D;IACxF,OAAO,CAAC,qBAAqB,CAAiE;IAE9F,OAAO,CAAC,WAAW,CAA6B;gBAEpC,MAAM,EAAE,gBAAgB,EAAqB,MAAM,EAAE,MAAM,EAAU,WAAW,EAAE,WAAW;IASzG;;OAEG;IACG,KAAK,CAAC,mBAAmB,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,4BAA4B;IAWhH;;OAEG;IACG,IAAI;IAiBV;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACG,WAAW,CAAC,WAAW,SAAS,kBAAkB,EACtD,WAAW,EAAE,WAAW,EACxB,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;IAwC7E;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,iBAAiB,CACrB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAmC9B;;OAEG;YACW,WAAW;IASzB;;;;;;;;;;;;;;;OAeG;YACW,aAAa;CA6B5B"}
|
|
@@ -21,7 +21,6 @@ export class ReqResp {
|
|
|
21
21
|
constructor(config, libp2p, peerManager) {
|
|
22
22
|
this.libp2p = libp2p;
|
|
23
23
|
this.peerManager = peerManager;
|
|
24
|
-
this.abortController = new AbortController();
|
|
25
24
|
// Warning, if the `start` function is not called as the parent class constructor, then the default sub protocol handlers will be used ( not good )
|
|
26
25
|
this.subProtocolHandlers = DEFAULT_SUB_PROTOCOL_HANDLERS;
|
|
27
26
|
this.subProtocolValidators = DEFAULT_SUB_PROTOCOL_VALIDATORS;
|
|
@@ -50,9 +49,13 @@ export class ReqResp {
|
|
|
50
49
|
for (const protocol of Object.keys(this.subProtocolHandlers)) {
|
|
51
50
|
await this.libp2p.unhandle(protocol);
|
|
52
51
|
}
|
|
52
|
+
// Close all active connections
|
|
53
|
+
const closeStreamPromises = this.libp2p.getConnections().map(connection => connection.close());
|
|
54
|
+
await Promise.all(closeStreamPromises);
|
|
55
|
+
this.logger.debug('ReqResp: All active streams closed');
|
|
53
56
|
this.rateLimiter.stop();
|
|
54
|
-
|
|
55
|
-
|
|
57
|
+
this.logger.debug('ReqResp: Rate limiter stopped');
|
|
58
|
+
// NOTE: We assume libp2p instance is managed by the caller
|
|
56
59
|
}
|
|
57
60
|
/**
|
|
58
61
|
* Send a request to peers, returns the first response
|
|
@@ -219,4 +222,4 @@ export class ReqResp {
|
|
|
219
222
|
}
|
|
220
223
|
}
|
|
221
224
|
}
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
225
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxcmVzcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlL3JlcXJlc3AvcmVxcmVzcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw4Q0FBOEM7QUFDOUMsT0FBTyxFQUFlLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDdkUsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHeEUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUkvQixPQUFPLEVBQUUsNkJBQTZCLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU1RyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV2RCxPQUFPLEVBQ0wsNkJBQTZCLEVBQzdCLCtCQUErQixFQUsvQixjQUFjLEdBQ2YsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUU1RTs7Ozs7Ozs7OztHQVVHO0FBQ0gsTUFBTSxPQUFPLE9BQU87SUFZbEIsWUFBWSxNQUF3QixFQUFxQixNQUFjLEVBQVUsV0FBd0I7UUFBaEQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUFVLGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBTnpHLG1KQUFtSjtRQUMzSSx3QkFBbUIsR0FBK0IsNkJBQTZCLENBQUM7UUFDaEYsMEJBQXFCLEdBQWlDLCtCQUErQixDQUFDO1FBSzVGLElBQUksQ0FBQyxNQUFNLEdBQUcsaUJBQWlCLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUVyRCxJQUFJLENBQUMsdUJBQXVCLEdBQUcsTUFBTSxDQUFDLHVCQUF1QixDQUFDO1FBQzlELElBQUksQ0FBQywwQkFBMEIsR0FBRyxNQUFNLENBQUMsMEJBQTBCLENBQUM7UUFFcEUsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLDBCQUEwQixDQUFDLFdBQVcsQ0FBQyxD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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/p2p",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.57.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"typedocOptions": {
|
|
@@ -37,6 +37,9 @@
|
|
|
37
37
|
"parser": {
|
|
38
38
|
"syntax": "typescript",
|
|
39
39
|
"decorators": true
|
|
40
|
+
},
|
|
41
|
+
"transform": {
|
|
42
|
+
"decoratorVersion": "2022-03"
|
|
40
43
|
}
|
|
41
44
|
}
|
|
42
45
|
}
|
|
@@ -56,11 +59,11 @@
|
|
|
56
59
|
"testTimeout": 15000
|
|
57
60
|
},
|
|
58
61
|
"dependencies": {
|
|
59
|
-
"@aztec/circuit-types": "0.
|
|
60
|
-
"@aztec/circuits.js": "0.
|
|
61
|
-
"@aztec/foundation": "0.
|
|
62
|
-
"@aztec/kv-store": "0.
|
|
63
|
-
"@aztec/telemetry-client": "0.
|
|
62
|
+
"@aztec/circuit-types": "0.57.0",
|
|
63
|
+
"@aztec/circuits.js": "0.57.0",
|
|
64
|
+
"@aztec/foundation": "0.57.0",
|
|
65
|
+
"@aztec/kv-store": "0.57.0",
|
|
66
|
+
"@aztec/telemetry-client": "0.57.0",
|
|
64
67
|
"@chainsafe/discv5": "9.0.0",
|
|
65
68
|
"@chainsafe/enr": "3.0.0",
|
|
66
69
|
"@chainsafe/libp2p-gossipsub": "13.0.0",
|
|
@@ -86,6 +89,7 @@
|
|
|
86
89
|
"tslib": "^2.4.0"
|
|
87
90
|
},
|
|
88
91
|
"devDependencies": {
|
|
92
|
+
"@aztec/archiver": "workspace:^",
|
|
89
93
|
"@jest/globals": "^29.5.0",
|
|
90
94
|
"@types/jest": "^29.5.0",
|
|
91
95
|
"@types/node": "^18.14.6",
|
|
@@ -36,7 +36,8 @@ export interface AttestationPool {
|
|
|
36
36
|
* Retrieve all of the attestations observed pertaining to a given slot
|
|
37
37
|
*
|
|
38
38
|
* @param slot - The slot to query
|
|
39
|
+
* @param proposalId - The proposal to query
|
|
39
40
|
* @return BlockAttestations
|
|
40
41
|
*/
|
|
41
|
-
getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
|
|
42
|
+
getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
|
|
42
43
|
}
|
|
@@ -4,19 +4,21 @@ import { createDebugLogger } from '@aztec/foundation/log';
|
|
|
4
4
|
import { type AttestationPool } from './attestation_pool.js';
|
|
5
5
|
|
|
6
6
|
export class InMemoryAttestationPool implements AttestationPool {
|
|
7
|
-
private attestations: Map</*slot=*/ bigint, Map</*address=*/ string, BlockAttestation
|
|
7
|
+
private attestations: Map</*slot=*/ bigint, Map</*proposalId*/ string, Map</*address=*/ string, BlockAttestation>>>;
|
|
8
8
|
|
|
9
9
|
constructor(private log = createDebugLogger('aztec:attestation_pool')) {
|
|
10
10
|
this.attestations = new Map();
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
public getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]> {
|
|
13
|
+
public getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
|
|
14
14
|
const slotAttestationMap = this.attestations.get(slot);
|
|
15
15
|
if (slotAttestationMap) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const proposalAttestationMap = slotAttestationMap.get(proposalId);
|
|
17
|
+
if (proposalAttestationMap) {
|
|
18
|
+
return Promise.resolve(Array.from(proposalAttestationMap.values()));
|
|
19
|
+
}
|
|
19
20
|
}
|
|
21
|
+
return Promise.resolve([]);
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
public addAttestations(attestations: BlockAttestation[]): Promise<void> {
|
|
@@ -24,10 +26,12 @@ export class InMemoryAttestationPool implements AttestationPool {
|
|
|
24
26
|
// Perf: order and group by slot before insertion
|
|
25
27
|
const slotNumber = attestation.payload.header.globalVariables.slotNumber;
|
|
26
28
|
|
|
29
|
+
const proposalId = attestation.p2pMessageIdentifier().toString();
|
|
27
30
|
const address = attestation.getSender();
|
|
28
31
|
|
|
29
32
|
const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
|
|
30
|
-
slotAttestationMap
|
|
33
|
+
const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
|
|
34
|
+
proposalAttestationMap.set(address.toString(), attestation);
|
|
31
35
|
|
|
32
36
|
this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
|
|
33
37
|
}
|
|
@@ -41,14 +45,27 @@ export class InMemoryAttestationPool implements AttestationPool {
|
|
|
41
45
|
return Promise.resolve();
|
|
42
46
|
}
|
|
43
47
|
|
|
48
|
+
public deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void> {
|
|
49
|
+
const slotAttestationMap = this.attestations.get(slot);
|
|
50
|
+
if (slotAttestationMap) {
|
|
51
|
+
slotAttestationMap.delete(proposalId);
|
|
52
|
+
this.log.verbose(`Removed attestation for slot ${slot}`);
|
|
53
|
+
}
|
|
54
|
+
return Promise.resolve();
|
|
55
|
+
}
|
|
56
|
+
|
|
44
57
|
public deleteAttestations(attestations: BlockAttestation[]): Promise<void> {
|
|
45
58
|
for (const attestation of attestations) {
|
|
46
59
|
const slotNumber = attestation.payload.header.globalVariables.slotNumber;
|
|
47
60
|
const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
|
|
48
61
|
if (slotAttestationMap) {
|
|
49
|
-
const
|
|
50
|
-
slotAttestationMap
|
|
51
|
-
|
|
62
|
+
const proposalId = attestation.p2pMessageIdentifier().toString();
|
|
63
|
+
const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
|
|
64
|
+
if (proposalAttestationMap) {
|
|
65
|
+
const address = attestation.getSender();
|
|
66
|
+
proposalAttestationMap.delete(address.toString());
|
|
67
|
+
this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
|
|
68
|
+
}
|
|
52
69
|
}
|
|
53
70
|
}
|
|
54
71
|
return Promise.resolve();
|
|
@@ -59,13 +76,34 @@ export class InMemoryAttestationPool implements AttestationPool {
|
|
|
59
76
|
* Get Slot or Default
|
|
60
77
|
*
|
|
61
78
|
* Fetch the slot mapping, if it does not exist, then create a mapping and return it
|
|
79
|
+
* @param map - The map to fetch from
|
|
80
|
+
* @param slot - The slot to fetch
|
|
81
|
+
* @returns The slot mapping
|
|
62
82
|
*/
|
|
63
83
|
function getSlotOrDefault(
|
|
64
|
-
map: Map<bigint, Map<string, BlockAttestation
|
|
84
|
+
map: Map<bigint, Map<string, Map<string, BlockAttestation>>>,
|
|
65
85
|
slot: bigint,
|
|
66
|
-
): Map<string, BlockAttestation
|
|
86
|
+
): Map<string, Map<string, BlockAttestation>> {
|
|
67
87
|
if (!map.has(slot)) {
|
|
68
|
-
map.set(slot, new Map<string, BlockAttestation
|
|
88
|
+
map.set(slot, new Map<string, Map<string, BlockAttestation>>());
|
|
69
89
|
}
|
|
70
90
|
return map.get(slot)!;
|
|
71
91
|
}
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* Get Proposal or Default
|
|
95
|
+
*
|
|
96
|
+
* Fetch the proposal mapping, if it does not exist, then create a mapping and return it
|
|
97
|
+
* @param map - The map to fetch from
|
|
98
|
+
* @param proposalId - The proposal id to fetch
|
|
99
|
+
* @returns The proposal mapping
|
|
100
|
+
*/
|
|
101
|
+
function getProposalOrDefault(
|
|
102
|
+
map: Map<string, Map<string, BlockAttestation>>,
|
|
103
|
+
proposalId: string,
|
|
104
|
+
): Map<string, BlockAttestation> {
|
|
105
|
+
if (!map.has(proposalId)) {
|
|
106
|
+
map.set(proposalId, new Map<string, BlockAttestation>());
|
|
107
|
+
}
|
|
108
|
+
return map.get(proposalId)!;
|
|
109
|
+
}
|
|
@@ -22,10 +22,13 @@ export const generateAccount = () => {
|
|
|
22
22
|
* @param slot The slot number the attestation is for
|
|
23
23
|
* @returns A Block Attestation
|
|
24
24
|
*/
|
|
25
|
-
export const mockAttestation = async (
|
|
25
|
+
export const mockAttestation = async (
|
|
26
|
+
signer: PrivateKeyAccount,
|
|
27
|
+
slot: number = 0,
|
|
28
|
+
archive: Fr = Fr.random(),
|
|
29
|
+
): Promise<BlockAttestation> => {
|
|
26
30
|
// Use arbitrary numbers for all other than slot
|
|
27
31
|
const header = makeHeader(1, 2, slot);
|
|
28
|
-
const archive = Fr.random();
|
|
29
32
|
const txs = [0, 1, 2, 3, 4, 5].map(() => TxHash.random());
|
|
30
33
|
|
|
31
34
|
const payload = new ConsensusPayload(header, archive, txs);
|
package/src/client/index.ts
CHANGED
|
@@ -6,8 +6,11 @@ import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
|
6
6
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
7
7
|
|
|
8
8
|
import { type AttestationPool } from '../attestation_pool/attestation_pool.js';
|
|
9
|
+
import { InMemoryAttestationPool } from '../attestation_pool/memory_attestation_pool.js';
|
|
9
10
|
import { P2PClient } from '../client/p2p_client.js';
|
|
10
11
|
import { type P2PConfig } from '../config.js';
|
|
12
|
+
import { type EpochProofQuotePool } from '../epoch_proof_quote_pool/epoch_proof_quote_pool.js';
|
|
13
|
+
import { MemoryEpochProofQuotePool } from '../epoch_proof_quote_pool/memory_epoch_proof_quote_pool.js';
|
|
11
14
|
import { DiscV5Service } from '../service/discV5_service.js';
|
|
12
15
|
import { DummyP2PService } from '../service/dummy_service.js';
|
|
13
16
|
import { LibP2PService, createLibP2PPeerId } from '../service/index.js';
|
|
@@ -18,16 +21,22 @@ export * from './p2p_client.js';
|
|
|
18
21
|
|
|
19
22
|
export const createP2PClient = async (
|
|
20
23
|
_config: P2PConfig & DataStoreConfig,
|
|
21
|
-
attestationsPool: AttestationPool,
|
|
22
24
|
l2BlockSource: L2BlockSource,
|
|
23
25
|
proofVerifier: ClientProtocolCircuitVerifier,
|
|
24
26
|
worldStateSynchronizer: WorldStateSynchronizer,
|
|
25
27
|
telemetry: TelemetryClient = new NoopTelemetryClient(),
|
|
26
|
-
deps: {
|
|
28
|
+
deps: {
|
|
29
|
+
txPool?: TxPool;
|
|
30
|
+
store?: AztecKVStore;
|
|
31
|
+
attestationsPool?: AttestationPool;
|
|
32
|
+
epochProofQuotePool?: EpochProofQuotePool;
|
|
33
|
+
} = {},
|
|
27
34
|
) => {
|
|
28
35
|
let config = { ..._config };
|
|
29
36
|
const store = deps.store ?? (await createStore('p2p', config, createDebugLogger('aztec:p2p:lmdb')));
|
|
30
37
|
const txPool = deps.txPool ?? new AztecKVTxPool(store, telemetry);
|
|
38
|
+
const attestationsPool = deps.attestationsPool ?? new InMemoryAttestationPool();
|
|
39
|
+
const epochProofQuotePool = deps.epochProofQuotePool ?? new MemoryEpochProofQuotePool();
|
|
31
40
|
|
|
32
41
|
let p2pService;
|
|
33
42
|
|
|
@@ -52,7 +61,15 @@ export const createP2PClient = async (
|
|
|
52
61
|
} else {
|
|
53
62
|
p2pService = new DummyP2PService();
|
|
54
63
|
}
|
|
55
|
-
return new P2PClient(
|
|
64
|
+
return new P2PClient(
|
|
65
|
+
store,
|
|
66
|
+
l2BlockSource,
|
|
67
|
+
txPool,
|
|
68
|
+
attestationsPool,
|
|
69
|
+
epochProofQuotePool,
|
|
70
|
+
p2pService,
|
|
71
|
+
config.keepProvenTxsInPoolFor,
|
|
72
|
+
);
|
|
56
73
|
};
|
|
57
74
|
|
|
58
75
|
async function configureP2PClientAddresses(_config: P2PConfig & DataStoreConfig): Promise<P2PConfig & DataStoreConfig> {
|
package/src/client/p2p_client.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type BlockAttestation,
|
|
3
3
|
type BlockProposal,
|
|
4
|
+
type EpochProofQuote,
|
|
4
5
|
type L2Block,
|
|
5
6
|
L2BlockDownloader,
|
|
6
7
|
type L2BlockSource,
|
|
@@ -15,6 +16,7 @@ import { type ENR } from '@chainsafe/enr';
|
|
|
15
16
|
|
|
16
17
|
import { type AttestationPool } from '../attestation_pool/attestation_pool.js';
|
|
17
18
|
import { getP2PConfigEnvVars } from '../config.js';
|
|
19
|
+
import { type EpochProofQuotePool } from '../epoch_proof_quote_pool/epoch_proof_quote_pool.js';
|
|
18
20
|
import { TX_REQ_PROTOCOL } from '../service/reqresp/interface.js';
|
|
19
21
|
import type { P2PService } from '../service/service.js';
|
|
20
22
|
import { type TxPool } from '../tx_pool/index.js';
|
|
@@ -58,9 +60,25 @@ export interface P2P {
|
|
|
58
60
|
* Queries the Attestation pool for attestations for the given slot
|
|
59
61
|
*
|
|
60
62
|
* @param slot - the slot to query
|
|
63
|
+
* @param proposalId - the proposal id to query
|
|
61
64
|
* @returns BlockAttestations
|
|
62
65
|
*/
|
|
63
|
-
getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
|
|
66
|
+
getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Queries the EpochProofQuote pool for quotes for the given epoch
|
|
70
|
+
*
|
|
71
|
+
* @param epoch - the epoch to query
|
|
72
|
+
* @returns EpochProofQuotes
|
|
73
|
+
*/
|
|
74
|
+
getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]>;
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* Broadcasts an EpochProofQuote to other peers.
|
|
78
|
+
*
|
|
79
|
+
* @param quote - the quote to broadcast
|
|
80
|
+
*/
|
|
81
|
+
broadcastEpochProofQuote(quote: EpochProofQuote): void;
|
|
64
82
|
|
|
65
83
|
/**
|
|
66
84
|
* Registers a callback from the validator client that determines how to behave when
|
|
@@ -134,7 +152,7 @@ export interface P2P {
|
|
|
134
152
|
* Indicates if the p2p client is ready for transaction submission.
|
|
135
153
|
* @returns A boolean flag indicating readiness.
|
|
136
154
|
*/
|
|
137
|
-
isReady():
|
|
155
|
+
isReady(): boolean;
|
|
138
156
|
|
|
139
157
|
/**
|
|
140
158
|
* Returns the current status of the p2p client.
|
|
@@ -186,6 +204,7 @@ export class P2PClient implements P2P {
|
|
|
186
204
|
private l2BlockSource: L2BlockSource,
|
|
187
205
|
private txPool: TxPool,
|
|
188
206
|
private attestationPool: AttestationPool,
|
|
207
|
+
private epochProofQuotePool: EpochProofQuotePool,
|
|
189
208
|
private p2pService: P2PService,
|
|
190
209
|
private keepProvenTxsFor: number,
|
|
191
210
|
private log = createDebugLogger('aztec:p2p'),
|
|
@@ -202,6 +221,22 @@ export class P2PClient implements P2P {
|
|
|
202
221
|
this.synchedProvenBlockNumber = store.openSingleton('p2p_pool_last_proven_l2_block');
|
|
203
222
|
}
|
|
204
223
|
|
|
224
|
+
#assertIsReady() {
|
|
225
|
+
if (!this.isReady()) {
|
|
226
|
+
throw new Error('P2P client not ready');
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]> {
|
|
231
|
+
return Promise.resolve(this.epochProofQuotePool.getQuotes(epoch));
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
broadcastEpochProofQuote(quote: EpochProofQuote): void {
|
|
235
|
+
this.#assertIsReady();
|
|
236
|
+
this.epochProofQuotePool.addQuote(quote);
|
|
237
|
+
return this.p2pService.propagate(quote);
|
|
238
|
+
}
|
|
239
|
+
|
|
205
240
|
/**
|
|
206
241
|
* Starts the P2P client.
|
|
207
242
|
* @returns An empty promise signalling the synching process.
|
|
@@ -281,8 +316,8 @@ export class P2PClient implements P2P {
|
|
|
281
316
|
return this.p2pService.propagate(proposal);
|
|
282
317
|
}
|
|
283
318
|
|
|
284
|
-
public getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]> {
|
|
285
|
-
return Promise.resolve(this.attestationPool.getAttestationsForSlot(slot));
|
|
319
|
+
public getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
|
|
320
|
+
return Promise.resolve(this.attestationPool.getAttestationsForSlot(slot, proposalId));
|
|
286
321
|
}
|
|
287
322
|
|
|
288
323
|
// REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
|
|
@@ -363,10 +398,7 @@ export class P2PClient implements P2P {
|
|
|
363
398
|
* @returns Empty promise.
|
|
364
399
|
**/
|
|
365
400
|
public async sendTx(tx: Tx): Promise<void> {
|
|
366
|
-
|
|
367
|
-
if (!ready) {
|
|
368
|
-
throw new Error('P2P client not ready');
|
|
369
|
-
}
|
|
401
|
+
this.#assertIsReady();
|
|
370
402
|
await this.txPool.addTxs([tx]);
|
|
371
403
|
this.p2pService.propagate(tx);
|
|
372
404
|
}
|
|
@@ -391,10 +423,7 @@ export class P2PClient implements P2P {
|
|
|
391
423
|
* @returns Empty promise.
|
|
392
424
|
**/
|
|
393
425
|
public async deleteTxs(txHashes: TxHash[]): Promise<void> {
|
|
394
|
-
|
|
395
|
-
if (!ready) {
|
|
396
|
-
throw new Error('P2P client not ready');
|
|
397
|
-
}
|
|
426
|
+
this.#assertIsReady();
|
|
398
427
|
await this.txPool.deleteTxs(txHashes);
|
|
399
428
|
}
|
|
400
429
|
|
|
@@ -403,7 +432,7 @@ export class P2PClient implements P2P {
|
|
|
403
432
|
* @returns True if the P2P client is ready to receive txs.
|
|
404
433
|
*/
|
|
405
434
|
public isReady() {
|
|
406
|
-
return
|
|
435
|
+
return this.currentState === P2PClientState.RUNNING;
|
|
407
436
|
}
|
|
408
437
|
|
|
409
438
|
/**
|
|
@@ -499,6 +528,10 @@ export class P2PClient implements P2P {
|
|
|
499
528
|
|
|
500
529
|
await this.synchedProvenBlockNumber.set(lastBlockNum);
|
|
501
530
|
this.log.debug(`Synched to proven block ${lastBlockNum}`);
|
|
531
|
+
const provenEpochNumber = await this.l2BlockSource.getProvenL2EpochNumber();
|
|
532
|
+
if (provenEpochNumber !== undefined) {
|
|
533
|
+
this.epochProofQuotePool.deleteQuotesToEpoch(BigInt(provenEpochNumber));
|
|
534
|
+
}
|
|
502
535
|
await this.startServiceIfSynched();
|
|
503
536
|
}
|
|
504
537
|
|