@aztec/cli 0.0.1-commit.b33fc05d0 → 0.0.1-commit.b3d3157a

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 (51) hide show
  1. package/dest/cmds/aztec_node/block_number.js +1 -1
  2. package/dest/cmds/aztec_node/get_logs.d.ts +30 -4
  3. package/dest/cmds/aztec_node/get_logs.d.ts.map +1 -1
  4. package/dest/cmds/aztec_node/get_logs.js +39 -29
  5. package/dest/cmds/aztec_node/get_node_info.d.ts +1 -1
  6. package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -1
  7. package/dest/cmds/aztec_node/get_node_info.js +0 -2
  8. package/dest/cmds/aztec_node/index.d.ts +1 -1
  9. package/dest/cmds/aztec_node/index.d.ts.map +1 -1
  10. package/dest/cmds/aztec_node/index.js +13 -3
  11. package/dest/cmds/infrastructure/setup_l2_contract.d.ts +1 -1
  12. package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
  13. package/dest/cmds/infrastructure/setup_l2_contract.js +5 -1
  14. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +1 -1
  15. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -1
  16. package/dest/cmds/l1/deploy_l1_contracts_cmd.js +0 -1
  17. package/dest/cmds/l1/deploy_new_rollup.d.ts +1 -1
  18. package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
  19. package/dest/cmds/l1/deploy_new_rollup.js +2 -4
  20. package/dest/cmds/l1/update_l1_validators.d.ts +1 -1
  21. package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
  22. package/dest/cmds/l1/update_l1_validators.js +0 -1
  23. package/dest/config/generated/networks.d.ts +31 -32
  24. package/dest/config/generated/networks.d.ts.map +1 -1
  25. package/dest/config/generated/networks.js +30 -31
  26. package/dest/config/network_config.d.ts +1 -1
  27. package/dest/config/network_config.d.ts.map +1 -1
  28. package/dest/config/network_config.js +3 -0
  29. package/dest/utils/aztec.d.ts +1 -2
  30. package/dest/utils/aztec.d.ts.map +1 -1
  31. package/dest/utils/aztec.js +2 -3
  32. package/dest/utils/commands.d.ts +14 -6
  33. package/dest/utils/commands.d.ts.map +1 -1
  34. package/dest/utils/commands.js +19 -9
  35. package/dest/utils/inspect.d.ts +1 -1
  36. package/dest/utils/inspect.d.ts.map +1 -1
  37. package/dest/utils/inspect.js +11 -11
  38. package/package.json +30 -30
  39. package/src/cmds/aztec_node/block_number.ts +1 -1
  40. package/src/cmds/aztec_node/get_logs.ts +70 -38
  41. package/src/cmds/aztec_node/get_node_info.ts +0 -2
  42. package/src/cmds/aztec_node/index.ts +13 -8
  43. package/src/cmds/infrastructure/setup_l2_contract.ts +4 -0
  44. package/src/cmds/l1/deploy_l1_contracts_cmd.ts +0 -1
  45. package/src/cmds/l1/deploy_new_rollup.ts +1 -3
  46. package/src/cmds/l1/update_l1_validators.ts +0 -1
  47. package/src/config/generated/networks.ts +30 -31
  48. package/src/config/network_config.ts +3 -0
  49. package/src/utils/aztec.ts +12 -18
  50. package/src/utils/commands.ts +22 -9
  51. package/src/utils/inspect.ts +7 -8
