Update DistributorV2 with send slash logic

Author: youngkidwarrior

apps/distributor/src/distributorv2.test.ts

@@ -103,6 +103,7 @@ describe('Distributor V2 Worker', () => {
       updated_at: '2024-04-06T16:49:02.569245+00:00',
       snapshot_block_num: 13261327,
       chain_id: 845337,
+      send_slash_divisor: 150,
       distribution_verification_values: [
         {
           type: 'tag_referral',
@@ -112,7 +113,6 @@ describe('Distributor V2 Worker', () => {
           multiplier_max: 2.5,
           multiplier_step: 0.1,
           distribution_id: 4,
-          mode: 'individual',
         },
         {
           type: 'total_tag_referrals',
@@ -121,7 +121,7 @@ describe('Distributor V2 Worker', () => {
           multiplier_min: 1.0,
           multiplier_max: 2.0,
           multiplier_step: 0.01,
-          mode: 'aggregate',
+
           created_at: '2024-04-06T16:49:02.569245+00:00',
           updated_at: '2024-04-06T16:49:02.569245+00:00',
           distribution_id: 4,
@@ -131,7 +131,6 @@ describe('Distributor V2 Worker', () => {
           fixed_value: 200,
           bips_value: 0,
           distribution_id: 4,
-          mode: 'individual',
         },
         {
           type: 'tag_registration',
@@ -140,7 +139,6 @@ describe('Distributor V2 Worker', () => {
           distribution_id: 4,
           created_at: '2024-04-06T16:49:02.569245+00:00',
           updated_at: '2024-04-06T16:49:02.569245+00:00',
-          mode: 'individual',
         },
         {
           type: 'send_ten',
@@ -149,7 +147,6 @@ describe('Distributor V2 Worker', () => {
           distribution_id: 4,
           created_at: '2024-04-06T16:49:02.569245+00:00',
           updated_at: '2024-04-06T16:49:02.569245+00:00',
-          mode: 'individual',
         },
         {
           type: 'send_one_hundred',
@@ -158,7 +155,6 @@ describe('Distributor V2 Worker', () => {
           distribution_id: 4,
           created_at: '2024-04-06T16:49:02.569245+00:00',
           updated_at: '2024-04-06T16:49:02.569245+00:00',
-          mode: 'individual',
         },
         {
           type: 'send_streak',
@@ -170,7 +166,6 @@ describe('Distributor V2 Worker', () => {
           multiplier_step: 0.2,
           created_at: '2024-04-06T16:49:02.569245+00:00',
           updated_at: '2024-04-06T16:49:02.569245+00:00',
-          mode: 'aggregate',
         },
       ],
     } as Tables<'distributions'> & {

apps/distributor/src/distributorv2.ts

@@ -6,6 +6,9 @@ import {
   fetchAllHodlers,
   fetchAllVerifications,
   fetchDistribution,
+  fetchDistributionShares,
+  fetchSendSlash,
+  fetchSendTransfers,
   supabaseAdmin,
 } from './supabase'
 import { fetchAllBalances, isMerkleDropActive } from './wagmi'
@@ -165,7 +168,6 @@ export class DistributorV2Worker {
         acc[verification.type] = {
           fixedValue: BigInt(verification.fixed_value),
           bipsValue: BigInt(verification.bips_value),
-          mode: verification.mode,
           multiplier_min: verification.multiplier_min,
           multiplier_max: verification.multiplier_max,
           multiplier_step: verification.multiplier_step,
@@ -177,7 +179,6 @@ export class DistributorV2Worker {
         {
           fixedValue?: bigint
           bipsValue?: bigint
-          mode: Database['public']['Enums']['verification_value_mode']
           multiplier_min: number
           multiplier_max: number
           multiplier_step: number
@@ -276,6 +277,29 @@ export class DistributorV2Worker {
       })
     }
 
+    const { data: sendSlashes, error: slashesError } = await fetchSendSlash(distribution.id)
+
+    if (slashesError) {
+      throw slashesError
+    }
+
+    const slashPercentageByUserId = sendSlashes.reduce(
+      (acc, { user_id, slash_percentage }) => {
+        acc[user_id] = slash_percentage
+        return acc
+      },
+      {} as Record<string, number>
+    )
+    console.log('slashPercentageByUserId: ', slashPercentageByUserId)
+
+    if (log.isLevelEnabled('debug')) {
+      await Bun.write('dist/slashes.json', JSON.stringify(sendSlashes, jsonBigint, 2)).catch(
+        (e) => {
+          log.error(e, 'Error writing slashes.json')
+        }
+      )
+    }
+
     // Calculate fixed pool share weights
     const distAmt = BigInt(distribution.amount)
     const fixedPoolAvailableAmount = distAmt
@@ -358,16 +382,27 @@ export class DistributorV2Worker {
       userFixedAmount =
         (userFixedAmount * BigInt(Math.round(finalMultiplier * Number(PERC_DENOM)))) / PERC_DENOM
 
-      if (
-        userFixedAmount > 0n &&
-        fixedPoolAllocatedAmount + userFixedAmount <= fixedPoolAvailableAmount
-      ) {
-        fixedPoolAmountsByAddress[address] =
-          (fixedPoolAmountsByAddress[address] || 0n) + userFixedAmount
-        fixedPoolAllocatedAmount += userFixedAmount
+      // Then modify the fixed pool calculation:
+      if (userFixedAmount > 0n) {
+        const slashPercentage = slashPercentageByUserId[userId] || 0
+        console.log('Before slash:', {
+          userId,
+          userFixedAmount,
+          slashPercentage,
+          calculation: Math.round(slashPercentage * Number(PERC_DENOM)),
+        })
+        userFixedAmount =
+          (userFixedAmount * BigInt(Math.round(slashPercentage * Number(PERC_DENOM)))) / PERC_DENOM
+
+        log.debug({ userId, address, slashPercentage }, 'User send slash')
 
-        // Log or save the multipliers for each verification type
-        log.debug({ userId, address, multipliers, finalMultiplier }, 'User multipliers')
+        if (fixedPoolAllocatedAmount + userFixedAmount <= fixedPoolAvailableAmount) {
+          fixedPoolAmountsByAddress[address] =
+            (fixedPoolAmountsByAddress[address] || 0n) + userFixedAmount
+          fixedPoolAllocatedAmount += userFixedAmount
+          // Log or save the multipliers for each verification type
+          log.debug({ userId, address, multipliers, finalMultiplier }, 'User multipliers')
+        }
       }
     }
 
@@ -376,7 +411,20 @@ export class DistributorV2Worker {
 
     let hodlerShares: { address: string; amount: bigint }[] = []
     if (hodlerPoolAvailableAmount > 0n) {
-      const { weightedShares } = calculateWeights(minBalanceAddresses, hodlerPoolAvailableAmount)
+      const slashedBalances = minBalanceAddresses.map((balance) => {
+        const slashPercentage =
+          slashPercentageByUserId[hodlerUserIdByAddress[balance.address] ?? ''] || 0
+        const slashedBalance =
+          (BigInt(balance.balance) * BigInt(Math.round(slashPercentage * Number(PERC_DENOM)))) /
+          PERC_DENOM
+
+        return {
+          address: balance.address,
+          balance: slashedBalance.toString(),
+        }
+      })
+
+      const { weightedShares } = calculateWeights(slashedBalances, hodlerPoolAvailableAmount)
       hodlerShares = Object.values(weightedShares)
     }
 
@@ -499,7 +547,6 @@ export class DistributorV2Worker {
     this.running = false
     return await this.workerPromise
   }
-
   public async calculateDistribution(id: string) {
     const { data: distribution, error } = await fetchDistribution(id)
     if (error) {

apps/distributor/src/supabase.ts

@@ -1,6 +1,7 @@
 import type { Database, Tables } from '@my/supabase/database.types'
 import { createClient } from '@supabase/supabase-js'
 import { selectAll } from 'app/utils/supabase/selectAll'
+import type { Address } from 'viem'
 
 if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
   throw new Error(
@@ -30,6 +31,12 @@ export async function fetchDistribution(id: string) {
     .single()
 }
 
+export async function fetchSendSlash(distributionNumber: number) {
+  return await supabaseAdmin
+    .rpc('get_send_slash_calculations', { distribution_number: distributionNumber })
+    .select()
+}
+
 export async function fetchAllVerifications(distributionId: number) {
   return selectAll(
     supabaseAdmin

apps/distributor/src/weights.ts

@@ -25,7 +25,7 @@ export enum Mode {
   Exponential = 'exponential',
 }
 
-export const PERC_DENOM = 10000n
+export const PERC_DENOM = 10000000n
 
 export function calculatePercentageWithBips(value: bigint, bips: bigint) {
   const bps = bips * PERC_DENOM