@aztec/aztec 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

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 (131) hide show
  1. package/README.md +1 -1
  2. package/dest/bin/index.d.ts +1 -1
  3. package/dest/bin/index.js +9 -9
  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 +10 -25
  7. package/dest/cli/aztec_start_options.d.ts +2 -2
  8. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  9. package/dest/cli/aztec_start_options.js +115 -231
  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.d.ts.map +1 -1
  15. package/dest/cli/cmds/start_archiver.js +4 -4
  16. package/dest/cli/cmds/start_blob_sink.d.ts +1 -1
  17. package/dest/cli/cmds/start_blob_sink.d.ts.map +1 -1
  18. package/dest/cli/cmds/start_blob_sink.js +2 -2
  19. package/dest/cli/cmds/start_bot.d.ts +4 -7
  20. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  21. package/dest/cli/cmds/start_bot.js +25 -14
  22. package/dest/cli/cmds/start_node.d.ts +1 -1
  23. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  24. package/dest/cli/cmds/start_node.js +13 -30
  25. package/dest/cli/cmds/start_p2p_bootstrap.d.ts +1 -1
  26. package/dest/cli/cmds/start_p2p_bootstrap.js +1 -1
  27. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  28. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  29. package/dest/cli/cmds/start_prover_agent.js +11 -2
  30. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  31. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  32. package/dest/cli/cmds/start_prover_broker.js +8 -3
  33. package/dest/cli/cmds/start_prover_node.d.ts +1 -1
  34. package/dest/cli/cmds/start_prover_node.d.ts.map +1 -1
  35. package/dest/cli/cmds/start_prover_node.js +17 -12
  36. package/dest/cli/cmds/start_txe.d.ts +1 -1
  37. package/dest/cli/index.d.ts +1 -1
  38. package/dest/cli/preload_crs.d.ts +1 -1
  39. package/dest/cli/release_version.d.ts +1 -1
  40. package/dest/cli/util.d.ts +12 -10
  41. package/dest/cli/util.d.ts.map +1 -1
  42. package/dest/cli/util.js +13 -13
  43. package/dest/cli/versioning.d.ts +1 -1
  44. package/dest/cli/versioning.js +3 -3
  45. package/dest/examples/token.d.ts +1 -1
  46. package/dest/examples/token.js +18 -16
  47. package/dest/examples/util.d.ts +3 -3
  48. package/dest/examples/util.d.ts.map +1 -1
  49. package/dest/examples/util.js +1 -1
  50. package/dest/index.d.ts +2 -2
  51. package/dest/index.d.ts.map +1 -1
  52. package/dest/index.js +1 -1
  53. package/dest/local-network/banana_fpc.d.ts +10 -0
  54. package/dest/local-network/banana_fpc.d.ts.map +1 -0
  55. package/dest/{sandbox → local-network}/banana_fpc.js +15 -19
  56. package/dest/local-network/index.d.ts +4 -0
  57. package/dest/local-network/index.d.ts.map +1 -0
  58. package/dest/local-network/index.js +3 -0
  59. package/dest/local-network/local-network.d.ts +74 -0
  60. package/dest/local-network/local-network.d.ts.map +1 -0
  61. package/dest/{sandbox/sandbox.js → local-network/local-network.js} +35 -43
  62. package/dest/local-network/sponsored_fpc.d.ts +5 -0
  63. package/dest/local-network/sponsored_fpc.d.ts.map +1 -0
  64. package/dest/{sandbox → local-network}/sponsored_fpc.js +7 -8
  65. package/dest/mnemonic.d.ts +1 -1
  66. package/dest/splash.d.ts +1 -1
  67. package/dest/testing/anvil_test_watcher.d.ts +4 -4
  68. package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
  69. package/dest/testing/anvil_test_watcher.js +19 -18
  70. package/dest/testing/cheat_codes.d.ts +7 -10
  71. package/dest/testing/cheat_codes.d.ts.map +1 -1
  72. package/dest/testing/cheat_codes.js +9 -10
  73. package/dest/testing/index.d.ts +1 -2
  74. package/dest/testing/index.d.ts.map +1 -1
  75. package/dest/testing/index.js +0 -1
  76. package/package.json +38 -36
  77. package/src/bin/index.ts +9 -9
  78. package/src/cli/aztec_start_action.ts +10 -22
  79. package/src/cli/aztec_start_options.ts +124 -238
  80. package/src/cli/cli.ts +46 -1
  81. package/src/cli/cmds/start_archiver.ts +4 -4
  82. package/src/cli/cmds/start_blob_sink.ts +2 -2
  83. package/src/cli/cmds/start_bot.ts +36 -13
  84. package/src/cli/cmds/start_node.ts +16 -27
  85. package/src/cli/cmds/start_p2p_bootstrap.ts +1 -1
  86. package/src/cli/cmds/start_prover_agent.ts +7 -2
  87. package/src/cli/cmds/start_prover_broker.ts +17 -3
  88. package/src/cli/cmds/start_prover_node.ts +14 -14
  89. package/src/cli/util.ts +21 -18
  90. package/src/cli/versioning.ts +3 -3
  91. package/src/examples/token.ts +20 -17
  92. package/src/examples/util.ts +2 -2
  93. package/src/index.ts +5 -5
  94. package/src/{sandbox → local-network}/banana_fpc.ts +16 -21
  95. package/src/local-network/index.ts +7 -0
  96. package/src/{sandbox/sandbox.ts → local-network/local-network.ts} +42 -55
  97. package/src/local-network/sponsored_fpc.ts +26 -0
  98. package/src/testing/anvil_test_watcher.ts +18 -19
  99. package/src/testing/cheat_codes.ts +13 -13
  100. package/src/testing/index.ts +0 -1
  101. package/dest/cli/chain_l2_config.d.ts +0 -31
  102. package/dest/cli/chain_l2_config.d.ts.map +0 -1
  103. package/dest/cli/chain_l2_config.js +0 -261
  104. package/dest/cli/cmds/start_faucet.d.ts +0 -4
  105. package/dest/cli/cmds/start_faucet.d.ts.map +0 -1
  106. package/dest/cli/cmds/start_faucet.js +0 -20
  107. package/dest/cli/cmds/start_pxe.d.ts +0 -16
  108. package/dest/cli/cmds/start_pxe.d.ts.map +0 -1
  109. package/dest/cli/cmds/start_pxe.js +0 -31
  110. package/dest/cli/get_l1_config.d.ts +0 -7
  111. package/dest/cli/get_l1_config.d.ts.map +0 -1
  112. package/dest/cli/get_l1_config.js +0 -13
  113. package/dest/sandbox/banana_fpc.d.ts +0 -11
  114. package/dest/sandbox/banana_fpc.d.ts.map +0 -1
  115. package/dest/sandbox/index.d.ts +0 -4
  116. package/dest/sandbox/index.d.ts.map +0 -1
  117. package/dest/sandbox/index.js +0 -3
  118. package/dest/sandbox/sandbox.d.ts +0 -83
  119. package/dest/sandbox/sandbox.d.ts.map +0 -1
  120. package/dest/sandbox/sponsored_fpc.d.ts +0 -4
  121. package/dest/sandbox/sponsored_fpc.d.ts.map +0 -1
  122. package/dest/testing/aztec_cheat_codes.d.ts +0 -59
  123. package/dest/testing/aztec_cheat_codes.d.ts.map +0 -1
  124. package/dest/testing/aztec_cheat_codes.js +0 -62
  125. package/src/cli/chain_l2_config.ts +0 -341
  126. package/src/cli/cmds/start_faucet.ts +0 -34
  127. package/src/cli/cmds/start_pxe.ts +0 -49
  128. package/src/cli/get_l1_config.ts +0 -19
  129. package/src/sandbox/index.ts +0 -4
  130. package/src/sandbox/sponsored_fpc.ts +0 -27
  131. package/src/testing/aztec_cheat_codes.ts +0 -77
