@aztec/end-to-end 0.0.0-test.0 → 0.0.1-commit.21caa21

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 (174) hide show
  1. package/dest/bench/client_flows/benchmark.d.ts +61 -0
  2. package/dest/bench/client_flows/benchmark.d.ts.map +1 -0
  3. package/dest/bench/client_flows/benchmark.js +261 -0
  4. package/dest/bench/client_flows/client_flows_benchmark.d.ts +80 -0
  5. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -0
  6. package/dest/bench/client_flows/client_flows_benchmark.js +334 -0
  7. package/dest/bench/client_flows/config.d.ts +14 -0
  8. package/dest/bench/client_flows/config.d.ts.map +1 -0
  9. package/dest/bench/client_flows/config.js +106 -0
  10. package/dest/bench/client_flows/data_extractor.d.ts +2 -0
  11. package/dest/bench/client_flows/data_extractor.d.ts.map +1 -0
  12. package/dest/bench/client_flows/data_extractor.js +77 -0
  13. package/dest/bench/utils.d.ts +12 -38
  14. package/dest/bench/utils.d.ts.map +1 -1
  15. package/dest/bench/utils.js +26 -66
  16. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +21 -13
  17. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  18. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +85 -57
  19. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +19 -25
  20. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  21. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +50 -70
  22. package/dest/e2e_deploy_contract/deploy_test.d.ts +16 -8
  23. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  24. package/dest/e2e_deploy_contract/deploy_test.js +13 -19
  25. package/dest/e2e_epochs/epochs_test.d.ts +59 -18
  26. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  27. package/dest/e2e_epochs/epochs_test.js +226 -44
  28. package/dest/e2e_fees/bridging_race.notest.d.ts +2 -0
  29. package/dest/e2e_fees/bridging_race.notest.d.ts.map +1 -0
  30. package/dest/e2e_fees/bridging_race.notest.js +63 -0
  31. package/dest/e2e_fees/fees_test.d.ts +21 -10
  32. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  33. package/dest/e2e_fees/fees_test.js +103 -109
  34. package/dest/e2e_l1_publisher/write_json.d.ts +10 -0
  35. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -0
  36. package/dest/e2e_l1_publisher/write_json.js +58 -0
  37. package/dest/e2e_multi_validator/utils.d.ts +12 -0
  38. package/dest/e2e_multi_validator/utils.d.ts.map +1 -0
  39. package/dest/e2e_multi_validator/utils.js +214 -0
  40. package/dest/e2e_nested_contract/nested_contract_test.d.ts +10 -7
  41. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  42. package/dest/e2e_nested_contract/nested_contract_test.js +24 -20
  43. package/dest/e2e_p2p/inactivity_slash_test.d.ts +31 -0
  44. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -0
  45. package/dest/e2e_p2p/inactivity_slash_test.js +139 -0
  46. package/dest/e2e_p2p/p2p_network.d.ts +275 -23
  47. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  48. package/dest/e2e_p2p/p2p_network.js +184 -131
  49. package/dest/e2e_p2p/shared.d.ts +43 -7
  50. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  51. package/dest/e2e_p2p/shared.js +164 -19
  52. package/dest/e2e_token_contract/token_contract_test.d.ts +12 -6
  53. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  54. package/dest/e2e_token_contract/token_contract_test.js +50 -26
  55. package/dest/fixtures/e2e_prover_test.d.ts +63 -0
  56. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -0
  57. package/dest/{e2e_prover → fixtures}/e2e_prover_test.js +104 -105
  58. package/dest/fixtures/fixtures.d.ts +6 -7
  59. package/dest/fixtures/fixtures.d.ts.map +1 -1
  60. package/dest/fixtures/fixtures.js +4 -3
  61. package/dest/fixtures/get_acvm_config.d.ts +2 -2
  62. package/dest/fixtures/get_acvm_config.d.ts.map +1 -1
  63. package/dest/fixtures/get_acvm_config.js +2 -14
  64. package/dest/fixtures/get_bb_config.d.ts +2 -2
  65. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  66. package/dest/fixtures/get_bb_config.js +10 -17
  67. package/dest/fixtures/index.d.ts +1 -1
  68. package/dest/fixtures/l1_to_l2_messaging.d.ts +9 -6
  69. package/dest/fixtures/l1_to_l2_messaging.d.ts.map +1 -1
  70. package/dest/fixtures/l1_to_l2_messaging.js +44 -18
  71. package/dest/fixtures/logging.d.ts +1 -1
  72. package/dest/fixtures/setup_l1_contracts.d.ts +476 -5
  73. package/dest/fixtures/setup_l1_contracts.d.ts.map +1 -1
  74. package/dest/fixtures/setup_l1_contracts.js +4 -4
  75. package/dest/fixtures/setup_p2p_test.d.ts +15 -14
  76. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  77. package/dest/fixtures/setup_p2p_test.js +81 -21
  78. package/dest/fixtures/snapshot_manager.d.ts +17 -9
  79. package/dest/fixtures/snapshot_manager.d.ts.map +1 -1
  80. package/dest/fixtures/snapshot_manager.js +147 -121
  81. package/dest/fixtures/token_utils.d.ts +10 -4
  82. package/dest/fixtures/token_utils.d.ts.map +1 -1
  83. package/dest/fixtures/token_utils.js +28 -12
  84. package/dest/fixtures/utils.d.ts +524 -40
  85. package/dest/fixtures/utils.d.ts.map +1 -1
  86. package/dest/fixtures/utils.js +464 -369
  87. package/dest/fixtures/web3signer.d.ts +5 -0
  88. package/dest/fixtures/web3signer.d.ts.map +1 -0
  89. package/dest/fixtures/web3signer.js +53 -0
  90. package/dest/fixtures/with_telemetry_utils.d.ts +1 -1
  91. package/dest/index.d.ts +1 -1
  92. package/dest/quality_of_service/alert_checker.d.ts +2 -2
  93. package/dest/quality_of_service/alert_checker.d.ts.map +1 -1
  94. package/dest/shared/cross_chain_test_harness.d.ts +39 -34
  95. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  96. package/dest/shared/cross_chain_test_harness.js +104 -50
  97. package/dest/shared/gas_portal_test_harness.d.ts +29 -31
  98. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  99. package/dest/shared/gas_portal_test_harness.js +51 -30
  100. package/dest/shared/index.d.ts +1 -1
  101. package/dest/shared/jest_setup.d.ts +1 -1
  102. package/dest/shared/jest_setup.js +1 -1
  103. package/dest/shared/submit-transactions.d.ts +6 -4
  104. package/dest/shared/submit-transactions.d.ts.map +1 -1
  105. package/dest/shared/submit-transactions.js +8 -7
  106. package/dest/shared/uniswap_l1_l2.d.ts +14 -12
  107. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  108. package/dest/shared/uniswap_l1_l2.js +146 -116
  109. package/dest/simulators/index.d.ts +1 -1
  110. package/dest/simulators/lending_simulator.d.ts +7 -11
  111. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  112. package/dest/simulators/lending_simulator.js +15 -16
  113. package/dest/simulators/token_simulator.d.ts +6 -3
  114. package/dest/simulators/token_simulator.d.ts.map +1 -1
  115. package/dest/simulators/token_simulator.js +16 -13
  116. package/dest/spartan/setup_test_wallets.d.ts +26 -11
  117. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  118. package/dest/spartan/setup_test_wallets.js +201 -58
  119. package/dest/spartan/utils.d.ts +116 -313
  120. package/dest/spartan/utils.d.ts.map +1 -1
  121. package/dest/spartan/utils.js +434 -130
  122. package/package.json +65 -58
  123. package/src/bench/client_flows/benchmark.ts +341 -0
  124. package/src/bench/client_flows/client_flows_benchmark.ts +447 -0
  125. package/src/bench/client_flows/config.ts +61 -0
  126. package/src/bench/client_flows/data_extractor.ts +89 -0
  127. package/src/bench/utils.ts +22 -76
  128. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +80 -77
  129. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +65 -106
  130. package/src/e2e_deploy_contract/deploy_test.ts +24 -39
  131. package/src/e2e_epochs/epochs_test.ts +276 -55
  132. package/src/e2e_fees/bridging_race.notest.ts +80 -0
  133. package/src/e2e_fees/fees_test.ts +142 -138
  134. package/src/e2e_l1_publisher/write_json.ts +77 -0
  135. package/src/e2e_multi_validator/utils.ts +258 -0
  136. package/src/e2e_nested_contract/nested_contract_test.ts +29 -19
  137. package/src/e2e_p2p/inactivity_slash_test.ts +182 -0
  138. package/src/e2e_p2p/p2p_network.ts +279 -169
  139. package/src/e2e_p2p/shared.ts +247 -29
  140. package/src/e2e_token_contract/token_contract_test.ts +43 -39
  141. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  142. package/src/{e2e_prover → fixtures}/e2e_prover_test.ts +107 -152
  143. package/src/fixtures/fixtures.ts +4 -3
  144. package/src/fixtures/get_acvm_config.ts +3 -11
  145. package/src/fixtures/get_bb_config.ts +18 -13
  146. package/src/fixtures/l1_to_l2_messaging.ts +53 -23
  147. package/src/fixtures/setup_l1_contracts.ts +6 -7
  148. package/src/fixtures/setup_p2p_test.ts +126 -38
  149. package/src/fixtures/snapshot_manager.ts +187 -139
  150. package/src/fixtures/token_utils.ts +32 -15
  151. package/src/fixtures/utils.ts +580 -434
  152. package/src/fixtures/web3signer.ts +63 -0
  153. package/src/guides/up_quick_start.sh +7 -15
  154. package/src/quality_of_service/alert_checker.ts +1 -1
  155. package/src/shared/cross_chain_test_harness.ts +108 -79
  156. package/src/shared/gas_portal_test_harness.ts +59 -50
  157. package/src/shared/jest_setup.ts +1 -1
  158. package/src/shared/submit-transactions.ts +12 -8
  159. package/src/shared/uniswap_l1_l2.ts +181 -184
  160. package/src/simulators/lending_simulator.ts +14 -15
  161. package/src/simulators/token_simulator.ts +21 -13
  162. package/src/spartan/DEVELOP.md +121 -0
  163. package/src/spartan/setup_test_wallets.ts +251 -93
  164. package/src/spartan/utils.ts +490 -130
  165. package/dest/e2e_prover/e2e_prover_test.d.ts +0 -56
  166. package/dest/e2e_prover/e2e_prover_test.d.ts.map +0 -1
  167. package/dest/sample-dapp/connect.js +0 -12
  168. package/dest/sample-dapp/contracts.js +0 -10
  169. package/dest/sample-dapp/deploy.js +0 -35
  170. package/dest/sample-dapp/index.js +0 -98
  171. package/src/sample-dapp/connect.mjs +0 -16
  172. package/src/sample-dapp/contracts.mjs +0 -14
  173. package/src/sample-dapp/deploy.mjs +0 -40
  174. package/src/sample-dapp/index.mjs +0 -128
