@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.1142ef1

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 (156) hide show
  1. package/README.md +1 -1
  2. package/dest/bin/index.d.ts +1 -1
  3. package/dest/bin/index.js +23 -12
  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 +40 -40
  7. package/dest/cli/aztec_start_options.d.ts +5 -3
  8. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  9. package/dest/cli/aztec_start_options.js +143 -224
  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 +12 -7
  13. package/dest/cli/cmds/migrate_ha_db.d.ts +3 -0
  14. package/dest/cli/cmds/migrate_ha_db.d.ts.map +1 -0
  15. package/dest/cli/cmds/migrate_ha_db.js +27 -0
  16. package/dest/cli/cmds/start_archiver.d.ts +1 -1
  17. package/dest/cli/cmds/start_archiver.d.ts.map +1 -1
  18. package/dest/cli/cmds/start_archiver.js +20 -12
  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 +2 -2
  23. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  24. package/dest/cli/cmds/start_node.js +68 -81
  25. package/dest/cli/cmds/start_p2p_bootstrap.d.ts +1 -1
  26. package/dest/cli/cmds/start_p2p_bootstrap.d.ts.map +1 -1
  27. package/dest/cli/cmds/start_p2p_bootstrap.js +9 -4
  28. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  29. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  30. package/dest/cli/cmds/start_prover_agent.js +33 -4
  31. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  32. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  33. package/dest/cli/cmds/start_prover_broker.js +10 -4
  34. package/dest/cli/cmds/start_prover_node.d.ts +1 -1
  35. package/dest/cli/cmds/start_prover_node.d.ts.map +1 -1
  36. package/dest/cli/cmds/start_prover_node.js +44 -46
  37. package/dest/cli/cmds/start_txe.d.ts +1 -1
  38. package/dest/cli/index.d.ts +1 -1
  39. package/dest/cli/preload_crs.d.ts +3 -0
  40. package/dest/cli/preload_crs.d.ts.map +1 -0
  41. package/dest/cli/preload_crs.js +6 -0
  42. package/dest/cli/release_version.d.ts +2 -0
  43. package/dest/cli/release_version.d.ts.map +1 -0
  44. package/dest/cli/release_version.js +14 -0
  45. package/dest/cli/util.d.ts +38 -7
  46. package/dest/cli/util.d.ts.map +1 -1
  47. package/dest/cli/util.js +198 -28
  48. package/dest/cli/versioning.d.ts +1 -1
  49. package/dest/cli/versioning.js +3 -3
  50. package/dest/examples/token.d.ts +1 -1
  51. package/dest/examples/token.js +31 -18
  52. package/dest/examples/util.d.ts +5 -6
  53. package/dest/examples/util.d.ts.map +1 -1
  54. package/dest/examples/util.js +5 -6
  55. package/dest/index.d.ts +2 -2
  56. package/dest/index.d.ts.map +1 -1
  57. package/dest/index.js +1 -1
  58. package/dest/local-network/banana_fpc.d.ts +10 -0
  59. package/dest/local-network/banana_fpc.d.ts.map +1 -0
  60. package/dest/{sandbox → local-network}/banana_fpc.js +20 -22
  61. package/dest/local-network/index.d.ts +4 -0
  62. package/dest/local-network/index.d.ts.map +1 -0
  63. package/dest/local-network/index.js +3 -0
  64. package/dest/local-network/local-network.d.ts +72 -0
  65. package/dest/local-network/local-network.d.ts.map +1 -0
  66. package/dest/local-network/local-network.js +195 -0
  67. package/dest/local-network/sponsored_fpc.d.ts +5 -0
  68. package/dest/local-network/sponsored_fpc.d.ts.map +1 -0
  69. package/dest/local-network/sponsored_fpc.js +18 -0
  70. package/dest/mnemonic.d.ts +1 -1
  71. package/dest/splash.d.ts +1 -1
  72. package/dest/testing/anvil_test_watcher.d.ts +34 -0
  73. package/dest/testing/anvil_test_watcher.d.ts.map +1 -0
  74. package/dest/testing/anvil_test_watcher.js +144 -0
  75. package/dest/testing/cheat_codes.d.ts +41 -0
  76. package/dest/testing/cheat_codes.d.ts.map +1 -0
  77. package/dest/testing/cheat_codes.js +62 -0
  78. package/dest/testing/epoch_test_settler.d.ts +17 -0
  79. package/dest/testing/epoch_test_settler.d.ts.map +1 -0
  80. package/dest/testing/epoch_test_settler.js +52 -0
  81. package/dest/testing/index.d.ts +5 -0
  82. package/dest/testing/index.d.ts.map +1 -0
  83. package/dest/testing/index.js +4 -0
  84. package/package.json +55 -45
  85. package/scripts/aztec.sh +63 -0
  86. package/scripts/compile.sh +44 -0
  87. package/scripts/extract_function.js +47 -0
  88. package/scripts/flamegraph.sh +59 -0
  89. package/scripts/init.sh +35 -0
  90. package/scripts/new.sh +59 -0
  91. package/scripts/setup_project.sh +31 -0
  92. package/src/bin/index.ts +28 -12
  93. package/src/cli/aztec_start_action.ts +36 -38
  94. package/src/cli/aztec_start_options.ts +159 -222
  95. package/src/cli/cli.ts +20 -11
  96. package/src/cli/cmds/migrate_ha_db.ts +43 -0
  97. package/src/cli/cmds/start_archiver.ts +21 -15
  98. package/src/cli/cmds/start_bot.ts +36 -13
  99. package/src/cli/cmds/start_node.ts +91 -86
  100. package/src/cli/cmds/start_p2p_bootstrap.ts +12 -4
  101. package/src/cli/cmds/start_prover_agent.ts +24 -12
  102. package/src/cli/cmds/start_prover_broker.ts +24 -4
  103. package/src/cli/cmds/start_prover_node.ts +54 -51
  104. package/src/cli/preload_crs.ts +7 -0
  105. package/src/cli/release_version.ts +21 -0
  106. package/src/cli/util.ts +208 -34
  107. package/src/cli/versioning.ts +3 -3
  108. package/src/examples/token.ts +23 -19
  109. package/src/examples/util.ts +6 -8
  110. package/src/index.ts +5 -6
  111. package/src/{sandbox → local-network}/banana_fpc.ts +21 -26
  112. package/src/local-network/index.ts +7 -0
  113. package/src/local-network/local-network.ts +238 -0
  114. package/src/local-network/sponsored_fpc.ts +26 -0
  115. package/src/testing/anvil_test_watcher.ts +166 -0
  116. package/src/testing/cheat_codes.ts +79 -0
  117. package/src/testing/epoch_test_settler.ts +59 -0
  118. package/src/testing/index.ts +4 -0
  119. package/dest/cli/chain_l2_config.d.ts +0 -19
  120. package/dest/cli/chain_l2_config.d.ts.map +0 -1
  121. package/dest/cli/chain_l2_config.js +0 -56
  122. package/dest/cli/cmds/start_blob_sink.d.ts +0 -3
  123. package/dest/cli/cmds/start_blob_sink.d.ts.map +0 -1
  124. package/dest/cli/cmds/start_blob_sink.js +0 -17
  125. package/dest/cli/cmds/start_faucet.d.ts +0 -4
  126. package/dest/cli/cmds/start_faucet.d.ts.map +0 -1
  127. package/dest/cli/cmds/start_faucet.js +0 -20
  128. package/dest/cli/cmds/start_pxe.d.ts +0 -16
  129. package/dest/cli/cmds/start_pxe.d.ts.map +0 -1
  130. package/dest/cli/cmds/start_pxe.js +0 -95
  131. package/dest/cli/get_l1_config.d.ts +0 -7
  132. package/dest/cli/get_l1_config.d.ts.map +0 -1
  133. package/dest/cli/get_l1_config.js +0 -13
  134. package/dest/sandbox/banana_fpc.d.ts +0 -11
  135. package/dest/sandbox/banana_fpc.d.ts.map +0 -1
  136. package/dest/sandbox/index.d.ts +0 -5
  137. package/dest/sandbox/index.d.ts.map +0 -1
  138. package/dest/sandbox/index.js +0 -4
  139. package/dest/sandbox/sandbox.d.ts +0 -76
  140. package/dest/sandbox/sandbox.d.ts.map +0 -1
  141. package/dest/sandbox/sandbox.js +0 -181
  142. package/dest/sandbox/sponsored_fee_payment_method.d.ts +0 -23
  143. package/dest/sandbox/sponsored_fee_payment_method.d.ts.map +0 -1
  144. package/dest/sandbox/sponsored_fee_payment_method.js +0 -36
  145. package/dest/sandbox/sponsored_fpc.d.ts +0 -6
  146. package/dest/sandbox/sponsored_fpc.d.ts.map +0 -1
  147. package/dest/sandbox/sponsored_fpc.js +0 -26
  148. package/src/cli/chain_l2_config.ts +0 -74
  149. package/src/cli/cmds/start_blob_sink.ts +0 -31
  150. package/src/cli/cmds/start_faucet.ts +0 -34
  151. package/src/cli/cmds/start_pxe.ts +0 -129
  152. package/src/cli/get_l1_config.ts +0 -18
  153. package/src/sandbox/index.ts +0 -5
  154. package/src/sandbox/sandbox.ts +0 -229
  155. package/src/sandbox/sponsored_fee_payment_method.ts +0 -46
  156. package/src/sandbox/sponsored_fpc.ts +0 -38
