Add possibility to exclude l2 transaction types

packages/backend/src/Application.ts

@@ -57,6 +57,8 @@ import { SpotValidiumSyncService } from './core/SpotValidiumSyncService'
 import { SpotValidiumUpdater } from './core/SpotValidiumUpdater'
 import { StatusService } from './core/StatusService'
 import { BlockDownloader } from './core/sync/BlockDownloader'
+import { Clock } from './core/sync/Clock'
+import { LiveL2TransactionDownloader } from './core/sync/LiveL2TransactionDownloader'
 import { SyncScheduler } from './core/sync/SyncScheduler'
 import { TransactionStatusService } from './core/TransactionStatusService'
 import { UserService } from './core/UserService'
@@ -88,6 +90,7 @@ import { TokenInspector } from './peripherals/ethereum/TokenInspector'
 import { AvailabilityGatewayClient } from './peripherals/starkware/AvailabilityGatewayClient'
 import { FeederGatewayClient } from './peripherals/starkware/FeederGatewayClient'
 import { FetchClient } from './peripherals/starkware/FetchClient'
+import { LiveL2TransactionClient } from './peripherals/starkware/LiveL2TransactionClient'
 import { handleServerError, reportError } from './tools/ErrorReporter'
 
 export class Application {
@@ -101,6 +104,8 @@ export class Application {
       reportError,
     })
 
+    const clock = new Clock()
+
     // #endregion tools
     // #region peripherals
 
