From ff0a29b6e54c01707a8eb76bcc25f2f3469cb631 Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Mon, 16 Dec 2024 20:47:37 +0000
Subject: [PATCH] rebase fixes

---
 yarn-project/blob-sink/src/config.ts               |  1 -
 yarn-project/blob-sink/src/run.ts                  | 14 ++++++--------
 yarn-project/blob-sink/src/server.ts               |  6 +++++-
 .../end-to-end/src/fixtures/snapshot_manager.ts    | 12 ++++--------
 yarn-project/end-to-end/src/fixtures/utils.ts      |  6 +++++-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/yarn-project/blob-sink/src/config.ts b/yarn-project/blob-sink/src/config.ts
index 407f0f31e95..0dfb0e57c12 100644
--- a/yarn-project/blob-sink/src/config.ts
+++ b/yarn-project/blob-sink/src/config.ts
@@ -20,7 +20,6 @@ export const blobSinkConfigMappings: ConfigMappingsType<BlobSinkConfig> = {
   // },
 };
 
-
 /**
  * Returns the blob sink configuration from the environment variables.
  * Note: If an environment variable is not set, the default value is used.
diff --git a/yarn-project/blob-sink/src/run.ts b/yarn-project/blob-sink/src/run.ts
index 059ea1fb5e9..02c240691c9 100644
--- a/yarn-project/blob-sink/src/run.ts
+++ b/yarn-project/blob-sink/src/run.ts
@@ -1,21 +1,19 @@
 // Run a standalone blob sink server
+import { createLogger } from '@aztec/foundation/log';
 
-import { createDebugLogger } from "@aztec/foundation/log";
-import { BlobSinkServer } from "./server.js";
-import { getBlobSinkConfigFromEnv } from "./config.js";
+import { getBlobSinkConfigFromEnv } from './config.js';
+import { BlobSinkServer } from './server.js';
 
-
-const logger = createDebugLogger('aztec:blob-sink');
+const logger = createLogger('aztec:blob-sink');
 
 async function main() {
-
   const config = getBlobSinkConfigFromEnv();
   const blobSinkServer = new BlobSinkServer(config);
 
   await blobSinkServer.start();
 
   const stop = async () => {
-    logger.debug('Stopping bootstrap node...');
+    logger.debug('Stopping Blob Sink...');
     await blobSinkServer.stop();
     logger.info('Node stopped');
     process.exit(0);
@@ -24,4 +22,4 @@ async function main() {
   process.on('SIGINT', stop);
 }
 
-main();
\ No newline at end of file
+void main();
diff --git a/yarn-project/blob-sink/src/server.ts b/yarn-project/blob-sink/src/server.ts
index 3e707d58dc9..b281c6215a6 100644
--- a/yarn-project/blob-sink/src/server.ts
+++ b/yarn-project/blob-sink/src/server.ts
@@ -35,7 +35,11 @@ export class BlobSinkServer {
   private metrics: BlobSinkMetrics;
   private log: Logger = createLogger('aztec:blob-sink');
 
-  constructor(config?: Partial<BlobSinkConfig>, store?: AztecKVStore, telemetry: TelemetryClient = new NoopTelemetryClient()) {
+  constructor(
+    config?: Partial<BlobSinkConfig>,
+    store?: AztecKVStore,
+    telemetry: TelemetryClient = new NoopTelemetryClient(),
+  ) {
     this.port = config?.port ?? 5052; // 5052 is beacon chain default http port
     this.app = express();
 
diff --git a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
index 834cada2a58..029e96d2ea7 100644
--- a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
+++ b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
@@ -286,10 +286,8 @@ async function setupFromFresh(
   // Setup blob sink service
   const blobSink = await createBlobSinkServer({
     port: blobSinkPort,
-    dataStoreConfig: {
-      dataDirectory: statePath,
-      dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
-    },
+    dataDirectory: statePath,
+    dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
   });
   await blobSink.start();
 
@@ -430,10 +428,8 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
 
   const blobSink = await createBlobSinkServer({
     port: blobSinkPort,
-    dataStoreConfig: {
-      dataDirectory: statePath,
-      dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
-    },
+    dataDirectory: statePath,
+    dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
   });
   await blobSink.start();
 
diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts
index 8d685b55844..e1d5fb4c775 100644
--- a/yarn-project/end-to-end/src/fixtures/utils.ts
+++ b/yarn-project/end-to-end/src/fixtures/utils.ts
@@ -367,7 +367,11 @@ export async function setup(
 
   // Blob sink service - blobs get posted here and served from here
   const blobSinkPort = await getPort();
-  const blobSink = await createBlobSinkServer({ port: blobSinkPort });
+  const blobSink = await createBlobSinkServer({
+    port: blobSinkPort,
+    dataDirectory: undefined,
+    dataStoreMapSizeKB: 1, // will be unused, set as default
+  });
   config.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
 
   const deployL1ContractsValues =