@@ -0,0 +1,6 @@
1
+ import { preloadCrsDataForServerSideProving } from './util.js';
2
+ export async function preloadCrs(_options, userLog, _debugLogger) {
3
+ await preloadCrsDataForServerSideProving({
4
+ realProofs: true
5
+ }, userLog);
6
+ }
@@ -0,0 +1,2 @@
1
+ export declare const getCliVersion: () => any;
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZV92ZXJzaW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL3JlbGVhc2VfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxlQUFPLE1BQU0sYUFBYSxXQWV6QixDQUFDIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"release_version.d.ts","sourceRoot":"","sources":["../../src/cli/release_version.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,aAAa,WAezB,CAAC"}
@@ -0,0 +1,14 @@
1
+ import { fileURLToPath } from '@aztec/foundation/url';
2
+ import { readFileSync } from 'fs';
3
+ import { dirname, resolve } from 'path';
4
+ export const getCliVersion = ()=>{
5
+ const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
6
+ const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
7
+ // If the version is 0.1.0, this is a placeholder version and we are in a docker container; query release please for the latest version
8
+ if (cliVersion === '0.1.0') {
9
+ const releasePleasePath = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json');
10
+ const releaseVersion = JSON.parse(readFileSync(releasePleasePath).toString())['.'];
11
+ return releaseVersion;
12
+ }
13
+ return cliVersion;
14
+ };
@@ -1,14 +1,32 @@
1
- import type { AccountManager, Fr } from '@aztec/aztec.js';
1
+ import type { AztecNodeConfig } from '@aztec/aztec-node';
2
+ import type { AccountManager } from '@aztec/aztec.js/wallet';
3
+ import type { ViemClient } from '@aztec/ethereum/types';
2
4
  import type { ConfigMappingsType } from '@aztec/foundation/config';