@@ -219,7 +224,43 @@ export class Application {
       | PerpetualRollupUpdater
     let stateTransitionCollector: IStateTransitionCollector
 
-    let feederGatewayCollector: FeederGatewayCollector | undefined
+    const feederGatewayClient = config.starkex.l2Transactions.enabled
+      ? new FeederGatewayClient(
+          config.starkex.l2Transactions.feederGateway,
+          fetchClient,
+          logger
+        )
+      : undefined
+
+    const feederGatewayCollector = feederGatewayClient
+      ? new FeederGatewayCollector(
+          feederGatewayClient,
+          l2TransactionRepository,
+          stateUpdateRepository,
+          logger,
+          config.starkex.l2Transactions.enabled
+        )
+      : undefined
+
+    const liveL2TransactionClient =
+      config.starkex.l2Transactions.enabled &&
+      config.starkex.l2Transactions.liveApi
+        ? new LiveL2TransactionClient(
+            config.starkex.l2Transactions.liveApi,
+            fetchClient
+          )
+        : undefined
+
+    const liveL2TransactionDownloader = liveL2TransactionClient
+      ? new LiveL2TransactionDownloader(
+          liveL2TransactionClient,
+          l2TransactionRepository,
+          stateUpdateRepository,
+          kvStore,
+          clock,
+          logger
+        )
+      : undefined
 
     if (config.starkex.dataAvailabilityMode === 'validium') {
       const availabilityGatewayClient = new AvailabilityGatewayClient(
@@ -236,22 +277,6 @@ export class Application {
           )
         stateTransitionCollector = perpetualValidiumStateTransitionCollector
 
-        const feederGatewayClient = config.starkex.feederGateway
-          ? new FeederGatewayClient(
-              config.starkex.feederGateway,
-              fetchClient,
-              logger
-            )
-          : undefined
-        feederGatewayCollector = feederGatewayClient
-          ? new FeederGatewayCollector(
-              feederGatewayClient,
-              l2TransactionRepository,
-              stateUpdateRepository,
-              logger
-            )
-          : undefined
-
         const perpetualCairoOutputCollector = new PerpetualCairoOutputCollector(
           ethereumClient,
           config.starkex
@@ -279,6 +304,7 @@ export class Application {
           perpetualValidiumUpdater,
           withdrawalAllowedCollector,
           feederGatewayCollector,
+          liveL2TransactionDownloader,
           logger
         )
       } else {
@@ -539,7 +565,8 @@ export class Application {
       userTransactionRepository,
       forcedTradeOfferRepository,
       l2TransactionRepository,
-      preprocessedStateDetailsRepository
+      preprocessedStateDetailsRepository,
+      config.starkex.l2Transactions.excludeTypes
     )
 
     const userController = new UserController(
@@ -555,6 +582,7 @@ export class Application {
       withdrawableAssetRepository,
       preprocessedUserStatisticsRepository,
       preprocessedUserL2TransactionsStatisticsRepository,
+      config.starkex.l2Transactions.excludeTypes,
       config.starkex.contracts.perpetual
     )
     const stateUpdateController = new StateUpdateController(
@@ -564,7 +592,8 @@ export class Application {
       userTransactionRepository,
       l2TransactionRepository,
       preprocessedAssetHistoryRepository,
-      preprocessedStateDetailsRepository
+      preprocessedStateDetailsRepository,
+      config.starkex.l2Transactions.excludeTypes
     )
     const transactionController = new TransactionController(
       pageContextService,
@@ -657,6 +686,7 @@ export class Application {
       if (config.enableSync) {
         transactionStatusService.start()
         await syncScheduler.start()
+        await liveL2TransactionDownloader?.start()
         await blockDownloader.start()
       }
 

packages/backend/src/api/controllers/HomeController.ts

@@ -6,6 +6,7 @@ import {
 } from '@explorer/frontend'
 import { UserDetails } from '@explorer/shared'
 
+import { L2TransactionTypesToExclude } from '../../config/starkex/StarkexConfig'
 import { AssetDetailsService } from '../../core/AssetDetailsService'
 import { ForcedTradeOfferViewService } from '../../core/ForcedTradeOfferViewService'
 import { PageContextService } from '../../core/PageContextService'
@@ -34,7 +35,10 @@ export class HomeController {
     private readonly userTransactionRepository: UserTransactionRepository,
     private readonly forcedTradeOfferRepository: ForcedTradeOfferRepository,
     private readonly l2TransactionRepository: L2TransactionRepository,
-    private readonly preprocessedStateDetailsRepository: PreprocessedStateDetailsRepository
+    private readonly preprocessedStateDetailsRepository: PreprocessedStateDetailsRepository,
+    private readonly excludeL2TransactionTypes:
+      | L2TransactionTypesToExclude
+      | undefined
   ) {}
 
   async getHomePage(
@@ -45,15 +49,20 @@ export class HomeController {
     const [
       l2Transactions,
       lastStateDetailsWithL2TransactionsStatistics,
+      liveL2TransactionsStatistics,
       stateUpdates,
       stateUpdatesCount,
       forcedUserTransactions,
       forcedUserTransactionsCount,
       availableOffers,
       availableOffersCount,
     ] = await Promise.all([
-      this.l2TransactionRepository.getPaginatedWithoutMulti(paginationOpts),
+      this.l2TransactionRepository.getPaginatedWithoutMulti(
+        paginationOpts,
+        this.excludeL2TransactionTypes
+      ),
       this.preprocessedStateDetailsRepository.findLastWithL2TransactionsStatistics(),
+      this.l2TransactionRepository.getLiveStatistics(),
       this.preprocessedStateDetailsRepository.getPaginated(paginationOpts),
       this.preprocessedStateDetailsRepository.countAll(),
       this.userTransactionRepository.getPaginated({
@@ -82,13 +91,21 @@ export class HomeController {
       forcedTransactionCount: update.forcedTransactionCount,
     }))
 
+    const totalL2Transactions =
+      sumUpTransactionCount(
+        lastStateDetailsWithL2TransactionsStatistics?.cumulativeL2TransactionsStatistics,
+        this.excludeL2TransactionTypes
+      ) +
+      sumUpTransactionCount(
+        liveL2TransactionsStatistics,
+        this.excludeL2TransactionTypes
+      )
+
     const content = renderHomePage({
       context,
       tutorials: [], // explicitly no tutorials
       l2Transactions: l2Transactions.map(l2TransactionToEntry),
-      totalL2Transactions: sumUpTransactionCount(
-        lastStateDetailsWithL2TransactionsStatistics?.cumulativeL2TransactionsStatistics
-      ),
+      totalL2Transactions,
       stateUpdates: stateUpdateEntries,
       totalStateUpdates: stateUpdatesCount,
       forcedTransactions: forcedTransactionEntries,
@@ -109,18 +126,33 @@ export class HomeController {
   ): Promise<ControllerResult> {
     const context = await this.pageContextService.getPageContext(givenUser)
 
-    const [l2Transactions, lastStateDetailsWithL2TransactionsStatistics] =
-      await Promise.all([
-        this.l2TransactionRepository.getPaginatedWithoutMulti(pagination),
-        this.preprocessedStateDetailsRepository.findLastWithL2TransactionsStatistics(),
-      ])
+    const [
+      l2Transactions,
+      lastStateDetailsWithL2TransactionsStatistics,
+      liveL2TransactionsStatistics,
+    ] = await Promise.all([
+      this.l2TransactionRepository.getPaginatedWithoutMulti(
+        pagination,
+        this.excludeL2TransactionTypes
+      ),
+      this.preprocessedStateDetailsRepository.findLastWithL2TransactionsStatistics(),
+      this.l2TransactionRepository.getLiveStatistics(),
+    ])
+
+    const totalL2Transactions =
+      sumUpTransactionCount(
+        lastStateDetailsWithL2TransactionsStatistics?.cumulativeL2TransactionsStatistics,
+        this.excludeL2TransactionTypes
+      ) +
+      sumUpTransactionCount(
+        liveL2TransactionsStatistics,
+        this.excludeL2TransactionTypes
+      )
 
     const content = renderHomeL2TransactionsPage({
       context,
       l2Transactions: l2Transactions.map(l2TransactionToEntry),
-      total: sumUpTransactionCount(
-        lastStateDetailsWithL2TransactionsStatistics?.cumulativeL2TransactionsStatistics
-      ),
+      total: totalL2Transactions,
       ...pagination,
     })
     return { type: 'success', content }

packages/backend/src/api/controllers/StateUpdateController.ts

@@ -7,6 +7,7 @@ import {
 import { UserDetails } from '@explorer/shared'
 import { AssetHash } from '@explorer/types'
 
+import { L2TransactionTypesToExclude } from '../../config/starkex/StarkexConfig'
 import { AssetDetailsMap } from '../../core/AssetDetailsMap'
 import { AssetDetailsService } from '../../core/AssetDetailsService'
 import { PageContextService } from '../../core/PageContextService'
@@ -40,7 +41,10 @@ export class StateUpdateController {
     private readonly userTransactionRepository: UserTransactionRepository,
     private readonly l2TransactionRepository: L2TransactionRepository,
     private readonly preprocessedAssetHistoryRepository: PreprocessedAssetHistoryRepository,
-    private readonly preprocessedStateDetailsRepository: PreprocessedStateDetailsRepository
+    private readonly preprocessedStateDetailsRepository: PreprocessedStateDetailsRepository,
+    private readonly excludeL2TransactionTypes:
+      | L2TransactionTypesToExclude
+      | undefined
   ) {}
 
   async getStateUpdatePage(
@@ -82,7 +86,8 @@ export class StateUpdateController {
         {
           offset: 0,
           limit: 6,
-        }
+        },
+        this.excludeL2TransactionTypes
       ),
       this.preprocessedStateDetailsRepository.findByStateUpdateId(
         stateUpdateId
@@ -132,7 +137,8 @@ export class StateUpdateController {
       l2Transactions: l2Transactions.map(l2TransactionToEntry),
       totalL2Transactions: preprocessedStateDetails?.l2TransactionsStatistics
         ? sumUpTransactionCount(
-            preprocessedStateDetails.l2TransactionsStatistics
+            preprocessedStateDetails.l2TransactionsStatistics,
+            this.excludeL2TransactionTypes
           )
         : 'processing',
       transactions,
@@ -152,7 +158,8 @@ export class StateUpdateController {
     const [l2Transactions, preprocessedStateDetails] = await Promise.all([
       this.l2TransactionRepository.getPaginatedWithoutMultiByStateUpdateId(
         stateUpdateId,
-        pagination
+        pagination,
+        this.excludeL2TransactionTypes
       ),
       this.preprocessedStateDetailsRepository.findByStateUpdateId(
         stateUpdateId
@@ -166,7 +173,8 @@ export class StateUpdateController {
       ...pagination,
       total: preprocessedStateDetails?.l2TransactionsStatistics
         ? sumUpTransactionCount(
-            preprocessedStateDetails.l2TransactionsStatistics
+            preprocessedStateDetails.l2TransactionsStatistics,
+            this.excludeL2TransactionTypes
           )
         : 'processing',
     })