@aztec/aztec 0.0.1-commit.c31f2472 → 0.0.1-commit.c52d6e7

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 (158) hide show
  1. package/dest/bin/index.js +9 -3
  2. package/dest/cli/admin_api_key_store.d.ts +45 -0
  3. package/dest/cli/admin_api_key_store.d.ts.map +1 -0
  4. package/dest/cli/admin_api_key_store.js +98 -0
  5. package/dest/cli/aztec_start_action.d.ts +1 -1
  6. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  7. package/dest/cli/aztec_start_action.js +69 -32
  8. package/dest/cli/aztec_start_options.d.ts +2 -2
  9. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  10. package/dest/cli/aztec_start_options.js +39 -23
  11. package/dest/cli/cli.d.ts +1 -1
  12. package/dest/cli/cli.d.ts.map +1 -1
  13. package/dest/cli/cli.js +3 -4
  14. package/dest/cli/cmds/compile.d.ts +4 -0
  15. package/dest/cli/cmds/compile.d.ts.map +1 -0
  16. package/dest/cli/cmds/compile.js +174 -0
  17. package/dest/cli/cmds/profile.d.ts +4 -0
  18. package/dest/cli/cmds/profile.d.ts.map +1 -0
  19. package/dest/cli/cmds/profile.js +8 -0
  20. package/dest/cli/cmds/profile_flamegraph.d.ts +4 -0
  21. package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -0
  22. package/dest/cli/cmds/profile_flamegraph.js +52 -0
  23. package/dest/cli/cmds/profile_gates.d.ts +4 -0
  24. package/dest/cli/cmds/profile_gates.d.ts.map +1 -0
  25. package/dest/cli/cmds/profile_gates.js +76 -0
  26. package/dest/cli/cmds/profile_utils.d.ts +18 -0
  27. package/dest/cli/cmds/profile_utils.d.ts.map +1 -0
  28. package/dest/cli/cmds/profile_utils.js +50 -0
  29. package/dest/cli/cmds/prover.d.ts +4 -0
  30. package/dest/cli/cmds/prover.d.ts.map +1 -0
  31. package/dest/cli/cmds/prover.js +24 -0
  32. package/dest/cli/cmds/standby.d.ts +56 -0
  33. package/dest/cli/cmds/standby.d.ts.map +1 -0
  34. package/dest/cli/cmds/standby.js +140 -0
  35. package/dest/cli/cmds/start_bot.d.ts +3 -3
  36. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  37. package/dest/cli/cmds/start_bot.js +17 -9
  38. package/dest/cli/cmds/start_node.d.ts +3 -2
  39. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  40. package/dest/cli/cmds/start_node.js +82 -51
  41. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  42. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  43. package/dest/cli/cmds/start_prover_agent.js +6 -18
  44. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  45. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  46. package/dest/cli/cmds/start_prover_broker.js +24 -15
  47. package/dest/cli/cmds/start_txe.d.ts +2 -2
  48. package/dest/cli/cmds/start_txe.d.ts.map +1 -1
  49. package/dest/cli/cmds/start_txe.js +6 -5
  50. package/dest/cli/cmds/utils/artifacts.d.ts +26 -0
  51. package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -0
  52. package/dest/cli/cmds/utils/artifacts.js +24 -0
  53. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  54. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  55. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  56. package/dest/cli/cmds/utils/needs_recompile.d.ts +10 -0
  57. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -0
  58. package/dest/cli/cmds/utils/needs_recompile.js +90 -0
  59. package/dest/cli/cmds/utils/spawn.d.ts +3 -0
  60. package/dest/cli/cmds/utils/spawn.d.ts.map +1 -0
  61. package/dest/cli/cmds/utils/spawn.js +16 -0
  62. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  63. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  64. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +61 -0
  65. package/dest/cli/util.d.ts +13 -19
  66. package/dest/cli/util.d.ts.map +1 -1
  67. package/dest/cli/util.js +37 -100
  68. package/dest/examples/token.js +9 -9
  69. package/dest/local-network/auth_registry.d.ts +5 -0
  70. package/dest/local-network/auth_registry.d.ts.map +1 -0
  71. package/dest/local-network/auth_registry.js +17 -0
  72. package/dest/local-network/banana_fpc.d.ts +3 -2
  73. package/dest/local-network/banana_fpc.d.ts.map +1 -1
  74. package/dest/local-network/banana_fpc.js +12 -8
  75. package/dest/local-network/local-network.d.ts +12 -32
  76. package/dest/local-network/local-network.d.ts.map +1 -1
  77. package/dest/local-network/local-network.js +83 -72
  78. package/dest/testing/cheat_codes.d.ts +17 -23
  79. package/dest/testing/cheat_codes.d.ts.map +1 -1
  80. package/dest/testing/cheat_codes.js +17 -43
  81. package/dest/testing/epoch_test_settler.d.ts +2 -2
  82. package/dest/testing/epoch_test_settler.d.ts.map +1 -1
  83. package/dest/testing/epoch_test_settler.js +6 -26
  84. package/dest/testing/index.d.ts +3 -2
  85. package/dest/testing/index.d.ts.map +1 -1
  86. package/dest/testing/index.js +2 -1
  87. package/dest/testing/local-network.d.ts +51 -0
  88. package/dest/testing/local-network.d.ts.map +1 -0
  89. package/dest/testing/local-network.js +60 -0
  90. package/dest/testing/token_allowed_setup.d.ts +12 -0
  91. package/dest/testing/token_allowed_setup.d.ts.map +1 -0
  92. package/dest/testing/token_allowed_setup.js +24 -0
  93. package/package.json +35 -34
  94. package/scripts/add_crate.sh +53 -0
  95. package/scripts/aztec.sh +15 -5
  96. package/scripts/init.sh +23 -19
  97. package/scripts/new.sh +48 -24
  98. package/scripts/setup_workspace.sh +69 -0
  99. package/scripts/templates/blank/contract/Nargo.toml +6 -0
  100. package/scripts/templates/blank/contract/src/main.nr +10 -0
  101. package/scripts/templates/blank/test/Nargo.toml +7 -0
  102. package/scripts/templates/blank/test/src/lib.nr +11 -0
  103. package/scripts/templates/counter/contract/Nargo.toml +7 -0
  104. package/scripts/templates/counter/contract/src/main.nr +48 -0
  105. package/scripts/templates/counter/test/Nargo.toml +7 -0
  106. package/scripts/templates/counter/test/src/lib.nr +32 -0
  107. package/src/bin/index.ts +9 -3
  108. package/src/cli/admin_api_key_store.ts +128 -0
  109. package/src/cli/aztec_start_action.ts +69 -24
  110. package/src/cli/aztec_start_options.ts +48 -30
  111. package/src/cli/cli.ts +3 -4
  112. package/src/cli/cmds/compile.ts +205 -0
  113. package/src/cli/cmds/profile.ts +26 -0
  114. package/src/cli/cmds/profile_flamegraph.ts +64 -0
  115. package/src/cli/cmds/profile_gates.ts +84 -0
  116. package/src/cli/cmds/profile_utils.ts +58 -0
  117. package/src/cli/cmds/prover.ts +42 -0
  118. package/src/cli/cmds/standby.ts +184 -0
  119. package/src/cli/cmds/start_bot.ts +17 -11
  120. package/src/cli/cmds/start_node.ts +92 -52
  121. package/src/cli/cmds/start_prover_agent.ts +7 -10
  122. package/src/cli/cmds/start_prover_broker.ts +28 -25
  123. package/src/cli/cmds/start_txe.ts +7 -5
  124. package/src/cli/cmds/utils/artifacts.ts +49 -0
  125. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  126. package/src/cli/cmds/utils/needs_recompile.ts +98 -0
  127. package/src/cli/cmds/utils/spawn.ts +16 -0
  128. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
  129. package/src/cli/util.ts +39 -118
  130. package/src/examples/token.ts +19 -9
  131. package/src/local-network/auth_registry.ts +19 -0
  132. package/src/local-network/banana_fpc.ts +13 -9
  133. package/src/local-network/local-network.ts +96 -81
  134. package/src/testing/cheat_codes.ts +18 -49
  135. package/src/testing/epoch_test_settler.ts +8 -32
  136. package/src/testing/index.ts +2 -1
  137. package/src/testing/local-network.ts +97 -0
  138. package/src/testing/token_allowed_setup.ts +26 -0
  139. package/dest/cli/cmds/start_archiver.d.ts +0 -9
  140. package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
  141. package/dest/cli/cmds/start_archiver.js +0 -48
  142. package/dest/cli/cmds/start_prover_node.d.ts +0 -7
  143. package/dest/cli/cmds/start_prover_node.d.ts.map +0 -1
  144. package/dest/cli/cmds/start_prover_node.js +0 -108
  145. package/dest/cli/release_version.d.ts +0 -2
  146. package/dest/cli/release_version.d.ts.map +0 -1
  147. package/dest/cli/release_version.js +0 -14
  148. package/dest/testing/anvil_test_watcher.d.ts +0 -34
  149. package/dest/testing/anvil_test_watcher.d.ts.map +0 -1
  150. package/dest/testing/anvil_test_watcher.js +0 -144
  151. package/scripts/compile.sh +0 -44
  152. package/scripts/extract_function.js +0 -47
  153. package/scripts/flamegraph.sh +0 -59
  154. package/scripts/setup_project.sh +0 -31
  155. package/src/cli/cmds/start_archiver.ts +0 -50
  156. package/src/cli/cmds/start_prover_node.ts +0 -124
  157. package/src/cli/release_version.ts +0 -21
  158. package/src/testing/anvil_test_watcher.ts +0 -166
