@aztec/ethereum 0.67.1 → 0.68.1
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 +7 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +1 -1
- package/dest/eth_cheat_codes.d.ts +1 -11
- package/dest/eth_cheat_codes.d.ts.map +1 -1
- package/dest/eth_cheat_codes.js +16 -40
- package/dest/l1_tx_utils.d.ts +14 -4
- package/dest/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils.js +31 -10
- package/dest/test/eth_cheat_codes_with_state.d.ts +18 -0
- package/dest/test/eth_cheat_codes_with_state.d.ts.map +1 -0
- package/dest/test/eth_cheat_codes_with_state.js +34 -0
- package/dest/test/index.d.ts +1 -0
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +2 -1
- package/dest/test/tx_delayer.d.ts +1 -0
- package/dest/test/tx_delayer.d.ts.map +1 -1
- package/dest/test/tx_delayer.js +17 -6
- package/package.json +8 -7
- package/src/config.ts +2 -2
- package/src/eth_cheat_codes.ts +15 -41
- package/src/l1_tx_utils.ts +46 -6
- package/src/test/eth_cheat_codes_with_state.ts +36 -0
- package/src/test/index.ts +1 -0
- package/src/test/tx_delayer.ts +16 -4
package/dest/config.d.ts
CHANGED
|
@@ -11,7 +11,13 @@ export type L1ContractsConfig = {
|
|
|
11
11
|
/** The number of L2 slots that we can wait for a proof of an epoch to be produced. */
|
|
12
12
|
aztecEpochProofClaimWindowInL2Slots: number;
|
|
13
13
|
};
|
|
14
|
-
export declare const DefaultL1ContractsConfig:
|
|
14
|
+
export declare const DefaultL1ContractsConfig: {
|
|
15
|
+
ethereumSlotDuration: number;
|
|
16
|
+
aztecSlotDuration: number;
|
|
17
|
+
aztecEpochDuration: number;
|
|
18
|
+
aztecTargetCommitteeSize: number;
|
|
19
|
+
aztecEpochProofClaimWindowInL2Slots: number;
|
|
20
|
+
};
|
|
15
21
|
export declare const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig>;
|
|
16
22
|
export declare function getL1ContractsConfigEnvVars(): L1ContractsConfig;
|
|
17
23
|
//# sourceMappingURL=config.d.ts.map
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sFAAsF;IACtF,mCAAmC,EAAE,MAAM,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sFAAsF;IACtF,mCAAmC,EAAE,MAAM,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;CAMR,CAAC;AAE9B,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CA0B3E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D"}
|
package/dest/config.js
CHANGED
|
@@ -36,4 +36,4 @@ export const l1ContractsConfigMappings = {
|
|
|
36
36
|
export function getL1ContractsConfigEnvVars() {
|
|
37
37
|
return getConfigFromMappings(l1ContractsConfigMappings);
|
|
38
38
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJCLHFCQUFxQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFlOUcsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUc7SUFDdEMsb0JBQW9CLEVBQUUsRUFBRTtJQUN4QixpQkFBaUIsRUFBRSxFQUFFO0lBQ3JCLGtCQUFrQixFQUFFLEVBQUU7SUFDdEIsd0JBQXdCLEVBQUUsRUFBRTtJQUM1QixtQ0FBbUMsRUFBRSxFQUFFO0NBQ1osQ0FBQztBQUU5QixNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBMEM7SUFDOUUsb0JBQW9CLEVBQUU7UUFDcEIsR0FBRyxFQUFFLHdCQUF3QjtRQUM3QixXQUFXLEVBQUUsb0NBQW9DO1FBQ2pELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsb0JBQW9CLENBQUM7S0FDckU7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUscUJBQXFCO1FBQzFCLFdBQVcsRUFBRSxrRkFBa0Y7UUFDL0YsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxpQkFBaUIsQ0FBQztLQUNsRTtJQUNELGtCQUFrQixFQUFFO1FBQ2xCLEdBQUcsRUFBRSxzQkFBc0I7UUFDM0IsV0FBVyxFQUFFLHNFQUFzRTtRQUNuRixHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLGtCQUFrQixDQUFDO0tBQ25FO0lBQ0Qsd0JBQXdCLEVBQUU7UUFDeEIsR0FBRyxFQUFFLDZCQUE2QjtRQUNsQyxXQUFXLEVBQUUsc0NBQXNDO1FBQ25ELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsd0JBQXdCLENBQUM7S0FDekU7SUFDRCxtQ0FBbUMsRUFBRTtRQUNuQyxHQUFHLEVBQUUsNENBQTRDO1FBQ2pELFdBQVcsRUFBRSxpRkFBaUY7UUFDOUYsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxtQ0FBbUMsQ0FBQztLQUNwRjtDQUNGLENBQUM7QUFFRixNQUFNLFVBQVUsMkJBQTJCO0lBQ3pDLE9BQU8scUJBQXFCLENBQUMseUJBQXlCLENBQUMsQ0FBQztBQUMxRCxDQUFDIn0=
|
|
@@ -92,17 +92,7 @@ export declare class EthCheatCodes {
|
|
|
92
92
|
* Set the next block timestamp and mines the block
|
|
93
93
|
* @param timestamp - The timestamp to set the next block to
|
|
94
94
|
*/
|
|
95
|
-
warp(timestamp: number | bigint): Promise<void>;
|
|
96
|
-
/**
|
|
97
|
-
* Dumps the current chain state to a file.
|
|
98
|
-
* @param fileName - The file name to dump state into
|
|
99
|
-
*/
|
|
100
|
-
dumpChainState(fileName: string): Promise<void>;
|
|
101
|
-
/**
|
|
102
|
-
* Loads the chain state from a file.
|
|
103
|
-
* @param fileName - The file name to load state from
|
|
104
|
-
*/
|
|
105
|
-
loadChainState(fileName: string): Promise<void>;
|
|
95
|
+
warp(timestamp: number | bigint, silent?: boolean): Promise<void>;
|
|
106
96
|
/**
|
|
107
97
|
* Load the value at a storage slot of a contract address on eth
|
|
108
98
|
* @param contract - The contract address
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../src/eth_cheat_codes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../src/eth_cheat_codes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;GAEG;AACH,qBAAa,aAAa;IAEtB;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,MAAM;;IAPb;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,MAAM,yCAAuC;IAGhD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;IAU3C;;;OAGG;IACU,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAU7C;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAK3C;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAKvC;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAKzC;;;OAGG;IACU,IAAI,CAAC,cAAc,SAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAKtC,MAAM;IAOpB;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOrC;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5E;;;OAGG;IACU,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9D;;;OAGG;IACU,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtE;;;OAGG;IACU,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9D;;;OAGG;IACU,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1D;;;OAGG;IACU,eAAe,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD;;;OAGG;IACU,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpE;;;OAGG;IACU,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5E;;;;;OAKG;IACU,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKtE;;;;;OAKG;IACU,KAAK,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASpF;;;;;OAKG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;IAMvD;;;OAGG;IACU,kBAAkB,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrE;;;OAGG;IACU,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpE;;;;OAIG;IACU,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/E;;;;OAIG;IACU,WAAW,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;IAKtE;;;;OAIG;IACU,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;CAIpE"}
|
package/dest/eth_cheat_codes.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
|
|
2
2
|
import { keccak256 } from '@aztec/foundation/crypto';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
|
-
import fs from 'fs';
|
|
5
4
|
/**
|
|
6
5
|
* A class that provides utility functions for interacting with ethereum (L1).
|
|
7
6
|
*/
|
|
@@ -71,7 +70,7 @@ export class EthCheatCodes {
|
|
|
71
70
|
*/
|
|
72
71
|
async mine(numberOfBlocks = 1) {
|
|
73
72
|
await this.doMine(numberOfBlocks);
|
|
74
|
-
this.logger.
|
|
73
|
+
this.logger.warn(`Mined ${numberOfBlocks} L1 blocks`);
|
|
75
74
|
}
|
|
76
75
|
async doMine(numberOfBlocks = 1) {
|
|
77
76
|
const res = await this.rpcCall('hardhat_mine', [numberOfBlocks]);
|
|
@@ -98,7 +97,7 @@ export class EthCheatCodes {
|
|
|
98
97
|
if (res.error) {
|
|
99
98
|
throw new Error(`Error setting balance for ${account}: ${res.error.message}`);
|
|
100
99
|
}
|
|
101
|
-
this.logger.
|
|
100
|
+
this.logger.warn(`Set balance for ${account} to ${balance}`);
|
|
102
101
|
}
|
|
103
102
|
/**
|
|
104
103
|
* Set the interval between blocks (block time)
|
|
@@ -109,7 +108,7 @@ export class EthCheatCodes {
|
|
|
109
108
|
if (res.error) {
|
|
110
109
|
throw new Error(`Error setting block interval: ${res.error.message}`);
|
|
111
110
|
}
|
|
112
|
-
this.logger.
|
|
111
|
+
this.logger.warn(`Set L1 block interval to ${interval}`);
|
|
113
112
|
}
|
|
114
113
|
/**
|
|
115
114
|
* Set the next block base fee per gas
|
|
@@ -120,7 +119,7 @@ export class EthCheatCodes {
|
|
|
120
119
|
if (res.error) {
|
|
121
120
|
throw new Error(`Error setting next block base fee per gas: ${res.error.message}`);
|
|
122
121
|
}
|
|
123
|
-
this.logger.
|
|
122
|
+
this.logger.warn(`Set L1 next block base fee per gas to ${baseFee}`);
|
|
124
123
|
}
|
|
125
124
|
/**
|
|
126
125
|
* Set the interval between blocks (block time)
|
|
@@ -131,7 +130,7 @@ export class EthCheatCodes {
|
|
|
131
130
|
if (res.error) {
|
|
132
131
|
throw new Error(`Error setting interval mining: ${res.error.message}`);
|
|
133
132
|
}
|
|
134
|
-
this.logger.
|
|
133
|
+
this.logger.warn(`Set L1 interval mining to ${seconds} seconds`);
|
|
135
134
|
}
|
|
136
135
|
/**
|
|
137
136
|
* Set the automine status of the underlying anvil chain
|
|
@@ -142,7 +141,7 @@ export class EthCheatCodes {
|
|
|
142
141
|
if (res.error) {
|
|
143
142
|
throw new Error(`Error setting automine: ${res.error.message}`);
|
|
144
143
|
}
|
|
145
|
-
this.logger.
|
|
144
|
+
this.logger.warn(`Set L1 automine to ${automine}`);
|
|
146
145
|
}
|
|
147
146
|
/**
|
|
148
147
|
* Drop a transaction from the mempool
|
|
@@ -153,7 +152,7 @@ export class EthCheatCodes {
|
|
|
153
152
|
if (res.error) {
|
|
154
153
|
throw new Error(`Error dropping transaction: ${res.error.message}`);
|
|
155
154
|
}
|
|
156
|
-
this.logger.
|
|
155
|
+
this.logger.warn(`Dropped transaction ${txHash}`);
|
|
157
156
|
}
|
|
158
157
|
/**
|
|
159
158
|
* Set the next block timestamp
|
|
@@ -164,44 +163,21 @@ export class EthCheatCodes {
|
|
|
164
163
|
if (res.error) {
|
|
165
164
|
throw new Error(`Error setting next block timestamp: ${res.error.message}`);
|
|
166
165
|
}
|
|
167
|
-
this.logger.
|
|
166
|
+
this.logger.warn(`Set L1 next block timestamp to ${timestamp}`);
|
|
168
167
|
}
|
|
169
168
|
/**
|
|
170
169
|
* Set the next block timestamp and mines the block
|
|
171
170
|
* @param timestamp - The timestamp to set the next block to
|
|
172
171
|
*/
|
|
173
|
-
async warp(timestamp) {
|
|
172
|
+
async warp(timestamp, silent = false) {
|
|
174
173
|
const res = await this.rpcCall('evm_setNextBlockTimestamp', [Number(timestamp)]);
|
|
175
174
|
if (res.error) {
|
|
176
175
|
throw new Error(`Error warping: ${res.error.message}`);
|
|
177
176
|
}
|
|
178
177
|
await this.doMine();
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
/**
|
|
182
|
-
* Dumps the current chain state to a file.
|
|
183
|
-
* @param fileName - The file name to dump state into
|
|
184
|
-
*/
|
|
185
|
-
async dumpChainState(fileName) {
|
|
186
|
-
const res = await this.rpcCall('hardhat_dumpState', []);
|
|
187
|
-
if (res.error) {
|
|
188
|
-
throw new Error(`Error dumping state: ${res.error.message}`);
|
|
189
|
-
}
|
|
190
|
-
const jsonContent = JSON.stringify(res.result);
|
|
191
|
-
fs.writeFileSync(`${fileName}.json`, jsonContent, 'utf8');
|
|
192
|
-
this.logger.verbose(`Dumped state to ${fileName}`);
|
|
193
|
-
}
|
|
194
|
-
/**
|
|
195
|
-
* Loads the chain state from a file.
|
|
196
|
-
* @param fileName - The file name to load state from
|
|
197
|
-
*/
|
|
198
|
-
async loadChainState(fileName) {
|
|
199
|
-
const data = JSON.parse(fs.readFileSync(`${fileName}.json`, 'utf8'));
|
|
200
|
-
const res = await this.rpcCall('hardhat_loadState', [data]);
|
|
201
|
-
if (res.error) {
|
|
202
|
-
throw new Error(`Error loading state: ${res.error.message}`);
|
|
178
|
+
if (!silent) {
|
|
179
|
+
this.logger.warn(`Warped L1 timestamp to ${timestamp}`);
|
|
203
180
|
}
|
|
204
|
-
this.logger.verbose(`Loaded state from ${fileName}`);
|
|
205
181
|
}
|
|
206
182
|
/**
|
|
207
183
|
* Load the value at a storage slot of a contract address on eth
|
|
@@ -225,7 +201,7 @@ export class EthCheatCodes {
|
|
|
225
201
|
if (res.error) {
|
|
226
202
|
throw new Error(`Error setting storage for contract ${contract} at ${slot}: ${res.error.message}`);
|
|
227
203
|
}
|
|
228
|
-
this.logger.
|
|
204
|
+
this.logger.warn(`Set L1 storage for contract ${contract} at ${slot} to ${value}`);
|
|
229
205
|
}
|
|
230
206
|
/**
|
|
231
207
|
* Computes the slot value for a given map and key.
|
|
@@ -247,7 +223,7 @@ export class EthCheatCodes {
|
|
|
247
223
|
if (res.error) {
|
|
248
224
|
throw new Error(`Error impersonating ${who}: ${res.error.message}`);
|
|
249
225
|
}
|
|
250
|
-
this.logger.
|
|
226
|
+
this.logger.warn(`Impersonating ${who}`);
|
|
251
227
|
}
|
|
252
228
|
/**
|
|
253
229
|
* Stop impersonating an account that you are currently impersonating.
|
|
@@ -258,7 +234,7 @@ export class EthCheatCodes {
|
|
|
258
234
|
if (res.error) {
|
|
259
235
|
throw new Error(`Error when stopping the impersonation of ${who}: ${res.error.message}`);
|
|
260
236
|
}
|
|
261
|
-
this.logger.
|
|
237
|
+
this.logger.warn(`Stopped impersonating ${who}`);
|
|
262
238
|
}
|
|
263
239
|
/**
|
|
264
240
|
* Set the bytecode for a contract
|
|
@@ -270,7 +246,7 @@ export class EthCheatCodes {
|
|
|
270
246
|
if (res.error) {
|
|
271
247
|
throw new Error(`Error setting bytecode for ${contract}: ${res.error.message}`);
|
|
272
248
|
}
|
|
273
|
-
this.logger.
|
|
249
|
+
this.logger.warn(`Set bytecode for ${contract} to ${bytecode}`);
|
|
274
250
|
}
|
|
275
251
|
/**
|
|
276
252
|
* Get the bytecode for a contract
|
|
@@ -291,4 +267,4 @@ export class EthCheatCodes {
|
|
|
291
267
|
return res.result;
|
|
292
268
|
}
|
|
293
269
|
}
|
|
294
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"eth_cheat_codes.js","sourceRoot":"","sources":["../src/eth_cheat_codes.ts"],"names":[],"mappings":"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"}
|
|
270
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"eth_cheat_codes.js","sourceRoot":"","sources":["../src/eth_cheat_codes.ts"],"names":[],"mappings":"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"}
|
package/dest/l1_tx_utils.d.ts
CHANGED
|
@@ -38,6 +38,11 @@ export interface L1TxUtilsConfig {
|
|
|
38
38
|
* How long to wait for a tx to be mined before giving up
|
|
39
39
|
*/
|
|
40
40
|
txTimeoutMs?: number;
|
|
41
|
+
/**
|
|
42
|
+
* How many attempts will be done to get a tx after it was sent?
|
|
43
|
+
* First attempt is done at 1s, second at 2s, third at 3s, etc.
|
|
44
|
+
*/
|
|
45
|
+
txPropagationMaxQueryAttempts?: number;
|
|
41
46
|
}
|
|
42
47
|
export declare const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig>;
|
|
43
48
|
export declare const defaultL1TxUtilsConfig: L1TxUtilsConfig;
|
|
@@ -46,6 +51,11 @@ export interface L1TxRequest {
|
|
|
46
51
|
data: Hex;
|
|
47
52
|
value?: bigint;
|
|
48
53
|
}
|
|
54
|
+
export interface L1BlobInputs {
|
|
55
|
+
blobs: Uint8Array[];
|
|
56
|
+
kzg: any;
|
|
57
|
+
maxFeePerBlobGas: bigint;
|
|
58
|
+
}
|
|
49
59
|
interface GasPrice {
|
|
50
60
|
maxFeePerGas: bigint;
|
|
51
61
|
maxPriorityFeePerGas: bigint;
|
|
@@ -64,7 +74,7 @@ export declare class L1TxUtils {
|
|
|
64
74
|
*/
|
|
65
75
|
sendTransaction(request: L1TxRequest, _gasConfig?: Partial<L1TxUtilsConfig> & {
|
|
66
76
|
fixedGas?: bigint;
|
|
67
|
-
}): Promise<{
|
|
77
|
+
}, _blobInputs?: L1BlobInputs): Promise<{
|
|
68
78
|
txHash: Hex;
|
|
69
79
|
gasLimit: bigint;
|
|
70
80
|
gasPrice: GasPrice;
|
|
@@ -78,7 +88,7 @@ export declare class L1TxUtils {
|
|
|
78
88
|
*/
|
|
79
89
|
monitorTransaction(request: L1TxRequest, initialTxHash: Hex, params: {
|
|
80
90
|
gasLimit: bigint;
|
|
81
|
-
}, _gasConfig?: Partial<L1TxUtilsConfig
|
|
91
|
+
}, _gasConfig?: Partial<L1TxUtilsConfig>, _blobInputs?: L1BlobInputs): Promise<TransactionReceipt>;
|
|
82
92
|
/**
|
|
83
93
|
* Sends a transaction and monitors it until completion
|
|
84
94
|
* @param request - The transaction request (to, data, value)
|
|
@@ -87,7 +97,7 @@ export declare class L1TxUtils {
|
|
|
87
97
|
*/
|
|
88
98
|
sendAndMonitorTransaction(request: L1TxRequest, gasConfig?: Partial<L1TxUtilsConfig> & {
|
|
89
99
|
fixedGas?: bigint;
|
|
90
|
-
}): Promise<TransactionReceipt>;
|
|
100
|
+
}, blobInputs?: L1BlobInputs): Promise<TransactionReceipt>;
|
|
91
101
|
/**
|
|
92
102
|
* Gets the current gas price with bounds checking
|
|
93
103
|
*/
|
|
@@ -95,7 +105,7 @@ export declare class L1TxUtils {
|
|
|
95
105
|
/**
|
|
96
106
|
* Estimates gas and adds buffer
|
|
97
107
|
*/
|
|
98
|
-
estimateGas(account: Account, request: L1TxRequest, _gasConfig?: L1TxUtilsConfig): Promise<bigint>;
|
|
108
|
+
estimateGas(account: Account, request: L1TxRequest, _gasConfig?: L1TxUtilsConfig, _blobInputs?: L1BlobInputs): Promise<bigint>;
|
|
99
109
|
}
|
|
100
110
|
export {};
|
|
101
111
|
//# sourceMappingURL=l1_tx_utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"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"}
|
package/dest/l1_tx_utils.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { times } from '@aztec/foundation/collection';
|
|
1
2
|
import { bigintConfigHelper, getDefaultConfig, numberConfigHelper, } from '@aztec/foundation/config';
|
|
2
3
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
3
4
|
import { sleep } from '@aztec/foundation/sleep';
|
|
@@ -57,6 +58,11 @@ export const l1TxUtilsConfigMappings = {
|
|
|
57
58
|
env: 'L1_TX_MONITOR_TX_TIMEOUT_MS',
|
|
58
59
|
...numberConfigHelper(300000), // 5 mins
|
|
59
60
|
},
|
|
61
|
+
txPropagationMaxQueryAttempts: {
|
|
62
|
+
description: 'How many attempts will be done to get a tx after it was sent',
|
|
63
|
+
env: 'L1_TX_PROPAGATION_MAX_QUERY_ATTEMPTS',
|
|
64
|
+
...numberConfigHelper(3),
|
|
65
|
+
},
|
|
60
66
|
};
|
|
61
67
|
export const defaultL1TxUtilsConfig = getDefaultConfig(l1TxUtilsConfigMappings);
|
|
62
68
|
export class L1TxUtils {
|
|
@@ -75,7 +81,7 @@ export class L1TxUtils {
|
|
|
75
81
|
* @param gasConfig - Optional gas configuration
|
|
76
82
|
* @returns The transaction hash and parameters used
|
|
77
83
|
*/
|
|
78
|
-
async sendTransaction(request, _gasConfig) {
|
|
84
|
+
async sendTransaction(request, _gasConfig, _blobInputs) {
|
|
79
85
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
80
86
|
const account = this.walletClient.account;
|
|
81
87
|
let gasLimit;
|
|
@@ -86,8 +92,10 @@ export class L1TxUtils {
|
|
|
86
92
|
gasLimit = await this.estimateGas(account, request);
|
|
87
93
|
}
|
|
88
94
|
const gasPrice = await this.getGasPrice(gasConfig);
|
|
95
|
+
const blobInputs = _blobInputs || {};
|
|
89
96
|
const txHash = await this.walletClient.sendTransaction({
|
|
90
97
|
...request,
|
|
98
|
+
...blobInputs,
|
|
91
99
|
gas: gasLimit,
|
|
92
100
|
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
93
101
|
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
@@ -106,11 +114,13 @@ export class L1TxUtils {
|
|
|
106
114
|
* @param params - Parameters used in the initial transaction
|
|
107
115
|
* @param gasConfig - Optional gas configuration
|
|
108
116
|
*/
|
|
109
|
-
async monitorTransaction(request, initialTxHash, params, _gasConfig) {
|
|
117
|
+
async monitorTransaction(request, initialTxHash, params, _gasConfig, _blobInputs) {
|
|
110
118
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
111
119
|
const account = this.walletClient.account;
|
|
120
|
+
const blobInputs = _blobInputs || {};
|
|
121
|
+
const makeGetTransactionBackoff = () => makeBackoff(times(gasConfig.txPropagationMaxQueryAttempts ?? 3, i => i + 1));
|
|
112
122
|
// Retry a few times, in case the tx is not yet propagated.
|
|
113
|
-
const tx = await retry(() => this.publicClient.getTransaction({ hash: initialTxHash }), `Getting L1 transaction ${initialTxHash}`,
|
|
123
|
+
const tx = await retry(() => this.publicClient.getTransaction({ hash: initialTxHash }), `Getting L1 transaction ${initialTxHash}`, makeGetTransactionBackoff(), this.logger, true);
|
|
114
124
|
if (tx?.nonce === undefined || tx?.nonce === null) {
|
|
115
125
|
throw new Error(`Failed to get L1 transaction ${initialTxHash} nonce`);
|
|
116
126
|
}
|
|
@@ -144,7 +154,7 @@ export class L1TxUtils {
|
|
|
144
154
|
}
|
|
145
155
|
}
|
|
146
156
|
// Retry a few times, in case the tx is not yet propagated.
|
|
147
|
-
const tx = await retry(() => this.publicClient.getTransaction({ hash: currentTxHash }), `Getting L1 transaction ${currentTxHash}`,
|
|
157
|
+
const tx = await retry(() => this.publicClient.getTransaction({ hash: currentTxHash }), `Getting L1 transaction ${currentTxHash}`, makeGetTransactionBackoff(), this.logger, true);
|
|
148
158
|
const timePassed = Date.now() - lastAttemptSent;
|
|
149
159
|
if (tx && timePassed < gasConfig.stallTimeMs) {
|
|
150
160
|
this.logger?.debug(`L1 transaction ${currentTxHash} pending. Time passed: ${timePassed}ms.`);
|
|
@@ -167,6 +177,7 @@ export class L1TxUtils {
|
|
|
167
177
|
`with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei`);
|
|
168
178
|
currentTxHash = await this.walletClient.sendTransaction({
|
|
169
179
|
...request,
|
|
180
|
+
...blobInputs,
|
|
170
181
|
nonce,
|
|
171
182
|
gas: params.gasLimit,
|
|
172
183
|
maxFeePerGas: newGasPrice.maxFeePerGas,
|
|
@@ -197,9 +208,9 @@ export class L1TxUtils {
|
|
|
197
208
|
* @param gasConfig - Optional gas configuration
|
|
198
209
|
* @returns The receipt of the successful transaction
|
|
199
210
|
*/
|
|
200
|
-
async sendAndMonitorTransaction(request, gasConfig) {
|
|
201
|
-
const { txHash, gasLimit } = await this.sendTransaction(request, gasConfig);
|
|
202
|
-
return this.monitorTransaction(request, txHash, { gasLimit }, gasConfig);
|
|
211
|
+
async sendAndMonitorTransaction(request, gasConfig, blobInputs) {
|
|
212
|
+
const { txHash, gasLimit } = await this.sendTransaction(request, gasConfig, blobInputs);
|
|
213
|
+
return this.monitorTransaction(request, txHash, { gasLimit }, gasConfig, blobInputs);
|
|
203
214
|
}
|
|
204
215
|
/**
|
|
205
216
|
* Gets the current gas price with bounds checking
|
|
@@ -250,12 +261,22 @@ export class L1TxUtils {
|
|
|
250
261
|
/**
|
|
251
262
|
* Estimates gas and adds buffer
|
|
252
263
|
*/
|
|
253
|
-
async estimateGas(account, request, _gasConfig) {
|
|
264
|
+
async estimateGas(account, request, _gasConfig, _blobInputs) {
|
|
254
265
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
255
|
-
|
|
266
|
+
let initialEstimate = 0n;
|
|
267
|
+
// Viem does not allow blobs to be sent via public client's estimate gas, so any estimation will fail.
|
|
268
|
+
// Strangely, the only way to get gas and send blobs is prepareTransactionRequest().
|
|
269
|
+
// See: https://github.com/wevm/viem/issues/2075
|
|
270
|
+
if (_blobInputs) {
|
|
271
|
+
initialEstimate = (await this.walletClient.prepareTransactionRequest({ account, ...request, ..._blobInputs }))
|
|
272
|
+
.gas;
|
|
273
|
+
}
|
|
274
|
+
else {
|
|
275
|
+
initialEstimate = await this.publicClient.estimateGas({ account, ...request });
|
|
276
|
+
}
|
|
256
277
|
// Add buffer based on either fixed amount or percentage
|
|
257
278
|
const withBuffer = initialEstimate + (initialEstimate * (gasConfig.gasLimitBufferPercentage ?? 0n)) / 100n;
|
|
258
279
|
return withBuffer;
|
|
259
280
|
}
|
|
260
281
|
}
|
|
261
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1_tx_utils.js","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"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"}
|
|
282
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1_tx_utils.js","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAEL,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEhD,OAAO,EAUL,UAAU,GACX,MAAM,MAAM,CAAC;AAEd,6BAA6B;AAC7B,6BAA6B;AAC7B,wCAAwC;AAExC,MAAM,SAAS,GAAG,WAAc,CAAC;AAEjC,wEAAwE;AACxE,4HAA4H;AAC5H,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAE5C,kCAAkC;AAClC,MAAM,aAAa,GAAG,KAAM,CAAC;AA8C7B,MAAM,CAAC,MAAM,uBAAuB,GAAwC;IAC1E,wBAAwB,EAAE;QACxB,WAAW,EAAE,6DAA6D;QAC1E,GAAG,EAAE,gCAAgC;QACrC,GAAG,kBAAkB,CAAC,GAAG,CAAC;KAC3B;IACD,OAAO,EAAE;QACP,WAAW,EAAE,2BAA2B;QACxC,GAAG,EAAE,kBAAkB;QACvB,GAAG,kBAAkB,CAAC,EAAE,CAAC;KAC1B;IACD,OAAO,EAAE;QACP,WAAW,EAAE,2BAA2B;QACxC,GAAG,EAAE,kBAAkB;QACvB,GAAG,kBAAkB,CAAC,IAAI,CAAC;KAC5B;IACD,yBAAyB,EAAE;QACzB,WAAW,EAAE,gEAAgE;QAC7E,GAAG,EAAE,iCAAiC;QACtC,GAAG,kBAAkB,CAAC,GAAG,CAAC;KAC3B;IACD,8BAA8B,EAAE;QAC9B,WAAW,EAAE,sEAAsE;QACnF,GAAG,EAAE,uCAAuC;QAC5C,GAAG,kBAAkB,CAAC,GAAG,CAAC;KAC3B;IACD,WAAW,EAAE;QACX,WAAW,EAAE,qCAAqC;QAClD,GAAG,EAAE,4BAA4B;QACjC,GAAG,kBAAkB,CAAC,CAAC,CAAC;KACzB;IACD,eAAe,EAAE;QACf,WAAW,EAAE,8BAA8B;QAC3C,GAAG,EAAE,iCAAiC;QACtC,GAAG,kBAAkB,CAAC,KAAM,CAAC;KAC9B;IACD,WAAW,EAAE;QACX,WAAW,EAAE,wCAAwC;QACrD,GAAG,EAAE,6BAA6B;QAClC,GAAG,kBAAkB,CAAC,KAAM,CAAC;KAC9B;IACD,WAAW,EAAE;QACX,WAAW,EAAE,8EAA8E;QAC3F,GAAG,EAAE,6BAA6B;QAClC,GAAG,kBAAkB,CAAC,MAAO,CAAC,EAAE,SAAS;KAC1C;IACD,6BAA6B,EAAE;QAC7B,WAAW,EAAE,8DAA8D;QAC3E,GAAG,EAAE,sCAAsC;QAC3C,GAAG,kBAAkB,CAAC,CAAC,CAAC;KACzB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,gBAAgB,CAAkB,uBAAuB,CAAC,CAAC;AAmBjG,MAAM,OAAO,SAAS;IAGpB,YACmB,YAA0B,EAC1B,YAAyD,EACzD,MAAe,EAChC,MAAiC;QAHhB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAA6C;QACzD,WAAM,GAAN,MAAM,CAAS;QAGhC,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,sBAAsB;YACzB,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;SAClB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,eAAe,CAC1B,OAAoB,EACpB,UAA6D,EAC7D,WAA0B;QAE1B,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QAC1C,IAAI,QAAgB,CAAC;QAErB,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACvB,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEnD,MAAM,UAAU,GAAG,WAAW,IAAI,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC;YACrD,GAAG,OAAO;YACV,GAAG,UAAU;YACb,GAAG,EAAE,QAAQ;YACb,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;SACpD,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,uBAAuB,MAAM,EAAE,EAAE;YACpD,QAAQ;YACR,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC/C,oBAAoB,EAAE,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC;SAChE,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAC7B,OAAoB,EACpB,aAAkB,EAClB,MAA4B,EAC5B,UAAqC,EACrC,WAA0B;QAE1B,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QAC1C,MAAM,UAAU,GAAG,WAAW,IAAI,EAAE,CAAC;QACrC,MAAM,yBAAyB,GAAG,GAAG,EAAE,CACrC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,6BAA6B,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAE/E,2DAA2D;QAC3D,MAAM,EAAE,GAAG,MAAM,KAAK,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAC/D,0BAA0B,aAAa,EAAE,EACzC,yBAAyB,EAAE,EAC3B,IAAI,CAAC,MAAM,EACX,IAAI,CACL,CAAC;QAEF,IAAI,EAAE,EAAE,KAAK,KAAK,SAAS,IAAI,EAAE,EAAE,KAAK,KAAK,IAAI,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,gCAAgC,aAAa,QAAQ,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC;QAEvB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC/C,IAAI,aAAa,GAAG,aAAa,CAAC;QAClC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,eAAe,CAAC;QACtC,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,OAAO,CAAC,UAAU,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC/F,IAAI,YAAY,GAAG,KAAK,EAAE,CAAC;oBACzB,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;wBAC5B,IAAI,CAAC;4BACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;4BACxE,IAAI,OAAO,EAAE,CAAC;gCACZ,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,kBAAkB,IAAI,QAAQ,CAAC,CAAC;gCACnD,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;oCAClC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,kBAAkB,IAAI,WAAW,CAAC,CAAC;gCACxD,CAAC;gCACD,OAAO,OAAO,CAAC;4BACjB,CAAC;wBACH,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gCAC7D,MAAM,GAAG,CAAC;4BACZ,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,2DAA2D;gBAC3D,MAAM,EAAE,GAAG,MAAM,KAAK,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAC/D,0BAA0B,aAAa,EAAE,EACzC,yBAAyB,EAAE,EAC3B,IAAI,CAAC,MAAM,EACX,IAAI,CACL,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC;gBAEhD,IAAI,EAAE,IAAI,UAAU,GAAG,SAAS,CAAC,WAAY,EAAE,CAAC;oBAC9C,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,kBAAkB,aAAa,0BAA0B,UAAU,KAAK,CAAC,CAAC;oBAE7F,kCAAkC;oBAClC,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;wBAC1B,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC;wBAChE,IAAI,UAAU,EAAE,CAAC;4BACf,MAAM;wBACR,CAAC;oBACH,CAAC;oBAED,MAAM,KAAK,CAAC,SAAS,CAAC,eAAgB,CAAC,CAAC;oBACxC,SAAS;gBACX,CAAC;gBAED,IAAI,UAAU,GAAG,SAAS,CAAC,WAAY,IAAI,QAAQ,GAAG,SAAS,CAAC,WAAY,EAAE,CAAC;oBAC7E,QAAQ,EAAE,CAAC;oBACX,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CACxC,SAAS,EACT,QAAQ,EACR,EAAE,CAAC,YAAY,IAAI,EAAE,CAAC,oBAAoB;wBACxC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,oBAAoB,EAAE,EAAE,CAAC,oBAAoB,EAAE;wBAClF,CAAC,CAAC,SAAS,CACd,CAAC;oBAEF,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,kBAAkB,aAAa,uCAAuC,QAAQ,IAAI,SAAS,CAAC,WAAW,GAAG;wBACxG,yBAAyB,UAAU,CAAC,WAAW,CAAC,oBAAoB,CAAC,OAAO,CAC/E,CAAC;oBAEF,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC;wBACtD,GAAG,OAAO;wBACV,GAAG,UAAU;wBACb,KAAK;wBACL,GAAG,EAAE,MAAM,CAAC,QAAQ;wBACpB,YAAY,EAAE,WAAW,CAAC,YAAY;wBACtC,oBAAoB,EAAE,WAAW,CAAC,oBAAoB;qBACvD,CAAC,CAAC;oBAEH,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;oBAC5B,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC/B,CAAC;gBACD,MAAM,KAAK,CAAC,SAAS,CAAC,eAAgB,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,uBAAuB,aAAa,GAAG,EAAE,GAAG,CAAC,CAAC;gBAChE,IAAI,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACtC,MAAM,GAAG,CAAC;gBACZ,CAAC;gBACD,MAAM,KAAK,CAAC,SAAS,CAAC,eAAgB,CAAC,CAAC;YAC1C,CAAC;YACD,6BAA6B;YAC7B,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC1B,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,GAAG,SAAS,CAAC,WAAY,CAAC;YACnE,CAAC;QACH,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,aAAa,YAAY,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,yBAAyB,CACpC,OAAoB,EACpB,SAA4D,EAC5D,UAAyB;QAEzB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACxF,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACvF,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,WAAW,CACvB,UAA4B,EAC5B,UAAkB,CAAC,EACnB,gBAA8D;QAE9D,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC;QAE1C,4CAA4C;QAC5C,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,4BAA4B,EAAE,CAAC;QACzE,IAAI,YAAY,GAAG,OAAO,CAAC;QAE3B,2DAA2D;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAY,GAAG,aAAa,CAAC,CAAC;QACpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,mDAAmD;YACnD,YAAY,GAAG,CAAC,YAAY,GAAG,CAAC,KAAM,GAAG,IAAI,CAAC,CAAC,GAAG,KAAM,CAAC;QAC3D,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,UAAU,GACd,SAAS,CAAC,8BAA8B,IAAI,sBAAsB,CAAC,8BAA+B,CAAC;YACrG,MAAM,cAAc,GAClB,UAAU,GAAG,+BAA+B,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,+BAA+B,CAAC;YAE9F,4DAA4D;YAC5D,MAAM,cAAc,GAAG,CAAC,gBAAiB,CAAC,oBAAoB,GAAG,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,GAAG,IAAI,CAAC;YACjG,MAAM,SAAS,GAAG,CAAC,gBAAiB,CAAC,YAAY,GAAG,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,GAAG,IAAI,CAAC;YAEpF,mCAAmC;YACnC,YAAY,IAAI,WAAW,CAAC;YAE5B,yEAAyE;YACzE,WAAW,GAAG,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC;YAC1E,YAAY,GAAG,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,wCAAwC;YACxC,WAAW,GAAG,CAAC,WAAW,GAAG,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YAC1F,YAAY,IAAI,WAAW,CAAC;QAC9B,CAAC;QAED,iCAAiC;QACjC,MAAM,YAAY,GAAG,SAAS,CAAC,OAAQ,GAAG,SAAS,CAAC;QACpD,YAAY,GAAG,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC;QAEzE,6CAA6C;QAC7C,MAAM,oBAAoB,GAAG,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;QAErF,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,oBAAoB,EAAE;YACvC,OAAO;YACP,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;YAC5B,YAAY,EAAE,UAAU,CAAC,YAAY,CAAC;YACtC,oBAAoB,EAAE,UAAU,CAAC,oBAAoB,CAAC;SACvD,CAAC,CAAC;QAEH,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IAChD,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,WAAW,CACtB,OAAgB,EAChB,OAAoB,EACpB,UAA4B,EAC5B,WAA0B;QAE1B,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACpD,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,sGAAsG;QACtG,oFAAoF;QACpF,gDAAgD;QAChD,IAAI,WAAW,EAAE,CAAC;YAChB,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;iBAC3G,GAAG,CAAC;QACT,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,wDAAwD;QACxD,MAAM,UAAU,GAAG,eAAe,GAAG,CAAC,eAAe,GAAG,CAAC,SAAS,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;QAE3G,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { EthCheatCodes } from '../eth_cheat_codes.js';
|
|
2
|
+
/**
|
|
3
|
+
* A class that provides utility functions for interacting with ethereum (L1) dumping/loading state to/from a file.
|
|
4
|
+
* It is separated to avoid importing fs in the main EthCheatCodes class, which might be used in the browser.
|
|
5
|
+
*/
|
|
6
|
+
export declare class EthCheatCodesWithState extends EthCheatCodes {
|
|
7
|
+
/**
|
|
8
|
+
* Dumps the current chain state to a file.
|
|
9
|
+
* @param fileName - The file name to dump state into
|
|
10
|
+
*/
|
|
11
|
+
dumpChainState(fileName: string): Promise<void>;
|
|
12
|
+
/**
|
|
13
|
+
* Loads the chain state from a file.
|
|
14
|
+
* @param fileName - The file name to load state from
|
|
15
|
+
*/
|
|
16
|
+
loadChainState(fileName: string): Promise<void>;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=eth_cheat_codes_with_state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eth_cheat_codes_with_state.d.ts","sourceRoot":"","sources":["../../src/test/eth_cheat_codes_with_state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,aAAa;IACvD;;;OAGG;IACU,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5D;;;OAGG;IACU,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ7D"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import { EthCheatCodes } from '../eth_cheat_codes.js';
|
|
3
|
+
/**
|
|
4
|
+
* A class that provides utility functions for interacting with ethereum (L1) dumping/loading state to/from a file.
|
|
5
|
+
* It is separated to avoid importing fs in the main EthCheatCodes class, which might be used in the browser.
|
|
6
|
+
*/
|
|
7
|
+
export class EthCheatCodesWithState extends EthCheatCodes {
|
|
8
|
+
/**
|
|
9
|
+
* Dumps the current chain state to a file.
|
|
10
|
+
* @param fileName - The file name to dump state into
|
|
11
|
+
*/
|
|
12
|
+
async dumpChainState(fileName) {
|
|
13
|
+
const res = await this.rpcCall('hardhat_dumpState', []);
|
|
14
|
+
if (res.error) {
|
|
15
|
+
throw new Error(`Error dumping state: ${res.error.message}`);
|
|
16
|
+
}
|
|
17
|
+
const jsonContent = JSON.stringify(res.result);
|
|
18
|
+
fs.writeFileSync(`${fileName}.json`, jsonContent, 'utf8');
|
|
19
|
+
this.logger.verbose(`Dumped state to ${fileName}`);
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Loads the chain state from a file.
|
|
23
|
+
* @param fileName - The file name to load state from
|
|
24
|
+
*/
|
|
25
|
+
async loadChainState(fileName) {
|
|
26
|
+
const data = JSON.parse(fs.readFileSync(`${fileName}.json`, 'utf8'));
|
|
27
|
+
const res = await this.rpcCall('hardhat_loadState', [data]);
|
|
28
|
+
if (res.error) {
|
|
29
|
+
throw new Error(`Error loading state: ${res.error.message}`);
|
|
30
|
+
}
|
|
31
|
+
this.logger.verbose(`Loaded state from ${fileName}`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRoX2NoZWF0X2NvZGVzX3dpdGhfc3RhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9ldGhfY2hlYXRfY29kZXNfd2l0aF9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFcEIsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXREOzs7R0FHRztBQUNILE1BQU0sT0FBTyxzQkFBdUIsU0FBUSxhQUFhO0lBQ3ZEOzs7T0FHRztJQUNJLEtBQUssQ0FBQyxjQUFjLENBQUMsUUFBZ0I7UUFDMUMsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLG1CQUFtQixFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3hELElBQUksR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2QsTUFBTSxJQUFJLEtBQUssQ0FBQyx3QkFBd0IsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQy9ELENBQUM7UUFDRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUMvQyxFQUFFLENBQUMsYUFBYSxDQUFDLEdBQUcsUUFBUSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQzFELElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLG1CQUFtQixRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ3JELENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsY0FBYyxDQUFDLFFBQWdCO1FBQzFDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxHQUFHLFFBQVEsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDckUsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLG1CQUFtQixFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM1RCxJQUFJLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNkLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUMvRCxDQUFDO1FBQ0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMscUJBQXFCLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDdkQsQ0FBQztDQUNGIn0=
|
package/dest/test/index.d.ts
CHANGED
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,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iCAAiC,CAAC"}
|
package/dest/test/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export * from './start_anvil.js';
|
|
2
2
|
export * from './tx_delayer.js';
|
|
3
|
-
|
|
3
|
+
export * from './eth_cheat_codes_with_state.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxpQ0FBaUMsQ0FBQyJ9
|
|
@@ -13,6 +13,7 @@ export interface Delayer {
|
|
|
13
13
|
/**
|
|
14
14
|
* Returns a new client (without modifying the one passed in) with an injected tx delayer.
|
|
15
15
|
* The delayer can be used to hold off the next tx to be sent until a given block number.
|
|
16
|
+
* TODO(#10824): This doesn't play along well with blob txs for some reason.
|
|
16
17
|
*/
|
|
17
18
|
export declare function withDelayer<T extends WalletClient>(client: T, opts: {
|
|
18
19
|
ethereumSlotDuration: bigint | number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAER,KAAK,YAAY,EAKlB,MAAM,MAAM,CAAC;AAEd,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAgBxG;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAuB5G;AAED,MAAM,WAAW,OAAO;IACtB,gGAAgG;IAChG,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,8EAA8E;IAC9E,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxE,wEAAwE;IACxE,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC3E;AAwBD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,MAAM,EAAE,CAAC,EACT,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA+DjC"}
|
package/dest/test/tx_delayer.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { omit } from '@aztec/foundation/collection';
|
|
1
2
|
import { createLogger } from '@aztec/foundation/log';
|
|
2
3
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
3
4
|
import { inspect } from 'util';
|
|
4
|
-
import { keccak256, publicActions, walletActions, } from 'viem';
|
|
5
|
+
import { keccak256, parseTransaction, publicActions, walletActions, } from 'viem';
|
|
5
6
|
export function waitUntilBlock(client, blockNumber, logger) {
|
|
6
7
|
const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
|
|
7
8
|
? client
|
|
@@ -48,6 +49,7 @@ class DelayerImpl {
|
|
|
48
49
|
/**
|
|
49
50
|
* Returns a new client (without modifying the one passed in) with an injected tx delayer.
|
|
50
51
|
* The delayer can be used to hold off the next tx to be sent until a given block number.
|
|
52
|
+
* TODO(#10824): This doesn't play along well with blob txs for some reason.
|
|
51
53
|
*/
|
|
52
54
|
export function withDelayer(client, opts) {
|
|
53
55
|
const logger = createLogger('ethereum:tx_delayer');
|
|
@@ -69,15 +71,24 @@ export function withDelayer(client, opts) {
|
|
|
69
71
|
// Compute the tx hash manually so we emulate sendRawTransaction response
|
|
70
72
|
const { serializedTransaction } = args[0];
|
|
71
73
|
const txHash = keccak256(serializedTransaction);
|
|
72
|
-
logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}
|
|
74
|
+
logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`, {
|
|
75
|
+
argsLen: args.length,
|
|
76
|
+
...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
|
|
77
|
+
});
|
|
73
78
|
// Do not await here so we can return the tx hash immediately as if it had been sent on the spot.
|
|
74
79
|
// Instead, delay it so it lands on the desired block number or timestamp, assuming anvil will
|
|
75
80
|
// mine it immediately.
|
|
76
81
|
void wait
|
|
77
82
|
.then(async () => {
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
83
|
+
const clientTxHash = await client.sendRawTransaction(...args);
|
|
84
|
+
if (clientTxHash !== txHash) {
|
|
85
|
+
logger.error(`Tx hash returned by the client does not match computed one`, {
|
|
86
|
+
clientTxHash,
|
|
87
|
+
computedTxHash: txHash,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
logger.info(`Sent previously delayed tx ${clientTxHash} to land on ${inspect(waitUntil)}`);
|
|
91
|
+
delayer.txs.push(clientTxHash);
|
|
81
92
|
})
|
|
82
93
|
.catch(err => logger.error(`Error sending tx after delay`, err));
|
|
83
94
|
return Promise.resolve(txHash);
|
|
@@ -99,4 +110,4 @@ export function withDelayer(client, opts) {
|
|
|
99
110
|
}));
|
|
100
111
|
return { client: extended, delayer };
|
|
101
112
|
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZGVsYXllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3R4X2RlbGF5ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3BELE9BQU8sRUFBZSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFckQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMvQixPQUFPLEVBS0wsU0FBUyxFQUNULGdCQUFnQixFQUNoQixhQUFhLEVBQ2IsYUFBYSxHQUNkLE1BQU0sTUFBTSxDQUFDO0FBRWQsTUFBTSxVQUFVLGNBQWMsQ0FBbUIsTUFBUyxFQUFFLFdBQTRCLEVBQUUsTUFBZTtJQUN2RyxNQUFNLFlBQVksR0FDaEIsZ0JBQWdCLElBQUksTUFBTSxJQUFJLE9BQU8sTUFBTSxDQUFDLGNBQWMsS0FBSyxVQUFVO1FBQ3ZFLENBQUMsQ0FBRSxNQUFrQztRQUNyQyxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUVuQyxPQUFPLFVBQVUsQ0FDZixLQUFLLElBQUksRUFBRTtRQUNULE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDL0UsTUFBTSxFQUFFLEtBQUssQ0FBQyxtQkFBbUIsa0JBQWtCLG1CQUFtQixXQUFXLEdBQUcsQ0FBQyxDQUFDO1FBQ3RGLE9BQU8sa0JBQWtCLElBQUksTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ25ELENBQUMsRUFDRCx1QkFBdUIsV0FBVyxFQUFFLEVBQ3BDLEVBQUUsRUFDRixHQUFHLENBQ0osQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsb0JBQW9CLENBQW1CLE1BQVMs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
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/ethereum",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.68.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
7
7
|
"./test": "./dest/test/index.js",
|
|
8
|
-
"./contracts": "./dest/contracts/index.js"
|
|
8
|
+
"./contracts": "./dest/contracts/index.js",
|
|
9
|
+
"./l1-contract-addresses": "./dest/l1_contract_addresses.js"
|
|
9
10
|
},
|
|
10
11
|
"typedocOptions": {
|
|
11
12
|
"entryPoints": [
|
|
@@ -22,14 +23,14 @@
|
|
|
22
23
|
"formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
|
|
23
24
|
"start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
|
|
24
25
|
"start": "node ./dest/index.js",
|
|
25
|
-
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests"
|
|
26
|
+
"test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
|
|
26
27
|
},
|
|
27
28
|
"inherits": [
|
|
28
29
|
"../package.common.json"
|
|
29
30
|
],
|
|
30
31
|
"dependencies": {
|
|
31
|
-
"@aztec/foundation": "0.
|
|
32
|
-
"@aztec/l1-artifacts": "0.
|
|
32
|
+
"@aztec/foundation": "0.68.1",
|
|
33
|
+
"@aztec/l1-artifacts": "0.68.1",
|
|
33
34
|
"@viem/anvil": "^0.0.10",
|
|
34
35
|
"dotenv": "^16.0.3",
|
|
35
36
|
"get-port": "^7.1.0",
|
|
@@ -80,9 +81,9 @@
|
|
|
80
81
|
],
|
|
81
82
|
"reporters": [
|
|
82
83
|
[
|
|
83
|
-
"
|
|
84
|
+
"jest-silent-reporter",
|
|
84
85
|
{
|
|
85
|
-
"
|
|
86
|
+
"useDots": true
|
|
86
87
|
}
|
|
87
88
|
]
|
|
88
89
|
],
|
package/src/config.ts
CHANGED
|
@@ -13,13 +13,13 @@ export type L1ContractsConfig = {
|
|
|
13
13
|
aztecEpochProofClaimWindowInL2Slots: number;
|
|
14
14
|
};
|
|
15
15
|
|
|
16
|
-
export const DefaultL1ContractsConfig
|
|
16
|
+
export const DefaultL1ContractsConfig = {
|
|
17
17
|
ethereumSlotDuration: 12,
|
|
18
18
|
aztecSlotDuration: 24,
|
|
19
19
|
aztecEpochDuration: 16,
|
|
20
20
|
aztecTargetCommitteeSize: 48,
|
|
21
21
|
aztecEpochProofClaimWindowInL2Slots: 13,
|
|
22
|
-
};
|
|
22
|
+
} satisfies L1ContractsConfig;
|
|
23
23
|
|
|
24
24
|
export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> = {
|
|
25
25
|
ethereumSlotDuration: {
|
package/src/eth_cheat_codes.ts
CHANGED
|
@@ -3,7 +3,6 @@ import { keccak256 } from '@aztec/foundation/crypto';
|
|
|
3
3
|
import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
5
|
|
|
6
|
-
import fs from 'fs';
|
|
7
6
|
import { type Hex } from 'viem';
|
|
8
7
|
|
|
9
8
|
/**
|
|
@@ -78,7 +77,7 @@ export class EthCheatCodes {
|
|
|
78
77
|
*/
|
|
79
78
|
public async mine(numberOfBlocks = 1): Promise<void> {
|
|
80
79
|
await this.doMine(numberOfBlocks);
|
|
81
|
-
this.logger.
|
|
80
|
+
this.logger.warn(`Mined ${numberOfBlocks} L1 blocks`);
|
|
82
81
|
}
|
|
83
82
|
|
|
84
83
|
private async doMine(numberOfBlocks = 1): Promise<void> {
|
|
@@ -108,7 +107,7 @@ export class EthCheatCodes {
|
|
|
108
107
|
if (res.error) {
|
|
109
108
|
throw new Error(`Error setting balance for ${account}: ${res.error.message}`);
|
|
110
109
|
}
|
|
111
|
-
this.logger.
|
|
110
|
+
this.logger.warn(`Set balance for ${account} to ${balance}`);
|
|
112
111
|
}
|
|
113
112
|
|
|
114
113
|
/**
|
|
@@ -120,7 +119,7 @@ export class EthCheatCodes {
|
|
|
120
119
|
if (res.error) {
|
|
121
120
|
throw new Error(`Error setting block interval: ${res.error.message}`);
|
|
122
121
|
}
|
|
123
|
-
this.logger.
|
|
122
|
+
this.logger.warn(`Set L1 block interval to ${interval}`);
|
|
124
123
|
}
|
|
125
124
|
|
|
126
125
|
/**
|
|
@@ -132,7 +131,7 @@ export class EthCheatCodes {
|
|
|
132
131
|
if (res.error) {
|
|
133
132
|
throw new Error(`Error setting next block base fee per gas: ${res.error.message}`);
|
|
134
133
|
}
|
|
135
|
-
this.logger.
|
|
134
|
+
this.logger.warn(`Set L1 next block base fee per gas to ${baseFee}`);
|
|
136
135
|
}
|
|
137
136
|
|
|
138
137
|
/**
|
|
@@ -144,7 +143,7 @@ export class EthCheatCodes {
|
|
|
144
143
|
if (res.error) {
|
|
145
144
|
throw new Error(`Error setting interval mining: ${res.error.message}`);
|
|
146
145
|
}
|
|
147
|
-
this.logger.
|
|
146
|
+
this.logger.warn(`Set L1 interval mining to ${seconds} seconds`);
|
|
148
147
|
}
|
|
149
148
|
|
|
150
149
|
/**
|
|
@@ -156,7 +155,7 @@ export class EthCheatCodes {
|
|
|
156
155
|
if (res.error) {
|
|
157
156
|
throw new Error(`Error setting automine: ${res.error.message}`);
|
|
158
157
|
}
|
|
159
|
-
this.logger.
|
|
158
|
+
this.logger.warn(`Set L1 automine to ${automine}`);
|
|
160
159
|
}
|
|
161
160
|
|
|
162
161
|
/**
|
|
@@ -168,7 +167,7 @@ export class EthCheatCodes {
|
|
|
168
167
|
if (res.error) {
|
|
169
168
|
throw new Error(`Error dropping transaction: ${res.error.message}`);
|
|
170
169
|
}
|
|
171
|
-
this.logger.
|
|
170
|
+
this.logger.warn(`Dropped transaction ${txHash}`);
|
|
172
171
|
}
|
|
173
172
|
|
|
174
173
|
/**
|
|
@@ -180,47 +179,22 @@ export class EthCheatCodes {
|
|
|
180
179
|
if (res.error) {
|
|
181
180
|
throw new Error(`Error setting next block timestamp: ${res.error.message}`);
|
|
182
181
|
}
|
|
183
|
-
this.logger.
|
|
182
|
+
this.logger.warn(`Set L1 next block timestamp to ${timestamp}`);
|
|
184
183
|
}
|
|
185
184
|
|
|
186
185
|
/**
|
|
187
186
|
* Set the next block timestamp and mines the block
|
|
188
187
|
* @param timestamp - The timestamp to set the next block to
|
|
189
188
|
*/
|
|
190
|
-
public async warp(timestamp: number | bigint): Promise<void> {
|
|
189
|
+
public async warp(timestamp: number | bigint, silent = false): Promise<void> {
|
|
191
190
|
const res = await this.rpcCall('evm_setNextBlockTimestamp', [Number(timestamp)]);
|
|
192
191
|
if (res.error) {
|
|
193
192
|
throw new Error(`Error warping: ${res.error.message}`);
|
|
194
193
|
}
|
|
195
194
|
await this.doMine();
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
/**
|
|
200
|
-
* Dumps the current chain state to a file.
|
|
201
|
-
* @param fileName - The file name to dump state into
|
|
202
|
-
*/
|
|
203
|
-
public async dumpChainState(fileName: string): Promise<void> {
|
|
204
|
-
const res = await this.rpcCall('hardhat_dumpState', []);
|
|
205
|
-
if (res.error) {
|
|
206
|
-
throw new Error(`Error dumping state: ${res.error.message}`);
|
|
207
|
-
}
|
|
208
|
-
const jsonContent = JSON.stringify(res.result);
|
|
209
|
-
fs.writeFileSync(`${fileName}.json`, jsonContent, 'utf8');
|
|
210
|
-
this.logger.verbose(`Dumped state to ${fileName}`);
|
|
211
|
-
}
|
|
212
|
-
|
|
213
|
-
/**
|
|
214
|
-
* Loads the chain state from a file.
|
|
215
|
-
* @param fileName - The file name to load state from
|
|
216
|
-
*/
|
|
217
|
-
public async loadChainState(fileName: string): Promise<void> {
|
|
218
|
-
const data = JSON.parse(fs.readFileSync(`${fileName}.json`, 'utf8'));
|
|
219
|
-
const res = await this.rpcCall('hardhat_loadState', [data]);
|
|
220
|
-
if (res.error) {
|
|
221
|
-
throw new Error(`Error loading state: ${res.error.message}`);
|
|
195
|
+
if (!silent) {
|
|
196
|
+
this.logger.warn(`Warped L1 timestamp to ${timestamp}`);
|
|
222
197
|
}
|
|
223
|
-
this.logger.verbose(`Loaded state from ${fileName}`);
|
|
224
198
|
}
|
|
225
199
|
|
|
226
200
|
/**
|
|
@@ -246,7 +220,7 @@ export class EthCheatCodes {
|
|
|
246
220
|
if (res.error) {
|
|
247
221
|
throw new Error(`Error setting storage for contract ${contract} at ${slot}: ${res.error.message}`);
|
|
248
222
|
}
|
|
249
|
-
this.logger.
|
|
223
|
+
this.logger.warn(`Set L1 storage for contract ${contract} at ${slot} to ${value}`);
|
|
250
224
|
}
|
|
251
225
|
|
|
252
226
|
/**
|
|
@@ -270,7 +244,7 @@ export class EthCheatCodes {
|
|
|
270
244
|
if (res.error) {
|
|
271
245
|
throw new Error(`Error impersonating ${who}: ${res.error.message}`);
|
|
272
246
|
}
|
|
273
|
-
this.logger.
|
|
247
|
+
this.logger.warn(`Impersonating ${who}`);
|
|
274
248
|
}
|
|
275
249
|
|
|
276
250
|
/**
|
|
@@ -282,7 +256,7 @@ export class EthCheatCodes {
|
|
|
282
256
|
if (res.error) {
|
|
283
257
|
throw new Error(`Error when stopping the impersonation of ${who}: ${res.error.message}`);
|
|
284
258
|
}
|
|
285
|
-
this.logger.
|
|
259
|
+
this.logger.warn(`Stopped impersonating ${who}`);
|
|
286
260
|
}
|
|
287
261
|
|
|
288
262
|
/**
|
|
@@ -295,7 +269,7 @@ export class EthCheatCodes {
|
|
|
295
269
|
if (res.error) {
|
|
296
270
|
throw new Error(`Error setting bytecode for ${contract}: ${res.error.message}`);
|
|
297
271
|
}
|
|
298
|
-
this.logger.
|
|
272
|
+
this.logger.warn(`Set bytecode for ${contract} to ${bytecode}`);
|
|
299
273
|
}
|
|
300
274
|
|
|
301
275
|
/**
|
package/src/l1_tx_utils.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { times } from '@aztec/foundation/collection';
|
|
1
2
|
import {
|
|
2
3
|
type ConfigMappingsType,
|
|
3
4
|
bigintConfigHelper,
|
|
@@ -71,6 +72,11 @@ export interface L1TxUtilsConfig {
|
|
|
71
72
|
* How long to wait for a tx to be mined before giving up
|
|
72
73
|
*/
|
|
73
74
|
txTimeoutMs?: number;
|
|
75
|
+
/**
|
|
76
|
+
* How many attempts will be done to get a tx after it was sent?
|
|
77
|
+
* First attempt is done at 1s, second at 2s, third at 3s, etc.
|
|
78
|
+
*/
|
|
79
|
+
txPropagationMaxQueryAttempts?: number;
|
|
74
80
|
}
|
|
75
81
|
|
|
76
82
|
export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
|
|
@@ -119,6 +125,11 @@ export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
|
|
|
119
125
|
env: 'L1_TX_MONITOR_TX_TIMEOUT_MS',
|
|
120
126
|
...numberConfigHelper(300_000), // 5 mins
|
|
121
127
|
},
|
|
128
|
+
txPropagationMaxQueryAttempts: {
|
|
129
|
+
description: 'How many attempts will be done to get a tx after it was sent',
|
|
130
|
+
env: 'L1_TX_PROPAGATION_MAX_QUERY_ATTEMPTS',
|
|
131
|
+
...numberConfigHelper(3),
|
|
132
|
+
},
|
|
122
133
|
};
|
|
123
134
|
|
|
124
135
|
export const defaultL1TxUtilsConfig = getDefaultConfig<L1TxUtilsConfig>(l1TxUtilsConfigMappings);
|
|
@@ -129,6 +140,12 @@ export interface L1TxRequest {
|
|
|
129
140
|
value?: bigint;
|
|
130
141
|
}
|
|
131
142
|
|
|
143
|
+
export interface L1BlobInputs {
|
|
144
|
+
blobs: Uint8Array[];
|
|
145
|
+
kzg: any;
|
|
146
|
+
maxFeePerBlobGas: bigint;
|
|
147
|
+
}
|
|
148
|
+
|
|
132
149
|
interface GasPrice {
|
|
133
150
|
maxFeePerGas: bigint;
|
|
134
151
|
maxPriorityFeePerGas: bigint;
|
|
@@ -158,6 +175,7 @@ export class L1TxUtils {
|
|
|
158
175
|
public async sendTransaction(
|
|
159
176
|
request: L1TxRequest,
|
|
160
177
|
_gasConfig?: Partial<L1TxUtilsConfig> & { fixedGas?: bigint },
|
|
178
|
+
_blobInputs?: L1BlobInputs,
|
|
161
179
|
): Promise<{ txHash: Hex; gasLimit: bigint; gasPrice: GasPrice }> {
|
|
162
180
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
163
181
|
const account = this.walletClient.account;
|
|
@@ -171,8 +189,10 @@ export class L1TxUtils {
|
|
|
171
189
|
|
|
172
190
|
const gasPrice = await this.getGasPrice(gasConfig);
|
|
173
191
|
|
|
192
|
+
const blobInputs = _blobInputs || {};
|
|
174
193
|
const txHash = await this.walletClient.sendTransaction({
|
|
175
194
|
...request,
|
|
195
|
+
...blobInputs,
|
|
176
196
|
gas: gasLimit,
|
|
177
197
|
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
178
198
|
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
@@ -199,15 +219,19 @@ export class L1TxUtils {
|
|
|
199
219
|
initialTxHash: Hex,
|
|
200
220
|
params: { gasLimit: bigint },
|
|
201
221
|
_gasConfig?: Partial<L1TxUtilsConfig>,
|
|
222
|
+
_blobInputs?: L1BlobInputs,
|
|
202
223
|
): Promise<TransactionReceipt> {
|
|
203
224
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
204
225
|
const account = this.walletClient.account;
|
|
226
|
+
const blobInputs = _blobInputs || {};
|
|
227
|
+
const makeGetTransactionBackoff = () =>
|
|
228
|
+
makeBackoff(times(gasConfig.txPropagationMaxQueryAttempts ?? 3, i => i + 1));
|
|
205
229
|
|
|
206
230
|
// Retry a few times, in case the tx is not yet propagated.
|
|
207
231
|
const tx = await retry<GetTransactionReturnType>(
|
|
208
232
|
() => this.publicClient.getTransaction({ hash: initialTxHash }),
|
|
209
233
|
`Getting L1 transaction ${initialTxHash}`,
|
|
210
|
-
|
|
234
|
+
makeGetTransactionBackoff(),
|
|
211
235
|
this.logger,
|
|
212
236
|
true,
|
|
213
237
|
);
|
|
@@ -250,7 +274,7 @@ export class L1TxUtils {
|
|
|
250
274
|
const tx = await retry<GetTransactionReturnType>(
|
|
251
275
|
() => this.publicClient.getTransaction({ hash: currentTxHash }),
|
|
252
276
|
`Getting L1 transaction ${currentTxHash}`,
|
|
253
|
-
|
|
277
|
+
makeGetTransactionBackoff(),
|
|
254
278
|
this.logger,
|
|
255
279
|
true,
|
|
256
280
|
);
|
|
@@ -288,6 +312,7 @@ export class L1TxUtils {
|
|
|
288
312
|
|
|
289
313
|
currentTxHash = await this.walletClient.sendTransaction({
|
|
290
314
|
...request,
|
|
315
|
+
...blobInputs,
|
|
291
316
|
nonce,
|
|
292
317
|
gas: params.gasLimit,
|
|
293
318
|
maxFeePerGas: newGasPrice.maxFeePerGas,
|
|
@@ -322,9 +347,10 @@ export class L1TxUtils {
|
|
|
322
347
|
public async sendAndMonitorTransaction(
|
|
323
348
|
request: L1TxRequest,
|
|
324
349
|
gasConfig?: Partial<L1TxUtilsConfig> & { fixedGas?: bigint },
|
|
350
|
+
blobInputs?: L1BlobInputs,
|
|
325
351
|
): Promise<TransactionReceipt> {
|
|
326
|
-
const { txHash, gasLimit } = await this.sendTransaction(request, gasConfig);
|
|
327
|
-
return this.monitorTransaction(request, txHash, { gasLimit }, gasConfig);
|
|
352
|
+
const { txHash, gasLimit } = await this.sendTransaction(request, gasConfig, blobInputs);
|
|
353
|
+
return this.monitorTransaction(request, txHash, { gasLimit }, gasConfig, blobInputs);
|
|
328
354
|
}
|
|
329
355
|
|
|
330
356
|
/**
|
|
@@ -392,9 +418,23 @@ export class L1TxUtils {
|
|
|
392
418
|
/**
|
|
393
419
|
* Estimates gas and adds buffer
|
|
394
420
|
*/
|
|
395
|
-
public async estimateGas(
|
|
421
|
+
public async estimateGas(
|
|
422
|
+
account: Account,
|
|
423
|
+
request: L1TxRequest,
|
|
424
|
+
_gasConfig?: L1TxUtilsConfig,
|
|
425
|
+
_blobInputs?: L1BlobInputs,
|
|
426
|
+
): Promise<bigint> {
|
|
396
427
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
397
|
-
|
|
428
|
+
let initialEstimate = 0n;
|
|
429
|
+
// Viem does not allow blobs to be sent via public client's estimate gas, so any estimation will fail.
|
|
430
|
+
// Strangely, the only way to get gas and send blobs is prepareTransactionRequest().
|
|
431
|
+
// See: https://github.com/wevm/viem/issues/2075
|
|
432
|
+
if (_blobInputs) {
|
|
433
|
+
initialEstimate = (await this.walletClient.prepareTransactionRequest({ account, ...request, ..._blobInputs }))
|
|
434
|
+
.gas;
|
|
435
|
+
} else {
|
|
436
|
+
initialEstimate = await this.publicClient.estimateGas({ account, ...request });
|
|
437
|
+
}
|
|
398
438
|
|
|
399
439
|
// Add buffer based on either fixed amount or percentage
|
|
400
440
|
const withBuffer = initialEstimate + (initialEstimate * (gasConfig.gasLimitBufferPercentage ?? 0n)) / 100n;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
|
|
3
|
+
import { EthCheatCodes } from '../eth_cheat_codes.js';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* A class that provides utility functions for interacting with ethereum (L1) dumping/loading state to/from a file.
|
|
7
|
+
* It is separated to avoid importing fs in the main EthCheatCodes class, which might be used in the browser.
|
|
8
|
+
*/
|
|
9
|
+
export class EthCheatCodesWithState extends EthCheatCodes {
|
|
10
|
+
/**
|
|
11
|
+
* Dumps the current chain state to a file.
|
|
12
|
+
* @param fileName - The file name to dump state into
|
|
13
|
+
*/
|
|
14
|
+
public async dumpChainState(fileName: string): Promise<void> {
|
|
15
|
+
const res = await this.rpcCall('hardhat_dumpState', []);
|
|
16
|
+
if (res.error) {
|
|
17
|
+
throw new Error(`Error dumping state: ${res.error.message}`);
|
|
18
|
+
}
|
|
19
|
+
const jsonContent = JSON.stringify(res.result);
|
|
20
|
+
fs.writeFileSync(`${fileName}.json`, jsonContent, 'utf8');
|
|
21
|
+
this.logger.verbose(`Dumped state to ${fileName}`);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Loads the chain state from a file.
|
|
26
|
+
* @param fileName - The file name to load state from
|
|
27
|
+
*/
|
|
28
|
+
public async loadChainState(fileName: string): Promise<void> {
|
|
29
|
+
const data = JSON.parse(fs.readFileSync(`${fileName}.json`, 'utf8'));
|
|
30
|
+
const res = await this.rpcCall('hardhat_loadState', [data]);
|
|
31
|
+
if (res.error) {
|
|
32
|
+
throw new Error(`Error loading state: ${res.error.message}`);
|
|
33
|
+
}
|
|
34
|
+
this.logger.verbose(`Loaded state from ${fileName}`);
|
|
35
|
+
}
|
|
36
|
+
}
|
package/src/test/index.ts
CHANGED
package/src/test/tx_delayer.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { omit } from '@aztec/foundation/collection';
|
|
1
2
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
2
3
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
3
4
|
|
|
@@ -8,6 +9,7 @@ import {
|
|
|
8
9
|
type PublicClient,
|
|
9
10
|
type WalletClient,
|
|
10
11
|
keccak256,
|
|
12
|
+
parseTransaction,
|
|
11
13
|
publicActions,
|
|
12
14
|
walletActions,
|
|
13
15
|
} from 'viem';
|
|
@@ -89,6 +91,7 @@ class DelayerImpl implements Delayer {
|
|
|
89
91
|
/**
|
|
90
92
|
* Returns a new client (without modifying the one passed in) with an injected tx delayer.
|
|
91
93
|
* The delayer can be used to hold off the next tx to be sent until a given block number.
|
|
94
|
+
* TODO(#10824): This doesn't play along well with blob txs for some reason.
|
|
92
95
|
*/
|
|
93
96
|
export function withDelayer<T extends WalletClient>(
|
|
94
97
|
client: T,
|
|
@@ -116,16 +119,25 @@ export function withDelayer<T extends WalletClient>(
|
|
|
116
119
|
// Compute the tx hash manually so we emulate sendRawTransaction response
|
|
117
120
|
const { serializedTransaction } = args[0];
|
|
118
121
|
const txHash = keccak256(serializedTransaction);
|
|
119
|
-
logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}
|
|
122
|
+
logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`, {
|
|
123
|
+
argsLen: args.length,
|
|
124
|
+
...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
|
|
125
|
+
});
|
|
120
126
|
|
|
121
127
|
// Do not await here so we can return the tx hash immediately as if it had been sent on the spot.
|
|
122
128
|
// Instead, delay it so it lands on the desired block number or timestamp, assuming anvil will
|
|
123
129
|
// mine it immediately.
|
|
124
130
|
void wait
|
|
125
131
|
.then(async () => {
|
|
126
|
-
const
|
|
127
|
-
|
|
128
|
-
|
|
132
|
+
const clientTxHash = await client.sendRawTransaction(...args);
|
|
133
|
+
if (clientTxHash !== txHash) {
|
|
134
|
+
logger.error(`Tx hash returned by the client does not match computed one`, {
|
|
135
|
+
clientTxHash,
|
|
136
|
+
computedTxHash: txHash,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
logger.info(`Sent previously delayed tx ${clientTxHash} to land on ${inspect(waitUntil)}`);
|
|
140
|
+
delayer.txs.push(clientTxHash);
|
|
129
141
|
})
|
|
130
142
|
.catch(err => logger.error(`Error sending tx after delay`, err));
|
|
131
143
|
|