@aztec/end-to-end 0.0.1-commit.d1f2d6c → 0.0.1-commit.d20b825a7

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.
Files changed (214) hide show
  1. package/README.md +27 -0
  2. package/dest/bench/client_flows/client_flows_benchmark.d.ts +2 -2
  3. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  4. package/dest/bench/client_flows/client_flows_benchmark.js +24 -31
  5. package/dest/bench/client_flows/config.d.ts +2 -2
  6. package/dest/bench/client_flows/config.d.ts.map +1 -1
  7. package/dest/bench/client_flows/config.js +18 -0
  8. package/dest/bench/utils.d.ts +1 -1
  9. package/dest/bench/utils.d.ts.map +1 -1
  10. package/dest/bench/utils.js +6 -3
  11. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +6 -3
  12. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  13. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +23 -13
  14. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +2 -2
  15. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  16. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +3 -2
  17. package/dest/e2e_deploy_contract/deploy_test.d.ts +2 -2
  18. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  19. package/dest/e2e_epochs/epochs_test.d.ts +32 -7
  20. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  21. package/dest/e2e_epochs/epochs_test.js +144 -49
  22. package/dest/e2e_fees/fees_test.d.ts +2 -2
  23. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  24. package/dest/e2e_fees/fees_test.js +21 -14
  25. package/dest/e2e_l1_publisher/write_json.d.ts +3 -2
  26. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
  27. package/dest/e2e_l1_publisher/write_json.js +1 -7
  28. package/dest/e2e_nested_contract/nested_contract_test.d.ts +1 -1
  29. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  30. package/dest/e2e_nested_contract/nested_contract_test.js +4 -6
  31. package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
  32. package/dest/e2e_p2p/p2p_network.d.ts +14 -12
  33. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  34. package/dest/e2e_p2p/p2p_network.js +69 -32
  35. package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
  36. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
  37. package/dest/e2e_p2p/reqresp/utils.js +190 -0
  38. package/dest/e2e_p2p/shared.d.ts +26 -8
  39. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  40. package/dest/e2e_p2p/shared.js +76 -52
  41. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +2 -0
  42. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +1 -0
  43. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.js +184 -0
  44. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts +18 -0
  45. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +1 -0
  46. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.js +120 -0
  47. package/dest/e2e_token_contract/token_contract_test.d.ts +4 -2
  48. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  49. package/dest/e2e_token_contract/token_contract_test.js +19 -9
  50. package/dest/fixtures/authwit_proxy.d.ts +15 -0
  51. package/dest/fixtures/authwit_proxy.d.ts.map +1 -0
  52. package/dest/fixtures/authwit_proxy.js +34 -0
  53. package/dest/fixtures/e2e_prover_test.d.ts +7 -6
  54. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  55. package/dest/fixtures/e2e_prover_test.js +38 -50
  56. package/dest/fixtures/elu_monitor.d.ts +21 -0
  57. package/dest/fixtures/elu_monitor.d.ts.map +1 -0
  58. package/dest/fixtures/elu_monitor.js +102 -0
  59. package/dest/fixtures/fixtures.d.ts +16 -1
  60. package/dest/fixtures/fixtures.d.ts.map +1 -1
  61. package/dest/fixtures/fixtures.js +16 -0
  62. package/dest/fixtures/get_bb_config.d.ts +1 -1
  63. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  64. package/dest/fixtures/get_bb_config.js +5 -5
  65. package/dest/fixtures/ha_setup.d.ts +71 -0
  66. package/dest/fixtures/ha_setup.d.ts.map +1 -0
  67. package/dest/fixtures/ha_setup.js +116 -0
  68. package/dest/fixtures/index.d.ts +2 -1
  69. package/dest/fixtures/index.d.ts.map +1 -1
  70. package/dest/fixtures/index.js +1 -0
  71. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts +25 -0
  72. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts.map +1 -0
  73. package/dest/fixtures/schnorr_hardcoded_account_contract.js +39 -0
  74. package/dest/fixtures/setup.d.ts +62 -32
  75. package/dest/fixtures/setup.d.ts.map +1 -1
  76. package/dest/fixtures/setup.js +116 -175
  77. package/dest/fixtures/setup_p2p_test.d.ts +18 -11
  78. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  79. package/dest/fixtures/setup_p2p_test.js +43 -32
  80. package/dest/fixtures/token_utils.d.ts +2 -2
  81. package/dest/fixtures/token_utils.d.ts.map +1 -1
  82. package/dest/fixtures/token_utils.js +5 -7
  83. package/dest/forward-compatibility/wallet_rpc_client.d.ts +7 -0
  84. package/dest/forward-compatibility/wallet_rpc_client.d.ts.map +1 -0
  85. package/dest/forward-compatibility/wallet_rpc_client.js +15 -0
  86. package/dest/forward-compatibility/wallet_service.d.ts +3 -0
  87. package/dest/forward-compatibility/wallet_service.d.ts.map +1 -0
  88. package/dest/forward-compatibility/wallet_service.js +109 -0
  89. package/dest/legacy-jest-resolver.d.cts +3 -0
  90. package/dest/legacy-jest-resolver.d.cts.map +1 -0
  91. package/dest/shared/cross_chain_test_harness.d.ts +1 -1
  92. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  93. package/dest/shared/cross_chain_test_harness.js +13 -13
  94. package/dest/shared/gas_portal_test_harness.js +3 -3
  95. package/dest/shared/index.d.ts +2 -1
  96. package/dest/shared/index.d.ts.map +1 -1
  97. package/dest/shared/index.js +1 -0
  98. package/dest/shared/jest_setup.js +41 -1
  99. package/dest/shared/mock_state_view.d.ts +86 -0
  100. package/dest/shared/mock_state_view.d.ts.map +1 -0
  101. package/dest/shared/mock_state_view.js +186 -0
  102. package/dest/shared/submit-transactions.d.ts +2 -2
  103. package/dest/shared/submit-transactions.d.ts.map +1 -1
  104. package/dest/shared/submit-transactions.js +1 -1
  105. package/dest/shared/uniswap_l1_l2.d.ts +1 -1
  106. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  107. package/dest/shared/uniswap_l1_l2.js +16 -21
  108. package/dest/simulators/lending_simulator.d.ts +1 -1
  109. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  110. package/dest/simulators/lending_simulator.js +4 -4
  111. package/dest/simulators/token_simulator.d.ts +1 -1
  112. package/dest/simulators/token_simulator.d.ts.map +1 -1
  113. package/dest/simulators/token_simulator.js +3 -24
  114. package/dest/spartan/setup_test_wallets.d.ts +12 -3
  115. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  116. package/dest/spartan/setup_test_wallets.js +100 -39
  117. package/dest/spartan/tx_metrics.d.ts +35 -1
  118. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  119. package/dest/spartan/tx_metrics.js +166 -2
  120. package/dest/spartan/utils/bot.d.ts +3 -2
  121. package/dest/spartan/utils/bot.d.ts.map +1 -1
  122. package/dest/spartan/utils/bot.js +2 -1
  123. package/dest/spartan/utils/config.d.ts +10 -1
  124. package/dest/spartan/utils/config.d.ts.map +1 -1
  125. package/dest/spartan/utils/config.js +4 -1
  126. package/dest/spartan/utils/index.d.ts +6 -4
  127. package/dest/spartan/utils/index.d.ts.map +1 -1
  128. package/dest/spartan/utils/index.js +6 -2
  129. package/dest/spartan/utils/k8s.d.ts +31 -1
  130. package/dest/spartan/utils/k8s.d.ts.map +1 -1
  131. package/dest/spartan/utils/k8s.js +124 -0
  132. package/dest/spartan/utils/nodes.d.ts +14 -5
  133. package/dest/spartan/utils/nodes.d.ts.map +1 -1
  134. package/dest/spartan/utils/nodes.js +204 -33
  135. package/dest/spartan/utils/pod_logs.d.ts +25 -0
  136. package/dest/spartan/utils/pod_logs.d.ts.map +1 -0
  137. package/dest/spartan/utils/pod_logs.js +74 -0
  138. package/dest/spartan/utils/scripts.d.ts +18 -4
  139. package/dest/spartan/utils/scripts.d.ts.map +1 -1
  140. package/dest/spartan/utils/scripts.js +19 -4
  141. package/dest/test-wallet/test_wallet.d.ts +84 -0
  142. package/dest/test-wallet/test_wallet.d.ts.map +1 -0
  143. package/dest/test-wallet/test_wallet.js +255 -0
  144. package/dest/test-wallet/utils.d.ts +41 -0
  145. package/dest/test-wallet/utils.d.ts.map +1 -0
  146. package/dest/test-wallet/utils.js +71 -0
  147. package/dest/test-wallet/wallet_worker_script.d.ts +2 -0
  148. package/dest/test-wallet/wallet_worker_script.d.ts.map +1 -0
  149. package/dest/test-wallet/wallet_worker_script.js +48 -0
  150. package/dest/test-wallet/worker_wallet.d.ts +52 -0
  151. package/dest/test-wallet/worker_wallet.d.ts.map +1 -0
  152. package/dest/test-wallet/worker_wallet.js +151 -0
  153. package/dest/test-wallet/worker_wallet_schema.d.ts +279 -0
  154. package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -0
  155. package/dest/test-wallet/worker_wallet_schema.js +10 -0
  156. package/package.json +46 -43
  157. package/src/bench/client_flows/client_flows_benchmark.ts +33 -20
  158. package/src/bench/client_flows/config.ts +9 -1
  159. package/src/bench/utils.ts +8 -3
  160. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +31 -21
  161. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +7 -8
  162. package/src/e2e_deploy_contract/deploy_test.ts +3 -3
  163. package/src/e2e_epochs/epochs_test.ts +168 -76
  164. package/src/e2e_fees/bridging_race.notest.ts +1 -1
  165. package/src/e2e_fees/fees_test.ts +24 -30
  166. package/src/e2e_l1_publisher/write_json.ts +1 -6
  167. package/src/e2e_nested_contract/nested_contract_test.ts +7 -5
  168. package/src/e2e_p2p/inactivity_slash_test.ts +7 -7
  169. package/src/e2e_p2p/p2p_network.ts +93 -48
  170. package/src/e2e_p2p/reqresp/utils.ts +256 -0
  171. package/src/e2e_p2p/shared.ts +99 -64
  172. package/src/e2e_storage_proof/fixtures/storage_proof.json +915 -0
  173. package/src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts +190 -0
  174. package/src/e2e_storage_proof/fixtures/storage_proof_fixture.ts +173 -0
  175. package/src/e2e_token_contract/token_contract_test.ts +26 -9
  176. package/src/fixtures/authwit_proxy.ts +54 -0
  177. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  178. package/src/fixtures/e2e_prover_test.ts +47 -56
  179. package/src/fixtures/elu_monitor.ts +126 -0
  180. package/src/fixtures/fixtures.ts +32 -0
  181. package/src/fixtures/get_bb_config.ts +7 -6
  182. package/src/fixtures/ha_setup.ts +188 -0
  183. package/src/fixtures/index.ts +1 -0
  184. package/src/fixtures/schnorr_hardcoded_account_contract.ts +49 -0
  185. package/src/fixtures/setup.ts +162 -236
  186. package/src/fixtures/setup_p2p_test.ts +48 -52
  187. package/src/fixtures/token_utils.ts +3 -3
  188. package/src/forward-compatibility/wallet_rpc_client.ts +14 -0
  189. package/src/forward-compatibility/wallet_service.ts +104 -0
  190. package/src/guides/up_quick_start.sh +3 -5
  191. package/src/legacy-jest-resolver.cjs +135 -0
  192. package/src/shared/cross_chain_test_harness.ts +13 -9
  193. package/src/shared/gas_portal_test_harness.ts +1 -2
  194. package/src/shared/index.ts +1 -0
  195. package/src/shared/jest_setup.ts +51 -1
  196. package/src/shared/mock_state_view.ts +188 -0
  197. package/src/shared/submit-transactions.ts +3 -2
  198. package/src/shared/uniswap_l1_l2.ts +38 -37
  199. package/src/simulators/lending_simulator.ts +8 -4
  200. package/src/simulators/token_simulator.ts +6 -30
  201. package/src/spartan/setup_test_wallets.ts +141 -32
  202. package/src/spartan/tx_metrics.ts +140 -2
  203. package/src/spartan/utils/bot.ts +4 -1
  204. package/src/spartan/utils/config.ts +3 -0
  205. package/src/spartan/utils/index.ts +10 -1
  206. package/src/spartan/utils/k8s.ts +160 -0
  207. package/src/spartan/utils/nodes.ts +251 -31
  208. package/src/spartan/utils/pod_logs.ts +99 -0
  209. package/src/spartan/utils/scripts.ts +43 -7
  210. package/src/test-wallet/test_wallet.ts +357 -0
  211. package/src/test-wallet/utils.ts +112 -0
  212. package/src/test-wallet/wallet_worker_script.ts +60 -0
  213. package/src/test-wallet/worker_wallet.ts +214 -0
  214. package/src/test-wallet/worker_wallet_schema.ts +13 -0