@@ -1,36 +1,42 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
2
  import { getInitialTestAccountsData } from '@aztec/accounts/testing';
3
- import { AztecNodeService } from '@aztec/aztec-node';
3
+ import { createAztecNodeService } from '@aztec/aztec-node';
4
4
  import { getConfigEnvVars } from '@aztec/aztec-node/config';
5
5
  import { Fr } from '@aztec/aztec.js/fields';
6
6
  import { createLogger } from '@aztec/aztec.js/log';
7
7
  import { createBlobClient } from '@aztec/blob-client/client';
8
8
  import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
9
- import { createEthereumChain } from '@aztec/ethereum/chain';
10
9
  import { waitForPublicClient } from '@aztec/ethereum/client';
11
10
  import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
12
11
  import { NULL_KEY } from '@aztec/ethereum/constants';
13
12
  import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
14
- import { EthCheatCodes } from '@aztec/ethereum/test';
15
13
  import { SecretValue } from '@aztec/foundation/config';
16
14
  import { EthAddress } from '@aztec/foundation/eth-address';
17
15
  import { TestDateProvider } from '@aztec/foundation/timer';
18
16
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
19
17
  import { protocolContractsHash } from '@aztec/protocol-contracts';
18
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
19
+ import { TxStatus } from '@aztec/stdlib/tx';
20
20
  import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