@@ -1,49 +1,51 @@
1
- import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
2
- import { createPXEClient } from '@aztec/aztec.js';
1
+ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
2
+ import { createAztecNodeClient } from '@aztec/aztec.js/node';
3
3
  import { createLogger } from '@aztec/foundation/log';
4
4
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
5
+ import { TestWallet } from '@aztec/test-wallet/server';
5
6
  const logger = createLogger('example:token');
6
- const url = 'http://localhost:8080';
7
- const pxe = createPXEClient(url);
7
+ const nodeUrl = 'http://localhost:8080';
8
+ const node = createAztecNodeClient(nodeUrl);
8
9
  const ALICE_MINT_BALANCE = 333n;
9
10
  const TRANSFER_AMOUNT = 33n;
10
11
  /**
11
12
  * Main function.
12
13
  */ async function main() {
13
14
  logger.info('Running token contract test on HTTP interface.');
14
- const [aliceWallet, bobWallet] = await getDeployedTestAccountsWallets(pxe);
15
- const alice = aliceWallet.getAddress();
16
- const bob = bobWallet.getAddress();
15
+ const wallet = await TestWallet.create(node);
16
+ // During local network setup we deploy a few accounts. Below we add them to our wallet.
17
+ const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
18
+ await wallet.createSchnorrAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);
19
+ await wallet.createSchnorrAccount(bobInitialAccountData.secret, bobInitialAccountData.salt);
20
+ const alice = aliceInitialAccountData.address;
21
+ const bob = bobInitialAccountData.address;
17
22
  logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);
