@aztec/aztec 0.0.1-commit.343b43af6 → 0.0.1-commit.350e0a4d

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 (125) hide show
  1. package/dest/bin/index.js +3 -1
  2. package/dest/cli/aztec_start_action.d.ts +1 -1
  3. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  4. package/dest/cli/aztec_start_action.js +22 -23
  5. package/dest/cli/aztec_start_options.d.ts +2 -2
  6. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  7. package/dest/cli/aztec_start_options.js +15 -15
  8. package/dest/cli/cmds/compile.d.ts +1 -1
  9. package/dest/cli/cmds/compile.d.ts.map +1 -1
  10. package/dest/cli/cmds/compile.js +34 -25
  11. package/dest/cli/cmds/profile.d.ts +1 -1
  12. package/dest/cli/cmds/profile.d.ts.map +1 -1
  13. package/dest/cli/cmds/profile.js +1 -1
  14. package/dest/cli/cmds/profile_flamegraph.d.ts +1 -1
  15. package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -1
  16. package/dest/cli/cmds/profile_flamegraph.js +2 -1
  17. package/dest/cli/cmds/profile_gates.d.ts +2 -2
  18. package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
  19. package/dest/cli/cmds/profile_gates.js +23 -4
  20. package/dest/cli/cmds/prover.d.ts +4 -0
  21. package/dest/cli/cmds/prover.d.ts.map +1 -0
  22. package/dest/cli/cmds/prover.js +24 -0
  23. package/dest/cli/cmds/standby.d.ts +39 -10
  24. package/dest/cli/cmds/standby.d.ts.map +1 -1
  25. package/dest/cli/cmds/standby.js +80 -18
  26. package/dest/cli/cmds/start_bot.d.ts +1 -1
  27. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  28. package/dest/cli/cmds/start_bot.js +8 -4
  29. package/dest/cli/cmds/start_node.d.ts +1 -1
  30. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  31. package/dest/cli/cmds/start_node.js +29 -48
  32. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  33. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  34. package/dest/cli/cmds/start_prover_agent.js +5 -17
  35. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  36. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  37. package/dest/cli/cmds/start_prover_broker.js +17 -8
  38. package/dest/cli/cmds/start_txe.d.ts +2 -2
  39. package/dest/cli/cmds/start_txe.d.ts.map +1 -1
  40. package/dest/cli/cmds/start_txe.js +6 -5
  41. package/dest/cli/cmds/utils/artifacts.d.ts +6 -1
  42. package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -1
  43. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  44. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  45. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  46. package/dest/cli/cmds/utils/needs_recompile.d.ts +1 -1
  47. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -1
  48. package/dest/cli/cmds/utils/needs_recompile.js +9 -43
  49. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  50. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  51. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +61 -0
  52. package/dest/cli/util.d.ts +10 -5
  53. package/dest/cli/util.d.ts.map +1 -1
  54. package/dest/cli/util.js +26 -53
  55. package/dest/examples/token.js +3 -3
  56. package/dest/local-network/auth_registry.d.ts +5 -0
  57. package/dest/local-network/auth_registry.d.ts.map +1 -0
  58. package/dest/local-network/auth_registry.js +17 -0
  59. package/dest/local-network/banana_fpc.d.ts +3 -2
  60. package/dest/local-network/banana_fpc.d.ts.map +1 -1
  61. package/dest/local-network/banana_fpc.js +11 -7
  62. package/dest/local-network/local-network.d.ts +8 -32
  63. package/dest/local-network/local-network.d.ts.map +1 -1
  64. package/dest/local-network/local-network.js +52 -73
  65. package/dest/testing/cheat_codes.d.ts +17 -23
  66. package/dest/testing/cheat_codes.d.ts.map +1 -1
  67. package/dest/testing/cheat_codes.js +17 -43
  68. package/dest/testing/epoch_test_settler.d.ts +2 -2
  69. package/dest/testing/epoch_test_settler.d.ts.map +1 -1
  70. package/dest/testing/epoch_test_settler.js +6 -26
  71. package/dest/testing/index.d.ts +1 -2
  72. package/dest/testing/index.d.ts.map +1 -1
  73. package/dest/testing/index.js +0 -1
  74. package/dest/testing/token_allowed_setup.d.ts +9 -4
  75. package/dest/testing/token_allowed_setup.d.ts.map +1 -1
  76. package/dest/testing/token_allowed_setup.js +12 -8
  77. package/package.json +34 -34
  78. package/scripts/add_crate.sh +11 -60
  79. package/scripts/aztec.sh +6 -2
  80. package/scripts/init.sh +5 -5
  81. package/scripts/new.sh +2 -2
  82. package/scripts/setup_workspace.sh +3 -2
  83. package/scripts/templates/blank/contract/Nargo.toml +6 -0
  84. package/scripts/templates/blank/contract/src/main.nr +10 -0
  85. package/scripts/templates/blank/test/Nargo.toml +7 -0
  86. package/scripts/templates/blank/test/src/lib.nr +11 -0
  87. package/scripts/templates/counter/contract/Nargo.toml +7 -0
  88. package/scripts/templates/counter/contract/src/main.nr +48 -0
  89. package/scripts/templates/counter/test/Nargo.toml +7 -0
  90. package/scripts/templates/counter/test/src/lib.nr +32 -0
  91. package/src/bin/index.ts +3 -1
  92. package/src/cli/aztec_start_action.ts +18 -19
  93. package/src/cli/aztec_start_options.ts +22 -23
  94. package/src/cli/cmds/compile.ts +39 -24
  95. package/src/cli/cmds/profile.ts +2 -1
  96. package/src/cli/cmds/profile_flamegraph.ts +2 -1
  97. package/src/cli/cmds/profile_gates.ts +22 -5
  98. package/src/cli/cmds/prover.ts +42 -0
  99. package/src/cli/cmds/standby.ts +95 -22
  100. package/src/cli/cmds/start_bot.ts +9 -6
  101. package/src/cli/cmds/start_node.ts +37 -40
  102. package/src/cli/cmds/start_prover_agent.ts +5 -8
  103. package/src/cli/cmds/start_prover_broker.ts +17 -11
  104. package/src/cli/cmds/start_txe.ts +7 -5
  105. package/src/cli/cmds/utils/artifacts.ts +5 -0
  106. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  107. package/src/cli/cmds/utils/needs_recompile.ts +8 -49
  108. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
  109. package/src/cli/util.ts +27 -68
  110. package/src/examples/token.ts +3 -3
  111. package/src/local-network/auth_registry.ts +19 -0
  112. package/src/local-network/banana_fpc.ts +12 -8
  113. package/src/local-network/local-network.ts +56 -83
  114. package/src/testing/cheat_codes.ts +18 -49
  115. package/src/testing/epoch_test_settler.ts +8 -32
  116. package/src/testing/index.ts +0 -1
  117. package/src/testing/token_allowed_setup.ts +15 -8
  118. package/dest/cli/cmds/start_archiver.d.ts +0 -9
  119. package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
  120. package/dest/cli/cmds/start_archiver.js +0 -48
  121. package/dest/testing/anvil_test_watcher.d.ts +0 -42
  122. package/dest/testing/anvil_test_watcher.d.ts.map +0 -1
  123. package/dest/testing/anvil_test_watcher.js +0 -181
  124. package/src/cli/cmds/start_archiver.ts +0 -50
  125. package/src/testing/anvil_test_watcher.ts +0 -210
