@aztec/cli 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/dest/config/generated/networks.js

@@ -2,13 +2,11 @@
 // Do not edit manually - run yarn generate to regenerate
 export const devnetConfig = {
     ETHEREUM_SLOT_DURATION: 12,
-    AZTEC_SLOT_DURATION: 72,
-    AZTEC_TARGET_COMMITTEE_SIZE: 48,
     AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
     AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
     AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
     AZTEC_EXIT_DELAY_SECONDS: 172800,
-    AZTEC_INBOX_LAG: 1,
+    AZTEC_INBOX_LAG: 2,
     AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
     AZTEC_MANA_TARGET: 100000000,
     AZTEC_PROVING_COST_PER_MANA: 100,
@@ -23,6 +21,11 @@ export const devnetConfig = {
     AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
     AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
     AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
+    AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
+    AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
+    AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
+    AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
+    AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
     SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
     SLASH_MAX_PAYLOAD_SIZE: 80,
     SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
@@ -32,7 +35,7 @@ export const devnetConfig = {
     SEQ_MIN_TX_PER_BLOCK: 1,
     SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
     SEQ_BLOCK_DURATION_MS: 6000,
-    SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
+    CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -40,10 +43,16 @@ export const devnetConfig = {
     PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
     PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
     SENTINEL_ENABLED: true,
+    OFFENSE_COLLECTION_ENABLED: true,
+    AZTEC_SLOT_DURATION: 36,
     AZTEC_EPOCH_DURATION: 8,
     AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1,
     AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
+    AZTEC_TARGET_COMMITTEE_SIZE: 1,
+    MAX_BLOCKS_PER_CHECKPOINT: 4,
     AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1,
+    AZTEC_SLASHING_QUORUM: 17,
+    AZTEC_GOVERNANCE_PROPOSER_QUORUM: 151,
     L1_CHAIN_ID: 11155111,
     TEST_ACCOUNTS: true,
     SPONSORED_FPC: true,
@@ -72,7 +81,7 @@ export const devnetConfig = {
     SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
     SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
     SLASH_GRACE_PERIOD_L2_SLOTS: 0,
-    ENABLE_VERSION_CHECK: true
+    ENABLE_AUTO_SHUTDOWN: false
 };
 export const testnetConfig = {
     ETHEREUM_SLOT_DURATION: 12,
@@ -81,7 +90,7 @@ export const testnetConfig = {
     AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
     AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
     AZTEC_EXIT_DELAY_SECONDS: 172800,
-    AZTEC_INBOX_LAG: 1,
+    AZTEC_INBOX_LAG: 2,
     AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
     AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
     AZTEC_SLASHER_ENABLED: true,
@@ -89,6 +98,11 @@ export const testnetConfig = {
     AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
     AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
     AZTEC_SLASHING_DISABLE_DURATION: 432000,
+    AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
+    AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
+    AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
+    AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
+    AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
     SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
     SLASH_MAX_PAYLOAD_SIZE: 80,
     SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
@@ -98,7 +112,8 @@ export const testnetConfig = {
     SEQ_MIN_TX_PER_BLOCK: 1,
     SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
     SEQ_BLOCK_DURATION_MS: 6000,
-    SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
+    MAX_BLOCKS_PER_CHECKPOINT: 10,
+    CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -106,6 +121,7 @@ export const testnetConfig = {
     PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
     PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
     SENTINEL_ENABLED: true,
+    OFFENSE_COLLECTION_ENABLED: true,
     AZTEC_SLOT_DURATION: 72,
     AZTEC_ACTIVATION_THRESHOLD: 2E+23,
     AZTEC_EJECTION_THRESHOLD: 1E+23,
@@ -116,10 +132,10 @@ export const testnetConfig = {
     AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
     AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
     AZTEC_MANA_TARGET: 75000000,
-    AZTEC_PROVING_COST_PER_MANA: 25000000,
+    AZTEC_PROVING_COST_PER_MANA: 12500000,
     AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
-    AZTEC_SLASH_AMOUNT_MEDIUM: 1E+23,
-    AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
+    AZTEC_SLASH_AMOUNT_MEDIUM: 2.5E+23,
+    AZTEC_SLASH_AMOUNT_LARGE: 2.5E+23,
     L1_CHAIN_ID: 11155111,
     TEST_ACCOUNTS: false,
     SPONSORED_FPC: false,
@@ -128,20 +144,20 @@ export const testnetConfig = {
     PROVER_REAL_PROOFS: true,
     P2P_MAX_PENDING_TX_COUNT: 1000,
     P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
-    SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
+    SLASH_DATA_WITHHOLDING_PENALTY: 0,
     SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
     SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
-    SLASH_INACTIVITY_PENALTY: 10000000000000000000,
-    SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
-    SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
-    SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
-    SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
-    SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 10000000000000000000,
-    SLASH_UNKNOWN_PENALTY: 10000000000000000000,
-    SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
-    SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
+    SLASH_INACTIVITY_PENALTY: 1E+23,
+    SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 1E+23,
+    SLASH_DUPLICATE_PROPOSAL_PENALTY: 2.5E+23,
+    SLASH_DUPLICATE_ATTESTATION_PENALTY: 2.5E+23,
+    SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
+    SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
+    SLASH_UNKNOWN_PENALTY: 1E+23,
+    SLASH_INVALID_BLOCK_PENALTY: 1E+23,
+    SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1E+23,
     SLASH_GRACE_PERIOD_L2_SLOTS: 64,
-    ENABLE_VERSION_CHECK: true
+    ENABLE_AUTO_SHUTDOWN: false
 };
 export const mainnetConfig = {
     ETHEREUM_SLOT_DURATION: 12,
@@ -149,7 +165,7 @@ export const mainnetConfig = {
     AZTEC_TARGET_COMMITTEE_SIZE: 48,
     AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
     AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
-    AZTEC_INBOX_LAG: 1,
+    AZTEC_INBOX_LAG: 2,
     AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
     AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
     AZTEC_SLASHER_ENABLED: true,
@@ -164,7 +180,8 @@ export const mainnetConfig = {
     SEQ_MIN_TX_PER_BLOCK: 1,
     SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
     SEQ_BLOCK_DURATION_MS: 6000,
-    SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
+    MAX_BLOCKS_PER_CHECKPOINT: 10,
+    CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -172,13 +189,14 @@ export const mainnetConfig = {
     PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
     PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
     SENTINEL_ENABLED: true,
+    OFFENSE_COLLECTION_ENABLED: true,
     AZTEC_SLOT_DURATION: 72,
     AZTEC_ACTIVATION_THRESHOLD: 2E+23,
     AZTEC_EJECTION_THRESHOLD: 1E+23,
     AZTEC_LOCAL_EJECTION_THRESHOLD: 1.9E+23,
     AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
-    AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
-    AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
+    AZTEC_SLASH_AMOUNT_MEDIUM: 5E+21,
+    AZTEC_SLASH_AMOUNT_LARGE: 5E+21,
     AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 34,
     AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 28,
     AZTEC_SLASHING_VETOER: '0xBbB4aF368d02827945748b28CD4b2D42e4A37480',
@@ -186,7 +204,7 @@ export const mainnetConfig = {
     AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
     AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
     AZTEC_MANA_TARGET: 75000000,
-    AZTEC_PROVING_COST_PER_MANA: 25000000,
+    AZTEC_PROVING_COST_PER_MANA: 12500000,
     AZTEC_EXIT_DELAY_SECONDS: 345600,
     AZTEC_SLASHING_DISABLE_DURATION: 259200,
     AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
@@ -205,18 +223,18 @@ export const mainnetConfig = {
     P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
     PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
     PUBLIC_OTEL_COLLECT_FROM: '',
-    ENABLE_VERSION_CHECK: false,
+    ENABLE_AUTO_SHUTDOWN: false,
     SLASH_DATA_WITHHOLDING_PENALTY: 0,
-    SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
+    SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.7,
     SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
     SLASH_INACTIVITY_PENALTY: 2E+21,
     SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
-    SLASH_DUPLICATE_PROPOSAL_PENALTY: 2E+21,
-    SLASH_DUPLICATE_ATTESTATION_PENALTY: 2E+21,
-    SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 2E+21,
-    SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2E+21,
+    SLASH_DUPLICATE_PROPOSAL_PENALTY: 5E+21,
+    SLASH_DUPLICATE_ATTESTATION_PENALTY: 5E+21,
+    SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
+    SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
     SLASH_UNKNOWN_PENALTY: 2E+21,
     SLASH_INVALID_BLOCK_PENALTY: 2E+21,
-    SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
-    SLASH_GRACE_PERIOD_L2_SLOTS: 1200
+    SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2E+21,
+    SLASH_GRACE_PERIOD_L2_SLOTS: 8400
 };

package/dest/utils/commands.d.ts

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import type { PXE } from '@aztec/pxe/server';
@@ -20,7 +21,7 @@ export declare function addOptions(program: Command, options: Option[]): Command
 export declare const makeNodeOption: (mandatory: boolean) => Option;
 export declare const nodeOption: Option;
 export declare const l1ChainIdOption: Option;
-export declare const createSecretKeyOption: (description: string, mandatory: boolean, argsParser?: ((value: string, previous: Fr) => Fr) | undefined) => Option;
+export declare const createSigningKeyOption: (description: string, mandatory: boolean, argsParser?: ((value: string, previous: import("@aztec/foundation/curves/bn254").Fq) => import("@aztec/foundation/curves/bn254").Fq) | undefined) => Option;
 export declare const logJson: (log: LogFn) => (obj: object) => void;
 /**
  * Updates a file in place atomically.
@@ -132,12 +133,12 @@ export declare function parsePublicKey(publicKey: string): PublicKeys | undefine
  */
 export declare function parsePartialAddress(address: string): Fr;
 /**
- * Parses a secret key from a string.
- * @param privateKey - A string
- * @returns A secret key
+ * Parses an account signing key from a string.
+ * @param signingKey - A string
+ * @returns A signing key
  * @throws InvalidArgumentError if the input string is not valid.
  */
-export declare function parseSecretKey(secretKey: string): Fr;
+export declare function parseSigningKey(signingKey: string): GrumpkinScalar;
 /**
  * Parses a field from a string.
  * @param field - A string representing the field.
@@ -157,4 +158,4 @@ export declare function parseFields(fields: string[]): Fr[];
  * @returns A JSON string
  */
 export declare function prettyPrintJSON(data: Record<string, any>): string;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbEQsT0FBTyxFQUFFLEtBQUssT0FBTyxFQUF3QyxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFJdkYsT0FBTyxFQUFFLFNBQVMsRUFBRSxDQUFDO0FBRXJCOzs7R0FHRztBQUNILGVBQU8sTUFBTSxZQUFZLHVCQUdJLENBQUM7QUFFOUIsZUFBTyxNQUFNLFNBQVMsUUFBdUIsQ0FBQztBQUM5QyxlQUFPLE1BQVEsY0FBYyxVQUErQixXQUFXLHNCQUFFLFFBQVEsc0JBQUUsT0FBTyxzQkFBRSxXQUFXLG9CQUFnQixDQUFDO0FBRXhILHdCQUFnQixVQUFVLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBRzdEO0FBRUQsZUFBTyxNQUFNLGNBQWMsZ0NBSVEsQ0FBQztBQUVwQyxlQUFPLE1BQU0sVUFBVSxRQUF1QixDQUFDO0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN2RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRWxELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBd0MsTUFBTSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBSXZGLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUVyQjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sWUFBWSx1QkFHSSxDQUFDO0FBRTlCLGVBQU8sTUFBTSxTQUFTLFFBQXVCLENBQUM7QUFDOUMsZUFBTyxNQUFRLGNBQWMsVUFBK0IsV0FBVyxzQkFBRSxRQUFRLHNCQUFFLE9BQU8sc0JBQUUsV0FBVyxvQkFBZ0IsQ0FBQztBQUV4SCx3QkFBZ0IsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUc3RDtBQUVELGVBQU8sTUFBTSxjQUFjLGdD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

package/dest/utils/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}

package/dest/utils/commands.js

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -28,7 +29,7 @@ export const l1ChainIdOption = new Option('-c, --l1-chain-id <number>', 'Chain I
     }
     return parsedValue;
 });
-export const createSecretKeyOption = (description, mandatory, argsParser)=>new Option('-sk, --secret-key <string>', description).env('SECRET_KEY').argParser(argsParser ?? parseSecretKey).makeOptionMandatory(mandatory);
+export const createSigningKeyOption = (description, mandatory, argsParser)=>new Option('-sk, --signing-key <string>', description).env('SIGNING_KEY').argParser(argsParser ?? parseSigningKey).makeOptionMandatory(mandatory);
 export const logJson = (log)=>(obj)=>log(JSON.stringify(obj, null, 2));
 /**
  * Updates a file in place atomically.
@@ -62,7 +63,7 @@ export const logJson = (log)=>(obj)=>log(JSON.stringify(obj, null, 2));
     let from;
     if (_from) {
         try {
-            from = AztecAddress.fromString(_from);
+            from = AztecAddress.fromStringUnsafe(_from);
         } catch  {
             throw new InvalidArgumentError(`Invalid option 'from' passed: ${_from}`);
         }
@@ -138,7 +139,7 @@ export function parseBigint(bigint) {
  * @throws InvalidArgumentError if the input string is not valid.
  */ export function parseAztecAddress(address) {
     try {
-        return AztecAddress.fromString(address);
+        return AztecAddress.fromStringUnsafe(address);
     } catch  {
         throw new InvalidArgumentError(`Invalid Aztec address: ${address}`);
     }
@@ -275,15 +276,15 @@ export function parseBigint(bigint) {
     }
 }
 /**
- * Parses a secret key from a string.
- * @param privateKey - A string
- * @returns A secret key
+ * Parses an account signing key from a string.
+ * @param signingKey - A string
+ * @returns A signing key
  * @throws InvalidArgumentError if the input string is not valid.
- */ export function parseSecretKey(secretKey) {
+ */ export function parseSigningKey(signingKey) {
     try {
-        return Fr.fromHexString(secretKey);
+        return GrumpkinScalar.fromHexString(signingKey);
     } catch  {
-        throw new InvalidArgumentError(`Invalid encryption secret key: ${secretKey}`);
+        throw new InvalidArgumentError(`Invalid signing key: ${signingKey}`);
     }
 }
 /**

package/dest/utils/inspect.js

@@ -25,10 +25,9 @@ export async function inspectBlock(aztecNode, blockNumber, log, opts = {}) {
     }
 }
 export async function inspectTx(aztecNode, txHash, log, opts = {}) {
-    const [receipt, effectsInBlock] = await Promise.all([
-        aztecNode.getTxReceipt(txHash),
-        aztecNode.getTxEffect(txHash)
-    ]);
+    const receipt = await aztecNode.getTxReceipt(txHash, {
+        includeTxEffect: true
+    });
     // Base tx data
     log(`Tx ${txHash.toString()}`);
     log(` Status: ${receipt.status}`);
@@ -38,10 +37,10 @@ export async function inspectTx(aztecNode, txHash, log, opts = {}) {
     if (receipt.error) {
         log(` Error: ${receipt.error}`);
     }
-    if (!effectsInBlock) {
+    if (!receipt.isMined() || !receipt.txEffect) {
         return;
     }
-    const effects = effectsInBlock.data;
+    const effects = receipt.txEffect;
     if (opts.includeBlockInfo) {
         log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.0.1-commit.993d240",
+  "version": "0.0.1-commit.9a89641",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -77,23 +77,23 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.993d240",
-    "@aztec/archiver": "0.0.1-commit.993d240",
-    "@aztec/aztec.js": "0.0.1-commit.993d240",
-    "@aztec/constants": "0.0.1-commit.993d240",
-    "@aztec/entrypoints": "0.0.1-commit.993d240",
-    "@aztec/ethereum": "0.0.1-commit.993d240",
-    "@aztec/foundation": "0.0.1-commit.993d240",
-    "@aztec/l1-artifacts": "0.0.1-commit.993d240",
-    "@aztec/node-keystore": "0.0.1-commit.993d240",
-    "@aztec/node-lib": "0.0.1-commit.993d240",
-    "@aztec/p2p": "0.0.1-commit.993d240",
-    "@aztec/protocol-contracts": "0.0.1-commit.993d240",
-    "@aztec/sequencer-client": "0.0.1-commit.993d240",
-    "@aztec/slasher": "0.0.1-commit.993d240",
-    "@aztec/stdlib": "0.0.1-commit.993d240",
-    "@aztec/wallets": "0.0.1-commit.993d240",
-    "@aztec/world-state": "0.0.1-commit.993d240",
+    "@aztec/accounts": "0.0.1-commit.9a89641",
+    "@aztec/archiver": "0.0.1-commit.9a89641",
+    "@aztec/aztec.js": "0.0.1-commit.9a89641",
+    "@aztec/constants": "0.0.1-commit.9a89641",
+    "@aztec/entrypoints": "0.0.1-commit.9a89641",
+    "@aztec/ethereum": "0.0.1-commit.9a89641",
+    "@aztec/foundation": "0.0.1-commit.9a89641",
+    "@aztec/l1-artifacts": "6.0.0-nightly.20260807",
+    "@aztec/node-keystore": "0.0.1-commit.9a89641",
+    "@aztec/node-lib": "0.0.1-commit.9a89641",
+    "@aztec/p2p": "0.0.1-commit.9a89641",
+    "@aztec/protocol-contracts": "0.0.1-commit.9a89641",
+    "@aztec/sequencer-client": "0.0.1-commit.9a89641",
+    "@aztec/slasher": "0.0.1-commit.9a89641",
+    "@aztec/stdlib": "0.0.1-commit.9a89641",
+    "@aztec/wallets": "0.0.1-commit.9a89641",
+    "@aztec/world-state": "0.0.1-commit.9a89641",
     "@ethersproject/wallet": "^5.8.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
@@ -107,9 +107,9 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/aztec-node": "0.0.1-commit.993d240",
-    "@aztec/kv-store": "0.0.1-commit.993d240",
-    "@aztec/telemetry-client": "0.0.1-commit.993d240",
+    "@aztec/aztec-node": "0.0.1-commit.9a89641",
+    "@aztec/kv-store": "0.0.1-commit.9a89641",
+    "@aztec/telemetry-client": "0.0.1-commit.9a89641",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -126,15 +126,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.0.1-commit.993d240",
-    "@aztec/bb-prover": "0.0.1-commit.993d240",
-    "@aztec/ethereum": "0.0.1-commit.993d240",
-    "@aztec/l1-artifacts": "0.0.1-commit.993d240",
-    "@aztec/noir-contracts.js": "0.0.1-commit.993d240",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.993d240",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.993d240",
-    "@aztec/protocol-contracts": "0.0.1-commit.993d240",
-    "@aztec/stdlib": "0.0.1-commit.993d240"
+    "@aztec/accounts": "0.0.1-commit.9a89641",
+    "@aztec/bb-prover": "0.0.1-commit.9a89641",
+    "@aztec/ethereum": "0.0.1-commit.9a89641",
+    "@aztec/l1-artifacts": "6.0.0-nightly.20260807",
+    "@aztec/noir-contracts.js": "0.0.1-commit.9a89641",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9a89641",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.9a89641",
+    "@aztec/protocol-contracts": "0.0.1-commit.9a89641",
+    "@aztec/stdlib": "0.0.1-commit.9a89641"
   },
   "files": [
     "dest",

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -2,33 +2,37 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { WaitOpts } from '@aztec/aztec.js/contracts';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { TxStatus } from '@aztec/aztec.js/tx';
 import { AccountManager } from '@aztec/aztec.js/wallet';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { EmbeddedWallet } from '@aztec/wallets/embedded';
-import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
+import { createFundedInitializerlessAccounts } from '@aztec/wallets/testing';
 
 export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
   const waitOpts: WaitOpts = {
     timeout: 180,
     interval: 1,
+    // The embedded wallet defaults to PROPOSED, which can be dropped if its proposed block is pruned
+    // before the checkpoint lands. Wait for the checkpoint so serial setup is reliable.
+    waitForStatus: TxStatus.CHECKPOINTED,
   };
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
   log('setupL2Contracts: Creating PXE client...');
   const node = createAztecNodeClient(nodeUrl);
   const wallet = await EmbeddedWallet.create(node);
 
-  let deployedAccountManagers: AccountManager[] = [];
+  let accountManagers: AccountManager[] = [];
   if (testAccounts) {
-    log('setupL2Contracts: Deploying test accounts...');
+    log('setupL2Contracts: Creating test accounts...');
     const initialAccountsData = await getInitialTestAccountsData();
-    deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
+    accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccountsData);
   }
 
   if (json) {
     const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
-    deployedAccountManagers.forEach((a, i) => {
+    accountManagers.forEach((a, i) => {
       toPrint[`testAccount${i}`] = a.address;
     });
     log(JSON.stringify(toPrint, null, 2));

package/src/cmds/validator_keys/eth_json_v3_worker.ts

@@ -0,0 +1,30 @@
+import { Wallet } from '@ethersproject/wallet';
+import { parentPort, workerData } from 'worker_threads';
+
+type EthJsonV3WorkerData = {
+  privateKeyHex: string;
+  password: string;
+};
+
+type SerializedError = {
+  message: string;
+  name?: string;
+  stack?: string;
+};
+
+function serializeError(error: unknown): SerializedError {
+  if (error instanceof Error) {
+    return { message: error.message, name: error.name, stack: error.stack };
+  }
+  return { message: String(error) };
+}
+
+void (async () => {
+  try {
+    const { privateKeyHex, password } = workerData as EthJsonV3WorkerData;
+    const json = await new Wallet(privateKeyHex).encrypt(password);
+    parentPort?.postMessage({ json });
+  } catch (error) {
+    parentPort?.postMessage({ error: serializeError(error) });
+  }
+})();

package/src/cmds/validator_keys/index.ts

@@ -1,6 +1,6 @@
 import type { LogFn } from '@aztec/foundation/log';
 
-import { Command } from 'commander';
+import { Command, Option } from 'commander';
 
 import { parseAztecAddress, parseEthereumAddress, parseHex, parseOptionalInteger } from '../../utils/commands.js';
 import { defaultBlsPath } from './utils.js';
@@ -33,15 +33,31 @@ export function injectCommands(program: Command, log: LogFn) {
       'Coinbase ETH address to use when proposing. Defaults to attester address.',
       parseEthereumAddress,
     )
-    // TODO: add funding account back in when implemented
-    // .option('--funding-account <privateKey|address>', 'ETH private key (or address for remote signer setup) to fund publishers')
+    .option(
+      '--funding-account <privateKey|address>',
+      'ETH funding account used to top up publisher EOAs. Provide a private key, or an address together with --remote-signer.',
+    )
     .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file')
     .option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', value => parseHex(value, 32))
     .option('--bls-path <path>', `EIP-2334 path (default ${defaultBlsPath})`)
-    .option(
-      '--password <str>',
-      'Password for writing keystore files (ETH JSON V3 and BLS EIP-2335). Empty string allowed',
+    .addOption(
+      new Option('--password <str>', 'Shared password for writing ETH JSON V3 and BLS EIP-2335 keystore files').env(
+        'AZTEC_KEYSTORE_PASSWORD',
+      ),
     )
+    .option('--password-file <path>', 'File containing the shared password for writing keystore files')
+    .addOption(
+      new Option('--eth-password <str>', 'Password for writing ETH JSON V3 keystore files').env(
+        'AZTEC_ETH_KEYSTORE_PASSWORD',
+      ),
+    )
+    .option('--eth-password-file <path>', 'File containing the password for writing ETH JSON V3 keystore files')
+    .addOption(
+      new Option('--bls-password <str>', 'Password for writing BLS EIP-2335 keystore files').env(
+        'AZTEC_BLS_KEYSTORE_PASSWORD',
+      ),
+    )
+    .option('--bls-password-file <path>', 'File containing the password for writing BLS EIP-2335 keystore files')
     .option('--encrypted-keystore-dir <dir>', 'Output directory for encrypted keystore file(s)')
     .option('--json', 'Echo resulting JSON to stdout')
     .option('--staker-output', 'Generate a single staker output JSON file with an array of validator entries')
@@ -85,8 +101,6 @@ export function injectCommands(program: Command, log: LogFn) {
       'Coinbase ETH address to use when proposing. Defaults to attester address.',
       parseEthereumAddress,
     )
-    // TODO: add funding account back in when implemented
-    // .option('--funding-account <privateKey|address>', 'ETH private key (or address for remote signer setup) to fund publishers')
     .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file')
     .option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', value => parseHex(value, 32))
     .option('--bls-path <path>', `EIP-2334 path (default ${defaultBlsPath})`)
@@ -103,6 +117,32 @@ export function injectCommands(program: Command, log: LogFn) {
       await addValidatorKeys(existing, options, log);
     });
 
+  group
+    .command('set-funding-account')
+    .summary('Set the funding account of an existing keystore')
+    .description(
+      'Sets the keystore-level ETH funding account used to top up publisher EOAs, replacing any existing one',
+    )
+    .argument('<existing>', 'Path to existing keystore JSON')
+    .argument(
+      '<privateKey|address>',
+      'Funding account: a private key, or an address (needs --remote-signer unless the keystore already defines one)',
+    )
+    .option(
+      '--remote-signer <url>',
+      'Remote signer URL for the funding account (required with an address unless the keystore already defines one)',
+    )
+    .option(
+      '--password <str>',
+      'Password for writing the funding key as an encrypted ETH JSON V3 file. Empty string allowed',
+    )
+    .option('--encrypted-keystore-dir <dir>', 'Output directory for the encrypted funding key file')
+    .option('--json', 'Echo resulting JSON to stdout')
+    .action(async (existing: string, fundingAccount: string, options) => {
+      const { setFundingAccount } = await import('./set_funding_account.js');
+      await setFundingAccount(existing, fundingAccount, options, log);
+    });
+
   group
     .command('staker')
     .summary('Generate staking JSON from keystore')