add protocol fee

helix-bridge · Oct 11, 2023 · 4c56ac0 · 4c56ac0
1 parent 8defb77
commit 4c56ac0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/apollo/prisma/migrations/20231011073505_init/migration.sql b/apollo/prisma/migrations/20231011073505_init/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `protocolFee` to the `Lnv20RelayInfo` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Lnv20RelayInfo" ADD COLUMN     "protocolFee" TEXT NOT NULL;
diff --git a/apollo/prisma/schema.prisma b/apollo/prisma/schema.prisma
@@ -65,6 +65,7 @@ model Lnv20RelayInfo {
   transaction_hash String
   timestamp Int
   margin String
+  protocolFee String
   baseFee String
   liquidityFeeRate Int
   slashCount Int

diff --git a/apollo/src/aggregation/aggregation.history.graphql b/apollo/src/aggregation/aggregation.history.graphql
@@ -57,6 +57,7 @@ type Lnv20RelayInfo {
   transaction_hash: String!
   timestamp: Int!
   margin: String
+  protocolFee: String
   baseFee: String
   liquidityFeeRate: Int
   slashCount: Int

diff --git a/apollo/src/graphql.ts b/apollo/src/graphql.ts
@@ -88,6 +88,7 @@ export class Lnv20RelayInfo {
     transaction_hash: string;
     timestamp: number;
     margin?: Nullable<string>;
+    protocolFee?: Nullable<string>;
     baseFee?: Nullable<string>;
     liquidityFeeRate?: Nullable<number>;
     slashCount?: Nullable<number>;

diff --git a/apollo/src/lnbridgev20/lnbridgev20.service.ts b/apollo/src/lnbridgev20/lnbridgev20.service.ts
@@ -574,7 +574,8 @@ export class Lnbridgev20Service implements OnModuleInit {
             transaction_hash: record.transactionHash,
             timestamp: Number(record.timestamp),
             margin: '0',
-            baseFee: (BigInt(record.baseFee) + BigInt(symbol.protocolFee)).toString(),
+            protocolFee: BigInt(symbol.protocolFee).toString(),
+            baseFee: BigInt(record.baseFee).toString(),
             liquidityFeeRate: Number(record.liquidityFeeRate),
             slashCount: 0,
             targetNonce: 0,
@@ -667,7 +668,8 @@ export class Lnbridgev20Service implements OnModuleInit {
             transaction_hash: record.transactionHash,
             timestamp: Number(record.timestamp),
             margin: margin,
-            baseFee: (BigInt(record.baseFee) + BigInt(symbol.protocolFee)).toString(),
+            protocolFee: BigInt(symbol.protocolFee).toString(),
+            baseFee: BigInt(record.baseFee).toString(),
             liquidityFeeRate: Number(record.liquidityFeeRate),
             slashCount: 0,
             withdrawNonce: 0,