Skip to content

feat: R2 snapshots custom domain #17511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilWindle merged 1 commit into from
Oct 6, 2025
Merged

feat: R2 snapshots custom domain #17511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spartan/aztec-network/values/archival-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ telemetry:

snapshots:
uploadLocation: ""
syncUrl: "https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev/snapshots/staging-public/"
syncUrl: "https://aztec-labs-snapshots.com/staging-public/"
frequency: "0 0 * * *" # daily uploads at midnight

network:
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/staging-ignition.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ROLLUP_DEPLOYMENT_PRIVATE_KEY=REPLACE_WITH_GCP_SECRET
OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
VERIFY_CONTRACTS=true
ETHERSCAN_API_KEY=REPLACE_WITH_GCP_SECRET
STORE_SNAPSHOT_URL=s3://testnet-bucket/snapshots/staging-ignition/?endpoint=https://REPLACE_WITH_GCP_SECRET.r2.cloudflarestorage.com&publicBaseUrl=https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev
STORE_SNAPSHOT_URL=s3://testnet-bucket/staging-ignition/?endpoint=https://REPLACE_WITH_GCP_SECRET.r2.cloudflarestorage.com&publicBaseUrl=https://aztec-labs-snapshots.com
R2_ACCESS_KEY_ID=REPLACE_WITH_GCP_SECRET
R2_SECRET_ACCESS_KEY=REPLACE_WITH_GCP_SECRET
BOT_TRANSFERS_REPLICAS=0
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/staging-public.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
VERIFY_CONTRACTS=true
ETHERSCAN_API_KEY=REPLACE_WITH_GCP_SECRET
DEPLOY_INTERNAL_BOOTNODE=false
STORE_SNAPSHOT_URL="s3://testnet-bucket/snapshots/staging-public/?endpoint=https://REPLACE_WITH_GCP_SECRET.r2.cloudflarestorage.com&publicBaseUrl=https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev"
STORE_SNAPSHOT_URL="s3://testnet-bucket/staging-public/?endpoint=https://REPLACE_WITH_GCP_SECRET.r2.cloudflarestorage.com&publicBaseUrl=https://aztec-labs-snapshots.com"
R2_ACCESS_KEY_ID=REPLACE_WITH_GCP_SECRET
R2_SECRET_ACCESS_KEY=REPLACE_WITH_GCP_SECRET
PROVER_FAILED_PROOF_STORE=gs://aztec-develop/staging-public/failed-proofs
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/testnet.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
VERIFY_CONTRACTS=true
ETHERSCAN_API_KEY=REPLACE_WITH_GCP_SECRET

STORE_SNAPSHOT_URL=s3://testnet-bucket/snapshots/testnet/?endpoint=https://REPLACE_WITH_GCP_SECRET.r2.cloudflarestorage.com&publicBaseUrl=https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev
STORE_SNAPSHOT_URL=s3://testnet-bucket/testnet/?endpoint=https://REPLACE_WITH_GCP_SECRET.r2.cloudflarestorage.com&publicBaseUrl=https://aztec-labs-snapshots.com
R2_ACCESS_KEY_ID=REPLACE_WITH_GCP_SECRET
R2_SECRET_ACCESS_KEY=REPLACE_WITH_GCP_SECRET
DEPLOY_INTERNAL_BOOTNODE=false
Expand Down
9 changes: 9 additions & 0 deletions spartan/terraform/cloudflare/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,12 @@ resource "cloudflare_r2_managed_domain" "r2dev" {
enabled = true
}

# Attach custom domain to the R2 bucket
resource "cloudflare_r2_custom_domain" "aztec_labs_snapshots_com" {
account_id = var.R2_ACCOUNT_ID
bucket_name = cloudflare_r2_bucket.bucket.name
domain = var.DOMAIN
zone_id = var.R2_ZONE_ID
enabled = true
}

2 changes: 1 addition & 1 deletion spartan/terraform/cloudflare/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ output "s3_endpoint" {
}

output "upload_location" {
value = "s3://${cloudflare_r2_bucket.bucket.name}/snapshots/testnet/?endpoint=https://${var.R2_ACCOUNT_ID}.r2.cloudflarestorage.com&publicBaseUrl=https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev"
value = "s3://${cloudflare_r2_bucket.bucket.name}/testnet/?endpoint=https://${var.R2_ACCOUNT_ID}.r2.cloudflarestorage.com&publicBaseUrl=https://aztec-labs-snapshots.com"
}
6 changes: 5 additions & 1 deletion spartan/terraform/cloudflare/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ variable "R2_ACCOUNT_ID" {

variable "DOMAIN" {
type = string
default = "aztec-labs.com"
default = "aztec-labs-snapshots.com"
}

variable "SUBDOMAIN" {
Expand All @@ -20,3 +20,7 @@ variable "BUCKET_NAME" {
type = string
default = "testnet-bucket"
}

variable "R2_ZONE_ID" {
type = string
}
10 changes: 5 additions & 5 deletions yarn-project/cli/src/config/chain_l2_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import publicIncludeMetrics from '../../public_include_metric_prefixes.json' wit
import { cachedFetch } from './cached_fetch.js';
import { enrichEthAddressVar, enrichVar } from './enrich_env.js';

const SNAPSHOT_URL = 'https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev/snapshots';
const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';

const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
Expand Down Expand Up @@ -99,7 +99,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
seqMinTxsPerBlock: 0,
seqMaxTxsPerBlock: 0,
realProofs: true,
snapshotsUrls: [`${SNAPSHOT_URL}/staging-ignition/`],
snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
autoUpdate: 'config-and-version',
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
maxTxPoolSize: 100_000_000, // 100MB
Expand Down Expand Up @@ -179,7 +179,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
seqMinTxsPerBlock: 0,
seqMaxTxsPerBlock: 20,
realProofs: true,
snapshotsUrls: [`${SNAPSHOT_URL}/staging-public/`],
snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
autoUpdate: 'config-and-version',
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
publicIncludeMetrics,
Expand Down Expand Up @@ -231,7 +231,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
seqMinTxsPerBlock: 0,
seqMaxTxsPerBlock: 20,
realProofs: true,
snapshotsUrls: [`${SNAPSHOT_URL}/testnet/`],
snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
autoUpdate: 'config-and-version',
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
maxTxPoolSize: 100_000_000, // 100MB
Expand Down Expand Up @@ -285,7 +285,7 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
seqMinTxsPerBlock: 0,
seqMaxTxsPerBlock: 0,
realProofs: true,
snapshotsUrls: ['https://storage.googleapis.com/aztec-testnet/snapshots/ignition/'],
snapshotsUrls: [`${SNAPSHOTS_URL}/ignition/`],
autoUpdate: 'notify',
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/ignition.json',
maxTxPoolSize: 100_000_000, // 100MB
Expand Down
Loading