Add allocation fee to drain delegate operations

baking-bad · Jun 29, 2024 · 5567ecc · 5567ecc
1 parent 5b7a317
commit 5567ecc
Show file tree

Hide file tree

Showing 12 changed files with 7,034 additions and 1,041 deletions.
diff --git a/Tzkt.Api/Models/Operations/DrainDelegateOperation.cs b/Tzkt.Api/Models/Operations/DrainDelegateOperation.cs
@@ -52,6 +52,11 @@ public class DrainDelegateOperation : Operation
         /// </summary>
         public long Fee { get; set; }
 
+        /// <summary>
+        /// The amount of funds burned from the drained baker for account creation (micro tez)
+        /// </summary>
+        public long AllocationFee { get; set; }
+
         #region injecting
         /// <summary>
         /// Injected historical quote at the time of operation

diff --git a/Tzkt.Api/Repositories/BalanceHistoryRepository.cs b/Tzkt.Api/Repositories/BalanceHistoryRepository.cs
@@ -915,7 +915,7 @@ void SumDrainDelegateOps(StringBuilder sql, int from, int to)
             sql.Append(sql.Length == 0 ? "SELECT " : "UNION ALL SELECT ");
 
             #region delegate
-            sql.Append(@"SUM(-""Amount"" - ""Fee"") as ""Change"" ");
+            sql.Append(@"SUM(-""Amount"" - ""Fee"" - ""AllocationFee"") as ""Change"" ");
             sql.Append(@"FROM ""DrainDelegateOps"" ");
             sql.Append(@"WHERE ""DelegateId"" = @account ");
 
@@ -1782,7 +1782,7 @@ void UnionDrainDelegateOps(StringBuilder sql)
 
             #region delegate
             sql.Append(@"""Level"" as ""Level"", ");
-            sql.Append(@"(-""Amount"" - ""Fee"") as ""Change"" ");
+            sql.Append(@"(-""Amount"" - ""Fee"" - ""AllocationFee"") as ""Change"" ");
 
             sql.Append(@"FROM ""DrainDelegateOps"" ");
             sql.Append(@"WHERE ""DelegateId"" = @account ");

diff --git a/Tzkt.Api/Repositories/OperationRepository.DrainDelegate.cs b/Tzkt.Api/Repositories/OperationRepository.DrainDelegate.cs
@@ -41,6 +41,7 @@ INNER JOIN  ""Blocks"" as b
                 Target = Accounts.GetAlias(row.TargetId),
                 Amount = row.Amount,
                 Fee = row.Fee,
+                AllocationFee = row.AllocationFee,
                 Quote = Quotes.Get(quote, row.Level)
             });
         }
@@ -67,6 +68,7 @@ public async Task<IEnumerable<DrainDelegateOperation>> GetDrainDelegates(Block b
                 Target = Accounts.GetAlias(row.TargetId),
                 Amount = row.Amount,
                 Fee = row.Fee,
+                AllocationFee = row.AllocationFee,
                 Quote = Quotes.Get(quote, block.Level)
             });
         }
@@ -108,6 +110,7 @@ public async Task<IEnumerable<DrainDelegateOperation>> GetDrainDelegates(
                 Target = Accounts.GetAlias(row.TargetId),
                 Amount = row.Amount,
                 Fee = row.Fee,
+                AllocationFee = row.AllocationFee,
                 Quote = Quotes.Get(quote, row.Level)
             });
         }
@@ -139,6 +142,7 @@ public async Task<object[][]> GetDrainDelegates(
                     case "target": columns.Add(@"o.""TargetId"""); break;
                     case "amount": columns.Add(@"o.""Amount"""); break;
                     case "fee": columns.Add(@"o.""Fee"""); break;
+                    case "allocationFee": columns.Add(@"o.""AllocationFee"""); break;
                     case "block":
                         columns.Add(@"b.""Hash""");
                         joins.Add(@"INNER JOIN ""Blocks"" as b ON b.""Level"" = o.""Level""");