3
- import type { LogFn } from '@aztec/foundation/log';
4
- import type { PXEService } from '@aztec/pxe/server';
5
+ import { Fr } from '@aztec/foundation/curves/bn254';
6
+ import { EthAddress } from '@aztec/foundation/eth-address';
7
+ import { type LogFn } from '@aztec/foundation/log';
8
+ import type { SharedNodeConfig } from '@aztec/node-lib/config';
9
+ import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
10
+ import type { TestWallet } from '@aztec/test-wallet/server';
5
11
  import type { Command } from 'commander';
6
12
  import { type AztecStartOption } from './aztec_start_options.js';
7
- export declare const installSignalHandlers: (logFn: LogFn, cb?: Array<() => Promise<void>>) => void;
13
+ export declare const enum ExitCode {
14
+ SUCCESS = 0,
15
+ ERROR = 1,
16
+ ROLLUP_UPGRADE = 78,
17
+ VERSION_UPGRADE = 79,
18
+ SIGHUP = 129,
19
+ SIGINT = 130,
20
+ SIGQUIT = 131,
21
+ SIGTERM = 143
22
+ }
23
+ export declare function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never>;
24
+ export declare function isShuttingDown(): boolean;
25
+ export declare const installSignalHandlers: (logFn: LogFn, cb?: (() => Promise<void>)[] | undefined) => void;
8
26
  /**
9
27
  * Creates logs for the initial accounts
10
28
  * @param accounts - The initial accounts
11
- * @param pxe - A PXE instance to get the registered accounts
29
+ * @param wallet - A TestWallet instance to get the registered accounts
12
30
  * @returns A string array containing the initial accounts details
13
31
  */
14
32
  export declare function createAccountLogs(accountsWithSecretKeys: {
@@ -20,7 +38,7 @@ export declare function createAccountLogs(accountsWithSecretKeys: {
20
38
  * The secret key of the account
21
39
  */
22
40
  secretKey: Fr;
23
- }[], pxe: PXEService): Promise<string[]>;
41
+ }[], wallet: TestWallet): Promise<string[]>;
24
42
  export declare function getMaxLengths(sections: {
25
43
  [key: string]: AztecStartOption[];
26
44
  }): [number, number];
