@aztec/end-to-end 2.0.0-rc.3 → 2.0.0-rc.30
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.
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
|
|
2
2
|
import { Fr, type Logger, type Wallet } from '@aztec/aztec.js';
|
|
3
|
+
import { EpochCache } from '@aztec/epoch-cache';
|
|
3
4
|
import { type ExtendedViemWalletClient } from '@aztec/ethereum';
|
|
4
5
|
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
5
6
|
import { ChainMonitor, type Delayer } from '@aztec/ethereum/test';
|
|
@@ -35,6 +36,7 @@ export declare class EpochsTestContext {
|
|
|
35
36
|
constants: L1RollupConstants;
|
|
36
37
|
logger: Logger;
|
|
37
38
|
monitor: ChainMonitor;
|
|
39
|
+
epochCache: EpochCache;
|
|
38
40
|
proverDelayer: Delayer;
|
|
39
41
|
sequencerDelayer: Delayer;
|
|
40
42
|
proverNodes: ProverNode[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EACL,EAAE,EACF,KAAK,MAAM,EAEX,KAAK,MAAM,EAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAA4B,KAAK,wBAAwB,EAA0B,MAAM,iBAAiB,CAAC;AAClH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAqC,MAAM,sBAAsB,CAAC;AAIrH,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAErE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,6BAA6B,CAAC;AAO1G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,eAAO,MAAM,qBAAqB,QAA0B,CAAC;AAE7D,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnF,MAAM,MAAM,qBAAqB,GAAG;KACjC,CAAC,IAAI,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QAChE,IAAI,EAAE,CAAC,CAAC;QACR,cAAc,EAAE,MAAM,CAAC;QACvB,SAAS,EAAE,UAAU,CAAC;KACvB;CACF,CAAC,MAAM,eAAe,CAAC,CAAC;AAEzB;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,wBAAwB,CAAC;IACpC,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAE/B,aAAa,EAAG,MAAM,CAAC;IAEvB,kBAAkB,EAAG,MAAM,CAAC;IAC5B,qBAAqB,EAAG,MAAM,CAAC;WAElB,KAAK,CAAC,IAAI,GAAE,cAAmB;WAMrC,gBAAgB,CAAC,IAAI,GAAE,cAAmB;;;;;;IAW3C,KAAK,CAAC,IAAI,GAAE,cAAmB;
|
|
1
|
+
{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AztecNodeService } from '@aztec/aztec-node';
|
|
2
2
|
import { Fr, MerkleTreeId, getContractInstanceFromInstantiationParams, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
|
|
3
|
+
import { EpochCache } from '@aztec/epoch-cache';
|
|
3
4
|
import { DefaultL1ContractsConfig, createExtendedL1Client } from '@aztec/ethereum';
|
|
4
5
|
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
5
6
|
import { ChainMonitor, DelayedTxUtils, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
|
|
@@ -30,6 +31,7 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
|
|
|
30
31
|
constants;
|
|
31
32
|
logger;
|
|
32
33
|
monitor;
|
|
34
|
+
epochCache;
|
|
33
35
|
proverDelayer;
|
|
34
36
|
sequencerDelayer;
|
|
35
37
|
proverNodes = [];
|
|
@@ -99,6 +101,9 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
|
|
|
99
101
|
this.logger = context.logger;
|
|
100
102
|
this.l1Client = context.deployL1ContractsValues.l1Client;
|
|
101
103
|
this.rollup = RollupContract.getFromConfig(context.config);
|
|
104
|
+
this.epochCache = await EpochCache.create(this.rollup, context.config, {
|
|
105
|
+
dateProvider: context.dateProvider
|
|
106
|
+
});
|
|
102
107
|
// Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
|
|
103
108
|
this.monitor = new ChainMonitor(this.rollup, context.dateProvider, this.logger).start();
|
|
104
109
|
// This is hideous.
|
|
@@ -280,7 +280,7 @@ export class P2PNetworkTest {
|
|
|
280
280
|
}
|
|
281
281
|
const rollup = new RollupContract(this.ctx.deployL1ContractsValues.l1Client, this.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress);
|
|
282
282
|
const slasherContract = getContract({
|
|
283
|
-
address: getAddress(await rollup.
|
|
283
|
+
address: getAddress(await rollup.getSlasherAddress()),
|
|
284
284
|
abi: SlasherAbi,
|
|
285
285
|
client: this.ctx.deployL1ContractsValues.l1Client
|
|
286
286
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "2.0.0-rc.
|
|
3
|
+
"version": "2.0.0-rc.30",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,41 +25,41 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "2.0.0-rc.
|
|
29
|
-
"@aztec/archiver": "2.0.0-rc.
|
|
30
|
-
"@aztec/aztec": "2.0.0-rc.
|
|
31
|
-
"@aztec/aztec-node": "2.0.0-rc.
|
|
32
|
-
"@aztec/aztec.js": "2.0.0-rc.
|
|
33
|
-
"@aztec/bb-prover": "2.0.0-rc.
|
|
34
|
-
"@aztec/blob-lib": "2.0.0-rc.
|
|
35
|
-
"@aztec/blob-sink": "2.0.0-rc.
|
|
36
|
-
"@aztec/bot": "2.0.0-rc.
|
|
37
|
-
"@aztec/cli": "2.0.0-rc.
|
|
38
|
-
"@aztec/constants": "2.0.0-rc.
|
|
39
|
-
"@aztec/entrypoints": "2.0.0-rc.
|
|
40
|
-
"@aztec/epoch-cache": "2.0.0-rc.
|
|
41
|
-
"@aztec/ethereum": "2.0.0-rc.
|
|
42
|
-
"@aztec/foundation": "2.0.0-rc.
|
|
43
|
-
"@aztec/kv-store": "2.0.0-rc.
|
|
44
|
-
"@aztec/l1-artifacts": "2.0.0-rc.
|
|
45
|
-
"@aztec/merkle-tree": "2.0.0-rc.
|
|
46
|
-
"@aztec/node-keystore": "2.0.0-rc.
|
|
47
|
-
"@aztec/noir-contracts.js": "2.0.0-rc.
|
|
48
|
-
"@aztec/noir-noirc_abi": "2.0.0-rc.
|
|
49
|
-
"@aztec/noir-protocol-circuits-types": "2.0.0-rc.
|
|
50
|
-
"@aztec/noir-test-contracts.js": "2.0.0-rc.
|
|
51
|
-
"@aztec/p2p": "2.0.0-rc.
|
|
52
|
-
"@aztec/protocol-contracts": "2.0.0-rc.
|
|
53
|
-
"@aztec/prover-client": "2.0.0-rc.
|
|
54
|
-
"@aztec/prover-node": "2.0.0-rc.
|
|
55
|
-
"@aztec/pxe": "2.0.0-rc.
|
|
56
|
-
"@aztec/sequencer-client": "2.0.0-rc.
|
|
57
|
-
"@aztec/simulator": "2.0.0-rc.
|
|
58
|
-
"@aztec/slasher": "2.0.0-rc.
|
|
59
|
-
"@aztec/stdlib": "2.0.0-rc.
|
|
60
|
-
"@aztec/telemetry-client": "2.0.0-rc.
|
|
61
|
-
"@aztec/validator-client": "2.0.0-rc.
|
|
62
|
-
"@aztec/world-state": "2.0.0-rc.
|
|
28
|
+
"@aztec/accounts": "2.0.0-rc.30",
|
|
29
|
+
"@aztec/archiver": "2.0.0-rc.30",
|
|
30
|
+
"@aztec/aztec": "2.0.0-rc.30",
|
|
31
|
+
"@aztec/aztec-node": "2.0.0-rc.30",
|
|
32
|
+
"@aztec/aztec.js": "2.0.0-rc.30",
|
|
33
|
+
"@aztec/bb-prover": "2.0.0-rc.30",
|
|
34
|
+
"@aztec/blob-lib": "2.0.0-rc.30",
|
|
35
|
+
"@aztec/blob-sink": "2.0.0-rc.30",
|
|
36
|
+
"@aztec/bot": "2.0.0-rc.30",
|
|
37
|
+
"@aztec/cli": "2.0.0-rc.30",
|
|
38
|
+
"@aztec/constants": "2.0.0-rc.30",
|
|
39
|
+
"@aztec/entrypoints": "2.0.0-rc.30",
|
|
40
|
+
"@aztec/epoch-cache": "2.0.0-rc.30",
|
|
41
|
+
"@aztec/ethereum": "2.0.0-rc.30",
|
|
42
|
+
"@aztec/foundation": "2.0.0-rc.30",
|
|
43
|
+
"@aztec/kv-store": "2.0.0-rc.30",
|
|
44
|
+
"@aztec/l1-artifacts": "2.0.0-rc.30",
|
|
45
|
+
"@aztec/merkle-tree": "2.0.0-rc.30",
|
|
46
|
+
"@aztec/node-keystore": "2.0.0-rc.30",
|
|
47
|
+
"@aztec/noir-contracts.js": "2.0.0-rc.30",
|
|
48
|
+
"@aztec/noir-noirc_abi": "2.0.0-rc.30",
|
|
49
|
+
"@aztec/noir-protocol-circuits-types": "2.0.0-rc.30",
|
|
50
|
+
"@aztec/noir-test-contracts.js": "2.0.0-rc.30",
|
|
51
|
+
"@aztec/p2p": "2.0.0-rc.30",
|
|
52
|
+
"@aztec/protocol-contracts": "2.0.0-rc.30",
|
|
53
|
+
"@aztec/prover-client": "2.0.0-rc.30",
|
|
54
|
+
"@aztec/prover-node": "2.0.0-rc.30",
|
|
55
|
+
"@aztec/pxe": "2.0.0-rc.30",
|
|
56
|
+
"@aztec/sequencer-client": "2.0.0-rc.30",
|
|
57
|
+
"@aztec/simulator": "2.0.0-rc.30",
|
|
58
|
+
"@aztec/slasher": "2.0.0-rc.30",
|
|
59
|
+
"@aztec/stdlib": "2.0.0-rc.30",
|
|
60
|
+
"@aztec/telemetry-client": "2.0.0-rc.30",
|
|
61
|
+
"@aztec/validator-client": "2.0.0-rc.30",
|
|
62
|
+
"@aztec/world-state": "2.0.0-rc.30",
|
|
63
63
|
"@iarna/toml": "^2.2.5",
|
|
64
64
|
"@jest/globals": "^30.0.0",
|
|
65
65
|
"@noble/curves": "=1.0.0",
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
retryUntil,
|
|
10
10
|
sleep,
|
|
11
11
|
} from '@aztec/aztec.js';
|
|
12
|
+
import { EpochCache } from '@aztec/epoch-cache';
|
|
12
13
|
import { DefaultL1ContractsConfig, type ExtendedViemWalletClient, createExtendedL1Client } from '@aztec/ethereum';
|
|
13
14
|
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
14
15
|
import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
|
|
@@ -69,6 +70,7 @@ export class EpochsTestContext {
|
|
|
69
70
|
public constants!: L1RollupConstants;
|
|
70
71
|
public logger!: Logger;
|
|
71
72
|
public monitor!: ChainMonitor;
|
|
73
|
+
public epochCache!: EpochCache;
|
|
72
74
|
public proverDelayer!: Delayer;
|
|
73
75
|
public sequencerDelayer!: Delayer;
|
|
74
76
|
|
|
@@ -141,6 +143,7 @@ export class EpochsTestContext {
|
|
|
141
143
|
this.logger = context.logger;
|
|
142
144
|
this.l1Client = context.deployL1ContractsValues.l1Client;
|
|
143
145
|
this.rollup = RollupContract.getFromConfig(context.config);
|
|
146
|
+
this.epochCache = await EpochCache.create(this.rollup, context.config, { dateProvider: context.dateProvider });
|
|
144
147
|
|
|
145
148
|
// Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
|
|
146
149
|
this.monitor = new ChainMonitor(this.rollup, context.dateProvider, this.logger).start();
|
|
@@ -415,7 +415,7 @@ export class P2PNetworkTest {
|
|
|
415
415
|
);
|
|
416
416
|
|
|
417
417
|
const slasherContract = getContract({
|
|
418
|
-
address: getAddress(await rollup.
|
|
418
|
+
address: getAddress(await rollup.getSlasherAddress()),
|
|
419
419
|
abi: SlasherAbi,
|
|
420
420
|
client: this.ctx.deployL1ContractsValues.l1Client,
|
|
421
421
|
});
|