@aztec/aztec 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

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 (142) hide show
  1. package/README.md +1 -1
  2. package/dest/bin/index.d.ts +1 -1
  3. package/dest/bin/index.js +14 -9
  4. package/dest/cli/admin_api_key_store.d.ts +45 -0
  5. package/dest/cli/admin_api_key_store.d.ts.map +1 -0
  6. package/dest/cli/admin_api_key_store.js +98 -0
  7. package/dest/cli/aztec_start_action.d.ts +1 -1
  8. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  9. package/dest/cli/aztec_start_action.js +59 -34
  10. package/dest/cli/aztec_start_options.d.ts +1 -1
  11. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  12. package/dest/cli/aztec_start_options.js +46 -45
  13. package/dest/cli/cli.d.ts +1 -1
  14. package/dest/cli/cli.js +7 -7
  15. package/dest/cli/cmds/compile.d.ts +4 -0
  16. package/dest/cli/cmds/compile.d.ts.map +1 -0
  17. package/dest/cli/cmds/compile.js +95 -0
  18. package/dest/cli/cmds/migrate_ha_db.d.ts +3 -0
  19. package/dest/cli/cmds/migrate_ha_db.d.ts.map +1 -0
  20. package/dest/cli/cmds/migrate_ha_db.js +27 -0
  21. package/dest/cli/cmds/start_archiver.d.ts +1 -1
  22. package/dest/cli/cmds/start_archiver.d.ts.map +1 -1
  23. package/dest/cli/cmds/start_archiver.js +12 -14
  24. package/dest/cli/cmds/start_bot.d.ts +4 -7
  25. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  26. package/dest/cli/cmds/start_bot.js +18 -18
  27. package/dest/cli/cmds/start_node.d.ts +1 -1
  28. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  29. package/dest/cli/cmds/start_node.js +71 -27
  30. package/dest/cli/cmds/start_p2p_bootstrap.d.ts +2 -2
  31. package/dest/cli/cmds/start_p2p_bootstrap.d.ts.map +1 -1
  32. package/dest/cli/cmds/start_p2p_bootstrap.js +2 -3
  33. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  34. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  35. package/dest/cli/cmds/start_prover_agent.js +4 -4
  36. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  37. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  38. package/dest/cli/cmds/start_prover_broker.js +4 -4
  39. package/dest/cli/cmds/start_txe.d.ts +1 -1
  40. package/dest/cli/index.d.ts +1 -1
  41. package/dest/cli/preload_crs.d.ts +1 -1
  42. package/dest/cli/release_version.d.ts +1 -1
  43. package/dest/cli/util.d.ts +12 -19
  44. package/dest/cli/util.d.ts.map +1 -1
  45. package/dest/cli/util.js +16 -11
  46. package/dest/cli/versioning.d.ts +1 -1
  47. package/dest/cli/versioning.js +3 -3
  48. package/dest/examples/token.d.ts +1 -1
  49. package/dest/examples/token.js +21 -19
  50. package/dest/examples/util.d.ts +3 -3
  51. package/dest/examples/util.d.ts.map +1 -1
  52. package/dest/examples/util.js +1 -1
  53. package/dest/index.d.ts +2 -2
  54. package/dest/index.d.ts.map +1 -1
  55. package/dest/index.js +1 -1
  56. package/dest/local-network/banana_fpc.d.ts +10 -0
  57. package/dest/local-network/banana_fpc.d.ts.map +1 -0
  58. package/dest/{sandbox → local-network}/banana_fpc.js +17 -21
  59. package/dest/local-network/index.d.ts +4 -0
  60. package/dest/local-network/index.d.ts.map +1 -0
  61. package/dest/local-network/index.js +3 -0
  62. package/dest/local-network/local-network.d.ts +73 -0
  63. package/dest/local-network/local-network.d.ts.map +1 -0
  64. package/dest/{sandbox/sandbox.js → local-network/local-network.js} +83 -66
  65. package/dest/local-network/sponsored_fpc.d.ts +5 -0
  66. package/dest/local-network/sponsored_fpc.d.ts.map +1 -0
  67. package/dest/{sandbox → local-network}/sponsored_fpc.js +7 -8
  68. package/dest/mnemonic.d.ts +1 -1
  69. package/dest/splash.d.ts +1 -1
  70. package/dest/testing/anvil_test_watcher.d.ts +12 -4
  71. package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
  72. package/dest/testing/anvil_test_watcher.js +69 -31
  73. package/dest/testing/cheat_codes.d.ts +7 -8
  74. package/dest/testing/cheat_codes.d.ts.map +1 -1
  75. package/dest/testing/cheat_codes.js +9 -10
  76. package/dest/testing/epoch_test_settler.d.ts +19 -0
  77. package/dest/testing/epoch_test_settler.d.ts.map +1 -0
  78. package/dest/testing/epoch_test_settler.js +62 -0
  79. package/dest/testing/index.d.ts +2 -2
  80. package/dest/testing/index.d.ts.map +1 -1
  81. package/dest/testing/index.js +1 -1
  82. package/package.json +41 -37
  83. package/scripts/aztec.sh +62 -0
  84. package/scripts/extract_function.js +47 -0
  85. package/scripts/flamegraph.sh +59 -0
  86. package/scripts/init.sh +35 -0
  87. package/scripts/new.sh +59 -0
  88. package/scripts/setup_project.sh +31 -0
  89. package/src/bin/index.ts +15 -9
  90. package/src/cli/admin_api_key_store.ts +128 -0
  91. package/src/cli/aztec_start_action.ts +62 -26
  92. package/src/cli/aztec_start_options.ts +47 -43
  93. package/src/cli/cli.ts +11 -11
  94. package/src/cli/cmds/compile.ts +107 -0
  95. package/src/cli/cmds/migrate_ha_db.ts +43 -0
  96. package/src/cli/cmds/start_archiver.ts +8 -19
  97. package/src/cli/cmds/start_bot.ts +27 -15
  98. package/src/cli/cmds/start_node.ts +64 -23
  99. package/src/cli/cmds/start_p2p_bootstrap.ts +3 -3
  100. package/src/cli/cmds/start_prover_agent.ts +4 -12
  101. package/src/cli/cmds/start_prover_broker.ts +7 -3
  102. package/src/cli/util.ts +23 -26
  103. package/src/cli/versioning.ts +3 -3
  104. package/src/examples/token.ts +20 -19
  105. package/src/examples/util.ts +2 -2
  106. package/src/index.ts +5 -5
  107. package/src/{sandbox → local-network}/banana_fpc.ts +24 -25
  108. package/src/local-network/index.ts +7 -0
  109. package/src/local-network/local-network.ts +267 -0
  110. package/src/local-network/sponsored_fpc.ts +26 -0
  111. package/src/testing/anvil_test_watcher.ts +77 -34
  112. package/src/testing/cheat_codes.ts +13 -13
  113. package/src/testing/epoch_test_settler.ts +71 -0
  114. package/src/testing/index.ts +1 -1
  115. package/dest/cli/cmds/start_blob_sink.d.ts +0 -3
  116. package/dest/cli/cmds/start_blob_sink.d.ts.map +0 -1
  117. package/dest/cli/cmds/start_blob_sink.js +0 -33
  118. package/dest/cli/cmds/start_prover_node.d.ts +0 -7
  119. package/dest/cli/cmds/start_prover_node.d.ts.map +0 -1
  120. package/dest/cli/cmds/start_prover_node.js +0 -108
  121. package/dest/cli/cmds/start_pxe.d.ts +0 -16
  122. package/dest/cli/cmds/start_pxe.d.ts.map +0 -1
  123. package/dest/cli/cmds/start_pxe.js +0 -31
  124. package/dest/sandbox/banana_fpc.d.ts +0 -11
  125. package/dest/sandbox/banana_fpc.d.ts.map +0 -1
  126. package/dest/sandbox/index.d.ts +0 -4
  127. package/dest/sandbox/index.d.ts.map +0 -1
  128. package/dest/sandbox/index.js +0 -3
  129. package/dest/sandbox/sandbox.d.ts +0 -84
  130. package/dest/sandbox/sandbox.d.ts.map +0 -1
  131. package/dest/sandbox/sponsored_fpc.d.ts +0 -4
  132. package/dest/sandbox/sponsored_fpc.d.ts.map +0 -1
  133. package/dest/testing/aztec_cheat_codes.d.ts +0 -59
  134. package/dest/testing/aztec_cheat_codes.d.ts.map +0 -1
  135. package/dest/testing/aztec_cheat_codes.js +0 -62
  136. package/src/cli/cmds/start_blob_sink.ts +0 -57
  137. package/src/cli/cmds/start_prover_node.ts +0 -124
  138. package/src/cli/cmds/start_pxe.ts +0 -49
  139. package/src/sandbox/index.ts +0 -4
  140. package/src/sandbox/sandbox.ts +0 -253
  141. package/src/sandbox/sponsored_fpc.ts +0 -27
  142. package/src/testing/aztec_cheat_codes.ts +0 -77