@@ -43,4 +61,17 @@ export declare const extractNamespacedOptions: (options: Record<string, any>, na
43
61
  * @returns Key-value map of relevant options.
44
62
  */
45
63
  export declare const extractRelevantOptions: <T>(options: Record<string, any>, mappings: ConfigMappingsType<T>, namespace: string) => T;
46
- //# sourceMappingURL=util.d.ts.map
64
+ /**
65
+ * Downloads just enough points to be able to verify Chonk proofs.
66
+ * @param opts - Whether proof are to be verifier
67
+ * @param log - Logging function
68
+ */
69
+ export declare function preloadCrsDataForVerifying({ realProofs }: Pick<AztecNodeConfig, 'realProofs'>, log: LogFn): Promise<void>;
70
+ /**
71
+ * Downloads enough points to be able to prove every server-side circuit
72
+ * @param opts - Whether real proof are to be generated
73
+ * @param log - Logging function
74
+ */
75
+ export declare function preloadCrsDataForServerSideProving({ realProofs }: Pick<ProverConfig, 'realProofs'>, log: LogFn): Promise<void>;
76
+ export declare function setupUpdateMonitor(autoUpdateMode: SharedNodeConfig['autoUpdate'], updatesLocation: URL, followsCanonicalRollup: boolean, publicClient: ViemClient, registryContractAddress: EthAddress, signalHandlers: Array<() => Promise<void>>, updateNodeConfig?: (config: object) => Promise<void>): Promise<void>;
77
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVwRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUc1RCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFekMsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQXFCLE1BQU0sMEJBQTBCLENBQUM7QUFFcEYsMEJBQWtCLFFBQVE7SUFDeEIsT0FBTyxJQUFJO0lBQ1gsS0FBSyxJQUFJO0lBQ1QsY0FBYyxLQUFLO0lBQ25CLGVBQWUsS0FBSztJQUVwQixNQUFNLE1BQU07SUFDWixNQUFNLE1BQU07SUFDWixPQUFPLE1BQU07SUFDYixPQUFPLE1BQU07Q0FDZDtBQUdELHdCQUFnQixRQUFRLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FnQjFHO0FBRUQsd0JBQWdCLGNBQWMsSUFBSSxPQUFPLENBRXhDO0FBRUQsZUFBTyxNQUFNLHFCQUFxQixrRUFhakMsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsd0JBQXNCLGlCQUFpQixDQUNyQyxzQkFBc0IsRUFBRTtJQUN0Qjs7T0FFRztJQUNILE9BQU8sRUFBRSxjQUFjLENBQUM7SUFDeEI7O09BRUc7SUFDSCxTQUFTLEVBQUUsRUFBRSxDQUFDO0NBQ2YsRUFBRSxFQUNILE1BQU0sRUFBRSxVQUFVLHFCQXlCbkI7QUFFRCx3QkFBZ0IsYUFBYSxDQUFDLFFBQVEsRUFBRTtJQUFFLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsRUFBRSxDQUFBO0NBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FpQi9GO0FBRUQsd0JBQWdCLGNBQWMsQ0FDNUIsTUFBTSxFQUFFLE1BQU0sRUFDZCxZQUFZLEVBQUUsTUFBTSxFQUNwQixNQUFNLEVBQUUsTUFBTSxFQUNkLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLGdCQUFnQixFQUFFLE1BQU0sR0FDdkIsTUFBTSxDQUtSO0FBaUNELGVBQU8sTUFBTSxVQUFVLHFEQVN0QixDQUFDO0FBRUYsZUFBTyxNQUFNLHVCQUF1QixjQXlCbkMsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsZUFBTyxNQUFNLHdCQUF3QiwwRUFTcEMsQ0FBQztBQUVGOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0sc0JBQXNCLEdBQUksQ0FBQyx3RkFrQ3ZDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUM5QyxFQUFFLFVBQVUsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLEVBQUUsWUFBWSxDQUFDLEVBQ25ELEdBQUcsRUFBRSxLQUFLLEdBQ1QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUtmO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FDdEQsRUFBRSxVQUFVLEVBQUUsRUFBRSxJQUFJLENBQUMsWUFBWSxFQUFFLFlBQVksQ0FBQyxFQUNoRCxHQUFHLEVBQUUsS0FBSyxHQUNULE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLZjtBQUVELHdCQUFzQixrQkFBa0IsQ0FDdEMsY0FBYyxFQUFFLGdCQUFnQixDQUFDLFlBQVksQ0FBQyxFQUM5QyxlQUFlLEVBQUUsR0FBRyxFQUNwQixzQkFBc0IsRUFBRSxPQUFPLEVBQy9CLFlBQVksRUFBRSxVQUFVLEVBQ3hCLHVCQUF1QixFQUFFLFVBQVUsRUFDbkMsY0FBYyxFQUFFLEtBQUssQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUMxQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLE1BQU0sS0FBSyxPQUFPLENBQUMsSUFBSSxDQUFDLGlCQStFckQifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,KAAK,gBAAgB,EAAqB,MAAM,0BAA0B,CAAC;AAEpF,eAAO,MAAM,qBAAqB,UAAW,KAAK,OAAO,MAAM,MAAM,QAAQ,IAAI,CAAC,CAAC,SAclF,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,sBAAsB,EAAE;IACtB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,EAAE,CAAC;CACf,EAAE,EACH,GAAG,EAAE,UAAU,qBAyBhB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAiB/F;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAmBD,eAAO,MAAM,UAAU,QAAS,OAAO,WAAW,gBAAgB,EAAE,SASnE,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAwBnC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,YAAa,OAAO,MAAM,EAAE,GAAG,CAAC,aAAa,MAAM,wBASvF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,eACxB,OAAO,MAAM,EAAE,GAAG,CAAC,YAClB,mBAAmB,CAAC,CAAC,aACpB,MAAM,KAChB,CA8BF,CAAC"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}
package/dest/cli/util.js CHANGED
@@ -1,33 +1,78 @@
1
+ import { createLogger } from '@aztec/foundation/log';
2
+ import { getTelemetryClient } from '@aztec/telemetry-client/start';
1
3
  import chalk from 'chalk';
2
4
  import { aztecStartOptions } from './aztec_start_options.js';
5
+ export var ExitCode = /*#__PURE__*/ function(ExitCode) {
6
+ ExitCode[ExitCode["SUCCESS"] = 0] = "SUCCESS";
7
+ ExitCode[ExitCode["ERROR"] = 1] = "ERROR";
8
+ ExitCode[ExitCode["ROLLUP_UPGRADE"] = 78] = "ROLLUP_UPGRADE";
9
+ ExitCode[ExitCode["VERSION_UPGRADE"] = 79] = "VERSION_UPGRADE";
10
+ // 128 + int(SIGNAL)
11
+ ExitCode[ExitCode["SIGHUP"] = 129] = "SIGHUP";
12
+ ExitCode[ExitCode["SIGINT"] = 130] = "SIGINT";
13
+ ExitCode[ExitCode["SIGQUIT"] = 131] = "SIGQUIT";
14
+ ExitCode[ExitCode["SIGTERM"] = 143] = "SIGTERM";
15
+ return ExitCode;
16
+ }({});
17
+ let shutdownPromise;
18
+ export function shutdown(logFn, exitCode, cb) {
19
+ if (shutdownPromise) {
20
+ logFn('Already shutting down.');
21
+ return shutdownPromise;
22
+ }
23
+ logFn('Shutting down...', {
24
+ exitCode
25
+ });
26
+ if (cb) {
27
+ shutdownPromise = Promise.allSettled(cb).then(()=>process.exit(exitCode));
28
+ } else {
29
+ // synchronously shuts down the process
30
+ // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
31
+ process.exit(exitCode);
32
+ }
33
+ return shutdownPromise;
34
+ }
35
+ export function isShuttingDown() {
36
+ return shutdownPromise !== undefined;
37
+ }
3
38
  export const installSignalHandlers = (logFn, cb)=>{
4
- const shutdown = async ()=>{
5
- logFn('Shutting down...');
6
- if (cb) {
7
- await Promise.all(cb);
8
- }
9
- process.exit(0);
10
- };
11
- process.removeAllListeners('SIGINT');
12
- process.removeAllListeners('SIGTERM');
13
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
14
- process.once('SIGINT', shutdown);
15
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
16
- process.once('SIGTERM', shutdown);
39
+ const signals = [
40
+ [
41
+ 'SIGINT',
42
+ 130
43
+ ],
44
+ [
45
+ 'SIGTERM',
46
+ 143
47
+ ],
48
+ [
49
+ 'SIGHUP',
50
+ 129
51
+ ],
52
+ [
53
+ 'SIQUIT',
54
+ 131
55
+ ]
56
+ ];
57
+ for (const [signal, exitCode] of signals){
58
+ process.removeAllListeners(signal);
59
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
60
+ process.once(signal, ()=>shutdown(logFn, exitCode, cb));
61
+ }
17
62
  };
18
63
  /**
19
64
  * Creates logs for the initial accounts
20
65
  * @param accounts - The initial accounts
21
- * @param pxe - A PXE instance to get the registered accounts
66
+ * @param wallet - A TestWallet instance to get the registered accounts
22
67
  * @returns A string array containing the initial accounts details
23
- */ export async function createAccountLogs(accountsWithSecretKeys, pxe) {
24
- const registeredAccounts = await pxe.getRegisteredAccounts();
68
+ */ export async function createAccountLogs(accountsWithSecretKeys, wallet) {
69
+ const registeredAccounts = await wallet.getAccounts();
25
70
  const accountLogStrings = [
26
71
  `Initial Accounts:\n\n`
27
72
  ];
28
73
  for (const accountWithSecretKey of accountsWithSecretKeys){
29
74
  const completeAddress = await accountWithSecretKey.account.getCompleteAddress();
30
- if (registeredAccounts.find((a)=>a.equals(completeAddress))) {
75
+ if (registeredAccounts.find((a)=>a.item.equals(completeAddress.address))) {
31
76
  accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
32
77
  accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
33
78
  accountLogStrings.push(` Secret Key: ${accountWithSecretKey.secretKey.toString()}\n`);
@@ -65,22 +110,34 @@ export function formatHelpLine(option, defaultValue, envVar, maxOptionLength, ma
65
110
  }
66
111
  const getDefaultOrEnvValue = (opt)=>{
67
112
  let val;
68
- // if the option is set in the environment, use that & parse it
69
- if (opt.envVar && process.env[opt.envVar]) {
70
- val = process.env[opt.envVar];
71
- if (val && opt.parseVal) {
113
+ // if the option is set in the environment, use that
114
+ if (opt.env) {
115
+ val = process.env[opt.env];
116
+ }
117
+ // if we have fallback env vars, check those
118
+ if (!val && opt.fallback && opt.fallback.length > 0) {
119
+ for (const fallback of opt.fallback){
120
+ val = process.env[fallback];
121
+ if (val) {
122
+ break;
123
+ }
124
+ }
125
+ }
126
+ // if we have a value, optionally parse it and return
127
+ if (val) {
128
+ if (opt.parseVal) {
72
129
  return opt.parseVal(val);
73
130
  }
74
- // if no env variable, use the default value
75
- } else if (opt.defaultValue) {
76
- val = opt.defaultValue;
131
+ return val;
132
+ } else if (opt.defaultValue !== undefined) {
133
+ return opt.defaultValue;
77
134
  }
78
- return val;
135
+ return undefined;
79
136
  };
80
137
  // Function to add options dynamically
81
138
  export const addOptions = (cmd, options)=>{
82
139
  options.forEach((opt)=>{
83
- cmd.option(opt.flag, `${opt.description} (default: ${opt.defaultValue}) ($${opt.envVar})`, opt.parseVal ? opt.parseVal : (val)=>val, getDefaultOrEnvValue(opt));
140
+ cmd.option(opt.flag, `${opt.description} (default: ${opt.defaultValue}) ($${opt.env})`, opt.parseVal ? opt.parseVal : (val)=>val, getDefaultOrEnvValue(opt));
84
141
  });
85
142
  };
86
143
  export const printAztecStartHelpText = ()=>{
@@ -92,8 +149,8 @@ export const printAztecStartHelpText = ()=>{
92
149
  helpTextLines.push(chalk.bold.blue(` ${category}`));
93
150
  helpTextLines.push('');
94
151
  aztecStartOptions[category].forEach((opt)=>{
95
- const defaultValueText = opt.defaultValue ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})` : '';
96
- const envVarText = opt.envVar ? `($${opt.envVar})` : '';
152
+ const defaultValueText = opt.defaultValue || Array.isArray(opt.defaultValue) && opt.defaultValue.length > 0 ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})` : '';
153
+ const envVarText = opt.env ? `($${opt.env})` : '';
97
154
  const flagText = `${opt.flag}`;
98
155
  const paddedText = formatHelpLine(flagText, defaultValueText, envVarText, maxFlagLength, maxDefaultLength);
99
156
  helpTextLines.push(` ${paddedText}`);
@@ -152,3 +209,116 @@ export const printAztecStartHelpText = ()=>{
152
209
  });
153
210
  return relevantOptions;
154
211
  };
212
+ /**
213
+ * Downloads just enough points to be able to verify Chonk proofs.
214
+ * @param opts - Whether proof are to be verifier
215
+ * @param log - Logging function
216
+ */ export async function preloadCrsDataForVerifying({ realProofs }, log) {
217
+ if (realProofs) {
218
+ const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
219
+ await Promise.all([
220
+ Crs.new(2 ** 1, undefined, log),
221
+ GrumpkinCrs.new(2 ** 16 + 1, undefined, log)
222
+ ]);
223
+ }
224
+ }
225
+ /**
226
+ * Downloads enough points to be able to prove every server-side circuit
227
+ * @param opts - Whether real proof are to be generated
228
+ * @param log - Logging function
229
+ */ export async function preloadCrsDataForServerSideProving({ realProofs }, log) {
230
+ if (realProofs) {
231
+ const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
232
+ await Promise.all([
233
+ Crs.new(2 ** 25 + 1, undefined, log),
234
+ GrumpkinCrs.new(2 ** 18 + 1, undefined, log)
235
+ ]);
236
+ }
237
+ }
238
+ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, followsCanonicalRollup, publicClient, registryContractAddress, signalHandlers, updateNodeConfig) {
239
+ const logger = createLogger('update-check');
240
+ const { UpdateChecker } = await import('@aztec/stdlib/update-checker');
241
+ const checker = await UpdateChecker.new({
242
+ baseURL: updatesLocation,
243
+ publicClient,
244
+ registryContractAddress
245
+ });
246
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
247
+ checker.on('newRollupVersion', async ({ latestVersion, currentVersion })=>{
248
+ if (isShuttingDown()) {
249
+ return;
250
+ }
251
+ // if node follows canonical rollup then this is equivalent to a config update
252
+ if (!followsCanonicalRollup) {
253
+ return;
254
+ }
255
+ if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
256
+ logger.info(`New rollup version detected. Please restart the node`, {
257
+ latestVersion,
258
+ currentVersion
259
+ });
260
+ await shutdown(logger.info, 78, signalHandlers);
261
+ } else if (autoUpdateMode === 'notify') {
262
+ logger.warn(`New rollup detected. Please restart the node`, {
263
+ latestVersion,
264
+ currentVersion
265
+ });
266
+ }
267
+ });
268
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
269
+ checker.on('newNodeVersion', async ({ latestVersion, currentVersion })=>{
270
+ if (isShuttingDown()) {
271
+ return;
272
+ }
273
+ if (autoUpdateMode === 'config-and-version') {
274
+ logger.info(`New node version detected. Please update and restart the node`, {
275
+ latestVersion,
276
+ currentVersion
277
+ });
278
+ await shutdown(logger.info, 79, signalHandlers);
279
+ } else if (autoUpdateMode === 'notify') {
280
+ logger.info(`New node version detected. Please update and restart the node`, {
281
+ latestVersion,
282
+ currentVersion
283
+ });
284
+ }
285
+ });
286
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
287
+ checker.on('updateNodeConfig', async (config)=>{
288
+ if (isShuttingDown()) {
289
+ return;
290
+ }
291
+ if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
292
+ logger.warn(`Config change detected. Updating node`, config);
293
+ try {
294
+ await updateNodeConfig(config);
295
+ } catch (err) {
296
+ logger.warn('Failed to update config', {
297
+ err
298
+ });
299
+ }
300
+ }
301
+ // don't notify on these config changes
302
+ });
303
+ checker.on('updatePublicTelemetryConfig', (config)=>{
304
+ if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
305
+ logger.warn(`Public telemetry config change detected. Updating telemetry client`, config);
306
+ try {
307
+ const publicIncludeMetrics = config.publicIncludeMetrics;
308
+ if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every((m)=>typeof m === 'string')) {
309
+ getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
310
+ }
311
+ const publicMetricsCollectFrom = config.publicMetricsCollectFrom;
312
+ if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every((m)=>typeof m === 'string')) {
313
+ getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
314
+ }
315
+ } catch (err) {
316
+ logger.warn('Failed to update config', {
317
+ err
318
+ });
319
+ }
320
+ }
321
+ // don't notify on these config changes
322
+ });
323
+ checker.start();
324
+ }
@@ -1,4 +1,4 @@
1
1
  import type { ChainConfig } from '@aztec/stdlib/config';
2
2
  import { type ComponentsVersions } from '@aztec/stdlib/versioning';
3
3
  export declare function getVersions(config?: ChainConfig): Partial<ComponentsVersions>;
4
- //# sourceMappingURL=versioning.d.ts.map
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbmluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS92ZXJzaW9uaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3hELE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUFtQyxNQUFNLDBCQUEwQixDQUFDO0FBRXBHLHdCQUFnQixXQUFXLENBQUMsTUFBTSxDQUFDLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQU83RSJ9
@@ -1,9 +1,9 @@
1
1
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
2
- import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
2
+ import { protocolContractsHash } from '@aztec/protocol-contracts';
3
3
  import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
4
4
  export function getVersions(config) {
5
- return config ? getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot()) : {
5
+ return config ? getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot()) : {
6
6
  l2CircuitsVkTreeRoot: getVKTreeRoot().toString(),
7
- l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString()
7
+ l2ProtocolContractsHash: protocolContractsHash.toString()
8
8
  };
9
9
  }
@@ -1,2 +1,2 @@
1
1
  export {};
2
- //# sourceMappingURL=token.d.ts.map
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9leGFtcGxlcy90b2tlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
@@ -1,40 +1,53 @@
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.getCompleteAddress();
16
- const bob = bobWallet.getCompleteAddress();
17
- logger.info(`Fetched Alice and Bob accounts: ${alice.address.toString()}, ${bob.address.toString()}`);
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;
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().deployed();
24
+ const token = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
25
+ from: alice
26
+ }).deployed();
20
27
  logger.info('Token deployed');