@@ -0,0 +1,190 @@
1
+ import { createLogger } from '@aztec/aztec.js/log';
2
+ import { waitForTx } from '@aztec/aztec.js/node';
3
+ import { Tx } from '@aztec/aztec.js/tx';
4
+ import { RollupContract } from '@aztec/ethereum/contracts';
5
+ import { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
6
+ import { timesAsync } from '@aztec/foundation/collection';
7
+ import { retryUntil } from '@aztec/foundation/retry';
8
+ import { expect, jest } from '@jest/globals';
9
+ import fs from 'fs';
10
+ import os from 'os';
11
+ import path from 'path';
12
+ import { getBootNodeUdpPort, shouldCollectMetrics } from '../../fixtures/fixtures.js';
13
+ import { createNodes } from '../../fixtures/setup_p2p_test.js';
14
+ import { P2PNetworkTest, WAIT_FOR_TX_TIMEOUT } from '../p2p_network.js';
15
+ import { prepareTransactions } from '../shared.js';
16
+ // Don't set this to a higher value than 9 because each node will use a different L1 publisher account and anvil seeds
17
+ export const NUM_VALIDATORS = 6;
18
+ export const NUM_TXS_PER_NODE = 4;
19
+ export const BOOT_NODE_UDP_PORT = getBootNodeUdpPort();
20
+ export const createReqrespDataDir = ()=>fs.mkdtempSync(path.join(os.tmpdir(), 'reqresp-'));
21
+ export async function createReqrespTest(options = {}) {
22
+ const { disableStatusHandshake = false } = options;
23
+ const t = await P2PNetworkTest.create({
24
+ testName: 'e2e_p2p_reqresp_tx',
25
+ numberOfNodes: 0,
26
+ numberOfValidators: NUM_VALIDATORS,
27
+ basePort: BOOT_NODE_UDP_PORT,
28
+ // To collect metrics - run in aztec-packages `docker compose --profile metrics up`
29
+ metricsPort: shouldCollectMetrics(),
30
+ initialConfig: {
31
+ ethereumSlotDuration: 8,
32
+ aztecSlotDuration: 36,
33
+ blockDurationMs: 6000,
34
+ l1PublishingTime: 8,
35
+ minTxsPerBlock: 1,
36
+ maxTxsPerBlock: 2,
37
+ enforceTimeTable: true,
38
+ aztecProofSubmissionEpochs: 1024,
39
+ ...disableStatusHandshake ? {
40
+ p2pDisableStatusHandshake: true
41
+ } : {},
42
+ listenAddress: '127.0.0.1',
43
+ aztecEpochDuration: 64
44
+ }
45
+ });
46
+ await t.setup();
47
+ await t.applyBaseSetup();
48
+ return t;
49
+ }
50
+ export async function cleanupReqrespTest(params) {
51
+ const { t, nodes, dataDir } = params;
52
+ if (nodes) {
53
+ await t.stopNodes(nodes);
54
+ }
55
+ await t.teardown();
56
+ for(let i = 0; i < NUM_VALIDATORS; i++){
57
+ fs.rmSync(`${dataDir}-${i}`, {
58
+ recursive: true,
59
+ force: true,
60
+ maxRetries: 3
61
+ });
62
+ }
63
+ }
64
+ const getNodePort = (nodeIndex)=>BOOT_NODE_UDP_PORT + 1 + nodeIndex;
65
+ export async function runReqrespTxTest(params) {
66
+ const { t, dataDir, disableStatusHandshake = false } = params;
67
+ if (!t.bootstrapNodeEnr) {
68
+ throw new Error('Bootstrap node ENR is not available');
69
+ }
70
+ t.logger.info('Creating nodes');
71
+ const aztecNodeConfig = disableStatusHandshake ? {
72
+ ...t.ctx.aztecNodeConfig,
73
+ p2pDisableStatusHandshake: true
74
+ } : t.ctx.aztecNodeConfig;
75
+ const nodes = await createNodes(aztecNodeConfig, t.ctx.dateProvider, t.bootstrapNodeEnr, NUM_VALIDATORS, BOOT_NODE_UDP_PORT, t.genesis, dataDir, shouldCollectMetrics());
76
+ t.logger.info('Waiting for nodes to connect');
77
+ await t.waitForP2PMeshConnectivity(nodes, NUM_VALIDATORS);
78
+ await t.setupAccount();
79
+ const targetBlockNumber = await t.ctx.aztecNodeService.getBlockNumber();
80
+ await retryUntil(async ()=>{
81
+ const blockNumbers = await Promise.all(nodes.map((node)=>node.getBlockNumber()));
82
+ return blockNumbers.every((blockNumber)=>blockNumber >= targetBlockNumber) ? true : undefined;
83
+ }, `validators to sync to L2 block ${targetBlockNumber}`, 60, 0.5);
84
+ t.logger.info('Preparing transactions to send');
85
+ const txBatches = await timesAsync(2, ()=>prepareTransactions(t.logger, t.ctx.aztecNodeService, NUM_TXS_PER_NODE, t.fundedAccount));
86
+ t.logger.info('Removing initial node');
87
+ await t.removeInitialNode();
88
+ t.logger.info('Starting fresh slot');
89
+ const [timestamp] = await t.ctx.cheatCodes.rollup.advanceToNextSlot();
90
+ t.ctx.dateProvider.setTime(Number(timestamp) * 1000);
91
+ const startSlotTimestamp = BigInt(timestamp);
92
+ const { proposerIndexes, nodesToTurnOffTxGossip } = await getProposerIndexes(t, startSlotTimestamp);
93
+ t.logger.info(`Turning off tx gossip for nodes: ${nodesToTurnOffTxGossip.map(getNodePort)}`);
94
+ t.logger.info(`Sending txs to proposer nodes: ${proposerIndexes.map(getNodePort)}`);
95
+ // Replace the p2p node implementation of some of the nodes with a spy such that it does not store transactions that are gossiped to it
96
+ // Original implementation of `handleGossipedTx` will store received transactions in the tx pool.
97
+ // We chose the first 2 nodes that will be the proposers for the next few slots
98
+ for (const nodeIndex of nodesToTurnOffTxGossip){
99
+ const logger = createLogger(`p2p:${getNodePort(nodeIndex)}`);
100
+ jest.spyOn(nodes[nodeIndex].p2pClient.p2pService, 'handleGossipedTx').mockImplementation((payloadData)=>{
101
+ const txHash = Tx.fromBuffer(payloadData).getTxHash();
102
+ logger.info(`Skipping storage of gossiped transaction ${txHash.toString()}`);
103
+ return Promise.resolve();
104
+ });
105
+ }
106
+ // We send the tx to the proposer nodes directly, ignoring the pxe and node in each context
107
+ // We cannot just call tx.send since they were created using a pxe wired to the first node which is now stopped
108
+ t.logger.info('Sending transactions through proposer nodes');
109
+ const submittedTxs = await Promise.all(txBatches.map(async (batch, batchIndex)=>{
110
+ const proposerNode = nodes[proposerIndexes[batchIndex]];
111
+ for (const tx of batch){
112
+ t.logger.info(`Tx ${tx.getTxHash().toString()} base64: ${tx.toBuffer().toString('base64')}`);
113
+ }
114
+ const txHashes = batch.map((tx)=>tx.getTxHash().toString());
115
+ t.logger.info(`Sending batch ${batchIndex} to proposer ${getNodePort(proposerIndexes[batchIndex])}: ${txHashes.join(', ')}`);
116
+ await Promise.all(batch.map(async (tx)=>{
117
+ try {
118
+ await proposerNode.sendTx(tx);
119
+ } catch (err) {
120
+ t.logger.error(`Error sending tx: ${err}`);
121
+ throw err;
122
+ }
123
+ }));
124
+ return batch.map((tx)=>({
125
+ node: proposerNode,
126
+ txHash: tx.getTxHash()
127
+ }));
128
+ }));
129
+ // Log pool state per node after sending
130
+ for(let i = 0; i < NUM_VALIDATORS; i++){
131
+ const count = await nodes[i].getPendingTxCount();
132
+ t.logger.info(`Node ${getNodePort(i)} pool has ${count} pending txs`);
133
+ }
134
+ t.logger.info('Waiting for all transactions to be mined');
135
+ await Promise.all(submittedTxs.flatMap((batch, batchIndex)=>batch.map(async (submittedTx, txIndex)=>{
136
+ t.logger.info(`Waiting for tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} to be mined`);
137
+ await waitForTx(submittedTx.node, submittedTx.txHash, {
138
+ timeout: WAIT_FOR_TX_TIMEOUT * 1.5
139
+ });
140
+ t.logger.info(`Tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} has been mined`);
141
+ })));
142
+ t.logger.info('All transactions mined');
143
+ // Assert that multiple blocks were built for at least one slot
144
+ t.logger.info('Verifying multiple blocks for at least one checkpoint');
145
+ // Wait for L1 checkpoint sync, which may lag behind P2P block propagation.
146
+ const checkpoints = await retryUntil(async ()=>{
147
+ const cps = await nodes[0].getCheckpoints(CheckpointNumber(1), 50);
148
+ return cps.length > 0 && cps.some((cp)=>cp.checkpoint.blocks.length >= 2) ? cps : undefined;
149
+ }, 'waiting for multi-block checkpoint to sync from L1', 30, 1);
150
+ let mbpsFound = false;
151
+ let expectedBlockNumber = checkpoints[0].checkpoint.blocks[0].number;
152
+ for (const published of checkpoints){
153
+ const blockCount = published.checkpoint.blocks.length;
154
+ mbpsFound = mbpsFound || blockCount >= 2;
155
+ for(let i = 0; i < blockCount; i++){
156
+ const block = published.checkpoint.blocks[i];
157
+ expect(block.indexWithinCheckpoint).toBe(i);
158
+ expect(block.checkpointNumber).toBe(published.checkpoint.number);
159
+ expect(block.number).toBe(expectedBlockNumber);
160
+ expectedBlockNumber++;
161
+ }
162
+ }
163
+ expect(mbpsFound).toBe(true);
164
+ return nodes;
165
+ }
166
+ async function getProposerIndexes(t, startSlotTimestamp) {
167
+ // Get the nodes for the next set of slots
168
+ const rollupContract = new RollupContract(t.ctx.deployL1ContractsValues.l1Client, t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress);
169
+ const attesters = await rollupContract.getAttesters();
170
+ const startSlot = await rollupContract.getSlotAt(startSlotTimestamp);
171
+ const proposers = await Promise.all(Array.from({
172
+ length: 3
173
+ }, async (_, i)=>{
174
+ const slot = SlotNumber(startSlot + i);
175
+ const slotTimestamp = await rollupContract.getTimestampForSlot(slot);
176
+ return await rollupContract.getProposerAt(slotTimestamp);
177
+ }));
178
+ // Get the indexes of the nodes that are responsible for the next two slots
179
+ const proposerIndexes = proposers.map((proposer)=>attesters.findIndex((a)=>a.equals(proposer)));
180
+ if (proposerIndexes.some((i)=>i === -1)) {
181
+ throw new Error(`Proposer index not found for proposer ` + `(proposers=${proposers.map((p)=>p.toString()).join(',')}, indices=${proposerIndexes.join(',')})`);
182
+ }
183
+ const nodesToTurnOffTxGossip = Array.from({
184
+ length: NUM_VALIDATORS
185
+ }, (_, i)=>i).filter((i)=>!proposerIndexes.includes(i));
186
+ return {
187
+ proposerIndexes,
188
+ nodesToTurnOffTxGossip
189
+ };
190
+ }
@@ -4,21 +4,40 @@ import { AztecAddress } from '@aztec/aztec.js/addresses';
4
4
  import type { Logger } from '@aztec/aztec.js/log';
5
5
  import { TxHash } from '@aztec/aztec.js/tx';
6
6
  import type { RollupCheatCodes } from '@aztec/aztec/testing';
7
- import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum/contracts';
7
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
8
+ import type { RollupContract, SlashingProposerContract } from '@aztec/ethereum/contracts';
9
+ import { EpochNumber } from '@aztec/foundation/branded-types';
10
+ import { EthAddress } from '@aztec/foundation/eth-address';
8
11
  import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
9
12
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
10
- import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
11
- import { type ProvenTx } from '@aztec/test-wallet/server';
13
+ import { type ProvenTx } from '../test-wallet/utils.js';
12
14
  export declare const submitComplexTxsTo: (logger: Logger, from: AztecAddress, spamContract: SpamContract, numTxs: number, opts?: {
13
15
  callPublic?: boolean | undefined;
14
16
  }) => Promise<TxHash[]>;
15
17
  export declare const submitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<TxHash[]>;
16
18
  export declare function prepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<ProvenTx[]>;
17
- export declare function awaitProposalExecution(slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract, timeoutSeconds: number, logger: Logger): Promise<bigint>;
19
+ export declare function awaitProposalExecution(slashingProposer: SlashingProposerContract, timeoutSeconds: number, logger: Logger): Promise<bigint>;
18
20
  export declare function awaitCommitteeExists({ rollup, logger }: {
19
21
  rollup: RollupContract;
20
22
  logger: Logger;
21
23
  }): Promise<readonly `0x${string}`[]>;
24
+ /**
25
+ * Advance epochs until we find one where the target proposer is selected for at least one slot,
26
+ * then stop one epoch before it. This leaves time for the caller to start sequencers before
27
+ * warping to the target epoch, avoiding the race where the target epoch passes before sequencers
28
+ * are ready.
29
+ *
30
+ * Returns the target epoch number so the caller can warp to it after starting sequencers.
31
+ */
32
+ export declare function advanceToEpochBeforeProposer({ epochCache, cheatCodes, targetProposer, logger, maxAttempts }: {
33
+ epochCache: EpochCacheInterface;
34
+ cheatCodes: RollupCheatCodes;
35
+ targetProposer: EthAddress;
36
+ logger: Logger;
37
+ maxAttempts?: number;
38
+ }): Promise<{
39
+ targetEpoch: EpochNumber;
40
+ }>;
22
41
  export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds }: {
23
42
  nodeAdmin: AztecNodeAdmin;
24
43
  logger: Logger;
@@ -31,16 +50,15 @@ export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundS
31
50
  * Await the committee to be slashed out of the validator set.
32
51
  * Currently assumes that the committee is the same size as the validator set.
33
52
  */
34
- export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }: {
53
+ export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }: {
35
54
  rollup: RollupContract;
36
55
  cheatCodes: RollupCheatCodes;
37
56
  committee: readonly `0x${string}`[];
38
- slashFactory: SlashFactoryContract;
39
- slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract | undefined;
57
+ slashingProposer: SlashingProposerContract | undefined;
40
58
  slashingRoundSize: number;
41
59
  aztecSlotDuration: number;
42
60
  aztecEpochDuration: number;
43
61
  logger: Logger;
44
62
  offenseEpoch: number;
45
63
  }): Promise<void>;
