@aztec/end-to-end 2.0.0-rc.8 → 2.0.2-rc.2
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/e2e_epochs/epochs_test.d.ts +2 -0
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +5 -0
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +3 -2
- package/dest/e2e_p2p/p2p_network.js +1 -1
- package/package.json +36 -36
- package/src/e2e_epochs/epochs_test.ts +3 -0
- package/src/e2e_fees/fees_test.ts +3 -2
- package/src/e2e_p2p/p2p_network.ts +1 -1
|
@@ -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.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,KAAK,qBAAqB,EAAE,cAAc,EAA0B,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,IAAI,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAKhD,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACL,KAAK,UAAU,EACf,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAuC,KAAK,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAIxH;;;;;;;;;GASG;AACH,qBAAa,QAAQ;IA+CjB,OAAO,CAAC,gBAAgB;IA9C1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,QAAQ,CAAsB;IAE/B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IACtB,UAAU,EAAG,UAAU,CAAC;IAExB,WAAW,EAAG,aAAa,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,SAAS,EAAG,aAAa,CAAC;IAC1B,UAAU,EAAG,YAAY,CAAC;IAC1B,gBAAgB,EAAG,YAAY,CAAC;IAChC,QAAQ,EAAG,UAAU,CAAC;IAEtB,QAAQ,EAAG,YAAY,CAAC;IAExB,WAAW,EAAG,WAAW,CAAC;IAE1B,cAAc,EAAG,cAAc,CAAC;IAEhC,gBAAgB,EAAG,gBAAgB,CAAC;IACpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,WAAW,CAAC;IACxB,YAAY,EAAG,oBAAoB,CAAC;IACpC,eAAe,EAAG,eAAe,CAAC;IAClC,oBAAoB,EAAG,uBAAuB,CAAC;IAC/C,yBAAyB,EAAG,sBAAsB,CAAC;IAEnD,OAAO,EAAG,iBAAiB,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAE5B,kBAAkB,EAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3C,2BAA2B,EAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,eAAe,EAAG,UAAU,CAAC;IAC7B,wBAAwB,EAAG,UAAU,CAAC;IACtC,yBAAyB,EAAG,UAAU,CAAC;IACvC,YAAY,EAAG,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/D,SAAgB,qBAAqB,SAAgB;IACrD,SAAgB,mBAAmB,SAAgB;IACnD,SAAgB,0BAA0B,SAAgB;gBAGxD,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI,EAC5B,YAAY,GAAE,OAAO,CAAC,YAAY,GAAG,qBAAqB,CAAM;IAgB5D,KAAK;IASL,QAAQ;IAKd,oBAAoB,CAAC,CAAC,EAAE,OAAO;IAIzB,kBAAkB;IAOlB,eAAe;;;;
|
|
1
|
+
{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,9 +105,10 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
105
105
|
}
|
|
106
106
|
async getBlockRewards() {
|
|
107
107
|
const blockReward = await this.rollupContract.getBlockReward();
|
|
108
|
-
const
|
|
108
|
+
const rewardConfig = await this.rollupContract.getRewardConfig();
|
|
109
|
+
const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(EthAddress.fromString(rewardConfig.rewardDistributor));
|
|
109
110
|
const toDistribute = balance > blockReward ? blockReward : balance;
|
|
110
|
-
const sequencerBlockRewards = toDistribute /
|
|
111
|
+
const sequencerBlockRewards = toDistribute * BigInt(rewardConfig.sequencerBps) / 10000n;
|
|
111
112
|
const proverBlockRewards = toDistribute - sequencerBlockRewards;
|
|
112
113
|
return {
|
|
113
114
|
sequencerBlockRewards,
|
|
@@ -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.
|
|
3
|
+
"version": "2.0.2-rc.2",
|
|
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.
|
|
29
|
-
"@aztec/archiver": "2.0.
|
|
30
|
-
"@aztec/aztec": "2.0.
|
|
31
|
-
"@aztec/aztec-node": "2.0.
|
|
32
|
-
"@aztec/aztec.js": "2.0.
|
|
33
|
-
"@aztec/bb-prover": "2.0.
|
|
34
|
-
"@aztec/blob-lib": "2.0.
|
|
35
|
-
"@aztec/blob-sink": "2.0.
|
|
36
|
-
"@aztec/bot": "2.0.
|
|
37
|
-
"@aztec/cli": "2.0.
|
|
38
|
-
"@aztec/constants": "2.0.
|
|
39
|
-
"@aztec/entrypoints": "2.0.
|
|
40
|
-
"@aztec/epoch-cache": "2.0.
|
|
41
|
-
"@aztec/ethereum": "2.0.
|
|
42
|
-
"@aztec/foundation": "2.0.
|
|
43
|
-
"@aztec/kv-store": "2.0.
|
|
44
|
-
"@aztec/l1-artifacts": "2.0.
|
|
45
|
-
"@aztec/merkle-tree": "2.0.
|
|
46
|
-
"@aztec/node-keystore": "2.0.
|
|
47
|
-
"@aztec/noir-contracts.js": "2.0.
|
|
48
|
-
"@aztec/noir-noirc_abi": "2.0.
|
|
49
|
-
"@aztec/noir-protocol-circuits-types": "2.0.
|
|
50
|
-
"@aztec/noir-test-contracts.js": "2.0.
|
|
51
|
-
"@aztec/p2p": "2.0.
|
|
52
|
-
"@aztec/protocol-contracts": "2.0.
|
|
53
|
-
"@aztec/prover-client": "2.0.
|
|
54
|
-
"@aztec/prover-node": "2.0.
|
|
55
|
-
"@aztec/pxe": "2.0.
|
|
56
|
-
"@aztec/sequencer-client": "2.0.
|
|
57
|
-
"@aztec/simulator": "2.0.
|
|
58
|
-
"@aztec/slasher": "2.0.
|
|
59
|
-
"@aztec/stdlib": "2.0.
|
|
60
|
-
"@aztec/telemetry-client": "2.0.
|
|
61
|
-
"@aztec/validator-client": "2.0.
|
|
62
|
-
"@aztec/world-state": "2.0.
|
|
28
|
+
"@aztec/accounts": "2.0.2-rc.2",
|
|
29
|
+
"@aztec/archiver": "2.0.2-rc.2",
|
|
30
|
+
"@aztec/aztec": "2.0.2-rc.2",
|
|
31
|
+
"@aztec/aztec-node": "2.0.2-rc.2",
|
|
32
|
+
"@aztec/aztec.js": "2.0.2-rc.2",
|
|
33
|
+
"@aztec/bb-prover": "2.0.2-rc.2",
|
|
34
|
+
"@aztec/blob-lib": "2.0.2-rc.2",
|
|
35
|
+
"@aztec/blob-sink": "2.0.2-rc.2",
|
|
36
|
+
"@aztec/bot": "2.0.2-rc.2",
|
|
37
|
+
"@aztec/cli": "2.0.2-rc.2",
|
|
38
|
+
"@aztec/constants": "2.0.2-rc.2",
|
|
39
|
+
"@aztec/entrypoints": "2.0.2-rc.2",
|
|
40
|
+
"@aztec/epoch-cache": "2.0.2-rc.2",
|
|
41
|
+
"@aztec/ethereum": "2.0.2-rc.2",
|
|
42
|
+
"@aztec/foundation": "2.0.2-rc.2",
|
|
43
|
+
"@aztec/kv-store": "2.0.2-rc.2",
|
|
44
|
+
"@aztec/l1-artifacts": "2.0.2-rc.2",
|
|
45
|
+
"@aztec/merkle-tree": "2.0.2-rc.2",
|
|
46
|
+
"@aztec/node-keystore": "2.0.2-rc.2",
|
|
47
|
+
"@aztec/noir-contracts.js": "2.0.2-rc.2",
|
|
48
|
+
"@aztec/noir-noirc_abi": "2.0.2-rc.2",
|
|
49
|
+
"@aztec/noir-protocol-circuits-types": "2.0.2-rc.2",
|
|
50
|
+
"@aztec/noir-test-contracts.js": "2.0.2-rc.2",
|
|
51
|
+
"@aztec/p2p": "2.0.2-rc.2",
|
|
52
|
+
"@aztec/protocol-contracts": "2.0.2-rc.2",
|
|
53
|
+
"@aztec/prover-client": "2.0.2-rc.2",
|
|
54
|
+
"@aztec/prover-node": "2.0.2-rc.2",
|
|
55
|
+
"@aztec/pxe": "2.0.2-rc.2",
|
|
56
|
+
"@aztec/sequencer-client": "2.0.2-rc.2",
|
|
57
|
+
"@aztec/simulator": "2.0.2-rc.2",
|
|
58
|
+
"@aztec/slasher": "2.0.2-rc.2",
|
|
59
|
+
"@aztec/stdlib": "2.0.2-rc.2",
|
|
60
|
+
"@aztec/telemetry-client": "2.0.2-rc.2",
|
|
61
|
+
"@aztec/validator-client": "2.0.2-rc.2",
|
|
62
|
+
"@aztec/world-state": "2.0.2-rc.2",
|
|
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();
|
|
@@ -145,13 +145,14 @@ export class FeesTest {
|
|
|
145
145
|
|
|
146
146
|
async getBlockRewards() {
|
|
147
147
|
const blockReward = await this.rollupContract.getBlockReward();
|
|
148
|
+
const rewardConfig = await this.rollupContract.getRewardConfig();
|
|
148
149
|
|
|
149
150
|
const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
|
|
150
|
-
|
|
151
|
+
EthAddress.fromString(rewardConfig.rewardDistributor),
|
|
151
152
|
);
|
|
152
153
|
|
|
153
154
|
const toDistribute = balance > blockReward ? blockReward : balance;
|
|
154
|
-
const sequencerBlockRewards = toDistribute /
|
|
155
|
+
const sequencerBlockRewards = (toDistribute * BigInt(rewardConfig.sequencerBps)) / 10000n;
|
|
155
156
|
const proverBlockRewards = toDistribute - sequencerBlockRewards;
|
|
156
157
|
|
|
157
158
|
return { sequencerBlockRewards, proverBlockRewards };
|
|
@@ -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
|
});
|