21
- // Create the contract abstraction and link it to Alice's and Bob's wallet for future signing
22
- const tokenAlice = await TokenContract.at(token.address, aliceWallet);
23
- const tokenBob = await TokenContract.at(token.address, bobWallet);
24
28
  // Mint tokens to Alice
25
29
  logger.info(`Minting ${ALICE_MINT_BALANCE} more coins to Alice...`);
26
- const from = aliceWallet.getAddress(); // we are setting from to Alice here because we need a sender to calculate the tag
27
- await tokenAlice.methods.mint_to_private(from, aliceWallet.getAddress(), ALICE_MINT_BALANCE).send().wait();
30
+ await token.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({
31
+ from: alice
32
+ }).wait();
28
33
  logger.info(`${ALICE_MINT_BALANCE} tokens were successfully minted by Alice and transferred to private`);
29
- const balanceAfterMint = await tokenAlice.methods.balance_of_private(alice).simulate();
34
+ const balanceAfterMint = await token.methods.balance_of_private(alice).simulate({
35
+ from: alice
36
+ });
30
37
  logger.info(`Tokens successfully minted. New Alice's balance: ${balanceAfterMint}`);
31
38
  // We will now transfer tokens from Alice to Bob
32
39
  logger.info(`Transferring ${TRANSFER_AMOUNT} tokens from Alice to Bob...`);