@@ -1,21 +1,26 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
- import { getSchnorrWallet } from '@aztec/accounts/schnorr';
3
- import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
4
- import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
5
- import { EthAddress } from '@aztec/aztec.js';
6
- import { createBlobSinkClient } from '@aztec/blob-sink/client';
7
- import { setupSponsoredFPC } from '@aztec/cli/cli-utils';
2
+ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
3
+ import { AztecNodeService } from '@aztec/aztec-node';
4
+ import { getConfigEnvVars } from '@aztec/aztec-node/config';
5
+ import { Fr } from '@aztec/aztec.js/fields';
6
+ import { createLogger } from '@aztec/aztec.js/log';
7
+ import { createBlobClient } from '@aztec/blob-client/client';
8
8
  import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
9
- import { NULL_KEY, createEthereumChain, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, waitForPublicClient } from '@aztec/ethereum';
9
+ import { createEthereumChain } from '@aztec/ethereum/chain';
10
+ import { waitForPublicClient } from '@aztec/ethereum/client';
11
+ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
12
+ import { NULL_KEY } from '@aztec/ethereum/constants';
13
+ import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
10
14
  import { EthCheatCodes } from '@aztec/ethereum/test';
11
15
  import { SecretValue } from '@aztec/foundation/config';
12
- import { Fr } from '@aztec/foundation/fields';
13
- import { createLogger } from '@aztec/foundation/log';
16
+ import { EthAddress } from '@aztec/foundation/eth-address';
14
17
  import { TestDateProvider } from '@aztec/foundation/timer';