21
- import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
21
+ import { EmbeddedWallet } from '@aztec/wallets/embedded';
22
+ import { createFundedInitializerlessAccounts } from '@aztec/wallets/testing';
22
23
  import { getGenesisValues } from '@aztec/world-state/testing';
23
- import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
24
24
  import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
25
25
  import { foundry } from 'viem/chains';
26
26
  import { createAccountLogs } from '../cli/util.js';
27
27
  import { DefaultMnemonic } from '../mnemonic.js';
28
- import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
29
- import { EpochTestSettler } from '../testing/epoch_test_settler.js';
28
+ import { getTokenAllowedSetupFunctions } from '../testing/token_allowed_setup.js';
29
+ import { publishStandardAuthRegistry } from './auth_registry.js';
30
30
  import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
31
31
  import { getSponsoredFPCAddress } from './sponsored_fpc.js';
32
32
  const logger = createLogger('local-network');
33
- const localAnvil = foundry;
33
+ // The embedded wallet defaults to waiting for PROPOSED, which returns as soon as a tx lands in a
34
+ // proposed L2 block. That is flaky for the serial sandbox setup below: a proposed block can be
35
+ // pruned before its checkpoint is published, dropping a tx we already moved on from ("Tx dropped by
36
+ // P2P node"). Wait for the checkpoint so each setup tx is durably included before the next is sent.
37
+ const setupWaitOpts = {
38
+ waitForStatus: TxStatus.CHECKPOINTED
39
+ };
34
40
  /**
35
41
  * Function to deploy our L1 contracts to the local network L1
36
42
  * @param aztecNodeConfig - The Aztec Node Config
@@ -45,12 +51,12 @@ const localAnvil = foundry;
45
51
  genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
46
52
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
47
53
  aztecTargetCommitteeSize: 0,
48
- slasherFlavor: 'none',
54
+ slasherEnabled: false,
49
55
  realVerifier: false
50
56
  });
51
- aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
57
+ Object.assign(aztecNodeConfig, l1Contracts.l1ContractAddresses);
52
58
  aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
53
- return aztecNodeConfig.l1Contracts;
59
+ return l1Contracts.l1ContractAddresses;
54
60
  }
55
61
  /**
56
62
  * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
@@ -65,14 +71,44 @@ const localAnvil = foundry;
65
71
  if ((config.l1RpcUrls?.length || 0) > 1) {
66
72
  logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
67
73
  }
74
+ // The local network deploys a banana FPC with Token contracts, so include Token entries
75
+ // in the setup allowlist so FPC-based fee payments work out of the box.
76
+ const tokenAllowList = await getTokenAllowedSetupFunctions();
77
+ const envConfig = getConfigEnvVars();
68
78
  const aztecNodeConfig = {
69
- ...getConfigEnvVars(),
70
- ...config
79
+ ...envConfig,
80
+ ...config,
81
+ skipOrphanProposedBlockPruning: true,
82
+ // The local network builds node config from env without a DATA_DIRECTORY, so the validator's
83
+ // local signing protection runs against an ephemeral store. That is acceptable for this dev
84
+ // network; production validators must persist it and fail-fast when the data directory is unset.
85
+ allowEphemeralSigningProtection: config.allowEphemeralSigningProtection ?? true,
86
+ txPublicSetupAllowListExtend: [
87
+ ...tokenAllowList,
88
+ ...config.txPublicSetupAllowListExtend ?? []
89
+ ],
90
+ // The local network runs against anvil with no committee, so it defaults to the deterministic
91
+ // AutomineSequencer, which owns L1 time control (warps the dateProvider and L1 timestamps to slot
92
+ // boundaries as it builds), replacing the deleted AnvilTestWatcher. This remains true when p2p is
93
+ // enabled for local peer testing; local-network is not a mode for connecting to an existing network.
94
+ useAutomineSequencer: config.useAutomineSequencer ?? true,
95
+ // The AutomineSequencer owns epoch proving in the local network — it writes epoch out hashes to
96
+ // the L1 Outbox and advances the proven tip as checkpoints land, through the same serial queue as
97
+ // its builds — replacing the standalone EpochTestSettler that used to race the build loop.
98
+ automineEnableProveEpoch: config.automineEnableProveEpoch ?? true,
99
+ // Defaults for the local network / sandbox; callers (e.g. the CLI) may override. No real proving
100
+ // happens here — the AutomineSequencer synthetically settles epochs. Short epochs let it write out
101
+ // hashes quickly (so users can consume L2-to-L1 messages without a long wait), with a wider
102
+ // proof-submission window so the synthetic settler has headroom before the rollup would prune an
103
+ // unproven checkpoint.
104
+ realProofs: config.realProofs ?? false,
105
+ aztecEpochDuration: config.aztecEpochDuration ?? 4,
106
+ aztecProofSubmissionEpochs: config.aztecProofSubmissionEpochs ?? 2
71
107
  };
72
108
  const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
73
- if (aztecNodeConfig.publisherPrivateKeys == undefined || !aztecNodeConfig.publisherPrivateKeys.length || aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY) {
109
+ if (aztecNodeConfig.sequencerPublisherPrivateKeys == undefined || !aztecNodeConfig.sequencerPublisherPrivateKeys.length || aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY) {
74
110
  const privKey = hdAccount.getHdKey().privateKey;
75
- aztecNodeConfig.publisherPrivateKeys = [
111
+ aztecNodeConfig.sequencerPublisherPrivateKeys = [
76
112
  new SecretValue(`0x${Buffer.from(privKey).toString('hex')}`)
77
113
  ];
78
114
  }
@@ -86,7 +122,7 @@ const localAnvil = foundry;
86
122
  const initialAccounts = await (async ()=>{
87
123
  if (config.testAccounts === true || config.testAccounts === undefined) {
88
124
  if (aztecNodeConfig.p2pEnabled) {
89
- userLog(`Not setting up test accounts as we are connecting to a network`);
125
+ userLog(`Not setting up test accounts when p2p is enabled`);
90
126
  } else {
91
127
  userLog(`Setting up test accounts`);
92
128
  return await getInitialTestAccountsData();
@@ -96,39 +132,22 @@ const localAnvil = foundry;
96
132
  })();
97
133
  const bananaFPC = await getBananaFPCAddress(initialAccounts);
98
134
  const sponsoredFPC = await getSponsoredFPCAddress();
99
- const fundedAddresses = initialAccounts.length ? [
135
+ const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map((a)=>AztecAddress.fromStringUnsafe(a));
136
+ const fundedAddresses = [
100
137
  ...initialAccounts.map((a)=>a.address),
101
- bananaFPC,
102
- sponsoredFPC
103
- ] : [];
104
- const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
138
+ ...initialAccounts.length ? [
139
+ bananaFPC,
140
+ sponsoredFPC
141
+ ] : [],
142
+ ...prefundAddresses
143
+ ];
144
+ const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(fundedAddresses, config.initialAccountFeeJuice);
105
145
  const dateProvider = new TestDateProvider();
106
- let cheatcodes;
107
- let rollupAddress;
108
- let watcher;
109
146
  if (!aztecNodeConfig.p2pEnabled) {
110
- ({ rollupAddress } = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
147
+ await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
111
148
  genesisArchiveRoot,
112
149
  feeJuicePortalInitialBalance: fundingNeeded
113
- }));
114
- const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
115
- l1RpcUrl
116
- ], aztecNodeConfig.l1ChainId) : {
117
- chainInfo: localAnvil
118
- };
119
- const publicClient = createPublicClient({
120
- chain: chain.chainInfo,
121
- transport: fallback([
122
- httpViemTransport(l1RpcUrl)
123
- ])
124
150
  });
125
- cheatcodes = new EthCheatCodes([
126
- l1RpcUrl
127
- ], dateProvider);
128
- watcher = new AnvilTestWatcher(cheatcodes, rollupAddress, publicClient, dateProvider);
129
- watcher.setisLocalNetwork(true);
130
- watcher.setIsMarkingAsProven(false); // Do not mark as proven in the watcher. It's marked in the epochTestSettler after the out hash is set.
131
- await watcher.start();
132
151
  }
133
152
  const telemetry = await initTelemetryClient(getTelemetryClientConfig());
134
153
  // Create a local blob client client inside the local network, no http connectivity
@@ -138,37 +157,28 @@ const localAnvil = foundry;
138
157
  blobClient,
139
158
  dateProvider
140
159
  }, {
141
- prefilledPublicData
160
+ genesis
142
161
  });
143
- let epochTestSettler;
144
- if (!aztecNodeConfig.p2pEnabled) {
145
- epochTestSettler = new EpochTestSettler(cheatcodes, rollupAddress, node.getBlockSource(), logger.createChild('epoch-settler'), {
146
- pollingIntervalMs: 200
147
- });
148
- await epochTestSettler.start();
149
- }
150
162
  if (initialAccounts.length) {
151
- const PXEConfig = {
152
- proverEnabled: aztecNodeConfig.realProofs
153
- };
154
- const wallet = await TestWallet.create(node, PXEConfig);
163
+ const wallet = await EmbeddedWallet.create(node, {
164
+ pxeConfig: {
165
+ proverEnabled: aztecNodeConfig.realProofs
166
+ },
167
+ ephemeral: true
168
+ });
155
169
  userLog('Setting up funded test accounts...');
156
- const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
157
- const accountsWithSecrets = accountManagers.map((manager, i)=>({
158
- account: manager,
159
- secretKey: initialAccounts[i].secret
160
- }));
161
- const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
170
+ const accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccounts);
171
+ const accLogs = await createAccountLogs(accountManagers, wallet);
162
172
  userLog(accLogs.join(''));
163
- await setupBananaFPC(initialAccounts, wallet, userLog);
173
+ userLog('Publishing standard AuthRegistry contract...');
174
+ await publishStandardAuthRegistry(wallet, initialAccounts[0].address, setupWaitOpts);
175
+ await setupBananaFPC(initialAccounts, wallet, userLog, setupWaitOpts);
164
176
  userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
165
177
  // We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
166
178
  await wallet.stop();
167
179
  }
168
180
  const stop = async ()=>{
169
181
  await node.stop();
170
- await watcher?.stop();
171
- await epochTestSettler?.stop();
172
182
  };
173
183
  return {
174
184
  node,
@@ -180,15 +190,16 @@ const localAnvil = foundry;
180
190
  * @param config - Optional Aztec node settings.
181
191
  */ export async function createAztecNode(config = {}, deps = {}, options = {}) {
182
192
  // TODO(#12272): will clean this up. This is criminal.
183
- const { l1Contracts, ...rest } = getConfigEnvVars();
193
+ // Not sure why this was ever done. Will be fixed in A-989, A-991, A-990.
184
194
  const aztecNodeConfig = {
185
- ...rest,
186
- ...config,
187
- l1Contracts: {
188
- ...l1Contracts,
189
- ...config.l1Contracts
190
- }
195
+ ...getConfigEnvVars(),
196
+ ...config
191
197
  };
192
- const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
198
+ const node = await createAztecNodeService(aztecNodeConfig, {
199
+ ...deps,
200
+ proverNodeDeps: {
201
+ broker: deps.proverBroker
202
+ }
203
+ }, options);
193
204
  return node;
194
205
  }
