@aztec/aztec 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

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 (95) hide show
  1. package/README.md +1 -1
  2. package/dest/bin/index.d.ts +1 -1
  3. package/dest/bin/index.js +4 -3
  4. package/dest/cli/aztec_start_action.d.ts +1 -1
  5. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  6. package/dest/cli/aztec_start_action.js +8 -12
  7. package/dest/cli/aztec_start_options.d.ts +1 -1
  8. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  9. package/dest/cli/aztec_start_options.js +19 -30
  10. package/dest/cli/cli.d.ts +1 -1
  11. package/dest/cli/cli.d.ts.map +1 -1
  12. package/dest/cli/cli.js +46 -1
  13. package/dest/cli/cmds/start_archiver.d.ts +1 -1
  14. package/dest/cli/cmds/start_archiver.js +6 -6
  15. package/dest/cli/cmds/start_bot.d.ts +1 -1
  16. package/dest/cli/cmds/start_bot.js +1 -1
  17. package/dest/cli/cmds/start_node.d.ts +1 -1
  18. package/dest/cli/cmds/start_node.js +4 -4
  19. package/dest/cli/cmds/start_p2p_bootstrap.d.ts +1 -1
  20. package/dest/cli/cmds/start_p2p_bootstrap.js +1 -1
  21. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  22. package/dest/cli/cmds/start_prover_agent.js +1 -1
  23. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  24. package/dest/cli/cmds/start_prover_broker.js +2 -2
  25. package/dest/cli/cmds/start_prover_node.d.ts +1 -1
  26. package/dest/cli/cmds/start_prover_node.js +2 -2
  27. package/dest/cli/cmds/start_txe.d.ts +1 -1
  28. package/dest/cli/index.d.ts +1 -1
  29. package/dest/cli/preload_crs.d.ts +1 -1
  30. package/dest/cli/release_version.d.ts +1 -1
  31. package/dest/cli/util.d.ts +8 -8
  32. package/dest/cli/util.d.ts.map +1 -1
  33. package/dest/cli/util.js +2 -2
  34. package/dest/cli/versioning.d.ts +1 -1
  35. package/dest/examples/token.d.ts +1 -1
  36. package/dest/examples/token.js +1 -1
  37. package/dest/examples/util.d.ts +2 -2
  38. package/dest/examples/util.d.ts.map +1 -1
  39. package/dest/index.d.ts +2 -2
  40. package/dest/index.d.ts.map +1 -1
  41. package/dest/index.js +1 -1
  42. package/dest/local-network/banana_fpc.d.ts +10 -0
  43. package/dest/local-network/banana_fpc.d.ts.map +1 -0
  44. package/dest/{sandbox → local-network}/banana_fpc.js +1 -1
  45. package/dest/local-network/index.d.ts +4 -0
  46. package/dest/local-network/index.d.ts.map +1 -0
  47. package/dest/{sandbox → local-network}/index.js +1 -1
  48. package/dest/local-network/local-network.d.ts +72 -0
  49. package/dest/local-network/local-network.d.ts.map +1 -0
  50. package/dest/{sandbox/sandbox.js → local-network/local-network.js} +25 -26
  51. package/dest/local-network/sponsored_fpc.d.ts +5 -0
  52. package/dest/local-network/sponsored_fpc.d.ts.map +1 -0
  53. package/dest/mnemonic.d.ts +1 -1
  54. package/dest/splash.d.ts +1 -1
  55. package/dest/testing/anvil_test_watcher.d.ts +4 -4
  56. package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
  57. package/dest/testing/anvil_test_watcher.js +16 -14
  58. package/dest/testing/cheat_codes.d.ts +1 -3
  59. package/dest/testing/cheat_codes.d.ts.map +1 -1
  60. package/dest/testing/index.d.ts +1 -1
  61. package/package.json +38 -36
  62. package/src/bin/index.ts +5 -3
  63. package/src/cli/aztec_start_action.ts +8 -12
  64. package/src/cli/aztec_start_options.ts +19 -30
  65. package/src/cli/cli.ts +46 -1
  66. package/src/cli/cmds/start_archiver.ts +6 -6
  67. package/src/cli/cmds/start_bot.ts +1 -1
  68. package/src/cli/cmds/start_node.ts +4 -4
  69. package/src/cli/cmds/start_p2p_bootstrap.ts +1 -1
  70. package/src/cli/cmds/start_prover_agent.ts +1 -1
  71. package/src/cli/cmds/start_prover_broker.ts +2 -2
  72. package/src/cli/cmds/start_prover_node.ts +2 -2
  73. package/src/cli/util.ts +6 -6
  74. package/src/examples/token.ts +1 -1
  75. package/src/examples/util.ts +1 -1
  76. package/src/index.ts +2 -2
  77. package/src/{sandbox → local-network}/banana_fpc.ts +1 -1
  78. package/src/{sandbox → local-network}/index.ts +1 -1
  79. package/src/{sandbox/sandbox.ts → local-network/local-network.ts} +49 -69
  80. package/src/{sandbox → local-network}/sponsored_fpc.ts +3 -2
  81. package/src/testing/anvil_test_watcher.ts +16 -14
  82. package/src/testing/cheat_codes.ts +3 -2
  83. package/dest/cli/cmds/start_blob_sink.d.ts +0 -3
  84. package/dest/cli/cmds/start_blob_sink.d.ts.map +0 -1
  85. package/dest/cli/cmds/start_blob_sink.js +0 -33
  86. package/dest/sandbox/banana_fpc.d.ts +0 -10
  87. package/dest/sandbox/banana_fpc.d.ts.map +0 -1
  88. package/dest/sandbox/index.d.ts +0 -4
  89. package/dest/sandbox/index.d.ts.map +0 -1
  90. package/dest/sandbox/sandbox.d.ts +0 -74
  91. package/dest/sandbox/sandbox.d.ts.map +0 -1
  92. package/dest/sandbox/sponsored_fpc.d.ts +0 -4
  93. package/dest/sandbox/sponsored_fpc.d.ts.map +0 -1
  94. package/src/cli/cmds/start_blob_sink.ts +0 -57
  95. /package/dest/{sandbox → local-network}/sponsored_fpc.js +0 -0
