Merge pull request #896 from 0xsend/fix_send_ceiling_functions_again

Fix send ceiling functions again

Author: youngkidwarrior

apps/distributor/src/distributorv2.ts

@@ -415,8 +415,12 @@ export class DistributorV2Worker {
 
       if (sendCeilingData && sendCeilingData.weight > 0n) {
         const scaledPreviousReward = previousReward / BigInt(sendSlash.scaling_divisor)
+        const cappedSendScore =
+          sendCeilingData.weight > scaledPreviousReward
+            ? scaledPreviousReward
+            : sendCeilingData.weight
         if (scaledPreviousReward > 0n) {
-          const slashPercentage = (sendCeilingData.weight * PERC_DENOM) / scaledPreviousReward
+          const slashPercentage = (cappedSendScore * PERC_DENOM) / scaledPreviousReward
           amountAfterSlash = (amount * slashPercentage) / PERC_DENOM
         } else {
           amountAfterSlash = 0n
@@ -533,6 +537,11 @@ export class DistributorV2Worker {
           fixedPoolAmountsByAddress[share.address]?.amountAfterSlash || 0n
         const amountAfterSlash = hodlerPoolAmountAfterSlash + fixedPoolAmountAfterSlash
 
+        // Skip if amountAfterSlash is 0
+        if (amountAfterSlash <= 0n) {
+          return null
+        }
+
         // Update totals
         totalAmount += amount
         totalHodlerPoolAmount += hodlerPoolAmount

supabase/database-generated.types.ts

@@ -1339,17 +1339,28 @@ export type Database = {
           user_id: string
         }
       }
-      sum_qualification_sends: {
-        Args: {
-          distribution_number: number
-          send_ceiling: number
-        }
-        Returns: {
-          user_id: string
-          amount: number
-          sent_to: string[]
-        }[]
-      }
+      sum_qualification_sends:
+        | {
+            Args: {
+              distribution_number: number
+            }
+            Returns: {
+              user_id: string
+              amount: number
+              sent_to: string[]
+            }[]
+          }
+        | {
+            Args: {
+              distribution_number: number
+              send_ceiling: number
+            }
+            Returns: {
+              user_id: string
+              amount: number
+              sent_to: string[]
+            }[]
+          }
       tag_search: {
         Args: {
           query: string