@@ -1,12 +1,9 @@
1
1
  import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
2
2
  import type { DateProvider } from '@aztec/foundation/timer';
3
- import type { SequencerClient } from '@aztec/sequencer-client';
4
- import type { AztecNode } from '@aztec/stdlib/interfaces/client';
3
+ import type { AztecNode, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
5
4
  /**
6
- * A class that provides utility functions for interacting with the chain.
7
- * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
8
- * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
9
- * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
5
+ * Wrapper for Aztec Debug API.
6
+ * @deprecated use the AztecNode debug API directly.
10
7
  */
11
8
  export declare class CheatCodes {
12
9
  /** Cheat codes for L1.*/
@@ -20,24 +17,21 @@ export declare class CheatCodes {
20
17
  rollup: RollupCheatCodes);
21
18
  static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): Promise<CheatCodes>;
22
19
  /**
23
- * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
24
- * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
25
- * by the slot number, which advances in fixed intervals.
26
- * This is useful for testing time-dependent contract behavior.
27
- * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
28
- * @param node - The Aztec node used to query if a new block has been mined.
29
- * @param targetTimestamp - The target timestamp to warp to (in seconds)
20
+ * Warps the L1 timestamp to at least `targetTimestamp` and mines an L2 block advancing the L2 timestamp to at least
21
+ * the target. Forwards to the node's debug API, which serializes the warp through the automine sequencer queue.
22
+ * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
23
+ * @param targetTimestamp - The target timestamp to warp to (in seconds).
24
+ * @deprecated Call `node.warpL2TimeAtLeastTo(targetTimestamp)` on the node debug API directly.
30
25
  */
31
- warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, targetTimestamp: bigint | number): Promise<void>;
26
+ warpL2TimeAtLeastTo(node: AztecNode & AztecNodeDebug, targetTimestamp: bigint | number): Promise<void>;
32
27
  /**
33
- * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
34
- * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
35
- * number, which advances in fixed intervals.
36
- * This is useful for testing time-dependent contract behavior.
37
- * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
38
- * @param node - The Aztec node used to query if a new block has been mined.
39
- * @param duration - The duration to advance time by (in seconds)
28
+ * Warps the L1 timestamp forward by at least `duration` seconds and mines an L2 block advancing the L2 timestamp at
29
+ * least by the duration. Forwards to the node's debug API, which serializes the warp through the automine sequencer
30
+ * queue.
31
+ * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
32
+ * @param duration - The duration to advance time by (in seconds).
33
+ * @deprecated Call `node.warpL2TimeAtLeastBy(duration)` on the node debug API directly.
40
34
  */
