@aztec/ethereum 3.0.3 → 3.9.9-nightly.20260312
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/client.js +6 -2
- package/dest/config.d.ts +19 -27
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +60 -55
- package/dest/contracts/empire_base.d.ts +4 -1
- package/dest/contracts/empire_base.d.ts.map +1 -1
- package/dest/contracts/empire_slashing_proposer.d.ts +4 -1
- package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -1
- package/dest/contracts/empire_slashing_proposer.js +31 -15
- package/dest/contracts/fee_asset_handler.d.ts +6 -5
- package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
- package/dest/contracts/fee_asset_handler.js +11 -9
- package/dest/contracts/fee_asset_price_oracle.d.ts +101 -0
- package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -0
- package/dest/contracts/fee_asset_price_oracle.js +651 -0
- package/dest/contracts/governance.d.ts +3 -1
- package/dest/contracts/governance.d.ts.map +1 -1
- package/dest/contracts/governance.js +14 -4
- package/dest/contracts/governance_proposer.d.ts +4 -1
- package/dest/contracts/governance_proposer.d.ts.map +1 -1
- package/dest/contracts/governance_proposer.js +404 -9
- package/dest/contracts/inbox.d.ts +22 -1
- package/dest/contracts/inbox.d.ts.map +1 -1
- package/dest/contracts/inbox.js +36 -1
- package/dest/contracts/index.d.ts +4 -1
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +3 -0
- package/dest/contracts/log.d.ts +13 -0
- package/dest/contracts/log.d.ts.map +1 -0
- package/dest/contracts/log.js +1 -0
- package/dest/contracts/multicall.d.ts +1 -1
- package/dest/contracts/multicall.d.ts.map +1 -1
- package/dest/contracts/multicall.js +2 -1
- package/dest/contracts/outbox.d.ts +41 -0
- package/dest/contracts/outbox.d.ts.map +1 -0
- package/dest/contracts/outbox.js +86 -0
- package/dest/contracts/registry.d.ts +3 -1
- package/dest/contracts/registry.d.ts.map +1 -1
- package/dest/contracts/registry.js +30 -1
- package/dest/contracts/rollup.d.ts +163 -81
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +703 -132
- package/dest/contracts/tally_slashing_proposer.d.ts +1 -1
- package/dest/contracts/tally_slashing_proposer.d.ts.map +1 -1
- package/dest/contracts/tally_slashing_proposer.js +8 -1
- package/dest/deploy_aztec_l1_contracts.d.ts +18 -4
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.js +117 -35
- package/dest/deploy_l1_contract.js +3 -3
- package/dest/generated/l1-contracts-defaults.d.ts +30 -0
- package/dest/generated/l1-contracts-defaults.d.ts.map +1 -0
- package/dest/generated/l1-contracts-defaults.js +30 -0
- package/dest/l1_artifacts.d.ts +5975 -1575
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_contract_addresses.d.ts +1 -1
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +3 -3
- package/dest/l1_tx_utils/config.d.ts +7 -1
- package/dest/l1_tx_utils/config.d.ts.map +1 -1
- package/dest/l1_tx_utils/config.js +14 -1
- package/dest/l1_tx_utils/constants.d.ts +8 -2
- package/dest/l1_tx_utils/constants.d.ts.map +1 -1
- package/dest/l1_tx_utils/constants.js +27 -2
- package/dest/l1_tx_utils/factory.d.ts +18 -10
- package/dest/l1_tx_utils/factory.d.ts.map +1 -1
- package/dest/l1_tx_utils/factory.js +17 -7
- package/dest/l1_tx_utils/fee-strategies/index.d.ts +10 -0
- package/dest/l1_tx_utils/fee-strategies/index.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/index.js +12 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts +8 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +129 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts +23 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +191 -0
- package/dest/l1_tx_utils/fee-strategies/types.d.ts +51 -0
- package/dest/l1_tx_utils/fee-strategies/types.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/types.js +3 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +15 -15
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +9 -15
- package/dest/l1_tx_utils/index-blobs.d.ts +3 -3
- package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -1
- package/dest/l1_tx_utils/index-blobs.js +2 -2
- package/dest/l1_tx_utils/index.d.ts +4 -1
- package/dest/l1_tx_utils/index.d.ts.map +1 -1
- package/dest/l1_tx_utils/index.js +3 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts +233 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts.map +1 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.js +506 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +18 -7
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_tx_utils.js +58 -42
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +4 -15
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +43 -147
- package/dest/l1_tx_utils/tx_delayer.d.ts +56 -0
- package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -0
- package/dest/{test → l1_tx_utils}/tx_delayer.js +62 -34
- package/dest/publisher_manager.d.ts +3 -2
- package/dest/publisher_manager.d.ts.map +1 -1
- package/dest/publisher_manager.js +2 -2
- package/dest/queries.d.ts +2 -2
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +12 -4
- package/dest/test/chain_monitor.js +1 -2
- package/dest/test/eth_cheat_codes.d.ts +13 -1
- package/dest/test/eth_cheat_codes.d.ts.map +1 -1
- package/dest/test/eth_cheat_codes.js +3 -1
- package/dest/test/index.d.ts +1 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +0 -2
- package/dest/test/rollup_cheat_codes.d.ts +5 -2
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +22 -3
- package/dest/test/start_anvil.js +1 -1
- package/dest/test/upgrade_utils.js +2 -2
- package/dest/utils.d.ts +15 -2
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +64 -0
- package/package.json +9 -7
- package/src/client.ts +2 -2
- package/src/config.ts +76 -54
- package/src/contracts/README.md +157 -0
- package/src/contracts/empire_base.ts +3 -1
- package/src/contracts/empire_slashing_proposer.ts +28 -28
- package/src/contracts/fee_asset_handler.ts +10 -7
- package/src/contracts/fee_asset_price_oracle.ts +280 -0
- package/src/contracts/governance.ts +13 -4
- package/src/contracts/governance_proposer.ts +16 -2
- package/src/contracts/inbox.ts +53 -1
- package/src/contracts/index.ts +3 -0
- package/src/contracts/log.ts +13 -0
- package/src/contracts/multicall.ts +5 -2
- package/src/contracts/outbox.ts +98 -0
- package/src/contracts/registry.ts +31 -1
- package/src/contracts/rollup.ts +382 -94
- package/src/contracts/tally_slashing_proposer.ts +5 -1
- package/src/deploy_aztec_l1_contracts.ts +147 -44
- package/src/deploy_l1_contract.ts +3 -3
- package/src/generated/l1-contracts-defaults.ts +32 -0
- package/src/l1_contract_addresses.ts +22 -20
- package/src/l1_tx_utils/config.ts +20 -0
- package/src/l1_tx_utils/constants.ts +13 -2
- package/src/l1_tx_utils/factory.ts +31 -31
- package/src/l1_tx_utils/fee-strategies/index.ts +22 -0
- package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +163 -0
- package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +245 -0
- package/src/l1_tx_utils/fee-strategies/types.ts +56 -0
- package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +43 -54
- package/src/l1_tx_utils/index-blobs.ts +2 -2
- package/src/l1_tx_utils/index.ts +3 -0
- package/src/l1_tx_utils/l1_fee_analyzer.ts +803 -0
- package/src/l1_tx_utils/l1_tx_utils.ts +60 -32
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +56 -190
- package/src/{test → l1_tx_utils}/tx_delayer.ts +78 -50
- package/src/publisher_manager.ts +4 -2
- package/src/queries.ts +11 -3
- package/src/test/chain_monitor.ts +1 -1
- package/src/test/eth_cheat_codes.ts +1 -1
- package/src/test/index.ts +0 -2
- package/src/test/rollup_cheat_codes.ts +22 -4
- package/src/test/start_anvil.ts +1 -1
- package/src/test/upgrade_utils.ts +2 -2
- package/src/utils.ts +82 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +0 -26
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +0 -1
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +0 -26
- package/dest/test/delayed_tx_utils.d.ts +0 -13
- package/dest/test/delayed_tx_utils.d.ts.map +0 -1
- package/dest/test/delayed_tx_utils.js +0 -28
- package/dest/test/tx_delayer.d.ts +0 -36
- package/dest/test/tx_delayer.d.ts.map +0 -1
- package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +0 -77
- 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 {
|
|
21
|
+
import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
|
|
20
22
|
|
|
21
23
|
const MAX_WAIT_TIME_SECONDS = 180;
|
|
22
24
|
|
|
@@ -73,82 +75,98 @@ export function waitUntilL1Timestamp<T extends Client>(
|
|
|
73
75
|
);
|
|
74
76
|
}
|
|
75
77
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
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: { l1Timestamp: bigint } | { l1BlockNumber: bigint } | { indefinitely: true } | undefined = undefined;
|
|
85
|
+
public sentTxHashes: Hex[] = [];
|
|
86
|
+
public cancelledTxs: Hex[] = [];
|
|
94
87
|
|
|
95
|
-
class DelayerImpl implements Delayer {
|
|
96
|
-
private logger = createLogger('ethereum:tx_delayer');
|
|
97
88
|
constructor(
|
|
98
89
|
public dateProvider: DateProvider,
|
|
99
90
|
opts: { ethereumSlotDuration: bigint | number },
|
|
91
|
+
bindings: LoggerBindings,
|
|
100
92
|
) {
|
|
101
93
|
this.ethereumSlotDuration = BigInt(opts.ethereumSlotDuration);
|
|
94
|
+
this.logger = createLogger('ethereum:tx_delayer', bindings);
|
|
102
95
|
}
|
|
103
96
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
public cancelledTxs: Hex[] = [];
|
|
97
|
+
/** Returns the logger instance used by this delayer. */
|
|
98
|
+
getLogger(): Logger {
|
|
99
|
+
return this.logger;
|
|
100
|
+
}
|
|
109
101
|
|
|
102
|
+
/** Returns the hashes of all effectively sent txs. */
|
|
110
103
|
getSentTxHashes() {
|
|
111
104
|
return this.sentTxHashes;
|
|
112
105
|
}
|
|
113
106
|
|
|
107
|
+
/** Returns the raw hex for all cancelled txs. */
|
|
114
108
|
getCancelledTxs(): Hex[] {
|
|
115
109
|
return this.cancelledTxs;
|
|
116
110
|
}
|
|
117
111
|
|
|
112
|
+
/** Delays the next tx to be sent so it lands on the given L1 block number. */
|
|
118
113
|
pauseNextTxUntilBlock(l1BlockNumber: number | bigint) {
|
|
119
114
|
this.nextWait = { l1BlockNumber: BigInt(l1BlockNumber) };
|
|
120
115
|
}
|
|
121
116
|
|
|
117
|
+
/** Delays the next tx to be sent so it lands on the given timestamp. */
|
|
122
118
|
pauseNextTxUntilTimestamp(l1Timestamp: number | bigint) {
|
|
123
119
|
this.nextWait = { l1Timestamp: BigInt(l1Timestamp) };
|
|
124
120
|
}
|
|
125
121
|
|
|
122
|
+
/** Delays the next tx to be sent indefinitely. */
|
|
126
123
|
cancelNextTx() {
|
|
127
124
|
this.nextWait = { indefinitely: true };
|
|
128
125
|
}
|
|
129
126
|
|
|
127
|
+
/**
|
|
128
|
+
* Sets max inclusion time into slot. If more than this many seconds have passed
|
|
129
|
+
* since the last L1 block was mined, then any tx will not be mined in the current
|
|
130
|
+
* L1 slot but will be deferred for the next one.
|
|
131
|
+
*/
|
|
130
132
|
setMaxInclusionTimeIntoSlot(seconds: number | undefined) {
|
|
131
133
|
this.maxInclusionTimeIntoSlot = seconds;
|
|
132
134
|
}
|
|
133
135
|
}
|
|
134
136
|
|
|
135
137
|
/**
|
|
136
|
-
*
|
|
137
|
-
*
|
|
138
|
-
* TODO(#10824): This doesn't play along well with blob txs for some reason.
|
|
138
|
+
* Creates a new Delayer instance. Exposed so callers can create a single shared delayer
|
|
139
|
+
* and pass it to multiple `wrapClientWithDelayer` calls.
|
|
139
140
|
*/
|
|
140
|
-
export function
|
|
141
|
-
client: T,
|
|
141
|
+
export function createDelayer(
|
|
142
142
|
dateProvider: DateProvider,
|
|
143
143
|
opts: { ethereumSlotDuration: bigint | number },
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
144
|
+
bindings: LoggerBindings,
|
|
145
|
+
): Delayer {
|
|
146
|
+
return new Delayer(dateProvider, opts, bindings);
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/** Tries to recover the sender address from a serialized signed transaction. */
|
|
150
|
+
async function tryRecoverSender(serializedTransaction: Hex): Promise<string | undefined> {
|
|
151
|
+
try {
|
|
152
|
+
return await recoverTransactionAddress({
|
|
153
|
+
serializedTransaction: serializedTransaction as TransactionSerialized,
|
|
154
|
+
});
|
|
155
|
+
} catch {
|
|
156
|
+
return undefined;
|
|
147
157
|
}
|
|
148
|
-
|
|
149
|
-
const delayer = new DelayerImpl(dateProvider, opts);
|
|
158
|
+
}
|
|
150
159
|
|
|
151
|
-
|
|
160
|
+
/**
|
|
161
|
+
* Wraps a viem client with tx delaying logic. Returns the wrapped client.
|
|
162
|
+
* The delayer intercepts sendRawTransaction calls and delays them based on the delayer's state.
|
|
163
|
+
*/
|
|
164
|
+
export function wrapClientWithDelayer<T extends ViemClient>(client: T, delayer: Delayer): T {
|
|
165
|
+
const logger = delayer.getLogger();
|
|
166
|
+
|
|
167
|
+
// Cast to ExtendedViemWalletClient for the extend chain since it has sendRawTransaction.
|
|
168
|
+
// The sendRawTransaction override is applied to all clients regardless of type.
|
|
169
|
+
const withRawTx = (client as unknown as ExtendedViemWalletClient)
|
|
152
170
|
// Tweak sendRawTransaction so it uses the delay defined in the delayer.
|
|
153
171
|
// Note that this will only work with local accounts (ie accounts for which we have the private key).
|
|
154
172
|
// Transactions signed by the node will not be delayed since they use sendTransaction directly,
|
|
@@ -160,6 +178,7 @@ export function withDelayer<T extends ViemClient>(
|
|
|
160
178
|
|
|
161
179
|
const { serializedTransaction } = args[0];
|
|
162
180
|
const publicClient = client as unknown as PublicClient;
|
|
181
|
+
const sender = await tryRecoverSender(serializedTransaction);
|
|
163
182
|
|
|
164
183
|
if (delayer.nextWait !== undefined) {
|
|
165
184
|
// Check if we have been instructed to delay the next tx.
|
|
@@ -171,7 +190,7 @@ export function withDelayer<T extends ViemClient>(
|
|
|
171
190
|
|
|
172
191
|
// Cancel tx outright if instructed
|
|
173
192
|
if ('indefinitely' in waitUntil && waitUntil.indefinitely) {
|
|
174
|
-
logger.info(`Cancelling tx ${txHash}
|
|
193
|
+
logger.info(`Cancelling tx ${txHash}`, { sender });
|
|
175
194
|
delayer.cancelledTxs.push(serializedTransaction);
|
|
176
195
|
return Promise.resolve(txHash);
|
|
177
196
|
}
|
|
@@ -185,6 +204,7 @@ export function withDelayer<T extends ViemClient>(
|
|
|
185
204
|
: undefined;
|
|
186
205
|
|
|
187
206
|
logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`, {
|
|
207
|
+
sender,
|
|
188
208
|
argsLen: args.length,
|
|
189
209
|
...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
|
|
190
210
|
});
|
|
@@ -196,6 +216,7 @@ export function withDelayer<T extends ViemClient>(
|
|
|
196
216
|
|
|
197
217
|
txHash = computeTxHash(serializedTransaction);
|
|
198
218
|
const logData = {
|
|
219
|
+
sender,
|
|
199
220
|
...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
|
|
200
221
|
lastBlockTimestamp,
|
|
201
222
|
now,
|
|
@@ -225,28 +246,35 @@ export function withDelayer<T extends ViemClient>(
|
|
|
225
246
|
computedTxHash: txHash,
|
|
226
247
|
});
|
|
227
248
|
}
|
|
228
|
-
logger.info(`Sent previously delayed tx ${clientTxHash}
|
|
249
|
+
logger.info(`Sent previously delayed tx ${clientTxHash}`, { sender });
|
|
229
250
|
delayer.sentTxHashes.push(clientTxHash);
|
|
230
251
|
})
|
|
231
252
|
.catch(err => logger.error(`Error sending tx after delay`, err));
|
|
232
253
|
return Promise.resolve(txHash!);
|
|
233
254
|
} else {
|
|
234
255
|
const txHash = await client.sendRawTransaction(...args);
|
|
235
|
-
logger.
|
|
256
|
+
logger.debug(`Sent tx immediately ${txHash}`, { sender });
|
|
236
257
|
delayer.sentTxHashes.push(txHash);
|
|
237
258
|
return txHash;
|
|
238
259
|
}
|
|
239
260
|
},
|
|
240
|
-
}))
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
261
|
+
}));
|
|
262
|
+
|
|
263
|
+
// Only re-bind wallet actions (sendTransaction, writeContract, deployContract) for wallet clients.
|
|
264
|
+
// This is needed for tests that use wallet actions directly rather than sendRawTransaction.
|
|
265
|
+
const isWalletClient = 'account' in client && client.account !== undefined;
|
|
266
|
+
const extended = isWalletClient
|
|
267
|
+
? withRawTx
|
|
268
|
+
// Re-extend with sendTransaction so it uses the modified sendRawTransaction.
|
|
269
|
+
.extend(client => ({ sendTransaction: walletActions(client).sendTransaction }))
|
|
270
|
+
// And with the actions that depend on the modified sendTransaction
|
|
271
|
+
.extend(client => ({
|
|
272
|
+
writeContract: walletActions(client).writeContract,
|
|
273
|
+
deployContract: walletActions(client).deployContract,
|
|
274
|
+
}))
|
|
275
|
+
: withRawTx;
|
|
248
276
|
|
|
249
|
-
return
|
|
277
|
+
return extended as T;
|
|
250
278
|
}
|
|
251
279
|
|
|
252
280
|
/**
|
package/src/publisher_manager.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { pick } from '@aztec/foundation/collection';
|
|
2
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
+
import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
|
|
3
3
|
|
|
4
4
|
import { L1TxUtils, TxUtilsState } from './l1_tx_utils/index.js';
|
|
5
5
|
|
|
@@ -28,13 +28,15 @@ const busyStates: TxUtilsState[] = [
|
|
|
28
28
|
export type PublisherFilter<UtilsType extends L1TxUtils> = (utils: UtilsType) => boolean;
|
|
29
29
|
|
|
30
30
|
export class PublisherManager<UtilsType extends L1TxUtils = L1TxUtils> {
|
|
31
|
-
private log
|
|
31
|
+
private log: Logger;
|
|
32
32
|
private config: { publisherAllowInvalidStates?: boolean };
|
|
33
33
|
|
|
34
34
|
constructor(
|
|
35
35
|
private publishers: UtilsType[],
|
|
36
36
|
config: { publisherAllowInvalidStates?: boolean },
|
|
37
|
+
bindings?: LoggerBindings,
|
|
37
38
|
) {
|
|
39
|
+
this.log = createLogger('publisher:manager', bindings);
|
|
38
40
|
this.log.info(`PublisherManager initialized with ${publishers.length} publishers.`);
|
|
39
41
|
this.publishers = publishers;
|
|
40
42
|
this.config = pick(config, 'publisherAllowInvalidStates');
|
package/src/queries.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
2
|
|
|
3
|
-
import type
|
|
3
|
+
import { DefaultL1ContractsConfig, type L1ContractsConfig } from './config.js';
|
|
4
4
|
import { ReadOnlyGovernanceContract } from './contracts/governance.js';
|
|
5
5
|
import { GovernanceProposerContract } from './contracts/governance_proposer.js';
|
|
6
|
+
import { InboxContract } from './contracts/inbox.js';
|
|
6
7
|
import { RollupContract } from './contracts/rollup.js';
|
|
7
8
|
import type { ViemPublicClient } from './types.js';
|
|
8
9
|
|
|
@@ -25,6 +26,8 @@ export async function getL1ContractsConfig(
|
|
|
25
26
|
const rollup = new RollupContract(publicClient, rollupAddress.toString());
|
|
26
27
|
const slasherProposer = await rollup.getSlashingProposer();
|
|
27
28
|
const slasher = await rollup.getSlasherContract();
|
|
29
|
+
const rollupAddresses = await rollup.getRollupAddresses();
|
|
30
|
+
const inboxContract = new InboxContract(publicClient, rollupAddresses.inboxAddress.toString());
|
|
28
31
|
|
|
29
32
|
const [
|
|
30
33
|
l1StartBlock,
|
|
@@ -35,6 +38,7 @@ export async function getL1ContractsConfig(
|
|
|
35
38
|
aztecTargetCommitteeSize,
|
|
36
39
|
lagInEpochsForValidatorSet,
|
|
37
40
|
lagInEpochsForRandao,
|
|
41
|
+
inboxLag,
|
|
38
42
|
activationThreshold,
|
|
39
43
|
ejectionThreshold,
|
|
40
44
|
localEjectionThreshold,
|
|
@@ -62,6 +66,7 @@ export async function getL1ContractsConfig(
|
|
|
62
66
|
rollup.getTargetCommitteeSize(),
|
|
63
67
|
rollup.getLagInEpochsForValidatorSet(),
|
|
64
68
|
rollup.getLagInEpochsForRandao(),
|
|
69
|
+
inboxContract.getLag(),
|
|
65
70
|
rollup.getActivationThreshold(),
|
|
66
71
|
rollup.getEjectionThreshold(),
|
|
67
72
|
rollup.getLocalEjectionThreshold(),
|
|
@@ -91,13 +96,15 @@ export async function getL1ContractsConfig(
|
|
|
91
96
|
aztecTargetCommitteeSize: Number(aztecTargetCommitteeSize),
|
|
92
97
|
lagInEpochsForValidatorSet: Number(lagInEpochsForValidatorSet),
|
|
93
98
|
lagInEpochsForRandao: Number(lagInEpochsForRandao),
|
|
99
|
+
inboxLag: Number(inboxLag),
|
|
94
100
|
governanceProposerQuorum: Number(governanceProposerQuorum),
|
|
95
101
|
governanceProposerRoundSize: Number(governanceProposerRoundSize),
|
|
102
|
+
governanceVotingDuration: DefaultL1ContractsConfig.governanceVotingDuration,
|
|
96
103
|
activationThreshold,
|
|
97
104
|
ejectionThreshold,
|
|
98
105
|
localEjectionThreshold,
|
|
99
106
|
slashingQuorum: Number(slashingQuorum),
|
|
100
|
-
slashingRoundSizeInEpochs: Number(slashingRoundSize / aztecEpochDuration),
|
|
107
|
+
slashingRoundSizeInEpochs: Number(Number(slashingRoundSize) / aztecEpochDuration),
|
|
101
108
|
slashingLifetimeInRounds: Number(slashingLifetimeInRounds),
|
|
102
109
|
slashingExecutionDelayInRounds: Number(slashingExecutionDelayInRounds),
|
|
103
110
|
slashingVetoer,
|
|
@@ -105,12 +112,13 @@ export async function getL1ContractsConfig(
|
|
|
105
112
|
manaTarget,
|
|
106
113
|
provingCostPerMana: provingCostPerMana,
|
|
107
114
|
rollupVersion: Number(rollupVersion),
|
|
108
|
-
genesisArchiveTreeRoot,
|
|
115
|
+
genesisArchiveTreeRoot: genesisArchiveTreeRoot.toString(),
|
|
109
116
|
exitDelaySeconds: Number(exitDelay),
|
|
110
117
|
slasherFlavor: slasherProposer?.type ?? 'tally',
|
|
111
118
|
slashingOffsetInRounds: Number(slashingOffsetInRounds),
|
|
112
119
|
slashAmountSmall: slashingAmounts[0],
|
|
113
120
|
slashAmountMedium: slashingAmounts[1],
|
|
114
121
|
slashAmountLarge: slashingAmounts[2],
|
|
122
|
+
initialEthPerFeeAsset: DefaultL1ContractsConfig.initialEthPerFeeAsset,
|
|
115
123
|
};
|
|
116
124
|
}
|
|
@@ -156,7 +156,7 @@ export class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
|
|
|
156
156
|
let committee: EthAddress[] | undefined;
|
|
157
157
|
if (l2Epoch !== this.l2EpochNumber) {
|
|
158
158
|
this.l2EpochNumber = l2Epoch;
|
|
159
|
-
committee =
|
|
159
|
+
committee = await this.rollup.getCurrentEpochCommittee();
|
|
160
160
|
this.emit('l2-epoch', { l2EpochNumber: l2Epoch, timestamp, committee });
|
|
161
161
|
msg += ` starting new epoch ${this.l2EpochNumber} `;
|
|
162
162
|
}
|
|
@@ -35,7 +35,7 @@ export class EthCheatCodes {
|
|
|
35
35
|
public chain: Chain = foundry,
|
|
36
36
|
) {
|
|
37
37
|
this.publicClient = createPublicClient({
|
|
38
|
-
transport: fallback(this.rpcUrls.map(url => http(url))),
|
|
38
|
+
transport: fallback(this.rpcUrls.map(url => http(url, { batch: false }))),
|
|
39
39
|
chain: chain,
|
|
40
40
|
});
|
|
41
41
|
}
|
package/src/test/index.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
export * from './delayed_tx_utils.js';
|
|
2
1
|
export * from './eth_cheat_codes.js';
|
|
3
2
|
export * from './eth_cheat_codes_with_state.js';
|
|
4
3
|
export * from './start_anvil.js';
|
|
5
|
-
export * from './tx_delayer.js';
|
|
6
4
|
export * from './upgrade_utils.js';
|
|
7
5
|
export * from './chain_monitor.js';
|
|
8
6
|
export * from './rollup_cheat_codes.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
1
|
+
import { OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
2
2
|
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
3
3
|
import type { ViemPublicClient } from '@aztec/ethereum/types';
|
|
4
4
|
import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
@@ -32,7 +32,7 @@ export class RollupCheatCodes {
|
|
|
32
32
|
) {
|
|
33
33
|
this.client = createPublicClient({
|
|
34
34
|
chain: ethCheatCodes.chain,
|
|
35
|
-
transport: fallback(ethCheatCodes.rpcUrls.map(url => http(url))),
|
|
35
|
+
transport: fallback(ethCheatCodes.rpcUrls.map(url => http(url, { batch: false }))),
|
|
36
36
|
});
|
|
37
37
|
this.rollup = getContract({
|
|
38
38
|
abi: RollupAbi,
|
|
@@ -56,6 +56,15 @@ export class RollupCheatCodes {
|
|
|
56
56
|
return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([ts]));
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
+
/** Returns the number of seconds until the start of the given slot based on L1 block timestamp. */
|
|
60
|
+
public async getSecondsUntilSlot(slot: SlotNumber): Promise<number> {
|
|
61
|
+
const [currentTimestamp, targetTimestamp] = await Promise.all([
|
|
62
|
+
this.client.getBlock().then(b => BigInt(b.timestamp)),
|
|
63
|
+
this.rollup.read.getTimestampForSlot([BigInt(slot)]),
|
|
64
|
+
]);
|
|
65
|
+
return Math.max(0, Number(targetTimestamp - currentTimestamp));
|
|
66
|
+
}
|
|
67
|
+
|
|
59
68
|
/** Returns the current epoch */
|
|
60
69
|
public async getEpoch(): Promise<EpochNumber> {
|
|
61
70
|
const slotNumber = await this.getSlot();
|
|
@@ -124,7 +133,7 @@ export class RollupCheatCodes {
|
|
|
124
133
|
} = {},
|
|
125
134
|
) {
|
|
126
135
|
const { epochDuration: slotsInEpoch } = await this.getConfig();
|
|
127
|
-
const slotNumber = SlotNumber(epoch * Number(slotsInEpoch));
|
|
136
|
+
const slotNumber = SlotNumber(Number(epoch) * Number(slotsInEpoch));
|
|
128
137
|
const timestamp = (await this.rollup.read.getTimestampForSlot([BigInt(slotNumber)])) + BigInt(opts.offset ?? 0);
|
|
129
138
|
try {
|
|
130
139
|
await this.ethCheatCodes.warp(Number(timestamp), { ...opts, silent: true, resetBlockInterval: true });
|
|
@@ -176,7 +185,7 @@ export class RollupCheatCodes {
|
|
|
176
185
|
* Marks the specified checkpoint (or latest if none) as proven
|
|
177
186
|
* @param maybeCheckpointNumber - The checkpoint number to mark as proven (defaults to latest pending)
|
|
178
187
|
*/
|
|
179
|
-
public markAsProven(maybeCheckpointNumber?:
|
|
188
|
+
public markAsProven(maybeCheckpointNumber?: CheckpointNumber) {
|
|
180
189
|
return this.ethCheatCodes.execWithPausedAnvil(async () => {
|
|
181
190
|
const tipsBefore = await this.getTips();
|
|
182
191
|
const { pending, proven } = tipsBefore;
|
|
@@ -250,6 +259,15 @@ export class RollupCheatCodes {
|
|
|
250
259
|
});
|
|
251
260
|
}
|
|
252
261
|
|
|
262
|
+
public insertOutbox(epoch: EpochNumber, outHash: bigint) {
|
|
263
|
+
return this.ethCheatCodes.execWithPausedAnvil(async () => {
|
|
264
|
+
const outboxAddress = await this.rollup.read.getOutbox();
|
|
265
|
+
const epochRootSlot = OutboxContract.getEpochRootStorageSlot(epoch);
|
|
266
|
+
await this.ethCheatCodes.store(EthAddress.fromString(outboxAddress), epochRootSlot, outHash);
|
|
267
|
+
this.logger.warn(`Advanced outbox to epoch ${epoch} with out hash ${outHash}`);
|
|
268
|
+
});
|
|
269
|
+
}
|
|
270
|
+
|
|
253
271
|
/**
|
|
254
272
|
* Executes an action impersonated as the owner of the Rollup contract.
|
|
255
273
|
* @param action - The action to execute
|
package/src/test/start_anvil.ts
CHANGED
|
@@ -33,7 +33,7 @@ export async function startAnvil(
|
|
|
33
33
|
const anvil = createAnvil({
|
|
34
34
|
anvilBinary,
|
|
35
35
|
host: '127.0.0.1',
|
|
36
|
-
port: opts.port ?? 8545,
|
|
36
|
+
port: opts.port ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : 8545),
|
|
37
37
|
blockTime: opts.l1BlockTime,
|
|
38
38
|
stopTimeout: 1000,
|
|
39
39
|
accounts: opts.accounts ?? 20,
|
|
@@ -7,7 +7,7 @@ import { type GetContractReturnType, type PrivateKeyAccount, getContract } from
|
|
|
7
7
|
|
|
8
8
|
import { extractProposalIdFromLogs } from '../contracts/governance.js';
|
|
9
9
|
import type { L1ContractAddresses } from '../l1_contract_addresses.js';
|
|
10
|
-
import {
|
|
10
|
+
import { createL1TxUtils } from '../l1_tx_utils/index.js';
|
|
11
11
|
import type { ExtendedViemWalletClient, ViemPublicClient } from '../types.js';
|
|
12
12
|
import { EthCheatCodes } from './eth_cheat_codes.js';
|
|
13
13
|
|
|
@@ -22,7 +22,7 @@ export async function executeGovernanceProposal(
|
|
|
22
22
|
) {
|
|
23
23
|
const proposal = await governance.read.getProposal([proposalId]);
|
|
24
24
|
|
|
25
|
-
const l1TxUtils =
|
|
25
|
+
const l1TxUtils = createL1TxUtils(l1Client);
|
|
26
26
|
|
|
27
27
|
const waitL1Block = async () => {
|
|
28
28
|
await l1TxUtils.sendAndMonitorTransaction({
|
package/src/utils.ts
CHANGED
|
@@ -4,15 +4,18 @@ import { ErrorsAbi } from '@aztec/l1-artifacts/ErrorsAbi';
|
|
|
4
4
|
|
|
5
5
|
import {
|
|
6
6
|
type Abi,
|
|
7
|
+
type AbiItem,
|
|
7
8
|
BaseError,
|
|
8
9
|
type ContractEventName,
|
|
9
10
|
ContractFunctionRevertedError,
|
|
10
11
|
type DecodeEventLogReturnType,
|
|
12
|
+
type FormattedTransaction,
|
|
11
13
|
type Hex,
|
|
12
14
|
type Log,
|
|
13
15
|
decodeErrorResult,
|
|
14
16
|
decodeEventLog,
|
|
15
17
|
} from 'viem';
|
|
18
|
+
import { formatAbiItem, formatAbiParams } from 'viem/utils';
|
|
16
19
|
|
|
17
20
|
export interface L2Claim {
|
|
18
21
|
claimSecret: Fr;
|
|
@@ -92,6 +95,57 @@ export function prettyLogViemErrorMsg(err: any) {
|
|
|
92
95
|
return err?.message ?? err;
|
|
93
96
|
}
|
|
94
97
|
|
|
98
|
+
export function mergeAbis(abis: Abi[]): Abi {
|
|
99
|
+
let merged: Abi = [];
|
|
100
|
+
const seen = new Set<string>();
|
|
101
|
+
|
|
102
|
+
for (const abi of abis) {
|
|
103
|
+
for (const item of abi) {
|
|
104
|
+
const key = getAbiItemKey(item);
|
|
105
|
+
if (!seen.has(key)) {
|
|
106
|
+
seen.add(key);
|
|
107
|
+
merged = [...merged, item];
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
return merged;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
function getAbiItemKey(item: AbiItem): string {
|
|
116
|
+
if (item.type === 'function') {
|
|
117
|
+
const signature = formatAbiItem(item);
|
|
118
|
+
const outputs = formatAbiParams(item.outputs);
|
|
119
|
+
const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
|
|
120
|
+
return `function:${signature}:${outputs}:${stateMutability}`;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
if (item.type === 'event') {
|
|
124
|
+
const signature = formatAbiItem(item);
|
|
125
|
+
const indexed = (item.inputs ?? []).map(input => ((input as { indexed?: boolean }).indexed ? '1' : '0')).join('');
|
|
126
|
+
const anonymous = item.anonymous ? 'anonymous' : 'not-anonymous';
|
|
127
|
+
return `event:${signature}:${indexed}:${anonymous}`;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
if (item.type === 'error') {
|
|
131
|
+
const signature = formatAbiItem(item);
|
|
132
|
+
return `error:${signature}`;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
if (item.type === 'constructor') {
|
|
136
|
+
const inputs = formatAbiParams(item.inputs);
|
|
137
|
+
const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
|
|
138
|
+
return `constructor::${inputs}:${stateMutability}`;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
if (item.type === 'fallback' || item.type === 'receive') {
|
|
142
|
+
const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
|
|
143
|
+
return `${item.type}:::${stateMutability}`;
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
return 'unknown';
|
|
147
|
+
}
|
|
148
|
+
|
|
95
149
|
function getNestedErrorData(error: unknown): string | undefined {
|
|
96
150
|
// If nothing, bail
|
|
97
151
|
if (!error) {
|
|
@@ -233,3 +287,31 @@ export function tryGetCustomErrorName(err: any) {
|
|
|
233
287
|
return undefined;
|
|
234
288
|
}
|
|
235
289
|
}
|
|
290
|
+
|
|
291
|
+
/**
|
|
292
|
+
* Type guard to check if a transaction is a blob transaction (EIP-4844).
|
|
293
|
+
* Blob transactions have maxFeePerBlobGas and blobVersionedHashes fields.
|
|
294
|
+
*/
|
|
295
|
+
export function isBlobTransaction(tx: FormattedTransaction): tx is FormattedTransaction & {
|
|
296
|
+
maxFeePerBlobGas: bigint;
|
|
297
|
+
blobVersionedHashes: readonly Hex[];
|
|
298
|
+
} {
|
|
299
|
+
return (
|
|
300
|
+
'maxFeePerBlobGas' in tx &&
|
|
301
|
+
tx.maxFeePerBlobGas !== undefined &&
|
|
302
|
+
'blobVersionedHashes' in tx &&
|
|
303
|
+
tx.blobVersionedHashes !== undefined
|
|
304
|
+
);
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
/**
|
|
308
|
+
* Calculates a percentile from an array of bigints
|
|
309
|
+
*/
|
|
310
|
+
export function calculatePercentile(values: bigint[], percentile: number): bigint {
|
|
311
|
+
if (values.length === 0) {
|
|
312
|
+
return 0n;
|
|
313
|
+
}
|
|
314
|
+
const sorted = [...values].sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
|
|
315
|
+
const index = Math.ceil((sorted.length - 1) * (percentile / 100));
|
|
316
|
+
return sorted[index];
|
|
317
|
+
}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
-
import { DateProvider } from '@aztec/foundation/timer';
|
|
3
|
-
import type { EthSigner } from '../eth-signer/eth-signer.js';
|
|
4
|
-
import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
|
|
5
|
-
import type { L1TxUtilsConfig } from './config.js';
|
|
6
|
-
import type { IL1TxMetrics, IL1TxStore } from './interfaces.js';
|
|
7
|
-
import { L1TxUtils } from './l1_tx_utils.js';
|
|
8
|
-
import type { L1BlobInputs } from './types.js';
|
|
9
|
-
/** Extends L1TxUtils with the capability to cancel blobs. This needs to be a separate class so we don't require a dependency on blob-lib unnecessarily. */
|
|
10
|
-
export declare class L1TxUtilsWithBlobs extends L1TxUtils {
|
|
11
|
-
/** Makes empty blob inputs for the cancellation tx. */
|
|
12
|
-
protected makeEmptyBlobInputs(maxFeePerBlobGas: bigint): Required<L1BlobInputs>;
|
|
13
|
-
}
|
|
14
|
-
export declare function createL1TxUtilsWithBlobsFromViemWallet(client: ExtendedViemWalletClient, deps?: {
|
|
15
|
-
logger?: Logger;
|
|
16
|
-
dateProvider?: DateProvider;
|
|
17
|
-
store?: IL1TxStore;
|
|
18
|
-
metrics?: IL1TxMetrics;
|
|
19
|
-
}, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;
|
|
20
|
-
export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signer: EthSigner, deps?: {
|
|
21
|
-
logger?: Logger;
|
|
22
|
-
dateProvider?: DateProvider;
|
|
23
|
-
store?: IL1TxStore;
|
|
24
|
-
metrics?: IL1TxMetrics;
|
|
25
|
-
}, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHNfd2l0aF9ibG9icy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2wxX3R4X3V0aWxzL2wxX3R4X3V0aWxzX3dpdGhfYmxvYnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSXZELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLFVBQVUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU3QyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQW1CLE1BQU0sWUFBWSxDQUFDO0FBRWhFLDJKQUEySjtBQUMzSixxQkFBYSxrQkFBbUIsU0FBUSxTQUFTO0lBQy9DLHVEQUF1RDtJQUN2RCxVQUFtQixtQkFBbUIsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLEdBQUcsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUl2RjtDQUNGO0FBRUQsd0JBQWdCLHNDQUFzQyxDQUNwRCxNQUFNLEVBQUUsd0JBQXdCLEVBQ2hDLElBQUksR0FBRTtJQUNKLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNoQixZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsS0FBSyxDQUFDLEVBQUUsVUFBVSxDQUFDO0lBQ25CLE9BQU8sQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUNuQixFQUNOLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLGdCQUFnQixHQUFFLE9BQWUsc0JBYWxDO0FBRUQsd0JBQWdCLHFDQUFxQyxDQUNuRCxNQUFNLEVBQUUsVUFBVSxFQUNsQixNQUFNLEVBQUUsU0FBUyxFQUNqQixJQUFJLEdBQUU7SUFDSixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLEtBQUssQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNuQixPQUFPLENBQUMsRUFBRSxZQUFZLENBQUM7Q0FDbkIsRUFDTixNQUFNLEdBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBTSxFQUNyQyxnQkFBZ0IsR0FBRSxPQUFlLHNCQWlCbEMifQ==
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_utils_with_blobs.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/l1_tx_utils_with_blobs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AAEhE,2JAA2J;AAC3J,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C,uDAAuD;IACvD,UAAmB,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,CAIvF;CACF;AAED,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,wBAAwB,EAChC,IAAI,GAAE;IACJ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;CACnB,EACN,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,gBAAgB,GAAE,OAAe,sBAalC;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,SAAS,EACjB,IAAI,GAAE;IACJ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;CACnB,EACN,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,gBAAgB,GAAE,OAAe,sBAiBlC"}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import { Blob } from '@aztec/blob-lib';
|
|
2
|
-
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
-
import { L1TxUtils } from './l1_tx_utils.js';
|
|
4
|
-
import { createViemSigner } from './signer.js';
|
|
5
|
-
/** Extends L1TxUtils with the capability to cancel blobs. This needs to be a separate class so we don't require a dependency on blob-lib unnecessarily. */ export class L1TxUtilsWithBlobs extends L1TxUtils {
|
|
6
|
-
/** Makes empty blob inputs for the cancellation tx. */ makeEmptyBlobInputs(maxFeePerBlobGas) {
|
|
7
|
-
const blobData = new Uint8Array(131072).fill(0);
|
|
8
|
-
const kzg = Blob.getViemKzgInstance();
|
|
9
|
-
return {
|
|
10
|
-
blobs: [
|
|
11
|
-
blobData
|
|
12
|
-
],
|
|
13
|
-
kzg,
|
|
14
|
-
maxFeePerBlobGas
|
|
15
|
-
};
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
export function createL1TxUtilsWithBlobsFromViemWallet(client, deps = {}, config = {}, debugMaxGasLimit = false) {
|
|
19
|
-
return new L1TxUtilsWithBlobs(client, EthAddress.fromString(client.account.address), createViemSigner(client), deps.logger, deps.dateProvider, config, debugMaxGasLimit, deps.store, deps.metrics);
|
|
20
|
-
}
|
|
21
|
-
export function createL1TxUtilsWithBlobsFromEthSigner(client, signer, deps = {}, config = {}, debugMaxGasLimit = false) {
|
|
22
|
-
const callback = async (transaction, _signingAddress)=>{
|
|
23
|
-
return (await signer.signTransaction(transaction)).toViemTransactionSignature();
|
|
24
|
-
};
|
|
25
|
-
return new L1TxUtilsWithBlobs(client, signer.address, callback, deps.logger, deps.dateProvider, config, debugMaxGasLimit, deps.store, deps.metrics);
|
|
26
|
-
}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import { type Logger } from '@aztec/foundation/log';
|
|
2
|
-
import { DateProvider } from '@aztec/foundation/timer';
|
|
3
|
-
import { type L1TxUtilsConfig } from '../l1_tx_utils/index.js';
|
|
4
|
-
import { L1TxUtilsWithBlobs } from '../l1_tx_utils/l1_tx_utils_with_blobs.js';
|
|
5
|
-
import type { ExtendedViemWalletClient } from '../types.js';
|
|
6
|
-
import { type Delayer } from './tx_delayer.js';
|
|
7
|
-
export declare class DelayedTxUtils extends L1TxUtilsWithBlobs {
|
|
8
|
-
delayer: Delayer | undefined;
|
|
9
|
-
static fromL1TxUtils(l1TxUtils: L1TxUtilsWithBlobs, ethereumSlotDuration: number, wallet: ExtendedViemWalletClient): DelayedTxUtils;
|
|
10
|
-
enableDelayer(ethereumSlotDuration: number): void;
|
|
11
|
-
}
|
|
12
|
-
export declare function createDelayedL1TxUtilsFromViemWallet(client: ExtendedViemWalletClient, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): DelayedTxUtils;
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVsYXllZF90eF91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvZGVsYXllZF90eF91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUM5RSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM1RCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQWUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1RCxxQkFBYSxjQUFlLFNBQVEsa0JBQWtCO0lBQzdDLE9BQU8sRUFBRSxPQUFPLEdBQUcsU0FBUyxDQUFDO0lBRXBDLE9BQWMsYUFBYSxDQUN6QixTQUFTLEVBQUUsa0JBQWtCLEVBQzdCLG9CQUFvQixFQUFFLE1BQU0sRUFDNUIsTUFBTSxFQUFFLHdCQUF3QixrQkFTakM7SUFFTSxhQUFhLENBQUMsb0JBQW9CLEVBQUUsTUFBTSxRQU1oRDtDQUNGO0FBRUQsd0JBQWdCLG9DQUFvQyxDQUNsRCxNQUFNLEVBQUUsd0JBQXdCLEVBQ2hDLE1BQU0sR0FBRSxNQUFrQyxFQUMxQyxZQUFZLEdBQUUsWUFBaUMsRUFDL0MsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBQyxFQUNqQyxnQkFBZ0IsR0FBRSxPQUFlLGtCQVdsQyJ9
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"delayed_tx_utils.d.ts","sourceRoot":"","sources":["../../src/test/delayed_tx_utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,iBAAiB,CAAC;AAE5D,qBAAa,cAAe,SAAQ,kBAAkB;IAC7C,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAEpC,OAAc,aAAa,CACzB,SAAS,EAAE,kBAAkB,EAC7B,oBAAoB,EAAE,MAAM,EAC5B,MAAM,EAAE,wBAAwB,kBASjC;IAEM,aAAa,CAAC,oBAAoB,EAAE,MAAM,QAMhD;CACF;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,kBAWlC"}
|