@aztec/aztec 5.0.0-nightly.20260421 → 5.0.0-nightly.20260423
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/testing/anvil_test_watcher.d.ts +7 -3
- package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
- package/dest/testing/anvil_test_watcher.js +4 -4
- package/dest/testing/index.d.ts +2 -2
- package/dest/testing/index.d.ts.map +1 -1
- package/package.json +33 -33
- package/scripts/aztec.sh +5 -1
- package/src/testing/anvil_test_watcher.ts +11 -3
- package/src/testing/index.ts +1 -1
|
@@ -2,6 +2,10 @@ import { EthCheatCodes } from '@aztec/ethereum/test';
|
|
|
2
2
|
import type { ViemClient } from '@aztec/ethereum/types';
|
|
3
3
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { TestDateProvider } from '@aztec/foundation/timer';
|
|
5
|
+
export type AnvilTestWatcherOpts = {
|
|
6
|
+
isLocalNetwork?: boolean;
|
|
7
|
+
isMarkingAsProven?: boolean;
|
|
8
|
+
};
|
|
5
9
|
/**
|
|
6
10
|
* Represents a watcher for a rollup contract.
|
|
7
11
|
*
|
|
@@ -13,6 +17,7 @@ export declare class AnvilTestWatcher {
|
|
|
13
17
|
private cheatcodes;
|
|
14
18
|
private dateProvider?;
|
|
15
19
|
private isLocalNetwork;
|
|
20
|
+
private isMarkingAsProven;
|
|
16
21
|
private rollup;
|
|
17
22
|
private rollupCheatCodes;
|
|
18
23
|
private l2SlotDuration;
|
|
@@ -20,11 +25,10 @@ export declare class AnvilTestWatcher {
|
|
|
20
25
|
private syncDateProviderPromise?;
|
|
21
26
|
private markingAsProvenRunningPromise?;
|
|
22
27
|
private logger;
|
|
23
|
-
private isMarkingAsProven;
|
|
24
28
|
private getPendingTxCount?;
|
|
25
29
|
private isSequencerBuilding?;
|
|
26
30
|
private unfilledSlotFirstSeen?;
|
|
27
|
-
constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
|
|
31
|
+
constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined, opts?: AnvilTestWatcherOpts);
|
|
28
32
|
setIsMarkingAsProven(isMarkingAsProven: boolean): void;
|
|
29
33
|
setisLocalNetwork(isLocalNetwork: boolean): void;
|
|
30
34
|
/** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
|
|
@@ -39,4 +43,4 @@ export declare class AnvilTestWatcher {
|
|
|
39
43
|
warpTimeIfNeeded(): Promise<void>;
|
|
40
44
|
private warpToTimestamp;
|
|
41
45
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFLE1BQU0sTUFBTSxvQkFBb0IsR0FBRztJQUNqQyxjQUFjLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDekIsaUJBQWlCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDN0IsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQXdCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQTFCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBQztJQUN2QixPQUFPLENBQUMsaUJBQWlCLENBQUM7SUFFMUIsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRy9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUF3QjtJQUdsRCxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBZ0I7SUFHNUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQXFDO0lBRW5FLFlBQ1UsVUFBVSxFQUFFLGFBQWEsRUFDakMsYUFBYSxFQUFFLFVBQVUsRUFDekIsUUFBUSxFQUFFLFVBQVUsRUFDWixZQUFZLENBQUMsOEJBQWtCLEVBQ3ZDLElBQUksR0FBRSxvQkFBeUIsRUFnQmhDO0lBRUQsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxRQUc5QztJQUVELGlCQUFpQixDQUFDLGNBQWMsRUFBRSxPQUFPLFFBRXhDO0lBRUQseUdBQXlHO0lBQ3pHLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxNQUFNLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFFN0M7SUFFRCx1R0FBdUc7SUFDdkcsc0JBQXNCLENBQUMsRUFBRSxFQUFFLE1BQU0sT0FBTyxRQUV2QztJQUVLLEtBQUssa0JBeUJWO0lBRUssSUFBSSxrQkFJVDtJQUVLLE9BQU8sa0JBSVo7SUFFSyxZQUFZLGtCQUtqQjtJQUVLLDRCQUE0QixrQkFzQmpDO0lBRUssZ0JBQWdCLGtCQTREckI7WUFNYSxlQUFlO0NBZ0I5QiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAwBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IA1BvB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,iBAAiB,CAAC;IAE1B,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAG/D,OAAO,CAAC,iBAAiB,CAAC,CAAwB;IAGlD,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAG5C,OAAO,CAAC,qBAAqB,CAAC,CAAqC;IAEnE,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EACvC,IAAI,GAAE,oBAAyB,EAgBhC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAED,yGAAyG;IACzG,oBAAoB,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAE7C;IAED,uGAAuG;IACvG,sBAAsB,CAAC,EAAE,EAAE,MAAM,OAAO,QAEvC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAsBjC;IAEK,gBAAgB,kBA4DrB;YAMa,eAAe;CAgB9B"}
|
|
@@ -14,6 +14,7 @@ import { getAddress, getContract } from 'viem';
|
|
|
14
14
|
cheatcodes;
|
|
15
15
|
dateProvider;
|
|
16
16
|
isLocalNetwork;
|
|
17
|
+
isMarkingAsProven;
|
|
17
18
|
rollup;
|
|
18
19
|
rollupCheatCodes;
|
|
19
20
|
l2SlotDuration;
|
|
@@ -21,19 +22,16 @@ import { getAddress, getContract } from 'viem';
|
|
|
21
22
|
syncDateProviderPromise;
|
|
22
23
|
markingAsProvenRunningPromise;
|
|
23
24
|
logger;
|
|
24
|
-
isMarkingAsProven;
|
|
25
25
|
// Optional callback to check if there are pending txs in the mempool.
|
|
26
26
|
getPendingTxCount;
|
|
27
27
|
// Optional callback to check if the sequencer is actively building a block.
|
|
28
28
|
isSequencerBuilding;
|
|
29
29
|
// Tracks when we first observed the current unfilled slot with pending txs (real wall time).
|
|
30
30
|
unfilledSlotFirstSeen;
|
|
31
|
-
constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
|
|
31
|
+
constructor(cheatcodes, rollupAddress, l1Client, dateProvider, opts = {}){
|
|
32
32
|
this.cheatcodes = cheatcodes;
|
|
33
33
|
this.dateProvider = dateProvider;
|
|
34
|
-
this.isLocalNetwork = false;
|
|
35
34
|
this.logger = createLogger(`aztecjs:utils:watcher`);
|
|
36
|
-
this.isMarkingAsProven = true;
|
|
37
35
|
this.rollup = getContract({
|
|
38
36
|
address: getAddress(rollupAddress.toString()),
|
|
39
37
|
abi: RollupAbi,
|
|
@@ -42,6 +40,8 @@ import { getAddress, getContract } from 'viem';
|
|
|
42
40
|
this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
|
|
43
41
|
rollupAddress
|
|
44
42
|
});
|
|
43
|
+
this.isLocalNetwork = opts.isLocalNetwork ?? false;
|
|
44
|
+
this.isMarkingAsProven = opts.isMarkingAsProven ?? true;
|
|
45
45
|
this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
|
|
46
46
|
}
|
|
47
47
|
setIsMarkingAsProven(isMarkingAsProven) {
|
package/dest/testing/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export { AnvilTestWatcher } from './anvil_test_watcher.js';
|
|
1
|
+
export { AnvilTestWatcher, type AnvilTestWatcherOpts } from './anvil_test_watcher.js';
|
|
2
2
|
export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
3
|
export { CheatCodes } from './cheat_codes.js';
|
|
4
4
|
export { EpochTestSettler } from './epoch_test_settler.js';
|
|
5
5
|
export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLG9CQUFvQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdEYsT0FBTyxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec",
|
|
3
|
-
"version": "5.0.0-nightly.
|
|
3
|
+
"version": "5.0.0-nightly.20260423",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,38 +28,38 @@
|
|
|
28
28
|
"../package.common.json"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec/accounts": "5.0.0-nightly.
|
|
32
|
-
"@aztec/archiver": "5.0.0-nightly.
|
|
33
|
-
"@aztec/aztec-node": "5.0.0-nightly.
|
|
34
|
-
"@aztec/aztec.js": "5.0.0-nightly.
|
|
35
|
-
"@aztec/bb-prover": "5.0.0-nightly.
|
|
36
|
-
"@aztec/bb.js": "5.0.0-nightly.
|
|
37
|
-
"@aztec/blob-client": "5.0.0-nightly.
|
|
38
|
-
"@aztec/bot": "5.0.0-nightly.
|
|
39
|
-
"@aztec/builder": "5.0.0-nightly.
|
|
40
|
-
"@aztec/cli": "5.0.0-nightly.
|
|
41
|
-
"@aztec/constants": "5.0.0-nightly.
|
|
42
|
-
"@aztec/entrypoints": "5.0.0-nightly.
|
|
43
|
-
"@aztec/ethereum": "5.0.0-nightly.
|
|
44
|
-
"@aztec/foundation": "5.0.0-nightly.
|
|
45
|
-
"@aztec/kv-store": "5.0.0-nightly.
|
|
46
|
-
"@aztec/l1-artifacts": "5.0.0-nightly.
|
|
47
|
-
"@aztec/node-lib": "5.0.0-nightly.
|
|
48
|
-
"@aztec/noir-contracts.js": "5.0.0-nightly.
|
|
49
|
-
"@aztec/noir-protocol-circuits-types": "5.0.0-nightly.
|
|
50
|
-
"@aztec/p2p": "5.0.0-nightly.
|
|
51
|
-
"@aztec/p2p-bootstrap": "5.0.0-nightly.
|
|
52
|
-
"@aztec/protocol-contracts": "5.0.0-nightly.
|
|
53
|
-
"@aztec/prover-client": "5.0.0-nightly.
|
|
54
|
-
"@aztec/prover-node": "5.0.0-nightly.
|
|
55
|
-
"@aztec/pxe": "5.0.0-nightly.
|
|
56
|
-
"@aztec/sequencer-client": "5.0.0-nightly.
|
|
57
|
-
"@aztec/stdlib": "5.0.0-nightly.
|
|
58
|
-
"@aztec/telemetry-client": "5.0.0-nightly.
|
|
59
|
-
"@aztec/txe": "5.0.0-nightly.
|
|
60
|
-
"@aztec/validator-ha-signer": "5.0.0-nightly.
|
|
61
|
-
"@aztec/wallets": "5.0.0-nightly.
|
|
62
|
-
"@aztec/world-state": "5.0.0-nightly.
|
|
31
|
+
"@aztec/accounts": "5.0.0-nightly.20260423",
|
|
32
|
+
"@aztec/archiver": "5.0.0-nightly.20260423",
|
|
33
|
+
"@aztec/aztec-node": "5.0.0-nightly.20260423",
|
|
34
|
+
"@aztec/aztec.js": "5.0.0-nightly.20260423",
|
|
35
|
+
"@aztec/bb-prover": "5.0.0-nightly.20260423",
|
|
36
|
+
"@aztec/bb.js": "5.0.0-nightly.20260423",
|
|
37
|
+
"@aztec/blob-client": "5.0.0-nightly.20260423",
|
|
38
|
+
"@aztec/bot": "5.0.0-nightly.20260423",
|
|
39
|
+
"@aztec/builder": "5.0.0-nightly.20260423",
|
|
40
|
+
"@aztec/cli": "5.0.0-nightly.20260423",
|
|
41
|
+
"@aztec/constants": "5.0.0-nightly.20260423",
|
|
42
|
+
"@aztec/entrypoints": "5.0.0-nightly.20260423",
|
|
43
|
+
"@aztec/ethereum": "5.0.0-nightly.20260423",
|
|
44
|
+
"@aztec/foundation": "5.0.0-nightly.20260423",
|
|
45
|
+
"@aztec/kv-store": "5.0.0-nightly.20260423",
|
|
46
|
+
"@aztec/l1-artifacts": "5.0.0-nightly.20260423",
|
|
47
|
+
"@aztec/node-lib": "5.0.0-nightly.20260423",
|
|
48
|
+
"@aztec/noir-contracts.js": "5.0.0-nightly.20260423",
|
|
49
|
+
"@aztec/noir-protocol-circuits-types": "5.0.0-nightly.20260423",
|
|
50
|
+
"@aztec/p2p": "5.0.0-nightly.20260423",
|
|
51
|
+
"@aztec/p2p-bootstrap": "5.0.0-nightly.20260423",
|
|
52
|
+
"@aztec/protocol-contracts": "5.0.0-nightly.20260423",
|
|
53
|
+
"@aztec/prover-client": "5.0.0-nightly.20260423",
|
|
54
|
+
"@aztec/prover-node": "5.0.0-nightly.20260423",
|
|
55
|
+
"@aztec/pxe": "5.0.0-nightly.20260423",
|
|
56
|
+
"@aztec/sequencer-client": "5.0.0-nightly.20260423",
|
|
57
|
+
"@aztec/stdlib": "5.0.0-nightly.20260423",
|
|
58
|
+
"@aztec/telemetry-client": "5.0.0-nightly.20260423",
|
|
59
|
+
"@aztec/txe": "5.0.0-nightly.20260423",
|
|
60
|
+
"@aztec/validator-ha-signer": "5.0.0-nightly.20260423",
|
|
61
|
+
"@aztec/wallets": "5.0.0-nightly.20260423",
|
|
62
|
+
"@aztec/world-state": "5.0.0-nightly.20260423",
|
|
63
63
|
"@iarna/toml": "^2.2.5",
|
|
64
64
|
"@types/chalk": "^2.2.0",
|
|
65
65
|
"abitype": "^0.8.11",
|
package/scripts/aztec.sh
CHANGED
|
@@ -23,10 +23,14 @@ case $cmd in
|
|
|
23
23
|
# Attempt to compile, no-op if there are no changes
|
|
24
24
|
node --no-warnings "$script_dir/../dest/bin/index.js" compile
|
|
25
25
|
|
|
26
|
-
export LOG_LEVEL="${LOG_LEVEL:-"error;trace:
|
|
26
|
+
export LOG_LEVEL="${LOG_LEVEL:-"error;trace:^contract:"}"
|
|
27
27
|
aztec start --txe --port 8081 &
|
|
28
28
|
server_pid=$!
|
|
29
29
|
trap 'kill $server_pid &>/dev/null || true' EXIT
|
|
30
|
+
if ! command -v nc &>/dev/null; then
|
|
31
|
+
echo "Error: 'nc' (netcat) is required but not installed." >&2
|
|
32
|
+
exit 1
|
|
33
|
+
fi
|
|
30
34
|
while ! nc -z 127.0.0.1 8081 &>/dev/null; do sleep 0.2; done
|
|
31
35
|
export NARGO_FOREIGN_CALL_TIMEOUT=300000
|
|
32
36
|
nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 --test-threads 16 "$@"
|
|
@@ -9,6 +9,11 @@ import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
|
|
|
9
9
|
|
|
10
10
|
import { type GetContractReturnType, getAddress, getContract } from 'viem';
|
|
11
11
|
|
|
12
|
+
export type AnvilTestWatcherOpts = {
|
|
13
|
+
isLocalNetwork?: boolean;
|
|
14
|
+
isMarkingAsProven?: boolean;
|
|
15
|
+
};
|
|
16
|
+
|
|
12
17
|
/**
|
|
13
18
|
* Represents a watcher for a rollup contract.
|
|
14
19
|
*
|
|
@@ -17,7 +22,8 @@ import { type GetContractReturnType, getAddress, getContract } from 'viem';
|
|
|
17
22
|
* block within the slot. And if so, it will time travel into the next slot.
|
|
18
23
|
*/
|
|
19
24
|
export class AnvilTestWatcher {
|
|
20
|
-
private isLocalNetwork
|
|
25
|
+
private isLocalNetwork;
|
|
26
|
+
private isMarkingAsProven;
|
|
21
27
|
|
|
22
28
|
private rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
|
|
23
29
|
private rollupCheatCodes: RollupCheatCodes;
|
|
@@ -29,8 +35,6 @@ export class AnvilTestWatcher {
|
|
|
29
35
|
|
|
30
36
|
private logger: Logger = createLogger(`aztecjs:utils:watcher`);
|
|
31
37
|
|
|
32
|
-
private isMarkingAsProven = true;
|
|
33
|
-
|
|
34
38
|
// Optional callback to check if there are pending txs in the mempool.
|
|
35
39
|
private getPendingTxCount?: () => Promise<number>;
|
|
36
40
|
|
|
@@ -45,6 +49,7 @@ export class AnvilTestWatcher {
|
|
|
45
49
|
rollupAddress: EthAddress,
|
|
46
50
|
l1Client: ViemClient,
|
|
47
51
|
private dateProvider?: TestDateProvider,
|
|
52
|
+
opts: AnvilTestWatcherOpts = {},
|
|
48
53
|
) {
|
|
49
54
|
this.rollup = getContract({
|
|
50
55
|
address: getAddress(rollupAddress.toString()),
|
|
@@ -56,6 +61,9 @@ export class AnvilTestWatcher {
|
|
|
56
61
|
rollupAddress,
|
|
57
62
|
});
|
|
58
63
|
|
|
64
|
+
this.isLocalNetwork = opts.isLocalNetwork ?? false;
|
|
65
|
+
this.isMarkingAsProven = opts.isMarkingAsProven ?? true;
|
|
66
|
+
|
|
59
67
|
this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
|
|
60
68
|
}
|
|
61
69
|
|
package/src/testing/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { AnvilTestWatcher } from './anvil_test_watcher.js';
|
|
1
|
+
export { AnvilTestWatcher, type AnvilTestWatcherOpts } from './anvil_test_watcher.js';
|
|
2
2
|
export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
3
|
export { CheatCodes } from './cheat_codes.js';
|
|
4
4
|
export { EpochTestSettler } from './epoch_test_settler.js';
|