@aztec/p2p 0.8.10 → 0.8.12
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/mocks.d.ts +3 -3
- package/dest/client/mocks.d.ts.map +1 -1
- package/dest/client/mocks.js +4 -4
- package/dest/client/p2p_client.d.ts +1 -1
- package/dest/client/p2p_client.js +2 -2
- package/dest/service/dummy_service.d.ts +1 -1
- package/dest/service/dummy_service.js +1 -1
- package/dest/service/libp2p_service.js +1 -1
- package/dest/tx_pool/memory_tx_pool.d.ts.map +1 -1
- package/dest/tx_pool/memory_tx_pool.js +5 -2
- package/dest/tx_pool/tx_pool.d.ts +1 -1
- package/package.json +4 -4
- package/src/client/mocks.ts +3 -3
- package/src/client/p2p_client.ts +2 -2
- package/src/service/dummy_service.ts +1 -1
- package/src/service/libp2p_service.ts +1 -1
- package/src/tx_pool/memory_tx_pool.ts +5 -1
- package/src/tx_pool/tx_pool.ts +1 -1
package/dest/client/mocks.d.ts
CHANGED
|
@@ -28,14 +28,14 @@ export declare class MockBlockSource implements L2BlockSource {
|
|
|
28
28
|
* @param number - The block number to return (inclusive).
|
|
29
29
|
* @returns The requested L2 block.
|
|
30
30
|
*/
|
|
31
|
-
|
|
31
|
+
getBlock(number: number): Promise<L2Block>;
|
|
32
32
|
/**
|
|
33
33
|
* Gets up to `limit` amount of L2 blocks starting from `from`.
|
|
34
34
|
* @param from - Number of the first block to return (inclusive).
|
|
35
35
|
* @param limit - The maximum number of blocks to return.
|
|
36
36
|
* @returns The requested mocked L2 blocks.
|
|
37
37
|
*/
|
|
38
|
-
|
|
38
|
+
getBlocks(from: number, limit: number): Promise<L2Block[]>;
|
|
39
39
|
/**
|
|
40
40
|
* Gets an l2 tx.
|
|
41
41
|
* @param txHash - The txHash of the l2 tx.
|
|
@@ -44,7 +44,7 @@ export declare class MockBlockSource implements L2BlockSource {
|
|
|
44
44
|
getL2Tx(txHash: TxHash): Promise<L2Tx | undefined>;
|
|
45
45
|
/**
|
|
46
46
|
* Starts the block source. In this mock implementation, this is a noop.
|
|
47
|
-
* @returns A promise that signals the initialization of the l2 block source on
|
|
47
|
+
* @returns A promise that signals the initialization of the l2 block source on completion.
|
|
48
48
|
*/
|
|
49
49
|
start(): Promise<void>;
|
|
50
50
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/client/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEpE;;GAEG;AACH,qBAAa,eAAgB,YAAW,aAAa;IAIvC,OAAO,CAAC,SAAS;IAH7B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,KAAK,CAAc;gBAEP,SAAS,SAAM;IAQnC;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIvC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIzC;;;OAGG;IACI,cAAc;IAIrB;;;;OAIG;IACI,
|
|
1
|
+
{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/client/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEpE;;GAEG;AACH,qBAAa,eAAgB,YAAW,aAAa;IAIvC,OAAO,CAAC,SAAS;IAH7B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,KAAK,CAAc;gBAEP,SAAS,SAAM;IAQnC;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIvC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIzC;;;OAGG;IACI,cAAc;IAIrB;;;;OAIG;IACI,QAAQ,CAAC,MAAM,EAAE,MAAM;IAI9B;;;;;OAKG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAI5C;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM;IAKtB;;;OAGG;IACI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
|
package/dest/client/mocks.js
CHANGED
|
@@ -40,7 +40,7 @@ export class MockBlockSource {
|
|
|
40
40
|
* @param number - The block number to return (inclusive).
|
|
41
41
|
* @returns The requested L2 block.
|
|
42
42
|
*/
|
|
43
|
-
|
|
43
|
+
getBlock(number) {
|
|
44
44
|
return Promise.resolve(this.l2Blocks[number]);
|
|
45
45
|
}
|
|
46
46
|
/**
|
|
@@ -49,7 +49,7 @@ export class MockBlockSource {
|
|
|
49
49
|
* @param limit - The maximum number of blocks to return.
|
|
50
50
|
* @returns The requested mocked L2 blocks.
|
|
51
51
|
*/
|
|
52
|
-
|
|
52
|
+
getBlocks(from, limit) {
|
|
53
53
|
return Promise.resolve(this.l2Blocks.slice(from, from + limit));
|
|
54
54
|
}
|
|
55
55
|
/**
|
|
@@ -63,7 +63,7 @@ export class MockBlockSource {
|
|
|
63
63
|
}
|
|
64
64
|
/**
|
|
65
65
|
* Starts the block source. In this mock implementation, this is a noop.
|
|
66
|
-
* @returns A promise that signals the initialization of the l2 block source on
|
|
66
|
+
* @returns A promise that signals the initialization of the l2 block source on completion.
|
|
67
67
|
*/
|
|
68
68
|
start() {
|
|
69
69
|
return Promise.resolve();
|
|
@@ -76,4 +76,4 @@ export class MockBlockSource {
|
|
|
76
76
|
return Promise.resolve();
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L21vY2tzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsT0FBTyxFQUErQixNQUFNLGNBQWMsQ0FBQztBQUVwRTs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBSTFCLFlBQW9CLFlBQVksR0FBRztRQUFmLGNBQVMsR0FBVCxTQUFTLENBQU07UUFIM0IsYUFBUSxHQUFjLEVBQUUsQ0FBQztRQUN6QixVQUFLLEdBQVcsRUFBRSxDQUFDO1FBR3pCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ3ZDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDaEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDMUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztTQUNwQztJQUNILENBQUM7SUFFRDs7O09BR0c7SUFDSCxnQkFBZ0I7UUFDZCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVEOzs7T0FHRztJQUNILGtCQUFrQjtRQUNoQixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVEOzs7T0FHRztJQUNJLGNBQWM7UUFDbkIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksUUFBUSxDQUFDLE1BQWM7UUFDNUIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxTQUFTLENBQUMsSUFBWSxFQUFFLEtBQWE7UUFDMUMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILE9BQU8sQ0FBQyxNQUFjO1FBQ3BCLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUM3RCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVEOzs7T0FHRztJQUNJLEtBQUs7UUFDVixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksSUFBSTtRQUNULE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7Q0FDRiJ9
|
|
@@ -74,7 +74,7 @@ export class P2PClient {
|
|
|
74
74
|
// start looking for further blocks
|
|
75
75
|
const blockProcess = async () => {
|
|
76
76
|
while (!this.stopping) {
|
|
77
|
-
const blocks = await this.blockDownloader.
|
|
77
|
+
const blocks = await this.blockDownloader.getBlocks();
|
|
78
78
|
await this.handleL2Blocks(blocks);
|
|
79
79
|
}
|
|
80
80
|
};
|
|
@@ -203,4 +203,4 @@ export class P2PClient {
|
|
|
203
203
|
this.log(`Moved to state ${P2PClientState[this.currentState]}`);
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
206
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDJwX2NsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvcDJwX2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQVcsY0FBYyxFQUFFLGlCQUFpQixFQUE2QixNQUFNLGNBQWMsQ0FBQztBQUVyRyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFJbkQ7O0dBRUc7QUFDSCxNQUFNLENBQU4sSUFBWSxjQUtYO0FBTEQsV0FBWSxjQUFjO0lBQ3hCLG1EQUFJLENBQUE7SUFDSiwyREFBUSxDQUFBO0lBQ1IseURBQU8sQ0FBQTtJQUNQLHlEQUFPLENBQUE7QUFDVCxDQUFDLEVBTFcsY0FBYyxLQUFkLGNBQWMsUUFLekI7QUFzRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sU0FBUztJQTBCcEI7Ozs7OztPQU1HO0lBQ0gsWUFDVSxhQUE0QixFQUM1QixNQUFjLEVBQ2QsVUFBc0IsRUFDdEIsTUFBTSxpQkFBaUIsQ0FBQyxXQUFXLENBQUM7UUFIcEMsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUNkLGVBQVUsR0FBVixVQUFVLENBQVk7UUFDdEIsUUFBRyxHQUFILEdBQUcsQ0FBaUM7UUEvQjlDOztXQUVHO1FBQ0ssYUFBUSxHQUFHLEtBQUssQ0FBQztRQU96Qjs7V0FFRztRQUNLLHNCQUFpQixHQUFHLENBQUMsQ0FBQztRQUV0QixpQkFBWSxHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUM7UUFDbkMsZ0JBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDaEMsNkJBQXdCLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDOUIsZ0JBQVcsR0FBZ0IsU0FBUyxDQUFDO1FBZTNDLE1BQU0sRUFBRSx1QkFBdUIsRUFBRSxhQUFhLEVBQUUsV0FBVyxF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
|
|
@@ -261,7 +261,7 @@ export class LibP2PService {
|
|
|
261
261
|
async processReceivedTxs(encodedMessage, peerId) {
|
|
262
262
|
try {
|
|
263
263
|
const txs = decodeTransactionsMessage(encodedMessage);
|
|
264
|
-
// Could
|
|
264
|
+
// Could optimize here and process all txs at once
|
|
265
265
|
// Propagation would need to filter and send custom tx set per peer
|
|
266
266
|
for (const tx of txs) {
|
|
267
267
|
await this.processTxFromPeer(tx, peerId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../src/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../src/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAU/B,OAAO,CAAC,GAAG;IATvB;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAE7B;;;OAGG;gBACiB,GAAG,8CAAqC;IAI5D;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS;IAKlD;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAO5C;;;OAGG;IACI,SAAS,IAAI,EAAE,EAAE;IAIxB;;;OAGG;IACI,cAAc,IAAI,MAAM,EAAE;IAIjC;;;;OAIG;IACI,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAGtC"}
|
|
@@ -29,7 +29,10 @@ export class InMemoryTxPool {
|
|
|
29
29
|
async addTxs(txs) {
|
|
30
30
|
for (const tx of txs) {
|
|
31
31
|
const txHash = await tx.getTxHash();
|
|
32
|
-
this.log(`Adding tx with id ${txHash.toString()}
|
|
32
|
+
this.log(`Adding tx with id ${txHash.toString()}`, {
|
|
33
|
+
eventName: 'tx-added-to-pool',
|
|
34
|
+
...tx.getStats(),
|
|
35
|
+
});
|
|
33
36
|
this.txs.set(txHash.toBigInt(), tx);
|
|
34
37
|
}
|
|
35
38
|
}
|
|
@@ -67,4 +70,4 @@ export class InMemoryTxPool {
|
|
|
67
70
|
return this.txs.has(txHash.toBigInt());
|
|
68
71
|
}
|
|
69
72
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X3R4X3Bvb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHhfcG9vbC9tZW1vcnlfdHhfcG9vbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUsxQzs7R0FFRztBQUNILE1BQU0sT0FBTyxjQUFjO0lBTXpCOzs7T0FHRztJQUNILFlBQW9CLE1BQU0saUJBQWlCLENBQUMsZUFBZSxDQUFDO1FBQXhDLFFBQUcsR0FBSCxHQUFHLENBQXFDO1FBQzFELElBQUksQ0FBQyxHQUFHLEdBQUcsSUFBSSxHQUFHLEVBQWMsQ0FBQztJQUNuQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLFdBQVcsQ0FBQyxNQUFjO1FBQy9CLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQy9DLE9BQU8sTUFBTSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFTO1FBQzNCLEtBQUssTUFBTSxFQUFFLElBQUksR0FBRyxFQUFFO1lBQ3BCLE1BQU0sTUFBTSxHQUFHLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMscUJBQXFCLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFO2dCQUNqRCxTQUFTLEVBQUUsa0JBQWtCO2dCQUM3QixHQUFHLEVBQUUsQ0FBQyxRQUFRLEVBQUU7YUFDWSxDQUFDLENBQUM7WUFDaEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1NBQ3JDO0lBQ0gsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxTQUFTLENBQUMsUUFBa0I7UUFDakMsTUFBTSxhQUFhLEdBQUcsUUFBUTthQUMzQixHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQzthQUNqRCxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEtBQUssSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQzVDLE9BQU8sYUFBYSxDQUFDO0lBQ3ZCLENBQUM7SUFFRDs7O09BR0c7SUFDSSxTQUFTO1FBQ2QsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVEOzs7T0FHRztJQUNJLGNBQWM7UUFDbkIsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsTUFBYztRQUN6QixPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7Q0FDRiJ9
|
|
@@ -15,7 +15,7 @@ export interface TxPool {
|
|
|
15
15
|
*/
|
|
16
16
|
getTxByHash(txHash: TxHash): Tx | undefined;
|
|
17
17
|
/**
|
|
18
|
-
* Deletes transactions from the pool. Tx
|
|
18
|
+
* Deletes transactions from the pool. Tx hashes that are not present are ignored.
|
|
19
19
|
* @param txHashes - An array of tx hashes to be removed from the tx pool.
|
|
20
20
|
*/
|
|
21
21
|
deleteTxs(txHashes: TxHash[]): void;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/p2p",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.12",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"typedocOptions": {
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"rootDir": "./src"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@aztec/circuits.js": "0.8.
|
|
36
|
-
"@aztec/foundation": "0.8.
|
|
37
|
-
"@aztec/types": "0.8.
|
|
35
|
+
"@aztec/circuits.js": "0.8.12",
|
|
36
|
+
"@aztec/foundation": "0.8.12",
|
|
37
|
+
"@aztec/types": "0.8.12",
|
|
38
38
|
"@chainsafe/libp2p-noise": "^13.0.0",
|
|
39
39
|
"@chainsafe/libp2p-yamux": "^5.0.0",
|
|
40
40
|
"@libp2p/bootstrap": "^9.0.4",
|
package/src/client/mocks.ts
CHANGED
|
@@ -45,7 +45,7 @@ export class MockBlockSource implements L2BlockSource {
|
|
|
45
45
|
* @param number - The block number to return (inclusive).
|
|
46
46
|
* @returns The requested L2 block.
|
|
47
47
|
*/
|
|
48
|
-
public
|
|
48
|
+
public getBlock(number: number) {
|
|
49
49
|
return Promise.resolve(this.l2Blocks[number]);
|
|
50
50
|
}
|
|
51
51
|
|
|
@@ -55,7 +55,7 @@ export class MockBlockSource implements L2BlockSource {
|
|
|
55
55
|
* @param limit - The maximum number of blocks to return.
|
|
56
56
|
* @returns The requested mocked L2 blocks.
|
|
57
57
|
*/
|
|
58
|
-
public
|
|
58
|
+
public getBlocks(from: number, limit: number) {
|
|
59
59
|
return Promise.resolve(this.l2Blocks.slice(from, from + limit));
|
|
60
60
|
}
|
|
61
61
|
|
|
@@ -71,7 +71,7 @@ export class MockBlockSource implements L2BlockSource {
|
|
|
71
71
|
|
|
72
72
|
/**
|
|
73
73
|
* Starts the block source. In this mock implementation, this is a noop.
|
|
74
|
-
* @returns A promise that signals the initialization of the l2 block source on
|
|
74
|
+
* @returns A promise that signals the initialization of the l2 block source on completion.
|
|
75
75
|
*/
|
|
76
76
|
public start(): Promise<void> {
|
|
77
77
|
return Promise.resolve();
|
package/src/client/p2p_client.ts
CHANGED
|
@@ -16,7 +16,7 @@ export enum P2PClientState {
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
|
-
* The
|
|
19
|
+
* The synchronization status of the P2P client.
|
|
20
20
|
*/
|
|
21
21
|
export interface P2PSyncState {
|
|
22
22
|
/**
|
|
@@ -164,7 +164,7 @@ export class P2PClient implements P2P {
|
|
|
164
164
|
// start looking for further blocks
|
|
165
165
|
const blockProcess = async () => {
|
|
166
166
|
while (!this.stopping) {
|
|
167
|
-
const blocks = await this.blockDownloader.
|
|
167
|
+
const blocks = await this.blockDownloader.getBlocks();
|
|
168
168
|
await this.handleL2Blocks(blocks);
|
|
169
169
|
}
|
|
170
170
|
};
|
|
@@ -310,7 +310,7 @@ export class LibP2PService implements P2PService {
|
|
|
310
310
|
private async processReceivedTxs(encodedMessage: Buffer, peerId: PeerId) {
|
|
311
311
|
try {
|
|
312
312
|
const txs = decodeTransactionsMessage(encodedMessage);
|
|
313
|
-
// Could
|
|
313
|
+
// Could optimize here and process all txs at once
|
|
314
314
|
// Propagation would need to filter and send custom tx set per peer
|
|
315
315
|
for (const tx of txs) {
|
|
316
316
|
await this.processTxFromPeer(tx, peerId);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
2
2
|
import { Tx, TxHash } from '@aztec/types';
|
|
3
|
+
import { TxAddedToPoolStats } from '@aztec/types/stats';
|
|
3
4
|
|
|
4
5
|
import { TxPool } from './index.js';
|
|
5
6
|
|
|
@@ -38,7 +39,10 @@ export class InMemoryTxPool implements TxPool {
|
|
|
38
39
|
public async addTxs(txs: Tx[]): Promise<void> {
|
|
39
40
|
for (const tx of txs) {
|
|
40
41
|
const txHash = await tx.getTxHash();
|
|
41
|
-
this.log(`Adding tx with id ${txHash.toString()}
|
|
42
|
+
this.log(`Adding tx with id ${txHash.toString()}`, {
|
|
43
|
+
eventName: 'tx-added-to-pool',
|
|
44
|
+
...tx.getStats(),
|
|
45
|
+
} satisfies TxAddedToPoolStats);
|
|
42
46
|
this.txs.set(txHash.toBigInt(), tx);
|
|
43
47
|
}
|
|
44
48
|
}
|
package/src/tx_pool/tx_pool.ts
CHANGED
|
@@ -18,7 +18,7 @@ export interface TxPool {
|
|
|
18
18
|
getTxByHash(txHash: TxHash): Tx | undefined;
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
|
-
* Deletes transactions from the pool. Tx
|
|
21
|
+
* Deletes transactions from the pool. Tx hashes that are not present are ignored.
|
|
22
22
|
* @param txHashes - An array of tx hashes to be removed from the tx pool.
|
|
23
23
|
*/
|
|
24
24
|
deleteTxs(txHashes: TxHash[]): void;
|