@@ -1,51 +1,53 @@
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 { type AztecNodeConfig, 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 { type BlobClientInterface, 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';
13
+ import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
15
14
  import { SecretValue } from '@aztec/foundation/config';
16
15
  import { EthAddress } from '@aztec/foundation/eth-address';
17
16
  import type { LogFn } from '@aztec/foundation/log';
18
17
  import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
19
18
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
20
19
  import { protocolContractsHash } from '@aztec/protocol-contracts';
21
- import { SequencerState } from '@aztec/sequencer-client';
22
20
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
23
21
  import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
24
- import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
22
+ import { TxStatus } from '@aztec/stdlib/tx';
23
+ import type { GenesisData } from '@aztec/stdlib/world-state';
25
24
  import {
26
25
  type TelemetryClient,
27
26
  getConfigEnvVars as getTelemetryClientConfig,
28
27
  initTelemetryClient,
29
28
  } from '@aztec/telemetry-client';
30
29
  import { EmbeddedWallet } from '@aztec/wallets/embedded';
31
- import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
30
+ import { createFundedInitializerlessAccounts } from '@aztec/wallets/testing';
32
31
  import { getGenesisValues } from '@aztec/world-state/testing';
33
32
 
34
- import { type Hex, createPublicClient, fallback, http as httpViemTransport } from 'viem';
33
+ import type { Hex } from 'viem';
35
34
  import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
36
35
  import { foundry } from 'viem/chains';
37
36
 
38
37
  import { createAccountLogs } from '../cli/util.js';
39
38
  import { DefaultMnemonic } from '../mnemonic.js';
40
- import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
41
- import { EpochTestSettler } from '../testing/epoch_test_settler.js';
42
39
  import { getTokenAllowedSetupFunctions } from '../testing/token_allowed_setup.js';
40
+ import { publishStandardAuthRegistry } from './auth_registry.js';
43
41
  import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
44
42
  import { getSponsoredFPCAddress } from './sponsored_fpc.js';
45
43
 
46
44
  const logger = createLogger('local-network');
47
45
 
48
- const localAnvil = foundry;
46
+ // The embedded wallet defaults to waiting for PROPOSED, which returns as soon as a tx lands in a
47
+ // proposed L2 block. That is flaky for the serial sandbox setup below: a proposed block can be
48
+ // pruned before its checkpoint is published, dropping a tx we already moved on from ("Tx dropped by
49
+ // P2P node"). Wait for the checkpoint so each setup tx is durably included before the next is sent.
50
+ const setupWaitOpts = { waitForStatus: TxStatus.CHECKPOINTED };
49
51
 
50
52
  /**
51
53
  * Function to deploy our L1 contracts to the local network L1
@@ -59,7 +61,7 @@ export async function deployContractsToL1(
59
61
  genesisArchiveRoot?: Fr;
60
62
  feeJuicePortalInitialBalance?: bigint;
61
63
  } = {},
62
- ) {
64
+ ): Promise<L1ContractAddresses> {
63
65
  await waitForPublicClient(aztecNodeConfig);
64
66
 
65
67
  const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
@@ -70,14 +72,14 @@ export async function deployContractsToL1(
70
72
  genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
71
73
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
72
74
  aztecTargetCommitteeSize: 0, // no committee in local network
73
- slasherFlavor: 'none', // no slashing in local network
75
+ slasherEnabled: false, // no slashing in local network
74
76
  realVerifier: false,
75
77
  });
76
78
 
77
- aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
79
+ Object.assign(aztecNodeConfig, l1Contracts.l1ContractAddresses);
78
80
  aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
79
81
 
80
- return aztecNodeConfig.l1Contracts;
82
+ return l1Contracts.l1ContractAddresses;
81
83
  }
82
84
 
83
85
  /** Local network settings. */
@@ -107,10 +109,33 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
107
109
  // in the setup allowlist so FPC-based fee payments work out of the box.
108
110
  const tokenAllowList = await getTokenAllowedSetupFunctions();
109
111
 
112
+ const envConfig = getConfigEnvVars();
110
113
  const aztecNodeConfig: AztecNodeConfig = {
111
- ...getConfigEnvVars(),
114
+ ...envConfig,
112
115
  ...config,
116
+ skipOrphanProposedBlockPruning: true,
117
+ // The local network builds node config from env without a DATA_DIRECTORY, so the validator's
118
+ // local signing protection runs against an ephemeral store. That is acceptable for this dev
119
+ // network; production validators must persist it and fail-fast when the data directory is unset.
120
+ allowEphemeralSigningProtection: config.allowEphemeralSigningProtection ?? true,
113
121
  txPublicSetupAllowListExtend: [...tokenAllowList, ...(config.txPublicSetupAllowListExtend ?? [])],
122
+ // The local network runs against anvil with no committee, so it defaults to the deterministic
123
+ // AutomineSequencer, which owns L1 time control (warps the dateProvider and L1 timestamps to slot
124
+ // boundaries as it builds), replacing the deleted AnvilTestWatcher. This remains true when p2p is
125
+ // enabled for local peer testing; local-network is not a mode for connecting to an existing network.
126
+ useAutomineSequencer: config.useAutomineSequencer ?? true,
127
+ // The AutomineSequencer owns epoch proving in the local network — it writes epoch out hashes to
128
+ // the L1 Outbox and advances the proven tip as checkpoints land, through the same serial queue as
129
+ // its builds — replacing the standalone EpochTestSettler that used to race the build loop.
130
+ automineEnableProveEpoch: config.automineEnableProveEpoch ?? true,
131
+ // Defaults for the local network / sandbox; callers (e.g. the CLI) may override. No real proving
132
+ // happens here — the AutomineSequencer synthetically settles epochs. Short epochs let it write out
133
+ // hashes quickly (so users can consume L2-to-L1 messages without a long wait), with a wider
134
+ // proof-submission window so the synthetic settler has headroom before the rollup would prune an
135
+ // unproven checkpoint.
136
+ realProofs: config.realProofs ?? false,
137
+ aztecEpochDuration: config.aztecEpochDuration ?? 4,
138
+ aztecProofSubmissionEpochs: config.aztecProofSubmissionEpochs ?? 2,
114
139
  };
115
140
  const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
116
141
  if (
@@ -134,7 +159,7 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
134
159
  const initialAccounts = await (async () => {
135
160
  if (config.testAccounts === true || config.testAccounts === undefined) {
136
161
  if (aztecNodeConfig.p2pEnabled) {
137
- userLog(`Not setting up test accounts as we are connecting to a network`);
162
+ userLog(`Not setting up test accounts when p2p is enabled`);
138
163
  } else {
139
164
  userLog(`Setting up test accounts`);
140
165
  return await getInitialTestAccountsData();
@@ -145,79 +170,27 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
145
170
 
146
171
  const bananaFPC = await getBananaFPCAddress(initialAccounts);
147
172
  const sponsoredFPC = await getSponsoredFPCAddress();
148
- const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map(a => AztecAddress.fromString(a));
173
+ const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map(a => AztecAddress.fromStringUnsafe(a));
149
174
  const fundedAddresses = [
150
175
  ...initialAccounts.map(a => a.address),
151
176
  ...(initialAccounts.length ? [bananaFPC, sponsoredFPC] : []),
152
177
  ...prefundAddresses,
153
178
  ];
154
- const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
179
+ const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(fundedAddresses);
155
180
 
156
181
  const dateProvider = new TestDateProvider();
157
182
 
158
- let cheatcodes: EthCheatCodes | undefined;
159
- let rollupAddress: EthAddress | undefined;
160
- let watcher: AnvilTestWatcher | undefined;
161
183
  if (!aztecNodeConfig.p2pEnabled) {
162
- ({ rollupAddress } = await deployContractsToL1(
163
- aztecNodeConfig,
164
- aztecNodeConfig.validatorPrivateKeys.getValue()[0],
165
- {
166
- genesisArchiveRoot,
167
- feeJuicePortalInitialBalance: fundingNeeded,
168
- },
169
- ));
170
-
171
- const chain =
172
- aztecNodeConfig.l1RpcUrls.length > 0
173
- ? createEthereumChain([l1RpcUrl], aztecNodeConfig.l1ChainId)
174
- : { chainInfo: localAnvil };
175
-
176
- const publicClient = createPublicClient({
177
- chain: chain.chainInfo,
178
- transport: fallback([httpViemTransport(l1RpcUrl)]) as any,
184
+ await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
185
+ genesisArchiveRoot,
186
+ feeJuicePortalInitialBalance: fundingNeeded,
179
187
  });
180
-
181
- cheatcodes = new EthCheatCodes([l1RpcUrl], dateProvider);
182
-
183
- watcher = new AnvilTestWatcher(cheatcodes, rollupAddress, publicClient, dateProvider);
184
- watcher.setisLocalNetwork(true);
185
- watcher.setIsMarkingAsProven(false); // Do not mark as proven in the watcher. It's marked in the epochTestSettler after the out hash is set.
186
-
187
- await watcher.start();
188
188
  }
189
189
 
190
190
  const telemetry = await initTelemetryClient(getTelemetryClientConfig());
191
191
  // Create a local blob client client inside the local network, no http connectivity
192
192
  const blobClient = createBlobClient();
193
- const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { prefilledPublicData });
194
-
195
- // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
196
- // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
197
- // warping time out from under an in-progress block.
198
- watcher?.setGetPendingTxCount(() => node.getPendingTxCount());
199
- const sequencer = node.getSequencer()?.getSequencer();
200
- if (sequencer) {
201
- const idleStates: Set<string> = new Set([
202
- SequencerState.STOPPED,
203
- SequencerState.STOPPING,
204
- SequencerState.IDLE,
205
- SequencerState.SYNCHRONIZING,
206
- ]);
207
- watcher?.setIsSequencerBuilding(() => !idleStates.has(sequencer.getState()));
208
- }
209
-
210
- let epochTestSettler: EpochTestSettler | undefined;
211
- if (!aztecNodeConfig.p2pEnabled) {
212
- epochTestSettler = new EpochTestSettler(
213
- cheatcodes!,
214
- rollupAddress!,
215
- node.getBlockSource(),
216
- logger.createChild('epoch-settler'),
217
- { pollingIntervalMs: 200 },
218
- );
219
- await epochTestSettler.start();
220
- }
193
+ const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { genesis });
221
194
 
222
195
  if (initialAccounts.length) {
223
196
  const wallet = await EmbeddedWallet.create(node, {
@@ -226,11 +199,14 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
226
199
  });
227
200
 
228
201
  userLog('Setting up funded test accounts...');
229
- const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
202
+ const accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccounts);
230
203
  const accLogs = await createAccountLogs(accountManagers, wallet);
231
204
  userLog(accLogs.join(''));
232
205
 
233
- await setupBananaFPC(initialAccounts, wallet, userLog);
206
+ userLog('Publishing standard AuthRegistry contract...');
207
+ await publishStandardAuthRegistry(wallet, initialAccounts[0].address, setupWaitOpts);
208
+
209
+ await setupBananaFPC(initialAccounts, wallet, userLog, setupWaitOpts);
234
210
 
235
211
  userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
236
212
 
@@ -240,8 +216,6 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
240
216
 
241
217
  const stop = async () => {
242
218
  await node.stop();
243
- await watcher?.stop();
244
- await epochTestSettler?.stop();
245
219
  };
246
220
 
247
221
  return { node, stop };
@@ -259,16 +233,15 @@ export async function createAztecNode(
259
233
  dateProvider?: DateProvider;
260
234
  proverBroker?: ProvingJobBroker;
261
235
  } = {},
262
- options: { prefilledPublicData?: PublicDataTreeLeaf[] } = {},
236
+ options: { genesis?: GenesisData } = {},
263
237
  ) {
264
238
  // TODO(#12272): will clean this up. This is criminal.
265
- const { l1Contracts, ...rest } = getConfigEnvVars();
239
+ // Not sure why this was ever done. Will be fixed in A-989, A-991, A-990.
266
240
  const aztecNodeConfig: AztecNodeConfig = {
267
- ...rest,
241
+ ...getConfigEnvVars(),
268
242
  ...config,
269
- l1Contracts: { ...l1Contracts, ...config.l1Contracts },
270
243
  };
271
- const node = await AztecNodeService.createAndSync(
244
+ const node = await createAztecNodeService(
272
245
  aztecNodeConfig,
273
246
  { ...deps, proverNodeDeps: { broker: deps.proverBroker } },
274
247
  options,
@@ -1,15 +1,10 @@
1
1
  import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
2
- import { BlockNumber } from '@aztec/foundation/branded-types';
3
- import { retryUntil } from '@aztec/foundation/retry';
4
2
  import type { DateProvider } from '@aztec/foundation/timer';
5
- import type { SequencerClient } from '@aztec/sequencer-client';
6
- import type { AztecNode } from '@aztec/stdlib/interfaces/client';
3
+ import type { AztecNode, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
7
4
 
8
5
  /**
9
- * A class that provides utility functions for interacting with the chain.
10
- * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
11
- * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
12
- * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
6
+ * Wrapper for Aztec Debug API.
7
+ * @deprecated use the AztecNode debug API directly.
13
8
  */
14
9
  export class CheatCodes {
15
10
  constructor(
@@ -29,51 +24,25 @@ export class CheatCodes {
29
24
  }
30
25
 
31
26
  /**
32
- * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
33
- * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
34
- * by the slot number, which advances in fixed intervals.
35
- * This is useful for testing time-dependent contract behavior.
36
- * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
37
- * @param node - The Aztec node used to query if a new block has been mined.
38
- * @param targetTimestamp - The target timestamp to warp to (in seconds)
27
+ * Warps the L1 timestamp to at least `targetTimestamp` and mines an L2 block advancing the L2 timestamp to at least
28
+ * the target. Forwards to the node's debug API, which serializes the warp through the automine sequencer queue.
29
+ * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
30
+ * @param targetTimestamp - The target timestamp to warp to (in seconds).
31
+ * @deprecated Call `node.warpL2TimeAtLeastTo(targetTimestamp)` on the node debug API directly.
39
32
  */
40
- async warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, targetTimestamp: bigint | number) {
41
- const currentL2BlockNumber: BlockNumber = await node.getBlockNumber();
42
-
43
- // We warp the L1 timestamp
44
- await this.eth.warp(targetTimestamp, { resetBlockInterval: true });
45
-
46
- // Wait until an L2 block is mined
47
- const sequencer = sequencerClient.getSequencer();
48
- const minTxsPerBlock = sequencer.getConfig().minTxsPerBlock;
49
- sequencer.updateConfig({ minTxsPerBlock: 0 });
50
-
51
- await retryUntil(
52
- async () => {
53
- const newL2BlockNumber: BlockNumber = await node.getBlockNumber();
54
- return newL2BlockNumber > currentL2BlockNumber;
55
- },
56
- 'new block after warping L2 time',
57
- 36,
58
- 1,
59
- );
60
-
61
- // Restore original minTxsPerBlock
62
- sequencer.updateConfig({ minTxsPerBlock });
33
+ warpL2TimeAtLeastTo(node: AztecNode & AztecNodeDebug, targetTimestamp: bigint | number): Promise<void> {
34
+ return node.warpL2TimeAtLeastTo(Number(targetTimestamp));
63
35
  }
64
36
 
65
37
  /**
66
- * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
67
- * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
68
- * number, which advances in fixed intervals.
69
- * This is useful for testing time-dependent contract behavior.
70
- * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
71
- * @param node - The Aztec node used to query if a new block has been mined.
72
- * @param duration - The duration to advance time by (in seconds)
38
+ * Warps the L1 timestamp forward by at least `duration` seconds and mines an L2 block advancing the L2 timestamp at
39
+ * least by the duration. Forwards to the node's debug API, which serializes the warp through the automine sequencer
40
+ * queue.
41
+ * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
42
+ * @param duration - The duration to advance time by (in seconds).
43
+ * @deprecated Call `node.warpL2TimeAtLeastBy(duration)` on the node debug API directly.
73
44
  */
74
- async warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number) {
75
- const currentTimestamp = await this.eth.timestamp();
76
- const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
77
- await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
45
+ warpL2TimeAtLeastBy(node: AztecNode & AztecNodeDebug, duration: bigint | number): Promise<void> {
46
+ return node.warpL2TimeAtLeastBy(Number(duration));
78
47
  }
79
48
  }
@@ -1,10 +1,9 @@
1
- import { Fr } from '@aztec/aztec.js/fields';
2
1
  import { type EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
3
- import { type EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
2
+ import type { EpochNumber } from '@aztec/foundation/branded-types';
4
3
  import type { Logger } from '@aztec/foundation/log';
4
+ import { settleEpochOutbox } from '@aztec/prover-client/test';
5
5
  import { EpochMonitor } from '@aztec/prover-node';
6
6
  import type { EthAddress, L2BlockSource } from '@aztec/stdlib/block';
7
- import { computeL2ToL1MembershipWitnessFromMessagesInEpoch } from '@aztec/stdlib/messaging';
8
7
 
9
8
  export class EpochTestSettler {
10
9
  private rollupCheatCodes: RollupCheatCodes;
@@ -31,35 +30,12 @@ export class EpochTestSettler {
31
30
  }
32
31
 
33
32
  async handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean> {
34
- const checkpointedBlocks = await this.l2BlockSource.getCheckpointedBlocksForEpoch(epoch);
35
- const blocks = checkpointedBlocks.map(b => b.block);
36
- this.log.info(
37
- `Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`,
38
- { blocks: blocks.map(b => b.toBlockInfo()) },
39
- );
40
- const messagesInEpoch: Fr[][][][] = [];
41
- let previousSlotNumber = SlotNumber.ZERO;
42
- let checkpointIndex = -1;
43
-
44
- for (const block of blocks) {
45
- const slotNumber = block.header.globalVariables.slotNumber;
46
- if (slotNumber !== previousSlotNumber) {
47
- checkpointIndex++;
48
- messagesInEpoch[checkpointIndex] = [];
49
- previousSlotNumber = slotNumber;
50
- }
51
- messagesInEpoch[checkpointIndex].push(block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs));
52
- }
53
-
54
- const [firstMessage] = messagesInEpoch.flat(3);
55
- if (firstMessage) {
56
- const { root: outHash } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, firstMessage);
57
- await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
58
- } else {
59
- this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
60
- }
61
-
62
- const lastCheckpoint = checkpointedBlocks.at(-1)?.checkpointNumber;
33
+ const lastCheckpoint = await settleEpochOutbox({
34
+ rollupCheatCodes: this.rollupCheatCodes,
35
+ l2BlockSource: this.l2BlockSource,
36
+ epoch,
37
+ log: this.log,
38
+ });
63
39
  if (lastCheckpoint !== undefined) {
64
40
  await this.rollupCheatCodes.markAsProven(lastCheckpoint);
65
41
  } else {
@@ -1,4 +1,3 @@
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';
@@ -1,19 +1,26 @@
1
1
  import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
2
2
  import { buildAllowedElement } from '@aztec/p2p/msg_validators';
3
+ import type { ContractArtifact } from '@aztec/stdlib/abi';
3
4
  import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
4
5
  import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
5
6
 
6
7
  /**
7
- * Returns Token-specific allowlist entries needed for FPC-based fee payments.
8
- * These are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
8
+ * Returns the allowlist entries needed for FPC-based fee payments, keyed by the contract class of
9
+ * the `artifact` actually deployed as the fee token (defaults to canonical Token). The setup-phase
10
+ * validator matches these entries by class id, so a test deploying the codegen'd TestToken as its
11
+ * fee vehicle must pass `TestTokenContract.artifact` here -- otherwise the FPC fee calls are matched
12
+ * against the wrong class and rejected. Test-only: FPC fee payment with custom tokens won't work on
13
+ * mainnet alpha.
9
14
  */
10
- export async function getTokenAllowedSetupFunctions(): Promise<AllowedElement[]> {
11
- const tokenClassId = (await getContractClassFromArtifact(TokenContractArtifact)).id;
15
+ export async function getTokenAllowedSetupFunctions(
16
+ artifact: ContractArtifact = TokenContractArtifact,
17
+ ): Promise<AllowedElement[]> {
18
+ const tokenClassId = (await getContractClassFromArtifact(artifact)).id;
12
19
  const target = { classId: tokenClassId };
13
20
  return Promise.all([
14
- // Token: needed for private transfers via FPC (transfer_to_public enqueues this)
15
- buildAllowedElement(TokenContractArtifact, target, '_increase_public_balance', { onlySelf: true }),
16
- // Token: needed for public transfers via FPC (fee_entrypoint_public enqueues this)
17
- buildAllowedElement(TokenContractArtifact, target, 'transfer_in_public'),
21
+ // needed for private transfers via FPC (transfer_to_public enqueues this)
22
+ buildAllowedElement(artifact, target, '_increase_public_balance', { onlySelf: true }),
23
+ // needed for public transfers via FPC (fee_entrypoint_public enqueues this)
24
+ buildAllowedElement(artifact, target, 'transfer_in_public'),
18
25
  ]);
19
26
  }
@@ -1,9 +0,0 @@
1
- import { type ArchiverConfig } from '@aztec/archiver';
2
- import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
3
- import { type DataStoreConfig } from '@aztec/stdlib/kv-store';
4
- export type { ArchiverConfig, DataStoreConfig };
5
- /** Starts a standalone archiver. */
6
- export declare function startArchiver(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers): Promise<{
7
- config: ArchiverConfig & DataStoreConfig;
8
- }>;
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvY21kcy9zdGFydF9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQW9FLE1BQU0saUJBQWlCLENBQUM7QUFJeEgsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUUvRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFLbEYsWUFBWSxFQUFFLGNBQWMsRUFBRSxlQUFlLEVBQUUsQ0FBQztBQUVoRCxvQ0FBb0M7QUFDcEMsd0JBQXNCLGFBQWEsQ0FDakMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsR0FDOUIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUE7Q0FBRSxDQUFDLENBK0J2RCJ9
@@ -1 +0,0 @@
1
- {"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAoE,MAAM,iBAAiB,CAAC;AAIxH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAKlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CA+BvD"}
@@ -1,48 +0,0 @@
1
- import { archiverConfigMappings, createArchiver, getArchiverConfigFromEnv } from '@aztec/archiver';
2
- import { createLogger } from '@aztec/aztec.js/log';
3
- import { blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
4
- import { getL1Config } from '@aztec/cli/config';
5
- import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
6
- import { dataConfigMappings } from '@aztec/stdlib/kv-store';
7
- import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
8
- import { extractRelevantOptions } from '../util.js';
9
- /** Starts a standalone archiver. */ export async function startArchiver(options, signalHandlers, services) {
10
- const envConfig = getArchiverConfigFromEnv();
11
- const cliOptions = extractRelevantOptions(options, {
12
- ...archiverConfigMappings,
13
- ...dataConfigMappings,
14
- ...blobClientConfigMapping
15
- }, 'archiver');
16
- let archiverConfig = {
17
- ...envConfig,
18
- ...cliOptions
19
- };
20
- archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
21
- if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
22
- throw new Error('L1 registry address is required to start an Archiver');
23
- }
24
- const { addresses, config: l1Config } = await getL1Config(archiverConfig.l1Contracts.registryAddress, archiverConfig.l1RpcUrls, archiverConfig.l1ChainId);
25
- archiverConfig.l1Contracts = addresses;
26
- archiverConfig = {
27
- ...archiverConfig,
28
- ...l1Config
29
- };
30
- const telemetry = await initTelemetryClient(getTelemetryClientConfig());
31
- const blobClient = createBlobClient(archiverConfig, {
32
- logger: createLogger('archiver:blob-client:client')
33
- });
34
- const archiver = await createArchiver(archiverConfig, {
35
- telemetry,
36
- blobClient
37
- }, {
38
- blockUntilSync: true
39
- });
40
- services.archiver = [
41
- archiver,
42
- ArchiverApiSchema
43
- ];
44
- signalHandlers.push(archiver.stop);
45
- return {
46
- config: archiverConfig
47
- };
48
- }
@@ -1,42 +0,0 @@
1
- import { EthCheatCodes } from '@aztec/ethereum/test';
2
- import type { ViemClient } from '@aztec/ethereum/types';
3
- import type { EthAddress } from '@aztec/foundation/eth-address';
4
- import type { TestDateProvider } from '@aztec/foundation/timer';
5
- /**
6
- * Represents a watcher for a rollup contract.
7
- *
8
- * It started on a network like anvil where time traveling is allowed, and auto-mine is turned on
9
- * it will periodically check if the current slot have already been filled, e.g., there was an L2
10
- * block within the slot. And if so, it will time travel into the next slot.
11
- */
12
- export declare class AnvilTestWatcher {
13
- private cheatcodes;
14
- private dateProvider?;
15
- private isLocalNetwork;
16
- private rollup;
17
- private rollupCheatCodes;
18
- private l2SlotDuration;
19
- private filledRunningPromise?;
20
- private syncDateProviderPromise?;
21
- private markingAsProvenRunningPromise?;
22
- private logger;
23
- private isMarkingAsProven;
24
- private getPendingTxCount?;
25
- private isSequencerBuilding?;
26
- private unfilledSlotFirstSeen?;
27
- constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
28
- setIsMarkingAsProven(isMarkingAsProven: boolean): void;
29
- setisLocalNetwork(isLocalNetwork: boolean): void;
30
- /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
31
- setGetPendingTxCount(fn: () => Promise<number>): void;
32
- /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
33
- setIsSequencerBuilding(fn: () => boolean): void;
34
- start(): Promise<void>;
35
- stop(): Promise<void>;
36
- trigger(): Promise<void>;
37
- markAsProven(): Promise<void>;
38
- syncDateProviderToL1IfBehind(): Promise<void>;
39
- warpTimeIfNeeded(): Promise<void>;
40
- private warpToTimestamp;
41
- }
42
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQXlCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQTNCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBa0I7SUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRS9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUTtJQUdqQyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBd0I7SUFHbEQsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQWdCO0lBRzVDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFxQztJQUVuRSxZQUNVLFVBQVUsRUFBRSxhQUFhLEVBQ2pDLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFFBQVEsRUFBRSxVQUFVLEVBQ1osWUFBWSxDQUFDLDhCQUFrQixFQWF4QztJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sUUFHOUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsT0FBTyxRQUV4QztJQUVELHlHQUF5RztJQUN6RyxvQkFBb0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBRTdDO0lBRUQsdUdBQXVHO0lBQ3ZHLHNCQUFzQixDQUFDLEVBQUUsRUFBRSxNQUFNLE9BQU8sUUFFdkM7SUFFSyxLQUFLLGtCQXlCVjtJQUVLLElBQUksa0JBSVQ7SUFFSyxPQUFPLGtCQUlaO0lBRUssWUFBWSxrQkFLakI7SUFFSyw0QkFBNEIsa0JBZWpDO0lBRUssZ0JBQWdCLGtCQXlEckI7WUFFYSxlQUFlO0NBTzlCIn0=
@@ -1 +0,0 @@
1
- {"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAyBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IA3BvB,OAAO,CAAC,cAAc,CAAkB;IAExC,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;IAGjC,OAAO,CAAC,iBAAiB,CAAC,CAAwB;IAGlD,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAG5C,OAAO,CAAC,qBAAqB,CAAC,CAAqC;IAEnE,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EAaxC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAED,yGAAyG;IACzG,oBAAoB,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAE7C;IAED,uGAAuG;IACvG,sBAAsB,CAAC,EAAE,EAAE,MAAM,OAAO,QAEvC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAejC;IAEK,gBAAgB,kBAyDrB;YAEa,eAAe;CAO9B"}