@aztec/ethereum 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

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.
Files changed (181) hide show
  1. package/dest/client.d.ts +27 -3
  2. package/dest/client.d.ts.map +1 -1
  3. package/dest/client.js +63 -8
  4. package/dest/config.d.ts +17 -6
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +38 -10
  7. package/dest/contracts/chain_state_override.d.ts +78 -0
  8. package/dest/contracts/chain_state_override.d.ts.map +1 -0
  9. package/dest/contracts/chain_state_override.js +137 -0
  10. package/dest/contracts/fee_asset_price_oracle.d.ts +105 -0
  11. package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -0
  12. package/dest/contracts/fee_asset_price_oracle.js +656 -0
  13. package/dest/contracts/governance.d.ts +135 -35
  14. package/dest/contracts/governance.d.ts.map +1 -1
  15. package/dest/contracts/governance.js +229 -18
  16. package/dest/contracts/governance_proposer.d.ts +33 -2
  17. package/dest/contracts/governance_proposer.d.ts.map +1 -1
  18. package/dest/contracts/governance_proposer.js +54 -6
  19. package/dest/contracts/gse.d.ts +4 -2
  20. package/dest/contracts/gse.d.ts.map +1 -1
  21. package/dest/contracts/gse.js +2 -2
  22. package/dest/contracts/inbox.d.ts +3 -3
  23. package/dest/contracts/inbox.d.ts.map +1 -1
  24. package/dest/contracts/inbox.js +12 -7
  25. package/dest/contracts/index.d.ts +4 -3
  26. package/dest/contracts/index.d.ts.map +1 -1
  27. package/dest/contracts/index.js +3 -2
  28. package/dest/contracts/multicall.d.ts +127 -12
  29. package/dest/contracts/multicall.d.ts.map +1 -1
  30. package/dest/contracts/multicall.js +201 -94
  31. package/dest/contracts/outbox.d.ts +27 -4
  32. package/dest/contracts/outbox.d.ts.map +1 -1
  33. package/dest/contracts/outbox.js +34 -7
  34. package/dest/contracts/registry.d.ts +3 -1
  35. package/dest/contracts/registry.d.ts.map +1 -1
  36. package/dest/contracts/registry.js +30 -1
  37. package/dest/contracts/rollup.d.ts +5437 -34
  38. package/dest/contracts/rollup.d.ts.map +1 -1
  39. package/dest/contracts/rollup.js +448 -104
  40. package/dest/contracts/slashing_proposer.d.ts +171 -0
  41. package/dest/contracts/slashing_proposer.d.ts.map +1 -0
  42. package/dest/contracts/slashing_proposer.js +753 -0
  43. package/dest/contracts/watch_event.d.ts +36 -0
  44. package/dest/contracts/watch_event.d.ts.map +1 -0
  45. package/dest/contracts/watch_event.js +66 -0
  46. package/dest/deploy_aztec_l1_contracts.d.ts +5 -9
  47. package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
  48. package/dest/deploy_aztec_l1_contracts.js +48 -27
  49. package/dest/deploy_l1_contract.js +3 -3
  50. package/dest/foundry_binary.d.ts +13 -0
  51. package/dest/foundry_binary.d.ts.map +1 -0
  52. package/dest/foundry_binary.js +52 -0
  53. package/dest/generated/l1-contracts-defaults.d.ts +3 -3
  54. package/dest/generated/l1-contracts-defaults.js +3 -3
  55. package/dest/l1_artifacts.d.ts +15524 -15847
  56. package/dest/l1_artifacts.d.ts.map +1 -1
  57. package/dest/l1_artifacts.js +9 -24
  58. package/dest/l1_contract_addresses.d.ts +61 -65
  59. package/dest/l1_contract_addresses.d.ts.map +1 -1
  60. package/dest/l1_contract_addresses.js +101 -82
  61. package/dest/l1_reader.d.ts +5 -5
  62. package/dest/l1_reader.d.ts.map +1 -1
  63. package/dest/l1_reader.js +9 -7
  64. package/dest/l1_tx_utils/config.d.ts +7 -1
  65. package/dest/l1_tx_utils/config.d.ts.map +1 -1
  66. package/dest/l1_tx_utils/config.js +17 -4
  67. package/dest/l1_tx_utils/factory.d.ts +18 -10
  68. package/dest/l1_tx_utils/factory.d.ts.map +1 -1
  69. package/dest/l1_tx_utils/factory.js +17 -7
  70. package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +1 -1
  71. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +1 -1
  72. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +15 -15
  73. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -1
  74. package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +9 -15
  75. package/dest/l1_tx_utils/index-blobs.d.ts +3 -3
  76. package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -1
  77. package/dest/l1_tx_utils/index-blobs.js +2 -2
  78. package/dest/l1_tx_utils/index.d.ts +2 -1
  79. package/dest/l1_tx_utils/index.d.ts.map +1 -1
  80. package/dest/l1_tx_utils/index.js +1 -0
  81. package/dest/l1_tx_utils/l1_tx_utils.d.ts +26 -7
  82. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
  83. package/dest/l1_tx_utils/l1_tx_utils.js +156 -79
  84. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -1
  85. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
  86. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +57 -23
  87. package/dest/l1_tx_utils/tx_delayer.d.ts +58 -0
  88. package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -0
  89. package/dest/{test → l1_tx_utils}/tx_delayer.js +67 -37
  90. package/dest/publisher_manager.d.ts +34 -8
  91. package/dest/publisher_manager.d.ts.map +1 -1
  92. package/dest/publisher_manager.js +119 -8
  93. package/dest/queries.d.ts +13 -2
  94. package/dest/queries.d.ts.map +1 -1
  95. package/dest/queries.js +62 -3
  96. package/dest/test/blob_kzg_warmup.d.ts +19 -0
  97. package/dest/test/blob_kzg_warmup.d.ts.map +1 -0
  98. package/dest/test/blob_kzg_warmup.js +64 -0
  99. package/dest/test/chain_monitor.d.ts +55 -4
  100. package/dest/test/chain_monitor.d.ts.map +1 -1
  101. package/dest/test/chain_monitor.js +104 -3
  102. package/dest/test/eth_cheat_codes.d.ts +31 -6
  103. package/dest/test/eth_cheat_codes.d.ts.map +1 -1
  104. package/dest/test/eth_cheat_codes.js +67 -44
  105. package/dest/test/index.d.ts +2 -3
  106. package/dest/test/index.d.ts.map +1 -1
  107. package/dest/test/index.js +1 -2
  108. package/dest/test/recording_rpc_server.d.ts +18 -0
  109. package/dest/test/recording_rpc_server.d.ts.map +1 -0
  110. package/dest/test/recording_rpc_server.js +68 -0
  111. package/dest/test/rollup_cheat_codes.d.ts +60 -3
  112. package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
  113. package/dest/test/rollup_cheat_codes.js +86 -7
  114. package/dest/test/start_anvil.d.ts +23 -3
  115. package/dest/test/start_anvil.d.ts.map +1 -1
  116. package/dest/test/start_anvil.js +182 -32
  117. package/dest/test/upgrade_utils.js +2 -2
  118. package/dest/utils.d.ts +9 -2
  119. package/dest/utils.d.ts.map +1 -1
  120. package/dest/utils.js +59 -24
  121. package/package.json +6 -8
  122. package/src/client.ts +72 -2
  123. package/src/config.ts +58 -14
  124. package/src/contracts/chain_state_override.ts +200 -0
  125. package/src/contracts/fee_asset_price_oracle.ts +285 -0
  126. package/src/contracts/governance.ts +313 -13
  127. package/src/contracts/governance_proposer.ts +58 -9
  128. package/src/contracts/gse.ts +7 -2
  129. package/src/contracts/inbox.ts +13 -5
  130. package/src/contracts/index.ts +3 -2
  131. package/src/contracts/multicall.ts +243 -105
  132. package/src/contracts/outbox.ts +42 -8
  133. package/src/contracts/registry.ts +31 -1
  134. package/src/contracts/rollup.ts +507 -109
  135. package/src/contracts/{tally_slashing_proposer.ts → slashing_proposer.ts} +119 -45
  136. package/src/contracts/watch_event.ts +110 -0
  137. package/src/deploy_aztec_l1_contracts.ts +75 -39
  138. package/src/deploy_l1_contract.ts +3 -3
  139. package/src/foundry_binary.ts +57 -0
  140. package/src/generated/l1-contracts-defaults.ts +3 -3
  141. package/src/l1_artifacts.ts +12 -35
  142. package/src/l1_contract_addresses.ts +120 -94
  143. package/src/l1_reader.ts +17 -10
  144. package/src/l1_tx_utils/config.ts +23 -3
  145. package/src/l1_tx_utils/factory.ts +31 -31
  146. package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +1 -1
  147. package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +1 -1
  148. package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +43 -54
  149. package/src/l1_tx_utils/index-blobs.ts +2 -2
  150. package/src/l1_tx_utils/index.ts +1 -0
  151. package/src/l1_tx_utils/l1_tx_utils.ts +149 -64
  152. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +57 -17
  153. package/src/{test → l1_tx_utils}/tx_delayer.ts +93 -56
  154. package/src/publisher_manager.ts +143 -12
  155. package/src/queries.ts +70 -4
  156. package/src/test/blob_kzg_warmup.ts +65 -0
  157. package/src/test/chain_monitor.ts +148 -3
  158. package/src/test/eth_cheat_codes.ts +63 -47
  159. package/src/test/index.ts +1 -2
  160. package/src/test/recording_rpc_server.ts +69 -0
  161. package/src/test/rollup_cheat_codes.ts +115 -6
  162. package/src/test/start_anvil.ts +212 -32
  163. package/src/test/upgrade_utils.ts +2 -2
  164. package/src/utils.ts +56 -29
  165. package/dest/contracts/empire_slashing_proposer.d.ts +0 -67
  166. package/dest/contracts/empire_slashing_proposer.d.ts.map +0 -1
  167. package/dest/contracts/empire_slashing_proposer.js +0 -207
  168. package/dest/contracts/tally_slashing_proposer.d.ts +0 -140
  169. package/dest/contracts/tally_slashing_proposer.d.ts.map +0 -1
  170. package/dest/contracts/tally_slashing_proposer.js +0 -320
  171. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +0 -26
  172. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +0 -1
  173. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +0 -26
  174. package/dest/test/delayed_tx_utils.d.ts +0 -13
  175. package/dest/test/delayed_tx_utils.d.ts.map +0 -1
  176. package/dest/test/delayed_tx_utils.js +0 -28
  177. package/dest/test/tx_delayer.d.ts +0 -36
  178. package/dest/test/tx_delayer.d.ts.map +0 -1
  179. package/src/contracts/empire_slashing_proposer.ts +0 -259
  180. package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +0 -77
  181. package/src/test/delayed_tx_utils.ts +0 -52
