diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json index 478aedf90a1..75ae0a84e27 100644 --- a/yarn-project/archiver/package.json +++ b/yarn-project/archiver/package.json @@ -64,6 +64,7 @@ ] }, "dependencies": { + "@aztec/blob-sink": "workspace:^", "@aztec/circuit-types": "workspace:^", "@aztec/circuits.js": "workspace:^", "@aztec/ethereum": "workspace:^", diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts index 7cdab4b031d..c427287192a 100644 --- a/yarn-project/archiver/src/archiver/archiver.ts +++ b/yarn-project/archiver/src/archiver/archiver.ts @@ -1,4 +1,4 @@ -import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client'; +import { type BlobSinkClientInterface } from '@aztec/blob-sink/client'; import { type GetUnencryptedLogsResponse, type InBlock, @@ -52,7 +52,6 @@ import { } from '@aztec/protocol-contracts/class-registerer'; import { ContractInstanceDeployedEvent } from '@aztec/protocol-contracts/instance-deployer'; import { Attributes, type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client'; -import { NoopTelemetryClient } from '@aztec/telemetry-client/noop'; import groupBy from 'lodash.groupby'; import { diff --git a/yarn-project/archiver/tsconfig.json b/yarn-project/archiver/tsconfig.json index 901d60f657d..050085a41a4 100644 --- a/yarn-project/archiver/tsconfig.json +++ b/yarn-project/archiver/tsconfig.json @@ -6,6 +6,9 @@ "tsBuildInfoFile": ".tsbuildinfo" }, "references": [ + { + "path": "../blob-sink" + }, { "path": "../circuit-types" }, diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json index 9edee48067e..3c384dc33b2 100644 --- a/yarn-project/aztec-node/package.json +++ b/yarn-project/aztec-node/package.json @@ -64,6 +64,7 @@ "dependencies": { "@aztec/archiver": "workspace:^", "@aztec/bb-prover": "workspace:^", + "@aztec/blob-sink": "workspace:^", "@aztec/circuit-types": "workspace:^", "@aztec/circuits.js": "workspace:^", "@aztec/epoch-cache": "workspace:^", diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts index 04857555bb7..325646610cd 100644 --- a/yarn-project/aztec-node/src/aztec-node/server.ts +++ b/yarn-project/aztec-node/src/aztec-node/server.ts @@ -1,6 +1,6 @@ import { createArchiver } from '@aztec/archiver'; import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover'; -import { BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client'; +import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client'; import { type AztecNode, type ClientProtocolCircuitVerifier, diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json index 2f5e8c847ce..be7bdcc3550 100644 --- a/yarn-project/aztec-node/tsconfig.json +++ b/yarn-project/aztec-node/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../bb-prover" }, + { + "path": "../blob-sink" + }, { "path": "../circuit-types" }, diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json index 714b0362802..2e16b2ab818 100644 --- a/yarn-project/aztec/package.json +++ b/yarn-project/aztec/package.json @@ -34,6 +34,7 @@ "@aztec/aztec-node": "workspace:^", "@aztec/aztec.js": "workspace:^", "@aztec/bb-prover": "workspace:^", + "@aztec/blob-sink": "workspace:^", "@aztec/bot": "workspace:^", "@aztec/builder": "workspace:^", "@aztec/circuit-types": "workspace:^", diff --git a/yarn-project/aztec/tsconfig.json b/yarn-project/aztec/tsconfig.json index 6f0e2ced57d..437089e01a7 100644 --- a/yarn-project/aztec/tsconfig.json +++ b/yarn-project/aztec/tsconfig.json @@ -24,6 +24,9 @@ { "path": "../bb-prover" }, + { + "path": "../blob-sink" + }, { "path": "../bot" }, diff --git a/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts b/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts index 697e65c7296..f367445555d 100644 --- a/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts +++ b/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts @@ -1,7 +1,7 @@ import { Blob } from '@aztec/foundation/blob'; import { Fr } from '@aztec/foundation/fields'; -import { BlobSinkClientInterface } from './interface.js'; +import { type BlobSinkClientInterface } from './interface.js'; /** * Shared test suite for blob sink clients diff --git a/yarn-project/blob-sink/src/client/factory.ts b/yarn-project/blob-sink/src/client/factory.ts index 9aeba21360b..48ed1757f28 100644 --- a/yarn-project/blob-sink/src/client/factory.ts +++ b/yarn-project/blob-sink/src/client/factory.ts @@ -1,6 +1,6 @@ import { MemoryBlobStore } from '../blobstore/memory_blob_store.js'; import { HttpBlobSinkClient } from './http.js'; -import { BlobSinkClientInterface } from './interface.js'; +import { type BlobSinkClientInterface } from './interface.js'; import { LocalBlobSinkClient } from './local.js'; export function createBlobSinkClient(blobSinkUrl?: string): BlobSinkClientInterface { diff --git a/yarn-project/blob-sink/src/client/http.ts b/yarn-project/blob-sink/src/client/http.ts index 3822a7903cd..316c8f6cee3 100644 --- a/yarn-project/blob-sink/src/client/http.ts +++ b/yarn-project/blob-sink/src/client/http.ts @@ -1,7 +1,7 @@ import { Blob } from '@aztec/foundation/blob'; -import { Logger, createLogger } from '@aztec/foundation/log'; +import { type Logger, createLogger } from '@aztec/foundation/log'; -import { BlobSinkClientInterface } from './interface.js'; +import { type BlobSinkClientInterface } from './interface.js'; export class HttpBlobSinkClient implements BlobSinkClientInterface { private readonly log: Logger; diff --git a/yarn-project/blob-sink/src/client/interface.ts b/yarn-project/blob-sink/src/client/interface.ts index e31e900e45c..6f19b48213e 100644 --- a/yarn-project/blob-sink/src/client/interface.ts +++ b/yarn-project/blob-sink/src/client/interface.ts @@ -1,4 +1,4 @@ -import { Blob } from '@aztec/foundation/blob'; +import { type Blob } from '@aztec/foundation/blob'; export interface BlobSinkClientInterface { sendBlobsToBlobSink(blockHash: string, blobs: Blob[]): Promise; diff --git a/yarn-project/blob-sink/src/client/local.test.ts b/yarn-project/blob-sink/src/client/local.test.ts index 50dc84cfbe1..d9348335c5b 100644 --- a/yarn-project/blob-sink/src/client/local.test.ts +++ b/yarn-project/blob-sink/src/client/local.test.ts @@ -3,14 +3,14 @@ import { runBlobSinkClientTests } from './blob-sink-client-tests.js'; import { LocalBlobSinkClient } from './local.js'; describe('LocalBlobSinkClient', () => { - runBlobSinkClientTests(async () => { + runBlobSinkClientTests(() => { const store = new MemoryBlobStore(); const client = new LocalBlobSinkClient(store); - return { + return Promise.resolve({ client, cleanup: async () => { // No cleanup needed for memory store }, - }; + }); }); }); diff --git a/yarn-project/blob-sink/src/client/local.ts b/yarn-project/blob-sink/src/client/local.ts index 0ff8525fe45..70f7ead3681 100644 --- a/yarn-project/blob-sink/src/client/local.ts +++ b/yarn-project/blob-sink/src/client/local.ts @@ -1,8 +1,8 @@ -import { Blob } from '@aztec/foundation/blob'; +import { type Blob } from '@aztec/foundation/blob'; -import { BlobStore } from '../blobstore/index.js'; +import { type BlobStore } from '../blobstore/index.js'; import { BlobWithIndex } from '../types/blob_with_index.js'; -import { BlobSinkClientInterface } from './interface.js'; +import { type BlobSinkClientInterface } from './interface.js'; export class LocalBlobSinkClient implements BlobSinkClientInterface { private readonly blobStore: BlobStore; diff --git a/yarn-project/prover-node/package.json b/yarn-project/prover-node/package.json index 13a872b8864..34ba7498a2f 100644 --- a/yarn-project/prover-node/package.json +++ b/yarn-project/prover-node/package.json @@ -54,6 +54,7 @@ "dependencies": { "@aztec/archiver": "workspace:^", "@aztec/bb-prover": "workspace:^", + "@aztec/blob-sink": "workspace:^", "@aztec/circuit-types": "workspace:^", "@aztec/circuits.js": "workspace:^", "@aztec/epoch-cache": "workspace:^", diff --git a/yarn-project/prover-node/tsconfig.json b/yarn-project/prover-node/tsconfig.json index b4f4776b00d..80cf2c8db2d 100644 --- a/yarn-project/prover-node/tsconfig.json +++ b/yarn-project/prover-node/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../bb-prover" }, + { + "path": "../blob-sink" + }, { "path": "../circuit-types" }, diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index 2fb4a6560f7..64a5fa8b9a4 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -29,6 +29,7 @@ "dependencies": { "@aztec/aztec.js": "workspace:^", "@aztec/bb-prover": "workspace:^", + "@aztec/blob-sink": "workspace:^", "@aztec/circuit-types": "workspace:^", "@aztec/circuits.js": "workspace:^", "@aztec/ethereum": "workspace:^", diff --git a/yarn-project/sequencer-client/src/client/sequencer-client.ts b/yarn-project/sequencer-client/src/client/sequencer-client.ts index 28f6c39a82f..d8fec126c9f 100644 --- a/yarn-project/sequencer-client/src/client/sequencer-client.ts +++ b/yarn-project/sequencer-client/src/client/sequencer-client.ts @@ -1,4 +1,4 @@ -import { BlobSinkClientInterface } from '@aztec/blob-sink/client'; +import { type BlobSinkClientInterface } from '@aztec/blob-sink/client'; import { type L1ToL2MessageSource, type L2BlockSource, type WorldStateSynchronizer } from '@aztec/circuit-types'; import { type ContractDataSource } from '@aztec/circuits.js'; import { isAnvilTestChain } from '@aztec/ethereum'; diff --git a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts index 9e74df456e4..f8f2e74a6a0 100644 --- a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts +++ b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts @@ -1,4 +1,4 @@ -import { BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client'; +import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client'; import { ConsensusPayload, type EpochProofClaim, diff --git a/yarn-project/sequencer-client/tsconfig.json b/yarn-project/sequencer-client/tsconfig.json index 9a8615c0299..5147653040e 100644 --- a/yarn-project/sequencer-client/tsconfig.json +++ b/yarn-project/sequencer-client/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../bb-prover" }, + { + "path": "../blob-sink" + }, { "path": "../circuit-types" }, diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index e70fb45a8d2..3025c64a7a5 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -87,6 +87,7 @@ __metadata: version: 0.0.0-use.local resolution: "@aztec/archiver@workspace:archiver" dependencies: + "@aztec/blob-sink": "workspace:^" "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" @@ -150,6 +151,7 @@ __metadata: dependencies: "@aztec/archiver": "workspace:^" "@aztec/bb-prover": "workspace:^" + "@aztec/blob-sink": "workspace:^" "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/epoch-cache": "workspace:^" @@ -242,6 +244,7 @@ __metadata: "@aztec/aztec-node": "workspace:^" "@aztec/aztec.js": "workspace:^" "@aztec/bb-prover": "workspace:^" + "@aztec/blob-sink": "workspace:^" "@aztec/bot": "workspace:^" "@aztec/builder": "workspace:^" "@aztec/circuit-types": "workspace:^" @@ -1085,6 +1088,7 @@ __metadata: dependencies: "@aztec/archiver": "workspace:^" "@aztec/bb-prover": "workspace:^" + "@aztec/blob-sink": "workspace:^" "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/epoch-cache": "workspace:^" @@ -1186,6 +1190,7 @@ __metadata: dependencies: "@aztec/aztec.js": "workspace:^" "@aztec/bb-prover": "workspace:^" + "@aztec/blob-sink": "workspace:^" "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^"