Merge pull request #183 from utxostack/revert-179-develop

Revert "Merge develop into main branch (20240923)"

Dockerfile

@@ -1,6 +1,6 @@
 ARG NODE_VERSION=20
 
-FROM node:${NODE_VERSION} AS base
+FROM node:${NODE_VERSION}-slim AS base
 ARG GIT_BRANCH
 
 ENV PNPM_HOME="/pnpm"
@@ -15,7 +15,7 @@ FROM base AS prod-deps
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile --ignore-scripts
 RUN pnpm run --filter backend postinstall
 
-FROM base AS build
+FROM base as build
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 RUN pnpm run --filter backend build
 

backend/package.json

@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "@apollo/server": "^4.11.0",
+    "@applifting-io/nestjs-dataloader": "^1.1.5",
     "@as-integrations/fastify": "^2.1.1",
     "@cell-studio/mempool.js": "^2.5.3",
     "@ckb-lumos/bi": "^0.23.0",

backend/prisma/schema.prisma

@@ -39,6 +39,11 @@ model Block {
   number            Int
   timestamp         DateTime
   transactionsCount Int
+  size              Int
+  totalFee          BigInt
+  minFee            BigInt
+  maxFee            BigInt
+  difficulty        BigInt
   createdAt         DateTime @default(now())
   updatedAt         DateTime @updatedAt
 
@@ -53,11 +58,13 @@ model Transaction {
   id            Int            @id @default(autoincrement())
   chainId       Int
   hash          String
-  index         Int
+  index         String
   blockNumber   Int
+  timestamp     DateTime
+  fee           BigInt
+  size          Int
   isCellbase    Boolean        @default(false)
   isRgbpp       Boolean        @default(false)
-  btcTxid       String?
   leapDirection LeapDirection?
   inputCount    Int
   outputCount   Int
@@ -66,10 +73,33 @@ model Transaction {
 
   chain   Chain    @relation(fields: [chainId], references: [id])
   block   Block    @relation(fields: [chainId, blockNumber], references: [chainId, number])
+  outputs Output[]
 
   @@unique([chainId, hash])
 }
 
+model Output {
+  id               Int      @id @default(autoincrement())
+  chainId          Int
+  txHash           String
+  index            String
+  consumedByTxHash String?
+  consumedByIndex  String?
+  capacity         BigInt
+  lockScriptHash   String   @db.Char(66)
+  typeScriptHash   String?  @db.Char(66)
+  isLive           Boolean  @default(true)
+  rgbppBound       Boolean  @default(false)
+  boundBtcTxId     String?
+  boundBtcTxIndex  Int?
+  createdAt        DateTime @default(now())
+  updatedAt        DateTime @updatedAt
+
+  transaction Transaction @relation(fields: [chainId, txHash], references: [chainId, hash])
+
+  @@unique([chainId, txHash, index])
+}
+
 model LockScript {
   id            Int      @id @default(autoincrement())
   chainId       Int

backend/src/bootstrap.service.ts

@@ -16,7 +16,7 @@ export class BootstrapService {
     for (const chain of chains) {
       this.logger.log(`Indexing assets for chain ${chain.name}`);
       const indexerService = await this.IndexerServiceFactory.getService(chain.id);
-      await indexerService.start();
+      await indexerService.startAssetsIndexing();
     }
   }
 }

backend/src/common/type/dataloader.ts

@@ -0,0 +1,4 @@
+import { NestDataLoader } from '@applifting-io/nestjs-dataloader';
+
+export type DataLoaderResponse<T extends NestDataLoader<unknown, unknown>> =
+  Awaited<ReturnType<ReturnType<T['getBatchFunction']>>> extends (infer E)[] ? E : never;