@@ -13,7 +13,7 @@ export const devnetConfig = {
13
13
  AZTEC_MANA_TARGET: 100000000,
14
14
  AZTEC_PROVING_COST_PER_MANA: 100,
15
15
  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
16
- AZTEC_SLASHER_FLAVOR: 'tally',
16
+ AZTEC_SLASHER_ENABLED: true,
17
17
  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
18
18
  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
19
19
  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
@@ -23,11 +23,10 @@ export const devnetConfig = {
23
23
  AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
24
24
  AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
25
25
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
26
- SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
27
- SLASH_MAX_PENALTY_PERCENTAGE: 2,
28
26
  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
29
27
  SLASH_MAX_PAYLOAD_SIZE: 80,
30
28
  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
29
+ SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
31
30
  P2P_ENABLED: true,
32
31
  BOOTSTRAP_NODES: '',
33
32
  SEQ_MIN_TX_PER_BLOCK: 1,
@@ -60,7 +59,6 @@ export const devnetConfig = {
60
59
  PUBLIC_OTEL_OPT_OUT: true,
61
60
  PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
62
61
  PUBLIC_OTEL_COLLECT_FROM: '',
63
- SLASH_PRUNE_PENALTY: 10000000000000000000,
64
62
  SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
65
63
  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
66
64
  SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
@@ -68,9 +66,11 @@ export const devnetConfig = {
68
66
  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
69
67
  SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
70
68
  SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
71
- SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
69
+ SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
70
+ SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 10000000000000000000,
72
71
  SLASH_UNKNOWN_PENALTY: 10000000000000000000,
73
72
  SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
73
+ SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
74
74
  SLASH_GRACE_PERIOD_L2_SLOTS: 0,
75
75
  ENABLE_VERSION_CHECK: true
76
76
  };
@@ -84,16 +84,15 @@ export const testnetConfig = {
84
84
  AZTEC_INBOX_LAG: 1,
85
85
  AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
86
86
  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
87
- AZTEC_SLASHER_FLAVOR: 'tally',
87
+ AZTEC_SLASHER_ENABLED: true,
88
88
  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
89
89
  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
90
90
  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
91
91
  AZTEC_SLASHING_DISABLE_DURATION: 432000,
92
- SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
93
- SLASH_MAX_PENALTY_PERCENTAGE: 2,
94
92
  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
95
93
  SLASH_MAX_PAYLOAD_SIZE: 80,
96
94
  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
95
+ SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
97
96
  P2P_ENABLED: true,
98
97
  BOOTSTRAP_NODES: '',
99
98
  SEQ_MIN_TX_PER_BLOCK: 1,
@@ -117,10 +116,10 @@ export const testnetConfig = {
117
116
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
118
117
  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
119
118
  AZTEC_MANA_TARGET: 75000000,
120
- AZTEC_PROVING_COST_PER_MANA: 25000000,
119
+ AZTEC_PROVING_COST_PER_MANA: 12500000,
121
120
  AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
122
- AZTEC_SLASH_AMOUNT_MEDIUM: 1E+23,
123
- AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
121
+ AZTEC_SLASH_AMOUNT_MEDIUM: 2.5E+23,
122
+ AZTEC_SLASH_AMOUNT_LARGE: 2.5E+23,
124
123
  L1_CHAIN_ID: 11155111,
125
124
  TEST_ACCOUNTS: false,
126
125
  SPONSORED_FPC: false,
@@ -129,17 +128,18 @@ export const testnetConfig = {
129
128
  PROVER_REAL_PROOFS: true,
130
129
  P2P_MAX_PENDING_TX_COUNT: 1000,
131
130
  P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
132
- SLASH_PRUNE_PENALTY: 10000000000000000000,
133
- SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
131
+ SLASH_DATA_WITHHOLDING_PENALTY: 0,
134
132
  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
135
133
  SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
136
- SLASH_INACTIVITY_PENALTY: 10000000000000000000,
137
- SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
138
- SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
139
- SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
140
- SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
141
- SLASH_UNKNOWN_PENALTY: 10000000000000000000,
142
- SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
134
+ SLASH_INACTIVITY_PENALTY: 1E+23,
135
+ SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 1E+23,
136
+ SLASH_DUPLICATE_PROPOSAL_PENALTY: 2.5E+23,
137
+ SLASH_DUPLICATE_ATTESTATION_PENALTY: 2.5E+23,
138
+ SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
139
+ SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
140
+ SLASH_UNKNOWN_PENALTY: 1E+23,
141
+ SLASH_INVALID_BLOCK_PENALTY: 1E+23,
142
+ SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1E+23,
143
143
  SLASH_GRACE_PERIOD_L2_SLOTS: 64,
144
144
  ENABLE_VERSION_CHECK: true
145
145
  };
@@ -152,14 +152,13 @@ export const mainnetConfig = {
152
152
  AZTEC_INBOX_LAG: 1,
153
153
  AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
154
154
  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
155
- AZTEC_SLASHER_FLAVOR: 'tally',
155
+ AZTEC_SLASHER_ENABLED: true,
156
156
  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
157
157
  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
158
- SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
159
- SLASH_MAX_PENALTY_PERCENTAGE: 2,
160
158
  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
161
159
  SLASH_MAX_PAYLOAD_SIZE: 80,
162
160
  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
161
+ SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
163
162
  P2P_ENABLED: true,
164
163
  BOOTSTRAP_NODES: '',
165
164
  SEQ_MIN_TX_PER_BLOCK: 1,
@@ -178,8 +177,8 @@ export const mainnetConfig = {
178
177
  AZTEC_EJECTION_THRESHOLD: 1E+23,
179
178
  AZTEC_LOCAL_EJECTION_THRESHOLD: 1.9E+23,
180
179
  AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
181
- AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
182
- AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
180
+ AZTEC_SLASH_AMOUNT_MEDIUM: 5E+21,
181
+ AZTEC_SLASH_AMOUNT_LARGE: 5E+21,
183
182
  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 34,
184
183
  AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 28,
185
184
  AZTEC_SLASHING_VETOER: '0xBbB4aF368d02827945748b28CD4b2D42e4A37480',
@@ -187,7 +186,7 @@ export const mainnetConfig = {
187
186
  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
188
187
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
189
188
  AZTEC_MANA_TARGET: 75000000,
190
- AZTEC_PROVING_COST_PER_MANA: 25000000,
189
+ AZTEC_PROVING_COST_PER_MANA: 12500000,
191
190
  AZTEC_EXIT_DELAY_SECONDS: 345600,
192
191
  AZTEC_SLASHING_DISABLE_DURATION: 259200,
193
192
  AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
@@ -201,23 +200,23 @@ export const mainnetConfig = {
201
200
  TRANSACTIONS_DISABLED: false,
202
201
  SEQ_MAX_TX_PER_CHECKPOINT: 72,
203
202
  PROVER_REAL_PROOFS: true,
204
- SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
205
203
  BLOB_ALLOW_EMPTY_SOURCES: true,
206
204
  P2P_MAX_PENDING_TX_COUNT: 1000,
207
205
  P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
208
206
  PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
209
207
  PUBLIC_OTEL_COLLECT_FROM: '',
210
208
  ENABLE_VERSION_CHECK: false,
211
- SLASH_PRUNE_PENALTY: 0,
212
209
  SLASH_DATA_WITHHOLDING_PENALTY: 0,
213
210
  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
214
211
  SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
215
212
  SLASH_INACTIVITY_PENALTY: 2E+21,
216
213
  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
217
- SLASH_DUPLICATE_PROPOSAL_PENALTY: 2E+21,
218
- SLASH_DUPLICATE_ATTESTATION_PENALTY: 2E+21,
219
- SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2E+21,
214
+ SLASH_DUPLICATE_PROPOSAL_PENALTY: 5E+21,
215
+ SLASH_DUPLICATE_ATTESTATION_PENALTY: 5E+21,
216
+ SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
217
+ SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
220
218
  SLASH_UNKNOWN_PENALTY: 2E+21,
221
219
  SLASH_INVALID_BLOCK_PENALTY: 2E+21,
220
+ SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2E+21,
222
221
  SLASH_GRACE_PERIOD_L2_SLOTS: 1200
223
222
  };
@@ -19,4 +19,4 @@ export declare function getNetworkConfig(networkName: NetworkNames, cacheDir?: s
19
19
  * Does not throw if the network simply doesn't exist in the config - just returns without enriching
20
20
  */
21
21
  export declare function enrichEnvironmentWithNetworkConfig(networkName: NetworkNames): Promise<void>;
22
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBWXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXNERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkE4QmpGIn0=
22
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBWXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXNERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkFpQ2pGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAsDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBA8BjF"}
1
+ {"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAsDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBAiCjF"}
@@ -107,6 +107,9 @@ const FALLBACK_CONFIG_URL = 'https://metadata.aztec.network/network_config.json'
107
107
  if (networkConfig.blobFileStoreUrls?.length) {
108
108
  enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
109
109
  }
110
+ if (networkConfig.txCollectionFileStoreUrls?.length) {
111
+ enrichVar('TX_COLLECTION_FILE_STORE_URLS', networkConfig.txCollectionFileStoreUrls.join(','));
112
+ }
110
113
  if (networkConfig.blockDurationMs !== undefined) {
111
114
  enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
112
115
  }
@@ -15,7 +15,6 @@ import type { NoirPackageConfig } from '@aztec/foundation/noir';
15
15
  export declare function getFunctionAbi(artifact: ContractArtifact, fnName: string): FunctionAbi;
16
16
  export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], privateKey: string | undefined, chainId: number, mnemonic: string, mnemonicIndex: number, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean): Promise<{
17
17
  rollup: RollupContract;
18
- slashFactoryAddress: EthAddress;
19
18
  }>;
20
19
  /**
21
20
  * Gets all contracts available in \@aztec/noir-contracts.js.
@@ -54,4 +53,4 @@ export declare const stripLeadingHex: (hex: string) => string;
54
53
  */
55
54
  export declare const addLeadingHex: (hex: string) => `0x${string}`;
56
55
  export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
57
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUFDLG1CQUFtQixFQUFFLFVBQVUsQ0FBQTtDQUFFLENBQUMsQ0FnRHRFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9
56
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQTtDQUFFLENBQUMsQ0EwQ3JDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9
@@ -1 +1 @@
1
- {"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAWhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAgDtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,yBAK3B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gCAKzB,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}
1
+ {"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAWhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC,CA0CrC;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,yBAK3B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gCAKzB,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}
@@ -51,7 +51,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
51
51
  initialValidators
52
52
  });
53
53
  }
54
- const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(privateKey, rpcUrls[0], chainId, registryAddress, {
54
+ const { rollup } = await deployRollupForUpgrade(privateKey, rpcUrls[0], chainId, registryAddress, {
55
55
  vkTreeRoot: getVKTreeRoot(),
56
56
  protocolContractsHash,
57
57
  genesisArchiveRoot,
@@ -61,8 +61,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
61
61
  ...config
62
62
  });
63
63
  return {
64
- rollup,
65
- slashFactoryAddress: EthAddress.fromString(slashFactoryAddress)
64
+ rollup
66
65
  };
67
66
  }
68
67
  /**
@@ -5,9 +5,10 @@ import type { PXE } from '@aztec/pxe/server';
5
5
  import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
6
6
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
7
7
  import { PublicKeys } from '@aztec/stdlib/keys';
8
- import { LogId } from '@aztec/stdlib/logs/log-id';
8
+ import { LogCursor, Tag } from '@aztec/stdlib/logs';
9
9
  import { TxHash } from '@aztec/stdlib/tx/tx-hash';
10
10
  import { type Command, Option } from 'commander';
11
+ export { LogCursor };
11
12
  /**
12
13
  * If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
13
14
  * localhost as being host.docker.internal.
@@ -73,12 +74,19 @@ export declare function parseEthereumAddress(address: string): EthAddress;
73
74
  */
74
75
  export declare function parseOptionalAztecAddress(address: string): AztecAddress | undefined;
75
76
  /**
76
- * Parses an optional log ID string into a LogId object.
77
+ * Parses an optional `<blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx>` triple into a {@link LogCursor},
78
+ * used as the `--after-log` argument of `get-logs` to resume pagination strictly after a previously-seen log.
79
+ * Thin wrapper over {@link LogCursor.parseOptional} that surfaces parse errors as commander's
80
+ * {@link InvalidArgumentError}.
81
+ */
82
+ export declare function parseOptionalLogCursor(value: string): LogCursor | undefined;
83
+ /**
84
+ * Parses a log tag from a string. Tags are field-element values; we delegate to the {@link parseField} parser.
77
85
  *
78
- * @param logId - The log ID string to parse.
79
- * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
86
+ * @param tag - A hex string, integer, or boolean string representing the tag.
87
+ * @returns A {@link Tag} wrapping the parsed field.
80
88
  */
81
- export declare function parseOptionalLogId(logId: string): LogId | undefined;
89
+ export declare function parseTag(tag: string): Tag;
82
90
  /**
83
91
  * Parses a selector from a string.
84
92
  * @param selector - A serialized selector.
@@ -149,4 +157,4 @@ export declare function parseFields(fields: string[]): Fr[];
149
157
  * @returns A JSON string
150
158
  */
151
159
  export declare function prettyPrintJSON(data: Record<string, any>): string;
152
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVsRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQXdDLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUl2Rjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sWUFBWSx1QkFHSSxDQUFDO0FBRTlCLGVBQU8sTUFBTSxTQUFTLFFBQXVCLENBQUM7QUFDOUMsZUFBTyxNQUFRLGNBQWMsVUFBK0IsV0FBVyxzQkFBRSxRQUFRLHNCQUFFLE9BQU8sc0JBQUUsV0FBVyxvQkFBZ0IsQ0FBQztBQUV4SCx3QkFBZ0IsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUc3RDtBQUVELGVBQU8sTUFBTSxjQUFjLGdDQUlRLENBQUM7QUFFcEMsZUFBTyxNQUFNLFVBQVUsUUFBdUIsQ0FBQztBQUUvQyxlQUFPLE1BQU0sZUFBZSxRQVN4QixDQUFDO0FBRUwsZUFBTyxN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
160
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbEQsT0FBTyxFQUFFLEtBQUssT0FBTyxFQUF3QyxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFJdkYsT0FBTyxFQUFFLFNBQVMsRUFBRSxDQUFDO0FBRXJCOzs7R0FHRztBQUNILGVBQU8sTUFBTSxZQUFZLHVCQUdJLENBQUM7QUFFOUIsZUFBTyxNQUFNLFNBQVMsUUFBdUIsQ0FBQztBQUM5QyxlQUFPLE1BQVEsY0FBYyxVQUErQixXQUFXLHNCQUFFLFFBQVEsc0JBQUUsT0FBTyxzQkFBRSxXQUFXLG9CQUFnQixDQUFDO0FBRXhILHdCQUFnQixVQUFVLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBRzdEO0FBRUQsZUFBTyxNQUFNLGNBQWMsZ0NBSVEsQ0FBQztBQUVwQyxlQUFPLE1BQU0sVUFBVSxRQUF1QixDQUFDO0FB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
@@ -1 +1 @@
1
- {"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}
@@ -3,11 +3,12 @@ import { EthAddress } from '@aztec/foundation/eth-address';
3
3
  import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
4
4
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
5
5
  import { PublicKeys } from '@aztec/stdlib/keys';
6
- import { LogId } from '@aztec/stdlib/logs/log-id';
6
+ import { LogCursor, Tag } from '@aztec/stdlib/logs';
7
7
  import { TxHash } from '@aztec/stdlib/tx/tx-hash';
8
8
  import { CommanderError, InvalidArgumentError, Option } from 'commander';
9
9
  import { lookup } from 'dns/promises';
10
10
  import { rename, writeFile } from 'fs/promises';
11
+ export { LogCursor };
11
12
  /**
12
13
  * If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
13
14
  * localhost as being host.docker.internal.
@@ -166,15 +167,24 @@ export function parseBigint(bigint) {
166
167
  return parseAztecAddress(address);
167
168
  }
168
169
  /**
169
- * Parses an optional log ID string into a LogId object.
170
- *
171
- * @param logId - The log ID string to parse.
172
- * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
173
- */ export function parseOptionalLogId(logId) {
174
- if (!logId) {
175
- return undefined;
170
+ * Parses an optional `<blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx>` triple into a {@link LogCursor},
171
+ * used as the `--after-log` argument of `get-logs` to resume pagination strictly after a previously-seen log.
172
+ * Thin wrapper over {@link LogCursor.parseOptional} that surfaces parse errors as commander's
173
+ * {@link InvalidArgumentError}.
174
+ */ export function parseOptionalLogCursor(value) {
175
+ try {
176
+ return LogCursor.parseOptional(value);
177
+ } catch (err) {
178
+ throw new InvalidArgumentError(err instanceof Error ? err.message : String(err));
176
179
  }
177
- return LogId.fromString(logId);
180
+ }
181
+ /**
182
+ * Parses a log tag from a string. Tags are field-element values; we delegate to the {@link parseField} parser.
183
+ *
184
+ * @param tag - A hex string, integer, or boolean string representing the tag.
185
+ * @returns A {@link Tag} wrapping the parsed field.
186
+ */ export function parseTag(tag) {
187
+ return new Tag(parseField(tag));
178
188
  }
179
189
  /**
180
190
  * Parses a selector from a string.
@@ -8,4 +8,4 @@ export declare function inspectBlock(aztecNode: AztecNode, blockNumber: BlockNum
8
8
  export declare function inspectTx(aztecNode: AztecNode, txHash: TxHash, log: LogFn, opts?: {
9
9
  includeBlockInfo?: boolean;
10
10
  }): Promise<void>;
11
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zcGVjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2luc3BlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHdCQUFzQixZQUFZLENBQ2hDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEdBQUcsRUFBRSxLQUFLLEVBQ1YsSUFBSSxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQU8saUJBMEJqQztBQUVELHdCQUFzQixTQUFTLENBQzdCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxFQUFFLEtBQUssRUFDVixJQUFJLEdBQUU7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFPLGlCQXNFMUMifQ==
11
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zcGVjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2luc3BlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHdCQUFzQixZQUFZLENBQ2hDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEdBQUcsRUFBRSxLQUFLLEVBQ1YsSUFBSSxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQU8saUJBeUJqQztBQUVELHdCQUFzQixTQUFTLENBQzdCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxFQUFFLEtBQUssRUFDVixJQUFJLEdBQUU7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFPLGlCQXNFMUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0BjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,iBAsE1C"}
1
+ {"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBAyBjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,iBAsE1C"}
@@ -1,33 +1,33 @@
1
1
  export async function inspectBlock(aztecNode, blockNumber, log, opts = {}) {
2
- const block = await aztecNode.getBlock(blockNumber);
2
+ const block = await aztecNode.getBlock(blockNumber, {
3
+ includeTransactions: opts.showTxs
4
+ });
3
5
  if (!block) {
4
6
  log(`No block found for block number ${blockNumber}`);
5
7
  return;
6
8
  }
7
- const blockHash = await block.hash();
8
- log(`Block ${blockNumber} (${blockHash.toString()})`);
9
+ log(`Block ${blockNumber} (${block.hash.toString()})`);
9
10
  log(` Total fees: ${block.header.totalFees.toBigInt()}`);
10
11
  log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
11
12
  log(` Fee per gas unit: DA=${block.header.globalVariables.gasFees.feePerDaGas} L2=${block.header.globalVariables.gasFees.feePerL2Gas}`);
12
13
  log(` Coinbase: ${block.header.globalVariables.coinbase}`);
13
14
  log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
14
15
  log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
15
- if (opts.showTxs) {
16
+ if (opts.showTxs && block.body) {
16
17
  log(``);
17
18
  for (const txHash of block.body.txEffects.map((tx)=>tx.txHash)){
18
19
  await inspectTx(aztecNode, txHash, log, {
19
20
  includeBlockInfo: false
20
21
  });
21
22
  }
22
- } else {
23
+ } else if (block.body) {
23
24
  log(` Transactions: ${block.body.txEffects.length}`);
24
25
  }
25
26
  }
26
27
  export async function inspectTx(aztecNode, txHash, log, opts = {}) {
27
- const [receipt, effectsInBlock] = await Promise.all([
28
- aztecNode.getTxReceipt(txHash),
29
- aztecNode.getTxEffect(txHash)
30
- ]);
28
+ const receipt = await aztecNode.getTxReceipt(txHash, {
29
+ includeTxEffect: true
30
+ });
31
31
  // Base tx data
32
32
  log(`Tx ${txHash.toString()}`);
33
33
  log(` Status: ${receipt.status}`);
@@ -37,10 +37,10 @@ export async function inspectTx(aztecNode, txHash, log, opts = {}) {
37
37
  if (receipt.error) {
38
38
  log(` Error: ${receipt.error}`);
39
39
  }
40
- if (!effectsInBlock) {
40
+ if (!receipt.isMined() || !receipt.txEffect) {
41
41
  return;
42
42
  }
43
- const effects = effectsInBlock.data;
43
+ const effects = receipt.txEffect;
44
44
  if (opts.includeBlockInfo) {
45
45
  log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
46
46
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "0.0.1-commit.b33fc05d0",
3
+ "version": "0.0.1-commit.b3d3157a",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./contracts": "./dest/cmds/contracts/index.js",
@@ -77,23 +77,23 @@
77
77
  ]
78
78
  },
79
79
  "dependencies": {
80
- "@aztec/accounts": "0.0.1-commit.b33fc05d0",
81
- "@aztec/archiver": "0.0.1-commit.b33fc05d0",
82
- "@aztec/aztec.js": "0.0.1-commit.b33fc05d0",
83
- "@aztec/constants": "0.0.1-commit.b33fc05d0",
84
- "@aztec/entrypoints": "0.0.1-commit.b33fc05d0",
85
- "@aztec/ethereum": "0.0.1-commit.b33fc05d0",
86
- "@aztec/foundation": "0.0.1-commit.b33fc05d0",
87
- "@aztec/l1-artifacts": "0.0.1-commit.b33fc05d0",
88
- "@aztec/node-keystore": "0.0.1-commit.b33fc05d0",
89
- "@aztec/node-lib": "0.0.1-commit.b33fc05d0",
90
- "@aztec/p2p": "0.0.1-commit.b33fc05d0",
91
- "@aztec/protocol-contracts": "0.0.1-commit.b33fc05d0",
92
- "@aztec/sequencer-client": "0.0.1-commit.b33fc05d0",
93
- "@aztec/slasher": "0.0.1-commit.b33fc05d0",
94
- "@aztec/stdlib": "0.0.1-commit.b33fc05d0",
95
- "@aztec/wallets": "0.0.1-commit.b33fc05d0",
96
- "@aztec/world-state": "0.0.1-commit.b33fc05d0",
80
+ "@aztec/accounts": "0.0.1-commit.b3d3157a",
81
+ "@aztec/archiver": "0.0.1-commit.b3d3157a",
82
+ "@aztec/aztec.js": "0.0.1-commit.b3d3157a",
83
+ "@aztec/constants": "0.0.1-commit.b3d3157a",
84
+ "@aztec/entrypoints": "0.0.1-commit.b3d3157a",
85
+ "@aztec/ethereum": "0.0.1-commit.b3d3157a",
86
+ "@aztec/foundation": "0.0.1-commit.b3d3157a",
87
+ "@aztec/l1-artifacts": "0.0.1-commit.b3d3157a",
88
+ "@aztec/node-keystore": "0.0.1-commit.b3d3157a",
89
+ "@aztec/node-lib": "0.0.1-commit.b3d3157a",
90
+ "@aztec/p2p": "0.0.1-commit.b3d3157a",
91
+ "@aztec/protocol-contracts": "0.0.1-commit.b3d3157a",
92
+ "@aztec/sequencer-client": "0.0.1-commit.b3d3157a",
93
+ "@aztec/slasher": "0.0.1-commit.b3d3157a",
94
+ "@aztec/stdlib": "0.0.1-commit.b3d3157a",
95
+ "@aztec/wallets": "0.0.1-commit.b3d3157a",
96
+ "@aztec/world-state": "0.0.1-commit.b3d3157a",
97
97
  "@ethersproject/wallet": "^5.8.0",
98
98
  "@iarna/toml": "^2.2.5",
99
99
  "@libp2p/peer-id-factory": "^3.0.4",
@@ -107,9 +107,9 @@
107
107
  "viem": "npm:@aztec/viem@2.38.2"
108
108
  },
109
109
  "devDependencies": {
110
- "@aztec/aztec-node": "0.0.1-commit.b33fc05d0",
111
- "@aztec/kv-store": "0.0.1-commit.b33fc05d0",
112
- "@aztec/telemetry-client": "0.0.1-commit.b33fc05d0",
110
+ "@aztec/aztec-node": "0.0.1-commit.b3d3157a",
111
+ "@aztec/kv-store": "0.0.1-commit.b3d3157a",
112
+ "@aztec/telemetry-client": "0.0.1-commit.b3d3157a",
113
113
  "@jest/globals": "^30.0.0",
114
114
  "@types/jest": "^30.0.0",
115
115
  "@types/lodash.chunk": "^4.2.9",
@@ -126,15 +126,15 @@
126
126
  "typescript": "^5.3.3"
127
127
  },
128
128
  "peerDependencies": {
129
- "@aztec/accounts": "0.0.1-commit.b33fc05d0",
130
- "@aztec/bb-prover": "0.0.1-commit.b33fc05d0",
131
- "@aztec/ethereum": "0.0.1-commit.b33fc05d0",
132
- "@aztec/l1-artifacts": "0.0.1-commit.b33fc05d0",
133
- "@aztec/noir-contracts.js": "0.0.1-commit.b33fc05d0",
134
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b33fc05d0",
135
- "@aztec/noir-test-contracts.js": "0.0.1-commit.b33fc05d0",
136
- "@aztec/protocol-contracts": "0.0.1-commit.b33fc05d0",
137
- "@aztec/stdlib": "0.0.1-commit.b33fc05d0"
129
+ "@aztec/accounts": "0.0.1-commit.b3d3157a",
130
+ "@aztec/bb-prover": "0.0.1-commit.b3d3157a",
131
+ "@aztec/ethereum": "0.0.1-commit.b3d3157a",
132
+ "@aztec/l1-artifacts": "0.0.1-commit.b3d3157a",
133
+ "@aztec/noir-contracts.js": "0.0.1-commit.b3d3157a",
134
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b3d3157a",
135
+ "@aztec/noir-test-contracts.js": "0.0.1-commit.b3d3157a",
136
+ "@aztec/protocol-contracts": "0.0.1-commit.b3d3157a",
137
+ "@aztec/stdlib": "0.0.1-commit.b3d3157a"
138
138
  },
139
139
  "files": [
140
140
  "dest",
@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
3
3
 
4
4
  export async function blockNumber(nodeUrl: string, log: LogFn) {
5
5
  const aztecNode = createAztecNodeClient(nodeUrl);
6
- const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getProvenBlockNumber()]);
6
+ const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getBlockNumber('proven')]);
7
7
  log(`Latest block: ${latestNum}`);
8
8
  log(`Proven block: ${provenNum}`);
9
9
  }