@aztec/p2p 0.0.1-commit.fcb71a6 → 0.0.1-commit.fffb133c
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/interface.d.ts +18 -5
- package/dest/client/interface.d.ts.map +1 -1
- package/dest/client/p2p_client.d.ts +10 -13
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +449 -118
- package/dest/config.js +2 -2
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +61 -42
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
- 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 +237 -263
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +21 -18
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +113 -108
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +17 -16
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +89 -128
- package/dest/mem_pools/attestation_pool/mocks.d.ts +9 -6
- package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/mocks.js +16 -12
- 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 +4 -13
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +15 -10
- 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 +91 -50
- package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +19 -5
- package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +59 -3
- package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +79 -5
- package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +47 -0
- package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +16 -0
- package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -0
- package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +122 -0
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +2 -2
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +4 -4
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +2 -0
- package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +2 -2
- package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +25 -0
- package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +1 -0
- package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +57 -0
- package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +4 -4
- package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
- package/dest/msg_validators/attestation_validator/attestation_validator.js +51 -18
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +5 -5
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +18 -14
- package/dest/msg_validators/clock_tolerance.d.ts +21 -0
- package/dest/msg_validators/clock_tolerance.d.ts.map +1 -0
- package/dest/msg_validators/clock_tolerance.js +37 -0
- package/dest/msg_validators/index.d.ts +2 -2
- package/dest/msg_validators/index.d.ts.map +1 -1
- package/dest/msg_validators/index.js +1 -1
- package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +9 -0
- package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -0
- package/dest/msg_validators/proposal_validator/block_proposal_validator.js +6 -0
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +9 -0
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -0
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +6 -0
- package/dest/msg_validators/proposal_validator/index.d.ts +4 -0
- package/dest/msg_validators/proposal_validator/index.d.ts.map +1 -0
- package/dest/msg_validators/proposal_validator/index.js +3 -0
- package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +13 -0
- package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -0
- package/dest/msg_validators/proposal_validator/proposal_validator.js +104 -0
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +23 -0
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +1 -0
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +212 -0
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/block_header_validator.js +1 -1
- 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/fee_payer_balance.d.ts +10 -0
- package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/fee_payer_balance.js +20 -0
- package/dest/msg_validators/tx_validator/gas_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/gas_validator.js +8 -14
- package/dest/msg_validators/tx_validator/index.d.ts +2 -1
- package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/index.js +1 -0
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/size_validator.d.ts +6 -0
- package/dest/msg_validators/tx_validator/size_validator.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/size_validator.js +20 -0
- package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
- package/dest/services/dummy_service.d.ts +6 -2
- package/dest/services/dummy_service.d.ts.map +1 -1
- package/dest/services/dummy_service.js +3 -0
- package/dest/services/encoding.d.ts +1 -1
- package/dest/services/encoding.d.ts.map +1 -1
- package/dest/services/encoding.js +6 -5
- package/dest/services/libp2p/instrumentation.d.ts +1 -1
- package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
- package/dest/services/libp2p/instrumentation.js +20 -73
- package/dest/services/libp2p/libp2p_service.d.ts +28 -11
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +711 -152
- package/dest/services/peer-manager/metrics.d.ts +1 -1
- package/dest/services/peer-manager/metrics.d.ts.map +1 -1
- package/dest/services/peer-manager/metrics.js +6 -26
- package/dest/services/peer-manager/peer_manager.d.ts +2 -2
- package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_manager.js +0 -10
- package/dest/services/peer-manager/peer_scoring.d.ts +1 -1
- package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_scoring.js +2 -5
- 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/constants.d.ts +12 -0
- package/dest/services/reqresp/constants.d.ts.map +1 -0
- package/dest/services/reqresp/constants.js +7 -0
- 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 +5 -21
- package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts +1 -1
- package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/block_txs/bitvector.js +7 -0
- package/dest/services/reqresp/protocols/status.d.ts +1 -1
- package/dest/services/reqresp/protocols/status.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/status.js +4 -1
- package/dest/services/reqresp/reqresp.js +402 -24
- package/dest/services/service.d.ts +16 -3
- package/dest/services/service.d.ts.map +1 -1
- package/dest/services/tx_collection/instrumentation.d.ts +1 -1
- package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
- package/dest/services/tx_collection/instrumentation.js +4 -14
- package/dest/services/tx_collection/slow_tx_collection.d.ts +3 -3
- package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/tx_collection.d.ts +5 -5
- package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
- package/dest/services/tx_provider.d.ts +3 -3
- package/dest/services/tx_provider.d.ts.map +1 -1
- package/dest/services/tx_provider_instrumentation.d.ts +1 -1
- package/dest/services/tx_provider_instrumentation.d.ts.map +1 -1
- package/dest/services/tx_provider_instrumentation.js +6 -19
- package/dest/testbench/p2p_client_testbench_worker.js +30 -17
- package/dest/testbench/worker_client_manager.d.ts +1 -1
- package/dest/testbench/worker_client_manager.d.ts.map +1 -1
- package/dest/testbench/worker_client_manager.js +6 -1
- package/package.json +16 -16
- package/src/client/interface.ts +19 -4
- package/src/client/p2p_client.ts +82 -132
- package/src/config.ts +2 -2
- package/src/mem_pools/attestation_pool/attestation_pool.ts +68 -41
- package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +239 -287
- package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +162 -140
- package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +141 -164
- package/src/mem_pools/attestation_pool/mocks.ts +19 -13
- package/src/mem_pools/instrumentation.ts +9 -18
- package/src/mem_pools/tx_pool/README.md +28 -13
- package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +130 -75
- package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +66 -5
- package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +119 -4
- package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +162 -0
- package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +4 -2
- package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +75 -0
- package/src/msg_validators/attestation_validator/attestation_validator.ts +36 -21
- package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +13 -16
- package/src/msg_validators/clock_tolerance.ts +51 -0
- package/src/msg_validators/index.ts +1 -1
- package/src/msg_validators/proposal_validator/block_proposal_validator.ts +10 -0
- package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +13 -0
- package/src/msg_validators/proposal_validator/index.ts +3 -0
- package/src/msg_validators/proposal_validator/proposal_validator.ts +92 -0
- package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +230 -0
- package/src/msg_validators/tx_validator/block_header_validator.ts +3 -1
- package/src/msg_validators/tx_validator/data_validator.ts +12 -4
- package/src/msg_validators/tx_validator/fee_payer_balance.ts +40 -0
- package/src/msg_validators/tx_validator/gas_validator.ts +8 -25
- package/src/msg_validators/tx_validator/index.ts +1 -0
- package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
- package/src/msg_validators/tx_validator/size_validator.ts +18 -0
- package/src/msg_validators/tx_validator/timestamp_validator.ts +3 -1
- package/src/services/dummy_service.ts +6 -0
- package/src/services/encoding.ts +5 -4
- package/src/services/libp2p/instrumentation.ts +19 -73
- package/src/services/libp2p/libp2p_service.ts +351 -115
- package/src/services/peer-manager/metrics.ts +5 -26
- package/src/services/peer-manager/peer_manager.ts +1 -2
- package/src/services/peer-manager/peer_scoring.ts +1 -5
- package/src/services/reqresp/connection-sampler/connection_sampler.ts +3 -1
- package/src/services/reqresp/constants.ts +14 -0
- package/src/services/reqresp/metrics.ts +7 -23
- package/src/services/reqresp/protocols/block_txs/bitvector.ts +9 -0
- package/src/services/reqresp/protocols/status.ts +7 -4
- package/src/services/service.ts +19 -4
- package/src/services/tx_collection/instrumentation.ts +4 -21
- package/src/services/tx_collection/slow_tx_collection.ts +2 -2
- package/src/services/tx_collection/tx_collection.ts +4 -4
- package/src/services/tx_provider.ts +2 -2
- package/src/services/tx_provider_instrumentation.ts +11 -24
- package/src/testbench/p2p_client_testbench_worker.ts +40 -21
- package/src/testbench/worker_client_manager.ts +6 -1
- package/dest/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.d.ts +0 -15
- package/dest/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.js +0 -88
- package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts +0 -12
- package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map +0 -1
- package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +0 -82
- package/dest/msg_validators/block_proposal_validator/index.d.ts +0 -2
- package/dest/msg_validators/block_proposal_validator/index.d.ts.map +0 -1
- package/dest/msg_validators/block_proposal_validator/index.js +0 -1
- package/src/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.ts +0 -108
- package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +0 -97
- package/src/msg_validators/block_proposal_validator/index.ts +0 -1
|
@@ -1,10 +1,377 @@
|
|
|
1
|
-
function
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
function applyDecs2203RFactory() {
|
|
2
|
+
function createAddInitializerMethod(initializers, decoratorFinishedRef) {
|
|
3
|
+
return function addInitializer(initializer) {
|
|
4
|
+
assertNotFinished(decoratorFinishedRef, "addInitializer");
|
|
5
|
+
assertCallable(initializer, "An initializer");
|
|
6
|
+
initializers.push(initializer);
|
|
7
|
+
};
|
|
8
|
+
}
|
|
9
|
+
function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
|
|
10
|
+
var kindStr;
|
|
11
|
+
switch(kind){
|
|
12
|
+
case 1:
|
|
13
|
+
kindStr = "accessor";
|
|
14
|
+
break;
|
|
15
|
+
case 2:
|
|
16
|
+
kindStr = "method";
|
|
17
|
+
break;
|
|
18
|
+
case 3:
|
|
19
|
+
kindStr = "getter";
|
|
20
|
+
break;
|
|
21
|
+
case 4:
|
|
22
|
+
kindStr = "setter";
|
|
23
|
+
break;
|
|
24
|
+
default:
|
|
25
|
+
kindStr = "field";
|
|
26
|
+
}
|
|
27
|
+
var ctx = {
|
|
28
|
+
kind: kindStr,
|
|
29
|
+
name: isPrivate ? "#" + name : name,
|
|
30
|
+
static: isStatic,
|
|
31
|
+
private: isPrivate,
|
|
32
|
+
metadata: metadata
|
|
33
|
+
};
|
|
34
|
+
var decoratorFinishedRef = {
|
|
35
|
+
v: false
|
|
36
|
+
};
|
|
37
|
+
ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
|
|
38
|
+
var get, set;
|
|
39
|
+
if (kind === 0) {
|
|
40
|
+
if (isPrivate) {
|
|
41
|
+
get = desc.get;
|
|
42
|
+
set = desc.set;
|
|
43
|
+
} else {
|
|
44
|
+
get = function() {
|
|
45
|
+
return this[name];
|
|
46
|
+
};
|
|
47
|
+
set = function(v) {
|
|
48
|
+
this[name] = v;
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
} else if (kind === 2) {
|
|
52
|
+
get = function() {
|
|
53
|
+
return desc.value;
|
|
54
|
+
};
|
|
55
|
+
} else {
|
|
56
|
+
if (kind === 1 || kind === 3) {
|
|
57
|
+
get = function() {
|
|
58
|
+
return desc.get.call(this);
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
if (kind === 1 || kind === 4) {
|
|
62
|
+
set = function(v) {
|
|
63
|
+
desc.set.call(this, v);
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
ctx.access = get && set ? {
|
|
68
|
+
get: get,
|
|
69
|
+
set: set
|
|
70
|
+
} : get ? {
|
|
71
|
+
get: get
|
|
72
|
+
} : {
|
|
73
|
+
set: set
|
|
74
|
+
};
|
|
75
|
+
try {
|
|
76
|
+
return dec(value, ctx);
|
|
77
|
+
} finally{
|
|
78
|
+
decoratorFinishedRef.v = true;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
function assertNotFinished(decoratorFinishedRef, fnName) {
|
|
82
|
+
if (decoratorFinishedRef.v) {
|
|
83
|
+
throw new Error("attempted to call " + fnName + " after decoration was finished");
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
function assertCallable(fn, hint) {
|
|
87
|
+
if (typeof fn !== "function") {
|
|
88
|
+
throw new TypeError(hint + " must be a function");
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
function assertValidReturnValue(kind, value) {
|
|
92
|
+
var type = typeof value;
|
|
93
|
+
if (kind === 1) {
|
|
94
|
+
if (type !== "object" || value === null) {
|
|
95
|
+
throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
|
|
96
|
+
}
|
|
97
|
+
if (value.get !== undefined) {
|
|
98
|
+
assertCallable(value.get, "accessor.get");
|
|
99
|
+
}
|
|
100
|
+
if (value.set !== undefined) {
|
|
101
|
+
assertCallable(value.set, "accessor.set");
|
|
102
|
+
}
|
|
103
|
+
if (value.init !== undefined) {
|
|
104
|
+
assertCallable(value.init, "accessor.init");
|
|
105
|
+
}
|
|
106
|
+
} else if (type !== "function") {
|
|
107
|
+
var hint;
|
|
108
|
+
if (kind === 0) {
|
|
109
|
+
hint = "field";
|
|
110
|
+
} else if (kind === 10) {
|
|
111
|
+
hint = "class";
|
|
112
|
+
} else {
|
|
113
|
+
hint = "method";
|
|
114
|
+
}
|
|
115
|
+
throw new TypeError(hint + " decorators must return a function or void 0");
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
|
|
119
|
+
var decs = decInfo[0];
|
|
120
|
+
var desc, init, value;
|
|
121
|
+
if (isPrivate) {
|
|
122
|
+
if (kind === 0 || kind === 1) {
|
|
123
|
+
desc = {
|
|
124
|
+
get: decInfo[3],
|
|
125
|
+
set: decInfo[4]
|
|
126
|
+
};
|
|
127
|
+
} else if (kind === 3) {
|
|
128
|
+
desc = {
|
|
129
|
+
get: decInfo[3]
|
|
130
|
+
};
|
|
131
|
+
} else if (kind === 4) {
|
|
132
|
+
desc = {
|
|
133
|
+
set: decInfo[3]
|
|
134
|
+
};
|
|
135
|
+
} else {
|
|
136
|
+
desc = {
|
|
137
|
+
value: decInfo[3]
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
} else if (kind !== 0) {
|
|
141
|
+
desc = Object.getOwnPropertyDescriptor(base, name);
|
|
142
|
+
}
|
|
143
|
+
if (kind === 1) {
|
|
144
|
+
value = {
|
|
145
|
+
get: desc.get,
|
|
146
|
+
set: desc.set
|
|
147
|
+
};
|
|
148
|
+
} else if (kind === 2) {
|
|
149
|
+
value = desc.value;
|
|
150
|
+
} else if (kind === 3) {
|
|
151
|
+
value = desc.get;
|
|
152
|
+
} else if (kind === 4) {
|
|
153
|
+
value = desc.set;
|
|
154
|
+
}
|
|
155
|
+
var newValue, get, set;
|
|
156
|
+
if (typeof decs === "function") {
|
|
157
|
+
newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
|
|
158
|
+
if (newValue !== void 0) {
|
|
159
|
+
assertValidReturnValue(kind, newValue);
|
|
160
|
+
if (kind === 0) {
|
|
161
|
+
init = newValue;
|
|
162
|
+
} else if (kind === 1) {
|
|
163
|
+
init = newValue.init;
|
|
164
|
+
get = newValue.get || value.get;
|
|
165
|
+
set = newValue.set || value.set;
|
|
166
|
+
value = {
|
|
167
|
+
get: get,
|
|
168
|
+
set: set
|
|
169
|
+
};
|
|
170
|
+
} else {
|
|
171
|
+
value = newValue;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
} else {
|
|
175
|
+
for(var i = decs.length - 1; i >= 0; i--){
|
|
176
|
+
var dec = decs[i];
|
|
177
|
+
newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
|
|
178
|
+
if (newValue !== void 0) {
|
|
179
|
+
assertValidReturnValue(kind, newValue);
|
|
180
|
+
var newInit;
|
|
181
|
+
if (kind === 0) {
|
|
182
|
+
newInit = newValue;
|
|
183
|
+
} else if (kind === 1) {
|
|
184
|
+
newInit = newValue.init;
|
|
185
|
+
get = newValue.get || value.get;
|
|
186
|
+
set = newValue.set || value.set;
|
|
187
|
+
value = {
|
|
188
|
+
get: get,
|
|
189
|
+
set: set
|
|
190
|
+
};
|
|
191
|
+
} else {
|
|
192
|
+
value = newValue;
|
|
193
|
+
}
|
|
194
|
+
if (newInit !== void 0) {
|
|
195
|
+
if (init === void 0) {
|
|
196
|
+
init = newInit;
|
|
197
|
+
} else if (typeof init === "function") {
|
|
198
|
+
init = [
|
|
199
|
+
init,
|
|
200
|
+
newInit
|
|
201
|
+
];
|
|
202
|
+
} else {
|
|
203
|
+
init.push(newInit);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
if (kind === 0 || kind === 1) {
|
|
210
|
+
if (init === void 0) {
|
|
211
|
+
init = function(instance, init) {
|
|
212
|
+
return init;
|
|
213
|
+
};
|
|
214
|
+
} else if (typeof init !== "function") {
|
|
215
|
+
var ownInitializers = init;
|
|
216
|
+
init = function(instance, init) {
|
|
217
|
+
var value = init;
|
|
218
|
+
for(var i = 0; i < ownInitializers.length; i++){
|
|
219
|
+
value = ownInitializers[i].call(instance, value);
|
|
220
|
+
}
|
|
221
|
+
return value;
|
|
222
|
+
};
|
|
223
|
+
} else {
|
|
224
|
+
var originalInitializer = init;
|
|
225
|
+
init = function(instance, init) {
|
|
226
|
+
return originalInitializer.call(instance, init);
|
|
227
|
+
};
|
|
228
|
+
}
|
|
229
|
+
ret.push(init);
|
|
230
|
+
}
|
|
231
|
+
if (kind !== 0) {
|
|
232
|
+
if (kind === 1) {
|
|
233
|
+
desc.get = value.get;
|
|
234
|
+
desc.set = value.set;
|
|
235
|
+
} else if (kind === 2) {
|
|
236
|
+
desc.value = value;
|
|
237
|
+
} else if (kind === 3) {
|
|
238
|
+
desc.get = value;
|
|
239
|
+
} else if (kind === 4) {
|
|
240
|
+
desc.set = value;
|
|
241
|
+
}
|
|
242
|
+
if (isPrivate) {
|
|
243
|
+
if (kind === 1) {
|
|
244
|
+
ret.push(function(instance, args) {
|
|
245
|
+
return value.get.call(instance, args);
|
|
246
|
+
});
|
|
247
|
+
ret.push(function(instance, args) {
|
|
248
|
+
return value.set.call(instance, args);
|
|
249
|
+
});
|
|
250
|
+
} else if (kind === 2) {
|
|
251
|
+
ret.push(value);
|
|
252
|
+
} else {
|
|
253
|
+
ret.push(function(instance, args) {
|
|
254
|
+
return value.call(instance, args);
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
} else {
|
|
258
|
+
Object.defineProperty(base, name, desc);
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
function applyMemberDecs(Class, decInfos, metadata) {
|
|
263
|
+
var ret = [];
|
|
264
|
+
var protoInitializers;
|
|
265
|
+
var staticInitializers;
|
|
266
|
+
var existingProtoNonFields = new Map();
|
|
267
|
+
var existingStaticNonFields = new Map();
|
|
268
|
+
for(var i = 0; i < decInfos.length; i++){
|
|
269
|
+
var decInfo = decInfos[i];
|
|
270
|
+
if (!Array.isArray(decInfo)) continue;
|
|
271
|
+
var kind = decInfo[1];
|
|
272
|
+
var name = decInfo[2];
|
|
273
|
+
var isPrivate = decInfo.length > 3;
|
|
274
|
+
var isStatic = kind >= 5;
|
|
275
|
+
var base;
|
|
276
|
+
var initializers;
|
|
277
|
+
if (isStatic) {
|
|
278
|
+
base = Class;
|
|
279
|
+
kind = kind - 5;
|
|
280
|
+
staticInitializers = staticInitializers || [];
|
|
281
|
+
initializers = staticInitializers;
|
|
282
|
+
} else {
|
|
283
|
+
base = Class.prototype;
|
|
284
|
+
protoInitializers = protoInitializers || [];
|
|
285
|
+
initializers = protoInitializers;
|
|
286
|
+
}
|
|
287
|
+
if (kind !== 0 && !isPrivate) {
|
|
288
|
+
var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
|
|
289
|
+
var existingKind = existingNonFields.get(name) || 0;
|
|
290
|
+
if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
|
|
291
|
+
throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
|
|
292
|
+
} else if (!existingKind && kind > 2) {
|
|
293
|
+
existingNonFields.set(name, kind);
|
|
294
|
+
} else {
|
|
295
|
+
existingNonFields.set(name, true);
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
|
|
299
|
+
}
|
|
300
|
+
pushInitializers(ret, protoInitializers);
|
|
301
|
+
pushInitializers(ret, staticInitializers);
|
|
302
|
+
return ret;
|
|
303
|
+
}
|
|
304
|
+
function pushInitializers(ret, initializers) {
|
|
305
|
+
if (initializers) {
|
|
306
|
+
ret.push(function(instance) {
|
|
307
|
+
for(var i = 0; i < initializers.length; i++){
|
|
308
|
+
initializers[i].call(instance);
|
|
309
|
+
}
|
|
310
|
+
return instance;
|
|
311
|
+
});
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
function applyClassDecs(targetClass, classDecs, metadata) {
|
|
315
|
+
if (classDecs.length > 0) {
|
|
316
|
+
var initializers = [];
|
|
317
|
+
var newClass = targetClass;
|
|
318
|
+
var name = targetClass.name;
|
|
319
|
+
for(var i = classDecs.length - 1; i >= 0; i--){
|
|
320
|
+
var decoratorFinishedRef = {
|
|
321
|
+
v: false
|
|
322
|
+
};
|
|
323
|
+
try {
|
|
324
|
+
var nextNewClass = classDecs[i](newClass, {
|
|
325
|
+
kind: "class",
|
|
326
|
+
name: name,
|
|
327
|
+
addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
|
|
328
|
+
metadata
|
|
329
|
+
});
|
|
330
|
+
} finally{
|
|
331
|
+
decoratorFinishedRef.v = true;
|
|
332
|
+
}
|
|
333
|
+
if (nextNewClass !== undefined) {
|
|
334
|
+
assertValidReturnValue(10, nextNewClass);
|
|
335
|
+
newClass = nextNewClass;
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
return [
|
|
339
|
+
defineMetadata(newClass, metadata),
|
|
340
|
+
function() {
|
|
341
|
+
for(var i = 0; i < initializers.length; i++){
|
|
342
|
+
initializers[i].call(newClass);
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
];
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
function defineMetadata(Class, metadata) {
|
|
349
|
+
return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
|
|
350
|
+
configurable: true,
|
|
351
|
+
enumerable: true,
|
|
352
|
+
value: metadata
|
|
353
|
+
});
|
|
354
|
+
}
|
|
355
|
+
return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
|
|
356
|
+
if (parentClass !== void 0) {
|
|
357
|
+
var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
|
|
358
|
+
}
|
|
359
|
+
var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
|
|
360
|
+
var e = applyMemberDecs(targetClass, memberDecs, metadata);
|
|
361
|
+
if (!classDecs.length) defineMetadata(targetClass, metadata);
|
|
362
|
+
return {
|
|
363
|
+
e: e,
|
|
364
|
+
get c () {
|
|
365
|
+
return applyClassDecs(targetClass, classDecs, metadata);
|
|
366
|
+
}
|
|
367
|
+
};
|
|
368
|
+
};
|
|
369
|
+
}
|
|
370
|
+
function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
|
|
371
|
+
return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
|
|
6
372
|
}
|
|
7
|
-
|
|
373
|
+
var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _initProto;
|
|
374
|
+
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
8
375
|
import { randomInt } from '@aztec/foundation/crypto/random';
|
|
9
376
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
10
377
|
import { createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
|
|
@@ -13,11 +380,11 @@ import { Timer } from '@aztec/foundation/timer';
|
|
|
13
380
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
14
381
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
15
382
|
import { GasFees } from '@aztec/stdlib/gas';
|
|
16
|
-
import {
|
|
383
|
+
import { BlockProposal, CheckpointAttestation, CheckpointProposal, P2PClientType, P2PMessage, PeerErrorSeverity, TopicType, createTopicString, getTopicsForClientAndConfig, metricsTopicStrToLabels } from '@aztec/stdlib/p2p';
|
|
17
384
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
18
385
|
import { Tx } from '@aztec/stdlib/tx';
|
|
19
386
|
import { compressComponentVersions } from '@aztec/stdlib/versioning';
|
|
20
|
-
import { Attributes, OtelMetricsAdapter, WithTracer, trackSpan } from '@aztec/telemetry-client';
|
|
387
|
+
import { Attributes, OtelMetricsAdapter, SpanStatusCode, WithTracer, trackSpan } from '@aztec/telemetry-client';
|
|
21
388
|
import { gossipsub } from '@chainsafe/libp2p-gossipsub';
|
|
22
389
|
import { createPeerScoreParams, createTopicScoreParams } from '@chainsafe/libp2p-gossipsub/score';
|
|
23
390
|
import { SignaturePolicy } from '@chainsafe/libp2p-gossipsub/types';
|
|
@@ -31,7 +398,7 @@ import { tcp } from '@libp2p/tcp';
|
|
|
31
398
|
import { ENR } from '@nethermindeth/enr';
|
|
32
399
|
import { createLibp2p } from 'libp2p';
|
|
33
400
|
import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
|
|
34
|
-
import {
|
|
401
|
+
import { BlockProposalValidator, CheckpointAttestationValidator, CheckpointProposalValidator, FishermanAttestationValidator, SizeTxValidator } from '../../msg_validators/index.js';
|
|
35
402
|
import { MessageSeenValidator } from '../../msg_validators/msg_seen_validator/msg_seen_validator.js';
|
|
36
403
|
import { getDefaultAllowedSetupFunctions } from '../../msg_validators/tx_validator/allowed_public_setup.js';
|
|
37
404
|
import { createTxMessageValidators } from '../../msg_validators/tx_validator/factory.js';
|
|
@@ -51,6 +418,31 @@ import { reqGoodbyeHandler } from '../reqresp/protocols/goodbye.js';
|
|
|
51
418
|
import { pingHandler, reqRespBlockHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/protocols/index.js';
|
|
52
419
|
import { ReqResp } from '../reqresp/reqresp.js';
|
|
53
420
|
import { P2PInstrumentation } from './instrumentation.js';
|
|
421
|
+
_dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
|
|
422
|
+
[Attributes.SLOT_NUMBER]: block.slotNumber,
|
|
423
|
+
[Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
|
|
424
|
+
[Attributes.P2P_ID]: await block.p2pMessageLoggingIdentifier().then((i)=>i.toString())
|
|
425
|
+
})), _dec1 = trackSpan('Libp2pService.processValidCheckpointProposal', async (checkpoint)=>({
|
|
426
|
+
[Attributes.SLOT_NUMBER]: checkpoint.slotNumber,
|
|
427
|
+
[Attributes.BLOCK_ARCHIVE]: checkpoint.archive.toString(),
|
|
428
|
+
[Attributes.P2P_ID]: await checkpoint.p2pMessageLoggingIdentifier().then((i)=>i.toString())
|
|
429
|
+
})), _dec2 = trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
|
|
430
|
+
[Attributes.BLOCK_HASH]: request.blockHash.toString()
|
|
431
|
+
})), _dec3 = trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
|
|
432
|
+
[Attributes.TX_HASH]: requestedTxHash.toString()
|
|
433
|
+
})), _dec4 = trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
|
|
434
|
+
[Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString()
|
|
435
|
+
})), _dec5 = trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
|
|
436
|
+
[Attributes.TX_HASH]: tx.getTxHash().toString()
|
|
437
|
+
})), _dec6 = trackSpan('Libp2pService.validateCheckpointAttestation', async (_, attestation)=>({
|
|
438
|
+
[Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
|
|
439
|
+
[Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
|
|
440
|
+
[Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
|
|
441
|
+
})), _dec7 = trackSpan('Libp2pService.validateBlockProposal', (_peerId, block)=>({
|
|
442
|
+
[Attributes.SLOT_NUMBER]: block.slotNumber.toString()
|
|
443
|
+
})), _dec8 = trackSpan('Libp2pService.validateCheckpointProposal', (_peerId, checkpoint)=>({
|
|
444
|
+
[Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString()
|
|
445
|
+
}));
|
|
54
446
|
/**
|
|
55
447
|
* Lib P2P implementation of the P2PService interface.
|
|
56
448
|
*/ export class LibP2PService extends WithTracer {
|
|
@@ -65,11 +457,61 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
65
457
|
epochCache;
|
|
66
458
|
proofVerifier;
|
|
67
459
|
worldStateSynchronizer;
|
|
460
|
+
static{
|
|
461
|
+
({ e: [_initProto] } = _apply_decs_2203_r(this, [
|
|
462
|
+
[
|
|
463
|
+
_dec,
|
|
464
|
+
2,
|
|
465
|
+
"processValidBlockProposal"
|
|
466
|
+
],
|
|
467
|
+
[
|
|
468
|
+
_dec1,
|
|
469
|
+
2,
|
|
470
|
+
"processValidCheckpointProposal"
|
|
471
|
+
],
|
|
472
|
+
[
|
|
473
|
+
_dec2,
|
|
474
|
+
2,
|
|
475
|
+
"validateRequestedBlockTxs"
|
|
476
|
+
],
|
|
477
|
+
[
|
|
478
|
+
_dec3,
|
|
479
|
+
2,
|
|
480
|
+
"validateRequestedTxs"
|
|
481
|
+
],
|
|
482
|
+
[
|
|
483
|
+
_dec4,
|
|
484
|
+
2,
|
|
485
|
+
"validateRequestedBlock"
|
|
486
|
+
],
|
|
487
|
+
[
|
|
488
|
+
_dec5,
|
|
489
|
+
2,
|
|
490
|
+
"validatePropagatedTx"
|
|
491
|
+
],
|
|
492
|
+
[
|
|
493
|
+
_dec6,
|
|
494
|
+
2,
|
|
495
|
+
"validateCheckpointAttestation"
|
|
496
|
+
],
|
|
497
|
+
[
|
|
498
|
+
_dec7,
|
|
499
|
+
2,
|
|
500
|
+
"validateBlockProposal"
|
|
501
|
+
],
|
|
502
|
+
[
|
|
503
|
+
_dec8,
|
|
504
|
+
2,
|
|
505
|
+
"validateCheckpointProposal"
|
|
506
|
+
]
|
|
507
|
+
], []));
|
|
508
|
+
}
|
|
68
509
|
discoveryRunningPromise;
|
|
69
510
|
msgIdSeenValidators;
|
|
70
511
|
// Message validators
|
|
71
|
-
attestationValidator;
|
|
72
512
|
blockProposalValidator;
|
|
513
|
+
checkpointProposalValidator;
|
|
514
|
+
checkpointAttestationValidator;
|
|
73
515
|
protocolVersion;
|
|
74
516
|
topicStrings;
|
|
75
517
|
feesCache;
|
|
@@ -78,34 +520,49 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
78
520
|
* @param block - The block received from the peer.
|
|
79
521
|
* @returns The attestation for the block, if any.
|
|
80
522
|
*/ blockReceivedCallback;
|
|
523
|
+
/**
|
|
524
|
+
* Callback for when a checkpoint proposal is received from a peer.
|
|
525
|
+
* @param checkpoint - The checkpoint proposal received from the peer.
|
|
526
|
+
* @returns The attestations for the checkpoint, if any.
|
|
527
|
+
*/ checkpointReceivedCallback;
|
|
81
528
|
gossipSubEventHandler;
|
|
82
529
|
instrumentation;
|
|
530
|
+
telemetry;
|
|
83
531
|
logger;
|
|
84
532
|
constructor(clientType, config, node, peerDiscoveryService, reqresp, peerManager, mempools, archiver, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')){
|
|
85
|
-
super(telemetry, 'LibP2PService'), this.clientType = clientType, this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.reqresp = reqresp, this.peerManager = peerManager, this.mempools = mempools, this.archiver = archiver, this.epochCache = epochCache, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.msgIdSeenValidators = {}, this.protocolVersion = '', this.topicStrings = {};
|
|
533
|
+
super(telemetry, 'LibP2PService'), this.clientType = clientType, this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.reqresp = reqresp, this.peerManager = peerManager, this.mempools = mempools, this.archiver = archiver, this.epochCache = epochCache, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.msgIdSeenValidators = (_initProto(this), {}), this.protocolVersion = '', this.topicStrings = {};
|
|
534
|
+
this.telemetry = telemetry;
|
|
86
535
|
// Create child logger with fisherman prefix if in fisherman mode
|
|
87
536
|
this.logger = config.fishermanMode ? logger.createChild('[FISHERMAN]') : logger;
|
|
88
537
|
this.instrumentation = new P2PInstrumentation(telemetry, 'LibP2PService');
|
|
89
538
|
this.msgIdSeenValidators[TopicType.tx] = new MessageSeenValidator(config.seenMessageCacheSize);
|
|
90
539
|
this.msgIdSeenValidators[TopicType.block_proposal] = new MessageSeenValidator(config.seenMessageCacheSize);
|
|
91
|
-
this.msgIdSeenValidators[TopicType.
|
|
540
|
+
this.msgIdSeenValidators[TopicType.checkpoint_proposal] = new MessageSeenValidator(config.seenMessageCacheSize);
|
|
541
|
+
this.msgIdSeenValidators[TopicType.checkpoint_attestation] = new MessageSeenValidator(config.seenMessageCacheSize);
|
|
92
542
|
const versions = getVersions(config);
|
|
93
543
|
this.protocolVersion = compressComponentVersions(versions);
|
|
94
544
|
logger.info(`Started libp2p service with protocol version ${this.protocolVersion}`);
|
|
95
545
|
this.topicStrings[TopicType.tx] = createTopicString(TopicType.tx, this.protocolVersion);
|
|
96
546
|
this.topicStrings[TopicType.block_proposal] = createTopicString(TopicType.block_proposal, this.protocolVersion);
|
|
97
|
-
this.topicStrings[TopicType.
|
|
98
|
-
|
|
99
|
-
this.attestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry) : new AttestationValidator(epochCache);
|
|
547
|
+
this.topicStrings[TopicType.checkpoint_proposal] = createTopicString(TopicType.checkpoint_proposal, this.protocolVersion);
|
|
548
|
+
this.topicStrings[TopicType.checkpoint_attestation] = createTopicString(TopicType.checkpoint_attestation, this.protocolVersion);
|
|
100
549
|
this.blockProposalValidator = new BlockProposalValidator(epochCache, {
|
|
101
550
|
txsPermitted: !config.disableTransactions
|
|
102
551
|
});
|
|
552
|
+
this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, {
|
|
553
|
+
txsPermitted: !config.disableTransactions
|
|
554
|
+
});
|
|
555
|
+
this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry) : new CheckpointAttestationValidator(epochCache);
|
|
103
556
|
this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
|
|
104
557
|
this.blockReceivedCallback = async (block)=>{
|
|
105
558
|
this.logger.debug(`Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber} from peer.`, {
|
|
106
559
|
p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier()
|
|
107
560
|
});
|
|
108
|
-
return
|
|
561
|
+
return false;
|
|
562
|
+
};
|
|
563
|
+
this.checkpointReceivedCallback = (checkpoint)=>{
|
|
564
|
+
this.logger.debug(`Handler not yet registered: Checkpoint received callback not set. Received checkpoint for slot ${checkpoint.slotNumber} from peer.`);
|
|
565
|
+
return Promise.resolve(undefined);
|
|
109
566
|
};
|
|
110
567
|
}
|
|
111
568
|
updateConfig(config) {
|
|
@@ -138,7 +595,8 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
138
595
|
const protocolVersion = compressComponentVersions(versions);
|
|
139
596
|
const txTopic = createTopicString(TopicType.tx, protocolVersion);
|
|
140
597
|
const blockProposalTopic = createTopicString(TopicType.block_proposal, protocolVersion);
|
|
141
|
-
const
|
|
598
|
+
const checkpointProposalTopic = createTopicString(TopicType.checkpoint_proposal, protocolVersion);
|
|
599
|
+
const checkpointAttestationTopic = createTopicString(TopicType.checkpoint_attestation, protocolVersion);
|
|
142
600
|
const preferredPeersEnrs = config.preferredPeers.map((enr)=>ENR.decodeTxt(enr));
|
|
143
601
|
const directPeers = (await Promise.all(preferredPeersEnrs.map(async (enr)=>{
|
|
144
602
|
const peerId = await enr.peerId();
|
|
@@ -262,12 +720,17 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
262
720
|
invalidMessageDeliveriesWeight: -20,
|
|
263
721
|
invalidMessageDeliveriesDecay: 0.5
|
|
264
722
|
}),
|
|
265
|
-
[
|
|
723
|
+
[blockProposalTopic]: createTopicScoreParams({
|
|
266
724
|
topicWeight: 1,
|
|
267
725
|
invalidMessageDeliveriesWeight: -20,
|
|
268
726
|
invalidMessageDeliveriesDecay: 0.5
|
|
269
727
|
}),
|
|
270
|
-
[
|
|
728
|
+
[checkpointProposalTopic]: createTopicScoreParams({
|
|
729
|
+
topicWeight: 1,
|
|
730
|
+
invalidMessageDeliveriesWeight: -20,
|
|
731
|
+
invalidMessageDeliveriesDecay: 0.5
|
|
732
|
+
}),
|
|
733
|
+
[checkpointAttestationTopic]: createTopicScoreParams({
|
|
271
734
|
topicWeight: 1,
|
|
272
735
|
invalidMessageDeliveriesWeight: -20,
|
|
273
736
|
invalidMessageDeliveriesDecay: 0.5
|
|
@@ -303,15 +766,6 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
303
766
|
throw new Error('Announce address not provided.');
|
|
304
767
|
}
|
|
305
768
|
const announceTcpMultiaddr = convertToMultiaddr(p2pIp, p2pPort, 'tcp');
|
|
306
|
-
await this.peerManager.initializePeers();
|
|
307
|
-
if (!this.config.p2pDiscoveryDisabled) {
|
|
308
|
-
await this.peerDiscoveryService.start();
|
|
309
|
-
}
|
|
310
|
-
await this.node.start();
|
|
311
|
-
// Subscribe to standard GossipSub topics by default
|
|
312
|
-
for (const topic of getTopicsForClientAndConfig(this.clientType, this.config.disableTransactions)){
|
|
313
|
-
this.subscribeToTopic(this.topicStrings[topic]);
|
|
314
|
-
}
|
|
315
769
|
// Create request response protocol handlers
|
|
316
770
|
const txHandler = reqRespTxHandler(this.mempools);
|
|
317
771
|
const goodbyeHandler = reqGoodbyeHandler(this.peerManager);
|
|
@@ -330,13 +784,6 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
330
784
|
if (!this.config.disableTransactions) {
|
|
331
785
|
requestResponseHandlers[ReqRespSubProtocol.TX] = txHandler.bind(this);
|
|
332
786
|
}
|
|
333
|
-
// add GossipSub listener
|
|
334
|
-
this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
|
|
335
|
-
// Start running promise for peer discovery and metrics collection
|
|
336
|
-
this.discoveryRunningPromise = new RunningPromise(async ()=>{
|
|
337
|
-
await this.peerManager.heartbeat();
|
|
338
|
-
}, this.logger, this.config.peerCheckIntervalMS);
|
|
339
|
-
this.discoveryRunningPromise.start();
|
|
340
787
|
// Define the sub protocol validators - This is done within this start() method to gain a callback to the existing validateTx function
|
|
341
788
|
const reqrespSubProtocolValidators = {
|
|
342
789
|
...DEFAULT_SUB_PROTOCOL_VALIDATORS,
|
|
@@ -344,7 +791,23 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
344
791
|
[ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
|
|
345
792
|
[ReqRespSubProtocol.BLOCK]: this.validateRequestedBlock.bind(this)
|
|
346
793
|
};
|
|
794
|
+
await this.peerManager.initializePeers();
|
|
347
795
|
await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
|
|
796
|
+
await this.node.start();
|
|
797
|
+
// Subscribe to standard GossipSub topics by default
|
|
798
|
+
for (const topic of getTopicsForClientAndConfig(this.clientType, this.config.disableTransactions)){
|
|
799
|
+
this.subscribeToTopic(this.topicStrings[topic]);
|
|
800
|
+
}
|
|
801
|
+
// add GossipSub listener
|
|
802
|
+
this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
|
|
803
|
+
// Start running promise for peer discovery and metrics collection
|
|
804
|
+
if (!this.config.p2pDiscoveryDisabled) {
|
|
805
|
+
await this.peerDiscoveryService.start();
|
|
806
|
+
}
|
|
807
|
+
this.discoveryRunningPromise = new RunningPromise(async ()=>{
|
|
808
|
+
await this.peerManager.heartbeat();
|
|
809
|
+
}, this.logger, this.config.peerCheckIntervalMS);
|
|
810
|
+
this.discoveryRunningPromise.start();
|
|
348
811
|
this.logger.info(`Started P2P service`, {
|
|
349
812
|
listen: this.config.listenAddress,
|
|
350
813
|
port: this.config.p2pPort,
|
|
@@ -408,6 +871,9 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
408
871
|
registerBlockReceivedCallback(callback) {
|
|
409
872
|
this.blockReceivedCallback = callback;
|
|
410
873
|
}
|
|
874
|
+
registerCheckpointReceivedCallback(callback) {
|
|
875
|
+
this.checkpointReceivedCallback = callback;
|
|
876
|
+
}
|
|
411
877
|
/**
|
|
412
878
|
* Subscribes to a topic.
|
|
413
879
|
* @param topic - The topic to subscribe to.
|
|
@@ -426,7 +892,9 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
426
892
|
if (!this.node.services.pubsub) {
|
|
427
893
|
throw new Error('Pubsub service not available.');
|
|
428
894
|
}
|
|
429
|
-
const
|
|
895
|
+
const isBlockProposal = topic === this.topicStrings[TopicType.block_proposal];
|
|
896
|
+
const traceContext = this.config.debugP2PInstrumentMessages && isBlockProposal ? this.telemetry.getTraceContext() : undefined;
|
|
897
|
+
const p2pMessage = P2PMessage.fromGossipable(message, this.config.debugP2PInstrumentMessages, traceContext);
|
|
430
898
|
const result = await this.node.services.pubsub.publish(topic, p2pMessage.toMessageData());
|
|
431
899
|
return result.recipients.length;
|
|
432
900
|
}
|
|
@@ -440,12 +908,15 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
440
908
|
case this.topicStrings[TopicType.tx]:
|
|
441
909
|
topicType = TopicType.tx;
|
|
442
910
|
break;
|
|
443
|
-
case this.topicStrings[TopicType.block_attestation]:
|
|
444
|
-
topicType = TopicType.block_attestation;
|
|
445
|
-
break;
|
|
446
911
|
case this.topicStrings[TopicType.block_proposal]:
|
|
447
912
|
topicType = TopicType.block_proposal;
|
|
448
913
|
break;
|
|
914
|
+
case this.topicStrings[TopicType.checkpoint_proposal]:
|
|
915
|
+
topicType = TopicType.checkpoint_proposal;
|
|
916
|
+
break;
|
|
917
|
+
case this.topicStrings[TopicType.checkpoint_attestation]:
|
|
918
|
+
topicType = TopicType.checkpoint_attestation;
|
|
919
|
+
break;
|
|
449
920
|
default:
|
|
450
921
|
this.logger.error(`Received message on unknown topic: ${msg.topic}`);
|
|
451
922
|
break;
|
|
@@ -499,22 +970,63 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
499
970
|
if (!preValidationResult.result) {
|
|
500
971
|
return;
|
|
501
972
|
}
|
|
973
|
+
// Determine topic type for attributes
|
|
502
974
|
if (msg.topic === this.topicStrings[TopicType.tx]) {
|
|
503
975
|
topicType = TopicType.tx;
|
|
504
|
-
|
|
976
|
+
} else if (msg.topic === this.topicStrings[TopicType.checkpoint_attestation]) {
|
|
977
|
+
topicType = TopicType.checkpoint_attestation;
|
|
978
|
+
} else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
979
|
+
topicType = TopicType.block_proposal;
|
|
980
|
+
} else if (msg.topic === this.topicStrings[TopicType.checkpoint_proposal]) {
|
|
981
|
+
topicType = TopicType.checkpoint_proposal;
|
|
505
982
|
}
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
if (
|
|
509
|
-
await this.
|
|
983
|
+
// Process the message, optionally within a linked span for trace propagation
|
|
984
|
+
const processMessage = async ()=>{
|
|
985
|
+
if (msg.topic === this.topicStrings[TopicType.tx]) {
|
|
986
|
+
await this.handleGossipedTx(p2pMessage.payload, msgId, source);
|
|
987
|
+
} else if (msg.topic === this.topicStrings[TopicType.checkpoint_attestation]) {
|
|
988
|
+
if (this.clientType === P2PClientType.Full) {
|
|
989
|
+
await this.processCheckpointAttestationFromPeer(p2pMessage.payload, msgId, source);
|
|
990
|
+
}
|
|
991
|
+
} else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
|
|
992
|
+
await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
|
|
993
|
+
} else if (msg.topic === this.topicStrings[TopicType.checkpoint_proposal]) {
|
|
994
|
+
await this.handleGossipedCheckpointProposal(p2pMessage.payload, msgId, source);
|
|
995
|
+
} else {
|
|
996
|
+
this.logger.error(`Received message on unknown topic: ${msg.topic}`);
|
|
510
997
|
}
|
|
998
|
+
};
|
|
999
|
+
const latency = p2pMessage.timestamp !== undefined ? msgReceivedTime - p2pMessage.timestamp.getTime() : undefined;
|
|
1000
|
+
const propagatedContext = p2pMessage.traceContext ? this.telemetry.extractPropagatedContext(p2pMessage.traceContext) : undefined;
|
|
1001
|
+
if (propagatedContext) {
|
|
1002
|
+
await this.tracer.startActiveSpan('LibP2PService.processMessage', {
|
|
1003
|
+
attributes: {
|
|
1004
|
+
[Attributes.TOPIC_NAME]: topicType,
|
|
1005
|
+
[Attributes.PEER_ID]: source.toString()
|
|
1006
|
+
}
|
|
1007
|
+
}, propagatedContext, async (span)=>{
|
|
1008
|
+
try {
|
|
1009
|
+
await processMessage();
|
|
1010
|
+
span.setStatus({
|
|
1011
|
+
code: SpanStatusCode.OK
|
|
1012
|
+
});
|
|
1013
|
+
} catch (err) {
|
|
1014
|
+
span.setStatus({
|
|
1015
|
+
code: SpanStatusCode.ERROR,
|
|
1016
|
+
message: String(err)
|
|
1017
|
+
});
|
|
1018
|
+
if (typeof err === 'string' || err && err instanceof Error) {
|
|
1019
|
+
span.recordException(err);
|
|
1020
|
+
}
|
|
1021
|
+
throw err;
|
|
1022
|
+
} finally{
|
|
1023
|
+
span.end();
|
|
1024
|
+
}
|
|
1025
|
+
});
|
|
1026
|
+
} else {
|
|
1027
|
+
await processMessage();
|
|
511
1028
|
}
|
|
512
|
-
if (
|
|
513
|
-
topicType = TopicType.block_proposal;
|
|
514
|
-
await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
|
|
515
|
-
}
|
|
516
|
-
if (p2pMessage.timestamp !== undefined && topicType !== undefined) {
|
|
517
|
-
const latency = msgReceivedTime - p2pMessage.timestamp.getTime();
|
|
1029
|
+
if (latency !== undefined && topicType !== undefined) {
|
|
518
1030
|
this.instrumentation.recordMessageLatency(topicType, latency);
|
|
519
1031
|
}
|
|
520
1032
|
return;
|
|
@@ -586,41 +1098,40 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
586
1098
|
]);
|
|
587
1099
|
}
|
|
588
1100
|
/**
|
|
589
|
-
* Process
|
|
590
|
-
*
|
|
591
|
-
|
|
592
|
-
* @param attestation - The attestation to process.
|
|
593
|
-
*/ async processAttestationFromPeer(payloadData, msgId, source) {
|
|
1101
|
+
* Process a checkpoint attestation from a peer.
|
|
1102
|
+
* Validates the attestation and adds it to the pool.
|
|
1103
|
+
*/ async processCheckpointAttestationFromPeer(payloadData, msgId, source) {
|
|
594
1104
|
const validationFunc = async ()=>{
|
|
595
|
-
const attestation =
|
|
1105
|
+
const attestation = CheckpointAttestation.fromBuffer(payloadData);
|
|
596
1106
|
const pool = this.mempools.attestationPool;
|
|
597
|
-
const
|
|
598
|
-
const
|
|
1107
|
+
const validationResult = await this.validateCheckpointAttestation(source, attestation);
|
|
1108
|
+
const isValid = validationResult.result === 'accept';
|
|
1109
|
+
const exists = isValid && await pool.hasCheckpointAttestation(attestation);
|
|
599
1110
|
let canAdd = true;
|
|
600
1111
|
if (isValid && !exists) {
|
|
601
1112
|
const slot = attestation.payload.header.slotNumber;
|
|
602
1113
|
const { committee } = await this.epochCache.getCommittee(slot);
|
|
603
1114
|
const committeeSize = committee?.length ?? 0;
|
|
604
|
-
canAdd = await pool.
|
|
1115
|
+
canAdd = await pool.canAddCheckpointAttestation(attestation, committeeSize);
|
|
605
1116
|
}
|
|
606
|
-
this.logger.trace(`Validate propagated
|
|
1117
|
+
this.logger.trace(`Validate propagated checkpoint attestation`, {
|
|
607
1118
|
isValid,
|
|
608
1119
|
exists,
|
|
609
1120
|
canAdd,
|
|
610
1121
|
[Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString(),
|
|
611
1122
|
[Attributes.P2P_ID]: source.toString()
|
|
612
1123
|
});
|
|
613
|
-
if (
|
|
1124
|
+
if (validationResult.result === 'reject') {
|
|
614
1125
|
return {
|
|
615
1126
|
result: TopicValidatorResult.Reject
|
|
616
1127
|
};
|
|
617
|
-
} else if (exists) {
|
|
1128
|
+
} else if (validationResult.result === 'ignore' || exists) {
|
|
618
1129
|
return {
|
|
619
1130
|
result: TopicValidatorResult.Ignore,
|
|
620
1131
|
obj: attestation
|
|
621
1132
|
};
|
|
622
1133
|
} else if (!canAdd) {
|
|
623
|
-
this.logger.warn(`Dropping
|
|
1134
|
+
this.logger.warn(`Dropping checkpoint attestation due to per-(slot, proposalId) attestation cap`, {
|
|
624
1135
|
slot: attestation.payload.header.slotNumber.toString(),
|
|
625
1136
|
archive: attestation.archive.toString(),
|
|
626
1137
|
source: source.toString()
|
|
@@ -636,24 +1147,25 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
636
1147
|
};
|
|
637
1148
|
}
|
|
638
1149
|
};
|
|
639
|
-
const { result, obj: attestation } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.
|
|
1150
|
+
const { result, obj: attestation } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.checkpoint_attestation);
|
|
640
1151
|
if (result !== TopicValidatorResult.Accept || !attestation) {
|
|
641
1152
|
return;
|
|
642
1153
|
}
|
|
643
|
-
this.logger.debug(`Received attestation for slot ${attestation.slotNumber} from external peer ${source.toString()}`, {
|
|
1154
|
+
this.logger.debug(`Received checkpoint attestation for slot ${attestation.slotNumber} from external peer ${source.toString()}`, {
|
|
644
1155
|
p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
|
|
645
1156
|
slot: attestation.slotNumber,
|
|
646
1157
|
archive: attestation.archive.toString(),
|
|
647
1158
|
source: source.toString()
|
|
648
1159
|
});
|
|
649
|
-
await this.mempools.attestationPool.
|
|
1160
|
+
await this.mempools.attestationPool.addCheckpointAttestations([
|
|
650
1161
|
attestation
|
|
651
1162
|
]);
|
|
652
1163
|
}
|
|
653
1164
|
async processBlockFromPeer(payloadData, msgId, source) {
|
|
654
1165
|
const validationFunc = async ()=>{
|
|
655
1166
|
const block = BlockProposal.fromBuffer(payloadData);
|
|
656
|
-
const
|
|
1167
|
+
const validationResult = await this.validateBlockProposal(source, block);
|
|
1168
|
+
const isValid = validationResult.result === 'accept';
|
|
657
1169
|
const pool = this.mempools.attestationPool;
|
|
658
1170
|
const exists = isValid && await pool.hasBlockProposal(block);
|
|
659
1171
|
const canAdd = isValid && await pool.canAddProposal(block);
|
|
@@ -661,14 +1173,14 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
661
1173
|
isValid,
|
|
662
1174
|
exists,
|
|
663
1175
|
canAdd,
|
|
664
|
-
[Attributes.SLOT_NUMBER]: block.
|
|
1176
|
+
[Attributes.SLOT_NUMBER]: block.slotNumber.toString(),
|
|
665
1177
|
[Attributes.P2P_ID]: source.toString()
|
|
666
1178
|
});
|
|
667
|
-
if (
|
|
1179
|
+
if (validationResult.result === 'reject') {
|
|
668
1180
|
return {
|
|
669
1181
|
result: TopicValidatorResult.Reject
|
|
670
1182
|
};
|
|
671
|
-
} else if (exists) {
|
|
1183
|
+
} else if (validationResult.result === 'ignore' || exists) {
|
|
672
1184
|
return {
|
|
673
1185
|
result: TopicValidatorResult.Ignore,
|
|
674
1186
|
obj: block
|
|
@@ -697,18 +1209,16 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
697
1209
|
await this.processValidBlockProposal(block, source);
|
|
698
1210
|
}
|
|
699
1211
|
// REVIEW: callback pattern https://github.com/AztecProtocol/aztec-packages/issues/7963
|
|
1212
|
+
// REFACTOR(palla): This method should be moved to the p2p_client or to a separate component,
|
|
1213
|
+
// should not be here as it does not deal with p2p networking.
|
|
700
1214
|
async processValidBlockProposal(block, sender) {
|
|
701
1215
|
const slot = block.slotNumber;
|
|
702
|
-
const previousSlot = SlotNumber(slot - 1);
|
|
703
1216
|
this.logger.verbose(`Received block proposal for slot ${slot} from external peer ${sender.toString()}.`, {
|
|
704
1217
|
p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier(),
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
source: sender.toString()
|
|
1218
|
+
source: sender.toString(),
|
|
1219
|
+
...block.toBlockInfo()
|
|
708
1220
|
});
|
|
709
|
-
|
|
710
|
-
this.logger.verbose(`Received ${attestationsForPreviousSlot.length} attestations for slot ${previousSlot}`);
|
|
711
|
-
// Attempt to add proposal, then mark the txs in this proposal as non-evictable
|
|
1221
|
+
// Attempt to add proposal
|
|
712
1222
|
try {
|
|
713
1223
|
await this.mempools.attestationPool.addBlockProposal(block);
|
|
714
1224
|
} catch (err) {
|
|
@@ -723,26 +1233,109 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
723
1233
|
}
|
|
724
1234
|
throw err;
|
|
725
1235
|
}
|
|
1236
|
+
// Mark the txs in this proposal as non-evictable
|
|
726
1237
|
await this.mempools.txPool.markTxsAsNonEvictable(block.txHashes);
|
|
727
|
-
|
|
728
|
-
//
|
|
729
|
-
|
|
730
|
-
if (
|
|
731
|
-
for
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
1238
|
+
// Call the block received callback to validate the proposal.
|
|
1239
|
+
// Note: Validators do NOT attest to individual blocks, only to checkpoint proposals.
|
|
1240
|
+
const isValid = await this.blockReceivedCallback(block, sender);
|
|
1241
|
+
if (!isValid) {
|
|
1242
|
+
this.logger.warn(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
|
|
1243
|
+
}
|
|
1244
|
+
}
|
|
1245
|
+
/**
|
|
1246
|
+
* Handle a gossiped checkpoint proposal.
|
|
1247
|
+
* Validates and processes the checkpoint proposal, then triggers the callback for attestation.
|
|
1248
|
+
*/ async handleGossipedCheckpointProposal(payloadData, msgId, source) {
|
|
1249
|
+
// TODO(palla/mbps): This pattern is repeated across multiple message handlers, consider abstracting it.
|
|
1250
|
+
const validationFunc = async ()=>{
|
|
1251
|
+
const checkpoint = CheckpointProposal.fromBuffer(payloadData);
|
|
1252
|
+
const validationResult = await this.validateCheckpointProposal(source, checkpoint);
|
|
1253
|
+
const isValid = validationResult.result === 'accept';
|
|
1254
|
+
const pool = this.mempools.attestationPool;
|
|
1255
|
+
const exists = isValid && await pool.hasCheckpointProposal(checkpoint);
|
|
1256
|
+
const canAdd = isValid && await pool.canAddCheckpointProposal(checkpoint);
|
|
1257
|
+
this.logger.trace(`Validate propagated checkpoint proposal`, {
|
|
1258
|
+
isValid,
|
|
1259
|
+
exists,
|
|
1260
|
+
canAdd,
|
|
1261
|
+
[Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
|
|
1262
|
+
[Attributes.P2P_ID]: source.toString()
|
|
1263
|
+
});
|
|
1264
|
+
if (validationResult.result === 'reject') {
|
|
1265
|
+
return {
|
|
1266
|
+
result: TopicValidatorResult.Reject
|
|
1267
|
+
};
|
|
1268
|
+
} else if (validationResult.result === 'ignore' || exists) {
|
|
1269
|
+
return {
|
|
1270
|
+
result: TopicValidatorResult.Ignore,
|
|
1271
|
+
obj: checkpoint
|
|
1272
|
+
};
|
|
1273
|
+
} else if (!canAdd) {
|
|
1274
|
+
this.peerManager.penalizePeer(source, PeerErrorSeverity.MidToleranceError);
|
|
1275
|
+
this.logger.warn(`Penalizing peer for checkpoint proposal exceeding per-slot cap`, {
|
|
1276
|
+
slot: checkpoint.slotNumber.toString(),
|
|
1277
|
+
archive: checkpoint.archive.toString(),
|
|
1278
|
+
source: source.toString()
|
|
736
1279
|
});
|
|
737
|
-
|
|
1280
|
+
return {
|
|
1281
|
+
result: TopicValidatorResult.Reject
|
|
1282
|
+
};
|
|
1283
|
+
} else {
|
|
1284
|
+
return {
|
|
1285
|
+
result: TopicValidatorResult.Accept,
|
|
1286
|
+
obj: checkpoint
|
|
1287
|
+
};
|
|
738
1288
|
}
|
|
1289
|
+
};
|
|
1290
|
+
const { result, obj: checkpoint } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.checkpoint_proposal);
|
|
1291
|
+
if (result !== TopicValidatorResult.Accept || !checkpoint) {
|
|
1292
|
+
return;
|
|
739
1293
|
}
|
|
1294
|
+
await this.processValidCheckpointProposal(checkpoint, source);
|
|
740
1295
|
}
|
|
741
1296
|
/**
|
|
742
|
-
*
|
|
743
|
-
*
|
|
744
|
-
|
|
745
|
-
|
|
1297
|
+
* Process a validated checkpoint proposal.
|
|
1298
|
+
* Extracts and processes the last block proposal (if present) first, then processes the checkpoint.
|
|
1299
|
+
* The block callback is invoked before the checkpoint callback.
|
|
1300
|
+
*/ async processValidCheckpointProposal(checkpoint, sender) {
|
|
1301
|
+
const slot = checkpoint.slotNumber;
|
|
1302
|
+
this.logger.verbose(`Received checkpoint proposal for slot ${slot} from external peer ${sender.toString()}.`, {
|
|
1303
|
+
p2pMessageIdentifier: await checkpoint.p2pMessageLoggingIdentifier(),
|
|
1304
|
+
slot: checkpoint.slotNumber,
|
|
1305
|
+
archive: checkpoint.archive.toString(),
|
|
1306
|
+
source: sender.toString()
|
|
1307
|
+
});
|
|
1308
|
+
// Extract block proposal before adding to pool (pool stores them separately)
|
|
1309
|
+
const blockProposal = checkpoint.getBlockProposal();
|
|
1310
|
+
// Add proposal to the pool (this extracts and stores block proposal separately)
|
|
1311
|
+
await this.mempools.attestationPool.addCheckpointProposal(checkpoint);
|
|
1312
|
+
// Mark txs as non-evictable if present (from the last block)
|
|
1313
|
+
if (checkpoint.txHashes.length > 0) {
|
|
1314
|
+
await this.mempools.txPool.markTxsAsNonEvictable(checkpoint.txHashes);
|
|
1315
|
+
}
|
|
1316
|
+
// If there was a last block proposal, invoke the block callback first for validation.
|
|
1317
|
+
// Note: The block proposal is already stored in the pool by addCheckpointProposal.
|
|
1318
|
+
if (blockProposal) {
|
|
1319
|
+
const isValid = await this.blockReceivedCallback(blockProposal, sender);
|
|
1320
|
+
if (!isValid) {
|
|
1321
|
+
this.logger.warn(`Block proposal from checkpoint failed validation`, {
|
|
1322
|
+
slot: slot.toString(),
|
|
1323
|
+
archive: checkpoint.archive.toString(),
|
|
1324
|
+
blockNumber: blockProposal.blockNumber.toString()
|
|
1325
|
+
});
|
|
1326
|
+
return;
|
|
1327
|
+
}
|
|
1328
|
+
}
|
|
1329
|
+
// Call the checkpoint received callback with the core version (without lastBlock)
|
|
1330
|
+
// to validate and potentially generate attestations
|
|
1331
|
+
const attestations = await this.checkpointReceivedCallback(checkpoint.toCore(), sender);
|
|
1332
|
+
if (attestations && attestations.length > 0) {
|
|
1333
|
+
// If the callback returned attestations, add them to the pool and propagate them
|
|
1334
|
+
await this.mempools.attestationPool.addCheckpointAttestations(attestations);
|
|
1335
|
+
for (const attestation of attestations){
|
|
1336
|
+
await this.propagate(attestation);
|
|
1337
|
+
}
|
|
1338
|
+
}
|
|
746
1339
|
}
|
|
747
1340
|
/**
|
|
748
1341
|
* Propagates provided message to peers.
|
|
@@ -895,7 +1488,7 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
895
1488
|
}
|
|
896
1489
|
}
|
|
897
1490
|
createRequestedTxValidator() {
|
|
898
|
-
return new AggregateTxValidator(new DataTxValidator(), new MetadataTxValidator({
|
|
1491
|
+
return new AggregateTxValidator(new DataTxValidator(), new SizeTxValidator(), new MetadataTxValidator({
|
|
899
1492
|
l1ChainId: new Fr(this.config.l1ChainId),
|
|
900
1493
|
rollupVersion: new Fr(this.config.rollupVersion),
|
|
901
1494
|
protocolContractsHash,
|
|
@@ -1050,17 +1643,17 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
1050
1643
|
return PeerErrorSeverity.HighToleranceError;
|
|
1051
1644
|
}
|
|
1052
1645
|
/**
|
|
1053
|
-
* Validate
|
|
1646
|
+
* Validate a checkpoint attestation.
|
|
1054
1647
|
*
|
|
1055
|
-
* @param attestation - The attestation to validate.
|
|
1056
|
-
* @returns True if the attestation is valid, false otherwise.
|
|
1057
|
-
*/ async
|
|
1058
|
-
const
|
|
1059
|
-
if (
|
|
1060
|
-
this.
|
|
1061
|
-
|
|
1648
|
+
* @param attestation - The checkpoint attestation to validate.
|
|
1649
|
+
* @returns True if the checkpoint attestation is valid, false otherwise.
|
|
1650
|
+
*/ async validateCheckpointAttestation(peerId, attestation) {
|
|
1651
|
+
const result = await this.checkpointAttestationValidator.validate(attestation);
|
|
1652
|
+
if (result.result === 'reject') {
|
|
1653
|
+
this.logger.debug(`Penalizing peer ${peerId} for checkpoint attestation validation failure`);
|
|
1654
|
+
this.peerManager.penalizePeer(peerId, result.severity);
|
|
1062
1655
|
}
|
|
1063
|
-
return
|
|
1656
|
+
return result;
|
|
1064
1657
|
}
|
|
1065
1658
|
/**
|
|
1066
1659
|
* Validate a block proposal.
|
|
@@ -1068,13 +1661,25 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
1068
1661
|
* @param block - The block proposal to validate.
|
|
1069
1662
|
* @returns True if the block proposal is valid, false otherwise.
|
|
1070
1663
|
*/ async validateBlockProposal(peerId, block) {
|
|
1071
|
-
const
|
|
1072
|
-
if (
|
|
1664
|
+
const result = await this.blockProposalValidator.validate(block);
|
|
1665
|
+
if (result.result === 'reject') {
|
|
1073
1666
|
this.logger.debug(`Penalizing peer ${peerId} for block proposal validation failure`);
|
|
1074
|
-
this.peerManager.penalizePeer(peerId, severity);
|
|
1075
|
-
return false;
|
|
1667
|
+
this.peerManager.penalizePeer(peerId, result.severity);
|
|
1076
1668
|
}
|
|
1077
|
-
return
|
|
1669
|
+
return result;
|
|
1670
|
+
}
|
|
1671
|
+
/**
|
|
1672
|
+
* Validate a checkpoint proposal.
|
|
1673
|
+
*
|
|
1674
|
+
* @param checkpoint - The checkpoint proposal to validate.
|
|
1675
|
+
* @returns True if the checkpoint proposal is valid, false otherwise.
|
|
1676
|
+
*/ async validateCheckpointProposal(peerId, checkpoint) {
|
|
1677
|
+
const result = await this.checkpointProposalValidator.validate(checkpoint);
|
|
1678
|
+
if (result.result === 'reject') {
|
|
1679
|
+
this.logger.debug(`Penalizing peer ${peerId} for checkpoint proposal validation failure`);
|
|
1680
|
+
this.peerManager.penalizePeer(peerId, result.severity);
|
|
1681
|
+
}
|
|
1682
|
+
return result;
|
|
1078
1683
|
}
|
|
1079
1684
|
getPeerScore(peerId) {
|
|
1080
1685
|
return this.node.services.pubsub.score.score(peerId.toString());
|
|
@@ -1111,49 +1716,3 @@ import { P2PInstrumentation } from './instrumentation.js';
|
|
|
1111
1716
|
}
|
|
1112
1717
|
}
|
|
1113
1718
|
}
|
|
1114
|
-
_ts_decorate([
|
|
1115
|
-
trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
|
|
1116
|
-
[Attributes.SLOT_NUMBER]: block.slotNumber,
|
|
1117
|
-
[Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
|
|
1118
|
-
[Attributes.P2P_ID]: await block.p2pMessageLoggingIdentifier().then((i)=>i.toString())
|
|
1119
|
-
}))
|
|
1120
|
-
], LibP2PService.prototype, "processValidBlockProposal", null);
|
|
1121
|
-
_ts_decorate([
|
|
1122
|
-
trackSpan('Libp2pService.broadcastAttestation', async (attestation)=>({
|
|
1123
|
-
[Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
|
|
1124
|
-
[Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
|
|
1125
|
-
[Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
|
|
1126
|
-
}))
|
|
1127
|
-
], LibP2PService.prototype, "broadcastAttestation", null);
|
|
1128
|
-
_ts_decorate([
|
|
1129
|
-
trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
|
|
1130
|
-
[Attributes.BLOCK_HASH]: request.blockHash.toString()
|
|
1131
|
-
}))
|
|
1132
|
-
], LibP2PService.prototype, "validateRequestedBlockTxs", null);
|
|
1133
|
-
_ts_decorate([
|
|
1134
|
-
trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
|
|
1135
|
-
[Attributes.TX_HASH]: requestedTxHash.toString()
|
|
1136
|
-
}))
|
|
1137
|
-
], LibP2PService.prototype, "validateRequestedTxs", null);
|
|
1138
|
-
_ts_decorate([
|
|
1139
|
-
trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
|
|
1140
|
-
[Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString()
|
|
1141
|
-
}))
|
|
1142
|
-
], LibP2PService.prototype, "validateRequestedBlock", null);
|
|
1143
|
-
_ts_decorate([
|
|
1144
|
-
trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
|
|
1145
|
-
[Attributes.TX_HASH]: tx.getTxHash().toString()
|
|
1146
|
-
}))
|
|
1147
|
-
], LibP2PService.prototype, "validatePropagatedTx", null);
|
|
1148
|
-
_ts_decorate([
|
|
1149
|
-
trackSpan('Libp2pService.validateAttestation', async (_, attestation)=>({
|
|
1150
|
-
[Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
|
|
1151
|
-
[Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
|
|
1152
|
-
[Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
|
|
1153
|
-
}))
|
|
1154
|
-
], LibP2PService.prototype, "validateAttestation", null);
|
|
1155
|
-
_ts_decorate([
|
|
1156
|
-
trackSpan('Libp2pService.validateBlockProposal', (_peerId, block)=>({
|
|
1157
|
-
[Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString()
|
|
1158
|
-
}))
|
|
1159
|
-
], LibP2PService.prototype, "validateBlockProposal", null);
|