chore: Accumulated backports to v2 (#18020)

This PR accumulates backport commits throughout the day and will be
auto-merged overnight.

Latest backport: #18009 - fix: Do not verify contracts if not deployed
in that run

🤖 This PR is managed automatically by the backport workflow.

Co-authored-by: Santiago Palladino <[email protected]>

Author: AztecBot

spartan/scripts/deploy_network.sh

@@ -280,7 +280,7 @@ EOF
 tf_run "${DEPLOY_ROLLUP_CONTRACTS_DIR}" "${DESTROY_ROLLUP_CONTRACTS}" "${CREATE_ROLLUP_CONTRACTS}"
 log "Deployed rollup contracts"
 
-if [[ "${VERIFY_CONTRACTS:-}" == "true" ]]; then
+if [[ "${VERIFY_CONTRACTS:-}" == "true" && "${CREATE_ROLLUP_CONTRACTS}" == "true" ]]; then
   terraform -chdir="${DEPLOY_ROLLUP_CONTRACTS_DIR}" output -raw verification_json_b64 | base64 -d > $HOME/l1-verify.json
   ${REPO_ROOT}/l1-contracts/scripts/verify-from-json.sh $HOME/l1-verify.json --api-key $ETHERSCAN_API_KEY
 fi