33
- await tokenAlice.methods.transfer(bob, TRANSFER_AMOUNT).send().wait();
40
+ await token.methods.transfer(bob, TRANSFER_AMOUNT).send({
41
+ from: alice
42
+ }).wait();
34
43
  // Check the new balances
35
- const aliceBalance = await tokenAlice.methods.balance_of_private(alice).simulate();
44
+ const aliceBalance = await token.methods.balance_of_private(alice).simulate({
45
+ from: alice
46
+ });
36
47
  logger.info(`Alice's balance ${aliceBalance}`);
37
- const bobBalance = await tokenBob.methods.balance_of_private(bob).simulate();
48
+ const bobBalance = await token.methods.balance_of_private(bob).simulate({
49
+ from: bob
50
+ });
38
51
  logger.info(`Bob's balance ${bobBalance}`);
39
52
  }
40
53
  main().then(()=>{
@@ -1,20 +1,19 @@
1
- import { EthAddress } from '@aztec/aztec.js';
2
- import type { ViemPublicClient, ViemWalletClient } 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
  /**
6
6
  * Helper function to deploy ETH contracts.
7
- * @param walletClient - A viem WalletClient.
8
- * @param publicClient - A viem PublicClient.
7
+ * @param l1Client - A viem WalletClient extended with public actions.
9
8
  * @param abi - The ETH contract's ABI (as abitype's Abi).
10
9
  * @param bytecode - The ETH contract's bytecode.
11
10
  * @param args - Constructor arguments for the contract.
12
11
  * @returns The ETH address the contract was deployed to.
13
12
  */
14
- export declare function deployL1Contract(walletClient: ViemWalletClient, publicClient: ViemPublicClient, abi: Narrow<Abi | readonly unknown[]>, bytecode: Hex, args?: readonly unknown[]): Promise<EthAddress>;
13
+ export declare function deployL1Contract(l1Client: ExtendedViemWalletClient, abi: Narrow<Abi | readonly unknown[]>, bytecode: Hex, args?: readonly unknown[]): Promise<EthAddress>;
15
14
  /**
16
15
  * Sleep for a given number of milliseconds.
17
16
  * @param ms - the number of milliseconds to sleep for
18
17
  */
19
18
  export declare function delay(ms: number): Promise<void>;
20
- //# 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,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAG1E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,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,20 +1,19 @@
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.
5
- * @param walletClient - A viem WalletClient.
6
- * @param publicClient - A viem PublicClient.
5
+ * @param l1Client - A viem WalletClient extended with public actions.
7
6
  * @param abi - The ETH contract's ABI (as abitype's Abi).
8
7
  * @param bytecode - The ETH contract's bytecode.
9
8
  * @param args - Constructor arguments for the contract.
10
9
  * @returns The ETH address the contract was deployed to.
11
- */ export async function deployL1Contract(walletClient, publicClient, abi, bytecode, args = []) {
12
- const hash = await walletClient.deployContract({
10
+ */ export async function deployL1Contract(l1Client, abi, bytecode, args = []) {
11
+ const hash = await l1Client.deployContract({
13
12
  abi,
14
13
  bytecode,
15
14
  args
16
15
  });
17
- const receipt = await publicClient.waitForTransactionReceipt({
16
+ const receipt = await l1Client.waitForTransactionReceipt({
18
17
  hash
19
18
  });
20
19
  const contractAddress = receipt.contractAddress;
package/dest/index.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export { createSandbox, getDeployedBananaCoinAddress, getDeployedBananaFPCAddress, getDeployedSponsoredFPCAddress, SponsoredFeePaymentMethod, } 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,EAC9B,yBAAyB,GAC1B,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, SponsoredFeePaymentMethod } 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"}