@@ -13,7 +13,7 @@ const TRANSFER_AMOUNT = 33n;
13
13
  */ async function main() {
14
14
  logger.info('Running token contract test on HTTP interface.');
15
15
  const wallet = await TestWallet.create(node);
16
- // During sandbox setup we deploy a few accounts. Below we add them to our wallet.
16
+ // During local network setup we deploy a few accounts. Below we add them to our wallet.
17
17
  const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
18
18
  await wallet.createSchnorrAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);
19
19
  await wallet.createSchnorrAccount(bobInitialAccountData.secret, bobInitialAccountData.salt);
@@ -1,5 +1,5 @@
1
1
  import { EthAddress } from '@aztec/aztec.js/addresses';
2
- import type { ExtendedViemWalletClient } from '@aztec/ethereum';
2
+ import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
3
3
  import type { Abi, Narrow } from 'abitype';
4
4
  import type { Hex } from 'viem';
5
5
  /**
@@ -16,4 +16,4 @@ export declare function deployL1Contract(l1Client: ExtendedViemWalletClient, abi
16
16
  * @param ms - the number of milliseconds to sleep for
17
17
  */
18
18
  export declare function delay(ms: number): Promise<void>;
19
- //# sourceMappingURL=util.d.ts.map
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4YW1wbGVzL3V0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHdEUsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUMzQyxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEM7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FDcEMsUUFBUSxFQUFFLHdCQUF3QixFQUNsQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxDQUFDLEVBQ3JDLFFBQVEsRUFBRSxHQUFHLEVBQ2IsSUFBSSxHQUFFLFNBQVMsT0FBTyxFQUFPLEdBQzVCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FjckI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsS0FBSyxDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUvQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}
package/dest/index.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export { createSandbox, registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, registerDeployedSponsoredFPCInWalletAndGetAddress, } from './sandbox/index.js';
2
- //# sourceMappingURL=index.d.ts.map
1
+ export { createLocalNetwork, registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, registerDeployedSponsoredFPCInWalletAndGetAddress, } from './local-network/index.js';
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsa0JBQWtCLEVBQ2xCLCtDQUErQyxFQUMvQyw4Q0FBOEMsRUFDOUMsaURBQWlELEdBQ2xELE1BQU0sMEJBQTBCLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,+CAA+C,EAC/C,8CAA8C,EAC9C,iDAAiD,GAClD,MAAM,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,+CAA+C,EAC/C,8CAA8C,EAC9C,iDAAiD,GAClD,MAAM,0BAA0B,CAAC"}
package/dest/index.js CHANGED
@@ -1 +1 @@
1
- export { createSandbox, registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, registerDeployedSponsoredFPCInWalletAndGetAddress } from './sandbox/index.js';
1
+ export { createLocalNetwork, registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, registerDeployedSponsoredFPCInWalletAndGetAddress } from './local-network/index.js';
@@ -0,0 +1,10 @@
1
+ import { type InitialAccountData } from '@aztec/accounts/testing';
2
+ import type { Wallet } from '@aztec/aztec.js/wallet';
3
+ import type { LogFn } from '@aztec/foundation/log';
4
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
5
+ export declare function getBananaCoinAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
6
+ export declare function getBananaFPCAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
7
+ export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn): Promise<void>;
8
+ export declare function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
9
+ export declare function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuYW5hX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYmFuYW5hX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBOEIsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF3QjNELHdCQUFzQixvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUseUJBRS9FO0FBV0Qsd0JBQXNCLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSx5QkFFOUU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssaUJBY3JHO0FBRUQsd0JBQXNCLCtDQUErQyxDQUFDLE1BQU0sRUFBRSxNQUFNLHlCQU1uRjtBQUVELHdCQUFzQiw4Q0FBOEMsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFNbEYifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAAC,eAAe,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAcrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}
@@ -1,5 +1,5 @@
1
1
  import { getInitialTestAccountsData } from '@aztec/accounts/testing';
