diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 29b015301a9e..c86f6d6106f1 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -64,13 +64,14 @@ aztec: # The derivation path of the calcualted private keys # Starting from this index, the number of keys is equal to the number of replicas for the given service - # Set the "extraAccounts" to start at 0 so that just using the default mnemonic won't clash with validator, prover, and bot accounts - extraAccountsStartIndex: 0 - ## The number of extra accounts to prefund - extraAccounts: 10 + # Default accounts start at 0, and are used by the boot node to deploy the system contracts + numberOfDefaultAccounts: 10 proverKeyIndexStart: 1000 validatorKeyIndexStart: 2000 botKeyIndexStart: 3000 + extraAccountsStartIndex: 4000 + ## The number of extra accounts to prefund + extraAccounts: 10 bootNode: enabled: true diff --git a/spartan/aztec-network/values/ci-sepolia.yaml b/spartan/aztec-network/values/ci-sepolia.yaml index 82044d231ee3..0d28e12a62d8 100644 --- a/spartan/aztec-network/values/ci-sepolia.yaml +++ b/spartan/aztec-network/values/ci-sepolia.yaml @@ -3,6 +3,7 @@ aztec: proofSubmissionWindow: 8 realProofs: false l1DeploymentMnemonic: "" + numberOfDefaultAccounts: 0 validatorKeyIndexStart: 0 proverKeyIndexStart: 3 botKeyIndexStart: 4 diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index a38d88504e67..ce7effe8faa6 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -3,6 +3,7 @@ telemetry: aztec: realProofs: true + numberOfDefaultAccounts: 0 validatorKeyIndexStart: 0 proverKeyIndexStart: 3 testAccounts: true diff --git a/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml b/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml index 5b09eb380a45..99803192c18a 100644 --- a/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml +++ b/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml @@ -3,6 +3,7 @@ telemetry: aztec: realProofs: false + numberOfDefaultAccounts: 0 validatorKeyIndexStart: 0 proverKeyIndexStart: 3 botKeyIndexStart: 4 diff --git a/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml b/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml index c7036a86ca58..3b7b4053a693 100644 --- a/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml +++ b/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml @@ -3,6 +3,7 @@ telemetry: aztec: l1DeploymentMnemonic: "" + numberOfDefaultAccounts: 0 validatorKeyIndexStart: 0 proverKeyIndexStart: 48 botKeyIndexStart: 49 diff --git a/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml b/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml index 206b67bd4c7a..dd51254d7cbe 100644 --- a/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml +++ b/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml @@ -4,6 +4,7 @@ telemetry: aztec: realProofs: true l1DeploymentMnemonic: "" + numberOfDefaultAccounts: 0 validatorKeyIndexStart: 0 proverKeyIndexStart: 48 botKeyIndexStart: 49 diff --git a/spartan/scripts/generate_devnet_config.sh b/spartan/scripts/generate_devnet_config.sh index 5a6752ccf497..af11b1356390 100755 --- a/spartan/scripts/generate_devnet_config.sh +++ b/spartan/scripts/generate_devnet_config.sh @@ -4,6 +4,8 @@ source $(git rev-parse --show-toplevel)/ci3/source values_file="$1" value_yamls="../aztec-network/values/$values_file ../aztec-network/values.yaml" +export NUMBER_OF_DEFAULT_ACCOUNTS=$(./read_value.sh "aztec.numberOfDefaultAccounts" $value_yamls) + export NUMBER_OF_VALIDATOR_KEYS=$(./read_value.sh "validator.replicas" $value_yamls) export VALIDATOR_KEY_START_INDEX=$(./read_value.sh "aztec.validatorKeyIndexStart" $value_yamls) @@ -21,12 +23,15 @@ export BLOCK_TIME=$(./read_value.sh "ethereum.blockTime" $value_yamls) export GAS_LIMIT=$(./read_value.sh "ethereum.gasLimit" $value_yamls) export CHAIN_ID=$(./read_value.sh "ethereum.chainId" $value_yamls) +# Initialize arrays for each type of key indices +DEFAULT_ACCOUNTS_INDICES=$(seq 0 $((NUMBER_OF_DEFAULT_ACCOUNTS - 1))) VALIDATOR_KEY_INDICES=$(seq $VALIDATOR_KEY_START_INDEX $((VALIDATOR_KEY_START_INDEX + NUMBER_OF_VALIDATOR_KEYS - 1))) EXTRA_ACCOUNTS_INDICES=$(seq $EXTRA_ACCOUNTS_START_INDEX $((EXTRA_ACCOUNTS_START_INDEX + EXTRA_ACCOUNTS - 1))) PROVER_KEY_INDICES=$(seq $PROVER_KEY_START_INDEX $((PROVER_KEY_START_INDEX + NUMBER_OF_PROVER_KEYS - 1))) BOT_KEY_INDICES=$(seq $BOT_KEY_START_INDEX $((BOT_KEY_START_INDEX + NUMBER_OF_BOT_KEYS - 1))) -export PREFUNDED_MNEMONIC_INDICES=$(echo "$VALIDATOR_KEY_INDICES $EXTRA_ACCOUNTS_INDICES $PROVER_KEY_INDICES $BOT_KEY_INDICES" | tr ' ' '\n' | sort -u | tr '\n' ',' | sed 's/,$//') +# Combine all indices, filter out empty items, sort, and format +export PREFUNDED_MNEMONIC_INDICES=$(echo "$DEFAULT_ACCOUNTS_INDICES $VALIDATOR_KEY_INDICES $EXTRA_ACCOUNTS_INDICES $PROVER_KEY_INDICES $BOT_KEY_INDICES" | tr ' ' '\n' | grep -v '^$' | sort -u | tr '\n' ',' | sed 's/,$//') echo "Generating eth devnet config..." echo "PREFUNDED_MNEMONIC_INDICES: $PREFUNDED_MNEMONIC_INDICES"