@@ -209,6 +213,10 @@ public async Task<object[][]> GetDrainDelegates(
                         foreach (var row in rows)
                             result[j++][i] = row.Fee;
                         break;
+                    case "allocationFee":
+                        foreach (var row in rows)
+                            result[j++][i] = row.AllocationFee;
+                        break;
                     case "quote":
                         foreach (var row in rows)
                             result[j++][i] = Quotes.Get(quote, row.Level);
@@ -244,6 +252,7 @@ public async Task<object[]> GetDrainDelegates(
                 case "target": columns.Add(@"o.""TargetId"""); break;
                 case "amount": columns.Add(@"o.""Amount"""); break;
                 case "fee": columns.Add(@"o.""Fee"""); break;
+                case "allocationFee": columns.Add(@"o.""AllocationFee"""); break;
                 case "block":
                     columns.Add(@"b.""Hash""");
                     joins.Add(@"INNER JOIN ""Blocks"" as b ON b.""Level"" = o.""Level""");
@@ -311,6 +320,10 @@ public async Task<object[]> GetDrainDelegates(
                     foreach (var row in rows)
                         result[j++] = row.Fee;
                     break;
+                case "allocationFee":
+                    foreach (var row in rows)
+                        result[j++] = row.AllocationFee;
+                    break;
                 case "quote":
                     foreach (var row in rows)
                         result[j++] = Quotes.Get(quote, row.Level);

diff --git a/Tzkt.Api/Repositories/ReportRepository.cs b/Tzkt.Api/Repositories/ReportRepository.cs
@@ -1520,7 +1520,7 @@ void UnionDrainDelegateOps(StringBuilder sql)
             sql.Append(@"null::integer as ""Received"", ");
             sql.Append(@"null::integer as ""From"", ");
             sql.Append(@"""Amount"" as ""Sent"", ");
-            sql.Append(@"""Fee"" as ""Fee"", ");
+            sql.Append(@"(""Fee"" + ""AllocationFee"") as ""Fee"", ");
             sql.Append(@"""TargetId"" as ""To"" ");
 
             sql.Append(@"FROM ""DrainDelegateOps"" ");

diff --git a/Tzkt.Api/Services/Home/HomeService.cs b/Tzkt.Api/Services/Home/HomeService.cs
@@ -353,7 +353,7 @@ SELECT SUM(""BakerFee"")::bigint AS fee, 0::bigint AS burn FROM ""DalPublishComm
                     UNION ALL
                     SELECT SUM(""BakerFee"")::bigint AS fee, 0::bigint AS burn FROM ""DelegationOps"" WHERE ""Level"" >= {currPeriod}
                     UNION ALL
-                    SELECT SUM(""Fee"")::bigint AS fee, 0::bigint AS burn FROM ""DrainDelegateOps"" WHERE ""Level"" >= {currPeriod}
+                    SELECT SUM(""Fee"")::bigint AS fee, SUM(""AllocationFee"")::bigint AS burn FROM ""DrainDelegateOps"" WHERE ""Level"" >= {currPeriod}
                     UNION ALL
                     SELECT SUM(""BakerFee"")::bigint AS fee, SUM(COALESCE(""StorageFee"", 0))::bigint AS burn FROM ""IncreasePaidStorageOps"" WHERE ""Level"" >= {currPeriod}
                     UNION ALL
@@ -431,7 +431,7 @@ SELECT SUM(""BakerFee"")::bigint AS fee, 0::bigint AS burn FROM ""DalPublishComm
                     UNION ALL
                     SELECT SUM(""BakerFee"")::bigint AS fee, 0::bigint AS burn FROM ""DelegationOps"" WHERE ""Level"" >= {prevPeriod} AND ""Level"" < {currPeriod}
                     UNION ALL
-                    SELECT SUM(""Fee"")::bigint AS fee, 0::bigint AS burn FROM ""DrainDelegateOps"" WHERE ""Level"" >= {prevPeriod} AND ""Level"" < {currPeriod}
+                    SELECT SUM(""Fee"")::bigint AS fee, SUM(""AllocationFee"")::bigint AS burn FROM ""DrainDelegateOps"" WHERE ""Level"" >= {prevPeriod} AND ""Level"" < {currPeriod}
                     UNION ALL
                     SELECT SUM(""BakerFee"")::bigint AS fee, SUM(COALESCE(""StorageFee"", 0))::bigint AS burn FROM ""IncreasePaidStorageOps"" WHERE ""Level"" >= {prevPeriod} AND ""Level"" < {currPeriod}
                     UNION ALL