41
- warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
35
+ warpL2TimeAtLeastBy(node: AztecNode & AztecNodeDebug, duration: bigint | number): Promise<void>;
42
36
  }
43
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFFbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakY7OztHQUdHO0FBQ0gscUJBQWEsVUFBVTtJQUVuQix5QkFBeUI7SUFDbEIsR0FBRyxFQUFFLGFBQWE7SUFDekIsdURBQXVEO0lBQ2hELE1BQU0sRUFBRSxnQkFBZ0I7SUFKakM7SUFDRSx5QkFBeUI7SUFDbEIsR0FBRyxFQUFFLGFBQWE7SUFDekIsdURBQXVEO0lBQ2hELE1BQU0sRUFBRSxnQkFBZ0IsRUFDN0I7SUFFSixPQUFhLE1BQU0sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FPdkc7SUFFRDs7Ozs7O09BTUc7SUFDSCxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsU0FBUyxHQUFHLGNBQWMsRUFBRSxlQUFlLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRXJHO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILG1CQUFtQixDQUFDLElBQUksRUFBRSxTQUFTLEdBQUcsY0FBYyxFQUFFLFFBQVEsRUFBRSxNQUFNLEdBQUcsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFOUY7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAJjC;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBAuB5G;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAIrG;CACF"}
1
+ {"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF;;;GAGG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAJjC;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErG;IAED;;;;;;;OAOG;IACH,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9F;CACF"}
@@ -1,10 +1,7 @@
1
1
  import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
2
- import { retryUntil } from '@aztec/foundation/retry';
3
2
  /**
4
- * A class that provides utility functions for interacting with the chain.
5
- * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
6
- * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
7
- * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
3
+ * Wrapper for Aztec Debug API.
4
+ * @deprecated use the AztecNode debug API directly.
8
5
  */ export class CheatCodes {
9
6
  eth;
10
7
  rollup;
@@ -18,45 +15,22 @@ import { retryUntil } from '@aztec/foundation/retry';
18
15
  return new CheatCodes(ethCheatCodes, rollupCheatCodes);
19
16
  }