46
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFDViw4QkFBOEIsRUFDOUIsY0FBYyxFQUNkLDZCQUE2QixFQUM5QixNQUFNLDJCQUEyQixDQUFDO0FBTW5DLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBSXZFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdkUsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFnQyxNQUFNLDJCQUEyQixDQUFDO0FBS3hGLGVBQU8sTUFBTSxrQkFBa0I7O3VCQWtCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBVzlCLENBQUM7QUFFRix3QkFBc0IsbUJBQW1CLENBQ3ZDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixNQUFNLEVBQUUsTUFBTSxFQUNkLGFBQWEsRUFBRSxrQkFBa0IsR0FDaEMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBb0JyQjtBQUVELHdCQUFnQixzQkFBc0IsQ0FDcEMsZ0JBQWdCLEVBQUUsOEJBQThCLEdBQUcsNkJBQTZCLEVBQ2hGLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBCakI7QUFFRCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLE1BQU0sRUFDUCxFQUFFO0lBQ0QsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUN2QixNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCLEdBQUcsT0FBTyxDQUFDLFNBQVMsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBWXBDO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLEVBQ3pDLE1BQU0sRUFDTixTQUFTLEVBQ1QsaUJBQWlCLEVBQ2pCLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsY0FBb0IsRUFDckIsRUFBRTtJQUNELFNBQVMsRUFBRSxjQUFjLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN6QiwrQ0FrQkE7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLFVBQVUsRUFDVixTQUFTLEVBQ1QsWUFBWSxFQUNaLGdCQUFnQixFQUNoQixpQkFBaUIsRUFDakIsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sWUFBWSxFQUNiLEVBQUU7SUFDRCxNQUFNLEVBQUUsY0FBYyxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQztJQUM3QixTQUFTLEVBQUUsU0FBUyxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7SUFDcEMsWUFBWSxFQUFFLG9CQUFvQixDQUFDO0lBQ25DLGdCQUFnQixFQUFFLDhCQUE4QixHQUFHLDZCQUE2QixHQUFHLFNBQVMsQ0FBQztJQUM3RixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQztDQUN0QixpQkE2RUEifQ==
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzFGLE9BQU8sRUFBRSxXQUFXLEVBQWMsTUFBTSxpQ0FBaUMsQ0FBQztBQUUxRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFJdkUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFLdEUsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFvQixNQUFNLHlCQUF5QixDQUFDO0FBRzFFLGVBQU8sTUFBTSxrQkFBa0I7O3VCQWtCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBc0I5QixDQUFDO0FBRUYsd0JBQXNCLG1CQUFtQixDQUN2QyxNQUFNLEVBQUUsTUFBTSxFQUNkLElBQUksRUFBRSxnQkFBZ0IsRUFDdEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxhQUFhLEVBQUUsa0JBQWtCLEdBQ2hDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQTZCckI7QUFFRCx3QkFBZ0Isc0JBQXNCLENBQ3BDLGdCQUFnQixFQUFFLHdCQUF3QixFQUMxQyxjQUFjLEVBQUUsTUFBTSxFQUN0QixNQUFNLEVBQUUsTUFBTSxHQUNiLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FjakI7QUFFRCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLE1BQU0sRUFDUCxFQUFFO0lBQ0QsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUN2QixNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCLEdBQUcsT0FBTyxDQUFDLFNBQVMsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBYXBDO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQiw0QkFBNEIsQ0FBQyxFQUNqRCxVQUFVLEVBQ1YsVUFBVSxFQUNWLGNBQWMsRUFDZCxNQUFNLEVBQ04sV0FBZ0IsRUFDakIsRUFBRTtJQUNELFVBQVUsRUFBRSxtQkFBbUIsQ0FBQztJQUNoQyxVQUFVLEVBQUUsZ0JBQWdCLENBQUM7SUFDN0IsY0FBYyxFQUFFLFVBQVUsQ0FBQztJQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RCLEdBQUcsT0FBTyxDQUFDO0lBQUUsV0FBVyxFQUFFLFdBQVcsQ0FBQTtDQUFFLENBQUMsQ0E4QnhDO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLEVBQ3pDLE1BQU0sRUFDTixTQUFTLEVBQ1QsaUJBQWlCLEVBQ2pCLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsY0FBb0IsRUFDckIsRUFBRTtJQUNELFNBQVMsRUFBRSxjQUFjLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN6QiwrQ0FrQkE7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLFVBQVUsRUFDVixTQUFTLEVBQ1QsZ0JBQWdCLEVBQ2hCLGlCQUFpQixFQUNqQixpQkFBaUIsRUFDakIsa0JBQWtCLEVBQ2xCLE1BQU0sRUFDTixZQUFZLEVBQ2IsRUFBRTtJQUNELE1BQU0sRUFBRSxjQUFjLENBQUM7SUFDdkIsVUFBVSxFQUFFLGdCQUFnQixDQUFDO0lBQzdCLFNBQVMsRUFBRSxTQUFTLEtBQUssTUFBTSxFQUFFLEVBQUUsQ0FBQztJQUNwQyxnQkFBZ0IsRUFBRSx3QkFBd0IsR0FBRyxTQUFTLENBQUM7SUFDdkQsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFDM0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFlBQVksRUFBRSxNQUFNLENBQUM7Q0FDdEIsaUJBdURBIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EACV,8BAA8B,EAC9B,cAAc,EACd,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,KAAK,QAAQ,EAAgC,MAAM,2BAA2B,CAAC;AAKxF,eAAO,MAAM,kBAAkB;;uBAkB9B,CAAC;AAGF,eAAO,MAAM,kBAAkB,kHAW9B,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoBrB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,EAChF,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA0BjB;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,MAAM,EACP,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC,CAYpC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,cAAoB,EACrB,EAAE;IACD,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,+CAkBA;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,UAAU,EACV,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,EACN,YAAY,EACb,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;IACpC,YAAY,EAAE,oBAAoB,CAAC;IACnC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,GAAG,SAAS,CAAC;IAC7F,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,iBA6EA"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,16 @@
1
1
  import { NO_WAIT, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
2
2
  import { Fr } from '@aztec/aztec.js/fields';
3
- import { EpochNumber } from '@aztec/foundation/branded-types';
3
+ import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
4
4
  import { timesAsync, unique } from '@aztec/foundation/collection';
5
5
  import { retryUntil } from '@aztec/foundation/retry';
6
6
  import { pluralize } from '@aztec/foundation/string';
7
7
  import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
8
8
  import { getPXEConfig, getPXEConfig as getRpcConfig } from '@aztec/pxe/server';
9
9
  import { getRoundForOffense } from '@aztec/slasher';
10
- import { TestWallet, proveInteraction } from '@aztec/test-wallet/server';
10
+ import { SchnorrHardcodedKeyAccountContract } from '../fixtures/schnorr_hardcoded_account_contract.js';
11
11
  import { submitTxsTo } from '../shared/submit-transactions.js';
12
+ import { TestWallet } from '../test-wallet/test_wallet.js';
13
+ import { proveInteraction } from '../test-wallet/utils.js';
12
14
  // submits a set of transactions to the provided Private eXecution Environment (PXE)
13
15
  export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opts = {})=>{
14
16
  const txs = [];
@@ -16,7 +18,7 @@ export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opt
16
18
  const spamCount = 15;
17
19
  for(let i = 0; i < numTxs; i++){
18
20
  const method = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic);
19
- const txHash = await method.send({
21
+ const { txHash } = await method.send({
20
22
  from,
21
23
  wait: NO_WAIT
22
24
  });
@@ -29,13 +31,21 @@ export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opt
29
31
  export const submitTransactions = async (logger, node, numTxs, fundedAccount)=>{
30
32
  const rpcConfig = getRpcConfig();
31
33
  rpcConfig.proverEnabled = false;
32
- const wallet = await TestWallet.create(node, {
34
+ const wallet = await TestWallet.create(node, // Use checkpointed chain tip to avoid anchoring on provisional blocks that the archiver can prune
35
+ // when their slot ends without a checkpoint landing on L1.
36
+ {
33
37
  ...getPXEConfig(),
34
- proverEnabled: false
38
+ proverEnabled: false,
39
+ syncChainTip: 'checkpointed'
35
40
  }, {
36
- useLogSuffix: true
41
+ loggerActorLabel: 'pxe-tx'
42
+ });
43
+ const contract = new SchnorrHardcodedKeyAccountContract();
44
+ const fundedAccountManager = await wallet.createAccount({
45
+ secret: fundedAccount.secret,
46
+ salt: fundedAccount.salt,
47
+ contract
37
48
  });
38
- const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
39
49
  return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
40
50
  };
41
51
  export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
@@ -43,11 +53,17 @@ export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
43
53
  rpcConfig.proverEnabled = false;
44
54
  const wallet = await TestWallet.create(node, {
45
55
  ...getPXEConfig(),
46
- proverEnabled: false
56
+ proverEnabled: false,
57
+ syncChainTip: 'checkpointed'
47
58
  }, {
48
- useLogSuffix: true
59
+ loggerActorLabel: 'pxe-tx'
60
+ });
61
+ const accountContract = new SchnorrHardcodedKeyAccountContract();
62
+ const fundedAccountManager = await wallet.createAccount({
63
+ secret: fundedAccount.secret,
64
+ salt: fundedAccount.salt,
65
+ contract: accountContract
49
66
  });
50
- const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
51
67
  const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
52
68
  salt: Fr.random()
53
69
  });
@@ -67,24 +83,12 @@ export function awaitProposalExecution(slashingProposer, timeoutSeconds, logger)
67
83
  logger.warn(`Timed out waiting for proposal execution`);
68
84
  reject(new Error(`Timeout waiting for proposal execution after ${timeoutSeconds}s`));
69
85
  }, timeoutSeconds * 1000);
70
- if (slashingProposer.type === 'empire') {
71
- const unwatch = slashingProposer.listenToPayloadSubmitted((args)=>{
72
- logger.warn(`Proposal ${args.payload} from round ${args.round} executed`);
73
- clearTimeout(timeout);
74
- unwatch();
75
- resolve(args.round);
76
- });
77
- } else if (slashingProposer.type === 'tally') {
78
- const unwatch = slashingProposer.listenToRoundExecuted((args)=>{
79
- logger.warn(`Slash from round ${args.round} executed`);
80
- clearTimeout(timeout);
81
- unwatch();
82
- resolve(args.round);
83
- });
84
- } else {
86
+ const unwatch = slashingProposer.listenToRoundExecuted((args)=>{
87
+ logger.warn(`Slash from round ${args.round} executed`);
85
88
  clearTimeout(timeout);
86
- reject(new Error(`Unknown slashing proposer type: ${slashingProposer.type}`));
87
- }
89
+ unwatch();
90
+ resolve(args.round);
91
+ });
88
92
  });