15
18
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
16
- import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
17
- import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
19
+ import { protocolContractsHash } from '@aztec/protocol-contracts';
20
+ import { SequencerState } from '@aztec/sequencer-client';
18
21
  import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
22
+ import { EmbeddedWallet } from '@aztec/wallets/embedded';
23
+ import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
19
24
  import { getGenesisValues } from '@aztec/world-state/testing';
20
25
  import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
21
26
  import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
@@ -23,32 +28,28 @@ import { foundry } from 'viem/chains';
23
28
  import { createAccountLogs } from '../cli/util.js';
24
29
  import { DefaultMnemonic } from '../mnemonic.js';
25
30
  import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
31
+ import { EpochTestSettler } from '../testing/epoch_test_settler.js';
26
32
  import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
27
33
  import { getSponsoredFPCAddress } from './sponsored_fpc.js';
28
- const logger = createLogger('sandbox');
34
+ const logger = createLogger('local-network');
29
35
  const localAnvil = foundry;
30
36
  /**
31
- * Function to deploy our L1 contracts to the sandbox L1
37
+ * Function to deploy our L1 contracts to the local network L1
32
38
  * @param aztecNodeConfig - The Aztec Node Config
33
39
  * @param hdAccount - Account for publishing L1 contracts
34
- */ export async function deployContractsToL1(aztecNodeConfig, hdAccount, contractDeployLogger = logger, opts = {}) {
35
- const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain(aztecNodeConfig.l1RpcUrls, aztecNodeConfig.l1ChainId) : {
36
- chainInfo: localAnvil
37
- };
40
+ */ export async function deployContractsToL1(aztecNodeConfig, privateKey, opts = {}) {
38
41
  await waitForPublicClient(aztecNodeConfig);
39
- const l1Contracts = await deployL1Contracts(aztecNodeConfig.l1RpcUrls, hdAccount, chain.chainInfo, contractDeployLogger, {
42
+ const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
40
43
  ...getL1ContractsConfigEnvVars(),
41
44
  ...aztecNodeConfig,
42
45
  vkTreeRoot: getVKTreeRoot(),
43
- protocolContractTreeRoot,
46
+ protocolContractsHash,
44
47
  genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
45
- salt: opts.salt,
46
48
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
47
49
  aztecTargetCommitteeSize: 0,
48
50
  slasherFlavor: 'none',
49
51
  realVerifier: false
50
52
  });
51
- await deployMulticall3(l1Contracts.l1Client, logger);
52
53
  aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
53
54
  aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
54
55
  return aztecNodeConfig.l1Contracts;
@@ -56,24 +57,24 @@ const localAnvil = foundry;
56
57
  /**
57
58
  * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
58
59
  * Does not start any HTTP services nor populate any initial accounts.
59
- * @param config - Optional Sandbox settings.
60
- */ export async function createSandbox(config = {}, userLog) {
61
- // sandbox is meant for test envs. We should only need one l1RpcUrl
60
+ * @param config - Optional local network settings.
61
+ */ export async function createLocalNetwork(config = {}, userLog) {
62
+ // local network is meant for test envs. We should only need one l1RpcUrl
62
63
  const l1RpcUrl = config.l1RpcUrls?.[0];
63
64
  if (!l1RpcUrl) {
64
65
  throw new Error('An L1 RPC URL is required');
65
66
  }
66
67
  if ((config.l1RpcUrls?.length || 0) > 1) {
67
- logger.warn(`Multiple L1 RPC URLs provided. Sandbox will only use the first one: ${l1RpcUrl}`);
68
+ logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
68
69
  }
69
70
  const aztecNodeConfig = {
70
71
  ...getConfigEnvVars(),
71
72
  ...config
72
73
  };
73
74
  const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
74
- if (aztecNodeConfig.publisherPrivateKeys == undefined || !aztecNodeConfig.publisherPrivateKeys.length || aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY) {
75
+ if (aztecNodeConfig.sequencerPublisherPrivateKeys == undefined || !aztecNodeConfig.sequencerPublisherPrivateKeys.length || aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY) {
75
76
  const privKey = hdAccount.getHdKey().privateKey;
76
- aztecNodeConfig.publisherPrivateKeys = [
77
+ aztecNodeConfig.sequencerPublisherPrivateKeys = [
77
78
  new SecretValue(`0x${Buffer.from(privKey).toString('hex')}`)
78
79
  ];
79
80
  }
@@ -90,7 +91,7 @@ const localAnvil = foundry;
90
91
  userLog(`Not setting up test accounts as we are connecting to a network`);
91
92
  } else {
92
93
  userLog(`Setting up test accounts`);
93
- return await getInitialTestAccounts();
94
+ return await getInitialTestAccountsData();
94
95
  }
95
96
  }
96
97
  return [];
@@ -103,15 +104,15 @@ const localAnvil = foundry;
103
104
  sponsoredFPC
104
105
  ] : [];
105
106
  const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
106
- let watcher = undefined;
107
107
  const dateProvider = new TestDateProvider();
108
+ let cheatcodes;
109
+ let rollupAddress;
110
+ let watcher;
108
111
  if (!aztecNodeConfig.p2pEnabled) {
109
- const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, hdAccount, undefined, {
110
- assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
112
+ ({ rollupAddress } = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
111
113
  genesisArchiveRoot,
112
- salt: config.deployAztecContractsSalt ? parseInt(config.deployAztecContractsSalt) : undefined,
113
114
  feeJuicePortalInitialBalance: fundingNeeded
114
- });
115
+ }));
115
116
  const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
116
117
  l1RpcUrl
117
118
  ], aztecNodeConfig.l1ChainId) : {
@@ -123,46 +124,68 @@ const localAnvil = foundry;
123
124
  httpViemTransport(l1RpcUrl)
124
125
  ])
