Skip to content

Commit d04540d

Browse files
alexghralexghr
authored
chore: trim down fisherman deployment (#18062)
This PR builds on top of #18060 and removes some components that are not going to be necessary for fisherman networks (like web3signer)
2 parents e2653e5 + 7227f1c commit d04540d

File tree

5 files changed

+59
-33
lines changed

5 files changed

+59
-33
lines changed

‎spartan/environments/ignition-fisherman.env‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ ETHEREUM_RPC_URLS=REPLACE_WITH_GCP_SECRET
2121
ETHEREUM_CONSENSUS_HOST_URLS=REPLACE_WITH_GCP_SECRET
2222
ETHEREUM_CONSENSUS_HOST_API_KEYS=REPLACE_WITH_GCP_SECRET
2323
ETHEREUM_CONSENSUS_HOST_API_KEY_HEADERS=REPLACE_WITH_GCP_SECRET
24-
FUNDING_PRIVATE_KEY=REPLACE_WITH_GCP_SECRET
24+
FUNDING_PRIVATE_KEY=""
25+
LABS_INFRA_MNEMONIC_SECRET_NAME=sepolia-labs-ignition-fisherman-mnemonic
2526
LABS_INFRA_MNEMONIC=REPLACE_WITH_GCP_SECRET
26-
ROLLUP_DEPLOYMENT_PRIVATE_KEY=REPLACE_WITH_GCP_SECRET
27+
ROLLUP_DEPLOYMENT_PRIVATE_KEY=""
2728
OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
2829

2930
SNAPSHOT_BUCKET_DIRECTORY=${SNAPSHOT_BUCKET_DIRECTORY:-ignition-sepolia}
3031

31-
ETHERSCAN_API_KEY=REPLACE_WITH_GCP_SECRET
32+
ETHERSCAN_API_KEY=""
3233
R2_ACCESS_KEY_ID=REPLACE_WITH_GCP_SECRET
3334
R2_SECRET_ACCESS_KEY=REPLACE_WITH_GCP_SECRET
3435
BOT_TRANSFERS_REPLICAS=0

‎spartan/environments/staging-ignition.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ETHEREUM_CONSENSUS_HOST_API_KEYS=REPLACE_WITH_GCP_SECRET
1717
ETHEREUM_CONSENSUS_HOST_API_KEY_HEADERS=REPLACE_WITH_GCP_SECRET
1818
FUNDING_PRIVATE_KEY=REPLACE_WITH_GCP_SECRET
1919
LABS_INFRA_MNEMONIC=REPLACE_WITH_GCP_SECRET
20+
LABS_INFRA_MNEMONIC_SECRET_NAME=sepolia-labs-staging-ignition-mnemonic
2021
ROLLUP_DEPLOYMENT_PRIVATE_KEY=REPLACE_WITH_GCP_SECRET
2122
OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
2223
VERIFY_CONTRACTS=true

‎spartan/scripts/deploy_network.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,14 @@ DESTROY_CHAOS_MESH=${DESTROY_CHAOS_MESH:-false}
108108
CREATE_CHAOS_MESH=${CREATE_CHAOS_MESH:-false}
109109

110110

111-
# Compute validator addresses
112-
VALIDATOR_ADDRESSES=$(echo "$VALIDATOR_INDICES" | tr ',' '\n' | xargs -I{} cast wallet address --mnemonic "$LABS_INFRA_MNEMONIC" --mnemonic-index {} | tr '\n' ',' | sed 's/,$//')
113-
log "VALIDATOR_ADDRESSES: ${VALIDATOR_ADDRESSES}"
111+
# Compute validator addresses (skip if no validators)
112+
if [[ $VALIDATOR_REPLICAS -gt 0 ]]; then
113+
VALIDATOR_ADDRESSES=$(echo "$VALIDATOR_INDICES" | tr ',' '\n' | xargs -I{} cast wallet address --mnemonic "$LABS_INFRA_MNEMONIC" --mnemonic-index {} | tr '\n' ',' | sed 's/,$//')
114+
log "VALIDATOR_ADDRESSES: ${VALIDATOR_ADDRESSES}"
115+
else
116+
VALIDATOR_ADDRESSES=""
117+
log "VALIDATOR_ADDRESSES: (none - no validators)"
118+
fi
114119

115120
# Compute and include publisher indices in prefunding list
116121
# Uses env overrides when provided, otherwise falls back to values.yaml defaults

‎spartan/scripts/setup_gcp_secrets.sh‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ NETWORK=${NETWORK:-}
1717

1818
L1_NETWORK=${L1_NETWORK:-sepolia}
1919

20+
# Read optional custom secret name for LABS_INFRA_MNEMONIC
21+
LABS_INFRA_MNEMONIC_SECRET_NAME=${LABS_INFRA_MNEMONIC_SECRET_NAME:-}
22+
2023
echo "Setting up GCP secrets for network: $NETWORK"
2124

2225
# Create secure temporary directory for secrets
@@ -67,6 +70,13 @@ mask_secret_value() {
6770
fi
6871
}
6972

73+
# Determine the mnemonic secret name: use custom if provided, otherwise use default pattern
74+
if [[ -n "$LABS_INFRA_MNEMONIC_SECRET_NAME" ]]; then
75+
MNEMONIC_SECRET="${LABS_INFRA_MNEMONIC_SECRET_NAME}"
76+
else
77+
MNEMONIC_SECRET="${L1_NETWORK}-labs-${NETWORK}-mnemonic"
78+
fi
79+
7080
# Map of environment variables to GCP secret names
7181
# Generic mappings - network-specific secrets use ${NETWORK} in the name
7282
declare -A SECRET_MAPPINGS=(
@@ -78,7 +88,7 @@ declare -A SECRET_MAPPINGS=(
7888
["ROLLUP_DEPLOYMENT_PRIVATE_KEY"]="${L1_NETWORK}-labs-rollup-private-key"
7989
["OTEL_COLLECTOR_ENDPOINT"]="otel-collector-url"
8090
["ETHERSCAN_API_KEY"]="etherscan-api-key"
81-
["LABS_INFRA_MNEMONIC"]="${L1_NETWORK}-labs-${NETWORK}-mnemonic"
91+
["LABS_INFRA_MNEMONIC"]="${MNEMONIC_SECRET}"
8292
["STORE_SNAPSHOT_URL"]="r2-account-id"
8393
["R2_ACCESS_KEY_ID"]="r2-access-key-id"
8494
["R2_SECRET_ACCESS_KEY"]="r2-secret-access-key"
@@ -95,6 +105,13 @@ JSON_SECRETS=(
95105
# Replace placeholders with actual secrets
96106
for env_var in "${!SECRET_MAPPINGS[@]}"; do
97107
secret_name="${SECRET_MAPPINGS[$env_var]}"
108+
109+
# Skip if the variable doesn't contain REPLACE_WITH_GCP_SECRET at all
110+
if ! grep -q "^${env_var}=.*REPLACE_WITH_GCP_SECRET" "$ENV_FILE"; then
111+
echo "Skipping $env_var (no placeholder value)"
112+
continue
113+
fi
114+
98115
echo "Fetching secret: $secret_name for $env_var"
99116

100117
if grep -q "^${env_var}=REPLACE_WITH_GCP_SECRET" "$ENV_FILE"; then

‎spartan/terraform/deploy-aztec-infra/main.tf‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ provider "helm" {
3636
}
3737

3838
module "web3signer" {
39+
# Only deploy web3signer if we have validators or provers that need to publish to L1
40+
count = tonumber(var.VALIDATOR_REPLICAS) > 0 || (tonumber(var.PROVER_REPLICAS) > 0 && !var.PROVER_NODE_DISABLE_PROOF_PUBLISH) ? 1 : 0
41+
3942
source = "../modules/web3signer"
4043
NAMESPACE = var.NAMESPACE
4144
RELEASE_NAME = var.RELEASE_PREFIX
@@ -122,7 +125,7 @@ locals {
122125
wait = true
123126
} : null
124127

125-
validators = {
128+
validators = tonumber(var.VALIDATOR_REPLICAS) > 0 ? {
126129
name = "${var.RELEASE_PREFIX}-validator"
127130
chart = "aztec-validator"
128131
values = [
@@ -152,7 +155,6 @@ locals {
152155
"validator.slash.offenseExpirationRounds" = var.SLASH_OFFENSE_EXPIRATION_ROUNDS
153156
"validator.slash.maxPayloadSize" = var.SLASH_MAX_PAYLOAD_SIZE
154157
"validator.node.env.TRANSACTIONS_DISABLED" = var.TRANSACTIONS_DISABLED
155-
"validator.node.env.NETWORK" = var.NETWORK
156158
"validator.node.env.KEY_INDEX_START" = var.VALIDATOR_MNEMONIC_START_INDEX
157159
"validator.node.env.PUBLISHER_KEY_INDEX_START" = var.VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX
158160
"validator.node.env.VALIDATORS_PER_NODE" = var.VALIDATORS_PER_NODE
@@ -166,7 +168,7 @@ locals {
166168
boot_node_host_path = "validator.node.env.BOOT_NODE_HOST"
167169
bootstrap_nodes_path = "validator.node.env.BOOTSTRAP_NODES"
168170
wait = true
169-
}
171+
} : null
170172

171173
prover = {
172174
name = "${var.RELEASE_PREFIX}-prover"
@@ -176,27 +178,29 @@ locals {
176178
"prover.yaml",
177179
"prover-resources-${var.PROVER_RESOURCE_PROFILE}.yaml"
178180
]
179-
custom_settings = {
180-
"node.mnemonic" = var.PROVER_MNEMONIC
181-
"node.mnemonicStartIndex" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
182-
"node.node.proverRealProofs" = var.PROVER_REAL_PROOFS
183-
"node.web3signerUrl" = "http://${var.RELEASE_PREFIX}-signer-web3signer.${var.NAMESPACE}.svc.cluster.local:9000/"
184-
"node.node.env.NETWORK" = var.NETWORK
185-
"node.node.env.PROVER_FAILED_PROOF_STORE" = var.PROVER_FAILED_PROOF_STORE
186-
"node.node.env.KEY_INDEX_START" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
187-
"node.node.env.PUBLISHER_KEY_INDEX_START" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
188-
"node.node.env.PUBLISHERS_PER_PROVER" = var.PROVER_PUBLISHERS_PER_PROVER
189-
"node.node.env.PROVER_NODE_DISABLE_PROOF_PUBLISH" = var.PROVER_NODE_DISABLE_PROOF_PUBLISH
190-
"node.node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
191-
"broker.node.proverRealProofs" = var.PROVER_REAL_PROOFS
192-
"broker.node.env.NETWORK" = var.NETWORK
193-
"broker.node.env.BOOTSTRAP_NODES" = "asdf"
194-
"agent.node.proverRealProofs" = var.PROVER_REAL_PROOFS
195-
"agent.node.env.NETWORK" = var.NETWORK
196-
"agent.replicaCount" = var.PROVER_REPLICAS
197-
"agent.node.env.BOOTSTRAP_NODES" = "asdf"
198-
"agent.node.env.AGENT_COUNT" = var.PROVER_AGENTS_PER_PROVER
199-
}
181+
custom_settings = merge(
182+
{
183+
"node.mnemonic" = var.PROVER_MNEMONIC
184+
"node.mnemonicStartIndex" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
185+
"node.node.proverRealProofs" = var.PROVER_REAL_PROOFS
186+
"node.node.env.PROVER_FAILED_PROOF_STORE" = var.PROVER_FAILED_PROOF_STORE
187+
"node.node.env.KEY_INDEX_START" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
188+
"node.node.env.PUBLISHER_KEY_INDEX_START" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
189+
"node.node.env.PUBLISHERS_PER_PROVER" = var.PROVER_PUBLISHERS_PER_PROVER
190+
"node.node.env.PROVER_NODE_DISABLE_PROOF_PUBLISH" = var.PROVER_NODE_DISABLE_PROOF_PUBLISH
191+
"node.node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
192+
"broker.node.proverRealProofs" = var.PROVER_REAL_PROOFS
193+
"broker.node.env.BOOTSTRAP_NODES" = "asdf"
194+
"agent.node.proverRealProofs" = var.PROVER_REAL_PROOFS
195+
"agent.replicaCount" = var.PROVER_REPLICAS
196+
"agent.node.env.BOOTSTRAP_NODES" = "asdf"
197+
"agent.node.env.AGENT_COUNT" = var.PROVER_AGENTS_PER_PROVER
198+
},
199+
# Only set web3signerUrl if proof publishing is enabled
200+
!var.PROVER_NODE_DISABLE_PROOF_PUBLISH ? {
201+
"node.web3signerUrl" = "http://${var.RELEASE_PREFIX}-signer-web3signer.${var.NAMESPACE}.svc.cluster.local:9000/"
202+
} : {}
203+
)
200204
boot_node_host_path = "node.node.env.BOOT_NODE_HOST"
201205
bootstrap_nodes_path = "node.node.env.BOOTSTRAP_NODES"
202206
wait = true
@@ -235,7 +239,6 @@ locals {
235239
custom_settings = {
236240
"nodeType" = "rpc"
237241
"replicaCount" = var.RPC_REPLICAS
238-
"node.env.NETWORK" = var.NETWORK
239242
"node.proverRealProofs" = var.PROVER_REAL_PROOFS
240243
"ingress.rpc.enabled" = var.RPC_INGRESS_ENABLED
241244
"ingress.rpc.host" = var.RPC_INGRESS_HOST
@@ -258,7 +261,6 @@ locals {
258261
]
259262
custom_settings = {
260263
"nodeType" = "archive"
261-
"node.env.NETWORK" = var.NETWORK
262264
"node.env.P2P_ARCHIVED_TX_LIMIT" = "10000000"
263265
"node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
264266
}

0 commit comments

Comments
 (0)