@@ -0,0 +1,214 @@
1
+ import { getAddressFromPrivateKey } from '@aztec/ethereum';
2
+ import { EthAddress } from '@aztec/foundation/eth-address';
3
+ import { writeFile } from 'fs/promises';
4
+ import { createServer } from 'http';
5
+ import { signMessage, signTypedData } from 'viem/accounts';
6
+ // Create a mock JSON RPC signer
7
+ // Only supports signing messages and type data
8
+ const SUPPORTED_METHODS = [
9
+ 'eth_sign',
10
+ 'eth_signTypedData_v4'
11
+ ];
12
+ export function createJSONRPCSigner(keyLookup, stats) {
13
+ return createServer((req, res)=>{
14
+ if (req.method === 'POST') {
15
+ let body = '';
16
+ req.on('data', (chunk)=>{
17
+ body += chunk.toString();
18
+ });
19
+ req.on('end', ()=>{
20
+ try {
21
+ const jsonRequest = JSON.parse(body);
22
+ res.writeHead(200, {
23
+ 'Content-Type': 'application/json'
24
+ });
25
+ if (!SUPPORTED_METHODS.includes(jsonRequest.method)) {
26
+ res.end(JSON.stringify({
27
+ jsonrpc: '2.0',
28
+ id: jsonRequest.id,
29
+ error: {
30
+ code: -32601,
31
+ message: 'Method not supported'
32
+ }
33
+ }));
34
+ return;
35
+ }
36
+ // Get the address sending the transaction
37
+ const [address, data] = jsonRequest.params;
38
+ const lowerCaseAddress = address.toLowerCase();
39
+ stats.set(lowerCaseAddress, (stats.get(lowerCaseAddress) ?? 0) + 1);
40
+ // Find the private key for the address
41
+ const privateKey = keyLookup.get(address.toLowerCase());
42
+ if (!privateKey) {
43
+ res.end(JSON.stringify({
44
+ jsonrpc: '2.0',
45
+ id: jsonRequest.id,
46
+ error: {
47
+ code: -32602,
48
+ message: `No private key found for address ${address}`
49
+ }
50
+ }));
51
+ return;
52
+ }
53
+ const promise = jsonRequest.method === 'eth_sign' ? signMessage({
54
+ message: {
55
+ raw: data
56
+ },
57
+ privateKey
58
+ }) : signTypedData({
59
+ privateKey,
60
+ ...data
61
+ });
62
+ void promise.then((signature)=>{
63
+ res.end(JSON.stringify({
64
+ jsonrpc: '2.0',
65
+ id: jsonRequest.id,
66
+ result: signature
67
+ }));
68
+ });
69
+ } catch (err) {
70
+ res.end(JSON.stringify({
71
+ jsonrpc: '2.0',
72
+ id: 1,
73
+ error: {
74
+ code: -32603,
75
+ message: `${err}`
76
+ }
77
+ }));
78
+ }
79
+ });
80
+ } else {
81
+ res.writeHead(405);
82
+ res.end('Method not allowed');
83
+ }
84
+ });
85
+ }
86
+ // Functions for creating file based key stores for the e2e_multi_validator_node_key_store test
87
+ export async function createKeyFile1(fileName, mnemonic, validatorIndex, publisher1Key, publisher2Key, coinbase, feeRecipient) {
88
+ const obj = {
89
+ schemaVersion: 1,
90
+ validators: [
91
+ {
92
+ attester: {
93
+ mnemonic: mnemonic,
94
+ accountIndex: 0,
95
+ addressIndex: validatorIndex,
96
+ addressCount: 1
97
+ },
98
+ coinbase: coinbase.toChecksumString(),
99
+ publisher: [
100
+ publisher1Key,
101
+ publisher2Key
102
+ ],
103
+ feeRecipient: feeRecipient.toString()
104
+ }
105
+ ]
106
+ };
107
+ await writeFile(fileName, JSON.stringify(obj, null, 2));
108
+ }
109
+ export async function createKeyFile2(fileName, validatorKey, publisherMnemonic, publisher1Index, coinbase, feeRecipient) {
110
+ const obj = {
111
+ schemaVersion: 1,
112
+ validators: [
113
+ {
114
+ attester: validatorKey,
115
+ coinbase: coinbase.toChecksumString(),
116
+ publisher: {
117
+ mnemonic: publisherMnemonic,
118
+ accountIndex: 0,
119
+ addressIndex: publisher1Index,
120
+ addressCount: 2
121
+ },
122
+ feeRecipient: feeRecipient.toString()
123
+ }
124
+ ]
125
+ };
126
+ await writeFile(fileName, JSON.stringify(obj, null, 2));
127
+ }
128
+ export async function createKeyFile3(fileName, validatorAddress, publisher1Key, publisher2Key, coinbase, remoteSignerUrl, feeRecipient) {
129
+ const obj = {
130
+ schemaVersion: 1,
131
+ validators: [
132
+ {
133
+ attester: validatorAddress.toChecksumString(),
134
+ coinbase: coinbase.toChecksumString(),
135
+ publisher: [
136
+ publisher1Key,
137
+ publisher2Key
138
+ ],
139
+ feeRecipient: feeRecipient.toString(),
140
+ remoteSigner: {
141
+ remoteSignerUrl: remoteSignerUrl
142
+ }
143
+ }
144
+ ]
145
+ };
146
+ await writeFile(fileName, JSON.stringify(obj, null, 2));
147
+ }
148
+ export async function createKeyFile4(fileName, validator1Address, validator2Address, publisher1Index, publisher2Key, mnemonic, publisher3Key, coinbase1, coinbase2, remoteSignerUrl, feeRecipient1, feeRecipient2) {
149
+ const obj = {
150
+ schemaVersion: 1,
151
+ remoteSigner: {
152
+ remoteSignerUrl: remoteSignerUrl
153
+ },
154
+ validators: [
155
+ {
156
+ attester: validator1Address.toChecksumString(),
157
+ coinbase: coinbase1.toChecksumString(),
158
+ publisher: {
159
+ mnemonic: mnemonic,
160
+ accountIndex: 0,
161
+ addressIndex: publisher1Index,
162
+ addressCount: 2
163
+ },
164
+ feeRecipient: feeRecipient1.toString()
165
+ },
166
+ {
167
+ attester: validator2Address.toChecksumString(),
168
+ coinbase: coinbase2.toChecksumString(),
169
+ publisher: [
170
+ publisher2Key,
171
+ publisher3Key
172
+ ],
173
+ feeRecipient: feeRecipient2.toString()
174
+ }
175
+ ]
176
+ };
177
+ await writeFile(fileName, JSON.stringify(obj, null, 2));
178
+ }
179
+ export async function createKeyFile5(fileName, proverAddress, remoteSignerUrl) {
180
+ const obj = {
181
+ schemaVersion: 1,
182
+ prover: {
183
+ id: '0x1234567890123456789012345678901234567890',
184
+ publisher: [
185
+ {
186
+ address: proverAddress.toChecksumString(),
187
+ remoteSignerUrl: remoteSignerUrl
188
+ }
189
+ ]
190
+ }
191
+ };
192
+ await writeFile(fileName, JSON.stringify(obj, null, 2));
193
+ }
194
+ export async function createKeyFile6(fileName, mnemonic, validator1Index, coinbase, feeRecipient) {
195
+ const obj = {
196
+ schemaVersion: 1,
197
+ validators: [
198
+ {
199
+ attester: {
200
+ mnemonic: mnemonic,
201
+ accountIndex: 0,
202
+ addressIndex: validator1Index,
203
+ addressCount: 2
204
+ },
205
+ coinbase: coinbase.toChecksumString(),
206
+ feeRecipient: feeRecipient.toString()
207
+ }
208
+ ]
209
+ };
210
+ await writeFile(fileName, JSON.stringify(obj, null, 2));
211
+ }
212
+ export function addressForPrivateKey(privateKey) {
213
+ return EthAddress.fromString(getAddressFromPrivateKey(privateKey));
214
+ }
@@ -1,14 +1,17 @@
1
- import { type AccountWallet, type CompleteAddress, type Logger, type PXE } from '@aztec/aztec.js';
2
- import { ChildContract } from '@aztec/noir-contracts.js/Child';
3
- import { ParentContract } from '@aztec/noir-contracts.js/Parent';
1
+ import { AztecAddress } from '@aztec/aztec.js/addresses';
2
+ import { type Logger } from '@aztec/aztec.js/log';
3
+ import type { AztecNode } from '@aztec/aztec.js/node';
4
+ import type { Wallet } from '@aztec/aztec.js/wallet';
5
+ import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
6
+ import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
4
7
  import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
