@aztec/p2p 0.38.0 → 0.40.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/bootstrap/bootstrap.d.ts.map +1 -1
- package/dest/bootstrap/bootstrap.js +3 -1
- package/dest/config.d.ts +5 -0
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +4 -2
- package/dest/service/data_store.d.ts +27 -0
- package/dest/service/data_store.d.ts.map +1 -0
- package/dest/service/data_store.js +188 -0
- package/dest/service/discV5_service.d.ts +8 -6
- package/dest/service/discV5_service.d.ts.map +1 -1
- package/dest/service/discV5_service.js +35 -21
- package/dest/service/dummy_service.d.ts +3 -1
- package/dest/service/dummy_service.d.ts.map +1 -1
- package/dest/service/dummy_service.js +11 -1
- package/dest/service/libp2p_service.d.ts +28 -17
- package/dest/service/libp2p_service.d.ts.map +1 -1
- package/dest/service/libp2p_service.js +101 -174
- package/dest/service/peer_manager.d.ts +12 -0
- package/dest/service/peer_manager.d.ts.map +1 -0
- package/dest/service/peer_manager.js +22 -0
- package/dest/service/service.d.ts +5 -0
- package/dest/service/service.d.ts.map +1 -1
- package/dest/service/service.js +6 -2
- package/dest/service/tx_messages.d.ts +11 -57
- package/dest/service/tx_messages.d.ts.map +1 -1
- package/dest/service/tx_messages.js +14 -89
- package/package.json +29 -21
- package/src/bootstrap/bootstrap.ts +2 -0
- package/src/config.ts +9 -0
- package/src/service/data_store.ts +235 -0
- package/src/service/discV5_service.ts +37 -20
- package/src/service/dummy_service.ts +8 -1
- package/src/service/libp2p_service.ts +130 -194
- package/src/service/peer_manager.ts +26 -0
- package/src/service/service.ts +7 -0
- package/src/service/tx_messages.ts +18 -93
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libp2p_service.d.ts","sourceRoot":"","sources":["../../src/service/libp2p_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"libp2p_service.d.ts","sourceRoot":"","sources":["../../src/service/libp2p_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAIpD,OAAO,EAAE,KAAK,eAAe,EAAa,MAAM,6BAA6B,CAAC;AAI9E,OAAO,KAAK,EAAsB,MAAM,EAAE,MAAM,EAAU,MAAM,mBAAmB,CAAC;AACpF,OAAO,iBAAiB,CAAC;AAMzB,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAEnD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGrE,MAAM,WAAW,YAAa,SAAQ,MAAM;IAC1C,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;KACjC,CAAC;CACH;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS7E;AAED;;GAEG;AACH,qBAAa,aAAc,YAAW,UAAU;IAM5C,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,MAAM;IAZhB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,aAAa,CAAsC;IAC3D,OAAO,CAAC,cAAc,CAAwB;IAC9C,OAAO,CAAC,WAAW,CAAc;gBAEvB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,YAAY,EAClB,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,cAAc,EACzB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,gBAAgB,GAAE,MAAM,EAAO,EAC/B,MAAM,yCAA4C;IAM5D;;;OAGG;IACU,KAAK;IAqDlB;;;OAGG;IACU,IAAI;IAQjB;;;;;OAKG;WACiB,GAAG,CACrB,MAAM,EAAE,SAAS,EACjB,oBAAoB,EAAE,oBAAoB,EAC1C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY;IA4ErB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAOxB;;;;;OAKG;YACW,cAAc;IAS5B;;;;OAIG;YACW,sBAAsB;IAUpC;;;OAGG;IACI,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI;IAIhC;;;OAGG;IACI,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;YAI7B,OAAO;YAsCP,kBAAkB;YAelB,oBAAoB;YAYpB,mBAAmB;YASnB,iBAAiB;YAOjB,aAAa;IAO3B,OAAO,CAAC,eAAe;CAGxB"}
|
|
@@ -1,19 +1,23 @@
|
|
|
1
1
|
import { SerialQueue } from '@aztec/foundation/fifo';
|
|
2
2
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
|
|
3
4
|
import { ENR } from '@chainsafe/enr';
|
|
5
|
+
import { gossipsub } from '@chainsafe/libp2p-gossipsub';
|
|
4
6
|
import { noise } from '@chainsafe/libp2p-noise';
|
|
5
7
|
import { yamux } from '@chainsafe/libp2p-yamux';
|
|
6
8
|
import { identify } from '@libp2p/identify';
|
|
7
9
|
import '@libp2p/kad-dht';
|
|
8
10
|
import { mplex } from '@libp2p/mplex';
|
|
9
11
|
import { peerIdFromString } from '@libp2p/peer-id';
|
|
10
|
-
import { createFromJSON, createSecp256k1PeerId
|
|
12
|
+
import { createFromJSON, createSecp256k1PeerId } from '@libp2p/peer-id-factory';
|
|
11
13
|
import { tcp } from '@libp2p/tcp';
|
|
12
14
|
import { pipe } from 'it-pipe';
|
|
13
15
|
import { createLibp2p } from 'libp2p';
|
|
16
|
+
import { AztecDatastore } from './data_store.js';
|
|
14
17
|
import { KnownTxLookup } from './known_txs.js';
|
|
18
|
+
import { PeerManager } from './peer_manager.js';
|
|
15
19
|
import { AztecPeerDb } from './peer_store.js';
|
|
16
|
-
import {
|
|
20
|
+
import { AztecTxMessageCreator, fromTxMessage } from './tx_messages.js';
|
|
17
21
|
/**
|
|
18
22
|
* Create a libp2p peer ID from the private key if provided, otherwise creates a new random ID.
|
|
19
23
|
* @param privateKey - Optional peer ID private key as hex string
|
|
@@ -29,14 +33,6 @@ export async function createLibP2PPeerId(privateKey) {
|
|
|
29
33
|
privKey: base64,
|
|
30
34
|
});
|
|
31
35
|
}
|
|
32
|
-
/**
|
|
33
|
-
* Exports a given peer id to a string representation.
|
|
34
|
-
* @param peerId - The peerId instance to be converted.
|
|
35
|
-
* @returns The peer id as a string.
|
|
36
|
-
*/
|
|
37
|
-
export function exportLibP2PPeerIdToString(peerId) {
|
|
38
|
-
return Buffer.from(exportToProtobuf(peerId)).toString('hex');
|
|
39
|
-
}
|
|
40
36
|
/**
|
|
41
37
|
* Lib P2P implementation of the P2PService interface.
|
|
42
38
|
*/
|
|
@@ -52,6 +48,8 @@ export class LibP2PService {
|
|
|
52
48
|
this.logger = logger;
|
|
53
49
|
this.jobQueue = new SerialQueue();
|
|
54
50
|
this.knownTxLookup = new KnownTxLookup();
|
|
51
|
+
this.messageCreator = new AztecTxMessageCreator(config.txGossipVersion);
|
|
52
|
+
this.peerManager = new PeerManager(node, peerDiscoveryService, config, logger);
|
|
55
53
|
}
|
|
56
54
|
/**
|
|
57
55
|
* Starts the LibP2P service.
|
|
@@ -73,23 +71,18 @@ export class LibP2PService {
|
|
|
73
71
|
this.peerDiscoveryService.on('peer:discovered', async (enr) => {
|
|
74
72
|
await this.addPeer(enr);
|
|
75
73
|
});
|
|
76
|
-
this.node.addEventListener('peer:
|
|
77
|
-
const peerId = evt.detail.id;
|
|
78
|
-
if (this.isBootstrapPeer(peerId)) {
|
|
79
|
-
this.logger.verbose(`Discovered bootstrap peer ${peerId.toString()}`);
|
|
80
|
-
}
|
|
81
|
-
});
|
|
82
|
-
this.node.addEventListener('peer:connect', evt => {
|
|
74
|
+
this.node.addEventListener('peer:connect', async (evt) => {
|
|
83
75
|
const peerId = evt.detail;
|
|
84
|
-
this.handleNewConnection(peerId);
|
|
76
|
+
await this.handleNewConnection(peerId);
|
|
85
77
|
});
|
|
86
|
-
this.node.addEventListener('peer:disconnect', evt => {
|
|
78
|
+
this.node.addEventListener('peer:disconnect', async (evt) => {
|
|
87
79
|
const peerId = evt.detail;
|
|
88
80
|
if (this.isBootstrapPeer(peerId)) {
|
|
89
81
|
this.logger.verbose(`Disconnect from bootstrap peer ${peerId.toString()}`);
|
|
90
82
|
}
|
|
91
83
|
else {
|
|
92
84
|
this.logger.verbose(`Disconnected from transaction peer ${peerId.toString()}`);
|
|
85
|
+
await this.peerManager.updateDiscoveryService();
|
|
93
86
|
}
|
|
94
87
|
});
|
|
95
88
|
this.jobQueue.start();
|
|
@@ -97,6 +90,14 @@ export class LibP2PService {
|
|
|
97
90
|
await this.node.start();
|
|
98
91
|
await this.node.handle(this.protocolId, (incoming) => this.jobQueue.put(() => Promise.resolve(this.handleProtocolDial(incoming))));
|
|
99
92
|
this.logger.info(`Started P2P client with Peer ID ${this.node.peerId.toString()}`);
|
|
93
|
+
// Subscribe to standard topics by default
|
|
94
|
+
this.subscribeToTopic(this.messageCreator.getTopic());
|
|
95
|
+
// add gossipsub listener
|
|
96
|
+
this.node.services.pubsub.addEventListener('gossipsub:message', async (e) => {
|
|
97
|
+
const { msg } = e.detail;
|
|
98
|
+
this.logger.debug(`Received PUBSUB message.`);
|
|
99
|
+
await this.handleNewGossipMessage(msg.topic, msg.data);
|
|
100
|
+
});
|
|
100
101
|
}
|
|
101
102
|
/**
|
|
102
103
|
* Stops the LibP2P service.
|
|
@@ -116,26 +117,8 @@ export class LibP2PService {
|
|
|
116
117
|
* @returns The new service.
|
|
117
118
|
*/
|
|
118
119
|
static async new(config, peerDiscoveryService, peerId, txPool, store) {
|
|
119
|
-
const { tcpListenIp, tcpListenPort, minPeerCount, maxPeerCount } = config;
|
|
120
|
-
const
|
|
121
|
-
start: false,
|
|
122
|
-
peerId,
|
|
123
|
-
addresses: {
|
|
124
|
-
listen: [`/ip4/${tcpListenIp}/tcp/${tcpListenPort}`],
|
|
125
|
-
},
|
|
126
|
-
transports: [tcp()],
|
|
127
|
-
streamMuxers: [yamux(), mplex()],
|
|
128
|
-
connectionEncryption: [noise()],
|
|
129
|
-
connectionManager: {
|
|
130
|
-
minConnections: minPeerCount,
|
|
131
|
-
maxConnections: maxPeerCount,
|
|
132
|
-
},
|
|
133
|
-
};
|
|
134
|
-
const services = {
|
|
135
|
-
identify: identify({
|
|
136
|
-
protocolPrefix: 'aztec',
|
|
137
|
-
}),
|
|
138
|
-
};
|
|
120
|
+
const { tcpListenIp, tcpListenPort, minPeerCount, maxPeerCount, dataDirectory, transactionProtocol: protocolId, } = config;
|
|
121
|
+
const bindAddrTcp = `/ip4/${tcpListenIp}/tcp/${tcpListenPort}`;
|
|
139
122
|
// The autonat service seems quite problematic in that using it seems to cause a lot of attempts
|
|
140
123
|
// to dial ephemeral ports. I suspect that it works better if you can get the uPNPnat service to
|
|
141
124
|
// work as then you would have a permanent port to be dialled.
|
|
@@ -149,11 +132,40 @@ export class LibP2PService {
|
|
|
149
132
|
// });
|
|
150
133
|
// services.uPnPNAT = uPnPNATService();
|
|
151
134
|
// }
|
|
135
|
+
const datastore = new AztecDatastore(AztecLmdbStore.open(dataDirectory));
|
|
152
136
|
const node = await createLibp2p({
|
|
153
|
-
|
|
154
|
-
|
|
137
|
+
start: false,
|
|
138
|
+
peerId,
|
|
139
|
+
addresses: {
|
|
140
|
+
listen: [bindAddrTcp],
|
|
141
|
+
},
|
|
142
|
+
transports: [
|
|
143
|
+
tcp({
|
|
144
|
+
maxConnections: config.maxPeerCount,
|
|
145
|
+
}),
|
|
146
|
+
],
|
|
147
|
+
datastore,
|
|
148
|
+
streamMuxers: [yamux(), mplex()],
|
|
149
|
+
connectionEncryption: [noise()],
|
|
150
|
+
connectionManager: {
|
|
151
|
+
minConnections: minPeerCount,
|
|
152
|
+
maxConnections: maxPeerCount,
|
|
153
|
+
},
|
|
154
|
+
services: {
|
|
155
|
+
identify: identify({
|
|
156
|
+
protocolPrefix: 'aztec',
|
|
157
|
+
}),
|
|
158
|
+
pubsub: gossipsub({
|
|
159
|
+
allowPublishToZeroTopicPeers: true,
|
|
160
|
+
D: 6,
|
|
161
|
+
Dlo: 4,
|
|
162
|
+
Dhi: 12,
|
|
163
|
+
heartbeatInterval: 1000,
|
|
164
|
+
mcacheLength: 5,
|
|
165
|
+
mcacheGossip: 3,
|
|
166
|
+
}),
|
|
167
|
+
},
|
|
155
168
|
});
|
|
156
|
-
const protocolId = config.transactionProtocol;
|
|
157
169
|
// Create an LMDB peer store
|
|
158
170
|
const peerDb = new AztecPeerDb(store);
|
|
159
171
|
// extract bootstrap node peer IDs
|
|
@@ -163,6 +175,42 @@ export class LibP2PService {
|
|
|
163
175
|
}
|
|
164
176
|
return new LibP2PService(config, node, peerDiscoveryService, peerDb, protocolId, txPool, bootstrapPeerIds);
|
|
165
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Subscribes to a topic.
|
|
180
|
+
* @param topic - The topic to subscribe to.
|
|
181
|
+
*/
|
|
182
|
+
subscribeToTopic(topic) {
|
|
183
|
+
if (!this.node.services.pubsub) {
|
|
184
|
+
throw new Error('Pubsub service not available.');
|
|
185
|
+
}
|
|
186
|
+
void this.node.services.pubsub.subscribe(topic);
|
|
187
|
+
}
|
|
188
|
+
/**
|
|
189
|
+
* Publishes data to a topic.
|
|
190
|
+
* @param topic - The topic to publish to.
|
|
191
|
+
* @param data - The data to publish.
|
|
192
|
+
* @returns The number of recipients the data was sent to.
|
|
193
|
+
*/
|
|
194
|
+
async publishToTopic(topic, data) {
|
|
195
|
+
if (!this.node.services.pubsub) {
|
|
196
|
+
throw new Error('Pubsub service not available.');
|
|
197
|
+
}
|
|
198
|
+
const result = await this.node.services.pubsub.publish(topic, data);
|
|
199
|
+
return result.recipients.length;
|
|
200
|
+
}
|
|
201
|
+
/**
|
|
202
|
+
* Handles a new gossip message that was received by the client.
|
|
203
|
+
* @param topic - The message's topic.
|
|
204
|
+
* @param data - The message data
|
|
205
|
+
*/
|
|
206
|
+
async handleNewGossipMessage(topic, data) {
|
|
207
|
+
if (topic !== this.messageCreator.getTopic()) {
|
|
208
|
+
// Invalid TX Topic, ignore
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
const tx = fromTxMessage(Buffer.from(data));
|
|
212
|
+
await this.processTxFromPeer(tx);
|
|
213
|
+
}
|
|
166
214
|
/**
|
|
167
215
|
* Propagates the provided transaction to peers.
|
|
168
216
|
* @param tx - The transaction to propagate.
|
|
@@ -193,7 +241,7 @@ export class LibP2PService {
|
|
|
193
241
|
const hasPeer = await this.node.peerStore.has(peerId);
|
|
194
242
|
// add to peer store if not already known
|
|
195
243
|
if (!hasPeer) {
|
|
196
|
-
this.logger.info(`Discovered peer ${
|
|
244
|
+
this.logger.info(`Discovered peer ${peerIdStr}. Adding to libp2p peer list`);
|
|
197
245
|
let stream;
|
|
198
246
|
try {
|
|
199
247
|
stream = await this.node.dialProtocol(peerMultiAddr, this.protocolId);
|
|
@@ -218,7 +266,7 @@ export class LibP2PService {
|
|
|
218
266
|
if (!message.length) {
|
|
219
267
|
this.logger.verbose(`Ignoring 0 byte message from peer${peer.toString()}`);
|
|
220
268
|
}
|
|
221
|
-
await this.
|
|
269
|
+
// await this.processTransactionMessage(message, peer);
|
|
222
270
|
}
|
|
223
271
|
catch (err) {
|
|
224
272
|
this.logger.error(`Failed to handle received message from peer ${incomingStreamData.connection.remotePeer.toString()}`, err);
|
|
@@ -235,150 +283,29 @@ export class LibP2PService {
|
|
|
235
283
|
await incomingStreamData.stream.close();
|
|
236
284
|
return { message: buffer, peer: incomingStreamData.connection.remotePeer };
|
|
237
285
|
}
|
|
238
|
-
handleNewConnection(peerId) {
|
|
286
|
+
async handleNewConnection(peerId) {
|
|
239
287
|
if (this.isBootstrapPeer(peerId)) {
|
|
240
288
|
this.logger.verbose(`Connected to bootstrap peer ${peerId.toString()}`);
|
|
241
289
|
}
|
|
242
290
|
else {
|
|
243
291
|
this.logger.verbose(`Connected to transaction peer ${peerId.toString()}`);
|
|
244
|
-
|
|
245
|
-
void this.jobQueue.put(async () => {
|
|
246
|
-
await this.sendTxHashesMessageToPeer(peerId);
|
|
247
|
-
});
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
async processMessage(message, peerId) {
|
|
251
|
-
const type = message.readUInt32BE(0);
|
|
252
|
-
const encodedMessage = getEncodedMessage(message);
|
|
253
|
-
switch (type) {
|
|
254
|
-
case Messages.POOLED_TRANSACTIONS:
|
|
255
|
-
await this.processReceivedTxs(encodedMessage, peerId);
|
|
256
|
-
return;
|
|
257
|
-
case Messages.POOLED_TRANSACTION_HASHES:
|
|
258
|
-
await this.processReceivedTxHashes(encodedMessage, peerId);
|
|
259
|
-
return;
|
|
260
|
-
case Messages.GET_TRANSACTIONS:
|
|
261
|
-
await this.processReceivedGetTransactionsRequest(encodedMessage, peerId);
|
|
262
|
-
return;
|
|
292
|
+
await this.peerManager.updateDiscoveryService();
|
|
263
293
|
}
|
|
264
|
-
throw new Error(`Unknown message type ${type}`);
|
|
265
294
|
}
|
|
266
|
-
async
|
|
267
|
-
try {
|
|
268
|
-
const txHashes = decodeTransactionHashesMessage(encodedMessage);
|
|
269
|
-
this.logger.debug(`Received tx hash messages from ${peerId.toString()}`);
|
|
270
|
-
// we send a message requesting the transactions that we don't have from the set of received hashes
|
|
271
|
-
const requiredHashes = txHashes.filter(hash => !this.txPool.hasTx(hash));
|
|
272
|
-
if (!requiredHashes.length) {
|
|
273
|
-
return;
|
|
274
|
-
}
|
|
275
|
-
await this.sendGetTransactionsMessageToPeer(txHashes, peerId);
|
|
276
|
-
}
|
|
277
|
-
catch (err) {
|
|
278
|
-
this.logger.error(`Failed to process received tx hashes`, err);
|
|
279
|
-
}
|
|
280
|
-
}
|
|
281
|
-
async processReceivedGetTransactionsRequest(encodedMessage, peerId) {
|
|
282
|
-
try {
|
|
283
|
-
this.logger.debug(`Received get txs messages from ${peerId.toString()}`);
|
|
284
|
-
// get the transactions in the list that we have and return them
|
|
285
|
-
const removeUndefined = (value) => value != undefined;
|
|
286
|
-
const txHashes = decodeGetTransactionsRequestMessage(encodedMessage);
|
|
287
|
-
const txs = txHashes.map(x => this.txPool.getTxByHash(x)).filter(removeUndefined);
|
|
288
|
-
if (!txs.length) {
|
|
289
|
-
return;
|
|
290
|
-
}
|
|
291
|
-
await this.sendTransactionsMessageToPeer(txs, peerId);
|
|
292
|
-
}
|
|
293
|
-
catch (err) {
|
|
294
|
-
this.logger.error(`Failed to process get txs request`, err);
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
async processReceivedTxs(encodedMessage, peerId) {
|
|
298
|
-
try {
|
|
299
|
-
const txs = decodeTransactionsMessage(encodedMessage);
|
|
300
|
-
// Could optimize here and process all txs at once
|
|
301
|
-
// Propagation would need to filter and send custom tx set per peer
|
|
302
|
-
for (const tx of txs) {
|
|
303
|
-
await this.processTxFromPeer(tx, peerId);
|
|
304
|
-
}
|
|
305
|
-
}
|
|
306
|
-
catch (err) {
|
|
307
|
-
this.logger.error(`Failed to process pooled transactions message`, err);
|
|
308
|
-
}
|
|
309
|
-
}
|
|
310
|
-
async processTxFromPeer(tx, peerId) {
|
|
295
|
+
async processTxFromPeer(tx) {
|
|
311
296
|
const txHash = tx.getTxHash();
|
|
312
297
|
const txHashString = txHash.toString();
|
|
313
|
-
this.
|
|
314
|
-
this.logger.debug(`Received tx ${txHashString} from peer ${peerId.toString()}`);
|
|
298
|
+
this.logger.debug(`Received tx ${txHashString} from external peer.`);
|
|
315
299
|
await this.txPool.addTxs([tx]);
|
|
316
|
-
this.propagateTx(tx);
|
|
317
300
|
}
|
|
318
301
|
async sendTxToPeers(tx) {
|
|
319
|
-
const
|
|
320
|
-
|
|
321
|
-
const
|
|
322
|
-
|
|
323
|
-
const txHashString = txHash.toString();
|
|
324
|
-
for (const peer of peers) {
|
|
325
|
-
try {
|
|
326
|
-
if (this.knownTxLookup.hasPeerSeenTx(peer, txHashString)) {
|
|
327
|
-
this.logger.debug(`Not sending tx ${txHashString} to peer ${peer.toString()} as they have already seen it`);
|
|
328
|
-
continue;
|
|
329
|
-
}
|
|
330
|
-
this.logger.debug(`Sending tx ${txHashString} to peer ${peer.toString()}`);
|
|
331
|
-
await this.sendRawMessageToPeer(payload, peer);
|
|
332
|
-
this.knownTxLookup.addPeerForTx(peer, txHashString);
|
|
333
|
-
}
|
|
334
|
-
catch (err) {
|
|
335
|
-
this.logger.error(`Failed to send txs to peer ${peer.toString()}`, err);
|
|
336
|
-
continue;
|
|
337
|
-
}
|
|
338
|
-
}
|
|
339
|
-
}
|
|
340
|
-
async sendTxHashesMessageToPeer(peer) {
|
|
341
|
-
try {
|
|
342
|
-
const hashes = this.txPool.getAllTxHashes();
|
|
343
|
-
if (!hashes.length) {
|
|
344
|
-
return;
|
|
345
|
-
}
|
|
346
|
-
const message = createTransactionHashesMessage(hashes);
|
|
347
|
-
await this.sendRawMessageToPeer(new Uint8Array(message), peer);
|
|
348
|
-
}
|
|
349
|
-
catch (err) {
|
|
350
|
-
this.logger.error(`Failed to send tx hashes to peer ${peer.toString()}`, err);
|
|
351
|
-
}
|
|
352
|
-
}
|
|
353
|
-
async sendGetTransactionsMessageToPeer(hashes, peer) {
|
|
354
|
-
try {
|
|
355
|
-
const message = createGetTransactionsRequestMessage(hashes);
|
|
356
|
-
await this.sendRawMessageToPeer(new Uint8Array(message), peer);
|
|
357
|
-
}
|
|
358
|
-
catch (err) {
|
|
359
|
-
this.logger.error(`Failed to send tx request to peer ${peer.toString()}`, err);
|
|
360
|
-
}
|
|
361
|
-
}
|
|
362
|
-
async sendTransactionsMessageToPeer(txs, peer) {
|
|
363
|
-
// don't filter out any transactions based on what we think the peer has seen,
|
|
364
|
-
// we have been explicitly asked for these transactions
|
|
365
|
-
const message = createTransactionsMessage(txs);
|
|
366
|
-
await this.sendRawMessageToPeer(message, peer);
|
|
367
|
-
for (const tx of txs) {
|
|
368
|
-
const hash = tx.getTxHash();
|
|
369
|
-
this.knownTxLookup.addPeerForTx(peer, hash.toString());
|
|
370
|
-
}
|
|
371
|
-
}
|
|
372
|
-
async sendRawMessageToPeer(message, peer) {
|
|
373
|
-
const stream = await this.node.dialProtocol(peer, this.protocolId);
|
|
374
|
-
await pipe([message], stream);
|
|
375
|
-
await stream.close();
|
|
376
|
-
}
|
|
377
|
-
getTxPeers() {
|
|
378
|
-
return this.node.getPeers().filter(peer => !this.isBootstrapPeer(peer));
|
|
302
|
+
const { data: txData } = this.messageCreator.createTxMessage(tx);
|
|
303
|
+
this.logger.debug(`Sending tx ${tx.getTxHash().toString()} to peers`);
|
|
304
|
+
const recipientsNum = await this.publishToTopic(this.messageCreator.getTopic(), txData);
|
|
305
|
+
this.logger.debug(`Sent tx ${tx.getTxHash().toString()} to ${recipientsNum} peers`);
|
|
379
306
|
}
|
|
380
307
|
isBootstrapPeer(peer) {
|
|
381
308
|
return this.bootstrapPeerIds.some(bootstrapPeer => bootstrapPeer.equals(peer));
|
|
382
309
|
}
|
|
383
310
|
}
|
|
384
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../src/service/libp2p_service.ts"],"names":[],"mappings":"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"}
|
|
311
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../src/service/libp2p_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { type Libp2p } from 'libp2p';
|
|
2
|
+
import { type P2PConfig } from '../config.js';
|
|
3
|
+
import { type PeerDiscoveryService } from './service.js';
|
|
4
|
+
export declare class PeerManager {
|
|
5
|
+
private libP2PNode;
|
|
6
|
+
private discV5Node;
|
|
7
|
+
private config;
|
|
8
|
+
private logger;
|
|
9
|
+
constructor(libP2PNode: Libp2p, discV5Node: PeerDiscoveryService, config: P2PConfig, logger?: import("@aztec/foundation/log").Logger);
|
|
10
|
+
updateDiscoveryService(): Promise<void>;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=peer_manager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"peer_manager.d.ts","sourceRoot":"","sources":["../../src/service/peer_manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,oBAAoB,EAAsB,MAAM,cAAc,CAAC;AAE7E,qBAAa,WAAW;IAEpB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;gBAHN,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,oBAAoB,EAChC,MAAM,EAAE,SAAS,EACjB,MAAM,yCAA8C;IAGxD,sBAAsB;CAU7B"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
2
|
+
import { PeerDiscoveryState } from './service.js';
|
|
3
|
+
export class PeerManager {
|
|
4
|
+
constructor(libP2PNode, discV5Node, config, logger = createDebugLogger('aztec:p2p:peer_manager')) {
|
|
5
|
+
this.libP2PNode = libP2PNode;
|
|
6
|
+
this.discV5Node = discV5Node;
|
|
7
|
+
this.config = config;
|
|
8
|
+
this.logger = logger;
|
|
9
|
+
}
|
|
10
|
+
async updateDiscoveryService() {
|
|
11
|
+
const peerCount = this.libP2PNode.getPeers().length;
|
|
12
|
+
if (peerCount >= this.config.maxPeerCount && this.discV5Node.getStatus() === PeerDiscoveryState.RUNNING) {
|
|
13
|
+
this.logger.debug('Max peer count reached, stopping discovery service');
|
|
14
|
+
await this.discV5Node.stop();
|
|
15
|
+
}
|
|
16
|
+
else if (peerCount <= this.config.minPeerCount && this.discV5Node.getStatus() === PeerDiscoveryState.STOPPED) {
|
|
17
|
+
this.logger.debug('Min peer count reached, starting discovery service');
|
|
18
|
+
await this.discV5Node.start();
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVlcl9tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2UvcGVlcl9tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSzFELE9BQU8sRUFBNkIsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFN0UsTUFBTSxPQUFPLFdBQVc7SUFDdEIsWUFDVSxVQUFrQixFQUNsQixVQUFnQyxFQUNoQyxNQUFpQixFQUNqQixTQUFTLGlCQUFpQixDQUFDLHdCQUF3QixDQUFDO1FBSHBELGVBQVUsR0FBVixVQUFVLENBQVE7UUFDbEIsZUFBVSxHQUFWLFVBQVUsQ0FBc0I7UUFDaEMsV0FBTSxHQUFOLE1BQU0sQ0FBVztRQUNqQixXQUFNLEdBQU4sTUFBTSxDQUE4QztJQUMzRCxDQUFDO0lBRUosS0FBSyxDQUFDLHNCQUFzQjtRQUMxQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU0sQ0FBQztRQUNwRCxJQUFJLFNBQVMsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxLQUFLLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3hHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLG9EQUFvRCxDQUFDLENBQUM7WUFDeEUsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQy9CLENBQUM7YUFBTSxJQUFJLFNBQVMsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxLQUFLLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQy9HLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLG9EQUFvRCxDQUFDLENBQUM7WUFDeEUsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2hDLENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
|
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
import type { Tx, TxHash } from '@aztec/circuit-types';
|
|
3
3
|
import type { ENR } from '@chainsafe/enr';
|
|
4
4
|
import type EventEmitter from 'events';
|
|
5
|
+
export declare enum PeerDiscoveryState {
|
|
6
|
+
RUNNING = "running",
|
|
7
|
+
STOPPED = "stopped"
|
|
8
|
+
}
|
|
5
9
|
/**
|
|
6
10
|
* The interface for a P2P service implementation.
|
|
7
11
|
*/
|
|
@@ -49,5 +53,6 @@ export interface PeerDiscoveryService extends EventEmitter {
|
|
|
49
53
|
*/
|
|
50
54
|
on(event: 'peer:discovered', listener: (enr: ENR) => void): this;
|
|
51
55
|
emit(event: 'peer:discovered', enr: ENR): boolean;
|
|
56
|
+
getStatus(): PeerDiscoveryState;
|
|
52
57
|
}
|
|
53
58
|
//# sourceMappingURL=service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service/service.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;OAGG;IACH,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAE1B;;;OAGG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD;;SAEK;IACL,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;SAEK;IACL,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;OAGG;IACH,WAAW,IAAI,GAAG,EAAE,CAAC;IAErB;;OAEG;IACH,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IACjE,IAAI,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service/service.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC,oBAAY,kBAAkB;IAC5B,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;OAGG;IACH,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAE1B;;;OAGG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD;;SAEK;IACL,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;SAEK;IACL,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;OAGG;IACH,WAAW,IAAI,GAAG,EAAE,CAAC;IAErB;;OAEG;IACH,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IACjE,IAAI,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IAElD,SAAS,IAAI,kBAAkB,CAAC;CACjC"}
|
package/dest/service/service.js
CHANGED
|
@@ -1,2 +1,6 @@
|
|
|
1
|
-
export
|
|
2
|
-
|
|
1
|
+
export var PeerDiscoveryState;
|
|
2
|
+
(function (PeerDiscoveryState) {
|
|
3
|
+
PeerDiscoveryState["RUNNING"] = "running";
|
|
4
|
+
PeerDiscoveryState["STOPPED"] = "stopped";
|
|
5
|
+
})(PeerDiscoveryState || (PeerDiscoveryState = {}));
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsTUFBTSxDQUFOLElBQVksa0JBR1g7QUFIRCxXQUFZLGtCQUFrQjtJQUM1Qix5Q0FBbUIsQ0FBQTtJQUNuQix5Q0FBbUIsQ0FBQTtBQUNyQixDQUFDLEVBSFcsa0JBQWtCLEtBQWxCLGtCQUFrQixRQUc3QiJ9
|
|
@@ -1,68 +1,22 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { Tx
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
2
|
+
import { Tx } from '@aztec/circuit-types';
|
|
3
|
+
import { type SemVer } from 'semver';
|
|
4
|
+
export declare const TX_MESSAGE_TOPIC = "";
|
|
5
|
+
export declare class AztecTxMessageCreator {
|
|
6
|
+
private readonly topic;
|
|
7
|
+
constructor(version: SemVer);
|
|
8
|
+
createTxMessage(tx: Tx): {
|
|
9
|
+
topic: string;
|
|
10
|
+
data: Buffer;
|
|
11
|
+
};
|
|
12
|
+
getTopic(): string;
|
|
10
13
|
}
|
|
11
|
-
/**
|
|
12
|
-
* Create a P2P message from the message type and message data.
|
|
13
|
-
* @param type - The type of the message.
|
|
14
|
-
* @param messageData - The binary message data.
|
|
15
|
-
* @returns The encoded message.
|
|
16
|
-
*/
|
|
17
|
-
export declare function createMessage(type: Messages, messageData: Buffer): Buffer;
|
|
18
|
-
/**
|
|
19
|
-
* Create a POOLED_TRANSACTIONS message from an array of transactions.
|
|
20
|
-
* @param txs - The transactions to encoded into a message.
|
|
21
|
-
* @returns The encoded message.
|
|
22
|
-
*/
|
|
23
|
-
export declare function createTransactionsMessage(txs: Tx[]): Buffer;
|
|
24
14
|
/**
|
|
25
15
|
* Decode a POOLED_TRANSACTIONS message into the original transaction objects.
|
|
26
16
|
* @param message - The binary message to be decoded.
|
|
27
17
|
* @returns - The array of transactions originally encoded into the message.
|
|
28
18
|
*/
|
|
29
19
|
export declare function decodeTransactionsMessage(message: Buffer): Tx[];
|
|
30
|
-
/**
|
|
31
|
-
* Create a POOLED_TRANSACTION_HASHES message.
|
|
32
|
-
* @param hashes - The transaction hashes to be sent.
|
|
33
|
-
* @returns The encoded message.
|
|
34
|
-
*/
|
|
35
|
-
export declare function createTransactionHashesMessage(hashes: TxHash[]): Buffer;
|
|
36
|
-
/**
|
|
37
|
-
* Decode a POOLED_TRANSACTION_HASHESs message ito the original transaction hash objects.
|
|
38
|
-
* @param message - The binary message to be decoded.
|
|
39
|
-
* @returns - The array of transaction hashes originally encoded into the message.
|
|
40
|
-
*/
|
|
41
|
-
export declare function decodeTransactionHashesMessage(message: Buffer): TxHash[];
|
|
42
|
-
/**
|
|
43
|
-
* Create a GET_TRANSACTIONS message from an array of transaction hashes.
|
|
44
|
-
* @param hashes - The hashes of the transactions to be requested.
|
|
45
|
-
* @returns The encoded message.
|
|
46
|
-
*/
|
|
47
|
-
export declare function createGetTransactionsRequestMessage(hashes: TxHash[]): Buffer;
|
|
48
|
-
/**
|
|
49
|
-
* Decode a GET_TRANSACTIONS message into the original transaction hash objects.
|
|
50
|
-
* @param message - The binary message to be decoded.
|
|
51
|
-
* @returns - The array of transaction hashes originally encoded into the message.
|
|
52
|
-
*/
|
|
53
|
-
export declare function decodeGetTransactionsRequestMessage(message: Buffer): TxHash[];
|
|
54
|
-
/**
|
|
55
|
-
* Decode the message type from a received message.
|
|
56
|
-
* @param message - The received message.
|
|
57
|
-
* @returns The decoded MessageType.
|
|
58
|
-
*/
|
|
59
|
-
export declare function decodeMessageType(message: Buffer): number;
|
|
60
|
-
/**
|
|
61
|
-
* Return the encoded message (minus the header) from received message buffer.
|
|
62
|
-
* @param message - The complete received message.
|
|
63
|
-
* @returns The encoded message, without the header.
|
|
64
|
-
*/
|
|
65
|
-
export declare function getEncodedMessage(message: Buffer): Buffer;
|
|
66
20
|
/**
|
|
67
21
|
* Creates a tx 'message' for sending to a peer.
|
|
68
22
|
* @param tx - The transaction to convert to a message.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_messages.d.ts","sourceRoot":"","sources":["../../src/service/tx_messages.ts"],"names":[],"mappings":";AAAA,OAAO,EAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"tx_messages.d.ts","sourceRoot":"","sources":["../../src/service/tx_messages.ts"],"names":[],"mappings":";AAAA,OAAO,EAAqB,EAAE,EAAuB,MAAM,sBAAsB,CAAC;AAIlF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBACnB,OAAO,EAAE,MAAM;IAI3B,eAAe,CAAC,EAAE,EAAE,EAAE;;;;IAMtB,QAAQ;CAGT;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,QAWxD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CA6B1C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,CAoDhD"}
|