@aztec/sequencer-client 6.0.0-nightly.20260604 → 6.0.0-nightly.20260721
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/README.md +27 -27
- package/dest/client/sequencer-client.d.ts +16 -3
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +17 -12
- package/dest/config.d.ts +6 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +23 -14
- package/dest/global_variable_builder/fee_predictor.d.ts +1 -1
- package/dest/global_variable_builder/fee_predictor.d.ts.map +1 -1
- package/dest/global_variable_builder/fee_predictor.js +11 -1
- package/dest/global_variable_builder/fee_provider.d.ts +1 -1
- package/dest/global_variable_builder/fee_provider.d.ts.map +1 -1
- package/dest/global_variable_builder/fee_provider.js +27 -5
- package/dest/global_variable_builder/global_builder.d.ts +3 -16
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +2 -25
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -1
- package/dest/publisher/config.d.ts +5 -1
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +11 -1
- package/dest/publisher/l1_to_l2_messaging.d.ts +21 -0
- package/dest/publisher/l1_to_l2_messaging.d.ts.map +1 -0
- package/dest/publisher/l1_to_l2_messaging.js +70 -0
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +48 -8
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -1
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +68 -1
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +2 -2
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +1 -1
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +4 -2
- package/dest/publisher/l1_tx_failed_store/index.d.ts +2 -2
- package/dest/publisher/l1_tx_failed_store/index.d.ts.map +1 -1
- package/dest/publisher/l1_tx_failed_store/index.js +1 -0
- package/dest/publisher/sequencer-publisher.d.ts +34 -6
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +364 -60
- package/dest/publisher/write_json.d.ts +11 -0
- package/dest/publisher/write_json.d.ts.map +1 -0
- package/dest/publisher/write_json.js +57 -0
- package/dest/sequencer/automine/automine_factory.d.ts +5 -3
- package/dest/sequencer/automine/automine_factory.d.ts.map +1 -1
- package/dest/sequencer/automine/automine_factory.js +2 -1
- package/dest/sequencer/automine/automine_sequencer.d.ts +43 -5
- package/dest/sequencer/automine/automine_sequencer.d.ts.map +1 -1
- package/dest/sequencer/automine/automine_sequencer.js +199 -18
- package/dest/sequencer/automine/index.d.ts +3 -0
- package/dest/sequencer/automine/index.d.ts.map +1 -0
- package/dest/sequencer/automine/index.js +2 -0
- package/dest/sequencer/checkpoint_proposal_job.d.ts +28 -15
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +140 -96
- package/dest/sequencer/events.d.ts +16 -5
- package/dest/sequencer/events.d.ts.map +1 -1
- package/dest/sequencer/index.d.ts +1 -3
- package/dest/sequencer/index.d.ts.map +1 -1
- package/dest/sequencer/index.js +0 -2
- package/dest/sequencer/requests_tracker.d.ts +22 -0
- package/dest/sequencer/requests_tracker.d.ts.map +1 -0
- package/dest/sequencer/requests_tracker.js +33 -0
- package/dest/sequencer/sequencer.d.ts +110 -36
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +330 -174
- package/dest/test/index.d.ts +3 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/utils.d.ts +15 -1
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +18 -1
- package/package.json +30 -28
- package/src/client/sequencer-client.ts +20 -13
- package/src/config.ts +25 -12
- package/src/global_variable_builder/fee_predictor.ts +11 -1
- package/src/global_variable_builder/fee_provider.ts +27 -5
- package/src/global_variable_builder/global_builder.ts +2 -34
- package/src/index.ts +1 -10
- package/src/publisher/config.ts +22 -1
- package/src/publisher/l1_to_l2_messaging.ts +85 -0
- package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +114 -7
- package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +4 -3
- package/src/publisher/l1_tx_failed_store/index.ts +1 -1
- package/src/publisher/sequencer-publisher.ts +385 -71
- package/src/publisher/write_json.ts +78 -0
- package/src/sequencer/automine/README.md +18 -4
- package/src/sequencer/automine/automine_factory.ts +8 -1
- package/src/sequencer/automine/automine_sequencer.ts +221 -20
- package/src/sequencer/automine/index.ts +6 -0
- package/src/sequencer/checkpoint_proposal_job.ts +163 -111
- package/src/sequencer/events.ts +16 -4
- package/src/sequencer/index.ts +0 -2
- package/src/sequencer/requests_tracker.ts +43 -0
- package/src/sequencer/sequencer.ts +361 -187
- package/src/test/index.ts +2 -2
- package/src/test/utils.ts +33 -0
- package/dest/sequencer/chain_state_overrides.d.ts +0 -61
- package/dest/sequencer/chain_state_overrides.d.ts.map +0 -1
- package/dest/sequencer/chain_state_overrides.js +0 -98
- package/dest/sequencer/timetable.d.ts +0 -98
- package/dest/sequencer/timetable.d.ts.map +0 -1
- package/dest/sequencer/timetable.js +0 -227
- package/src/sequencer/chain_state_overrides.ts +0 -162
- package/src/sequencer/timetable.ts +0 -288
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AAE1F,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,IAAI,8BAA8B,EACxD,MAAM,kBAAkB,CAAC;AAE1B,+EAA+E;AAC/E,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,UAAU,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IASxE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;IAEpB,YACmB,YAAY,EAAE,gBAAgB,EAC/C,MAAM,EAAE,2BAA2B,EASpC;IAED,yEAAyE;IAC5D,8BAA8B,CACzC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,OAAO,CAAC,yBAAyB,CAAC,CAYpC;CACF"}
|
|
@@ -1,47 +1,24 @@
|
|
|
1
1
|
import { RollupContract, buildSimulationOverridesStateOverride } from '@aztec/ethereum/contracts';
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
-
import {
|
|
3
|
+
import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
4
4
|
import { GasFees } from '@aztec/stdlib/gas';
|
|
5
|
-
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
6
5
|
/**
|
|
7
6
|
* Simple global variables builder.
|
|
8
7
|
*/ export class GlobalVariableBuilder {
|
|
9
|
-
dateProvider;
|
|
10
8
|
publicClient;
|
|
11
9
|
rollupContract;
|
|
12
|
-
ethereumSlotDuration;
|
|
13
10
|
aztecSlotDuration;
|
|
14
11
|
l1GenesisTime;
|
|
15
12
|
chainId;
|
|
16
13
|
version;
|
|
17
|
-
constructor(
|
|
18
|
-
this.dateProvider = dateProvider;
|
|
14
|
+
constructor(publicClient, config){
|
|
19
15
|
this.publicClient = publicClient;
|
|
20
16
|
this.version = new Fr(config.rollupVersion);
|
|
21
17
|
this.chainId = new Fr(this.publicClient.chain.id);
|
|
22
|
-
this.ethereumSlotDuration = config.ethereumSlotDuration;
|
|
23
18
|
this.aztecSlotDuration = config.slotDuration;
|
|
24
19
|
this.l1GenesisTime = config.l1GenesisTime;
|
|
25
20
|
this.rollupContract = new RollupContract(this.publicClient, config.rollupAddress);
|
|
26
21
|
}
|
|
27
|
-
/**
|
|
28
|
-
* Simple builder of global variables.
|
|
29
|
-
* @param blockNumber - The block number to build global variables for.
|
|
30
|
-
* @param coinbase - The address to receive block reward.
|
|
31
|
-
* @param feeRecipient - The address to receive fees.
|
|
32
|
-
* @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
|
|
33
|
-
* @returns The global variables for the given block number.
|
|
34
|
-
*/ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, maybeSlot) {
|
|
35
|
-
const slot = maybeSlot ?? await this.rollupContract.getSlotAt(getNextL1SlotTimestamp(this.dateProvider.nowInSeconds(), {
|
|
36
|
-
l1GenesisTime: this.l1GenesisTime,
|
|
37
|
-
ethereumSlotDuration: this.ethereumSlotDuration
|
|
38
|
-
}));
|
|
39
|
-
const checkpointGlobalVariables = await this.buildCheckpointGlobalVariables(coinbase, feeRecipient, slot);
|
|
40
|
-
return GlobalVariables.from({
|
|
41
|
-
blockNumber,
|
|
42
|
-
...checkpointGlobalVariables
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
22
|
/** Builds global variables that are constant throughout a checkpoint. */ async buildCheckpointGlobalVariables(coinbase, feeRecipient, slotNumber, simulationOverridesPlan) {
|
|
46
23
|
const { chainId, version } = this;
|
|
47
24
|
const timestamp = getTimestampForSlot(slotNumber, {
|
package/dest/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export * from './client/index.js';
|
|
2
2
|
export * from './config.js';
|
|
3
3
|
export * from './publisher/index.js';
|
|
4
|
-
export {
|
|
4
|
+
export { Sequencer, SequencerState, type SequencerEvents } from './sequencer/index.js';
|
|
5
5
|
export * from './global_variable_builder/index.js';
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsT0FBTyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUl2RixjQUFjLG9DQUFvQyxDQUFDIn0=
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvF,cAAc,oCAAoC,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export * from './client/index.js';
|
|
2
2
|
export * from './config.js';
|
|
3
3
|
export * from './publisher/index.js';
|
|
4
|
-
export {
|
|
4
|
+
export { Sequencer, SequencerState } from './sequencer/index.js';
|
|
5
5
|
// Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
|
|
6
6
|
// ISSUE(#9832)
|
|
7
7
|
export * from './global_variable_builder/index.js';
|
|
@@ -48,6 +48,10 @@ export type SequencerPublisherConfig = L1TxUtilsConfig & BlobClientConfig & {
|
|
|
48
48
|
fishermanMode?: boolean;
|
|
49
49
|
sequencerPublisherAllowInvalidStates?: boolean;
|
|
50
50
|
sequencerPublisherForwarderAddress?: EthAddress;
|
|
51
|
+
/** How long to wait for the previous L1 block before sending scheduled publisher txs anyway. */
|
|
52
|
+
sequencerPublisherPreviousL1BlockWaitTimeoutMs: number;
|
|
53
|
+
/** Poll interval while waiting for the previous L1 block before scheduled publisher txs. */
|
|
54
|
+
sequencerPublisherPreviousL1BlockWaitPollIntervalMs: number;
|
|
51
55
|
/** Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path */
|
|
52
56
|
l1TxFailedStore?: string;
|
|
53
57
|
/** Min ETH balance below which a publisher gets funded. Undefined = funding disabled. */
|
|
@@ -61,4 +65,4 @@ export declare const proverTxSenderConfigMappings: ConfigMappingsType<ProverTxSe
|
|
|
61
65
|
export declare const sequencerTxSenderConfigMappings: ConfigMappingsType<SequencerTxSenderConfig>;
|
|
62
66
|
export declare const sequencerPublisherConfigMappings: ConfigMappingsType<SequencerPublisherConfig & L1TxUtilsConfig>;
|
|
63
67
|
export declare const proverPublisherConfigMappings: ConfigMappingsType<ProverPublisherConfig & L1TxUtilsConfig>;
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBMkIsTUFBTSxrQ0FBa0MsQ0FBQztBQUNsRyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sMkJBQTJCLENBQUM7QUFDeEYsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUEyQixNQUFNLG9DQUFvQyxDQUFDO0FBQ25HLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixXQUFXLEVBR1osTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFJM0Qsa0RBQWtEO0FBQ2xELE1BQU0sTUFBTSxjQUFjLEdBQUcsY0FBYyxHQUFHO0lBQzVDLG1EQUFtRDtJQUNuRCxvQkFBb0IsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQztJQUVwRCwwREFBMEQ7SUFDMUQsa0JBQWtCLENBQUMsRUFBRSxVQUFVLEVBQUUsQ0FBQztDQUNuQyxDQUFDO0FBRUYsTUFBTSxNQUFNLG9CQUFvQixHQUFHLGNBQWMsR0FBRztJQUNsRCwwQkFBMEIsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQztJQUMxRCx3QkFBd0IsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDO0NBQ3pDLENBQUM7QUFFRixNQUFNLE1BQU0sdUJBQXVCLEdBQUcsY0FBYyxHQUFHO0lBQ3JELDZCQUE2QixDQUFDLEVBQUUsV0FBVyxDQUFDLEtBQUssTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDO0lBQzdELDJCQUEyQixDQUFDLEVBQUUsVUFBVSxFQUFFLENBQUM7Q0FDNUMsQ0FBQztBQUVGLHdCQUFnQixpQ0FBaUMsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLEdBQUcsY0FBYyxDQU05RjtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxNQUFNLEVBQUUsdUJBQXVCLEdBQUcsY0FBYyxDQU1wRztBQUVELHdDQUF3QztBQUN4QyxNQUFNLE1BQU0sZUFBZSxHQUFHLGVBQWUsR0FDM0MsZ0JBQWdCLEdBQUc7SUFDakIsb0dBQW9HO0lBQ3BHLDJCQUEyQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ3RDLDRHQUE0RztJQUM1RyxhQUFhLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDeEIsd0dBQXdHO0lBQ3hHLHlCQUF5QixDQUFDLEVBQUUsVUFBVSxDQUFDO0lBQ3ZDLDRGQUE0RjtJQUM1RixlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDekIseUZBQXlGO0lBQ3pGLHlCQUF5QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ25DLG9GQUFvRjtJQUNwRixzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNqQyxDQUFDO0FBa0JKLE1BQU0sTUFBTSxxQkFBcUIsR0FBRyxlQUFlLEdBQ2pELGdCQUFnQixHQUFHO0lBQ2pCLGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN4QixpQ0FBaUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUM1QywrQkFBK0IsQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUM3Qyx5RkFBeUY7SUFDekYseUJBQXlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkMsb0ZBQW9GO0lBQ3BGLHNCQUFzQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2pDLENBQUM7QUFFSixNQUFNLE1BQU0sd0JBQXdCLEdBQUcsZUFBZSxHQUNwRCxnQkFBZ0IsR0FBRztJQUNqQixhQUFhLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDeEIsb0NBQW9DLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDL0Msa0NBQWtDLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDaEQsZ0dBQWdHO0lBQ2hHLDhDQUE4QyxFQUFFLE1BQU0sQ0FBQztJQUN2RCw0RkFBNEY7SUFDNUYsbURBQW1ELEVBQUUsTUFBTSxDQUFDO0lBQzVELDRGQUE0RjtJQUM1RixlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDekIseUZBQXlGO0lBQ3pGLHlCQUF5QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ25DLG9GQUFvRjtJQUNwRixzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNqQyxDQUFDO0FBRUosd0JBQWdCLGtDQUFrQyxDQUFDLE1BQU0sRUFBRSxxQkFBcUIsR0FBRyxlQUFlLENBTWpHO0FBRUQsd0JBQWdCLHFDQUFxQyxDQUFDLE1BQU0sRUFBRSx3QkFBd0IsR0FBRyxlQUFlLENBT3ZHO0FBRUQsZUFBTyxNQUFNLDRCQUE0QixFQUFFLGtCQUFrQixDQUFDLG9CQUFvQixDQWdCakYsQ0FBQztBQUVGLGVBQU8sTUFBTSwrQkFBK0IsRUFBRSxrQkFBa0IsQ0FBQyx1QkFBdUIsQ0FnQnZGLENBQUM7QUFFRixlQUFPLE1BQU0sZ0NBQWdDLEVBQUUsa0JBQWtCLENBQUMsd0JBQXdCLEdBQUcsZUFBZSxDQW9DM0csQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsR0FBRyxlQUFlLENBb0JyRyxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/publisher/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,oCAAoC,CAAC;AACnG,OAAO,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/publisher/config.ts"],"names":[],"mappings":"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"}
|
package/dest/publisher/config.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { blobClientConfigMapping } from '@aztec/blob-client/client/config';
|
|
2
2
|
import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
|
|
3
3
|
import { l1TxUtilsConfigMappings } from '@aztec/ethereum/l1-tx-utils/config';
|
|
4
|
-
import { SecretValue, booleanConfigHelper } from '@aztec/foundation/config';
|
|
4
|
+
import { SecretValue, booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
|
|
5
5
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import { parseEther } from 'viem';
|
|
7
7
|
export function getTxSenderConfigFromProverConfig(config) {
|
|
@@ -99,6 +99,16 @@ export const sequencerPublisherConfigMappings = {
|
|
|
99
99
|
description: 'Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only)',
|
|
100
100
|
parseEnv: (val)=>EthAddress.fromString(val)
|
|
101
101
|
},
|
|
102
|
+
sequencerPublisherPreviousL1BlockWaitTimeoutMs: {
|
|
103
|
+
env: `SEQ_PUBLISHER_PREVIOUS_L1_BLOCK_WAIT_TIMEOUT_MS`,
|
|
104
|
+
description: 'How long to wait for the previous L1 block before sending scheduled publisher txs anyway, in milliseconds.',
|
|
105
|
+
...numberConfigHelper(8_000)
|
|
106
|
+
},
|
|
107
|
+
sequencerPublisherPreviousL1BlockWaitPollIntervalMs: {
|
|
108
|
+
env: `SEQ_PUBLISHER_PREVIOUS_L1_BLOCK_WAIT_POLL_INTERVAL_MS`,
|
|
109
|
+
description: 'Poll interval while waiting for the previous L1 block before scheduled publisher txs, in milliseconds.',
|
|
110
|
+
...numberConfigHelper(500)
|
|
111
|
+
},
|
|
102
112
|
l1TxFailedStore: {
|
|
103
113
|
env: 'L1_TX_FAILED_STORE',
|
|
104
114
|
description: 'Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path'
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
2
|
+
import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
|
|
3
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
|
+
/**
|
|
6
|
+
* Sends an L1-to-L2 message via the Inbox contract and returns its hash and global leaf index.
|
|
7
|
+
* Test helper copied from the end-to-end fixtures so this integration test can live in sequencer-client.
|
|
8
|
+
*/
|
|
9
|
+
export declare function sendL1ToL2Message(message: {
|
|
10
|
+
recipient: AztecAddress;
|
|
11
|
+
content: Fr;
|
|
12
|
+
secretHash: Fr;
|
|
13
|
+
}, ctx: {
|
|
14
|
+
l1Client: ExtendedViemWalletClient;
|
|
15
|
+
l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress' | 'rollupAddress'>;
|
|
16
|
+
}): Promise<{
|
|
17
|
+
msgHash: Fr;
|
|
18
|
+
globalLeafIndex: Fr;
|
|
19
|
+
txReceipt: import("viem").TransactionReceipt;
|
|
20
|
+
}>;
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnaW5nLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL2wxX3RvX2wyX21lc3NhZ2luZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDdEUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBSWhFOzs7R0FHRztBQUNILHdCQUFzQixpQkFBaUIsQ0FDckMsT0FBTyxFQUFFO0lBQUUsU0FBUyxFQUFFLFlBQVksQ0FBQztJQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7SUFBQyxVQUFVLEVBQUUsRUFBRSxDQUFBO0NBQUUsRUFDakUsR0FBRyxFQUFFO0lBQ0gsUUFBUSxFQUFFLHdCQUF3QixDQUFDO0lBQ25DLG1CQUFtQixFQUFFLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxjQUFjLEdBQUcsZUFBZSxDQUFDLENBQUM7Q0FDbEY7Ozs7R0FnRUYifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"l1_to_l2_messaging.d.ts","sourceRoot":"","sources":["../../src/publisher/l1_to_l2_messaging.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIhE;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,SAAS,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAA;CAAE,EACjE,GAAG,EAAE;IACH,QAAQ,EAAE,wBAAwB,CAAC;IACnC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,GAAG,eAAe,CAAC,CAAC;CAClF;;;;GAgEF"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { tryJsonStringify } from '@aztec/foundation/json-rpc';
|
|
4
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
+
import { InboxAbi } from '@aztec/l1-artifacts';
|
|
6
|
+
import { decodeEventLog, getContract } from 'viem';
|
|
7
|
+
/**
|
|
8
|
+
* Sends an L1-to-L2 message via the Inbox contract and returns its hash and global leaf index.
|
|
9
|
+
* Test helper copied from the end-to-end fixtures so this integration test can live in sequencer-client.
|
|
10
|
+
*/ export async function sendL1ToL2Message(message, ctx) {
|
|
11
|
+
const logger = createLogger('sequencer-client:l1_to_l2_messaging');
|
|
12
|
+
const inbox = getContract({
|
|
13
|
+
address: ctx.l1ContractAddresses.inboxAddress.toString(),
|
|
14
|
+
abi: InboxAbi,
|
|
15
|
+
client: ctx.l1Client
|
|
16
|
+
});
|
|
17
|
+
const { recipient, content, secretHash } = message;
|
|
18
|
+
const version = await new RollupContract(ctx.l1Client, ctx.l1ContractAddresses.rollupAddress.toString()).getVersion();
|
|
19
|
+
// We inject the message to Inbox
|
|
20
|
+
const txHash = await inbox.write.sendL2Message([
|
|
21
|
+
{
|
|
22
|
+
actor: recipient.toString(),
|
|
23
|
+
version: BigInt(version)
|
|
24
|
+
},
|
|
25
|
+
content.toString(),
|
|
26
|
+
secretHash.toString()
|
|
27
|
+
], {
|
|
28
|
+
gas: 1_000_000n
|
|
29
|
+
});
|
|
30
|
+
logger.info(`L1 to L2 message sent in tx ${txHash}`);
|
|
31
|
+
// We check that the message was correctly injected by checking the emitted event
|
|
32
|
+
const txReceipt = await ctx.l1Client.waitForTransactionReceipt({
|
|
33
|
+
hash: txHash
|
|
34
|
+
});
|
|
35
|
+
if (txReceipt.status !== 'success') {
|
|
36
|
+
throw new Error(`L1 to L2 message failed to be sent in tx ${txHash}. Status: ${txReceipt.status}`);
|
|
37
|
+
}
|
|
38
|
+
logger.info(`L1 to L2 message receipt retrieved for tx ${txReceipt.transactionHash}`, txReceipt);
|
|
39
|
+
if (txReceipt.transactionHash !== txHash) {
|
|
40
|
+
throw new Error(`Receipt transaction hash mismatch: ${txReceipt.transactionHash} !== ${txHash}`);
|
|
41
|
+
}
|
|
42
|
+
// Filter for MessageSent events from the Inbox contract by trying to decode each log
|
|
43
|
+
const messageSentLogs = txReceipt.logs.filter((log)=>log.address.toLowerCase() === ctx.l1ContractAddresses.inboxAddress.toString().toLowerCase()).map((log)=>{
|
|
44
|
+
try {
|
|
45
|
+
const decoded = decodeEventLog({
|
|
46
|
+
abi: InboxAbi,
|
|
47
|
+
data: log.data,
|
|
48
|
+
topics: log.topics
|
|
49
|
+
});
|
|
50
|
+
return {
|
|
51
|
+
log,
|
|
52
|
+
decoded
|
|
53
|
+
};
|
|
54
|
+
} catch {
|
|
55
|
+
return null; // Not a decodable event from this ABI
|
|
56
|
+
}
|
|
57
|
+
}).filter((item)=>item !== null && item.decoded.eventName === 'MessageSent');
|
|
58
|
+
if (messageSentLogs.length !== 1) {
|
|
59
|
+
throw new Error(`Wrong number of MessageSent logs found in ${txHash} transaction (got ${messageSentLogs.length} expected 1)\n${tryJsonStringify(messageSentLogs.map((item)=>item.log))}`);
|
|
60
|
+
}
|
|
61
|
+
// We already have the decoded event
|
|
62
|
+
const topics = messageSentLogs[0].decoded;
|
|
63
|
+
const receivedMsgHash = topics.args.hash;
|
|
64
|
+
const receivedGlobalLeafIndex = topics.args.index;
|
|
65
|
+
return {
|
|
66
|
+
msgHash: Fr.fromHexString(receivedMsgHash),
|
|
67
|
+
globalLeafIndex: new Fr(receivedGlobalLeafIndex),
|
|
68
|
+
txReceipt
|
|
69
|
+
};
|
|
70
|
+
}
|
|
@@ -1,30 +1,36 @@
|
|
|
1
|
+
import type { WindowBlockFees } from '@aztec/ethereum/l1-fee-analysis';
|
|
2
|
+
import type { GasPrice } from '@aztec/ethereum/l1-tx-utils';
|
|
1
3
|
import type { Branded } from '@aztec/foundation/branded-types';
|
|
4
|
+
import { type ZodFor } from '@aztec/foundation/schemas';
|
|
2
5
|
import type { Hex } from 'viem';
|
|
3
6
|
/** URI pointing to a stored failed L1 transaction. */
|
|
4
7
|
export type FailedL1TxUri = Branded<string, 'FailedL1TxUri'>;
|
|
5
|
-
/**
|
|
8
|
+
/**
|
|
9
|
+
* A failed L1 transaction captured for debugging and replay. Serialized with jsonStringify (bigints
|
|
10
|
+
* become decimal strings on disk) and parsed back via FailedL1TxSchema.
|
|
11
|
+
*/
|
|
6
12
|
export type FailedL1Tx = {
|
|
7
13
|
/** Tx hash (for reverts) or keccak256(request.data) (for simulation/send failures). */
|
|
8
14
|
id: Hex;
|
|
9
15
|
/** Unix timestamp (ms) when failure occurred. */
|
|
10
16
|
timestamp: number;
|
|
11
|
-
/**
|
|
12
|
-
failureType: 'simulation' | 'revert' | 'send-error';
|
|
17
|
+
/** How the failure occurred. */
|
|
18
|
+
failureType: 'simulation' | 'revert' | 'send-error' | 'timeout';
|
|
13
19
|
/** The actual L1 transaction for replay (multicall-encoded for bundled txs). */
|
|
14
20
|
request: {
|
|
15
21
|
to: Hex;
|
|
16
22
|
data: Hex;
|
|
17
|
-
value?:
|
|
23
|
+
value?: bigint;
|
|
18
24
|
};
|
|
19
25
|
/** Raw blob data as hex for replay. */
|
|
20
26
|
blobData?: Hex[];
|
|
21
27
|
/** L1 block number at time of failure (simulation target or receipt block). */
|
|
22
|
-
l1BlockNumber:
|
|
28
|
+
l1BlockNumber: bigint;
|
|
23
29
|
/** Receipt info (present only for on-chain reverts). */
|
|
24
30
|
receipt?: {
|
|
25
31
|
transactionHash: Hex;
|
|
26
|
-
blockNumber:
|
|
27
|
-
gasUsed:
|
|
32
|
+
blockNumber: bigint;
|
|
33
|
+
gasUsed: bigint;
|
|
28
34
|
status: 'reverted';
|
|
29
35
|
};
|
|
30
36
|
/** Error information. */
|
|
@@ -47,7 +53,41 @@ export type FailedL1Tx = {
|
|
|
47
53
|
slot?: number;
|
|
48
54
|
sender: Hex;
|
|
49
55
|
};
|
|
56
|
+
/** Gas pricing info at time of failure for underpricing diagnosis. */
|
|
57
|
+
gasInfo?: {
|
|
58
|
+
/** Gas prices the tx was sent with (present for revert/send-error/timeout, not simulation). */
|
|
59
|
+
sentGasPrice?: GasPrice;
|
|
60
|
+
/** Gas limit used or estimated. */
|
|
61
|
+
gasLimit?: bigint;
|
|
62
|
+
/** Nonce used for the sent tx. */
|
|
63
|
+
nonce?: number;
|
|
64
|
+
/**
|
|
65
|
+
* For timeouts: the escalating gas prices used across the initial send and each speed-up retry,
|
|
66
|
+
* in order. Compare against windowBlocks[].minIncludedPriorityFee to see if any attempt cleared the bar.
|
|
67
|
+
*/
|
|
68
|
+
sentGasPriceLadder?: GasPrice[];
|
|
69
|
+
/** Number of send attempts (initial send + speed-ups). */
|
|
70
|
+
attempts?: number;
|
|
71
|
+
/**
|
|
72
|
+
* Per-block fee data for the L1 blocks the tx could have been included in (the target L2 slot's
|
|
73
|
+
* inclusion window), in chronological order. Compare sentGasPrice against these to see whether
|
|
74
|
+
* the tx was underpriced for each block it competed for. May be a partial or empty list if the
|
|
75
|
+
* window was not yet mined when the failure was recorded (e.g. an early send failure).
|
|
76
|
+
*/
|
|
77
|
+
windowBlocks?: WindowBlockFees[];
|
|
78
|
+
};
|
|
79
|
+
/** Timing info relative to the L2 slot. */
|
|
80
|
+
timing?: {
|
|
81
|
+
/** The target L2 slot this tx was for. */
|
|
82
|
+
targetL2Slot?: number;
|
|
83
|
+
/** Unix timestamp (seconds) when the target slot ends. */
|
|
84
|
+
slotDeadlineTimestampS?: bigint;
|
|
85
|
+
/** Milliseconds remaining until the slot deadline. Negative = past deadline. */
|
|
86
|
+
msUntilSlotDeadline?: number;
|
|
87
|
+
};
|
|
50
88
|
};
|
|
89
|
+
/** Parses a stored failed-tx record, coercing the on-disk decimal strings back to bigints. */
|
|
90
|
+
export declare const FailedL1TxSchema: ZodFor<FailedL1Tx>;
|
|
51
91
|
/** Store for failed L1 transactions for debugging purposes. */
|
|
52
92
|
export interface L1TxFailedStore {
|
|
53
93
|
/** Saves a failed transaction and returns its URI. */
|
|
@@ -55,4 +95,4 @@ export interface L1TxFailedStore {
|
|
|
55
95
|
/** Retrieves a failed transaction by its URI. */
|
|
56
96
|
getFailedTx(uri: FailedL1TxUri): Promise<FailedL1Tx>;
|
|
57
97
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFpbGVkX3R4X3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGlzaGVyL2wxX3R4X2ZhaWxlZF9zdG9yZS9mYWlsZWRfdHhfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdkUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDL0QsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFFakUsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBR2hDLHNEQUFzRDtBQUN0RCxNQUFNLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsZUFBZSxDQUFDLENBQUM7QUFFN0Q7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLFVBQVUsR0FBRztJQUN2Qix1RkFBdUY7SUFDdkYsRUFBRSxFQUFFLEdBQUcsQ0FBQztJQUNSLGlEQUFpRDtJQUNqRCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLGdDQUFnQztJQUNoQyxXQUFXLEVBQUUsWUFBWSxHQUFHLFFBQVEsR0FBRyxZQUFZLEdBQUcsU0FBUyxDQUFDO0lBQ2hFLGdGQUFnRjtJQUNoRixPQUFPLEVBQUU7UUFDUCxFQUFFLEVBQUUsR0FBRyxDQUFDO1FBQ1IsSUFBSSxFQUFFLEdBQUcsQ0FBQztRQUNWLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUNoQixDQUFDO0lBQ0YsdUNBQXVDO0lBQ3ZDLFFBQVEsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBQ2pCLCtFQUErRTtJQUMvRSxhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHdEQUF3RDtJQUN4RCxPQUFPLENBQUMsRUFBRTtRQUNSLGVBQWUsRUFBRSxHQUFHLENBQUM7UUFDckIsV0FBVyxFQUFFLE1BQU0sQ0FBQztRQUNwQixPQUFPLEVBQUUsTUFBTSxDQUFDO1FBQ2hCLE1BQU0sRUFBRSxVQUFVLENBQUM7S0FDcEIsQ0FBQztJQUNGLHlCQUF5QjtJQUN6QixLQUFLLEVBQUU7UUFDTCxPQUFPLEVBQUUsTUFBTSxDQUFDO1FBQ2hCLDREQUE0RDtRQUM1RCxJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDZixDQUFDO0lBQ0Ysd0JBQXdCO0lBQ3hCLE9BQU8sRUFBRTtRQUNQLGlFQUFpRTtRQUNqRSxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUM7UUFDbEIsK0VBQStFO1FBQy9FLFFBQVEsQ0FBQyxFQUFFLEtBQUssQ0FBQztZQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7WUFBQyxFQUFFLEVBQUUsR0FBRyxDQUFDO1lBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQTtTQUFFLENBQUMsQ0FBQztRQUN6RCxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUMxQixJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDZCxNQUFNLEVBQUUsR0FBRyxDQUFDO0tBQ2IsQ0FBQztJQUNGLHNFQUFzRTtJQUN0RSxPQUFPLENBQUMsRUFBRTtRQUNSLCtGQUErRjtRQUMvRixZQUFZLENBQUMsRUFBRSxRQUFRLENBQUM7UUFDeEIsbUNBQW1DO1FBQ25DLFFBQVEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNsQixrQ0FBa0M7UUFDbEMsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ2Y7OztXQUdHO1FBQ0gsa0JBQWtCLENBQUMsRUFBRSxRQUFRLEVBQUUsQ0FBQztRQUNoQywwREFBMEQ7UUFDMUQsUUFBUSxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ2xCOzs7OztXQUtHO1FBQ0gsWUFBWSxDQUFDLEVBQUUsZUFBZSxFQUFFLENBQUM7S0FDbEMsQ0FBQztJQUNGLDJDQUEyQztJQUMzQyxNQUFNLENBQUMsRUFBRTtRQUNQLDBDQUEwQztRQUMxQyxZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDdEIsMERBQTBEO1FBQzFELHNCQUFzQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ2hDLGdGQUFnRjtRQUNoRixtQkFBbUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUM5QixDQUFDO0NBQ0gsQ0FBQztBQW9CRiw4RkFBOEY7QUFDOUYsZUFBTyxNQUFNLGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxVQUFVLENBK0M5QyxDQUFDO0FBRUgsK0RBQStEO0FBQy9ELE1BQU0sV0FBVyxlQUFlO0lBQzlCLHNEQUFzRDtJQUN0RCxZQUFZLENBQUMsRUFBRSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDckQsaURBQWlEO0lBQ2pELFdBQVcsQ0FBQyxHQUFHLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztDQUN0RCJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failed_tx_store.d.ts","sourceRoot":"","sources":["../../../src/publisher/l1_tx_failed_store/failed_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"failed_tx_store.d.ts","sourceRoot":"","sources":["../../../src/publisher/l1_tx_failed_store/failed_tx_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,68 @@
|
|
|
1
|
-
|
|
1
|
+
import { schemas } from '@aztec/foundation/schemas';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
const hexSchema = schemas.HexStringWith0x;
|
|
4
|
+
const gasPriceSchema = z.object({
|
|
5
|
+
maxFeePerGas: schemas.BigInt,
|
|
6
|
+
maxPriorityFeePerGas: schemas.BigInt,
|
|
7
|
+
maxFeePerBlobGas: schemas.BigInt.optional()
|
|
8
|
+
});
|
|
9
|
+
const windowBlockFeesSchema = z.object({
|
|
10
|
+
blockNumber: schemas.BigInt,
|
|
11
|
+
timestamp: schemas.BigInt,
|
|
12
|
+
baseFeePerGas: schemas.BigInt,
|
|
13
|
+
p75PriorityFee: schemas.BigInt,
|
|
14
|
+
minIncludedPriorityFee: schemas.BigInt,
|
|
15
|
+
blockBlobsFull: z.boolean(),
|
|
16
|
+
includedBlobCount: z.number()
|
|
17
|
+
});
|
|
18
|
+
/** Parses a stored failed-tx record, coercing the on-disk decimal strings back to bigints. */ export const FailedL1TxSchema = z.object({
|
|
19
|
+
id: hexSchema,
|
|
20
|
+
timestamp: z.number(),
|
|
21
|
+
failureType: z.enum([
|
|
22
|
+
'simulation',
|
|
23
|
+
'revert',
|
|
24
|
+
'send-error',
|
|
25
|
+
'timeout'
|
|
26
|
+
]),
|
|
27
|
+
request: z.object({
|
|
28
|
+
to: hexSchema,
|
|
29
|
+
data: hexSchema,
|
|
30
|
+
value: schemas.BigInt.optional()
|
|
31
|
+
}),
|
|
32
|
+
blobData: z.array(hexSchema).optional(),
|
|
33
|
+
l1BlockNumber: schemas.BigInt,
|
|
34
|
+
receipt: z.object({
|
|
35
|
+
transactionHash: hexSchema,
|
|
36
|
+
blockNumber: schemas.BigInt,
|
|
37
|
+
gasUsed: schemas.BigInt,
|
|
38
|
+
status: z.literal('reverted')
|
|
39
|
+
}).optional(),
|
|
40
|
+
error: z.object({
|
|
41
|
+
message: z.string(),
|
|
42
|
+
name: z.string().optional()
|
|
43
|
+
}),
|
|
44
|
+
context: z.object({
|
|
45
|
+
actions: z.array(z.string()),
|
|
46
|
+
requests: z.array(z.object({
|
|
47
|
+
action: z.string(),
|
|
48
|
+
to: hexSchema,
|
|
49
|
+
data: hexSchema
|
|
50
|
+
})).optional(),
|
|
51
|
+
checkpointNumber: z.number().optional(),
|
|
52
|
+
slot: z.number().optional(),
|
|
53
|
+
sender: hexSchema
|
|
54
|
+
}),
|
|
55
|
+
gasInfo: z.object({
|
|
56
|
+
sentGasPrice: gasPriceSchema.optional(),
|
|
57
|
+
gasLimit: schemas.BigInt.optional(),
|
|
58
|
+
nonce: z.number().optional(),
|
|
59
|
+
sentGasPriceLadder: z.array(gasPriceSchema).optional(),
|
|
60
|
+
attempts: z.number().optional(),
|
|
61
|
+
windowBlocks: z.array(windowBlockFeesSchema).optional()
|
|
62
|
+
}).optional(),
|
|
63
|
+
timing: z.object({
|
|
64
|
+
targetL2Slot: z.number().optional(),
|
|
65
|
+
slotDeadlineTimestampS: schemas.BigInt.optional(),
|
|
66
|
+
msUntilSlotDeadline: z.number().optional()
|
|
67
|
+
}).optional()
|
|
68
|
+
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Logger } from '@aztec/foundation/log';
|
|
2
2
|
import type { FileStore } from '@aztec/stdlib/file-store';
|
|
3
|
-
import type
|
|
3
|
+
import { type FailedL1Tx, type FailedL1TxUri, type L1TxFailedStore } from './failed_tx_store.js';
|
|
4
4
|
/**
|
|
5
5
|
* L1TxFailedStore implementation using the FileStore abstraction.
|
|
6
6
|
* Supports any backend that FileStore supports (GCS, S3, R2, local filesystem).
|
|
@@ -12,4 +12,4 @@ export declare class FileStoreL1TxFailedStore implements L1TxFailedStore {
|
|
|
12
12
|
saveFailedTx(tx: FailedL1Tx): Promise<FailedL1TxUri>;
|
|
13
13
|
getFailedTx(uri: FailedL1TxUri): Promise<FailedL1Tx>;
|
|
14
14
|
}
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZV9zdG9yZV9mYWlsZWRfdHhfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaXNoZXIvbDFfdHhfZmFpbGVkX3N0b3JlL2ZpbGVfc3RvcmVfZmFpbGVkX3R4X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUUxRCxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQW9CLEtBQUssYUFBYSxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbkg7OztHQUdHO0FBQ0gscUJBQWEsd0JBQXlCLFlBQVcsZUFBZTtJQUk1RCxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFINUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQVM7SUFFN0IsWUFDbUIsU0FBUyxFQUFFLFNBQVMsRUFDckMsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUdoQjtJQUVZLFlBQVksQ0FBQyxFQUFFLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FvQmhFO0lBRVksV0FBVyxDQUFDLEdBQUcsRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUdoRTtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file_store_failed_tx_store.d.ts","sourceRoot":"","sources":["../../../src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file_store_failed_tx_store.d.ts","sourceRoot":"","sources":["../../../src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,KAAK,UAAU,EAAoB,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEnH;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,eAAe;IAI5D,OAAO,CAAC,QAAQ,CAAC,SAAS;IAH5B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YACmB,SAAS,EAAE,SAAS,EACrC,MAAM,CAAC,EAAE,MAAM,EAGhB;IAEY,YAAY,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAoBhE;IAEY,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAGhE;CACF"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
|
|
1
2
|
import { createLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { FailedL1TxSchema } from './failed_tx_store.js';
|
|
2
4
|
/**
|
|
3
5
|
* L1TxFailedStore implementation using the FileStore abstraction.
|
|
4
6
|
* Supports any backend that FileStore supports (GCS, S3, R2, local filesystem).
|
|
@@ -12,7 +14,7 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
12
14
|
async saveFailedTx(tx) {
|
|
13
15
|
const prefix = tx.receipt ? 'tx' : 'data';
|
|
14
16
|
const path = `${tx.failureType}/${prefix}-${tx.id}.json`;
|
|
15
|
-
const json =
|
|
17
|
+
const json = jsonStringify(tx, true);
|
|
16
18
|
const uri = await this.fileStore.save(path, Buffer.from(json), {
|
|
17
19
|
metadata: {
|
|
18
20
|
'content-type': 'application/json',
|
|
@@ -29,6 +31,6 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
29
31
|
}
|
|
30
32
|
async getFailedTx(uri) {
|
|
31
33
|
const data = await this.fileStore.read(uri);
|
|
32
|
-
return
|
|
34
|
+
return jsonParseWithSchema(data.toString(), FailedL1TxSchema);
|
|
33
35
|
}
|
|
34
36
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { type FailedL1Tx, type FailedL1TxUri, type L1TxFailedStore } from './failed_tx_store.js';
|
|
1
|
+
export { type FailedL1Tx, FailedL1TxSchema, type FailedL1TxUri, type L1TxFailedStore } from './failed_tx_store.js';
|
|
2
2
|
export { createL1TxFailedStore } from './factory.js';
|
|
3
3
|
export { FileStoreL1TxFailedStore } from './file_store_failed_tx_store.js';
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaXNoZXIvbDFfdHhfZmFpbGVkX3N0b3JlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLGFBQWEsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ25ILE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNyRCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/publisher/l1_tx_failed_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/publisher/l1_tx_failed_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC"}
|