2
- import { Fr } from '@aztec/foundation/fields';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
3
3
  import { FPCContract } from '@aztec/noir-contracts.js/FPC';
4
4
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
5
5
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -0,0 +1,4 @@
1
+ export * from './local-network.js';
2
+ export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, } from './banana_fpc.js';
3
+ export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2NhbC1uZXR3b3JrL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFFbkMsT0FBTyxFQUNMLCtDQUErQyxFQUMvQyw4Q0FBOEMsR0FDL0MsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQUUsaURBQWlELEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/local-network/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EACL,+CAA+C,EAC/C,8CAA8C,GAC/C,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iDAAiD,EAAE,MAAM,oBAAoB,CAAC"}
@@ -1,3 +1,3 @@
1
- export * from './sandbox.js';
1
+ export * from './local-network.js';
2
2
  export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress } from './banana_fpc.js';
3
3
  export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
@@ -0,0 +1,72 @@
1
+ #!/usr/bin/env -S node --no-warnings
2
+ import { AztecNodeService } from '@aztec/aztec-node';
3
+ import { type AztecNodeConfig } from '@aztec/aztec-node/config';
4
+ import { Fr } from '@aztec/aztec.js/fields';
5
+ import { type BlobClientInterface } from '@aztec/blob-client/client';
6
+ import { EthAddress } from '@aztec/foundation/eth-address';
7
+ import type { LogFn } from '@aztec/foundation/log';
8
+ import { DateProvider } from '@aztec/foundation/timer';
9
+ import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
10
+ import { type TelemetryClient } from '@aztec/telemetry-client';
11
+ import { type Hex } from 'viem';
12
+ /**
13
+ * Function to deploy our L1 contracts to the local network L1
14
+ * @param aztecNodeConfig - The Aztec Node Config
15
+ * @param hdAccount - Account for publishing L1 contracts
16
+ */
17
+ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, privateKey: Hex, opts?: {
18
+ assumeProvenThroughBlockNumber?: number;
19
+ genesisArchiveRoot?: Fr;
20
+ feeJuicePortalInitialBalance?: bigint;
21
+ }): Promise<{
22
+ coinIssuerAddress: EthAddress;
23
+ feeJuiceAddress: EthAddress;
24
+ feeJuicePortalAddress: EthAddress;
25
+ governanceAddress: EthAddress;
26
+ governanceProposerAddress: EthAddress;
27
+ inboxAddress: EthAddress;
28
+ outboxAddress: EthAddress;
29
+ registryAddress: EthAddress;
30
+ rewardDistributorAddress: EthAddress;
31
+ rollupAddress: EthAddress;
32
+ stakingAssetAddress: EthAddress;
33
+ } & {
34
+ slashFactoryAddress?: EthAddress | undefined;
35
+ feeAssetHandlerAddress?: EthAddress | undefined;
36
+ stakingAssetHandlerAddress?: EthAddress | undefined;
37
+ zkPassportVerifierAddress?: EthAddress | undefined;
38
+ gseAddress?: EthAddress | undefined;
39
+ dateGatedRelayerAddress?: EthAddress | undefined;
40
+ } & {
41
+ rollupAddress: EthAddress;
42
+ } & {
43
+ rollupAddress: EthAddress;
44
+ }>;
45
+ /** Local network settings. */
46
+ export type LocalNetworkConfig = AztecNodeConfig & {
47
+ /** Mnemonic used to derive the L1 deployer private key.*/
48
+ l1Mnemonic: string;
49
+ /** Whether to deploy test accounts on local network start.*/
50
+ testAccounts: boolean;
51
+ };
52
+ /**
53
+ * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
54
+ * Does not start any HTTP services nor populate any initial accounts.
55
+ * @param config - Optional local network settings.
56
+ */
57
+ export declare function createLocalNetwork(config: Partial<LocalNetworkConfig> | undefined, userLog: LogFn): Promise<{
58
+ node: AztecNodeService;
59
+ stop: () => Promise<void>;
60
+ }>;
61
+ /**
62
+ * Create and start a new Aztec RPC HTTP Server
63
+ * @param config - Optional Aztec node settings.
64
+ */
65
+ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?: {
66
+ telemetry?: TelemetryClient;
67
+ blobClient?: BlobClientInterface;
68
+ dateProvider?: DateProvider;
69
+ }, options?: {
70
+ prefilledPublicData?: PublicDataTreeLeaf[];
71
+ }): Promise<AztecNodeService>;
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUd6RSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUlqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBY3pGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osOEJBQThCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDeEMsa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBK0doRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUFFLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQUMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFBO0NBQU8sRUFDekcsT0FBTyxHQUFFO0lBQUUsbUJBQW1CLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxDQUFBO0NBQU8sNkJBVzdEIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAczF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAoBP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GA+GhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACzG,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
@@ -1,14 +1,19 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
2
  import { getInitialTestAccountsData } from '@aztec/accounts/testing';