20
17
  /**
21
- * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
22
- * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
23
- * by the slot number, which advances in fixed intervals.
24
- * This is useful for testing time-dependent contract behavior.
25
- * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
26
- * @param node - The Aztec node used to query if a new block has been mined.
27
- * @param targetTimestamp - The target timestamp to warp to (in seconds)
28
- */ async warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp) {
29
- const currentL2BlockNumber = await node.getBlockNumber();
30
- // We warp the L1 timestamp
31
- await this.eth.warp(targetTimestamp, {
32
- resetBlockInterval: true
33
- });
34
- // Wait until an L2 block is mined
35
- const sequencer = sequencerClient.getSequencer();
36
- const minTxsPerBlock = sequencer.getConfig().minTxsPerBlock;
37
- sequencer.updateConfig({
38
- minTxsPerBlock: 0
39
- });
40
- await retryUntil(async ()=>{
41
- const newL2BlockNumber = await node.getBlockNumber();
42
- return newL2BlockNumber > currentL2BlockNumber;
43
- }, 'new block after warping L2 time', 36, 1);
44
- // Restore original minTxsPerBlock
45
- sequencer.updateConfig({
46
- minTxsPerBlock
47
- });
18
+ * Warps the L1 timestamp to at least `targetTimestamp` and mines an L2 block advancing the L2 timestamp to at least
19
+ * the target. Forwards to the node's debug API, which serializes the warp through the automine sequencer queue.
20
+ * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
21
+ * @param targetTimestamp - The target timestamp to warp to (in seconds).
22
+ * @deprecated Call `node.warpL2TimeAtLeastTo(targetTimestamp)` on the node debug API directly.
23
+ */ warpL2TimeAtLeastTo(node, targetTimestamp) {
24
+ return node.warpL2TimeAtLeastTo(Number(targetTimestamp));
48
25
  }
49
26
  /**
50
- * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
51
- * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
52
- * number, which advances in fixed intervals.
53
- * This is useful for testing time-dependent contract behavior.
54
- * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
55
- * @param node - The Aztec node used to query if a new block has been mined.
56
- * @param duration - The duration to advance time by (in seconds)
57
- */ async warpL2TimeAtLeastBy(sequencerClient, node, duration) {
58
- const currentTimestamp = await this.eth.timestamp();
59
- const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
60
- await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
27
+ * Warps the L1 timestamp forward by at least `duration` seconds and mines an L2 block advancing the L2 timestamp at
28
+ * least by the duration. Forwards to the node's debug API, which serializes the warp through the automine sequencer
29
+ * queue.
30
+ * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
31
+ * @param duration - The duration to advance time by (in seconds).
32
+ * @deprecated Call `node.warpL2TimeAtLeastBy(duration)` on the node debug API directly.
33
+ */ warpL2TimeAtLeastBy(node, duration) {
34
+ return node.warpL2TimeAtLeastBy(Number(duration));
61
35
  }
62
36
  }
@@ -1,5 +1,5 @@
1
1
  import { type EthCheatCodes } from '@aztec/ethereum/test';
2
- import { type EpochNumber } from '@aztec/foundation/branded-types';
2
+ import type { EpochNumber } from '@aztec/foundation/branded-types';
3
3
  import type { Logger } from '@aztec/foundation/log';
4
4
  import type { EthAddress, L2BlockSource } from '@aztec/stdlib/block';
5
5
  export declare class EpochTestSettler {
@@ -16,4 +16,4 @@ export declare class EpochTestSettler {
16
16
  stop(): Promise<void>;
17
17
  handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean>;
18
18
  }
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXFDbEU7Q0FDRiJ9
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWNsRTtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGrE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAqClE;CACF"}
1
+ {"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAErE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAclE;CACF"}
@@ -1,7 +1,6 @@
1
1
  import { RollupCheatCodes } from '@aztec/ethereum/test';
2
- import { SlotNumber } from '@aztec/foundation/branded-types';
2
+ import { settleEpochOutbox } from '@aztec/prover-client/test';
3
3
  import { EpochMonitor } from '@aztec/prover-node';
4
- import { computeL2ToL1MembershipWitnessFromMessagesInEpoch } from '@aztec/stdlib/messaging';
5
4
  export class EpochTestSettler {
6
5
  l2BlockSource;
7
6
  log;
@@ -27,31 +26,12 @@ export class EpochTestSettler {
27
26
  await this.epochMonitor?.stop();
28
27
  }
29
28
  async handleEpochReadyToProve(epoch) {
30
- const checkpointedBlocks = await this.l2BlockSource.getCheckpointedBlocksForEpoch(epoch);
31
- const blocks = checkpointedBlocks.map((b)=>b.block);
32
- this.log.info(`Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`, {
33
- blocks: blocks.map((b)=>b.toBlockInfo())
29
+ const lastCheckpoint = await settleEpochOutbox({
30
+ rollupCheatCodes: this.rollupCheatCodes,
31
+ l2BlockSource: this.l2BlockSource,
32
+ epoch,
33
+ log: this.log
34
34
  });
35
- const messagesInEpoch = [];
36
- let previousSlotNumber = SlotNumber.ZERO;
37
- let checkpointIndex = -1;
38
- for (const block of blocks){
39
- const slotNumber = block.header.globalVariables.slotNumber;
40
- if (slotNumber !== previousSlotNumber) {
41
- checkpointIndex++;
42
- messagesInEpoch[checkpointIndex] = [];
43
- previousSlotNumber = slotNumber;
44
- }
45
- messagesInEpoch[checkpointIndex].push(block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs));
46
- }
47
- const [firstMessage] = messagesInEpoch.flat(3);
48
- if (firstMessage) {
49
- const { root: outHash } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, firstMessage);
50
- await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
51
- } else {
52
- this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
53
- }
54
- const lastCheckpoint = checkpointedBlocks.at(-1)?.checkpointNumber;
55
35
  if (lastCheckpoint !== undefined) {
56
36
  await this.rollupCheatCodes.markAsProven(lastCheckpoint);
57
37
  } else {
@@ -1,5 +1,6 @@
1
- export { AnvilTestWatcher } from './anvil_test_watcher.js';
2
1
  export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
3
2
  export { CheatCodes } from './cheat_codes.js';
4
3
  export { EpochTestSettler } from './epoch_test_settler.js';
5
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUMifQ==
4
+ export { setupLocalNetwork, TEST_FEE_PADDING, type LocalNetwork, type LocalNetworkOptions } from './local-network.js';
5
+ export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLEtBQUssWUFBWSxFQUFFLEtBQUssbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN0SCxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACtH,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}
@@ -1,4 +1,5 @@
1
- export { AnvilTestWatcher } from './anvil_test_watcher.js';
2
1
  export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
3
2
  export { CheatCodes } from './cheat_codes.js';
4
3
  export { EpochTestSettler } from './epoch_test_settler.js';
4
+ export { setupLocalNetwork, TEST_FEE_PADDING } from './local-network.js';
5
+ export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';
@@ -0,0 +1,51 @@
1
+ import type { AztecNodeService } from '@aztec/aztec-node';
2
+ import type { AztecNodeConfig } from '@aztec/aztec-node/config';
3
+ import type { Fr } from '@aztec/aztec.js/fields';
4
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
5
+ /** A running in-process local network: an inline Aztec node backed by its own anvil L1. */
6
+ export interface LocalNetwork extends AsyncDisposable {
7
+ /** Fully-synced Aztec node, ready to serve client requests. */
8
+ node: AztecNodeService;
9
+ /** RPC URL of the spawned anvil instance. */
10
+ l1RpcUrl: string;
11
+ /** Chain id used on L1 (foundry's default 31337). */
12
+ l1ChainId: number;
13
+ /** Stops every process started by the fixture: node and anvil. Also invoked by `await using`. */
14
+ stop: () => Promise<void>;
15
+ }
16
+ /** Options for {@link setupLocalNetwork}. */
17
+ export interface LocalNetworkOptions {
18
+ /**
19
+ * Addresses that should hold fee juice at genesis. Saves each of these the round-trip of bridging
20
+ * + claiming fee juice before they can pay for gas.
21
+ */
22
+ fundedAddresses?: AztecAddress[];
23
+ /** Override the default per-address genesis fee juice granted to {@link fundedAddresses}. */
24
+ initialAccountFeeJuice?: Fr;
25
+ /** Node config overrides, e.g. `realProofs`, `aztecEpochDuration`, `p2pEnabled`. */
26
+ config?: Partial<AztecNodeConfig>;
27
+ }
28
+ /**
29
+ * Spin up an in-process local network with the given addresses pre-funded.
30
+ *
31
+ * Each call spawns its own anvil on an OS-assigned random port and runs the Aztec node inline via
32
+ * the same {@link createLocalNetwork} codepath that backs `aztec start --local-network` (with the
33
+ * sandbox account/FPC/token setup skipped). Distinct ports let independent suites run in parallel.
34
+ * The caller must `await result.stop()` in its teardown (or hold the result with `await using`).
35
+ *
36
+ * Requires a Foundry toolchain (`anvil`/`forge`), installed via `aztec-up` or `foundryup`. Binaries
37
+ * are located in the standard install directories or on `PATH`; set `$ANVIL_BIN` / `$FORGE_BIN` to
38
+ * pin specific ones.
39
+ */
40
+ export declare function setupLocalNetwork(opts?: LocalNetworkOptions): Promise<LocalNetwork>;
41
+ /**
42
+ * Min-fee padding multiplier for test wallets whose txs may mine well after their fee estimate.
43
+ * The automine sequencer builds one block per tx and advances L1 time in big jumps, and proposer
44
+ * pipelining evolves the fee-asset price across the build/publish gap (~20x observed in CI), so the
45
+ * network's congestion base fee can swing sharply between the wallet's fee estimate and the block
46
+ * the tx actually lands in. The default wallet padding isn't enough and trips
47
+ * `maxFeesPerGas.feePerL2Gas must be >= gasFees.feePerL2Gas`. Apply via
48
+ * `wallet.setMinFeePadding(TEST_FEE_PADDING)` on every test wallet that sends txs.
49
+ */
50
+ export declare const TEST_FEE_PADDING = 30;
51
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWpELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBTWhFLDJGQUEyRjtBQUMzRixNQUFNLFdBQVcsWUFBYSxTQUFRLGVBQWU7SUFDbkQsK0RBQStEO0lBQy9ELElBQUksRUFBRSxnQkFBZ0IsQ0FBQztJQUN2Qiw2Q0FBNkM7SUFDN0MsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixxREFBcUQ7SUFDckQsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixpR0FBaUc7SUFDakcsSUFBSSxFQUFFLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQzNCO0FBRUQsNkNBQTZDO0FBQzdDLE1BQU0sV0FBVyxtQkFBbUI7SUFDbEM7OztPQUdHO0lBQ0gsZUFBZSxDQUFDLEVBQUUsWUFBWSxFQUFFLENBQUM7SUFDakMsNkZBQTZGO0lBQzdGLHNCQUFzQixDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQzVCLG9GQUFvRjtJQUNwRixNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7Q0FDbkM7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUNILHdCQUFzQixpQkFBaUIsQ0FBQyxJQUFJLEdBQUUsbUJBQXdCLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQXNDN0Y7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILGVBQU8sTUFBTSxnQkFBZ0IsS0FBSyxDQUFDIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/testing/local-network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAMhE,2FAA2F;AAC3F,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,+DAA+D;IAC/D,IAAI,EAAE,gBAAgB,CAAC;IACvB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,iGAAiG;IACjG,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,6CAA6C;AAC7C,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,eAAe,CAAC,EAAE,YAAY,EAAE,CAAC;IACjC,6FAA6F;IAC7F,sBAAsB,CAAC,EAAE,EAAE,CAAC;IAC5B,oFAAoF;IACpF,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACnC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,YAAY,CAAC,CAsC7F;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,KAAK,CAAC"}
@@ -0,0 +1,60 @@
1
+ import { startAnvil } from '@aztec/ethereum/test';
2
+ import { foundry } from 'viem/chains';
3
+ import { createLocalNetwork } from '../local-network/local-network.js';
4
+ /**
5
+ * Spin up an in-process local network with the given addresses pre-funded.
6
+ *
7
+ * Each call spawns its own anvil on an OS-assigned random port and runs the Aztec node inline via
8
+ * the same {@link createLocalNetwork} codepath that backs `aztec start --local-network` (with the
9
+ * sandbox account/FPC/token setup skipped). Distinct ports let independent suites run in parallel.
10
+ * The caller must `await result.stop()` in its teardown (or hold the result with `await using`).
11
+ *
12
+ * Requires a Foundry toolchain (`anvil`/`forge`), installed via `aztec-up` or `foundryup`. Binaries
13
+ * are located in the standard install directories or on `PATH`; set `$ANVIL_BIN` / `$FORGE_BIN` to
14
+ * pin specific ones.
15
+ */ export async function setupLocalNetwork(opts = {}) {
16
+ // `--port 0` → anvil binds an ephemeral port that `startAnvil` reads back, so parallel suites
17
+ // never collide on a fixed port.
18
+ const { rpcUrl, stop: stopAnvil } = await startAnvil({
19
+ port: 0
20
+ });
21
+ try {
22
+ const { node, stop: stopNode } = await createLocalNetwork({
23
+ ...opts.config,
24
+ l1RpcUrls: [
25
+ rpcUrl
26
+ ],
27
+ testAccounts: false,
28
+ prefundAddresses: (opts.fundedAddresses ?? []).map((a)=>a.toString()),
29
+ initialAccountFeeJuice: opts.initialAccountFeeJuice
30
+ }, ()=>{});
31
+ // Stop the node before anvil (its teardown still talks to L1); the finally guarantees anvil is
32
+ // reaped even if node shutdown throws.
33
+ const stop = async ()=>{
34
+ try {
35
+ await stopNode();
36
+ } finally{
37
+ await stopAnvil();
38
+ }
39
+ };
40
+ return {
41
+ node,
42
+ l1RpcUrl: rpcUrl,
43
+ l1ChainId: foundry.id,
44
+ stop,
45
+ [Symbol.asyncDispose]: stop
46
+ };
47
+ } catch (err) {
48
+ await stopAnvil();
49
+ throw err;
50
+ }
51
+ }
52
+ /**
53
+ * Min-fee padding multiplier for test wallets whose txs may mine well after their fee estimate.
54
+ * The automine sequencer builds one block per tx and advances L1 time in big jumps, and proposer
55
+ * pipelining evolves the fee-asset price across the build/publish gap (~20x observed in CI), so the
56
+ * network's congestion base fee can swing sharply between the wallet's fee estimate and the block
57
+ * the tx actually lands in. The default wallet padding isn't enough and trips
58
+ * `maxFeesPerGas.feePerL2Gas must be >= gasFees.feePerL2Gas`. Apply via
59
+ * `wallet.setMinFeePadding(TEST_FEE_PADDING)` on every test wallet that sends txs.
60
+ */ export const TEST_FEE_PADDING = 30;
@@ -0,0 +1,12 @@
1
+ import type { ContractArtifact } from '@aztec/stdlib/abi';
2
+ import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
3
+ /**
4
+ * Returns the allowlist entries needed for FPC-based fee payments, keyed by the contract class of
5
+ * the `artifact` actually deployed as the fee token (defaults to canonical Token). The setup-phase
6
+ * validator matches these entries by class id, so a test deploying the codegen'd TestToken as its
7
+ * fee vehicle must pass `TestTokenContract.artifact` here -- otherwise the FPC fee calls are matched
8
+ * against the wrong class and rejected. Test-only: FPC fee payment with custom tokens won't work on
9
+ * mainnet alpha.
10
+ */
11
+ export declare function getTokenAllowedSetupFunctions(artifact?: ContractArtifact): Promise<AllowedElement[]>;
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fYWxsb3dlZF9zZXR1cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvdG9rZW5fYWxsb3dlZF9zZXR1cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTFELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXRFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsNkJBQTZCLENBQ2pELFFBQVEsR0FBRSxnQkFBd0MsR0FDakQsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBUzNCIn0=