Moved HistoricalBlockStorage into BlockStorage

packages/api/src/graphql/modules/BatchStorageResolver.ts

@@ -1,10 +1,6 @@
 import { inject } from "tsyringe";
 import { Arg, Field, ObjectType, Query } from "type-graphql";
-import {
-  Batch,
-  BatchStorage,
-  HistoricalBatchStorage,
-} from "@proto-kit/sequencer";
+import { Batch, BatchStorage } from "@proto-kit/sequencer";
 import { MOCK_PROOF } from "@proto-kit/common";
 
 import { graphqlModule, GraphqlModule } from "../GraphqlModule";
@@ -39,10 +35,9 @@ export class ComputedBlockModel {
 
 @graphqlModule()
 export class BatchStorageResolver extends GraphqlModule {
-  // TODO seperate these two block interfaces
   public constructor(
     @inject("BatchStorage")
-    private readonly batchStorage: BatchStorage & HistoricalBatchStorage,
+    private readonly batchStorage: BatchStorage,
     private readonly blockResolver: BlockResolver
   ) {
     super();

packages/api/src/graphql/modules/BlockResolver.ts

@@ -1,9 +1,5 @@
 import { inject } from "tsyringe";
-import {
-  HistoricalBlockStorage,
-  Block,
-  BlockStorage,
-} from "@proto-kit/sequencer";
+import { Block, BlockStorage } from "@proto-kit/sequencer";
 import { Arg, Field, ObjectType, Query } from "type-graphql";
 
 import { GraphqlModule, graphqlModule } from "../GraphqlModule";
@@ -62,7 +58,7 @@ export class BlockModel {
 export class BlockResolver extends GraphqlModule<object> {
   public constructor(
     @inject("BlockStorage")
-    private readonly blockStorage: HistoricalBlockStorage & BlockStorage
+    private readonly blockStorage: BlockStorage
   ) {
     super();
   }

packages/api/src/graphql/modules/QueryGraphqlModule.ts

@@ -39,7 +39,6 @@ import {
   QueryTransportModule,
   NetworkStateQuery,
   BlockStorage,
-  HistoricalBlockStorage,
   NetworkStateTransportModule,
 } from "@proto-kit/sequencer";
 import {
@@ -80,7 +79,7 @@ export class QueryGraphqlModule<
       MandatoryProtocolModulesRecord & ProtocolModulesRecord
     >,
     @inject("BlockStorage")
-    private readonly blockStorage: BlockStorage & HistoricalBlockStorage
+    private readonly blockStorage: BlockStorage
   ) {
     super();
   }

packages/persistance/src/services/prisma/PrismaBatchStore.ts

@@ -1,8 +1,4 @@
-import {
-  Batch,
-  HistoricalBatchStorage,
-  BatchStorage,
-} from "@proto-kit/sequencer";
+import { Batch, BatchStorage } from "@proto-kit/sequencer";
 import { Prisma } from "@prisma/client";
 import { inject, injectable } from "tsyringe";
 
@@ -11,7 +7,7 @@ import type { PrismaConnection } from "../../PrismaDatabaseConnection";
 import { BatchMapper } from "./mappers/BatchMapper";
 
 @injectable()
-export class PrismaBatchStore implements BatchStorage, HistoricalBatchStorage {
+export class PrismaBatchStore implements BatchStorage {
   public constructor(
     @inject("Database") private readonly connection: PrismaConnection,
     private readonly batchMapper: BatchMapper

packages/persistance/src/services/prisma/PrismaBlockStorage.ts

@@ -1,5 +1,4 @@
 import {
-  HistoricalBlockStorage,
   TransactionExecutionResult,
   Block,
   BlockResult,
@@ -27,9 +26,7 @@ import { BlockResultMapper } from "./mappers/BlockResultMapper";
 import { BlockMapper } from "./mappers/BlockMapper";
 
 @injectable()
-export class PrismaBlockStorage
-  implements BlockQueue, BlockStorage, HistoricalBlockStorage
-{
+export class PrismaBlockStorage implements BlockQueue, BlockStorage {
   public constructor(
     @inject("Database") private readonly connection: PrismaConnection,
     private readonly transactionResultMapper: TransactionExecutionResultMapper,

packages/sdk/src/query/BlockStorageNetworkStateModule.ts

@@ -1,8 +1,6 @@
 import { inject, injectable } from "tsyringe";
 import {
   BlockStorage,
-  HistoricalBlockStorage,
-  HistoricalBatchStorage,
   NetworkStateTransportModule,
   Sequencer,
   SequencerModulesRecord,
@@ -29,16 +27,16 @@ export class BlockStorageNetworkStateModule
     return this.sequencer.dependencyContainer.resolve<BlockQueue>("BlockQueue");
   }
 
-  private get unprovenStorage(): BlockStorage & HistoricalBlockStorage {
-    return this.sequencer.dependencyContainer.resolve<
-      BlockStorage & HistoricalBlockStorage
-    >("BlockStorage");
+  private get unprovenStorage(): BlockStorage {
+    return this.sequencer.dependencyContainer.resolve<BlockStorage>(
+      "BlockStorage"
+    );
   }
 
-  private get provenStorage(): BatchStorage & HistoricalBatchStorage {
-    return this.sequencer.dependencyContainer.resolve<
-      BatchStorage & HistoricalBatchStorage
-    >("BatchStorage");
+  private get provenStorage(): BatchStorage {
+    return this.sequencer.dependencyContainer.resolve<BatchStorage>(
+      "BatchStorage"
+    );
   }
 
   public async getUnprovenNetworkState(): Promise<NetworkState | undefined> {

packages/sequencer/src/settlement/messages/outgoing/OutgoingMessageCollector.ts

@@ -3,10 +3,7 @@ import { OutgoingMessageEvent } from "@proto-kit/protocol";
 import { filterNonUndefined } from "@proto-kit/common";
 
 import { Block } from "../../../storage/model/Block";
-import {
-  BlockStorage,
-  HistoricalBlockStorage,
-} from "../../../storage/repositories/BlockStorage";
+import { BlockStorage } from "../../../storage/repositories/BlockStorage";
 import { Batch } from "../../../storage/model/Batch";
 
 /**
@@ -25,7 +22,7 @@ export interface OutgoingMessageAdapter<T> {
 export class OutgoingMessageCollector {
   public constructor(
     @inject("BlockStorage")
-    private readonly blockStorage: BlockStorage & HistoricalBlockStorage,
+    private readonly blockStorage: BlockStorage,
     @inject("OutgoingMessageAdapter")
     private readonly messageAdapter: OutgoingMessageAdapter<any>
   ) {}

packages/sequencer/src/storage/inmemory/InMemoryBatchStorage.ts

@@ -1,14 +1,9 @@
 import { log } from "@proto-kit/common";
 
-import {
-  BatchStorage,
-  HistoricalBatchStorage,
-} from "../repositories/BatchStorage";
+import { BatchStorage } from "../repositories/BatchStorage";
 import { Batch } from "../model/Batch";
 
-export class InMemoryBatchStorage
-  implements BatchStorage, HistoricalBatchStorage
-{
+export class InMemoryBatchStorage implements BatchStorage {
   private readonly batches: Batch[] = [];
 
   public async getCurrentBatchHeight(): Promise<number> {

packages/sequencer/src/storage/inmemory/InMemoryBlockStorage.ts

@@ -1,10 +1,6 @@
 import { inject, injectable } from "tsyringe";
 
-import {
-  HistoricalBlockStorage,
-  BlockQueue,
-  BlockStorage,
-} from "../repositories/BlockStorage";
+import { BlockQueue, BlockStorage } from "../repositories/BlockStorage";
 import type {
   Block,
   BlockResult,
@@ -14,9 +10,7 @@ import type {
 import { BatchStorage } from "../repositories/BatchStorage";
 
 @injectable()
-export class InMemoryBlockStorage
-  implements BlockStorage, HistoricalBlockStorage, BlockQueue
-{
+export class InMemoryBlockStorage implements BlockStorage, BlockQueue {
   public constructor(
     @inject("BatchStorage") private readonly batchStorage: BatchStorage
   ) {}

packages/sequencer/src/storage/inmemory/InMemoryTransactionStorage.ts

@@ -3,10 +3,7 @@ import { Field } from "o1js";
 
 import { TransactionStorage } from "../repositories/TransactionStorage";
 import { PendingTransaction } from "../../mempool/PendingTransaction";
-import {
-  HistoricalBlockStorage,
-  BlockStorage,
-} from "../repositories/BlockStorage";
+import { BlockStorage } from "../repositories/BlockStorage";
 
 import { InMemoryBatchStorage } from "./InMemoryBatchStorage";
 
@@ -18,7 +15,7 @@ export class InMemoryTransactionStorage implements TransactionStorage {
 
   public constructor(
     @inject("BlockStorage")
-    private readonly blockStorage: BlockStorage & HistoricalBlockStorage,
+    private readonly blockStorage: BlockStorage,
     @inject("BatchStorage") private readonly batchStorage: InMemoryBatchStorage
   ) {}
 

packages/sequencer/src/storage/repositories/BatchStorage.ts

@@ -1,12 +1,8 @@
 import { Batch } from "../model/Batch";
 
 export interface BatchStorage {
-  // TODO Rename to getCurrentChainLength(), blockheight seems misleading here
   getCurrentBatchHeight: () => Promise<number>;
   getLatestBatch: () => Promise<Batch | undefined>;
   pushBatch: (block: Batch) => Promise<void>;
-}
-
-export interface HistoricalBatchStorage {
   getBatchAt: (height: number) => Promise<Batch | undefined>;
 }

packages/sequencer/src/storage/repositories/BlockStorage.ts

@@ -13,12 +13,11 @@ export interface BlockQueue {
 }
 
 export interface BlockStorage {
+  // TODO Rename to getCurrentChainLength(), blockheight seems misleading here
   getCurrentBlockHeight: () => Promise<number>;
   getLatestBlock: () => Promise<BlockWithResult | undefined>;
   pushBlock: (block: Block) => Promise<void>;
-}
 
-export interface HistoricalBlockStorage {
   getBlockAt: (height: number) => Promise<Block | undefined>;
   getBlock: (hash: string) => Promise<Block | undefined>;
 }

packages/sequencer/test/integration/BlockProduction-test.ts

@@ -29,7 +29,6 @@ import { afterEach } from "@jest/globals";
 
 import {
   BatchStorage,
-  HistoricalBatchStorage,
   Sequencer,
   SequencerModule,
   VanillaTaskWorkerModules,
@@ -251,8 +250,7 @@ export function testBlockProduction<
     ).toStrictEqual(batch!.toNetworkState.hash().toString());
 
     // Check if the batchstorage has received the block
-    const batchStorage = sequencer.resolve("BatchStorage") as BatchStorage &
-      HistoricalBatchStorage;
+    const batchStorage = sequencer.resolve("BatchStorage") as BatchStorage;
     const retrievedBatch = await batchStorage.getBatchAt(0);
     expect(retrievedBatch).toBeDefined();
 

packages/sequencer/test/integration/StorageIntegration.test.ts

@@ -10,8 +10,6 @@ import { TypedClass, expectDefined } from "@proto-kit/common";
 import {
   AsyncStateService,
   BatchStorage,
-  HistoricalBatchStorage,
-  HistoricalBlockStorage,
   InMemoryDatabase,
   Sequencer,
   SequencerModule,
@@ -158,9 +156,7 @@ describe.each([["InMemory", InMemoryDatabase]])(
         generatedBlock.hash.toBigInt()
       );
 
-      const blockStorage = sequencer.resolve(
-        "BlockStorage"
-      ) as HistoricalBlockStorage & BlockStorage;
+      const blockStorage = sequencer.resolve("BlockStorage") as BlockStorage;
       const block2 = await blockStorage.getBlockAt(
         Number(blocks[0].block.height.toString())
       );
@@ -196,9 +192,7 @@ describe.each([["InMemory", InMemoryDatabase]])(
       const blocks = await sequencer.resolve("BlockQueue").getNewBlocks();
       expect(blocks).toHaveLength(0);
 
-      const batchStorage = sequencer.resolve(
-        "BatchStorage"
-      ) as HistoricalBatchStorage & BatchStorage;
+      const batchStorage = sequencer.resolve("BatchStorage") as BatchStorage;
       const batch = await batchStorage.getBatchAt(0);
 
       expectDefined(batch);