125
126
  });
126
- watcher = new AnvilTestWatcher(new EthCheatCodes([
127
+ cheatcodes = new EthCheatCodes([
127
128
  l1RpcUrl
128
- ]), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
129
- watcher.setIsSandbox(true);
129
+ ], dateProvider);
130
+ watcher = new AnvilTestWatcher(cheatcodes, rollupAddress, publicClient, dateProvider);
131
+ watcher.setisLocalNetwork(true);
132
+ watcher.setIsMarkingAsProven(false); // Do not mark as proven in the watcher. It's marked in the epochTestSettler after the out hash is set.
130
133
  await watcher.start();
131
134
  }
132
- const telemetry = initTelemetryClient(getTelemetryClientConfig());
133
- // Create a local blob sink client inside the sandbox, no http connectivity
134
- const blobSinkClient = createBlobSinkClient();
135
+ const telemetry = await initTelemetryClient(getTelemetryClientConfig());
136
+ // Create a local blob client client inside the local network, no http connectivity
137
+ const blobClient = createBlobClient();
135
138
  const node = await createAztecNode(aztecNodeConfig, {
136
139
  telemetry,
137
- blobSinkClient,
140
+ blobClient,
138
141
  dateProvider
139
142
  }, {
140
143
  prefilledPublicData
141
144
  });
142
- const pxeServiceConfig = {
143
- proverEnabled: aztecNodeConfig.realProofs
144
- };
145
- const pxe = await createAztecPXE(node, pxeServiceConfig);
145
+ // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
146
+ // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
147
+ // warping time out from under an in-progress block.
148
+ watcher?.setGetPendingTxCount(()=>node.getPendingTxCount());
149
+ const sequencer = node.getSequencer()?.getSequencer();
150
+ if (sequencer) {
151
+ const idleStates = new Set([
152
+ SequencerState.STOPPED,
153
+ SequencerState.STOPPING,
154
+ SequencerState.IDLE,
155
+ SequencerState.SYNCHRONIZING
156
+ ]);
157
+ watcher?.setIsSequencerBuilding(()=>!idleStates.has(sequencer.getState()));
158
+ }
159
+ let epochTestSettler;
160
+ if (!aztecNodeConfig.p2pEnabled) {
161
+ epochTestSettler = new EpochTestSettler(cheatcodes, rollupAddress, node.getBlockSource(), logger.createChild('epoch-settler'), {
162
+ pollingIntervalMs: 200
163
+ });
164
+ await epochTestSettler.start();
165
+ }
146
166
  if (initialAccounts.length) {
167
+ const wallet = await EmbeddedWallet.create(node, {
168
+ pxeConfig: {
169
+ proverEnabled: aztecNodeConfig.realProofs
170
+ },
171
+ ephemeral: true
172
+ });
147
173
  userLog('Setting up funded test accounts...');
148
- const accounts = await deployFundedSchnorrAccounts(pxe, initialAccounts);
149
- const accountsWithSecrets = accounts.map((account, i)=>({
150
- account,
151
- secretKey: initialAccounts[i].secret
152
- }));
153
- const accLogs = await createAccountLogs(accountsWithSecrets, pxe);
174
+ const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
175
+ const accLogs = await createAccountLogs(accountManagers, wallet);
154
176
  userLog(accLogs.join(''));
155
- const deployer = await getSchnorrWallet(pxe, initialAccounts[0].address, initialAccounts[0].signingKey);
156
- await setupBananaFPC(initialAccounts, deployer, userLog);
157
- await setupSponsoredFPC(pxe, userLog);
177
+ await setupBananaFPC(initialAccounts, wallet, userLog);
178
+ userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
179
+ // We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
180
+ await wallet.stop();
158
181
  }