3
- import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
4
- import { EthAddress } from '@aztec/aztec.js/addresses';
5
- import { createBlobSinkClient } from '@aztec/blob-sink/client';
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';
6
8
  import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
7
- 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';
8
14
  import { EthCheatCodes } from '@aztec/ethereum/test';
9
15
  import { SecretValue } from '@aztec/foundation/config';
10
- import { Fr } from '@aztec/foundation/fields';
11
- import { createLogger } from '@aztec/foundation/log';
16
+ import { EthAddress } from '@aztec/foundation/eth-address';
12
17
  import { TestDateProvider } from '@aztec/foundation/timer';
13
18
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
14
19
  import { protocolContractsHash } from '@aztec/protocol-contracts';
@@ -23,30 +28,25 @@ import { DefaultMnemonic } from '../mnemonic.js';
23
28
  import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
24
29
  import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
25
30
  import { getSponsoredFPCAddress } from './sponsored_fpc.js';
26
- const logger = createLogger('sandbox');
31
+ const logger = createLogger('local-network');
27
32
  const localAnvil = foundry;
28
33
  /**
29
- * Function to deploy our L1 contracts to the sandbox L1
34
+ * Function to deploy our L1 contracts to the local network L1
30
35
  * @param aztecNodeConfig - The Aztec Node Config
31
36
  * @param hdAccount - Account for publishing L1 contracts
32
- */ export async function deployContractsToL1(aztecNodeConfig, hdAccount, contractDeployLogger = logger, opts = {}) {
33
- const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain(aztecNodeConfig.l1RpcUrls, aztecNodeConfig.l1ChainId) : {
34
- chainInfo: localAnvil
35
- };
37
+ */ export async function deployContractsToL1(aztecNodeConfig, privateKey, opts = {}) {
36
38
  await waitForPublicClient(aztecNodeConfig);
37
- const l1Contracts = await deployL1Contracts(aztecNodeConfig.l1RpcUrls, hdAccount, chain.chainInfo, contractDeployLogger, {
39
+ const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
38
40
  ...getL1ContractsConfigEnvVars(),
39
41
  ...aztecNodeConfig,
40
42
  vkTreeRoot: getVKTreeRoot(),
41
43
  protocolContractsHash,
42
44
  genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
43
- salt: opts.salt,
44
45
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
45
46
  aztecTargetCommitteeSize: 0,
46
47
  slasherFlavor: 'none',
47
48
  realVerifier: false
48
49
  });
49
- await deployMulticall3(l1Contracts.l1Client, logger);
50
50
  aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
51
51
  aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
52
52
  return aztecNodeConfig.l1Contracts;
@@ -54,15 +54,15 @@ const localAnvil = foundry;
54
54
  /**
55
55
  * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
56
56
  * Does not start any HTTP services nor populate any initial accounts.
57
- * @param config - Optional Sandbox settings.
58
- */ export async function createSandbox(config = {}, userLog) {
59
- // sandbox is meant for test envs. We should only need one l1RpcUrl
57
+ * @param config - Optional local network settings.
58
+ */ export async function createLocalNetwork(config = {}, userLog) {
59
+ // local network is meant for test envs. We should only need one l1RpcUrl
60
60
  const l1RpcUrl = config.l1RpcUrls?.[0];
61
61
  if (!l1RpcUrl) {
62
62
  throw new Error('An L1 RPC URL is required');
63
63
  }
64
64
  if ((config.l1RpcUrls?.length || 0) > 1) {
65
- logger.warn(`Multiple L1 RPC URLs provided. Sandbox will only use the first one: ${l1RpcUrl}`);
65
+ logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
66
66
  }
67
67
  const aztecNodeConfig = {
68
68
  ...getConfigEnvVars(),
@@ -104,10 +104,9 @@ const localAnvil = foundry;
104
104
  let watcher = undefined;
105
105
  const dateProvider = new TestDateProvider();
106
106
  if (!aztecNodeConfig.p2pEnabled) {
107
- const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, hdAccount, undefined, {
107
+ const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
108
108
  assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
109
109
  genesisArchiveRoot,
110
- salt: config.deployAztecContractsSalt ? parseInt(config.deployAztecContractsSalt) : undefined,
111
110
  feeJuicePortalInitialBalance: fundingNeeded
112
111
  });
113
112
  const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
@@ -124,15 +123,15 @@ const localAnvil = foundry;
124
123
  watcher = new AnvilTestWatcher(new EthCheatCodes([
125
124
  l1RpcUrl
126
125
  ], dateProvider), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
127
- watcher.setIsSandbox(true);
126
+ watcher.setisLocalNetwork(true);
128
127
  await watcher.start();
129
128
  }
130
- const telemetry = initTelemetryClient(getTelemetryClientConfig());
131
- // Create a local blob sink client inside the sandbox, no http connectivity
132
- const blobSinkClient = createBlobSinkClient();
129
+ const telemetry = await initTelemetryClient(getTelemetryClientConfig());
130
+ // Create a local blob client client inside the local network, no http connectivity
131
+ const blobClient = createBlobClient();
133
132
  const node = await createAztecNode(aztecNodeConfig, {
134
133
  telemetry,
135
- blobSinkClient,
134
+ blobClient,
136
135
  dateProvider
137
136
  }, {
138
137
  prefilledPublicData
@@ -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,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;
@@ -23,7 +23,7 @@ export declare class AnvilTestWatcher {
23
23
  private isMarkingAsProven;
24
24
  constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
25
25
  setIsMarkingAsProven(isMarkingAsProven: boolean): void;
26
- setIsSandbox(isSandbox: boolean): void;
26
+ setisLocalNetwork(isLocalNetwork: boolean): void;
27
27
  start(): Promise<void>;
28
28
  stop(): Promise<void>;
29
29
  trigger(): Promise<void>;
@@ -31,4 +31,4 @@ export declare class AnvilTestWatcher {
31
31
  syncDateProviderToL1IfBehind(): Promise<void>;
32
32
  warpTimeIfNeeded(): Promise<void>;
33
33
  }
34
- //# sourceMappingURL=anvil_test_watcher.d.ts.map
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQWdCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQWxCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBa0I7SUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRS9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUTtJQUVqQyxZQUNVLFVBQVUsRUFBRSxhQUFhLEVBQ2pDLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFFBQVEsRUFBRSxVQUFVLEVBQ1osWUFBWSxDQUFDLDhCQUFrQixFQWF4QztJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sUUFHOUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsT0FBTyxRQUV4QztJQUVLLEtBQUssa0JBeUJWO0lBRUssSUFBSSxrQkFJVDtJQUVLLE9BQU8sa0JBSVo7SUFFSyxZQUFZLGtCQUtqQjtJQUVLLDRCQUE0QixrQkFlakM7SUFFSyxnQkFBZ0Isa0JBd0NyQjtDQUNGIn0=
@@ -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;IAK/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IA2BL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,4BAA4B;IAiB5B,gBAAgB;CAwCvB"}
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;IAgBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAlBvB,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;IAEjC,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;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAejC;IAEK,gBAAgB,kBAwCrB;CACF"}
@@ -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;
@@ -24,7 +25,7 @@ import { getAddress, getContract } from 'viem';
24
25
  constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
25
26
  this.cheatcodes = cheatcodes;
26
27
  this.dateProvider = dateProvider;
27
- this.isSandbox = false;
28
+ this.isLocalNetwork = false;
28
29
  this.logger = createLogger(`aztecjs:utils:watcher`);
29
30
  this.isMarkingAsProven = true;
30
31
  this.rollup = getContract({
@@ -41,8 +42,8 @@ import { getAddress, getContract } from 'viem';
41
42
  this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
42
43
  this.isMarkingAsProven = isMarkingAsProven;
43
44
  }
44
- setIsSandbox(isSandbox) {
45
- this.isSandbox = isSandbox;
45
+ setisLocalNetwork(isLocalNetwork) {
46
+ this.isLocalNetwork = isLocalNetwork;
46
47
  }
47
48
  async start() {
48
49
  if (this.filledRunningPromise) {
@@ -52,7 +53,7 @@ import { getAddress, getContract } from 'viem';
52
53
  this.l2SlotDuration = config.slotDuration;
53
54
  // If auto mining is not supported (e.g., we are on a real network), then we
54
55
  // will simple do nothing. But if on an anvil or the like, this make sure that
55
- // the sandbox and tests don't break because time is frozen and we never get to
56
+ // the local network and tests don't break because time is frozen and we never get to
56
57
  // the next slot.
57
58
  const isAutoMining = await this.cheatcodes.isAutoMining();
58
59
  if (isAutoMining) {
@@ -84,7 +85,7 @@ import { getAddress, getContract } from 'viem';
84
85
  await this.rollupCheatCodes.markAsProven();
85
86
  }
86
87
  async syncDateProviderToL1IfBehind() {
87
- // this doesn't apply to the sandbox, because we don't have a date provider in the sandbox
88
+ // this doesn't apply to the local network, because we don't have a date provider in the local network
88
89
  if (!this.dateProvider) {
89
90
  return;
90
91
  }
@@ -100,15 +101,16 @@ import { getAddress, getContract } from 'viem';
100
101
  }
101
102
  async warpTimeIfNeeded() {
102
103
  try {
103
- const currentSlot = await this.rollup.read.getCurrentSlot();
104
- const pendingBlockNumber = BigInt(await this.rollup.read.getPendingBlockNumber());
105
- const blockLog = await this.rollup.read.getBlock([
106
- pendingBlockNumber
104
+ const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
105
+ const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
106
+ const checkpointLog = await this.rollup.read.getCheckpoint([
107
+ pendingCheckpointNumber
107
108
  ]);
109
+ const nextSlot = SlotNumber(currentSlot + 1);
108
110
  const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
109
- currentSlot + 1n
111
+ BigInt(nextSlot)
110
112
  ]));
111
- if (currentSlot === blockLog.slotNumber) {
113
+ if (BigInt(currentSlot) === checkpointLog.slotNumber) {
112
114
  // We should jump to the next slot
113
115
  try {
114
116
  await this.cheatcodes.warp(nextSlotTimestamp, {
@@ -120,8 +122,8 @@ import { getAddress, getContract } from 'viem';
120
122
  this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
121
123
  return;
122
124
  }
123
- // If we are not in sandbox, we don't need to warp time
124
- if (!this.isSandbox) {
125
+ // If we are not in local network, we don't need to warp time
126
+ if (!this.isLocalNetwork) {
125
127
  return;
126
128
  }
127
129
  const currentTimestamp = this.dateProvider?.now() ?? Date.now();
@@ -9,9 +9,7 @@ import type { AztecNode } from '@aztec/stdlib/interfaces/client';
9
9
  * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
10
10
  */
11
11
  export declare class CheatCodes {
12
- /** Cheat codes for L1.*/
13
12
  eth: EthCheatCodes;
14
- /** Cheat codes for the Aztec Rollup contract on L1. */
15
13
  rollup: RollupCheatCodes;
16
14
  constructor(
17
15
  /** Cheat codes for L1.*/
@@ -40,4 +38,4 @@ export declare class CheatCodes {
40
38
  */
41
39
  warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
42
40
  }
43
- //# sourceMappingURL=cheat_codes.d.ts.map
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFHWixHQUFHLEVBQUUsYUFBYTtJQUVsQixNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==
@@ -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;AAEvE,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;;IAH/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IASxG;;;;;;;;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;IAGZ,GAAG,EAAE,aAAa;IAElB,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,4 +1,4 @@
1
1
  export { AnvilTestWatcher } from './anvil_test_watcher.js';
2
2
  export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
3
3
  export { CheatCodes } from './cheat_codes.js';
4
- //# sourceMappingURL=index.d.ts.map
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/aztec",
3
- "version": "0.0.1-commit.b655e406",
3
+ "version": "0.0.1-commit.c7c42ec",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -15,12 +15,12 @@
15
15
  "tsconfig": "./tsconfig.json"
16
16
  },
17
17
  "scripts": {
18
- "build": "yarn clean && tsc -b",
18
+ "build": "yarn clean && ../scripts/tsc.sh",
19
19
  "start": "node --no-warnings ./dest/bin",
20
20
  "start:debug": "node --inspect=0.0.0.0:9221 --no-warnings ./dest/bin",
21
- "start:sandbox": "ETHEREUM_HOSTS=http://0.0.0.0:8545/ && yarn start start --sandbox",
21
+ "start:local-network": "ETHEREUM_HOSTS=http://0.0.0.0:8545/ && yarn start start --local-network",
22
22
  "clean": "rm -rf ./dest .tsbuildinfo",
23
- "build:dev": "tsc -b --watch",
23
+ "build:dev": "../scripts/tsc.sh --watch",
24
24
  "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
25
25
  "run:example:token": "LOG_LEVEL='verbose' node ./dest/examples/token.js"
26
26
  },
@@ -28,44 +28,45 @@
28
28
  "../package.common.json"
29
29
  ],
30
30
  "dependencies": {
31
- "@aztec/accounts": "0.0.1-commit.b655e406",
32
- "@aztec/archiver": "0.0.1-commit.b655e406",
33
- "@aztec/aztec-faucet": "0.0.1-commit.b655e406",
34
- "@aztec/aztec-node": "0.0.1-commit.b655e406",
35
- "@aztec/aztec.js": "0.0.1-commit.b655e406",
36
- "@aztec/bb-prover": "0.0.1-commit.b655e406",
37
- "@aztec/bb.js": "0.0.1-commit.b655e406",
38
- "@aztec/blob-sink": "0.0.1-commit.b655e406",
39
- "@aztec/bot": "0.0.1-commit.b655e406",
40
- "@aztec/builder": "0.0.1-commit.b655e406",
41
- "@aztec/cli": "0.0.1-commit.b655e406",
42
- "@aztec/constants": "0.0.1-commit.b655e406",
43
- "@aztec/entrypoints": "0.0.1-commit.b655e406",
44
- "@aztec/ethereum": "0.0.1-commit.b655e406",
45
- "@aztec/foundation": "0.0.1-commit.b655e406",
46
- "@aztec/kv-store": "0.0.1-commit.b655e406",
47
- "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
48
- "@aztec/node-lib": "0.0.1-commit.b655e406",
49
- "@aztec/noir-contracts.js": "0.0.1-commit.b655e406",
50
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b655e406",
51
- "@aztec/p2p": "0.0.1-commit.b655e406",
52
- "@aztec/p2p-bootstrap": "0.0.1-commit.b655e406",
53
- "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
54
- "@aztec/prover-client": "0.0.1-commit.b655e406",
55
- "@aztec/prover-node": "0.0.1-commit.b655e406",
56
- "@aztec/pxe": "0.0.1-commit.b655e406",
57
- "@aztec/stdlib": "0.0.1-commit.b655e406",
58
- "@aztec/telemetry-client": "0.0.1-commit.b655e406",
59
- "@aztec/test-wallet": "0.0.1-commit.b655e406",
60
- "@aztec/txe": "0.0.1-commit.b655e406",
61
- "@aztec/world-state": "0.0.1-commit.b655e406",
31
+ "@aztec/accounts": "0.0.1-commit.c7c42ec",
32
+ "@aztec/archiver": "0.0.1-commit.c7c42ec",
33
+ "@aztec/aztec-faucet": "0.0.1-commit.c7c42ec",
34
+ "@aztec/aztec-node": "0.0.1-commit.c7c42ec",
35
+ "@aztec/aztec.js": "0.0.1-commit.c7c42ec",
36
+ "@aztec/bb-prover": "0.0.1-commit.c7c42ec",
37
+ "@aztec/bb.js": "0.0.1-commit.c7c42ec",
38
+ "@aztec/blob-client": "0.0.1-commit.c7c42ec",
39
+ "@aztec/bot": "0.0.1-commit.c7c42ec",
40
+ "@aztec/builder": "0.0.1-commit.c7c42ec",
41
+ "@aztec/cli": "0.0.1-commit.c7c42ec",
42
+ "@aztec/constants": "0.0.1-commit.c7c42ec",
43
+ "@aztec/entrypoints": "0.0.1-commit.c7c42ec",
44
+ "@aztec/ethereum": "0.0.1-commit.c7c42ec",
45
+ "@aztec/foundation": "0.0.1-commit.c7c42ec",
46
+ "@aztec/kv-store": "0.0.1-commit.c7c42ec",
47
+ "@aztec/l1-artifacts": "0.0.1-commit.c7c42ec",
48
+ "@aztec/node-lib": "0.0.1-commit.c7c42ec",
49
+ "@aztec/noir-contracts.js": "0.0.1-commit.c7c42ec",
50
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.c7c42ec",
51
+ "@aztec/p2p": "0.0.1-commit.c7c42ec",
52
+ "@aztec/p2p-bootstrap": "0.0.1-commit.c7c42ec",
53
+ "@aztec/protocol-contracts": "0.0.1-commit.c7c42ec",
54
+ "@aztec/prover-client": "0.0.1-commit.c7c42ec",
55
+ "@aztec/prover-node": "0.0.1-commit.c7c42ec",
56
+ "@aztec/pxe": "0.0.1-commit.c7c42ec",
57
+ "@aztec/sequencer-client": "0.0.1-commit.c7c42ec",
58
+ "@aztec/stdlib": "0.0.1-commit.c7c42ec",
59
+ "@aztec/telemetry-client": "0.0.1-commit.c7c42ec",
60
+ "@aztec/test-wallet": "0.0.1-commit.c7c42ec",
61
+ "@aztec/txe": "0.0.1-commit.c7c42ec",
62
+ "@aztec/world-state": "0.0.1-commit.c7c42ec",
62
63
  "@types/chalk": "^2.2.0",
63
64
  "abitype": "^0.8.11",
64
65
  "chalk": "^5.3.0",
65
66
  "commander": "^12.1.0",
66
67
  "koa": "^2.16.1",
67
68
  "koa-router": "^13.1.1",
68
- "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
69
+ "viem": "npm:@aztec/viem@2.38.2"
69
70
  },
70
71
  "files": [
71
72
  "dest",
@@ -77,6 +78,7 @@
77
78
  "@jest/globals": "^30.0.0",
78
79
  "@types/jest": "^30.0.0",
79
80
  "@types/koa": "^2.15.0",
81
+ "@typescript/native-preview": "7.0.0-dev.20251126.1",
80
82
  "jest": "^30.0.0",
81
83
  "ts-node": "^10.9.1",
82
84
  "typescript": "^5.3.3"
package/src/bin/index.ts CHANGED
@@ -2,7 +2,8 @@
2
2
  //
3
3
  import { injectCommands as injectBuilderCommands } from '@aztec/builder';
4
4
  import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
5
- import { enrichEnvironmentWithChainConfig, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
5
+ import { enrichEnvironmentWithChainName } from '@aztec/cli/config/chain';
6
+ import { enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config/network';
6
7
  import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
7
8
  import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
8
9
  import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
@@ -13,10 +14,11 @@ import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
13
14
 
14
15
  import { Command } from 'commander';
15
16
 
16
- import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
17
17
  import { injectAztecCommands } from '../cli/index.js';
18
18
  import { getCliVersion } from '../cli/release_version.js';
19
19
 
20
+ const NETWORK_FLAG = 'network';
21
+
20
22
  const userLog = createConsoleLogger();
21
23
  const debugLogger = createLogger('cli');
22
24
 
@@ -40,7 +42,7 @@ async function main() {
40
42
 
41
43
  const networkName = getActiveNetworkName(networkValue);
42
44
  await enrichEnvironmentWithNetworkConfig(networkName);
43
- enrichEnvironmentWithChainConfig(networkName);
45
+ enrichEnvironmentWithChainName(networkName);
44
46
 
45
47
  const cliVersion = getCliVersion();
46
48
  let program = new Command('aztec');