@@ -1,5 +1,5 @@
1
1
  import { omit } from '@aztec/foundation/collection';
2
- import { type Logger, createLogger } from '@aztec/foundation/log';
2
+ import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
3
3
  import { retryUntil } from '@aztec/foundation/retry';
4
4
  import type { DateProvider } from '@aztec/foundation/timer';
5
5
 
@@ -9,14 +9,16 @@ import {
9
9
  type Hex,
10
10
  type PublicClient,
11
11
  type TransactionSerializableEIP4844,
12
+ type TransactionSerialized,
12
13
  keccak256,
13
14
  parseTransaction,
14
15
  publicActions,
16
+ recoverTransactionAddress,
15
17
  serializeTransaction,
16
18
  walletActions,
17
19
  } from 'viem';
18
20
 
19
- import { type ViemClient, isExtendedClient } from '../types.js';
21
+ import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
20
22
 
21
23
  const MAX_WAIT_TIME_SECONDS = 180;
22
24
 
@@ -73,82 +75,102 @@ export function waitUntilL1Timestamp<T extends Client>(
73
75
  );
74
76
  }
75
77
 
76
- export interface Delayer {
77
- /** Returns the hashes of all effectively sent txs. */
78
- getSentTxHashes(): Hex[];
79
- /** Returns the raw hex for all cancelled txs. */
80
- getCancelledTxs(): Hex[];
81
- /** Delays the next tx to be sent so it lands on the given L1 block number. */
82
- pauseNextTxUntilBlock(l1BlockNumber: number | bigint | undefined): void;
83
- /** Delays the next tx to be sent so it lands on the given timestamp. */
84
- pauseNextTxUntilTimestamp(l1Timestamp: number | bigint | undefined): void;
85
- /** Delays the next tx to be sent indefinitely. */
86
- cancelNextTx(): void;
87
- /**
88
- * Sets max inclusion time into slot. If more than this many seconds have passed
89
- * since the last L1 block was mined, then any tx will not be mined in the current
90
- * L1 slot but will be deferred for the next one.
91
- */
92
- setMaxInclusionTimeIntoSlot(seconds: number | bigint | undefined): void;
93
- }
78
+ /** Manages tx delaying for testing, intercepting sendRawTransaction calls to delay or cancel them. */
79
+ export class Delayer {
80
+ private logger: Logger;
81
+
82
+ public maxInclusionTimeIntoSlot: number | undefined = undefined;
83
+ public ethereumSlotDuration: bigint;
84
+ public nextWait:
85
+ | { l1Timestamp: bigint; timeoutSeconds?: number }
86
+ | { l1BlockNumber: bigint; timeoutSeconds?: number }
87
+ | { indefinitely: true }
88
+ | undefined = undefined;
89
+ public sentTxHashes: Hex[] = [];
90
+ public cancelledTxs: Hex[] = [];
94
91
 
95
- class DelayerImpl implements Delayer {
96
- private logger = createLogger('ethereum:tx_delayer');
97
92
  constructor(
98
93
  public dateProvider: DateProvider,
99
94
  opts: { ethereumSlotDuration: bigint | number },
95
+ bindings: LoggerBindings,
100
96
  ) {
101
97
  this.ethereumSlotDuration = BigInt(opts.ethereumSlotDuration);
98
+ this.logger = createLogger('ethereum:tx_delayer', bindings);
102
99
  }
103
100
 
104
- public maxInclusionTimeIntoSlot: number | undefined = undefined;
105
- public ethereumSlotDuration: bigint;
106
- public nextWait: { l1Timestamp: bigint } | { l1BlockNumber: bigint } | { indefinitely: true } | undefined = undefined;
107
- public sentTxHashes: Hex[] = [];
108
- public cancelledTxs: Hex[] = [];
101
+ /** Returns the logger instance used by this delayer. */
102
+ getLogger(): Logger {
103
+ return this.logger;
104
+ }
109
105
 
106
+ /** Returns the hashes of all effectively sent txs. */
110
107
  getSentTxHashes() {
111
108
  return this.sentTxHashes;
112
109
  }
113
110
 
111
+ /** Returns the raw hex for all cancelled txs. */
114
112
  getCancelledTxs(): Hex[] {
115
113
  return this.cancelledTxs;
116
114
  }
117
115
 
118
- pauseNextTxUntilBlock(l1BlockNumber: number | bigint) {
119
- this.nextWait = { l1BlockNumber: BigInt(l1BlockNumber) };
116
+ /** Delays the next tx to be sent so it lands on the given L1 block number. */
117
+ pauseNextTxUntilBlock(l1BlockNumber: number | bigint, timeoutSeconds?: number) {
118
+ this.nextWait = { l1BlockNumber: BigInt(l1BlockNumber), timeoutSeconds };
120
119
  }
121
120
 
122
- pauseNextTxUntilTimestamp(l1Timestamp: number | bigint) {
123
- this.nextWait = { l1Timestamp: BigInt(l1Timestamp) };
121
+ /** Delays the next tx to be sent so it lands on the given timestamp. */
122
+ pauseNextTxUntilTimestamp(l1Timestamp: number | bigint, timeoutSeconds?: number) {
123
+ this.nextWait = { l1Timestamp: BigInt(l1Timestamp), timeoutSeconds };
124
124
  }
125
125
 
126
+ /** Delays the next tx to be sent indefinitely. */
126
127
  cancelNextTx() {
127
128
  this.nextWait = { indefinitely: true };
128
129
  }
129
130
 
131
+ /**
132
+ * Sets max inclusion time into slot. If more than this many seconds have passed
133
+ * since the last L1 block was mined, then any tx will not be mined in the current
134
+ * L1 slot but will be deferred for the next one.
135
+ */
130
136
  setMaxInclusionTimeIntoSlot(seconds: number | undefined) {
131
137
  this.maxInclusionTimeIntoSlot = seconds;
132
138
  }
133
139
  }
134
140
 
135
141
  /**
136
- * Returns a new client (without modifying the one passed in) with an injected tx delayer.
137
- * The delayer can be used to hold off the next tx to be sent until a given block number.
138
- * TODO(#10824): This doesn't play along well with blob txs for some reason.
142
+ * Creates a new Delayer instance. Exposed so callers can create a single shared delayer
143
+ * and pass it to multiple `wrapClientWithDelayer` calls.
139
144
  */
140
- export function withDelayer<T extends ViemClient>(
141
- client: T,
145
+ export function createDelayer(
142
146
  dateProvider: DateProvider,
143
147
  opts: { ethereumSlotDuration: bigint | number },
144
- ): { client: T; delayer: Delayer } {
145
- if (!isExtendedClient(client)) {
146
- throw new Error('withDelayer has to be instantiated with a wallet viem client.');
148
+ bindings: LoggerBindings,
149
+ ): Delayer {
150
+ return new Delayer(dateProvider, opts, bindings);
151
+ }
152
+
153
+ /** Tries to recover the sender address from a serialized signed transaction. */
154
+ async function tryRecoverSender(serializedTransaction: Hex): Promise<string | undefined> {
155
+ try {
156
+ return await recoverTransactionAddress({
157
+ serializedTransaction: serializedTransaction as TransactionSerialized,
158
+ });
159
+ } catch {
160
+ return undefined;
147
161
  }
148
- const logger = createLogger('ethereum:tx_delayer');
149
- const delayer = new DelayerImpl(dateProvider, opts);
162
+ }
150
163
 
151
- const extended = client
164
+ /**
165
+ * Wraps a viem client with tx delaying logic. Returns the wrapped client.
166
+ * The delayer intercepts sendRawTransaction calls and delays them based on the delayer's state.
167
+ */
168
+ export function wrapClientWithDelayer<T extends ViemClient>(client: T, delayer: Delayer): T {
169
+ const logger = delayer.getLogger();
170
+
171
+ // Cast to ExtendedViemWalletClient for the extend chain since it has sendRawTransaction.
172
+ // The sendRawTransaction override is applied to all clients regardless of type.
173
+ const withRawTx = (client as unknown as ExtendedViemWalletClient)
152
174
  // Tweak sendRawTransaction so it uses the delay defined in the delayer.
153
175
  // Note that this will only work with local accounts (ie accounts for which we have the private key).
154
176
  // Transactions signed by the node will not be delayed since they use sendTransaction directly,
@@ -160,6 +182,7 @@ export function withDelayer<T extends ViemClient>(
160
182
 
161
183
  const { serializedTransaction } = args[0];
162
184
  const publicClient = client as unknown as PublicClient;
185
+ const sender = await tryRecoverSender(serializedTransaction);
163
186
 
164
187
  if (delayer.nextWait !== undefined) {
165
188
  // Check if we have been instructed to delay the next tx.
@@ -171,7 +194,7 @@ export function withDelayer<T extends ViemClient>(
171
194
 
172
195
  // Cancel tx outright if instructed
173
196
  if ('indefinitely' in waitUntil && waitUntil.indefinitely) {
174
- logger.info(`Cancelling tx ${txHash}`);
197
+ logger.info(`Cancelling tx ${txHash}`, { sender });
175
198
  delayer.cancelledTxs.push(serializedTransaction);
176
199
  return Promise.resolve(txHash);
177
200
  }
@@ -179,12 +202,18 @@ export function withDelayer<T extends ViemClient>(
179
202
  // Or wait until the desired block number or timestamp
180
203
  wait =
181
204
  'l1BlockNumber' in waitUntil
182
- ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger)
205
+ ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger, waitUntil.timeoutSeconds)
183
206
  : 'l1Timestamp' in waitUntil
184
- ? waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger)
207
+ ? waitUntilL1Timestamp(
208
+ publicClient,
209
+ waitUntil.l1Timestamp - delayer.ethereumSlotDuration,
210
+ logger,
211
+ waitUntil.timeoutSeconds,
212
+ )
185
213
  : undefined;
186
214
 
187
215
  logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`, {
216
+ sender,
188
217
  argsLen: args.length,
189
218
  ...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
190
219
  });
@@ -196,6 +225,7 @@ export function withDelayer<T extends ViemClient>(
196
225
 
197
226
  txHash = computeTxHash(serializedTransaction);
198
227
  const logData = {
228
+ sender,
199
229
  ...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
200
230
  lastBlockTimestamp,
201
231
  now,
@@ -225,28 +255,35 @@ export function withDelayer<T extends ViemClient>(
225
255
  computedTxHash: txHash,
226
256
  });
227
257
  }
228
- logger.info(`Sent previously delayed tx ${clientTxHash}`);
258
+ logger.info(`Sent previously delayed tx ${clientTxHash}`, { sender });
229
259
  delayer.sentTxHashes.push(clientTxHash);
230
260
  })
231
261
  .catch(err => logger.error(`Error sending tx after delay`, err));
232
262
  return Promise.resolve(txHash!);
233
263
  } else {
234
264
  const txHash = await client.sendRawTransaction(...args);
235
- logger.debug(`Sent tx immediately ${txHash}`);
265
+ logger.debug(`Sent tx immediately ${txHash}`, { sender });
236
266
  delayer.sentTxHashes.push(txHash);
237
267
  return txHash;
238
268
  }
239
269
  },
240
- }))
241
- // Re-extend with sendTransaction so it uses the modified sendRawTransaction.
242
- .extend(client => ({ sendTransaction: walletActions(client).sendTransaction }))
243
- // And with the actions that depend on the modified sendTransaction
244
- .extend(client => ({
245
- writeContract: walletActions(client).writeContract,
246
- deployContract: walletActions(client).deployContract,
247
- })) as T;
270
+ }));
271
+
272
+ // Only re-bind wallet actions (sendTransaction, writeContract, deployContract) for wallet clients.
273
+ // This is needed for tests that use wallet actions directly rather than sendRawTransaction.
274
+ const isWalletClient = 'account' in client && client.account !== undefined;
275
+ const extended = isWalletClient
276
+ ? withRawTx
277
+ // Re-extend with sendTransaction so it uses the modified sendRawTransaction.
278
+ .extend(client => ({ sendTransaction: walletActions(client).sendTransaction }))
279
+ // And with the actions that depend on the modified sendTransaction
280
+ .extend(client => ({
281
+ writeContract: walletActions(client).writeContract,
282
+ deployContract: walletActions(client).deployContract,
283
+ }))
284
+ : withRawTx;
248
285
 
249
- return { client: extended, delayer };
286
+ return extended as T;
250
287
  }
251
288
 
252
289
  /**
@@ -1,6 +1,8 @@
1
1
  import { pick } from '@aztec/foundation/collection';
2
2
  import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
3
+ import { RunningPromise } from '@aztec/foundation/running-promise';
3
4
 
5
+ import { Multicall3 } from './contracts/multicall.js';
4
6
  import { L1TxUtils, TxUtilsState } from './l1_tx_utils/index.js';
5
7
 
6
8
  // Defines the order in which we prioritise publishers based on their state (first is better)
@@ -27,24 +29,99 @@ const busyStates: TxUtilsState[] = [
27
29
 
28
30
  export type PublisherFilter<UtilsType extends L1TxUtils> = (utils: UtilsType) => boolean;
29
31
 
32
+ /** Config accepted by PublisherManager. */
33
+ type PublisherManagerConfig = {
34
+ publisherAllowInvalidStates?: boolean;
35
+ publisherFundingThreshold?: bigint;
36
+ publisherFundingAmount?: bigint;
37
+ };
38
+
30
39
  export class PublisherManager<UtilsType extends L1TxUtils = L1TxUtils> {
31
40
  private log: Logger;
32
- private config: { publisherAllowInvalidStates?: boolean };
41
+ private config: PublisherManagerConfig;
42
+ private static readonly FUNDING_CHECK_INTERVAL_MS = 2 * 60 * 1000;
43
+ protected funder?: UtilsType;
44
+ protected readonly fundingPromise?: RunningPromise;
45
+ private started = false;
33
46
 
34
47
  constructor(
35
- private publishers: UtilsType[],
36
- config: { publisherAllowInvalidStates?: boolean },
37
- bindings?: LoggerBindings,
48
+ protected publishers: UtilsType[],
49
+ config: PublisherManagerConfig,
50
+ opts?: { bindings?: LoggerBindings; funder?: UtilsType },
38
51
  ) {
39
- this.log = createLogger('publisher:manager', bindings);
52
+ this.funder = opts?.funder;
53
+ this.log = createLogger('publisher:manager', opts?.bindings);
40
54
  this.log.info(`PublisherManager initialized with ${publishers.length} publishers.`);
41
55
  this.publishers = publishers;
42
- this.config = pick(config, 'publisherAllowInvalidStates');
56
+ this.config = pick(config, 'publisherAllowInvalidStates', 'publisherFundingThreshold', 'publisherFundingAmount');
57
+
58
+ const hasThreshold = this.config.publisherFundingThreshold !== undefined;
59
+ const hasAmount = this.config.publisherFundingAmount !== undefined;
60
+ if (hasThreshold !== hasAmount) {
61
+ this.log.warn(`Incomplete funding config: both publisherFundingThreshold and publisherFundingAmount must be set`);
62
+ }
63
+
64
+ if (this.funder) {
65
+ const funderAddress = this.funder.getSenderAddress();
66
+ if (publishers.some(p => p.getSenderAddress().equals(funderAddress))) {
67
+ this.log.error(`Funding account ${funderAddress} is also a publisher, disabling funding to avoid self-funding`);
68
+ this.funder = undefined;
69
+ }
70
+ }
71
+
72
+ if (this.funder && hasThreshold && hasAmount) {
73
+ this.fundingPromise = new RunningPromise(
74
+ () => this.triggerFundingIfNeeded(),
75
+ this.log,
76
+ PublisherManager.FUNDING_CHECK_INTERVAL_MS,
77
+ );
78
+ }
79
+ }
80
+
81
+ /**
82
+ * Clears any interrupted flag left by a previous {@link stop} so publishing works again after a restart,
83
+ * loads the state of all publishers and the funder, and starts periodic funding checks. Idempotent: a
84
+ * start while already started is a no-op, so it never re-runs `loadStateAndResumeMonitoring` (which
85
+ * would spawn a duplicate background monitor per pending nonce). Lifecycle calls are expected to be
86
+ * serialized by the caller.
87
+ */
88
+ public async start(): Promise<void> {
89
+ if (this.started) {
90
+ this.log.debug('PublisherManager already started, ignoring start');
91
+ return;
92
+ }
93
+
94
+ // Clear the interrupted flag set by a previous stop() so a restarted manager can publish again.
95
+ // On a first start this is a no-op (the flag is already clear).
96
+ this.publishers.forEach(pub => pub.restart());
97
+ this.funder?.restart();
98
+
99
+ await Promise.all([
100
+ ...this.publishers.map(pub => pub.loadStateAndResumeMonitoring()),
101
+ this.funder?.loadStateAndResumeMonitoring(),
102
+ ]);
103
+
104
+ this.fundingPromise?.start();
105
+ // Marked started only once fully up, so a start that failed to load state can be retried.
106
+ this.started = true;
43
107
  }
44
108
 
45
- /** Loads the state of all publishers and resumes monitoring any pending txs */
46
- public async loadState(): Promise<void> {
47
- await Promise.all(this.publishers.map(pub => pub.loadStateAndResumeMonitoring()));
109
+ /**
110
+ * Stops the funding loop, interrupts all publishers so no further L1 txs are sent, and waits (bounded)
111
+ * for their in-flight tx monitor loops to wind down. Idempotent, and the manager may be restarted
112
+ * afterwards via {@link start}, which clears the interrupted flag.
113
+ */
114
+ public async stop(): Promise<void> {
115
+ this.started = false;
116
+ await this.fundingPromise?.stop();
117
+ this.publishers.forEach(pub => pub.interrupt());
118
+ this.funder?.interrupt();
119
+ // Wait for in-flight tx monitor loops to observe the interrupt, so no L1 requests are still
120
+ // being issued after shutdown (e.g. against an anvil instance a test is about to tear down).
121
+ await Promise.all([
122
+ ...this.publishers.map(pub => pub.waitMonitoringStopped()),
123
+ this.funder?.waitMonitoringStopped(),
124
+ ]);
48
125
  }
49
126
 
50
127
  // Finds and prioritises available publishers based on
@@ -83,8 +160,17 @@ export class PublisherManager<UtilsType extends L1TxUtils = L1TxUtils> {
83
160
  }),
84
161
  );
85
162
 
163
+ // Discount unfunded publishers: a publisher with no ETH cannot send a tx, so it must never win
164
+ // selection regardless of how favourable its state or last-used time is. Fall back to the full
165
+ // set only if every candidate is unfunded, so behaviour is no worse than before.
166
+ let fundedPublishers = publishersWithBalance.filter(p => p.balance > 0n);
167
+ if (fundedPublishers.length === 0) {
168
+ this.log.warn(`All candidate publishers have zero balance; selecting from unfunded publishers.`);
169
+ fundedPublishers = publishersWithBalance;
170
+ }
171
+
86
172
  // Sort based on state, then balance, then time since last use
87
- const sortedPublishers = publishersWithBalance.sort((a, b) => {
173
+ const sortedPublishers = fundedPublishers.sort((a, b) => {
88
174
  const stateComparison = sortOrder.indexOf(a.publisher.state) - sortOrder.indexOf(b.publisher.state);
89
175
  if (stateComparison !== 0) {
90
176
  return stateComparison;
@@ -102,7 +188,52 @@ export class PublisherManager<UtilsType extends L1TxUtils = L1TxUtils> {
102
188
  return sortedPublishers[0].publisher;
103
189
  }
104
190
 
105
- public interrupt() {
106
- this.publishers.forEach(pub => pub.interrupt());
191
+ /** Check all publisher balances and fund those below threshold. */
192
+ private async triggerFundingIfNeeded(): Promise<void> {
193
+ const { funder, config } = this;
194
+ if (!funder || config.publisherFundingThreshold === undefined || config.publisherFundingAmount === undefined) {
195
+ return;
196
+ }
197
+
198
+ const allBalances = await Promise.all(
199
+ this.publishers.map(async pub => ({ balance: await pub.getSenderBalance(), publisher: pub })),
200
+ );
201
+ const lowBalance = allBalances.filter(p => p.balance < config.publisherFundingThreshold!);
202
+ if (lowBalance.length === 0) {
203
+ return;
204
+ }
205
+
206
+ const fundingAmount = config.publisherFundingAmount!;
207
+ const funderBalance = await funder.getSenderBalance();
208
+
209
+ if (funderBalance < 10n * fundingAmount) {
210
+ this.log.warn(`Funding account balance is low`, { funderBalance, threshold: 10n * fundingAmount });
211
+ }
212
+ const affordableCount = Number(funderBalance / fundingAmount);
213
+ if (affordableCount === 0) {
214
+ this.log.error(`Funding account balance too low to fund any publisher`, { funderBalance, fundingAmount });
215
+ return;
216
+ }
217
+ if (affordableCount < lowBalance.length) {
218
+ this.log.warn(`Funder can only afford ${affordableCount}/${lowBalance.length} publishers`, {
219
+ funderBalance,
220
+ fundingAmount,
221
+ });
222
+ }
223
+
224
+ const toFund = lowBalance.slice(0, affordableCount).map(p => p.publisher);
225
+ await this.fundPublishers(toFund);
226
+ }
227
+
228
+ /** Fund publishers via a single Multicall3 aggregate3Value transaction. */
229
+ private async fundPublishers(publishers: UtilsType[]): Promise<void> {
230
+ const fundingAmount = this.config.publisherFundingAmount!;
231
+ const calls = publishers.map(pub => ({
232
+ to: pub.getSenderAddress().toString(),
233
+ value: fundingAmount,
234
+ }));
235
+
236
+ await Multicall3.forwardValue(calls, this.funder!, this.log);
237
+ this.log.info(`Funded ${publishers.length} publishers`);
107
238
  }
108
239
  }
package/src/queries.ts CHANGED
@@ -1,11 +1,77 @@
1
1
  import { EthAddress } from '@aztec/foundation/eth-address';
2
2
 
3
+ import { BaseError, type Block } from 'viem';
4
+
3
5
  import { DefaultL1ContractsConfig, type L1ContractsConfig } from './config.js';
4
6
  import { ReadOnlyGovernanceContract } from './contracts/governance.js';
5
7
  import { GovernanceProposerContract } from './contracts/governance_proposer.js';
6
8
  import { InboxContract } from './contracts/inbox.js';
7
9
  import { RollupContract } from './contracts/rollup.js';
8
- import type { ViemPublicClient } from './types.js';
10
+ import type { ViemClient, ViemPublicClient } from './types.js';
11
+
12
+ /**
13
+ * Returns the L1 finalized block, or `undefined` if the chain does not yet have one
14
+ * (common on freshly started devnets). Rethrows any other RPC error.
15
+ */
16
+ export async function getFinalizedL1Block(client: ViemClient): Promise<Block<bigint, false, 'finalized'> | undefined> {
17
+ try {
18
+ return await client.getBlock({ blockTag: 'finalized', includeTransactions: false });
19
+ } catch (err) {
20
+ if (isFinalizedBlockTagNotFoundError(err)) {
21
+ return undefined;
22
+ }
23
+ throw err;
24
+ }
25
+ }
26
+
27
+ // Error messages returned by popular Ethereum execution clients when
28
+ // eth_getBlockByNumber / eth_call is called with blockTag "finalized" or
29
+ // "safe" and no such block has been produced yet:
30
+ //
31
+ // geth "finalized block not found"
32
+ // "safe block not found"
33
+ // reth "block not found: finalized"
34
+ // "block not found: safe"
35
+ // nethermind "Unknown block error" (same for both tags)
36
+ // besu "Unknown block"
37
+ // erigon 'block "finalized" not available (head block: N)'
38
+ // 'block "safe" not available (head block: N)'
39
+ //
40
+ // A combined regex covers all five:
41
+ const FINALIZED_BLOCK_TAG_NOT_FOUND_MESSAGE_RE =
42
+ /(finalized|safe) block not found|block not found: (finalized|safe)|unknown block|block "(finalized|safe)" not available/i;
43
+
44
+ /**
45
+ * Returns true if the error originates from an RPC call that failed because
46
+ * the "finalized" (or "safe") block tag is not yet available on the chain.
47
+ */
48
+ export function isFinalizedBlockTagNotFoundError(err: unknown): boolean {
49
+ if (!err) {
50
+ return false;
51
+ }
52
+
53
+ if (err instanceof BaseError) {
54
+ const hit = err.walk((e: any) => matchesFinalizedBlockTagNotFound(e));
55
+ if (hit) {
56
+ return true;
57
+ }
58
+ }
59
+
60
+ for (let cur: any = err, i = 0; cur && i < 10; cur = cur.cause, i++) {
61
+ if (matchesFinalizedBlockTagNotFound(cur)) {
62
+ return true;
63
+ }
64
+ }
65
+ return false;
66
+ }
67
+
68
+ function matchesFinalizedBlockTagNotFound(e: any): boolean {
69
+ if (!e) {
70
+ return false;
71
+ }
72
+ const text = `${e.details ?? ''} ${e.message ?? ''} ${e.shortMessage ?? ''}`;
73
+ return FINALIZED_BLOCK_TAG_NOT_FOUND_MESSAGE_RE.test(text);
74
+ }
9
75
 
10
76
  /** Reads the L1ContractsConfig from L1 contracts. */
11
77
  export async function getL1ContractsConfig(
@@ -76,8 +142,8 @@ export async function getL1ContractsConfig(
76
142
  slasherProposer?.getRoundSize() ?? 0n,
77
143
  slasherProposer?.getLifetimeInRounds() ?? 0n,
78
144
  slasherProposer?.getExecutionDelayInRounds() ?? 0n,
79
- slasherProposer?.type === 'tally' ? slasherProposer.getSlashOffsetInRounds() : 0n,
80
- slasherProposer?.type === 'tally' ? slasherProposer.getSlashingAmounts() : [0n, 0n, 0n],
145
+ slasherProposer?.getSlashOffsetInRounds() ?? 0n,
146
+ slasherProposer?.getSlashingAmounts() ?? [0n, 0n, 0n],
81
147
  slasher?.getVetoer() ?? EthAddress.ZERO,
82
148
  slasher?.getSlashingDisableDuration() ?? 0,
83
149
  rollup.getManaTarget(),
@@ -114,7 +180,7 @@ export async function getL1ContractsConfig(
114
180
  rollupVersion: Number(rollupVersion),
115
181
  genesisArchiveTreeRoot: genesisArchiveTreeRoot.toString(),
116
182
  exitDelaySeconds: Number(exitDelay),
117
- slasherFlavor: slasherProposer?.type ?? 'tally',
183
+ slasherEnabled: !!slasherProposer,
118
184
  slashingOffsetInRounds: Number(slashingOffsetInRounds),
119
185
  slashAmountSmall: slashingAmounts[0],
120
186
  slashAmountMedium: slashingAmounts[1],
@@ -0,0 +1,65 @@
1
+ import { getBytesPerBlob, getBytesPerCommitment, getKzg } from '@aztec/blob-lib';
2
+ import type { Logger } from '@aztec/foundation/log';
3
+
4
+ import type { ExtendedViemWalletClient } from '../types.js';
5
+
6
+ /**
7
+ * Warms both KZG trusted setups in parallel for tests against a local anvil:
8
+ * - anvil's own setup, loaded lazily when it first validates a blob sidecar in `eth_sendRawTransaction`
9
+ * - our `@crate-crypto/node-eth-kzg` singleton (`getKzg()`, a ~2.2s synchronous precomp build)
10
+ *
11
+ * Without this, the first checkpoint publish pays both serially (~4.4s). The recipe does all RPC round
12
+ * trips up front, fires a single bare raw send carrying a fake (garbage) blob sidecar that anvil rejects
13
+ * after loading its trusted setup, yields once to flush the socket write, then synchronously builds our
14
+ * own precomp tables while anvil warms in parallel. The fake tx is rejected at admission, so it never
15
+ * enters the pool, mines no block, and burns no nonce — sending it from the passed client is harmless.
16
+ *
17
+ * Best-effort: any failure is debug-logged and swallowed, leaving lazy init as the fallback. Never throws.
18
+ *
19
+ * @param l1Client - The L1 client whose account sends the (rejected) warm-up blob tx.
20
+ */
21
+ export async function warmBlobKzg(l1Client: ExtendedViemWalletClient, logger?: Logger): Promise<void> {
22
+ try {
23
+ // A pure-JS fake kzg: returns deterministic garbage of the correct lengths (commitment and proof are
24
+ // both 48 bytes). It makes viem build a syntactically valid sidecar without initializing any native
25
+ // module, so anvil loads its trusted setup to validate the (invalid) proof and then rejects the tx.
26
+ const fakeKzg = {
27
+ blobToKzgCommitment: () => {
28
+ const commitment = new Uint8Array(getBytesPerCommitment());
29
+ commitment.fill(0xab);
30
+ commitment[0] = 0xc0;
31
+ return commitment;
32
+ },
33
+ computeBlobKzgProof: () => {
34
+ const proof = new Uint8Array(getBytesPerCommitment());
35
+ proof.fill(0xcd);
36
+ proof[0] = 0xc0;
37
+ return proof;
38
+ },
39
+ };
40
+
41
+ // All RPC round trips (nonce, fees, gas) happen here, so only a single socket write remains to flush.
42
+ const prepared = await l1Client.prepareTransactionRequest({
43
+ blobs: [new Uint8Array(getBytesPerBlob())],
44
+ kzg: fakeKzg,
45
+ to: '0x0000000000000000000000000000000000000000',
46
+ value: 0n,
47
+ maxFeePerBlobGas: 1_000_000_000_000n,
48
+ });
49
+ const serialized = await l1Client.signTransaction(prepared);
50
+
51
+ // Fire the raw send without awaiting and swallow the expected rejection.
52
+ const sent = l1Client.request({ method: 'eth_sendRawTransaction', params: [serialized] }).catch(() => {});
53
+
54
+ // Flush the single socket write so anvil receives the tx and starts loading its trusted setup in its
55
+ // own process before we block the event loop below.
56
+ await new Promise(resolve => setImmediate(resolve));
57
+
58
+ // Synchronously build our precomp tables (~2.2s, event-loop-blocking); anvil warms in parallel.
59
+ getKzg();
60
+
61
+ await sent;
62
+ } catch (err) {
63
+ logger?.debug('Failed to warm blob KZG; falling back to lazy init', { err });
64
+ }
65
+ }