18
23
  logger.info('Deploying Token...');
19
- const token = await TokenContract.deploy(aliceWallet, alice, 'TokenName', 'TokenSymbol', 18).send({
24
+ const token = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
20
25
  from: alice
21
26
  }).deployed();
22
27
  logger.info('Token deployed');
23
- // Create the contract abstraction and link it to Alice's and Bob's wallet for future signing
24
- const tokenAlice = await TokenContract.at(token.address, aliceWallet);
25
- const tokenBob = await TokenContract.at(token.address, bobWallet);
26
28
  // Mint tokens to Alice
27
29
  logger.info(`Minting ${ALICE_MINT_BALANCE} more coins to Alice...`);
28
- await tokenAlice.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({
30
+ await token.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({
29
31
  from: alice
30
32
  }).wait();
31
33
  logger.info(`${ALICE_MINT_BALANCE} tokens were successfully minted by Alice and transferred to private`);
32
- const balanceAfterMint = await tokenAlice.methods.balance_of_private(alice).simulate({
34
+ const balanceAfterMint = await token.methods.balance_of_private(alice).simulate({
33
35
  from: alice
34
36
  });
35
37
  logger.info(`Tokens successfully minted. New Alice's balance: ${balanceAfterMint}`);
36
38
  // We will now transfer tokens from Alice to Bob
37
39
  logger.info(`Transferring ${TRANSFER_AMOUNT} tokens from Alice to Bob...`);
38
- await tokenAlice.methods.transfer(bob, TRANSFER_AMOUNT).send({
40
+ await token.methods.transfer(bob, TRANSFER_AMOUNT).send({
39
41
  from: alice
40
42
  }).wait();
41
43
  // Check the new balances
42
- const aliceBalance = await tokenAlice.methods.balance_of_private(alice).simulate({
44
+ const aliceBalance = await token.methods.balance_of_private(alice).simulate({
43
45
  from: alice
44
46
  });
45
47
  logger.info(`Alice's balance ${aliceBalance}`);
46
- const bobBalance = await tokenBob.methods.balance_of_private(bob).simulate({
48
+ const bobBalance = await token.methods.balance_of_private(bob).simulate({
47
49
  from: bob
48
50
  });
49
51
  logger.info(`Bob's balance ${bobBalance}`);
@@ -1,5 +1,5 @@
1
- import { EthAddress } from '@aztec/aztec.js';
2
- import type { ExtendedViemWalletClient } from '@aztec/ethereum';
1
+ import { EthAddress } from '@aztec/aztec.js/addresses';
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,iBAAiB,CAAC;AAC7C,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"}
@@ -1,4 +1,4 @@
1
- import { EthAddress } from '@aztec/aztec.js';
1
+ import { EthAddress } from '@aztec/aztec.js/addresses';
2
2
  import { jsonStringify } from '@aztec/foundation/json-rpc';
3
3
  /**
4
4
  * Helper function to deploy ETH contracts.
package/dest/index.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export { createSandbox, getDeployedBananaCoinAddress, getDeployedBananaFPCAddress, getDeployedSponsoredFPCAddress, } 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,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,GAC/B,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, getDeployedBananaCoinAddress, getDeployedBananaFPCAddress, getDeployedSponsoredFPCAddress } 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
- import { getInitialTestAccounts } from '@aztec/accounts/testing';
2
- import { Fr } from '@aztec/foundation/fields';
1
+ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
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';
@@ -43,16 +43,16 @@ async function getBananaFPCInstance(initialAccounts) {
43
43
  export async function getBananaFPCAddress(initialAccounts) {
44
44
  return (await getBananaFPCInstance(initialAccounts)).address;
45
45
  }
46
- export async function setupBananaFPC(initialAccounts, deployer, log) {
46
+ export async function setupBananaFPC(initialAccounts, wallet, log) {
47
47
  const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
48
48
  const admin = getBananaAdmin(initialAccounts);
49
49
  const [bananaCoin, fpc] = await Promise.all([
50
- TokenContract.deploy(deployer, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
50
+ TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
51
51
  from: admin,
52
52
  contractAddressSalt: BANANA_COIN_SALT,
53
53
  universalDeploy: true
54
54
  }).deployed(),
55
- FPCContract.deploy(deployer, bananaCoinAddress, admin).send({
55
+ FPCContract.deploy(wallet, bananaCoinAddress, admin).send({
56
56
  from: admin,
57
57
  contractAddressSalt: BANANA_FPC_SALT,
58
58
  universalDeploy: true
@@ -61,21 +61,17 @@ export async function setupBananaFPC(initialAccounts, deployer, log) {
61
61
  log(`BananaCoin: ${bananaCoin.address}`);
62
62
  log(`FPC: ${fpc.address}`);
63
63
  }
64
- export async function getDeployedBananaCoinAddress(pxe) {
65
- const initialAccounts = await getInitialTestAccounts();
66
- const bananaCoin = await getBananaCoinAddress(initialAccounts);
67
- const contracts = await pxe.getContracts();
68
- if (!contracts.find((c)=>c.equals(bananaCoin))) {
69
- throw new Error('BananaCoin not deployed.');
70
- }
71
- return bananaCoin;
64
+ export async function registerDeployedBananaCoinInWalletAndGetAddress(wallet) {
65
+ const initialAccounts = await getInitialTestAccountsData();
66
+ const bananaCoin = await getBananaCoinInstance(initialAccounts);
67
+ // The following is no-op if the contract is already registered
68
+ await wallet.registerContract(bananaCoin, TokenContract.artifact);
69
+ return bananaCoin.address;
72
70
  }
73
- export async function getDeployedBananaFPCAddress(pxe) {
74
- const initialAccounts = await getInitialTestAccounts();
71
+ export async function registerDeployedBananaFPCInWalletAndGetAddress(wallet) {
72
+ const initialAccounts = await getInitialTestAccountsData();
75
73
  const fpc = await getBananaFPCInstance(initialAccounts);
76
- const contracts = await pxe.getContracts();
77
- if (!contracts.find((c)=>c.equals(fpc.address))) {
78
- throw new Error('BananaFPC not deployed.');
79
- }
74
+ // The following is no-op if the contract is already registered
75
+ await wallet.registerContract(fpc, FPCContract.artifact);
80
76
  return fpc.address;
81
77
  }
@@ -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"}
@@ -0,0 +1,3 @@
1
+ export * from './local-network.js';
2
+ export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress } from './banana_fpc.js';
3
+ export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
@@ -0,0 +1,74 @@
1
+ #!/usr/bin/env -S node --no-warnings
2
+ import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
3
+ import { EthAddress } from '@aztec/aztec.js/addresses';
4
+ import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
5
+ import { Fr } from '@aztec/foundation/curves/bn254';
6
+ import { type LogFn } from '@aztec/foundation/log';
7
+ import { DateProvider } from '@aztec/foundation/timer';
8
+ import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
9
+ import { type TelemetryClient } from '@aztec/telemetry-client';
10
+ import { type HDAccount, type PrivateKeyAccount } from 'viem';
11
+ /**
12
+ * Function to deploy our L1 contracts to the local network L1
13
+ * @param aztecNodeConfig - The Aztec Node Config
14
+ * @param hdAccount - Account for publishing L1 contracts
15
+ */
16
+ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount | PrivateKeyAccount, contractDeployLogger?: import("@aztec/foundation/log").Logger, opts?: {
17
+ assumeProvenThroughBlockNumber?: number;
18
+ salt?: 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
+ /** Salt used to deploy L1 contracts.*/
50
+ deployAztecContractsSalt: string;
51
+ /** Whether to deploy test accounts on local network start.*/
52
+ testAccounts: boolean;
53
+ };
54
+ /**
55
+ * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
56
+ * Does not start any HTTP services nor populate any initial accounts.
57
+ * @param config - Optional local network settings.
58
+ */
59
+ export declare function createLocalNetwork(config: Partial<LocalNetworkConfig> | undefined, userLog: LogFn): Promise<{
60
+ node: AztecNodeService;
61
+ stop: () => Promise<void>;
62
+ }>;
63
+ /**
64
+ * Create and start a new Aztec RPC HTTP Server
65
+ * @param config - Optional Aztec node settings.
66
+ */
67
+ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?: {
68
+ telemetry?: TelemetryClient;
69
+ blobSinkClient?: BlobSinkClientInterface;
70
+ dateProvider?: DateProvider;
71
+ }, options?: {
72
+ prefilledPublicData?: PublicDataTreeLeaf[];
73
+ }): Promise<AztecNodeService>;
74
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLGdCQUFnQixFQUFvQixNQUFNLG1CQUFtQixDQUFDO0FBQzdGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBd0IsTUFBTSx5QkFBeUIsQ0FBQztBQVU3RixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFHekUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFJakMsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssaUJBQWlCLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBY3ZIOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFNBQVMsRUFBRSxTQUFTLEdBQUcsaUJBQWlCLEVBQ3hDLG9CQUFvQix5Q0FBUyxFQUM3QixJQUFJLEdBQUU7SUFDSiw4QkFBOEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4QyxJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZCxrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUN4Qiw0QkFBNEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FrQ1A7QUFFRCw4QkFBOEI7QUFDOUIsTUFBTSxNQUFNLGtCQUFrQixHQUFHLGVBQWUsR0FBRztJQUNqRCwwREFBMEQ7SUFDMUQsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQix1Q0FBdUM7SUFDdkMsd0JBQXdCLEVBQUUsTUFBTSxDQUFDO0lBQ2pDLDZEQUE2RDtJQUM3RCxZQUFZLEVBQUUsT0FBTyxDQUFDO0NBQ3ZCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE1BQU0seUNBQWtDLEVBQUUsT0FBTyxFQUFFLEtBQUs7OztHQWdIaEc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxNQUFNLEdBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBTSxFQUNyQyxJQUFJLEdBQUU7SUFBRSxTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7SUFBQyxjQUFjLENBQUMsRUFBRSx1QkFBdUIsQ0FBQztJQUFDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQTtDQUFPLEVBQ2pILE9BQU8sR0FBRTtJQUFFLG1CQUFtQixDQUFDLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQTtDQUFPLDZCQVc3RCJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAU7F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,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,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAgHhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
@@ -1,21 +1,24 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
- import { getSchnorrWallet } from '@aztec/accounts/schnorr';
3
- import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
2
+ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
4
3
  import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
5
- import { EthAddress } from '@aztec/aztec.js';
4
+ import { EthAddress } from '@aztec/aztec.js/addresses';
6
5
  import { createBlobSinkClient } from '@aztec/blob-sink/client';
7
- import { setupSponsoredFPC } from '@aztec/cli/cli-utils';
8
6
  import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
9
- import { NULL_KEY, createEthereumChain, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, waitForPublicClient } from '@aztec/ethereum';
7
+ import { createEthereumChain } from '@aztec/ethereum/chain';
8
+ import { waitForPublicClient } from '@aztec/ethereum/client';
9
+ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
10
+ import { NULL_KEY } from '@aztec/ethereum/constants';
11
+ import { deployMulticall3 } from '@aztec/ethereum/contracts';
12
+ import { deployL1Contracts } from '@aztec/ethereum/deploy-l1-contracts';
10
13
  import { EthCheatCodes } from '@aztec/ethereum/test';
11
14
  import { SecretValue } from '@aztec/foundation/config';
12
- import { Fr } from '@aztec/foundation/fields';
15
+ import { Fr } from '@aztec/foundation/curves/bn254';
13
16
  import { createLogger } from '@aztec/foundation/log';
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';
18
20
  import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
21
+ import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
19
22
  import { getGenesisValues } from '@aztec/world-state/testing';
20
23
  import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
21
24
  import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
@@ -25,10 +28,10 @@ import { DefaultMnemonic } from '../mnemonic.js';
25
28
  import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
26
29
  import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
27
30
  import { getSponsoredFPCAddress } from './sponsored_fpc.js';
28
- const logger = createLogger('sandbox');
31
+ const logger = createLogger('local-network');
29
32
  const localAnvil = foundry;
30
33
  /**
31
- * Function to deploy our L1 contracts to the sandbox L1
34
+ * Function to deploy our L1 contracts to the local network L1
32
35
  * @param aztecNodeConfig - The Aztec Node Config
33
36
  * @param hdAccount - Account for publishing L1 contracts
34
37
  */ export async function deployContractsToL1(aztecNodeConfig, hdAccount, contractDeployLogger = logger, opts = {}) {
@@ -40,7 +43,7 @@ const localAnvil = foundry;
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
48
  salt: opts.salt,
46
49
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
@@ -56,15 +59,15 @@ const localAnvil = foundry;
56
59
  /**
57
60
  * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
58
61
  * 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
62
+ * @param config - Optional local network settings.
63
+ */ export async function createLocalNetwork(config = {}, userLog) {
64
+ // local network is meant for test envs. We should only need one l1RpcUrl
62
65
  const l1RpcUrl = config.l1RpcUrls?.[0];
63
66
  if (!l1RpcUrl) {
64
67
  throw new Error('An L1 RPC URL is required');
65
68
  }
66
69
  if ((config.l1RpcUrls?.length || 0) > 1) {
67
- logger.warn(`Multiple L1 RPC URLs provided. Sandbox will only use the first one: ${l1RpcUrl}`);
70
+ logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
68
71
  }
69
72
  const aztecNodeConfig = {
70
73
  ...getConfigEnvVars(),
@@ -90,7 +93,7 @@ const localAnvil = foundry;
90
93
  userLog(`Not setting up test accounts as we are connecting to a network`);
91
94
  } else {
92
95
  userLog(`Setting up test accounts`);
93
- return await getInitialTestAccounts();
96
+ return await getInitialTestAccountsData();
94
97
  }
95
98
  }
96
99
  return [];
@@ -125,12 +128,12 @@ const localAnvil = foundry;
125
128
  });
126
129
  watcher = new AnvilTestWatcher(new EthCheatCodes([
127
130
  l1RpcUrl
128
- ]), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
129
- watcher.setIsSandbox(true);
131
+ ], dateProvider), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
132
+ watcher.setisLocalNetwork(true);
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
135
+ const telemetry = await initTelemetryClient(getTelemetryClientConfig());
136
+ // Create a local blob sink client inside the local network, no http connectivity
134
137
  const blobSinkClient = createBlobSinkClient();
135
138
  const node = await createAztecNode(aztecNodeConfig, {
136
139
  telemetry,
@@ -139,22 +142,23 @@ const localAnvil = foundry;
139
142
  }, {
140
143
  prefilledPublicData
141
144
  });
142
- const pxeServiceConfig = {
143
- proverEnabled: aztecNodeConfig.realProofs
144
- };
145
- const pxe = await createAztecPXE(node, pxeServiceConfig);
146
145
  if (initialAccounts.length) {
146
+ const PXEConfig = {
147
+ proverEnabled: aztecNodeConfig.realProofs
148
+ };
149
+ const wallet = await TestWallet.create(node, PXEConfig);
147
150
  userLog('Setting up funded test accounts...');
148
- const accounts = await deployFundedSchnorrAccounts(pxe, initialAccounts);
149
- const accountsWithSecrets = accounts.map((account, i)=>({
150
- account,
151
+ const accountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccounts);
152
+ const accountsWithSecrets = accountManagers.map((manager, i)=>({
153
+ account: manager,
151
154
  secretKey: initialAccounts[i].secret
152
155
  }));
153
- const accLogs = await createAccountLogs(accountsWithSecrets, pxe);
156
+ const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
154
157
  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);
158
+ await setupBananaFPC(initialAccounts, wallet, userLog);
159
+ userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
160
+ // We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
161
+ await wallet.stop();
158
162
  }
159
163
  const stop = async ()=>{
160
164
  await node.stop();
@@ -162,7 +166,6 @@ const localAnvil = foundry;
162
166
  };
163
167
  return {
164
168
  node,
165
- pxe,
166
169
  stop
167
170
  };
168
171
  }
@@ -183,14 +186,3 @@ const localAnvil = foundry;
183
186
  const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
184
187
  return node;
185
188
  }
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;
@@ -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;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;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"}