@aztec/p2p 0.76.4 → 0.77.0-testnet-ignition.21
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 +2 -2
- package/dest/bootstrap/bootstrap.d.ts.map +1 -1
- package/dest/bootstrap/bootstrap.js +55 -41
- package/dest/client/factory.d.ts +8 -6
- package/dest/client/factory.d.ts.map +1 -1
- package/dest/client/factory.js +8 -10
- package/dest/client/index.js +0 -1
- package/dest/client/p2p_client.d.ts +7 -4
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +492 -514
- package/dest/config.d.ts +8 -10
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +54 -47
- package/dest/enr/generate-enr.d.ts +9 -0
- package/dest/enr/generate-enr.d.ts.map +1 -0
- package/dest/enr/generate-enr.js +30 -0
- package/dest/enr/index.d.ts +2 -0
- package/dest/enr/index.d.ts.map +1 -0
- package/dest/enr/index.js +1 -0
- package/dest/errors/reqresp.error.js +6 -10
- package/dest/index.js +0 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.js +6 -2
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +65 -33
- package/dest/mem_pools/attestation_pool/index.js +0 -1
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +3 -3
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +23 -20
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +2 -2
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +22 -26
- package/dest/mem_pools/attestation_pool/mocks.d.ts +3 -2
- package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/mocks.js +12 -7
- package/dest/mem_pools/index.d.ts +2 -2
- package/dest/mem_pools/index.d.ts.map +1 -1
- package/dest/mem_pools/index.js +1 -2
- package/dest/mem_pools/instrumentation.d.ts +1 -1
- package/dest/mem_pools/instrumentation.d.ts.map +1 -1
- package/dest/mem_pools/instrumentation.js +35 -39
- package/dest/mem_pools/interface.d.ts +3 -3
- package/dest/mem_pools/interface.d.ts.map +1 -1
- package/dest/mem_pools/interface.js +3 -2
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +2 -2
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +129 -136
- package/dest/mem_pools/tx_pool/index.js +0 -1
- package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +2 -2
- package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/memory_tx_pool.js +46 -44
- package/dest/mem_pools/tx_pool/priority.d.ts +1 -1
- package/dest/mem_pools/tx_pool/priority.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/priority.js +1 -3
- package/dest/mem_pools/tx_pool/tx_pool.d.ts +1 -1
- package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/tx_pool.js +3 -2
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +1 -1
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +109 -39
- package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +2 -2
- package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
- package/dest/msg_validators/attestation_validator/attestation_validator.js +4 -4
- package/dest/msg_validators/attestation_validator/index.js +0 -1
- package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts +2 -2
- package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +3 -3
- package/dest/msg_validators/block_proposal_validator/index.js +0 -1
- package/dest/msg_validators/index.js +0 -1
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +9 -11
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts +2 -2
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/block_header_validator.js +18 -13
- package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/data_validator.js +102 -33
- package/dest/msg_validators/tx_validator/double_spend_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/double_spend_validator.js +34 -20
- package/dest/msg_validators/tx_validator/index.js +0 -1
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts +2 -2
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.js +30 -27
- package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -1
- package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/tx_proof_validator.js +17 -12
- package/dest/services/data_store.js +57 -57
- package/dest/services/discv5/discV5_service.d.ts +2 -0
- package/dest/services/discv5/discV5_service.d.ts.map +1 -1
- package/dest/services/discv5/discV5_service.js +64 -36
- package/dest/services/dummy_service.d.ts +4 -2
- package/dest/services/dummy_service.d.ts.map +1 -1
- package/dest/services/dummy_service.js +41 -59
- package/dest/services/encoding.d.ts +3 -3
- package/dest/services/encoding.d.ts.map +1 -1
- package/dest/services/encoding.js +10 -9
- package/dest/services/gossipsub/scoring.d.ts +7 -0
- package/dest/services/gossipsub/scoring.d.ts.map +1 -0
- package/dest/services/gossipsub/scoring.js +10 -0
- package/dest/services/index.js +0 -1
- package/dest/services/libp2p/libp2p_service.d.ts +10 -33
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +682 -673
- package/dest/services/peer-manager/metrics.js +14 -7
- package/dest/services/peer-manager/peer_manager.d.ts +24 -6
- package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_manager.js +390 -340
- package/dest/services/peer-manager/peer_scoring.d.ts +3 -3
- package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_scoring.js +21 -19
- package/dest/services/reqresp/config.js +4 -5
- package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +2 -2
- package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +1 -1
- package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +35 -28
- package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts +1 -1
- package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map +1 -1
- package/dest/services/reqresp/connection-sampler/connection_sampler.js +67 -61
- package/dest/services/reqresp/index.js +1 -3
- package/dest/services/reqresp/interface.d.ts +2 -2
- package/dest/services/reqresp/interface.d.ts.map +1 -1
- package/dest/services/reqresp/interface.js +27 -31
- package/dest/services/reqresp/metrics.d.ts +1 -1
- package/dest/services/reqresp/metrics.d.ts.map +1 -1
- package/dest/services/reqresp/metrics.js +23 -10
- package/dest/services/reqresp/protocols/block.d.ts +2 -2
- package/dest/services/reqresp/protocols/block.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/block.js +1 -2
- package/dest/services/reqresp/protocols/goodbye.d.ts +5 -5
- package/dest/services/reqresp/protocols/goodbye.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/goodbye.js +36 -41
- package/dest/services/reqresp/protocols/index.js +1 -3
- package/dest/services/reqresp/protocols/ping.js +1 -3
- package/dest/services/reqresp/protocols/status.js +1 -3
- package/dest/services/reqresp/protocols/tx.d.ts +3 -3
- package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/tx.js +6 -9
- package/dest/services/reqresp/rate-limiter/index.js +0 -1
- package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +9 -9
- package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
- package/dest/services/reqresp/rate-limiter/rate_limiter.js +53 -46
- package/dest/services/reqresp/rate-limiter/rate_limits.js +16 -17
- package/dest/services/reqresp/reqresp.d.ts +4 -4
- package/dest/services/reqresp/reqresp.d.ts.map +1 -1
- package/dest/services/reqresp/reqresp.js +467 -464
- package/dest/services/reqresp/status.js +16 -17
- package/dest/services/service.d.ts +3 -2
- package/dest/services/service.d.ts.map +1 -1
- package/dest/services/service.js +3 -4
- package/dest/test-helpers/generate-peer-id-private-keys.js +2 -4
- package/dest/test-helpers/get-ports.js +3 -3
- package/dest/test-helpers/index.js +0 -1
- package/dest/test-helpers/make-enrs.d.ts +1 -1
- package/dest/test-helpers/make-enrs.d.ts.map +1 -1
- package/dest/test-helpers/make-enrs.js +3 -6
- package/dest/test-helpers/make-test-p2p-clients.d.ts +7 -6
- package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
- package/dest/test-helpers/make-test-p2p-clients.js +10 -12
- package/dest/test-helpers/reqresp-nodes.d.ts +18 -7
- package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
- package/dest/test-helpers/reqresp-nodes.js +64 -40
- package/dest/testbench/p2p_client_testbench_worker.js +61 -45
- package/dest/testbench/parse_log_file.d.ts +2 -0
- package/dest/testbench/parse_log_file.d.ts.map +1 -0
- package/dest/testbench/parse_log_file.js +131 -0
- package/dest/testbench/testbench.d.ts +2 -0
- package/dest/testbench/testbench.d.ts.map +1 -0
- package/dest/testbench/testbench.js +141 -0
- package/dest/{services/types.d.ts → types/index.d.ts} +1 -1
- package/dest/types/index.d.ts.map +1 -0
- package/dest/types/index.js +28 -0
- package/dest/util.d.ts +5 -5
- package/dest/util.d.ts.map +1 -1
- package/dest/util.js +23 -34
- package/dest/versioning.d.ts +3 -3
- package/dest/versioning.d.ts.map +1 -1
- package/dest/versioning.js +7 -12
- package/package.json +15 -13
- package/src/bootstrap/bootstrap.ts +30 -17
- package/src/client/factory.ts +9 -12
- package/src/client/p2p_client.ts +13 -24
- package/src/config.ts +14 -15
- package/src/enr/generate-enr.ts +39 -0
- package/src/enr/index.ts +1 -0
- package/src/mem_pools/attestation_pool/attestation_pool.ts +1 -1
- package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +4 -3
- package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +3 -3
- package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +2 -2
- package/src/mem_pools/attestation_pool/mocks.ts +5 -5
- package/src/mem_pools/index.ts +2 -2
- package/src/mem_pools/instrumentation.ts +4 -3
- package/src/mem_pools/interface.ts +3 -3
- package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +4 -4
- package/src/mem_pools/tx_pool/memory_tx_pool.ts +3 -3
- package/src/mem_pools/tx_pool/priority.ts +1 -1
- package/src/mem_pools/tx_pool/tx_pool.ts +1 -1
- package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +4 -3
- package/src/msg_validators/attestation_validator/attestation_validator.ts +2 -2
- package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +2 -2
- package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +1 -1
- package/src/msg_validators/tx_validator/block_header_validator.ts +2 -2
- package/src/msg_validators/tx_validator/data_validator.ts +57 -4
- package/src/msg_validators/tx_validator/double_spend_validator.ts +17 -12
- package/src/msg_validators/tx_validator/metadata_validator.ts +2 -2
- package/src/msg_validators/tx_validator/tx_proof_validator.ts +2 -6
- package/src/services/discv5/discV5_service.ts +33 -8
- package/src/services/dummy_service.ts +4 -2
- package/src/services/encoding.ts +3 -3
- package/src/services/gossipsub/scoring.ts +13 -0
- package/src/services/libp2p/libp2p_service.ts +124 -146
- package/src/services/peer-manager/peer_manager.ts +71 -13
- package/src/services/peer-manager/peer_scoring.ts +3 -3
- package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +2 -2
- package/src/services/reqresp/connection-sampler/connection_sampler.ts +9 -3
- package/src/services/reqresp/interface.ts +4 -3
- package/src/services/reqresp/metrics.ts +1 -1
- package/src/services/reqresp/protocols/block.ts +3 -3
- package/src/services/reqresp/protocols/goodbye.ts +7 -7
- package/src/services/reqresp/protocols/tx.ts +5 -5
- package/src/services/reqresp/rate-limiter/rate_limiter.ts +22 -18
- package/src/services/reqresp/reqresp.ts +18 -11
- package/src/services/service.ts +3 -2
- package/src/test-helpers/make-enrs.ts +1 -1
- package/src/test-helpers/make-test-p2p-clients.ts +9 -7
- package/src/test-helpers/reqresp-nodes.ts +32 -18
- package/src/testbench/p2p_client_testbench_worker.ts +16 -9
- package/src/testbench/parse_log_file.ts +175 -0
- package/src/testbench/testbench.ts +157 -0
- package/src/util.ts +5 -5
- package/src/versioning.ts +7 -7
- package/dest/services/libp2p/libp2p_logger.d.ts +0 -7
- package/dest/services/libp2p/libp2p_logger.d.ts.map +0 -1
- package/dest/services/libp2p/libp2p_logger.js +0 -67
- package/dest/services/types.d.ts.map +0 -1
- package/dest/services/types.js +0 -35
- package/src/services/libp2p/libp2p_logger.ts +0 -78
- package/src/testbench/scripts/run_testbench.sh +0 -7
- /package/src/{services/types.ts → types/index.ts} +0 -0
|
@@ -1,527 +1,505 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
}
|
|
7
|
+
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
3
8
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { Attributes, TraceableL2BlockStream, WithTracer, getTelemetryClient, trackSpan
|
|
9
|
+
import { Attributes, TraceableL2BlockStream, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
|
|
5
10
|
import { getP2PDefaultConfig } from '../config.js';
|
|
6
11
|
import { ReqRespSubProtocol } from '../services/reqresp/interface.js';
|
|
7
12
|
/**
|
|
8
13
|
* Enum defining the possible states of the p2p client.
|
|
9
|
-
*/
|
|
10
|
-
export var P2PClientState;
|
|
11
|
-
(function (P2PClientState) {
|
|
14
|
+
*/ export var P2PClientState = /*#__PURE__*/ function(P2PClientState) {
|
|
12
15
|
P2PClientState[P2PClientState["IDLE"] = 0] = "IDLE";
|
|
13
16
|
P2PClientState[P2PClientState["SYNCHING"] = 1] = "SYNCHING";
|
|
14
17
|
P2PClientState[P2PClientState["RUNNING"] = 2] = "RUNNING";
|
|
15
18
|
P2PClientState[P2PClientState["STOPPED"] = 3] = "STOPPED";
|
|
16
|
-
|
|
19
|
+
return P2PClientState;
|
|
20
|
+
}({});
|
|
17
21
|
/**
|
|
18
22
|
* The P2P client implementation.
|
|
19
|
-
*/
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
/**
|
|
123
|
-
* Starts the P2P client.
|
|
124
|
-
* @returns An empty promise signalling the synching process.
|
|
125
|
-
*/
|
|
126
|
-
async start() {
|
|
127
|
-
if (this.currentState === P2PClientState.STOPPED) {
|
|
128
|
-
throw new Error('P2P client already stopped');
|
|
129
|
-
}
|
|
130
|
-
if (this.currentState !== P2PClientState.IDLE) {
|
|
131
|
-
return this.syncPromise;
|
|
132
|
-
}
|
|
133
|
-
// get the current latest block numbers
|
|
134
|
-
this.latestBlockNumberAtStart = await this.l2BlockSource.getBlockNumber();
|
|
135
|
-
this.provenBlockNumberAtStart = await this.l2BlockSource.getProvenBlockNumber();
|
|
136
|
-
const syncedLatestBlock = (await this.getSyncedLatestBlockNum()) + 1;
|
|
137
|
-
const syncedProvenBlock = (await this.getSyncedProvenBlockNum()) + 1;
|
|
138
|
-
// if there are blocks to be retrieved, go to a synching state
|
|
139
|
-
if (syncedLatestBlock <= this.latestBlockNumberAtStart || syncedProvenBlock <= this.provenBlockNumberAtStart) {
|
|
140
|
-
this.setCurrentState(P2PClientState.SYNCHING);
|
|
141
|
-
this.syncPromise = new Promise(resolve => {
|
|
142
|
-
this.syncResolve = resolve;
|
|
143
|
-
});
|
|
144
|
-
this.log.verbose(`Starting sync from ${syncedLatestBlock} (last proven ${syncedProvenBlock})`);
|
|
145
|
-
}
|
|
146
|
-
else {
|
|
147
|
-
// if no blocks to be retrieved, go straight to running
|
|
148
|
-
this.setCurrentState(P2PClientState.RUNNING);
|
|
149
|
-
this.syncPromise = Promise.resolve();
|
|
150
|
-
await this.p2pService.start();
|
|
151
|
-
this.log.debug(`Block ${syncedLatestBlock} (proven ${syncedProvenBlock}) already beyond current block`);
|
|
152
|
-
}
|
|
153
|
-
this.blockStream.start();
|
|
154
|
-
this.log.verbose(`Started block downloader from block ${syncedLatestBlock}`);
|
|
155
|
-
return this.syncPromise;
|
|
156
|
-
}
|
|
157
|
-
/**
|
|
158
|
-
* Allows consumers to stop the instance of the P2P client.
|
|
159
|
-
* 'ready' will now return 'false' and the running promise that keeps the client synced is interrupted.
|
|
160
|
-
*/
|
|
161
|
-
async stop() {
|
|
162
|
-
this.log.debug('Stopping p2p client...');
|
|
163
|
-
await this.p2pService.stop();
|
|
164
|
-
this.log.debug('Stopped p2p service');
|
|
165
|
-
await this.blockStream.stop();
|
|
166
|
-
this.log.debug('Stopped block downloader');
|
|
167
|
-
await this.runningPromise;
|
|
168
|
-
this.setCurrentState(P2PClientState.STOPPED);
|
|
169
|
-
this.log.info('P2P client stopped.');
|
|
170
|
-
}
|
|
171
|
-
broadcastProposal(proposal) {
|
|
172
|
-
this.log.verbose(`Broadcasting proposal ${proposal.p2pMessageIdentifier()} to peers`);
|
|
173
|
-
return this.p2pService.propagate(proposal);
|
|
174
|
-
}
|
|
175
|
-
async getAttestationsForSlot(slot, proposalId) {
|
|
176
|
-
return (await this.attestationPool?.getAttestationsForSlot(slot, proposalId)) ?? [];
|
|
177
|
-
}
|
|
178
|
-
// REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
|
|
179
|
-
// ^ This pattern is not my favorite (md)
|
|
180
|
-
registerBlockProposalHandler(handler) {
|
|
181
|
-
this.p2pService.registerBlockReceivedCallback(handler);
|
|
182
|
-
}
|
|
183
|
-
/**
|
|
184
|
-
* Requests the transactions with the given hashes from the network.
|
|
185
|
-
*
|
|
186
|
-
* If a transaction can be retrieved, it will be returned, if not an undefined
|
|
187
|
-
* will be returned. In place.
|
|
188
|
-
*
|
|
189
|
-
* @param txHashes - The hashes of the transactions to request.
|
|
190
|
-
* @returns A promise that resolves to an array of transactions or undefined.
|
|
191
|
-
*/
|
|
192
|
-
async requestTxs(txHashes) {
|
|
193
|
-
const res = await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes);
|
|
194
|
-
return Promise.resolve(res ?? []);
|
|
195
|
-
}
|
|
196
|
-
/**
|
|
197
|
-
* Uses the Request Response protocol to request a transaction from the network.
|
|
198
|
-
*
|
|
199
|
-
* If the underlying request response protocol fails, then we return undefined.
|
|
200
|
-
* If it succeeds then we add the transaction to our transaction pool and return.
|
|
201
|
-
*
|
|
202
|
-
* @param txHash - The hash of the transaction to request.
|
|
203
|
-
* @returns A promise that resolves to a transaction or undefined.
|
|
204
|
-
*/
|
|
205
|
-
async requestTxByHash(txHash) {
|
|
206
|
-
const tx = await this.p2pService.sendRequest(ReqRespSubProtocol.TX, txHash);
|
|
207
|
-
if (tx) {
|
|
208
|
-
this.log.debug(`Received tx ${txHash.toString()} from peer`);
|
|
209
|
-
await this.txPool.addTxs([tx]);
|
|
210
|
-
}
|
|
211
|
-
else {
|
|
212
|
-
this.log.debug(`Failed to receive tx ${txHash.toString()} from peer`);
|
|
213
|
-
}
|
|
214
|
-
return tx;
|
|
215
|
-
}
|
|
216
|
-
/**
|
|
217
|
-
* Uses the batched Request Response protocol to request a set of transactions from the network.
|
|
218
|
-
*/
|
|
219
|
-
async requestTxsByHash(txHashes) {
|
|
220
|
-
const txs = (await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes)) ?? [];
|
|
221
|
-
await this.txPool.addTxs(txs);
|
|
222
|
-
const txHashesStr = txHashes.map(tx => tx.toString()).join(', ');
|
|
223
|
-
this.log.debug(`Received batched txs ${txHashesStr} (${txs.length} / ${txHashes.length}}) from peers`);
|
|
224
|
-
return txs;
|
|
225
|
-
}
|
|
226
|
-
getPendingTxs() {
|
|
227
|
-
return Promise.resolve(this.getTxs('pending'));
|
|
228
|
-
}
|
|
229
|
-
async getPendingTxCount() {
|
|
230
|
-
const pendingTxs = await this.txPool.getPendingTxHashes();
|
|
231
|
-
return pendingTxs.length;
|
|
232
|
-
}
|
|
233
|
-
async *iteratePendingTxs() {
|
|
234
|
-
for (const txHash of await this.txPool.getPendingTxHashes()) {
|
|
235
|
-
const tx = await this.txPool.getTxByHash(txHash);
|
|
236
|
-
if (tx) {
|
|
237
|
-
yield tx;
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
/**
|
|
242
|
-
* Returns all transactions in the transaction pool.
|
|
243
|
-
* @returns An array of Txs.
|
|
244
|
-
*/
|
|
245
|
-
async getTxs(filter) {
|
|
246
|
-
if (filter === 'all') {
|
|
247
|
-
return this.txPool.getAllTxs();
|
|
248
|
-
}
|
|
249
|
-
else if (filter === 'mined') {
|
|
250
|
-
const minedHashes = await this.txPool.getMinedTxHashes();
|
|
251
|
-
const minedTx = await Promise.all(minedHashes.map(([txHash]) => this.txPool.getTxByHash(txHash)));
|
|
252
|
-
return minedTx.filter((tx) => !!tx);
|
|
23
|
+
*/ export class P2PClient extends WithTracer {
|
|
24
|
+
l2BlockSource;
|
|
25
|
+
p2pService;
|
|
26
|
+
log;
|
|
27
|
+
/** The JS promise that will be running to keep the client's data in sync. Can be interrupted if the client is stopped. */ runningPromise;
|
|
28
|
+
currentState;
|
|
29
|
+
syncPromise;
|
|
30
|
+
syncResolve;
|
|
31
|
+
latestBlockNumberAtStart;
|
|
32
|
+
provenBlockNumberAtStart;
|
|
33
|
+
synchedBlockHashes;
|
|
34
|
+
synchedLatestBlockNumber;
|
|
35
|
+
synchedProvenBlockNumber;
|
|
36
|
+
txPool;
|
|
37
|
+
attestationPool;
|
|
38
|
+
/** How many slots to keep attestations for. */ keepAttestationsInPoolFor;
|
|
39
|
+
/** How many slots to keep proven txs for. */ keepProvenTxsFor;
|
|
40
|
+
blockStream;
|
|
41
|
+
/**
|
|
42
|
+
* In-memory P2P client constructor.
|
|
43
|
+
* @param store - The client's instance of the KV store.
|
|
44
|
+
* @param l2BlockSource - P2P client's source for fetching existing blocks.
|
|
45
|
+
* @param txPool - The client's instance of a transaction pool. Defaults to in-memory implementation.
|
|
46
|
+
* @param p2pService - The concrete instance of p2p networking to use.
|
|
47
|
+
* @param keepProvenTxsFor - How many blocks have to pass after a block is proven before its txs are deleted (zero to delete immediately once proven).
|
|
48
|
+
* @param log - A logger.
|
|
49
|
+
*/ constructor(_clientType, store, l2BlockSource, mempools, p2pService, config = {}, telemetry = getTelemetryClient(), log = createLogger('p2p')){
|
|
50
|
+
super(telemetry, 'P2PClient'), this.l2BlockSource = l2BlockSource, this.p2pService = p2pService, this.log = log, this.currentState = 0, this.syncPromise = Promise.resolve(), this.syncResolve = undefined, this.latestBlockNumberAtStart = -1, this.provenBlockNumberAtStart = -1;
|
|
51
|
+
const { keepProvenTxsInPoolFor, blockCheckIntervalMS, blockRequestBatchSize, keepAttestationsInPoolFor } = {
|
|
52
|
+
...getP2PDefaultConfig(),
|
|
53
|
+
...config
|
|
54
|
+
};
|
|
55
|
+
this.keepProvenTxsFor = keepProvenTxsInPoolFor;
|
|
56
|
+
this.keepAttestationsInPoolFor = keepAttestationsInPoolFor;
|
|
57
|
+
const tracer = telemetry.getTracer('P2PL2BlockStream');
|
|
58
|
+
const logger = createLogger('p2p:l2-block-stream');
|
|
59
|
+
this.blockStream = new TraceableL2BlockStream(l2BlockSource, this, this, tracer, 'P2PL2BlockStream', logger, {
|
|
60
|
+
batchSize: blockRequestBatchSize,
|
|
61
|
+
pollIntervalMS: blockCheckIntervalMS
|
|
62
|
+
});
|
|
63
|
+
this.synchedBlockHashes = store.openMap('p2p_pool_block_hashes');
|
|
64
|
+
this.synchedLatestBlockNumber = store.openSingleton('p2p_pool_last_l2_block');
|
|
65
|
+
this.synchedProvenBlockNumber = store.openSingleton('p2p_pool_last_proven_l2_block');
|
|
66
|
+
this.txPool = mempools.txPool;
|
|
67
|
+
this.attestationPool = mempools.attestationPool;
|
|
68
|
+
}
|
|
69
|
+
isP2PClient() {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
getPeers(includePending) {
|
|
73
|
+
return Promise.resolve(this.p2pService.getPeers(includePending));
|
|
74
|
+
}
|
|
75
|
+
getL2BlockHash(number) {
|
|
76
|
+
return this.synchedBlockHashes.getAsync(number);
|
|
77
|
+
}
|
|
78
|
+
async getL2Tips() {
|
|
79
|
+
const latestBlockNumber = await this.getSyncedLatestBlockNum();
|
|
80
|
+
let latestBlockHash;
|
|
81
|
+
const provenBlockNumber = await this.getSyncedProvenBlockNum();
|
|
82
|
+
let provenBlockHash;
|
|
83
|
+
if (latestBlockNumber > 0) {
|
|
84
|
+
latestBlockHash = await this.synchedBlockHashes.getAsync(latestBlockNumber);
|
|
85
|
+
if (typeof latestBlockHash === 'undefined') {
|
|
86
|
+
this.log.warn(`Block hash for latest block ${latestBlockNumber} not found`);
|
|
87
|
+
throw new Error();
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
if (provenBlockNumber > 0) {
|
|
91
|
+
provenBlockHash = await this.synchedBlockHashes.getAsync(provenBlockNumber);
|
|
92
|
+
if (typeof provenBlockHash === 'undefined') {
|
|
93
|
+
this.log.warn(`Block hash for proven block ${provenBlockNumber} not found`);
|
|
94
|
+
throw new Error();
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return Promise.resolve({
|
|
98
|
+
latest: {
|
|
99
|
+
hash: latestBlockHash,
|
|
100
|
+
number: latestBlockNumber
|
|
101
|
+
},
|
|
102
|
+
proven: {
|
|
103
|
+
hash: provenBlockHash,
|
|
104
|
+
number: provenBlockNumber
|
|
105
|
+
},
|
|
106
|
+
finalized: {
|
|
107
|
+
hash: provenBlockHash,
|
|
108
|
+
number: provenBlockNumber
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
async handleBlockStreamEvent(event) {
|
|
113
|
+
this.log.debug(`Handling block stream event ${event.type}`);
|
|
114
|
+
switch(event.type){
|
|
115
|
+
case 'blocks-added':
|
|
116
|
+
await this.handleLatestL2Blocks(event.blocks);
|
|
117
|
+
break;
|
|
118
|
+
case 'chain-finalized':
|
|
119
|
+
break;
|
|
120
|
+
case 'chain-proven':
|
|
121
|
+
{
|
|
122
|
+
const from = await this.getSyncedProvenBlockNum() + 1;
|
|
123
|
+
const limit = event.blockNumber - from + 1;
|
|
124
|
+
await this.handleProvenL2Blocks(await this.l2BlockSource.getBlocks(from, limit));
|
|
125
|
+
break;
|
|
253
126
|
}
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
throw new Error(`Unknown filter ${filter}`);
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
/**
|
|
265
|
-
* Returns a transaction in the transaction pool by its hash.
|
|
266
|
-
* @param txHash - Hash of the transaction to look for in the pool.
|
|
267
|
-
* @returns A single tx or undefined.
|
|
268
|
-
*/
|
|
269
|
-
getTxByHashFromPool(txHash) {
|
|
270
|
-
return this.txPool.getTxByHash(txHash);
|
|
271
|
-
}
|
|
272
|
-
/**
|
|
273
|
-
* Returns a transaction in the transaction pool by its hash.
|
|
274
|
-
* If the transaction is not in the pool, it will be requested from the network.
|
|
275
|
-
* @param txHash - Hash of the transaction to look for in the pool.
|
|
276
|
-
* @returns A single tx or undefined.
|
|
277
|
-
*/
|
|
278
|
-
async getTxByHash(txHash) {
|
|
279
|
-
const tx = await this.txPool.getTxByHash(txHash);
|
|
280
|
-
if (tx) {
|
|
281
|
-
return tx;
|
|
127
|
+
case 'chain-pruned':
|
|
128
|
+
await this.handlePruneL2Blocks(event.blockNumber);
|
|
129
|
+
break;
|
|
130
|
+
default:
|
|
131
|
+
{
|
|
132
|
+
const _ = event;
|
|
133
|
+
break;
|
|
282
134
|
}
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
}
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"p2p_client.js","sourceRoot":"","sources":["../../src/client/p2p_client.ts"],"names":[],"mappings":"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"}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
#assertIsReady() {
|
|
138
|
+
// this.log.info('Checking if p2p client is ready, current state: ', this.currentState);
|
|
139
|
+
if (!this.isReady()) {
|
|
140
|
+
throw new Error('P2P client not ready');
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Starts the P2P client.
|
|
145
|
+
* @returns An empty promise signalling the synching process.
|
|
146
|
+
*/ async start() {
|
|
147
|
+
if (this.currentState === 3) {
|
|
148
|
+
throw new Error('P2P client already stopped');
|
|
149
|
+
}
|
|
150
|
+
if (this.currentState !== 0) {
|
|
151
|
+
return this.syncPromise;
|
|
152
|
+
}
|
|
153
|
+
// get the current latest block numbers
|
|
154
|
+
this.latestBlockNumberAtStart = await this.l2BlockSource.getBlockNumber();
|
|
155
|
+
this.provenBlockNumberAtStart = await this.l2BlockSource.getProvenBlockNumber();
|
|
156
|
+
const syncedLatestBlock = await this.getSyncedLatestBlockNum() + 1;
|
|
157
|
+
const syncedProvenBlock = await this.getSyncedProvenBlockNum() + 1;
|
|
158
|
+
// if there are blocks to be retrieved, go to a synching state
|
|
159
|
+
if (syncedLatestBlock <= this.latestBlockNumberAtStart || syncedProvenBlock <= this.provenBlockNumberAtStart) {
|
|
160
|
+
this.setCurrentState(1);
|
|
161
|
+
this.syncPromise = new Promise((resolve)=>{
|
|
162
|
+
this.syncResolve = resolve;
|
|
163
|
+
});
|
|
164
|
+
this.log.verbose(`Starting sync from ${syncedLatestBlock} (last proven ${syncedProvenBlock})`);
|
|
165
|
+
} else {
|
|
166
|
+
// if no blocks to be retrieved, go straight to running
|
|
167
|
+
this.setCurrentState(2);
|
|
168
|
+
this.syncPromise = Promise.resolve();
|
|
169
|
+
await this.p2pService.start();
|
|
170
|
+
this.log.debug(`Block ${syncedLatestBlock} (proven ${syncedProvenBlock}) already beyond current block`);
|
|
171
|
+
}
|
|
172
|
+
this.blockStream.start();
|
|
173
|
+
this.log.verbose(`Started block downloader from block ${syncedLatestBlock}`);
|
|
174
|
+
return this.syncPromise;
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Allows consumers to stop the instance of the P2P client.
|
|
178
|
+
* 'ready' will now return 'false' and the running promise that keeps the client synced is interrupted.
|
|
179
|
+
*/ async stop() {
|
|
180
|
+
this.log.debug('Stopping p2p client...');
|
|
181
|
+
await this.p2pService.stop();
|
|
182
|
+
this.log.debug('Stopped p2p service');
|
|
183
|
+
await this.blockStream.stop();
|
|
184
|
+
this.log.debug('Stopped block downloader');
|
|
185
|
+
await this.runningPromise;
|
|
186
|
+
this.setCurrentState(3);
|
|
187
|
+
this.log.info('P2P client stopped.');
|
|
188
|
+
}
|
|
189
|
+
broadcastProposal(proposal) {
|
|
190
|
+
this.log.verbose(`Broadcasting proposal for slot ${proposal.slotNumber.toNumber()} to peers`);
|
|
191
|
+
return this.p2pService.propagate(proposal);
|
|
192
|
+
}
|
|
193
|
+
async getAttestationsForSlot(slot, proposalId) {
|
|
194
|
+
return await this.attestationPool?.getAttestationsForSlot(slot, proposalId) ?? [];
|
|
195
|
+
}
|
|
196
|
+
// REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
|
|
197
|
+
// ^ This pattern is not my favorite (md)
|
|
198
|
+
registerBlockProposalHandler(handler) {
|
|
199
|
+
this.p2pService.registerBlockReceivedCallback(handler);
|
|
200
|
+
}
|
|
201
|
+
/**
|
|
202
|
+
* Requests the transactions with the given hashes from the network.
|
|
203
|
+
*
|
|
204
|
+
* If a transaction can be retrieved, it will be returned, if not an undefined
|
|
205
|
+
* will be returned. In place.
|
|
206
|
+
*
|
|
207
|
+
* @param txHashes - The hashes of the transactions to request.
|
|
208
|
+
* @returns A promise that resolves to an array of transactions or undefined.
|
|
209
|
+
*/ async requestTxs(txHashes) {
|
|
210
|
+
const res = await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes);
|
|
211
|
+
return Promise.resolve(res ?? []);
|
|
212
|
+
}
|
|
213
|
+
/**
|
|
214
|
+
* Uses the Request Response protocol to request a transaction from the network.
|
|
215
|
+
*
|
|
216
|
+
* If the underlying request response protocol fails, then we return undefined.
|
|
217
|
+
* If it succeeds then we add the transaction to our transaction pool and return.
|
|
218
|
+
*
|
|
219
|
+
* @param txHash - The hash of the transaction to request.
|
|
220
|
+
* @returns A promise that resolves to a transaction or undefined.
|
|
221
|
+
*/ async requestTxByHash(txHash) {
|
|
222
|
+
const tx = await this.p2pService.sendRequest(ReqRespSubProtocol.TX, txHash);
|
|
223
|
+
if (tx) {
|
|
224
|
+
this.log.debug(`Received tx ${txHash.toString()} from peer`);
|
|
225
|
+
await this.txPool.addTxs([
|
|
226
|
+
tx
|
|
227
|
+
]);
|
|
228
|
+
} else {
|
|
229
|
+
this.log.debug(`Failed to receive tx ${txHash.toString()} from peer`);
|
|
230
|
+
}
|
|
231
|
+
return tx;
|
|
232
|
+
}
|
|
233
|
+
/**
|
|
234
|
+
* Uses the batched Request Response protocol to request a set of transactions from the network.
|
|
235
|
+
*/ async requestTxsByHash(txHashes) {
|
|
236
|
+
const txs = await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes) ?? [];
|
|
237
|
+
await this.txPool.addTxs(txs);
|
|
238
|
+
const txHashesStr = txHashes.map((tx)=>tx.toString()).join(', ');
|
|
239
|
+
this.log.debug(`Received batched txs ${txHashesStr} (${txs.length} / ${txHashes.length}}) from peers`);
|
|
240
|
+
return txs;
|
|
241
|
+
}
|
|
242
|
+
getPendingTxs() {
|
|
243
|
+
return Promise.resolve(this.getTxs('pending'));
|
|
244
|
+
}
|
|
245
|
+
async getPendingTxCount() {
|
|
246
|
+
const pendingTxs = await this.txPool.getPendingTxHashes();
|
|
247
|
+
return pendingTxs.length;
|
|
248
|
+
}
|
|
249
|
+
async *iteratePendingTxs() {
|
|
250
|
+
for (const txHash of (await this.txPool.getPendingTxHashes())){
|
|
251
|
+
const tx = await this.txPool.getTxByHash(txHash);
|
|
252
|
+
if (tx) {
|
|
253
|
+
yield tx;
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
/**
|
|
258
|
+
* Returns all transactions in the transaction pool.
|
|
259
|
+
* @returns An array of Txs.
|
|
260
|
+
*/ async getTxs(filter) {
|
|
261
|
+
if (filter === 'all') {
|
|
262
|
+
return this.txPool.getAllTxs();
|
|
263
|
+
} else if (filter === 'mined') {
|
|
264
|
+
const minedHashes = await this.txPool.getMinedTxHashes();
|
|
265
|
+
const minedTx = await Promise.all(minedHashes.map(([txHash])=>this.txPool.getTxByHash(txHash)));
|
|
266
|
+
return minedTx.filter((tx)=>!!tx);
|
|
267
|
+
} else if (filter === 'pending') {
|
|
268
|
+
const pendingHashses = await this.txPool.getPendingTxHashes();
|
|
269
|
+
const pendingTxs = await Promise.all(pendingHashses.map((txHash)=>this.txPool.getTxByHash(txHash)));
|
|
270
|
+
return pendingTxs.filter((tx)=>!!tx);
|
|
271
|
+
} else {
|
|
272
|
+
const _ = filter;
|
|
273
|
+
throw new Error(`Unknown filter ${filter}`);
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
/**
|
|
277
|
+
* Returns a transaction in the transaction pool by its hash.
|
|
278
|
+
* @param txHash - Hash of the transaction to look for in the pool.
|
|
279
|
+
* @returns A single tx or undefined.
|
|
280
|
+
*/ getTxByHashFromPool(txHash) {
|
|
281
|
+
return this.txPool.getTxByHash(txHash);
|
|
282
|
+
}
|
|
283
|
+
/**
|
|
284
|
+
* Returns a transaction in the transaction pool by its hash.
|
|
285
|
+
* If the transaction is not in the pool, it will be requested from the network.
|
|
286
|
+
* @param txHash - Hash of the transaction to look for in the pool.
|
|
287
|
+
* @returns A single tx or undefined.
|
|
288
|
+
*/ async getTxByHash(txHash) {
|
|
289
|
+
const tx = await this.txPool.getTxByHash(txHash);
|
|
290
|
+
if (tx) {
|
|
291
|
+
return tx;
|
|
292
|
+
}
|
|
293
|
+
return this.requestTxByHash(txHash);
|
|
294
|
+
}
|
|
295
|
+
/**
|
|
296
|
+
* Returns transactions in the transaction pool by hash.
|
|
297
|
+
* If a transaction is not in the pool, it will be requested from the network.
|
|
298
|
+
* @param txHashes - Hashes of the transactions to look for.
|
|
299
|
+
* @returns The txs found, not necessarily on the same order as the hashes.
|
|
300
|
+
*/ async getTxsByHash(txHashes) {
|
|
301
|
+
const txs = await Promise.all(txHashes.map((txHash)=>this.txPool.getTxByHash(txHash)));
|
|
302
|
+
const missingTxHashes = txs.map((tx, index)=>[
|
|
303
|
+
tx,
|
|
304
|
+
index
|
|
305
|
+
]).filter(([tx, _index])=>!tx).map(([_tx, index])=>txHashes[index]);
|
|
306
|
+
if (missingTxHashes.length === 0) {
|
|
307
|
+
return txs;
|
|
308
|
+
}
|
|
309
|
+
const missingTxs = await this.requestTxsByHash(missingTxHashes);
|
|
310
|
+
return txs.filter((tx)=>!!tx).concat(missingTxs);
|
|
311
|
+
}
|
|
312
|
+
/**
|
|
313
|
+
* Returns an archived transaction in the transaction pool by its hash.
|
|
314
|
+
* @param txHash - Hash of the archived transaction to look for.
|
|
315
|
+
* @returns A single tx or undefined.
|
|
316
|
+
*/ getArchivedTxByHash(txHash) {
|
|
317
|
+
return this.txPool.getArchivedTxByHash(txHash);
|
|
318
|
+
}
|
|
319
|
+
/**
|
|
320
|
+
* Verifies the 'tx' and, if valid, adds it to local tx pool and forwards it to other peers.
|
|
321
|
+
* @param tx - The tx to verify.
|
|
322
|
+
* @returns Empty promise.
|
|
323
|
+
**/ async sendTx(tx) {
|
|
324
|
+
this.#assertIsReady();
|
|
325
|
+
await this.txPool.addTxs([
|
|
326
|
+
tx
|
|
327
|
+
]);
|
|
328
|
+
this.p2pService.propagate(tx);
|
|
329
|
+
}
|
|
330
|
+
/**
|
|
331
|
+
* Returns whether the given tx hash is flagged as pending or mined.
|
|
332
|
+
* @param txHash - Hash of the tx to query.
|
|
333
|
+
* @returns Pending or mined depending on its status, or undefined if not found.
|
|
334
|
+
*/ getTxStatus(txHash) {
|
|
335
|
+
return this.txPool.getTxStatus(txHash);
|
|
336
|
+
}
|
|
337
|
+
getEnr() {
|
|
338
|
+
return this.p2pService.getEnr();
|
|
339
|
+
}
|
|
340
|
+
getEncodedEnr() {
|
|
341
|
+
return Promise.resolve(this.p2pService.getEnr()?.encodeTxt());
|
|
342
|
+
}
|
|
343
|
+
/**
|
|
344
|
+
* Deletes the 'txs' from the pool.
|
|
345
|
+
* NOT used if we use sendTx as reconcileTxPool will handle this.
|
|
346
|
+
* @param txHashes - Hashes of the transactions to delete.
|
|
347
|
+
* @returns Empty promise.
|
|
348
|
+
**/ async deleteTxs(txHashes) {
|
|
349
|
+
this.#assertIsReady();
|
|
350
|
+
await this.txPool.deleteTxs(txHashes);
|
|
351
|
+
}
|
|
352
|
+
/**
|
|
353
|
+
* Public function to check if the p2p client is fully synced and ready to receive txs.
|
|
354
|
+
* @returns True if the P2P client is ready to receive txs.
|
|
355
|
+
*/ isReady() {
|
|
356
|
+
return this.currentState === 2;
|
|
357
|
+
}
|
|
358
|
+
/**
|
|
359
|
+
* Public function to check the latest block number that the P2P client is synced to.
|
|
360
|
+
* @returns Block number of latest L2 Block we've synced with.
|
|
361
|
+
*/ async getSyncedLatestBlockNum() {
|
|
362
|
+
return await this.synchedLatestBlockNumber.getAsync() ?? INITIAL_L2_BLOCK_NUM - 1;
|
|
363
|
+
}
|
|
364
|
+
/**
|
|
365
|
+
* Public function to check the latest proven block number that the P2P client is synced to.
|
|
366
|
+
* @returns Block number of latest proven L2 Block we've synced with.
|
|
367
|
+
*/ async getSyncedProvenBlockNum() {
|
|
368
|
+
return await this.synchedProvenBlockNumber.getAsync() ?? INITIAL_L2_BLOCK_NUM - 1;
|
|
369
|
+
}
|
|
370
|
+
/**
|
|
371
|
+
* Method to check the status the p2p client.
|
|
372
|
+
* @returns Information about p2p client status: state & syncedToBlockNum.
|
|
373
|
+
*/ async getStatus() {
|
|
374
|
+
const blockNumber = await this.getSyncedLatestBlockNum();
|
|
375
|
+
const blockHash = blockNumber === 0 ? '' : await this.l2BlockSource.getBlockHeader(blockNumber).then((header)=>header?.hash()).then((hash)=>hash?.toString());
|
|
376
|
+
return {
|
|
377
|
+
state: this.currentState,
|
|
378
|
+
syncedToL2Block: {
|
|
379
|
+
number: blockNumber,
|
|
380
|
+
hash: blockHash
|
|
381
|
+
}
|
|
382
|
+
};
|
|
383
|
+
}
|
|
384
|
+
/**
|
|
385
|
+
* Mark all txs from these blocks as mined.
|
|
386
|
+
* @param blocks - A list of existing blocks with txs that the P2P client needs to ensure the tx pool is reconciled with.
|
|
387
|
+
* @returns Empty promise.
|
|
388
|
+
*/ async markTxsAsMinedFromBlocks(blocks) {
|
|
389
|
+
for (const block of blocks){
|
|
390
|
+
const txHashes = block.body.txEffects.map((txEffect)=>txEffect.txHash);
|
|
391
|
+
await this.txPool.markAsMined(txHashes, block.number);
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
/**
|
|
395
|
+
* Deletes txs from these blocks.
|
|
396
|
+
* @param blocks - A list of existing blocks with txs that the P2P client needs to ensure the tx pool is reconciled with.
|
|
397
|
+
* @returns Empty promise.
|
|
398
|
+
*/ async deleteTxsFromBlocks(blocks) {
|
|
399
|
+
this.log.debug(`Deleting txs from blocks ${blocks[0].number} to ${blocks[blocks.length - 1].number}`);
|
|
400
|
+
for (const block of blocks){
|
|
401
|
+
const txHashes = block.body.txEffects.map((txEffect)=>txEffect.txHash);
|
|
402
|
+
await this.txPool.deleteTxs(txHashes);
|
|
403
|
+
}
|
|
404
|
+
}
|
|
405
|
+
/**
|
|
406
|
+
* Handles new mined blocks by marking the txs in them as mined.
|
|
407
|
+
* @param blocks - A list of existing blocks with txs that the P2P client needs to ensure the tx pool is reconciled with.
|
|
408
|
+
* @returns Empty promise.
|
|
409
|
+
*/ async handleLatestL2Blocks(blocks) {
|
|
410
|
+
if (!blocks.length) {
|
|
411
|
+
return Promise.resolve();
|
|
412
|
+
}
|
|
413
|
+
await this.markTxsAsMinedFromBlocks(blocks);
|
|
414
|
+
const lastBlockNum = blocks[blocks.length - 1].number;
|
|
415
|
+
await Promise.all(blocks.map(async (block)=>this.synchedBlockHashes.set(block.number, (await block.hash()).toString())));
|
|
416
|
+
await this.synchedLatestBlockNumber.set(lastBlockNum);
|
|
417
|
+
this.log.verbose(`Synched to latest block ${lastBlockNum}`);
|
|
418
|
+
await this.startServiceIfSynched();
|
|
419
|
+
}
|
|
420
|
+
/**
|
|
421
|
+
* Handles new proven blocks by deleting the txs in them, or by deleting the txs in blocks `keepProvenTxsFor` ago.
|
|
422
|
+
* @param blocks - A list of proven L2 blocks.
|
|
423
|
+
* @returns Empty promise.
|
|
424
|
+
*/ async handleProvenL2Blocks(blocks) {
|
|
425
|
+
if (!blocks.length) {
|
|
426
|
+
return Promise.resolve();
|
|
427
|
+
}
|
|
428
|
+
const firstBlockNum = blocks[0].number;
|
|
429
|
+
const lastBlockNum = blocks[blocks.length - 1].number;
|
|
430
|
+
const lastBlockSlot = blocks[blocks.length - 1].header.globalVariables.slotNumber.toBigInt();
|
|
431
|
+
// If keepProvenTxsFor is 0, we delete all txs from all proven blocks.
|
|
432
|
+
if (this.keepProvenTxsFor === 0) {
|
|
433
|
+
await this.deleteTxsFromBlocks(blocks);
|
|
434
|
+
} else if (lastBlockNum - this.keepProvenTxsFor >= INITIAL_L2_BLOCK_NUM) {
|
|
435
|
+
const fromBlock = Math.max(INITIAL_L2_BLOCK_NUM, firstBlockNum - this.keepProvenTxsFor);
|
|
436
|
+
const toBlock = lastBlockNum - this.keepProvenTxsFor;
|
|
437
|
+
const limit = toBlock - fromBlock + 1;
|
|
438
|
+
const blocksToDeleteTxsFrom = await this.l2BlockSource.getBlocks(fromBlock, limit, true);
|
|
439
|
+
await this.deleteTxsFromBlocks(blocksToDeleteTxsFrom);
|
|
440
|
+
}
|
|
441
|
+
// We delete attestations older than the last block slot minus the number of slots we want to keep in the pool.
|
|
442
|
+
const lastBlockSlotMinusKeepAttestationsInPoolFor = lastBlockSlot - BigInt(this.keepAttestationsInPoolFor);
|
|
443
|
+
if (lastBlockSlotMinusKeepAttestationsInPoolFor >= BigInt(INITIAL_L2_BLOCK_NUM)) {
|
|
444
|
+
await this.attestationPool?.deleteAttestationsOlderThan(lastBlockSlotMinusKeepAttestationsInPoolFor);
|
|
445
|
+
}
|
|
446
|
+
await this.synchedProvenBlockNumber.set(lastBlockNum);
|
|
447
|
+
this.log.debug(`Synched to proven block ${lastBlockNum}`);
|
|
448
|
+
await this.startServiceIfSynched();
|
|
449
|
+
}
|
|
450
|
+
/**
|
|
451
|
+
* Updates the tx pool after a chain prune.
|
|
452
|
+
* @param latestBlock - The block number the chain was pruned to.
|
|
453
|
+
*/ async handlePruneL2Blocks(latestBlock) {
|
|
454
|
+
const txsToDelete = [];
|
|
455
|
+
for (const tx of (await this.txPool.getAllTxs())){
|
|
456
|
+
// every tx that's been generated against a block that has now been pruned is no longer valid
|
|
457
|
+
if (tx.data.constants.historicalHeader.globalVariables.blockNumber.toNumber() > latestBlock) {
|
|
458
|
+
txsToDelete.push(await tx.getTxHash());
|
|
459
|
+
}
|
|
460
|
+
}
|
|
461
|
+
this.log.info(`Detected chain prune. Removing invalid txs count=${txsToDelete.length} newLatestBlock=${latestBlock} previousLatestBlock=${this.getSyncedLatestBlockNum()}`);
|
|
462
|
+
// delete invalid txs (both pending and mined)
|
|
463
|
+
await this.txPool.deleteTxs(txsToDelete);
|
|
464
|
+
// everything left in the mined set was built against a block on the proven chain so its still valid
|
|
465
|
+
// move back to pending the txs that were reorged out of the chain
|
|
466
|
+
// NOTE: we can't move _all_ txs back to pending because the tx pool could keep hold of mined txs for longer
|
|
467
|
+
// (see this.keepProvenTxsFor)
|
|
468
|
+
const txsToMoveToPending = [];
|
|
469
|
+
for (const [txHash, blockNumber] of (await this.txPool.getMinedTxHashes())){
|
|
470
|
+
if (blockNumber > latestBlock) {
|
|
471
|
+
txsToMoveToPending.push(txHash);
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
this.log.info(`Moving ${txsToMoveToPending.length} mined txs back to pending`);
|
|
475
|
+
await this.txPool.markMinedAsPending(txsToMoveToPending);
|
|
476
|
+
await this.synchedLatestBlockNumber.set(latestBlock);
|
|
477
|
+
// no need to update block hashes, as they will be updated as new blocks are added
|
|
478
|
+
}
|
|
479
|
+
async startServiceIfSynched() {
|
|
480
|
+
if (this.currentState === 1 && await this.getSyncedLatestBlockNum() >= this.latestBlockNumberAtStart && await this.getSyncedProvenBlockNum() >= this.provenBlockNumberAtStart) {
|
|
481
|
+
this.log.debug(`Synched to blocks at start`);
|
|
482
|
+
this.setCurrentState(2);
|
|
483
|
+
if (this.syncResolve !== undefined) {
|
|
484
|
+
this.syncResolve();
|
|
485
|
+
await this.p2pService.start();
|
|
486
|
+
}
|
|
487
|
+
}
|
|
488
|
+
}
|
|
489
|
+
/**
|
|
490
|
+
* Method to set the value of the current state.
|
|
491
|
+
* @param newState - New state value.
|
|
492
|
+
*/ setCurrentState(newState) {
|
|
493
|
+
const oldState = this.currentState;
|
|
494
|
+
this.currentState = newState;
|
|
495
|
+
this.log.debug(`Moved from state ${P2PClientState[oldState]} to ${P2PClientState[this.currentState]}`);
|
|
496
|
+
}
|
|
497
|
+
}
|
|
498
|
+
_ts_decorate([
|
|
499
|
+
trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
|
|
500
|
+
[Attributes.BLOCK_NUMBER]: proposal.blockNumber.toNumber(),
|
|
501
|
+
[Attributes.SLOT_NUMBER]: proposal.slotNumber.toNumber(),
|
|
502
|
+
[Attributes.BLOCK_ARCHIVE]: proposal.archive.toString(),
|
|
503
|
+
[Attributes.P2P_ID]: (await proposal.p2pMessageIdentifier()).toString()
|
|
504
|
+
}))
|
|
505
|
+
], P2PClient.prototype, "broadcastProposal", null);
|