159
182
  const stop = async ()=>{
160
183
  await node.stop();
161
184
  await watcher?.stop();
185
+ await epochTestSettler?.stop();
162
186
  };
163
187
  return {
164
188
  node,
165
- pxe,
166
189
  stop
167
190
  };
168
191
  }
@@ -180,17 +203,11 @@ const localAnvil = foundry;
180
203
  ...config.l1Contracts
181
204
  }
182
205
  };
183
- const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
206
+ const node = await AztecNodeService.createAndSync(aztecNodeConfig, {
207
+ ...deps,
208
+ proverNodeDeps: {
209
+ broker: deps.proverBroker
210
+ }
211
+ }, options);
184
212
  return node;
185
213
  }
186
- /**
187
- * Create and start a new Aztec PXE HTTP Server
188
- * @param config - Optional PXE settings.
189
- */ export async function createAztecPXE(node, config = {}) {
190
- const pxeServiceConfig = {
191
- ...getPXEServiceConfig(),
192
- ...config
193
- };
194
- const pxe = await createPXEService(node, pxeServiceConfig);
195
- return pxe;
196
- }
@@ -0,0 +1,5 @@
1
+ import type { AztecAddress } from '@aztec/aztec.js/addresses';
2
+ import type { Wallet } from '@aztec/aztec.js/wallet';
3
+ export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
4
+ export declare function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
5
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BvbnNvcmVkX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvc3BvbnNvcmVkX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQU05RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVVyRCx3QkFBc0Isc0JBQXNCLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUVwRTtBQUVELHdCQUFzQixpREFBaUQsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FLN0cifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sponsored_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/sponsored_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAM9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAUrD,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,YAAY,CAAC,CAEpE;AAED,wBAAsB,iDAAiD,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAK7G"}
@@ -1,4 +1,5 @@
1
- import { Fr, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
1
+ import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
2
+ import { Fr } from '@aztec/aztec.js/fields';
2
3
  import { SPONSORED_FPC_SALT } from '@aztec/constants';
3
4
  import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
4
5
  async function getSponsoredFPCInstance() {
@@ -9,11 +10,9 @@ async function getSponsoredFPCInstance() {
9
10
  export async function getSponsoredFPCAddress() {
10
11
  return (await getSponsoredFPCInstance()).address;
11
12
  }
12
- export async function getDeployedSponsoredFPCAddress(pxe) {
13
- const fpc = await getSponsoredFPCAddress();
14
- const contracts = await pxe.getContracts();
15
- if (!contracts.find((c)=>c.equals(fpc))) {
16
- throw new Error('SponsoredFPC not deployed.');
17
- }
18
- return fpc;
13
+ export async function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet) {
14
+ const fpc = await getSponsoredFPCInstance();
15
+ // The following is no-op if the contract is already registered
16
+ await wallet.registerContract(fpc, SponsoredFPCContract.artifact);
17
+ return fpc.address;
19
18
  }
@@ -1,2 +1,2 @@
1
1
  export declare const DefaultMnemonic = "test test test test test test test test test test test junk";
2
- //# sourceMappingURL=mnemonic.d.ts.map
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW5lbW9uaWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9tbmVtb25pYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFPLE1BQU0sZUFBZSxnRUFBZ0UsQ0FBQyJ9
package/dest/splash.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export declare const splash: string;
2
2
  export declare const github = "https://github.com/AztecProtocol";
3
- //# sourceMappingURL=splash.d.ts.map
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BsYXNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc3BsYXNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQU8sTUFBTSxNQUFNLEVBQUUsTUFPa0IsQ0FBQztBQUV4QyxlQUFPLE1BQU0sTUFBTSxxQ0FBcUMsQ0FBQyJ9
@@ -1,5 +1,5 @@
1
- import type { ViemClient } from '@aztec/ethereum';
2
1
  import { EthCheatCodes } from '@aztec/ethereum/test';
2
+ import type { ViemClient } from '@aztec/ethereum/types';
3
3
  import type { EthAddress } from '@aztec/foundation/eth-address';
4
4
  import type { TestDateProvider } from '@aztec/foundation/timer';
5
5
  /**
@@ -12,7 +12,7 @@ import type { TestDateProvider } from '@aztec/foundation/timer';
12
12
  export declare class AnvilTestWatcher {
13
13
  private cheatcodes;
14
14
  private dateProvider?;
15
- private isSandbox;
15
+ private isLocalNetwork;
16
16
  private rollup;
17
17
  private rollupCheatCodes;
18
18
  private l2SlotDuration;
@@ -21,14 +21,22 @@ export declare class AnvilTestWatcher {
21
21
  private markingAsProvenRunningPromise?;
22
22
  private logger;
23
23
  private isMarkingAsProven;
24
+ private getPendingTxCount?;
25
+ private isSequencerBuilding?;
26
+ private unfilledSlotFirstSeen?;
24
27
  constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
25
28
  setIsMarkingAsProven(isMarkingAsProven: boolean): void;
26
- setIsSandbox(isSandbox: 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;
27
34
  start(): Promise<void>;
28
35
  stop(): Promise<void>;
29
36
  trigger(): Promise<void>;
30
37
  markAsProven(): Promise<void>;
31
38
  syncDateProviderToL1IfBehind(): Promise<void>;
32
39
  warpTimeIfNeeded(): Promise<void>;
40
+ private warpToTimestamp;
33
41
  }
34
- //# sourceMappingURL=anvil_test_watcher.d.ts.map
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQXlCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQTNCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBa0I7SUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRS9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUTtJQUdqQyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBd0I7SUFHbEQsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQWdCO0lBRzVDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFxQztJQUVuRSxZQUNVLFVBQVUsRUFBRSxhQUFhLEVBQ2pDLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFFBQVEsRUFBRSxVQUFVLEVBQ1osWUFBWSxDQUFDLDhCQUFrQixFQWF4QztJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sUUFHOUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsT0FBTyxRQUV4QztJQUVELHlHQUF5RztJQUN6RyxvQkFBb0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBRTdDO0lBRUQsdUdBQXVHO0lBQ3ZHLHNCQUFzQixDQUFDLEVBQUUsRUFBRSxNQUFNLE9BQU8sUUFFdkM7SUFFSyxLQUFLLGtCQXlCVjtJQUVLLElBQUksa0JBSVQ7SUFFSyxPQUFPLGtCQUlaO0lBRUssWUFBWSxrQkFLakI7SUFFSyw0QkFBNEIsa0JBZWpDO0lBRUssZ0JBQWdCLGtCQXlEckI7WUFFYSxlQUFlO0NBTzlCIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAgBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAlBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,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;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,EAAE,gBAAgB,YAAA;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IA2BL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,4BAA4B;IAiB5B,gBAAgB;CA4CvB"}
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"}
@@ -1,4 +1,5 @@
1
1
  import { RollupCheatCodes } from '@aztec/ethereum/test';
2
+ import { SlotNumber } from '@aztec/foundation/branded-types';
2
3
  import { createLogger } from '@aztec/foundation/log';
3
4
  import { RunningPromise } from '@aztec/foundation/running-promise';
4
5
  import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
@@ -12,7 +13,7 @@ import { getAddress, getContract } from 'viem';
12
13
  */ export class AnvilTestWatcher {
13
14
  cheatcodes;
14
15
  dateProvider;
15
- isSandbox;
16
+ isLocalNetwork;
16
17
  rollup;
17
18
  rollupCheatCodes;
18
19
  l2SlotDuration;
@@ -21,10 +22,16 @@ import { getAddress, getContract } from 'viem';
21
22
  markingAsProvenRunningPromise;
22
23
  logger;
23
24
  isMarkingAsProven;
25
+ // Optional callback to check if there are pending txs in the mempool.
26
+ getPendingTxCount;
27
+ // Optional callback to check if the sequencer is actively building a block.
28
+ isSequencerBuilding;
29
+ // Tracks when we first observed the current unfilled slot with pending txs (real wall time).
30
+ unfilledSlotFirstSeen;
24
31
  constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
25
32
  this.cheatcodes = cheatcodes;
26
33
  this.dateProvider = dateProvider;
27
- this.isSandbox = false;
34
+ this.isLocalNetwork = false;
28
35
  this.logger = createLogger(`aztecjs:utils:watcher`);
29
36
  this.isMarkingAsProven = true;
30
37
  this.rollup = getContract({
@@ -38,10 +45,17 @@ import { getAddress, getContract } from 'viem';
38
45
  this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
39
46
  }
40
47
  setIsMarkingAsProven(isMarkingAsProven) {
48
+ this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
41
49
  this.isMarkingAsProven = isMarkingAsProven;
42
50
  }
43
- setIsSandbox(isSandbox) {
44
- this.isSandbox = isSandbox;
51
+ setisLocalNetwork(isLocalNetwork) {
52
+ this.isLocalNetwork = isLocalNetwork;
53
+ }
54
+ /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */ setGetPendingTxCount(fn) {
55
+ this.getPendingTxCount = fn;
56
+ }
57
+ /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */ setIsSequencerBuilding(fn) {
58
+ this.isSequencerBuilding = fn;
45
59
  }
46
60
  async start() {
47
61
  if (this.filledRunningPromise) {
@@ -51,7 +65,7 @@ import { getAddress, getContract } from 'viem';
51
65
  this.l2SlotDuration = config.slotDuration;
52
66
  // If auto mining is not supported (e.g., we are on a real network), then we
53
67
  // will simple do nothing. But if on an anvil or the like, this make sure that
54
- // the sandbox and tests don't break because time is frozen and we never get to
68
+ // the local network and tests don't break because time is frozen and we never get to
55
69
  // the next slot.
56
70
  const isAutoMining = await this.cheatcodes.isAutoMining();
57
71
  if (isAutoMining) {
@@ -83,7 +97,7 @@ import { getAddress, getContract } from 'viem';
83
97
  await this.rollupCheatCodes.markAsProven();
84
98
  }
85
99
  async syncDateProviderToL1IfBehind() {
86
- // this doesn't apply to the sandbox, because we don't have a date provider in the sandbox
100
+ // this doesn't apply to the local network, because we don't have a date provider in the local network
87
101
  if (!this.dateProvider) {
88
102
  return;
89
103
  }
@@ -99,45 +113,69 @@ import { getAddress, getContract } from 'viem';
99
113
  }
100
114
  async warpTimeIfNeeded() {
101
115
  try {
102
- const currentSlot = await this.rollup.read.getCurrentSlot();
103
- const pendingBlockNumber = BigInt(await this.rollup.read.getPendingBlockNumber());
104
- const blockLog = await this.rollup.read.getBlock([
105
- pendingBlockNumber
116
+ const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
117
+ const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
118
+ const checkpointLog = await this.rollup.read.getCheckpoint([
119
+ pendingCheckpointNumber
106
120
  ]);
121
+ const nextSlot = SlotNumber(currentSlot + 1);
107
122
  const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
108
- currentSlot + 1n
123
+ BigInt(nextSlot)
109
124
  ]));
110
- if (currentSlot === blockLog.slotNumber) {
111
- // We should jump to the next slot
112
- try {
113
- await this.cheatcodes.warp(nextSlotTimestamp, {
114
- resetBlockInterval: true,
115
- updateDateProvider: this.dateProvider
116
- });
117
- } catch (e) {
118
- this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
119
- }
125
+ if (BigInt(currentSlot) === checkpointLog.slotNumber) {
126
+ // The current slot has been filled, we should jump to the next slot.
127
+ await this.warpToTimestamp(nextSlotTimestamp);
120
128
  this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
121
129
  return;
122
130
  }
123
- // If we are not in sandbox, we don't need to warp time
124
- if (!this.isSandbox) {
131
+ // If we are not in local network, we don't need to warp time
132
+ if (!this.isLocalNetwork) {
125
133
  return;
126
134
  }
135
+ // If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
136
+ // sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
137
+ // the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
138
+ // to avoid invalidating its in-progress work.
139
+ if (this.getPendingTxCount) {
140
+ const pendingTxs = await this.getPendingTxCount();
141
+ if (pendingTxs > 0) {
142
+ if (this.isSequencerBuilding?.()) {
143
+ this.unfilledSlotFirstSeen = undefined;
144
+ return;
145
+ }
146
+ const realNow = Date.now();
147
+ if (!this.unfilledSlotFirstSeen || this.unfilledSlotFirstSeen.slot !== currentSlot) {
148
+ this.unfilledSlotFirstSeen = {
149
+ slot: currentSlot,
150
+ realTime: realNow
151
+ };
152
+ return;
153
+ }
154
+ if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
155
+ await this.warpToTimestamp(nextSlotTimestamp);
156
+ this.unfilledSlotFirstSeen = undefined;
157
+ this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
158
+ }
159
+ return;
160
+ }
161
+ }
162
+ // Fallback: warp when the dateProvider time has passed the next slot timestamp.
127
163
  const currentTimestamp = this.dateProvider?.now() ?? Date.now();
128
164
  if (currentTimestamp > nextSlotTimestamp * 1000) {
129
- try {
130
- await this.cheatcodes.warp(nextSlotTimestamp, {
131
- resetBlockInterval: true,
132
- updateDateProvider: this.dateProvider
133
- });
134
- } catch (e) {
135
- this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
136
- }
165
+ await this.warpToTimestamp(nextSlotTimestamp);
137
166
  this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
138
167
  }
139
168
  } catch {
140
169
  this.logger.error('mineIfSlotFilled failed');
141
170
  }
142
171
  }
172
+ async warpToTimestamp(timestamp) {
173
+ try {
174
+ await this.cheatcodes.warp(timestamp, {
175
+ resetBlockInterval: true
176
+ });
177
+ } catch (e) {
178
+ this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
179
+ }
180
+ }
143
181
  }
@@ -1,25 +1,24 @@
1
1
  import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
2
+ import type { DateProvider } from '@aztec/foundation/timer';
2
3
  import type { SequencerClient } from '@aztec/sequencer-client';
3
- import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
4
- import { AztecCheatCodes } from './aztec_cheat_codes.js';
4
+ import type { AztecNode } from '@aztec/stdlib/interfaces/client';
5
5
  /**
6
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.
7
10
  */
8
11
  export declare class CheatCodes {
9
12
  /** Cheat codes for L1.*/
10
13
  eth: EthCheatCodes;
11
- /** Cheat codes for Aztec L2. */
12
- aztec: AztecCheatCodes;
13
14
  /** Cheat codes for the Aztec Rollup contract on L1. */
14
15
  rollup: RollupCheatCodes;
15
16
  constructor(
16
17
  /** Cheat codes for L1.*/
17
18
  eth: EthCheatCodes,
18
- /** Cheat codes for Aztec L2. */
19
- aztec: AztecCheatCodes,
20
19
  /** Cheat codes for the Aztec Rollup contract on L1. */
21
20
  rollup: RollupCheatCodes);
22
- static create(rpcUrls: string[], pxe: PXE): Promise<CheatCodes>;
21
+ static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): Promise<CheatCodes>;
23
22
  /**
24
23
  * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
25
24
  * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
@@ -41,4 +40,4 @@ export declare class CheatCodes {
41
40
  */
42
41
  warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
43
42
  }
44
- //# sourceMappingURL=cheat_codes.d.ts.map
43
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFFbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;;IAL/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAUrE;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM;IAyB7G;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAKvG"}
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,22 +1,21 @@
1
- import { retryUntil } from '@aztec/aztec.js';
2
1
  import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
3
- import { AztecCheatCodes } from './aztec_cheat_codes.js';
2
+ import { retryUntil } from '@aztec/foundation/retry';
4
3
  /**
5
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.
6
8
  */ export class CheatCodes {
7
9
  eth;
8
- aztec;
9
10
  rollup;
10
- constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for Aztec L2. */ aztec, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
11
+ constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
11
12
  this.eth = eth;
12
- this.aztec = aztec;
13
13
  this.rollup = rollup;
14
14
  }
15
- static async create(rpcUrls, pxe) {
16
- const ethCheatCodes = new EthCheatCodes(rpcUrls);
17
- const aztecCheatCodes = new AztecCheatCodes(pxe);
18
- const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await pxe.getNodeInfo().then((n)=>n.l1ContractAddresses));
19
- return new CheatCodes(ethCheatCodes, aztecCheatCodes, rollupCheatCodes);
15
+ static async create(rpcUrls, node, dateProvider) {
16
+ const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
17
+ const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await node.getNodeInfo().then((n)=>n.l1ContractAddresses));
18
+ return new CheatCodes(ethCheatCodes, rollupCheatCodes);
20
19
  }
21
20
  /**
22
21
  * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
@@ -0,0 +1,19 @@
1
+ import { type EthCheatCodes } from '@aztec/ethereum/test';
2
+ import { type EpochNumber } from '@aztec/foundation/branded-types';
3
+ import type { Logger } from '@aztec/foundation/log';
4
+ import type { EthAddress, L2BlockSource } from '@aztec/stdlib/block';
5
+ export declare class EpochTestSettler {
6
+ private l2BlockSource;
7
+ private log;
8
+ private options;
9
+ private rollupCheatCodes;
10
+ private epochMonitor?;
11
+ constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l2BlockSource: L2BlockSource, log: Logger, options: {
12
+ pollingIntervalMs: number;
13
+ provingDelayMs?: number;
14
+ });
15
+ start(): Promise<void>;
16
+ stop(): Promise<void>;
17
+ handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean>;
18
+ }
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXFDbEU7Q0FDRiJ9
@@ -0,0 +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"}