5
8
  export declare class NestedContractTest {
6
9
  private numberOfAccounts;
7
10
  private snapshotManager;
8
11
  logger: Logger;
9
- wallets: AccountWallet[];
10
- accounts: CompleteAddress[];
11
- pxe: PXE;
12
+ wallet: Wallet;
13
+ defaultAccountAddress: AztecAddress;
14
+ aztecNode: AztecNode;
12
15
  parentContract: ParentContract;
13
16
  childContract: ChildContract;
14
17
  constructor(testName: string, numberOfAccounts?: number);
@@ -23,4 +26,4 @@ export declare class NestedContractTest {
23
26
  snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
24
27
  applyManualSnapshots(): Promise<void>;
25
28
  }
26
- //# sourceMappingURL=nested_contract_test.d.ts.map
29
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVzdGVkX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbmVzdGVkX2NvbnRyYWN0L25lc3RlZF9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUV0RSxPQUFPLEVBRUwsS0FBSyxpQkFBaUIsRUFJdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUl6QyxxQkFBYSxrQkFBa0I7SUFZM0IsT0FBTyxDQUFDLGdCQUFnQjtJQVgxQixPQUFPLENBQUMsZUFBZSxDQUFtQjtJQUMxQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLE1BQU0sQ0FBQztJQUNoQixxQkFBcUIsRUFBRyxZQUFZLENBQUM7SUFDckMsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixjQUFjLEVBQUcsY0FBYyxDQUFDO0lBQ2hDLGFBQWEsRUFBRyxhQUFhLENBQUM7SUFFOUIsWUFDRSxRQUFRLEVBQUUsTUFBTSxFQUNSLGdCQUFnQixTQUFJLEVBSTdCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkFvQnZCO0lBRUssS0FBSyxrQkFFVjtJQUVLLFFBQVEsa0JBRWI7SUFFRCxRQUFRLEdBQUksQ0FBQyw4SkFJMkQ7SUFFbEUsb0JBQW9CLGtCQWtCekI7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAUC,OAAO,CAAC,gBAAgB;IATtD,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAElB,QAAQ,EAAE,MAAM,EAAU,gBAAgB,SAAI;IAK1D;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAc3B"}
1
+ {"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,MAAM,CAAC;IAChB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IAEtB,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;IAE9B,YACE,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI,EAI7B;IAED;;;;OAIG;IACG,kBAAkB,kBAoBvB;IAEK,KAAK,kBAEV;IAEK,QAAQ,kBAEb;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,oBAAoB,kBAkBzB;CACF"}
@@ -1,22 +1,19 @@
1
- import { getSchnorrWallet } from '@aztec/accounts/schnorr';
2
- import { createLogger } from '@aztec/aztec.js';
3
- import { ChildContract } from '@aztec/noir-contracts.js/Child';
4
- import { ParentContract } from '@aztec/noir-contracts.js/Parent';
1
+ import { createLogger } from '@aztec/aztec.js/log';
2
+ import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
3
+ import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
5
4
  import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
6
5
  const { E2E_DATA_PATH: dataPath } = process.env;
7
6
  export class NestedContractTest {
8
7
  numberOfAccounts;
9
8
  snapshotManager;
10
9
  logger;
11
- wallets;
12
- accounts;
13
- pxe;
10
+ wallet;
11
+ defaultAccountAddress;
12
+ aztecNode;
14
13
  parentContract;
15
14
  childContract;
16
15
  constructor(testName, numberOfAccounts = 1){
17
16
  this.numberOfAccounts = numberOfAccounts;
18
- this.wallets = [];
19
- this.accounts = [];
20
17
  this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
21
18
  this.logger = createLogger(`e2e:e2e_nested_contract:${testName}`);
22
19
  this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}-${numberOfAccounts}`, dataPath);
@@ -26,15 +23,17 @@ export class NestedContractTest {
26
23
  * 1. Add 3 accounts.
27
24
  * 2. Publicly deploy accounts
28
25
  */ async applyBaseSnapshots() {
29
- await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe })=>{
30
- this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
31
- this.accounts = await pxe.getRegisteredAccounts();
32
- this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
33
- this.pxe = pxe;
26
+ await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), ({ deployedAccounts }, { wallet, aztecNode })=>{
27
+ this.wallet = wallet;
28
+ [{ address: this.defaultAccountAddress }] = deployedAccounts;
29
+ this.aztecNode = aztecNode;
30
+ return Promise.resolve();
34
31
  });
35
32
  await this.snapshotManager.snapshot('public_deploy', async ()=>{}, async ()=>{
36
33
  this.logger.verbose(`Public deploy accounts...`);
37
- await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 2));
34
+ await publicDeployAccounts(this.wallet, [
35
+ this.defaultAccountAddress
36
+ ]);
38
37
  });
39
38
  }
40
39
  async setup() {
@@ -46,15 +45,20 @@ export class NestedContractTest {
46
45
  snapshot;
47
46
  async applyManualSnapshots() {
48
47
  await this.snapshotManager.snapshot('manual', async ()=>{
49
- const parentContract = await ParentContract.deploy(this.wallets[0]).send().deployed();
50
- const childContract = await ChildContract.deploy(this.wallets[0]).send().deployed();
48
+ const parentContract = await ParentContract.deploy(this.wallet).send({
49
+ from: this.defaultAccountAddress
50
+ }).deployed();
51
+ const childContract = await ChildContract.deploy(this.wallet).send({
52
+ from: this.defaultAccountAddress
53
+ }).deployed();
51
54
  return {
52
55
  parentContractAddress: parentContract.address,
53
56
  childContractAddress: childContract.address
54
57
  };
55
- }, async ({ parentContractAddress, childContractAddress })=>{
56
- this.parentContract = await ParentContract.at(parentContractAddress, this.wallets[0]);
57
- this.childContract = await ChildContract.at(childContractAddress, this.wallets[0]);
58
+ }, ({ parentContractAddress, childContractAddress })=>{
59
+ this.parentContract = ParentContract.at(parentContractAddress, this.wallet);
60
+ this.childContract = ChildContract.at(childContractAddress, this.wallet);
61
+ return Promise.resolve();
58
62
  });
59
63
  }
60
64
  }
@@ -0,0 +1,31 @@
1
+ import type { AztecNodeService } from '@aztec/aztec-node';
2
+ import { EthAddress } from '@aztec/aztec.js/addresses';
3
+ import { RollupContract } from '@aztec/ethereum';
4
+ import 'jest-extended';
5
+ import { P2PNetworkTest } from './p2p_network.js';
6
+ export declare class P2PInactivityTest {
7
+ readonly test: P2PNetworkTest;
8
+ nodes: AztecNodeService[];
9
+ activeNodes: AztecNodeService[];
10
+ inactiveNodes: AztecNodeService[];
11
+ rollup: RollupContract;
12
+ offlineValidators: EthAddress[];
13
+ private dataDir;
14
+ private inactiveNodeCount;
15
+ private keepInitialNode;
16
+ constructor(test: P2PNetworkTest, opts: {
17
+ inactiveNodeCount: number;
18
+ keepInitialNode?: boolean;
19
+ });
20
+ static create(testName: string, opts: {
21
+ slashInactivityConsecutiveEpochThreshold: number;
22
+ inactiveNodeCount: number;
23
+ keepInitialNode?: boolean;
24
+ }): Promise<P2PInactivityTest>;
25
+ setup(): Promise<this>;
26
+ teardown(): Promise<void>;
27
+ get ctx(): import("../fixtures/snapshot_manager.js").SubsystemsContext;
28
+ get logger(): import("../../../foundation/dest/log/pino-logger.js").Logger;
29
+ get slashingAmount(): bigint;
30
+ }
31
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5hY3Rpdml0eV9zbGFzaF90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9pbmFjdGl2aXR5X3NsYXNoX3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSWpELE9BQU8sZUFBZSxDQUFDO0FBS3ZCLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQWlCbEQscUJBQWEsaUJBQWlCO2FBYVYsSUFBSSxFQUFFLGNBQWM7SUFaL0IsS0FBSyxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFDM0IsV0FBVyxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFDakMsYUFBYSxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFFbkMsTUFBTSxFQUFHLGNBQWMsQ0FBQztJQUN4QixpQkFBaUIsRUFBRyxVQUFVLEVBQUUsQ0FBQztJQUV4QyxPQUFPLENBQUMsT0FBTyxDQUFTO0lBQ3hCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUztJQUNsQyxPQUFPLENBQUMsZUFBZSxDQUFVO0lBRWpDLFlBQ2tCLElBQUksRUFBRSxjQUFjLEVBQ3BDLElBQUksRUFBRTtRQUFFLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUFDLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBSy9EO0lBRUQsT0FBYSxNQUFNLENBQ2pCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLElBQUksRUFBRTtRQUFFLHdDQUF3QyxFQUFFLE1BQU0sQ0FBQztRQUFDLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUFDLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLDhCQThCakg7SUFFWSxLQUFLLGtCQTZFakI7SUFFWSxRQUFRLGtCQU1wQjtJQUVELElBQVcsR0FBRyxnRUFFYjtJQUVELElBQVcsTUFBTSxpRUFFaEI7SUFFRCxJQUFXLGNBQWMsV0FFeEI7Q0FDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"inactivity_slash_test.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/inactivity_slash_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,eAAe,CAAC;AAKvB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBlD,qBAAa,iBAAiB;aAaV,IAAI,EAAE,cAAc;IAZ/B,KAAK,EAAG,gBAAgB,EAAE,CAAC;IAC3B,WAAW,EAAG,gBAAgB,EAAE,CAAC;IACjC,aAAa,EAAG,gBAAgB,EAAE,CAAC;IAEnC,MAAM,EAAG,cAAc,CAAC;IACxB,iBAAiB,EAAG,UAAU,EAAE,CAAC;IAExC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,eAAe,CAAU;IAEjC,YACkB,IAAI,EAAE,cAAc,EACpC,IAAI,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,EAK/D;IAED,OAAa,MAAM,CACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;QAAE,wCAAwC,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,8BA8BjH;IAEY,KAAK,kBA6EjB;IAEY,QAAQ,kBAMpB;IAED,IAAW,GAAG,gEAEb;IAED,IAAW,MAAM,iEAEhB;IAED,IAAW,cAAc,WAExB;CACF"}
@@ -0,0 +1,139 @@
1
+ import { EpochNumber } from '@aztec/foundation/branded-types';
2
+ import fs from 'fs';
3
+ import 'jest-extended';
4
+ import os from 'os';
5
+ import path from 'path';
6
+ import { createNodes } from '../fixtures/setup_p2p_test.js';
7
+ import { P2PNetworkTest } from './p2p_network.js';
8
+ const NUM_NODES = 6;
9
+ const NUM_VALIDATORS = NUM_NODES;
10
+ const COMMITTEE_SIZE = NUM_VALIDATORS;
11
+ const SLASHING_QUORUM = 3;
12
+ const EPOCH_DURATION = 2;
13
+ const SLASHING_ROUND_SIZE_IN_EPOCHS = 2;
14
+ const BOOT_NODE_UDP_PORT = 4500;
15
+ const ETHEREUM_SLOT_DURATION = process.env.CI ? 8 : 4;
16
+ const AZTEC_SLOT_DURATION = ETHEREUM_SLOT_DURATION * 2;
17
+ const SLASHING_UNIT = BigInt(1e18);
18
+ const SLASHING_AMOUNT = SLASHING_UNIT * 3n;
19
+ // How many epochs it may take to set everything up, so we dont slash during this period
20
+ const SETUP_EPOCH_DURATION = 5;
21
+ export class P2PInactivityTest {
22
+ test;
23
+ nodes;
24
+ activeNodes;
25
+ inactiveNodes;
26
+ rollup;
27
+ offlineValidators;
28
+ dataDir;
29
+ inactiveNodeCount;
30
+ keepInitialNode;
31
+ constructor(test, opts){
32
+ this.test = test;
33
+ this.dataDir = fs.mkdtempSync(path.join(os.tmpdir(), test.testName));
34
+ this.inactiveNodeCount = opts.inactiveNodeCount;
35
+ this.keepInitialNode = opts.keepInitialNode ?? false;
36
+ }
37
+ static async create(testName, opts) {
38
+ const test = await P2PNetworkTest.create({
39
+ testName,
40
+ numberOfNodes: 0,
41
+ numberOfValidators: NUM_VALIDATORS,
42
+ basePort: BOOT_NODE_UDP_PORT,
43
+ startProverNode: true,
44
+ initialConfig: {
45
+ proverNodeConfig: {
46
+ proverNodeEpochProvingDelayMs: AZTEC_SLOT_DURATION * 1000
47
+ },
48
+ aztecTargetCommitteeSize: COMMITTEE_SIZE,
49
+ aztecSlotDuration: AZTEC_SLOT_DURATION,
50
+ ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
51
+ aztecProofSubmissionEpochs: 1024,
52
+ listenAddress: '127.0.0.1',
53
+ minTxsPerBlock: 0,
54
+ aztecEpochDuration: EPOCH_DURATION,
55
+ validatorReexecute: false,
56
+ sentinelEnabled: true,
57
+ slashingQuorum: SLASHING_QUORUM,
58
+ slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE_IN_EPOCHS,
59
+ slashInactivityTargetPercentage: 0.8,
60
+ slashGracePeriodL2Slots: SETUP_EPOCH_DURATION * EPOCH_DURATION,
61
+ slashAmountSmall: SLASHING_UNIT,
62
+ slashAmountMedium: SLASHING_UNIT * 2n,
63
+ slashAmountLarge: SLASHING_UNIT * 3n,
64
+ ...opts
65
+ }
66
+ });
67
+ return new P2PInactivityTest(test, opts);
68
+ }
69
+ async setup() {
70
+ await this.test.applyBaseSnapshots();
71
+ await this.test.setup();
72
+ // Set slashing penalties for inactivity
73
+ const { rollup } = await this.test.getContracts();
74
+ const [activationThreshold, ejectionThreshold, localEjectionThreshold] = await Promise.all([
75
+ rollup.getActivationThreshold(),
76
+ rollup.getEjectionThreshold(),
77
+ rollup.getLocalEjectionThreshold()
78
+ ]);
79
+ const biggestEjection = ejectionThreshold > localEjectionThreshold ? ejectionThreshold : localEjectionThreshold;
80
+ expect(activationThreshold - SLASHING_AMOUNT).toBeLessThan(biggestEjection);
81
+ this.test.ctx.aztecNodeConfig.slashInactivityPenalty = SLASHING_AMOUNT;
82
+ this.rollup = rollup;
83
+ if (!this.keepInitialNode) {
84
+ await this.test.ctx.aztecNode.stop();
85
+ }
86
+ // Create all active nodes
87
+ this.activeNodes = await createNodes(this.test.ctx.aztecNodeConfig, this.test.ctx.dateProvider, this.test.bootstrapNodeEnr, NUM_NODES - this.inactiveNodeCount - Number(this.keepInitialNode), BOOT_NODE_UDP_PORT, this.test.prefilledPublicData, this.dataDir, undefined, Number(this.keepInitialNode));
88
+ // And the ones with an initially disabled sequencer
89
+ const inactiveConfig = {
90
+ ...this.test.ctx.aztecNodeConfig,
91
+ dontStartSequencer: true
92
+ };
93
+ this.inactiveNodes = await createNodes(inactiveConfig, this.test.ctx.dateProvider, this.test.bootstrapNodeEnr, this.inactiveNodeCount, BOOT_NODE_UDP_PORT, this.test.prefilledPublicData, this.dataDir, undefined, NUM_NODES - this.inactiveNodeCount);
94
+ this.nodes = [
95
+ ...this.keepInitialNode ? [
96
+ this.test.ctx.aztecNode
97
+ ] : [],
98
+ ...this.activeNodes,
99
+ ...this.inactiveNodes
100
+ ];
101
+ if (this.nodes.length !== NUM_NODES) {
102
+ throw new Error(`Expected ${NUM_NODES} nodes but got ${this.nodes.length}`);
103
+ }
104
+ this.offlineValidators = this.test.validators.slice(this.test.validators.length - this.inactiveNodeCount).map((a)=>a.attester);
105
+ this.test.logger.warn(`Setup complete. Offline validators are ${this.offlineValidators.join(', ')}.`, {
106
+ validators: this.test.validators,
107
+ offlineValidators: this.offlineValidators
108
+ });
109
+ // Wait for P2P mesh to be fully formed before starting slashing period
110
+ // This prevents race conditions where validators propose blocks before the network is ready
111
+ await this.test.waitForP2PMeshConnectivity(this.nodes, NUM_NODES);
112
+ const ethereumSlotDuration = this.test.ctx.aztecNodeConfig.ethereumSlotDuration;
113
+ this.test.logger.warn(`Advancing to the L1 slot before epoch ${SETUP_EPOCH_DURATION + 1} to start slashing`);
114
+ await this.test.ctx.cheatCodes.rollup.advanceToEpoch(EpochNumber(SETUP_EPOCH_DURATION + 1), {
115
+ offset: -ethereumSlotDuration
116
+ });
117
+ return this;
118
+ }
119
+ async teardown() {
120
+ await this.test.stopNodes(this.nodes);
121
+ await this.test.teardown();
122
+ for(let i = 0; i < NUM_NODES; i++){
123
+ fs.rmSync(`${this.dataDir}-${i}`, {
124
+ recursive: true,
125
+ force: true,
126
+ maxRetries: 3
127
+ });
128
+ }
129
+ }
130
+ get ctx() {
131
+ return this.test.ctx;
132
+ }
133
+ get logger() {
134
+ return this.test.logger;
135
+ }
136
+ get slashingAmount() {
137
+ return SLASHING_AMOUNT;
138
+ }
139
+ }