@aztec/sequencer-client 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/client/index.js +0 -1
- package/dest/client/sequencer-client.d.ts +12 -9
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +55 -60
- package/dest/config.d.ts +2 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +41 -46
- package/dest/global_variable_builder/global_builder.d.ts +5 -2
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +45 -31
- package/dest/global_variable_builder/index.js +0 -1
- package/dest/index.js +0 -1
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +33 -48
- package/dest/publisher/index.js +0 -1
- package/dest/publisher/sequencer-publisher-metrics.d.ts +5 -2
- package/dest/publisher/sequencer-publisher-metrics.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-metrics.js +47 -23
- package/dest/publisher/sequencer-publisher.d.ts +10 -9
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +191 -160
- package/dest/sequencer/allowed.d.ts +1 -1
- package/dest/sequencer/allowed.d.ts.map +1 -1
- package/dest/sequencer/allowed.js +6 -13
- package/dest/sequencer/config.d.ts +1 -1
- package/dest/sequencer/config.d.ts.map +1 -1
- package/dest/sequencer/config.js +1 -2
- package/dest/sequencer/index.js +0 -1
- package/dest/sequencer/metrics.js +26 -18
- package/dest/sequencer/sequencer.d.ts +18 -12
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +589 -560
- package/dest/sequencer/timetable.d.ts +1 -1
- package/dest/sequencer/timetable.d.ts.map +1 -1
- package/dest/sequencer/timetable.js +33 -19
- package/dest/sequencer/utils.d.ts +2 -2
- package/dest/sequencer/utils.d.ts.map +1 -1
- package/dest/sequencer/utils.js +22 -32
- package/dest/slasher/factory.d.ts +4 -8
- package/dest/slasher/factory.d.ts.map +1 -1
- package/dest/slasher/factory.js +5 -7
- package/dest/slasher/index.js +0 -1
- package/dest/slasher/slasher_client.d.ts +10 -62
- package/dest/slasher/slasher_client.d.ts.map +1 -1
- package/dest/slasher/slasher_client.js +47 -231
- package/dest/test/index.d.ts +3 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +4 -1
- package/dest/tx_validator/archive_cache.d.ts +3 -3
- package/dest/tx_validator/archive_cache.d.ts.map +1 -1
- package/dest/tx_validator/archive_cache.js +8 -8
- package/dest/tx_validator/gas_validator.d.ts +5 -3
- package/dest/tx_validator/gas_validator.d.ts.map +1 -1
- package/dest/tx_validator/gas_validator.js +70 -70
- package/dest/tx_validator/nullifier_cache.d.ts +2 -2
- package/dest/tx_validator/nullifier_cache.d.ts.map +1 -1
- package/dest/tx_validator/nullifier_cache.js +9 -9
- package/dest/tx_validator/phases_validator.d.ts +3 -2
- package/dest/tx_validator/phases_validator.d.ts.map +1 -1
- package/dest/tx_validator/phases_validator.js +29 -21
- package/dest/tx_validator/test_utils.d.ts +4 -2
- package/dest/tx_validator/test_utils.d.ts.map +1 -1
- package/dest/tx_validator/test_utils.js +2 -3
- package/dest/tx_validator/tx_validator_factory.d.ts +7 -5
- package/dest/tx_validator/tx_validator_factory.d.ts.map +1 -1
- package/dest/tx_validator/tx_validator_factory.js +14 -13
- package/package.json +28 -29
- package/src/client/sequencer-client.ts +17 -14
- package/src/config.ts +6 -14
- package/src/global_variable_builder/global_builder.ts +18 -19
- package/src/publisher/config.ts +9 -17
- package/src/publisher/sequencer-publisher-metrics.ts +23 -2
- package/src/publisher/sequencer-publisher.ts +15 -17
- package/src/sequencer/allowed.ts +4 -4
- package/src/sequencer/config.ts +1 -1
- package/src/sequencer/sequencer.ts +40 -35
- package/src/sequencer/timetable.ts +1 -1
- package/src/sequencer/utils.ts +2 -2
- package/src/slasher/factory.ts +7 -13
- package/src/slasher/slasher_client.ts +30 -252
- package/src/test/index.ts +3 -3
- package/src/tx_validator/archive_cache.ts +4 -3
- package/src/tx_validator/gas_validator.ts +22 -31
- package/src/tx_validator/nullifier_cache.ts +3 -2
- package/src/tx_validator/phases_validator.ts +8 -8
- package/src/tx_validator/test_utils.ts +5 -3
- package/src/tx_validator/tx_validator_factory.ts +23 -17
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,kBAAkB;IAqB3B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAzBtB,wDAAwD;IACxD,SAAgB,WAAW,KAAK;IAEhC,uDAAuD;IACvD,SAAgB,gBAAgB,KAAK;IAErC,mGAAmG;IACnG,SAAgB,0BAA0B,KAAK;IAE/C,mIAAmI;IACnI,SAAgB,mBAAmB,KAAK;IAExC;;;;OAIG;IACH,SAAgB,gBAAgB,SAAC;gBAGd,oBAAoB,EAAE,MAAM,EAC5B,iBAAiB,EAAE,MAAM,EACzB,4BAA4B,EAAE,MAAM,EACpC,OAAO,GAAE,OAAc,EACvB,OAAO,CAAC,8BAAkB,EAC1B,GAAG,mCAAsC;IAK5D,OAAO,KAAK,yCAAyC,GAEpD;IAEM,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAenE,OAAO,KAAK,0BAA0B,GAErC;IAEM,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAU1D,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS;IAsB5D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM;CAkBxE;AAED,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,aAAa,EAAE,cAAc;aAC7B,cAAc,EAAE,MAAM;aACtB,WAAW,EAAE,MAAM;gBAFnB,aAAa,EAAE,cAAc,EAC7B,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM;CAOtC"}
|
|
@@ -1,20 +1,31 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/aztec.js';
|
|
2
2
|
import { SequencerState } from './utils.js';
|
|
3
3
|
export class SequencerTimetable {
|
|
4
|
-
|
|
4
|
+
ethereumSlotDuration;
|
|
5
|
+
aztecSlotDuration;
|
|
6
|
+
maxL1TxInclusionTimeIntoSlot;
|
|
7
|
+
enforce;
|
|
8
|
+
metrics;
|
|
9
|
+
log;
|
|
10
|
+
/** How late into the slot can we be to start working */ initialTime;
|
|
11
|
+
/** How long it takes to get ready to start building */ blockPrepareTime;
|
|
12
|
+
/** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */ attestationPropagationTime;
|
|
13
|
+
/** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */ blockValidationTime;
|
|
14
|
+
/**
|
|
15
|
+
* How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
|
|
16
|
+
* but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
|
|
17
|
+
* we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
|
|
18
|
+
*/ l1PublishingTime;
|
|
19
|
+
constructor(ethereumSlotDuration, aztecSlotDuration, maxL1TxInclusionTimeIntoSlot, enforce = true, metrics, log = createLogger('sequencer:timetable')){
|
|
5
20
|
this.ethereumSlotDuration = ethereumSlotDuration;
|
|
6
21
|
this.aztecSlotDuration = aztecSlotDuration;
|
|
7
22
|
this.maxL1TxInclusionTimeIntoSlot = maxL1TxInclusionTimeIntoSlot;
|
|
8
23
|
this.enforce = enforce;
|
|
9
24
|
this.metrics = metrics;
|
|
10
25
|
this.log = log;
|
|
11
|
-
/** How late into the slot can we be to start working */
|
|
12
26
|
this.initialTime = 3;
|
|
13
|
-
/** How long it takes to get ready to start building */
|
|
14
27
|
this.blockPrepareTime = 1;
|
|
15
|
-
/** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */
|
|
16
28
|
this.attestationPropagationTime = 2;
|
|
17
|
-
/** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */
|
|
18
29
|
this.blockValidationTime = 1;
|
|
19
30
|
this.l1PublishingTime = this.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
|
|
20
31
|
}
|
|
@@ -31,7 +42,7 @@ export class SequencerTimetable {
|
|
|
31
42
|
secondsIntoSlot,
|
|
32
43
|
maxAllowed,
|
|
33
44
|
available,
|
|
34
|
-
executionTimeEnd
|
|
45
|
+
executionTimeEnd
|
|
35
46
|
});
|
|
36
47
|
return executionTimeEnd;
|
|
37
48
|
}
|
|
@@ -43,12 +54,12 @@ export class SequencerTimetable {
|
|
|
43
54
|
const validationTimeEnd = this.aztecSlotDuration - this.afterBlockReexecTimeNeeded;
|
|
44
55
|
this.log.debug(`Validator re-execution time deadline is ${validationTimeEnd}`, {
|
|
45
56
|
secondsIntoSlot,
|
|
46
|
-
validationTimeEnd
|
|
57
|
+
validationTimeEnd
|
|
47
58
|
});
|
|
48
59
|
return validationTimeEnd;
|
|
49
60
|
}
|
|
50
61
|
getMaxAllowedTime(state) {
|
|
51
|
-
switch
|
|
62
|
+
switch(state){
|
|
52
63
|
case SequencerState.STOPPED:
|
|
53
64
|
case SequencerState.IDLE:
|
|
54
65
|
case SequencerState.SYNCHRONIZING:
|
|
@@ -62,10 +73,11 @@ export class SequencerTimetable {
|
|
|
62
73
|
return this.aztecSlotDuration - this.l1PublishingTime - 2 * this.attestationPropagationTime;
|
|
63
74
|
case SequencerState.PUBLISHING_BLOCK:
|
|
64
75
|
return this.aztecSlotDuration - this.l1PublishingTime;
|
|
65
|
-
default:
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
76
|
+
default:
|
|
77
|
+
{
|
|
78
|
+
const _exhaustiveCheck = state;
|
|
79
|
+
throw new Error(`Unexpected state: ${state}`);
|
|
80
|
+
}
|
|
69
81
|
}
|
|
70
82
|
}
|
|
71
83
|
assertTimeLeft(newState, secondsIntoSlot) {
|
|
@@ -81,16 +93,18 @@ export class SequencerTimetable {
|
|
|
81
93
|
throw new SequencerTooSlowError(newState, maxAllowedTime, secondsIntoSlot);
|
|
82
94
|
}
|
|
83
95
|
this.metrics?.recordStateTransitionBufferMs(Math.floor(bufferSeconds * 1000), newState);
|
|
84
|
-
this.log.trace(`Enough time to transition to ${newState}`, {
|
|
96
|
+
this.log.trace(`Enough time to transition to ${newState}`, {
|
|
97
|
+
maxAllowedTime,
|
|
98
|
+
secondsIntoSlot
|
|
99
|
+
});
|
|
85
100
|
}
|
|
86
101
|
}
|
|
87
102
|
export class SequencerTooSlowError extends Error {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
this.currentTime = currentTime;
|
|
103
|
+
proposedState;
|
|
104
|
+
maxAllowedTime;
|
|
105
|
+
currentTime;
|
|
106
|
+
constructor(proposedState, maxAllowedTime, currentTime){
|
|
107
|
+
super(`Too far into slot for ${proposedState} (time into slot ${currentTime}s greater than ${maxAllowedTime}s allowance)`), this.proposedState = proposedState, this.maxAllowedTime = maxAllowedTime, this.currentTime = currentTime;
|
|
93
108
|
this.name = 'SequencerTooSlowError';
|
|
94
109
|
}
|
|
95
110
|
}
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZXRhYmxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci90aW1ldGFibGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRy9DLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFNUMsTUFBTSxPQUFPLGtCQUFrQjtJQW9CN0IsWUFDbUIsb0JBQTRCLEVBQzVCLGlCQUF5QixFQUN6Qiw0QkFBb0MsRUFDcEMsVUFBbUIsSUFBSSxFQUN2QixPQUEwQixFQUMxQixNQUFNLFlBQVksQ0FBQyxxQkFBcUIsQ0FBQztRQUx6Qyx5QkFBb0IsR0FBcEIsb0JBQW9CLENBQVE7UUFDNUIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFRO1FBQ3pCLGlDQUE0QixHQUE1Qiw0QkFBNEIsQ0FBUTtRQUNwQyxZQUFPLEdBQVAsT0FBTyxDQUFnQjtRQUN2QixZQUFPLEdBQVAsT0FBTyxDQUFtQjtRQUMxQixRQUFHLEdBQUgsR0FBRyxDQUFzQztRQXpCNUQsd0RBQXdEO1FBQ3hDLGdCQUFXLEdBQUcsQ0FBQyxDQUFDO1FBRWhDLHVEQUF1RDtRQUN2QyxxQkFBZ0IsR0FBRyxDQUFDLENBQUM7UUFFckMsbUdBQW1HO1FBQ25GLCtCQUEwQixHQUFHLENBQUMsQ0FBQztRQUUvQyxtSUFBbUk7UUFDbkgsd0JBQW1CLEdBQUcsQ0FBQyxDQUFDO1FBaUJ0QyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixHQUFHLElBQUksQ0FBQyw0QkFBNEIsQ0FBQztJQUN4RixDQUFDO0lBRUQsSUFBWSx5Q0FBeUM7UUFDbkQsT0FBTyxJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxDQUFDLDBCQUEwQixHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUM7SUFDaEcsQ0FBQztJQUVNLDJCQUEyQixDQUFDLGVBQXVCO1FBQ3hE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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
1
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
2
|
import { Signature } from '@aztec/foundation/eth-signature';
|
|
3
|
+
import type { BlockAttestation } from '@aztec/stdlib/p2p';
|
|
4
4
|
export declare enum SequencerState {
|
|
5
5
|
/**
|
|
6
6
|
* Sequencer is stopped and not processing any txs from the pool.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,oBAAY,cAAc;IACxB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,qBAAqB,0BAA0B;IAC/C;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,uBAAuB,4BAA4B;IACnD;;OAEG;IACH,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,gBAAgB,EAAE,EAChC,cAAc,EAAE,UAAU,EAAE,GAC3B,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBtB"}
|
package/dest/sequencer/utils.js
CHANGED
|
@@ -1,39 +1,31 @@
|
|
|
1
1
|
import { Signature } from '@aztec/foundation/eth-signature';
|
|
2
|
-
export var SequencerState
|
|
3
|
-
(function (SequencerState) {
|
|
2
|
+
export var SequencerState = /*#__PURE__*/ function(SequencerState) {
|
|
4
3
|
/**
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
SequencerState["STOPPED"] = "STOPPED";
|
|
4
|
+
* Sequencer is stopped and not processing any txs from the pool.
|
|
5
|
+
*/ SequencerState["STOPPED"] = "STOPPED";
|
|
8
6
|
/**
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
SequencerState["IDLE"] = "IDLE";
|
|
7
|
+
* Sequencer is awaiting the next call to work().
|
|
8
|
+
*/ SequencerState["IDLE"] = "IDLE";
|
|
12
9
|
/**
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
SequencerState["SYNCHRONIZING"] = "SYNCHRONIZING";
|
|
10
|
+
* Synchronizing with the L2 chain.
|
|
11
|
+
*/ SequencerState["SYNCHRONIZING"] = "SYNCHRONIZING";
|
|
16
12
|
/**
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
SequencerState["PROPOSER_CHECK"] = "PROPOSER_CHECK";
|
|
13
|
+
* Checking if we are the proposer for the current slot.
|
|
14
|
+
*/ SequencerState["PROPOSER_CHECK"] = "PROPOSER_CHECK";
|
|
20
15
|
/**
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
SequencerState["INITIALIZING_PROPOSAL"] = "INITIALIZING_PROPOSAL";
|
|
16
|
+
* Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise.
|
|
17
|
+
*/ SequencerState["INITIALIZING_PROPOSAL"] = "INITIALIZING_PROPOSAL";
|
|
24
18
|
/**
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
SequencerState["CREATING_BLOCK"] = "CREATING_BLOCK";
|
|
19
|
+
* Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA.
|
|
20
|
+
*/ SequencerState["CREATING_BLOCK"] = "CREATING_BLOCK";
|
|
28
21
|
/**
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
SequencerState["COLLECTING_ATTESTATIONS"] = "COLLECTING_ATTESTATIONS";
|
|
22
|
+
* Collecting attestations from its peers. Will move to PUBLISHING_BLOCK.
|
|
23
|
+
*/ SequencerState["COLLECTING_ATTESTATIONS"] = "COLLECTING_ATTESTATIONS";
|
|
32
24
|
/**
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
SequencerState
|
|
36
|
-
}
|
|
25
|
+
* Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING.
|
|
26
|
+
*/ SequencerState["PUBLISHING_BLOCK"] = "PUBLISHING_BLOCK";
|
|
27
|
+
return SequencerState;
|
|
28
|
+
}({});
|
|
37
29
|
export function sequencerStateToNumber(state) {
|
|
38
30
|
return Object.values(SequencerState).indexOf(state);
|
|
39
31
|
}
|
|
@@ -43,21 +35,19 @@ export function sequencerStateToNumber(state) {
|
|
|
43
35
|
* The rollup smart contract expects attestations to appear in the order of the committee
|
|
44
36
|
*
|
|
45
37
|
* @todo: perform this logic within the memory attestation store instead?
|
|
46
|
-
*/
|
|
47
|
-
export async function orderAttestations(attestations, orderAddresses) {
|
|
38
|
+
*/ export async function orderAttestations(attestations, orderAddresses) {
|
|
48
39
|
// Create a map of sender addresses to BlockAttestations
|
|
49
40
|
const attestationMap = new Map();
|
|
50
|
-
for (const attestation of attestations)
|
|
41
|
+
for (const attestation of attestations){
|
|
51
42
|
const sender = await attestation.getSender();
|
|
52
43
|
if (sender) {
|
|
53
44
|
attestationMap.set(sender.toString(), attestation);
|
|
54
45
|
}
|
|
55
46
|
}
|
|
56
47
|
// Create the ordered array based on the orderAddresses, else return an empty signature
|
|
57
|
-
const orderedAttestations = orderAddresses.map(address
|
|
48
|
+
const orderedAttestations = orderAddresses.map((address)=>{
|
|
58
49
|
const addressString = address.toString();
|
|
59
50
|
return attestationMap.get(addressString)?.signature || Signature.empty();
|
|
60
51
|
});
|
|
61
52
|
return orderedAttestations;
|
|
62
53
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU1RCxNQUFNLENBQU4sSUFBWSxjQWlDWDtBQWpDRCxXQUFZLGNBQWM7SUFDeEI7O09BRUc7SUFDSCxxQ0FBbUIsQ0FBQTtJQUNuQjs7T0FFRztJQUNILCtCQUFhLENBQUE7SUFDYjs7T0FFRztJQUNILGlEQUErQixDQUFBO0lBQy9COztPQUVHO0lBQ0gsbURBQWlDLENBQUE7SUFDakM7O09BRUc7SUFDSCxpRUFBK0MsQ0FBQTtJQUMvQzs7T0FFRztJQUNILG1EQUFpQyxDQUFBO0lBQ2pDOztPQUVHO0lBQ0gscUVBQW1ELENBQUE7SUFDbkQ7O09BRUc7SUFDSCx1REFBcUMsQ0FBQTtBQUN2QyxDQUFDLEVBakNXLGNBQWMsS0FBZCxjQUFjLFFBaUN6QjtBQUlELE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxLQUFxQjtJQUMxRCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQ3RELENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUNyQyxZQUFnQyxFQUNoQyxjQUE0QjtJQUU1Qix3REFBd0Q7SUFDeEQsTUFBTSxjQUFjLEdBQUcsSUFBSSxHQUFHLEVBQTRCLENBQUM7SUFFM0QsS0FBSyxNQUFNLFdBQVcsSUFBSSxZQUFZLEVBQUUsQ0FBQztRQUN2QyxNQUFNLE1BQU0sR0FBRyxNQUFNLFdBQVcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUM3QyxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ1gsY0FBYyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsV0FBVyxDQUFDLENBQUM7UUFDckQsQ0FBQztJQUNILENBQUM7SUFFRCx1RkFBdUY7SUFDdkYsTUFBTSxtQkFBbUIsR0FBRyxjQUFjLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ3ZELE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN6QyxPQUFPLGNBQWMsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLEVBQUUsU0FBUyxJQUFJLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUMzRSxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sbUJBQW1CLENBQUM7QUFDN0IsQ0FBQyJ9
|
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import
|
|
3
|
-
import { type AztecAsyncKVStore } from '@aztec/kv-store';
|
|
4
|
-
import { type DataStoreConfig } from '@aztec/kv-store/config';
|
|
1
|
+
import type { L1ContractsConfig, L1ReaderConfig } from '@aztec/ethereum';
|
|
2
|
+
import type { L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
|
|
5
3
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
6
4
|
import { SlasherClient } from './slasher_client.js';
|
|
7
|
-
import {
|
|
8
|
-
export declare const createSlasherClient: (_config: SlasherConfig &
|
|
9
|
-
store?: AztecAsyncKVStore;
|
|
10
|
-
}) => Promise<SlasherClient>;
|
|
5
|
+
import type { SlasherConfig } from './slasher_client.js';
|
|
6
|
+
export declare const createSlasherClient: (_config: SlasherConfig & L1ContractsConfig & L1ReaderConfig, l2BlockSource: L2BlockSourceEventEmitter, telemetry?: TelemetryClient) => SlasherClient;
|
|
11
7
|
//# sourceMappingURL=factory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/slasher/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/slasher/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,eAAO,MAAM,mBAAmB,YACrB,aAAa,GAAG,iBAAiB,GAAG,cAAc,iBAC5C,yBAAyB,cAC7B,eAAe,kBAI3B,CAAC"}
|
package/dest/slasher/factory.js
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
-
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
3
1
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
4
2
|
import { SlasherClient } from './slasher_client.js';
|
|
5
|
-
export const createSlasherClient =
|
|
6
|
-
const config = {
|
|
7
|
-
|
|
8
|
-
|
|
3
|
+
export const createSlasherClient = (_config, l2BlockSource, telemetry = getTelemetryClient())=>{
|
|
4
|
+
const config = {
|
|
5
|
+
..._config
|
|
6
|
+
};
|
|
7
|
+
return new SlasherClient(config, l2BlockSource, telemetry);
|
|
9
8
|
};
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zbGFzaGVyL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3JELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQXdCLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbkYsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBR3BELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLEtBQUssRUFDdEMsT0FBNkUsRUFDN0UsYUFBNEIsRUFDNUIsWUFBNkIsa0JBQWtCLEVBQUUsRUFDakQsT0FBc0MsRUFBRSxFQUN4QyxFQUFFO0lBQ0YsTUFBTSxNQUFNLEdBQUcsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDO0lBQzlCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxNQUFNLFdBQVcsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLFlBQVksQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakcsT0FBTyxJQUFJLGFBQWEsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLGFBQWEsRUFBRSxTQUFTLENBQUMsQ0FBQztBQUNwRSxDQUFDLENBQUMifQ==
|
package/dest/slasher/index.js
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
export * from './slasher_client.js';
|
|
2
2
|
export { createSlasherClient } from './factory.js';
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2xhc2hlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGNBQWMsQ0FBQyJ9
|
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
|
|
1
|
+
import { type L1ContractsConfig, type L1ReaderConfig, type ViemPublicClient } from '@aztec/ethereum';
|
|
3
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
-
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
5
3
|
import { SlashFactoryAbi } from '@aztec/l1-artifacts';
|
|
4
|
+
import { type L2BlockId, type L2BlockSourceEvent, type L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
|
|
6
5
|
import { type TelemetryClient, WithTracer } from '@aztec/telemetry-client';
|
|
7
|
-
import { type
|
|
6
|
+
import { type GetContractReturnType } from 'viem';
|
|
8
7
|
/**
|
|
9
8
|
* Enum defining the possible states of the Slasher client.
|
|
10
9
|
*/
|
|
11
10
|
export declare enum SlasherClientState {
|
|
12
11
|
IDLE = 0,
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
STOPPED = 3
|
|
12
|
+
RUNNING = 1,
|
|
13
|
+
STOPPED = 2
|
|
16
14
|
}
|
|
17
15
|
/**
|
|
18
16
|
* The synchronization status of the Slasher client.
|
|
@@ -58,70 +56,20 @@ export interface SlasherConfig {
|
|
|
58
56
|
*/
|
|
59
57
|
export declare class SlasherClient extends WithTracer {
|
|
60
58
|
private config;
|
|
61
|
-
private store;
|
|
62
59
|
private l2BlockSource;
|
|
63
60
|
private log;
|
|
64
|
-
private currentState;
|
|
65
|
-
private syncPromise;
|
|
66
|
-
private syncResolve?;
|
|
67
|
-
private latestBlockNumberAtStart;
|
|
68
|
-
private provenBlockNumberAtStart;
|
|
69
|
-
private synchedBlockHashes;
|
|
70
|
-
private synchedLatestBlockNumber;
|
|
71
|
-
private synchedProvenBlockNumber;
|
|
72
|
-
private blockStream;
|
|
73
61
|
private slashEvents;
|
|
74
|
-
protected slashFactoryContract?: GetContractReturnType<typeof SlashFactoryAbi,
|
|
62
|
+
protected slashFactoryContract?: GetContractReturnType<typeof SlashFactoryAbi, ViemPublicClient>;
|
|
75
63
|
private slashingAmount;
|
|
76
|
-
constructor(config: SlasherConfig & L1ContractsConfig & L1ReaderConfig,
|
|
64
|
+
constructor(config: SlasherConfig & L1ContractsConfig & L1ReaderConfig, l2BlockSource: L2BlockSourceEventEmitter, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
|
|
65
|
+
start(): void;
|
|
77
66
|
getSlashPayload(slotNumber: bigint): Promise<EthAddress | undefined>;
|
|
78
|
-
|
|
79
|
-
getL2Tips(): Promise<L2Tips>;
|
|
80
|
-
handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
|
|
81
|
-
start(): Promise<void>;
|
|
67
|
+
handleBlockStreamEvent(event: L2BlockSourceEvent): Promise<void>;
|
|
82
68
|
/**
|
|
83
69
|
* Allows consumers to stop the instance of the slasher client.
|
|
84
70
|
* 'ready' will now return 'false' and the running promise that keeps the client synced is interrupted.
|
|
85
71
|
*/
|
|
86
|
-
stop():
|
|
87
|
-
/**
|
|
88
|
-
* Public function to check if the slasher client is fully synced and ready to receive txs.
|
|
89
|
-
* @returns True if the slasher client is ready to receive txs.
|
|
90
|
-
*/
|
|
91
|
-
isReady(): boolean;
|
|
92
|
-
/**
|
|
93
|
-
* Public function to check the latest block number that the slasher client is synced to.
|
|
94
|
-
* @returns Block number of latest L2 Block we've synced with.
|
|
95
|
-
*/
|
|
96
|
-
getSyncedLatestBlockNum(): Promise<number>;
|
|
97
|
-
/**
|
|
98
|
-
* Public function to check the latest proven block number that the slasher client is synced to.
|
|
99
|
-
* @returns Block number of latest proven L2 Block we've synced with.
|
|
100
|
-
*/
|
|
101
|
-
getSyncedProvenBlockNum(): Promise<number>;
|
|
102
|
-
/**
|
|
103
|
-
* Method to check the status of the slasher client.
|
|
104
|
-
* @returns Information about slasher client status: state & syncedToBlockNum.
|
|
105
|
-
*/
|
|
106
|
-
getStatus(): Promise<SlasherSyncState>;
|
|
107
|
-
/**
|
|
108
|
-
* Handles new blocks
|
|
109
|
-
* @param blocks - A list of blocks that the slasher client needs to store block hashes for
|
|
110
|
-
* @returns Empty promise.
|
|
111
|
-
*/
|
|
112
|
-
private handleLatestL2Blocks;
|
|
113
|
-
/**
|
|
114
|
-
* Handles new proven blocks by updating the proven block number
|
|
115
|
-
* @param blocks - A list of proven L2 blocks.
|
|
116
|
-
* @returns Empty promise.
|
|
117
|
-
*/
|
|
118
|
-
private handleProvenL2Blocks;
|
|
72
|
+
stop(): void;
|
|
119
73
|
private handlePruneL2Blocks;
|
|
120
|
-
private startServiceIfSynched;
|
|
121
|
-
/**
|
|
122
|
-
* Method to set the value of the current state.
|
|
123
|
-
* @param newState - New state value.
|
|
124
|
-
*/
|
|
125
|
-
private setCurrentState;
|
|
126
74
|
}
|
|
127
75
|
//# sourceMappingURL=slasher_client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slasher_client.d.ts","sourceRoot":"","sources":["../../src/slasher/slasher_client.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"slasher_client.d.ts","sourceRoot":"","sources":["../../src/slasher/slasher_client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAE/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,eAAe,EAAE,UAAU,EAAsB,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EAAE,KAAK,qBAAqB,EAA+D,MAAM,MAAM,CAAC;AAE/G;;GAEG;AACH,oBAAY,kBAAkB;IAC5B,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;IAC1B;;OAEG;IACH,eAAe,EAAE,SAAS,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAQD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,aAAc,SAAQ,UAAU;IAWzC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,aAAa;IAErB,OAAO,CAAC,GAAG;IAbb,OAAO,CAAC,WAAW,CAAoB;IAEvC,SAAS,CAAC,oBAAoB,CAAC,EAAE,qBAAqB,CAAC,OAAO,eAAe,EAAE,gBAAgB,CAAC,CAAa;IAK7G,OAAO,CAAC,cAAc,CAAc;gBAG1B,MAAM,EAAE,aAAa,GAAG,iBAAiB,GAAG,cAAc,EAC1D,aAAa,EAAE,yBAAyB,EAChD,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAA0B;IAwBhC,KAAK;IAMC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IA8B1E,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAavE;;;OAGG;IACI,IAAI;IAOX,OAAO,CAAC,mBAAmB;CAgB5B"}
|