From b2d36a860c1988d4ed1b888bd26681d0c18f7366 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Tue, 22 Apr 2025 13:48:32 -0300 Subject: [PATCH] chore: Disable blobscan by default Disables blobscan as blob archive fallback since its API has not been reliable enough. We keep it enabled in k8s config for our blobsink though. --- spartan/aztec-network/templates/blob-sink.yaml | 2 ++ spartan/aztec-network/values/alpha-testnet.yaml | 1 + yarn-project/blob-sink/src/archive/factory.test.ts | 10 +++++----- yarn-project/blob-sink/src/archive/factory.ts | 6 ------ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/spartan/aztec-network/templates/blob-sink.yaml b/spartan/aztec-network/templates/blob-sink.yaml index d47642d4ff47..c656a7800062 100644 --- a/spartan/aztec-network/templates/blob-sink.yaml +++ b/spartan/aztec-network/templates/blob-sink.yaml @@ -99,6 +99,8 @@ spec: fieldPath: metadata.namespace - name: BLOB_SINK_PORT value: "{{ .Values.blobSink.service.nodePort }}" + - name: BLOB_SINK_ARCHIVE_API_URL + value: "{{ .Values.blobSink.archiveApiUrl }}" - name: LOG_LEVEL value: "{{ .Values.blobSink.logLevel }}" - name: LOG_JSON diff --git a/spartan/aztec-network/values/alpha-testnet.yaml b/spartan/aztec-network/values/alpha-testnet.yaml index 6a14be97c164..a7ce3b03ff38 100644 --- a/spartan/aztec-network/values/alpha-testnet.yaml +++ b/spartan/aztec-network/values/alpha-testnet.yaml @@ -24,6 +24,7 @@ network: blobSink: enabled: true + archiveApiUrl: "https://api.sepolia.blobscan.com" dataStoreConfig: dataDir: "/data" storageSize: "128Gi" diff --git a/yarn-project/blob-sink/src/archive/factory.test.ts b/yarn-project/blob-sink/src/archive/factory.test.ts index 8cea09f5010c..5150375d7955 100644 --- a/yarn-project/blob-sink/src/archive/factory.test.ts +++ b/yarn-project/blob-sink/src/archive/factory.test.ts @@ -2,18 +2,18 @@ import type { BlobSinkArchiveApiConfig } from './config.js'; import { createBlobArchiveClient } from './factory.js'; describe('BlobscanArchiveClient factory', () => { - it.each<[string, BlobSinkArchiveApiConfig, boolean, string]>([ - ['empty config', {}, false, ''], - ['random chain, no custom URL', { l1ChainId: 23478 }, false, ''], + it.each<[string, BlobSinkArchiveApiConfig, boolean, string | undefined]>([ + ['empty config', {}, false, undefined], + ['random chain, no custom URL', { l1ChainId: 23478 }, false, undefined], [ 'random chain, custom URL', { l1ChainId: 23478, archiveApiUrl: 'https://example.com' }, true, 'https://example.com/', ], - ['ETH mainnet default URL', { l1ChainId: 1 }, true, 'https://api.blobscan.com/'], + ['ETH mainnet no default URL', { l1ChainId: 1 }, false, undefined], ['ETH mainnet custom URL', { l1ChainId: 1, archiveApiUrl: 'https://example.com' }, true, 'https://example.com/'], - ['Sepolia default URL', { l1ChainId: 11155111 }, true, 'https://api.sepolia.blobscan.com/'], + ['Sepolia no default URL', { l1ChainId: 11155111 }, false, undefined], ['Seplia custom URL', { l1ChainId: 11155111, archiveApiUrl: 'https://example.com' }, true, 'https://example.com/'], ])('can instantiate a client: %s', (_, cfg, clientExpected, expectedBaseUrl) => { const client = createBlobArchiveClient(cfg); diff --git a/yarn-project/blob-sink/src/archive/factory.ts b/yarn-project/blob-sink/src/archive/factory.ts index d5816d3542eb..1add277c3e44 100644 --- a/yarn-project/blob-sink/src/archive/factory.ts +++ b/yarn-project/blob-sink/src/archive/factory.ts @@ -7,11 +7,5 @@ export function createBlobArchiveClient(config: BlobSinkConfig): BlobArchiveClie return new BlobscanArchiveClient(config.archiveApiUrl); } - if (config.l1ChainId === 1) { - return new BlobscanArchiveClient('https://api.blobscan.com'); - } else if (config.l1ChainId === 11155111) { - return new BlobscanArchiveClient('https://api.sepolia.blobscan.com'); - } - return undefined; }