@aztec/ethereum 5.0.0-rc.1 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/config.d.ts +10 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +24 -0
- package/dest/contracts/rollup.d.ts +165 -8
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.d.ts +2 -2
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.js +2 -0
- package/dest/generated/l1-contracts-defaults.d.ts +1 -1
- package/dest/generated/l1-contracts-defaults.js +1 -1
- package/dest/l1_artifacts.d.ts +1219 -77
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_tx_utils/config.js +3 -3
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +1 -1
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_tx_utils.js +57 -15
- package/dest/publisher_manager.d.ts +18 -6
- package/dest/publisher_manager.d.ts.map +1 -1
- package/dest/publisher_manager.js +44 -7
- package/dest/test/blob_kzg_warmup.d.ts +19 -0
- package/dest/test/blob_kzg_warmup.d.ts.map +1 -0
- package/dest/test/blob_kzg_warmup.js +64 -0
- package/dest/test/chain_monitor.d.ts +33 -2
- package/dest/test/chain_monitor.d.ts.map +1 -1
- package/dest/test/chain_monitor.js +71 -6
- package/dest/test/eth_cheat_codes.d.ts +20 -3
- package/dest/test/eth_cheat_codes.d.ts.map +1 -1
- package/dest/test/eth_cheat_codes.js +50 -40
- package/dest/test/index.d.ts +2 -1
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +1 -0
- package/dest/test/rollup_cheat_codes.d.ts +30 -1
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +27 -0
- package/package.json +5 -5
- package/src/config.ts +35 -0
- package/src/contracts/rollup.ts +2 -1
- package/src/deploy_aztec_l1_contracts.ts +2 -1
- package/src/generated/l1-contracts-defaults.ts +1 -1
- package/src/l1_tx_utils/config.ts +3 -3
- package/src/l1_tx_utils/l1_tx_utils.ts +52 -18
- package/src/publisher_manager.ts +54 -18
- package/src/test/blob_kzg_warmup.ts +65 -0
- package/src/test/chain_monitor.ts +88 -5
- package/src/test/eth_cheat_codes.ts +47 -43
- package/src/test/index.ts +1 -0
- package/src/test/rollup_cheat_codes.ts +51 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher_manager.d.ts","sourceRoot":"","sources":["../src/publisher_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"publisher_manager.d.ts","sourceRoot":"","sources":["../src/publisher_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAGnE,OAAO,EAAE,SAAS,EAAgB,MAAM,wBAAwB,CAAC;AAwBjE,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,SAAS,IAAI,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;AAEzF,2CAA2C;AAC3C,KAAK,sBAAsB,GAAG;IAC5B,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,CAAC;AAEF,qBAAa,gBAAgB,CAAC,SAAS,SAAS,SAAS,GAAG,SAAS;IASjE,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE;IARnC,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAiB;IAClE,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAC7B,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACnD,OAAO,CAAC,OAAO,CAAS;IAExB,YACY,UAAU,EAAE,SAAS,EAAE,EACjC,MAAM,EAAE,sBAAsB,EAC9B,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,cAAc,CAAC;QAAC,MAAM,CAAC,EAAE,SAAS,CAAA;KAAE,EA6BzD;IAED;;;;;;OAMG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAmBlC;IAED;;;;OAIG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAWjC;IAQY,qBAAqB,CAAC,MAAM,GAAE,eAAe,CAAC,SAAS,CAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAwDtG;YAGa,sBAAsB;YAqCtB,cAAc;CAU7B"}
|
|
@@ -30,8 +30,10 @@ export class PublisherManager {
|
|
|
30
30
|
static FUNDING_CHECK_INTERVAL_MS = 2 * 60 * 1000;
|
|
31
31
|
funder;
|
|
32
32
|
fundingPromise;
|
|
33
|
+
started;
|
|
33
34
|
constructor(publishers, config, opts){
|
|
34
35
|
this.publishers = publishers;
|
|
36
|
+
this.started = false;
|
|
35
37
|
this.funder = opts?.funder;
|
|
36
38
|
this.log = createLogger('publisher:manager', opts?.bindings);
|
|
37
39
|
this.log.info(`PublisherManager initialized with ${publishers.length} publishers.`);
|
|
@@ -49,21 +51,48 @@ export class PublisherManager {
|
|
|
49
51
|
this.funder = undefined;
|
|
50
52
|
}
|
|
51
53
|
}
|
|
54
|
+
if (this.funder && hasThreshold && hasAmount) {
|
|
55
|
+
this.fundingPromise = new RunningPromise(()=>this.triggerFundingIfNeeded(), this.log, PublisherManager.FUNDING_CHECK_INTERVAL_MS);
|
|
56
|
+
}
|
|
52
57
|
}
|
|
53
|
-
/**
|
|
58
|
+
/**
|
|
59
|
+
* Clears any interrupted flag left by a previous {@link stop} so publishing works again after a restart,
|
|
60
|
+
* loads the state of all publishers and the funder, and starts periodic funding checks. Idempotent: a
|
|
61
|
+
* start while already started is a no-op, so it never re-runs `loadStateAndResumeMonitoring` (which
|
|
62
|
+
* would spawn a duplicate background monitor per pending nonce). Lifecycle calls are expected to be
|
|
63
|
+
* serialized by the caller.
|
|
64
|
+
*/ async start() {
|
|
65
|
+
if (this.started) {
|
|
66
|
+
this.log.debug('PublisherManager already started, ignoring start');
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
// Clear the interrupted flag set by a previous stop() so a restarted manager can publish again.
|
|
70
|
+
// On a first start this is a no-op (the flag is already clear).
|
|
71
|
+
this.publishers.forEach((pub)=>pub.restart());
|
|
72
|
+
this.funder?.restart();
|
|
54
73
|
await Promise.all([
|
|
55
74
|
...this.publishers.map((pub)=>pub.loadStateAndResumeMonitoring()),
|
|
56
75
|
this.funder?.loadStateAndResumeMonitoring()
|
|
57
76
|
]);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
77
|
+
this.fundingPromise?.start();
|
|
78
|
+
// Marked started only once fully up, so a start that failed to load state can be retried.
|
|
79
|
+
this.started = true;
|
|
62
80
|
}
|
|
63
|
-
/**
|
|
81
|
+
/**
|
|
82
|
+
* Stops the funding loop, interrupts all publishers so no further L1 txs are sent, and waits (bounded)
|
|
83
|
+
* for their in-flight tx monitor loops to wind down. Idempotent, and the manager may be restarted
|
|
84
|
+
* afterwards via {@link start}, which clears the interrupted flag.
|
|
85
|
+
*/ async stop() {
|
|
86
|
+
this.started = false;
|
|
64
87
|
await this.fundingPromise?.stop();
|
|
65
88
|
this.publishers.forEach((pub)=>pub.interrupt());
|
|
66
89
|
this.funder?.interrupt();
|
|
90
|
+
// Wait for in-flight tx monitor loops to observe the interrupt, so no L1 requests are still
|
|
91
|
+
// being issued after shutdown (e.g. against an anvil instance a test is about to tear down).
|
|
92
|
+
await Promise.all([
|
|
93
|
+
...this.publishers.map((pub)=>pub.waitMonitoringStopped()),
|
|
94
|
+
this.funder?.waitMonitoringStopped()
|
|
95
|
+
]);
|
|
67
96
|
}
|
|
68
97
|
// Finds and prioritises available publishers based on
|
|
69
98
|
// 1. Validity as per the provided filter function
|
|
@@ -97,8 +126,16 @@ export class PublisherManager {
|
|
|
97
126
|
publisher: pub
|
|
98
127
|
};
|
|
99
128
|
}));
|
|
129
|
+
// Discount unfunded publishers: a publisher with no ETH cannot send a tx, so it must never win
|
|
130
|
+
// selection regardless of how favourable its state or last-used time is. Fall back to the full
|
|
131
|
+
// set only if every candidate is unfunded, so behaviour is no worse than before.
|
|
132
|
+
let fundedPublishers = publishersWithBalance.filter((p)=>p.balance > 0n);
|
|
133
|
+
if (fundedPublishers.length === 0) {
|
|
134
|
+
this.log.warn(`All candidate publishers have zero balance; selecting from unfunded publishers.`);
|
|
135
|
+
fundedPublishers = publishersWithBalance;
|
|
136
|
+
}
|
|
100
137
|
// Sort based on state, then balance, then time since last use
|
|
101
|
-
const sortedPublishers =
|
|
138
|
+
const sortedPublishers = fundedPublishers.sort((a, b)=>{
|
|
102
139
|
const stateComparison = sortOrder.indexOf(a.publisher.state) - sortOrder.indexOf(b.publisher.state);
|
|
103
140
|
if (stateComparison !== 0) {
|
|
104
141
|
return stateComparison;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
+
import type { ExtendedViemWalletClient } from '../types.js';
|
|
3
|
+
/**
|
|
4
|
+
* Warms both KZG trusted setups in parallel for tests against a local anvil:
|
|
5
|
+
* - anvil's own setup, loaded lazily when it first validates a blob sidecar in `eth_sendRawTransaction`
|
|
6
|
+
* - our `@crate-crypto/node-eth-kzg` singleton (`getKzg()`, a ~2.2s synchronous precomp build)
|
|
7
|
+
*
|
|
8
|
+
* Without this, the first checkpoint publish pays both serially (~4.4s). The recipe does all RPC round
|
|
9
|
+
* trips up front, fires a single bare raw send carrying a fake (garbage) blob sidecar that anvil rejects
|
|
10
|
+
* after loading its trusted setup, yields once to flush the socket write, then synchronously builds our
|
|
11
|
+
* own precomp tables while anvil warms in parallel. The fake tx is rejected at admission, so it never
|
|
12
|
+
* enters the pool, mines no block, and burns no nonce — sending it from the passed client is harmless.
|
|
13
|
+
*
|
|
14
|
+
* Best-effort: any failure is debug-logged and swallowed, leaving lazy init as the fallback. Never throws.
|
|
15
|
+
*
|
|
16
|
+
* @param l1Client - The L1 client whose account sends the (rejected) warm-up blob tx.
|
|
17
|
+
*/
|
|
18
|
+
export declare function warmBlobKzg(l1Client: ExtendedViemWalletClient, logger?: Logger): Promise<void>;
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvYl9remdfd2FybXVwLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9ibG9iX2t6Z193YXJtdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFNUQ7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCx3QkFBc0IsV0FBVyxDQUFDLFFBQVEsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTRDcEcifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blob_kzg_warmup.d.ts","sourceRoot":"","sources":["../../src/test/blob_kzg_warmup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE5D;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,wBAAwB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CpG"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { getBytesPerBlob, getBytesPerCommitment, getKzg } from '@aztec/blob-lib';
|
|
2
|
+
/**
|
|
3
|
+
* Warms both KZG trusted setups in parallel for tests against a local anvil:
|
|
4
|
+
* - anvil's own setup, loaded lazily when it first validates a blob sidecar in `eth_sendRawTransaction`
|
|
5
|
+
* - our `@crate-crypto/node-eth-kzg` singleton (`getKzg()`, a ~2.2s synchronous precomp build)
|
|
6
|
+
*
|
|
7
|
+
* Without this, the first checkpoint publish pays both serially (~4.4s). The recipe does all RPC round
|
|
8
|
+
* trips up front, fires a single bare raw send carrying a fake (garbage) blob sidecar that anvil rejects
|
|
9
|
+
* after loading its trusted setup, yields once to flush the socket write, then synchronously builds our
|
|
10
|
+
* own precomp tables while anvil warms in parallel. The fake tx is rejected at admission, so it never
|
|
11
|
+
* enters the pool, mines no block, and burns no nonce — sending it from the passed client is harmless.
|
|
12
|
+
*
|
|
13
|
+
* Best-effort: any failure is debug-logged and swallowed, leaving lazy init as the fallback. Never throws.
|
|
14
|
+
*
|
|
15
|
+
* @param l1Client - The L1 client whose account sends the (rejected) warm-up blob tx.
|
|
16
|
+
*/ export async function warmBlobKzg(l1Client, logger) {
|
|
17
|
+
try {
|
|
18
|
+
// A pure-JS fake kzg: returns deterministic garbage of the correct lengths (commitment and proof are
|
|
19
|
+
// both 48 bytes). It makes viem build a syntactically valid sidecar without initializing any native
|
|
20
|
+
// module, so anvil loads its trusted setup to validate the (invalid) proof and then rejects the tx.
|
|
21
|
+
const fakeKzg = {
|
|
22
|
+
blobToKzgCommitment: ()=>{
|
|
23
|
+
const commitment = new Uint8Array(getBytesPerCommitment());
|
|
24
|
+
commitment.fill(0xab);
|
|
25
|
+
commitment[0] = 0xc0;
|
|
26
|
+
return commitment;
|
|
27
|
+
},
|
|
28
|
+
computeBlobKzgProof: ()=>{
|
|
29
|
+
const proof = new Uint8Array(getBytesPerCommitment());
|
|
30
|
+
proof.fill(0xcd);
|
|
31
|
+
proof[0] = 0xc0;
|
|
32
|
+
return proof;
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
// All RPC round trips (nonce, fees, gas) happen here, so only a single socket write remains to flush.
|
|
36
|
+
const prepared = await l1Client.prepareTransactionRequest({
|
|
37
|
+
blobs: [
|
|
38
|
+
new Uint8Array(getBytesPerBlob())
|
|
39
|
+
],
|
|
40
|
+
kzg: fakeKzg,
|
|
41
|
+
to: '0x0000000000000000000000000000000000000000',
|
|
42
|
+
value: 0n,
|
|
43
|
+
maxFeePerBlobGas: 1_000_000_000_000n
|
|
44
|
+
});
|
|
45
|
+
const serialized = await l1Client.signTransaction(prepared);
|
|
46
|
+
// Fire the raw send without awaiting and swallow the expected rejection.
|
|
47
|
+
const sent = l1Client.request({
|
|
48
|
+
method: 'eth_sendRawTransaction',
|
|
49
|
+
params: [
|
|
50
|
+
serialized
|
|
51
|
+
]
|
|
52
|
+
}).catch(()=>{});
|
|
53
|
+
// Flush the single socket write so anvil receives the tx and starts loading its trusted setup in its
|
|
54
|
+
// own process before we block the event loop below.
|
|
55
|
+
await new Promise((resolve)=>setImmediate(resolve));
|
|
56
|
+
// Synchronously build our precomp tables (~2.2s, event-loop-blocking); anvil warms in parallel.
|
|
57
|
+
getKzg();
|
|
58
|
+
await sent;
|
|
59
|
+
} catch (err) {
|
|
60
|
+
logger?.debug('Failed to warm blob KZG; falling back to lazy init', {
|
|
61
|
+
err
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|
|
@@ -50,6 +50,15 @@ export type ChainMonitorEventMap = {
|
|
|
50
50
|
}];
|
|
51
51
|
'l2-fees': [L2FeeData];
|
|
52
52
|
};
|
|
53
|
+
/** Options for tuning what the {@link ChainMonitor} polls on each new L1 block. */
|
|
54
|
+
export type ChainMonitorOptions = {
|
|
55
|
+
/**
|
|
56
|
+
* Whether to fetch L2 fee/oracle data (5 extra rollup reads per new L1 block) and emit `l2-fees`.
|
|
57
|
+
* Defaults to `true`. Set to `false` for tests that only care about slot/checkpoint/proven state to
|
|
58
|
+
* avoid the extra round-trips.
|
|
59
|
+
*/
|
|
60
|
+
includeFeeData?: boolean;
|
|
61
|
+
};
|
|
53
62
|
/** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */
|
|
54
63
|
export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
|
|
55
64
|
private readonly rollup;
|
|
@@ -57,6 +66,7 @@ export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
|
|
|
57
66
|
private readonly logger;
|
|
58
67
|
private readonly intervalMs;
|
|
59
68
|
private readonly l1Client;
|
|
69
|
+
private readonly includeFeeData;
|
|
60
70
|
private inbox;
|
|
61
71
|
private handle;
|
|
62
72
|
private running;
|
|
@@ -78,7 +88,7 @@ export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
|
|
|
78
88
|
l2SlotNumber: SlotNumber;
|
|
79
89
|
/** Current L2 fee data (components of the minimum fee per mana). */
|
|
80
90
|
l2FeeData: L2FeeData;
|
|
81
|
-
constructor(rollup: RollupContract, dateProvider?: DateProvider, logger?: import("@aztec/foundation/log").Logger, intervalMs?: number);
|
|
91
|
+
constructor(rollup: RollupContract, dateProvider?: DateProvider, logger?: import("@aztec/foundation/log").Logger, intervalMs?: number, options?: ChainMonitorOptions);
|
|
82
92
|
start(): this;
|
|
83
93
|
stop(): Promise<void>;
|
|
84
94
|
protected getInbox(): Promise<InboxContract>;
|
|
@@ -89,7 +99,28 @@ export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
|
|
|
89
99
|
waitUntilL1Block(block: number | bigint): Promise<void>;
|
|
90
100
|
waitUntilL1Timestamp(timestamp: number | bigint): Promise<void>;
|
|
91
101
|
waitUntilCheckpoint(checkpointNumber: CheckpointNumber): Promise<void>;
|
|
102
|
+
/**
|
|
103
|
+
* Resolves with the first `checkpoint` event whose payload satisfies `match`. Unlike
|
|
104
|
+
* {@link waitUntilCheckpoint} (which waits for a target number), this lets callers wait for an
|
|
105
|
+
* arbitrary checkpoint property (e.g. one published in the first half of its slot). Rejects after
|
|
106
|
+
* `opts.timeout` ms if provided; otherwise waits indefinitely.
|
|
107
|
+
*
|
|
108
|
+
* By default this is purely event-driven and only resolves on the *next* matching checkpoint that
|
|
109
|
+
* arrives after the call. Set `checkCurrentCheckpoint` to also test the current checkpoint first (via
|
|
110
|
+
* a fresh {@link run} snapshot) and short-circuit if it already satisfies `match`. Use it only for
|
|
111
|
+
* latching state predicates (e.g. "checkpoint number has passed N"), where an already-satisfied
|
|
112
|
+
* result is valid and you want to avoid missing an advance that landed before the listener attached.
|
|
113
|
+
* Do NOT set it when the predicate depends on observing the checkpoint live (e.g. one published
|
|
114
|
+
* mid-slot that the caller then times against wall-clock), since it may return a checkpoint whose
|
|
115
|
+
* slot has already elapsed.
|
|
116
|
+
*/
|
|
117
|
+
waitForCheckpoint(match: (event: ChainMonitorEventMap['checkpoint'][0]) => boolean, opts?: {
|
|
118
|
+
timeout?: number;
|
|
119
|
+
checkCurrentCheckpoint?: boolean;
|
|
120
|
+
}): Promise<ChainMonitorEventMap['checkpoint'][0]>;
|
|
121
|
+
/** Resolves once the proven checkpoint number reaches `checkpointNumber`. */
|
|
122
|
+
waitUntilCheckpointProven(checkpointNumber: CheckpointNumber): Promise<void>;
|
|
92
123
|
private fetchFeeData;
|
|
93
124
|
private hasFeeDataChanged;
|
|
94
125
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
126
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbW9uaXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvY2hhaW5fbW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN0RixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM1RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFJdEMsaURBQWlEO0FBQ2pELE1BQU0sTUFBTSxTQUFTLEdBQUcsb0JBQW9CLEdBQUc7SUFDN0Msb0dBQW9HO0lBQ3BHLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsMENBQTBDO0lBQzFDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsMENBQTBDO0lBQzFDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsd0RBQXdEO0lBQ3hELGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIsa0NBQWtDO0lBQ2xDLFVBQVUsRUFBRSxNQUFNLENBQUM7Q0FDcEIsQ0FBQztBQUVGLE1BQU0sTUFBTSxvQkFBb0IsR0FBRztJQUNqQyxVQUFVLEVBQUUsQ0FBQztRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQyxDQUFDO0lBQzNELFVBQVUsRUFBRTtRQUNWO1lBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7WUFBQyxhQUFhLEVBQUUsTUFBTSxDQUFDO1lBQUMsWUFBWSxFQUFFLFVBQVUsQ0FBQztZQUFDLFNBQVMs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../src/test/chain_monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,iDAAiD;AACjD,MAAM,MAAM,SAAS,GAAG,oBAAoB,GAAG;IAC7C,oGAAoG;IACpG,aAAa,EAAE,MAAM,CAAC;IACtB,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,UAAU,EAAE;QACV;YAAE,gBAAgB,EAAE,gBAAgB,CAAC;YAAC,aAAa,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,UAAU,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE;KAC3G,CAAC;IACF,mBAAmB,EAAE,CAAC;QAAE,sBAAsB,EAAE,gBAAgB,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9G,aAAa,EAAE,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,WAAW,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IACrG,SAAS,EAAE,CAAC;QAAE,YAAY,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7D,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC;CACxB,CAAC;AAEF,8GAA8G;AAC9G,qBAAa,YAAa,SAAQ,YAAY,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../src/test/chain_monitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { EventEmitter } from 'events';
|
|
|
10
10
|
logger;
|
|
11
11
|
intervalMs;
|
|
12
12
|
l1Client;
|
|
13
|
+
includeFeeData;
|
|
13
14
|
inbox;
|
|
14
15
|
handle;
|
|
15
16
|
// eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
|
|
@@ -23,9 +24,10 @@ import { EventEmitter } from 'events';
|
|
|
23
24
|
/** Current L2 epoch number */ l2EpochNumber;
|
|
24
25
|
/** Current L2 slot number */ l2SlotNumber;
|
|
25
26
|
/** Current L2 fee data (components of the minimum fee per mana). */ l2FeeData;
|
|
26
|
-
constructor(rollup, dateProvider = new DateProvider(), logger = createLogger('aztecjs:utils:chain_monitor'), intervalMs = 200){
|
|
27
|
+
constructor(rollup, dateProvider = new DateProvider(), logger = createLogger('aztecjs:utils:chain_monitor'), intervalMs = 200, options = {}){
|
|
27
28
|
super(), this.rollup = rollup, this.dateProvider = dateProvider, this.logger = logger, this.intervalMs = intervalMs, this.running = new Set(), this.totalL2Messages = 0;
|
|
28
29
|
this.l1Client = rollup.client;
|
|
30
|
+
this.includeFeeData = options.includeFeeData ?? true;
|
|
29
31
|
}
|
|
30
32
|
start() {
|
|
31
33
|
if (this.handle) {
|
|
@@ -141,11 +143,13 @@ import { EventEmitter } from 'events';
|
|
|
141
143
|
timestamp
|
|
142
144
|
});
|
|
143
145
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
146
|
+
if (this.includeFeeData) {
|
|
147
|
+
const feeData = await this.fetchFeeData(timestamp);
|
|
148
|
+
if (this.hasFeeDataChanged(feeData)) {
|
|
149
|
+
msg += ` with L2 min fee ${feeData.minFeePerMana}`;
|
|
150
|
+
this.l2FeeData = feeData;
|
|
151
|
+
this.emit('l2-fees', feeData);
|
|
152
|
+
}
|
|
149
153
|
}
|
|
150
154
|
this.logger.info(msg, {
|
|
151
155
|
currentTimestamp: this.dateProvider.nowInSeconds(),
|
|
@@ -223,6 +227,67 @@ import { EventEmitter } from 'events';
|
|
|
223
227
|
this.on('checkpoint', listener);
|
|
224
228
|
});
|
|
225
229
|
}
|
|
230
|
+
/**
|
|
231
|
+
* Resolves with the first `checkpoint` event whose payload satisfies `match`. Unlike
|
|
232
|
+
* {@link waitUntilCheckpoint} (which waits for a target number), this lets callers wait for an
|
|
233
|
+
* arbitrary checkpoint property (e.g. one published in the first half of its slot). Rejects after
|
|
234
|
+
* `opts.timeout` ms if provided; otherwise waits indefinitely.
|
|
235
|
+
*
|
|
236
|
+
* By default this is purely event-driven and only resolves on the *next* matching checkpoint that
|
|
237
|
+
* arrives after the call. Set `checkCurrentCheckpoint` to also test the current checkpoint first (via
|
|
238
|
+
* a fresh {@link run} snapshot) and short-circuit if it already satisfies `match`. Use it only for
|
|
239
|
+
* latching state predicates (e.g. "checkpoint number has passed N"), where an already-satisfied
|
|
240
|
+
* result is valid and you want to avoid missing an advance that landed before the listener attached.
|
|
241
|
+
* Do NOT set it when the predicate depends on observing the checkpoint live (e.g. one published
|
|
242
|
+
* mid-slot that the caller then times against wall-clock), since it may return a checkpoint whose
|
|
243
|
+
* slot has already elapsed.
|
|
244
|
+
*/ async waitForCheckpoint(match, opts = {}) {
|
|
245
|
+
if (opts.checkCurrentCheckpoint) {
|
|
246
|
+
await this.run();
|
|
247
|
+
const current = {
|
|
248
|
+
checkpointNumber: this.checkpointNumber,
|
|
249
|
+
l1BlockNumber: this.l1BlockNumber,
|
|
250
|
+
l2SlotNumber: this.l2SlotNumber,
|
|
251
|
+
timestamp: this.checkpointTimestamp
|
|
252
|
+
};
|
|
253
|
+
if (match(current)) {
|
|
254
|
+
return current;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
return new Promise((resolve, reject)=>{
|
|
258
|
+
let timer;
|
|
259
|
+
const listener = (event)=>{
|
|
260
|
+
if (match(event)) {
|
|
261
|
+
if (timer) {
|
|
262
|
+
clearTimeout(timer);
|
|
263
|
+
}
|
|
264
|
+
this.off('checkpoint', listener);
|
|
265
|
+
resolve(event);
|
|
266
|
+
}
|
|
267
|
+
};
|
|
268
|
+
if (opts.timeout !== undefined) {
|
|
269
|
+
timer = setTimeout(()=>{
|
|
270
|
+
this.off('checkpoint', listener);
|
|
271
|
+
reject(new Error(`Timed out after ${opts.timeout}ms waiting for a matching checkpoint`));
|
|
272
|
+
}, opts.timeout);
|
|
273
|
+
}
|
|
274
|
+
this.on('checkpoint', listener);
|
|
275
|
+
});
|
|
276
|
+
}
|
|
277
|
+
/** Resolves once the proven checkpoint number reaches `checkpointNumber`. */ waitUntilCheckpointProven(checkpointNumber) {
|
|
278
|
+
if (this.provenCheckpointNumber >= checkpointNumber) {
|
|
279
|
+
return Promise.resolve();
|
|
280
|
+
}
|
|
281
|
+
return new Promise((resolve)=>{
|
|
282
|
+
const listener = (data)=>{
|
|
283
|
+
if (data.provenCheckpointNumber >= checkpointNumber) {
|
|
284
|
+
this.off('checkpoint-proven', listener);
|
|
285
|
+
resolve();
|
|
286
|
+
}
|
|
287
|
+
};
|
|
288
|
+
this.on('checkpoint-proven', listener);
|
|
289
|
+
});
|
|
290
|
+
}
|
|
226
291
|
async fetchFeeData(timestamp) {
|
|
227
292
|
const [components, minFeePerMana, l1Fees, ethPerFeeAsset, manaTarget] = await Promise.all([
|
|
228
293
|
this.rollup.getManaMinFeeComponentsAt(timestamp, true),
|
|
@@ -109,6 +109,10 @@ export declare class EthCheatCodes {
|
|
|
109
109
|
setIntervalMining(seconds: number, opts?: {
|
|
110
110
|
silent?: boolean;
|
|
111
111
|
}): Promise<void>;
|
|
112
|
+
/**
|
|
113
|
+
* Starts interval mining from a freshly mined block and syncs the date provider to the block timestamp.
|
|
114
|
+
*/
|
|
115
|
+
startIntervalMiningWithFreshBlock(seconds: number): Promise<void>;
|
|
112
116
|
/**
|
|
113
117
|
* Set the automine status of the underlying anvil chain
|
|
114
118
|
* @param automine - The automine status to set
|
|
@@ -222,10 +226,23 @@ export declare class EthCheatCodes {
|
|
|
222
226
|
}>;
|
|
223
227
|
getTxPoolContents(): Promise<TxPoolTransaction[]>;
|
|
224
228
|
/**
|
|
225
|
-
* Mines
|
|
226
|
-
*
|
|
229
|
+
* Mines empty blocks while leaving any pending transactions untouched in the mempool.
|
|
230
|
+
*
|
|
231
|
+
* Never manipulates the mempool, so it is immune to the race that dropping and re-adding txs has against a
|
|
232
|
+
* concurrent publisher that is monitoring and re-broadcasting the same in-flight tx (with that approach the
|
|
233
|
+
* in-flight tx could reappear in the pool and be swept into the "empty" block, mining a proposal the caller
|
|
234
|
+
* expected to stay pending). Works in two steps: first the block gas limit is temporarily lowered below the
|
|
235
|
+
* intrinsic cost of any transaction (21000 gas) and the blocks are mined, so no pending tx is includable;
|
|
236
|
+
* then those blocks are reorged out and replaced with empty blocks mined at the restored gas limit. The
|
|
237
|
+
* reorg is needed because anvil applies a new gas limit only to future blocks: without it the just-mined
|
|
238
|
+
* blocks would keep the tiny gas limit, and an `eth_call` against `latest` (whose gas is capped by the
|
|
239
|
+
* block gas limit) would revert with "intrinsic gas too high".
|
|
227
240
|
*/
|
|
228
241
|
mineEmptyBlock(blockCount?: number): Promise<void>;
|
|
242
|
+
/** Returns the gas limit of the latest mined L1 block. */
|
|
243
|
+
getBlockGasLimit(): Promise<bigint>;
|
|
244
|
+
/** Sets the block gas limit applied to subsequently mined L1 blocks. */
|
|
245
|
+
setBlockGasLimit(gasLimit: bigint): Promise<void>;
|
|
229
246
|
execWithPausedAnvil<T>(fn: () => Promise<T>): Promise<T>;
|
|
230
247
|
syncDateProvider(): Promise<void>;
|
|
231
248
|
}
|
|
@@ -234,4 +251,4 @@ export type TxPoolTransaction = Transaction & {
|
|
|
234
251
|
poolState: TxPoolState;
|
|
235
252
|
};
|
|
236
253
|
export {};
|
|
237
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
254
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRoX2NoZWF0X2NvZGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9ldGhfY2hlYXRfY29kZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSTNELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxLQUFLLEtBQUssRUFBRSxLQUFLLEdBQUcsRUFBRSxLQUFLLFdBQVcsRUFBbUQsTUFBTSxNQUFNLENBQUM7QUFHL0csT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFcEQ7O0dBRUc7QUFDSCxxQkFBYSxhQUFhO0lBR3RCOztPQUVHO0lBQ0ksT0FBTyxFQUFFLE1BQU0sRUFBRTtJQUN4Qjs7T0FFRztJQUNJLFlBQVksRUFBRSxZQUFZLEdBQUcsZ0JBQWdCO0lBQ3BEOztPQUVHO0lBQ0ksTUFBTTtJQUNiOztPQUVHO0lBQ0ksS0FBSyxFQUFFLEtBQUs7SUFqQnJCLFNBQWdCLFlBQVksRUFBRSxnQkFBZ0IsQ0FBQztJQUMvQztJQUNFOztPQUVHO0lBQ0ksT0FBTyxFQUFFLE1BQU0sRUFBRTtJQUN4Qjs7T0FFRztJQUNJLFlBQVksRUFBRSxZQUFZLEdBQUcsZ0JBQWdCO0lBQ3BEOztPQUVHO0lBQ0ksTUFBTSx5Q0FBdUM7SUFDcEQ7O09BRUc7SUFDSSxLQUFLLEdBQUUsS0FBZSxFQU05QjtJQUVNLE9BQU8sQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsZ0JBRzNDO1lBRWEsU0FBUztJQU92Qjs7O09BR0c7SUFDVSxZQUFZLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVE1QztJQUVEOzs7T0FHRztJQUNVLFdBQVcsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRzFDO0lBRUQ7OztPQUdHO0lB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/eth_cheat_codes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/eth_cheat_codes.ts"],"names":[],"mappings":"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"}
|
|
@@ -192,6 +192,21 @@ import { foundry } from 'viem/chains';
|
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
194
|
/**
|
|
195
|
+
* Starts interval mining from a freshly mined block and syncs the date provider to the block timestamp.
|
|
196
|
+
*/ async startIntervalMiningWithFreshBlock(seconds) {
|
|
197
|
+
if (seconds <= 0) {
|
|
198
|
+
throw new Error(`Interval mining requires a positive interval, got ${seconds}`);
|
|
199
|
+
}
|
|
200
|
+
await this.setAutomine(false);
|
|
201
|
+
await this.setIntervalMining(0, {
|
|
202
|
+
silent: true
|
|
203
|
+
});
|
|
204
|
+
await this.evmMine();
|
|
205
|
+
await this.syncDateProvider();
|
|
206
|
+
await this.setIntervalMining(seconds);
|
|
207
|
+
this.logger.warn(`Started L1 interval mining at ${seconds} seconds from a fresh block`);
|
|
208
|
+
}
|
|
209
|
+
/**
|
|
195
210
|
* Set the automine status of the underlying anvil chain
|
|
196
211
|
* @param automine - The automine status to set
|
|
197
212
|
*/ async setAutomine(automine, opts = {}) {
|
|
@@ -462,52 +477,47 @@ import { foundry } from 'viem/chains';
|
|
|
462
477
|
return mapTxPoolContent(txpoolContent);
|
|
463
478
|
}
|
|
464
479
|
/**
|
|
465
|
-
* Mines
|
|
466
|
-
*
|
|
480
|
+
* Mines empty blocks while leaving any pending transactions untouched in the mempool.
|
|
481
|
+
*
|
|
482
|
+
* Never manipulates the mempool, so it is immune to the race that dropping and re-adding txs has against a
|
|
483
|
+
* concurrent publisher that is monitoring and re-broadcasting the same in-flight tx (with that approach the
|
|
484
|
+
* in-flight tx could reappear in the pool and be swept into the "empty" block, mining a proposal the caller
|
|
485
|
+
* expected to stay pending). Works in two steps: first the block gas limit is temporarily lowered below the
|
|
486
|
+
* intrinsic cost of any transaction (21000 gas) and the blocks are mined, so no pending tx is includable;
|
|
487
|
+
* then those blocks are reorged out and replaced with empty blocks mined at the restored gas limit. The
|
|
488
|
+
* reorg is needed because anvil applies a new gas limit only to future blocks: without it the just-mined
|
|
489
|
+
* blocks would keep the tiny gas limit, and an `eth_call` against `latest` (whose gas is capped by the
|
|
490
|
+
* block gas limit) would revert with "intrinsic gas too high".
|
|
467
491
|
*/ async mineEmptyBlock(blockCount = 1) {
|
|
468
492
|
await this.execWithPausedAnvil(async ()=>{
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
try {
|
|
476
|
-
const rawTx = await this.doRpcCall('debug_getRawTransaction', [
|
|
477
|
-
tx.hash
|
|
478
|
-
]);
|
|
479
|
-
if (rawTx) {
|
|
480
|
-
rawTxs.push(rawTx);
|
|
481
|
-
this.logger.debug(`Got raw tx for ${tx.hash}`);
|
|
482
|
-
} else {
|
|
483
|
-
this.logger.warn(`No raw tx found for ${tx.hash}`);
|
|
484
|
-
}
|
|
485
|
-
} catch {
|
|
486
|
-
this.logger.warn(`Failed to get raw transaction for ${tx.hash}`);
|
|
487
|
-
}
|
|
488
|
-
}
|
|
489
|
-
this.logger.debug(`Retrieved ${rawTxs.length} raw transactions`);
|
|
490
|
-
// Drop all transactions from the mempool
|
|
491
|
-
await this.doRpcCall('anvil_dropAllTransactions', []);
|
|
492
|
-
// Mine an empty block
|
|
493
|
-
await this.doMine(blockCount);
|
|
494
|
-
// Re-add the transactions to the pool
|
|
495
|
-
for (const rawTx of rawTxs){
|
|
496
|
-
try {
|
|
497
|
-
const txHash = await this.doRpcCall('eth_sendRawTransaction', [
|
|
498
|
-
rawTx
|
|
499
|
-
]);
|
|
500
|
-
this.logger.debug(`Re-added transaction ${txHash}`);
|
|
501
|
-
} catch (err) {
|
|
502
|
-
this.logger.warn(`Failed to re-add transaction: ${err}`);
|
|
503
|
-
}
|
|
504
|
-
}
|
|
505
|
-
if (rawTxs.length !== txs.length) {
|
|
506
|
-
this.logger.warn(`Failed to add all txs back: had ${txs.length} but re-added ${rawTxs.length}`);
|
|
493
|
+
const originalGasLimit = await this.getBlockGasLimit();
|
|
494
|
+
try {
|
|
495
|
+
await this.setBlockGasLimit(1n);
|
|
496
|
+
await this.doMine(blockCount);
|
|
497
|
+
} finally{
|
|
498
|
+
await this.setBlockGasLimit(originalGasLimit);
|
|
507
499
|
}
|
|
500
|
+
// Replace the tiny-gas-limit blocks with empty blocks at the restored gas limit, keeping the same
|
|
501
|
+
// height and timestamps. The reorged-out blocks held no transactions, so nothing returns to the pool.
|
|
502
|
+
await this.doRpcCall('anvil_reorg', [
|
|
503
|
+
blockCount,
|
|
504
|
+
[]
|
|
505
|
+
]);
|
|
508
506
|
});
|
|
509
507
|
this.logger.warn(`Mined ${blockCount} empty L1 ${pluralize('block', blockCount)}`);
|
|
510
508
|
}
|
|
509
|
+
/** Returns the gas limit of the latest mined L1 block. */ async getBlockGasLimit() {
|
|
510
|
+
const block = await this.doRpcCall('eth_getBlockByNumber', [
|
|
511
|
+
'latest',
|
|
512
|
+
false
|
|
513
|
+
]);
|
|
514
|
+
return BigInt(block.gasLimit);
|
|
515
|
+
}
|
|
516
|
+
/** Sets the block gas limit applied to subsequently mined L1 blocks. */ async setBlockGasLimit(gasLimit) {
|
|
517
|
+
await this.doRpcCall('anvil_setBlockGasLimit', [
|
|
518
|
+
toHex(gasLimit)
|
|
519
|
+
]);
|
|
520
|
+
}
|
|
511
521
|
async execWithPausedAnvil(fn) {
|
|
512
522
|
const [blockInterval, wasAutoMining] = await Promise.all([
|
|
513
523
|
this.getIntervalMining(),
|
package/dest/test/index.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
export * from './blob_kzg_warmup.js';
|
|
1
2
|
export * from './eth_cheat_codes.js';
|
|
2
3
|
export * from './eth_cheat_codes_with_state.js';
|
|
3
4
|
export * from './start_anvil.js';
|
|
4
5
|
export * from './upgrade_utils.js';
|
|
5
6
|
export * from './chain_monitor.js';
|
|
6
7
|
export * from './rollup_cheat_codes.js';
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMseUJBQXlCLENBQUMifQ==
|
package/dest/test/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC"}
|
package/dest/test/index.js
CHANGED