89
93
  }
90
94
  export async function awaitCommitteeExists({ rollup, logger }) {
@@ -94,8 +98,42 @@ export async function awaitCommitteeExists({ rollup, logger }) {
94
98
  committee = await rollup.getCurrentEpochCommittee();
95
99
  return committee && committee.length > 0;
96
100
  }, 'non-empty committee', 60);
101
+ logger.warn(`Committee has been formed`, {
102
+ committee: committee.map((c)=>c.toString())
103
+ });
97
104
  return committee.map((c)=>c.toString());
98
105
  }
106
+ /**
107
+ * Advance epochs until we find one where the target proposer is selected for at least one slot,
108
+ * then stop one epoch before it. This leaves time for the caller to start sequencers before
109
+ * warping to the target epoch, avoiding the race where the target epoch passes before sequencers
110
+ * are ready.
111
+ *
112
+ * Returns the target epoch number so the caller can warp to it after starting sequencers.
113
+ */ export async function advanceToEpochBeforeProposer({ epochCache, cheatCodes, targetProposer, logger, maxAttempts = 20 }) {
114
+ const { epochDuration } = await cheatCodes.getConfig();
115
+ for(let attempt = 0; attempt < maxAttempts; attempt++){
116
+ const currentEpoch = await cheatCodes.getEpoch();
117
+ // Check the NEXT epoch's slots so we stay one epoch before the target,
118
+ // giving the caller time to start sequencers before the target epoch arrives.
119
+ const nextEpoch = Number(currentEpoch) + 1;
120
+ const startSlot = nextEpoch * Number(epochDuration);
121
+ const endSlot = startSlot + Number(epochDuration);
122
+ logger.info(`Checking next epoch ${nextEpoch} (slots ${startSlot}-${endSlot - 1}) for proposer ${targetProposer} (current epoch: ${currentEpoch})`);
123
+ for(let s = startSlot; s < endSlot; s++){
124
+ const proposer = await epochCache.getProposerAttesterAddressInSlot(SlotNumber(s));
125
+ if (proposer && proposer.equals(targetProposer)) {
126
+ logger.warn(`Found target proposer ${targetProposer} in slot ${s} of epoch ${nextEpoch}. Staying at epoch ${currentEpoch} to allow sequencer startup.`);
127
+ return {
128
+ targetEpoch: EpochNumber(nextEpoch)
129
+ };
130
+ }
131
+ }
132
+ logger.info(`Target proposer not found in epoch ${nextEpoch}, advancing to next epoch`);
133
+ await cheatCodes.advanceToNextEpoch();
134
+ }
135
+ throw new Error(`Target proposer ${targetProposer} not found in any slot after ${maxAttempts} epoch attempts`);
136
+ }
99
137
  export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds = 120 }) {
100
138
  const targetOffenseCount = waitUntilOffenseCount ?? 1;
101
139
  logger.warn(`Waiting for ${pluralize('offense', targetOffenseCount)} to be detected`);
@@ -116,35 +154,21 @@ export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSiz
116
154
  /**
117
155
  * Await the committee to be slashed out of the validator set.
118
156
  * Currently assumes that the committee is the same size as the validator set.
119
- */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }) {
157
+ */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }) {
120
158
  if (!slashingProposer) {
121
159
  throw new Error('No slashing proposer configured. Cannot test slashing.');
122
160
  }
123
161
  await cheatCodes.debugRollup();
124
- if (slashingProposer.type === 'empire') {
125
- // Await for the slash payload to be created if empire (no payload is created on tally until execution time)
126
- const targetEpoch = EpochNumber(await cheatCodes.getEpoch() + await rollup.getLagInEpochsForValidatorSet() + 1);
127
- logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
128
- await cheatCodes.advanceToEpoch(targetEpoch);
129
- const slashPayloadEvents = await retryUntil(async ()=>{
130
- const events = await slashFactory.getSlashPayloadCreatedEvents();
131
- return events.length > 0 ? events : undefined;
132
- }, 'slash payload created', 120, 1);
133
- expect(slashPayloadEvents.length).toBe(1);
134
- // The uniqueness check is needed since a validator may be slashed more than once on the same round (eg because they let two epochs be pruned)
135
- expect(unique(slashPayloadEvents[0].slashes.map((slash)=>slash.validator.toString()))).toHaveLength(committee.length);
136
- } else {
137
- // Use the slash offset to ensure we are in the right epoch for tally
138
- const slashOffsetInRounds = await slashingProposer.getSlashOffsetInRounds();
139
- const slashingRoundSizeInEpochs = slashingRoundSize / aztecEpochDuration;
140
- const slashingOffsetInEpochs = Number(slashOffsetInRounds) * slashingRoundSizeInEpochs;
141
- const firstEpochInOffenseRound = offenseEpoch - offenseEpoch % slashingRoundSizeInEpochs;
142
- const targetEpoch = firstEpochInOffenseRound + slashingOffsetInEpochs;
143
- logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
144
- await cheatCodes.advanceToEpoch(EpochNumber(targetEpoch), {
145
- offset: -aztecSlotDuration / 2
146
- });
147
- }
162
+ // Use the slash offset to ensure we are in the right epoch for tally
163
+ const slashOffsetInRounds = await slashingProposer.getSlashOffsetInRounds();
164
+ const slashingRoundSizeInEpochs = slashingRoundSize / aztecEpochDuration;
165
+ const slashingOffsetInEpochs = Number(slashOffsetInRounds) * slashingRoundSizeInEpochs;
166
+ const firstEpochInOffenseRound = offenseEpoch - offenseEpoch % slashingRoundSizeInEpochs;
167
+ const targetEpoch = firstEpochInOffenseRound + slashingOffsetInEpochs;
168
+ logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
169
+ await cheatCodes.advanceToEpoch(EpochNumber(targetEpoch), {
170
+ offset: -aztecSlotDuration / 2
171
+ });
148
172
  const attestersPre = await rollup.getAttesters();
149
173
  expect(attestersPre.length).toBe(committee.length);
150
174
  for (const attester of attestersPre){
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZV9wcm9vZl9mZXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZTJlX3N0b3JhZ2VfcHJvb2YvZml4dHVyZXMvc3RvcmFnZV9wcm9vZl9mZXRjaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"storage_proof_fetcher.d.ts","sourceRoot":"","sources":["../../../src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts"],"names":[],"mappings":""}