Merge pull request #824 from 0xsend/dev

deploy

Author: youngkidwarrior

apps/distributor/src/distributorv2.test.ts

@@ -214,49 +214,58 @@ describe('Distributor V2 Worker', () => {
             {
               user_id,
               type: 'tag_referral',
+              weight: 1,
             },
 
             {
               user_id,
               type: 'tag_registration',
+              weight: 1,
             },
             {
               user_id,
               type: 'send_ten',
+              weight: 1,
             },
             {
               user_id,
               type: 'send_one_hundred',
+              weight: 1,
             },
             {
               user_id,
               type: 'total_tag_referrals',
               metadata: {
                 value: 2,
               },
+              weight: 2,
             },
             {
               user_id: user_id,
               type: 'send_streak',
               metadata: {
                 value: 5,
               },
+              weight: 5,
             },
             // alice only has tag_registration
             {
               user_id: user_id2,
               type: 'tag_registration',
+              weight: 1,
             },
             {
               user_id: user_id2,
               type: 'send_ten',
+              weight: 1,
             },
             {
               user_id: user_id2,
               type: 'total_tag_referrals',
               metadata: {
                 value: 5,
               },
+              weight: 5,
             },
           ],
           count: 10,

apps/distributor/src/distributorv2.ts

@@ -303,10 +303,11 @@ export class DistributorV2Worker {
       for (const verification of verifications) {
         const verificationValue = verificationValues[verification.type]
         if (!verificationValue) continue
+
         // Initialize or update multiplier info
         if (
           !multipliers[verification.type] &&
-          (verificationValue.multiplier_step > 0 || verificationValue.multiplier_min > 0)
+          (verificationValue.multiplier_step > 0 || verificationValue.multiplier_min > 0) //@todo: should have a better way to tell if multipliers are enabled
         ) {
           multipliers[verification.type] = {
             value: undefined,
@@ -317,50 +318,33 @@ export class DistributorV2Worker {
         }
         const multiplierInfo = multipliers[verification.type]
 
-        switch (verificationValue.mode) {
-          case 'individual':
-            // Calculate fixed amount
-            if (verificationValue.fixedValue) {
-              userFixedAmount += verificationValue.fixedValue
-            }
-            if (!multiplierInfo) {
-              break
-            }
-            if (multiplierInfo.value === undefined) {
-              multiplierInfo.value = multiplierInfo.min
-              break
-            }
-            if (multiplierInfo.value > multiplierInfo.max) {
-              multiplierInfo.value = multiplierInfo.max
-              break
-            }
-            if (multiplierInfo.value < multiplierInfo.max) {
-              multiplierInfo.value += multiplierInfo.step
-            }
-            break
-          case 'aggregate': {
-            // @ts-expect-error this is json
-            const value = verification.metadata?.value ?? 0
-            if (verificationValue.fixedValue) {
-              userFixedAmount += verificationValue.fixedValue * BigInt(value)
-            }
-
-            if (!multiplierInfo) {
-              break
-            }
-            // Minus 1 from the value so 1 = multiplier min
-            if (value > 0) {
-              multiplierInfo.value = Math.min(
-                multiplierInfo.min + (value - 1) * multiplierInfo.step,
-                multiplierInfo.max
-              )
-            } else {
-              multiplierInfo.value = 1.0
-            }
-            break
+        const weight = verification.weight
+
+        // Calculate fixed amount
+        if (verificationValue.fixedValue) {
+          userFixedAmount += verificationValue.fixedValue * BigInt(weight)
+        }
+
+        if (!multiplierInfo) {
+          continue
+        }
+
+        if (weight === 1) {
+          // Individual behavior
+          if (multiplierInfo.value === undefined) {
+            multiplierInfo.value = multiplierInfo.min
+          } else if (multiplierInfo.value < multiplierInfo.max) {
+            multiplierInfo.value = Math.min(
+              multiplierInfo.value + multiplierInfo.step,
+              multiplierInfo.max
+            )
           }
-          default:
-            throw new Error(`Unknown verification value mode: ${verificationValue.mode}`)
+        } else {
+          // Aggregate behavior
+          multiplierInfo.value = Math.min(
+            multiplierInfo.min + (weight - 1) * multiplierInfo.step,
+            multiplierInfo.max
+          )
         }
       }
 
@@ -504,7 +488,7 @@ export class DistributorV2Worker {
       } catch (error) {
         this.log.error(error, `Error processing block. ${(error as Error).message}`)
       }
-      await sleep(60_000)
+      await sleep(21_600_000)
     }
 
     this.log.info('Distributor stopped.')

packages/app/features/account/rewards/activity/__snapshots__/screen.test.tsx.snap

@@ -315,7 +315,7 @@ exports[`ActivityRewardsScreen renders: ActivityRewardsScreen 1`] = `
               }
               suppressHighlighting={true}
             >
-              Min. Balance 
+              Sendtag Registered
             </Text>
             <RNSVGSvgView
               align="xMidYMid"
@@ -457,7 +457,7 @@ exports[`ActivityRewardsScreen renders: ActivityRewardsScreen 1`] = `
               }
               suppressHighlighting={true}
             >
-              Sendtag Registered
+              Min. Balance 
             </Text>
             <RNSVGSvgView
               align="xMidYMid"
@@ -621,47 +621,6 @@ exports[`ActivityRewardsScreen renders: ActivityRewardsScreen 1`] = `
         }
       />
     </View>
-    <View
-      style={
-        {
-          "flex": 1,
-          "flexDirection": "column",
-          "gap": 24,
-          "width": "100%",
-        }
-      }
-    >
-      <Text
-        accessibilityRole="header"
-        style={
-          {
-            "color": "#FFFFFF",
-            "fontFamily": "System",
-            "fontSize": 23,
-            "fontWeight": "600",
-            "lineHeight": 27,
-            "marginBottom": 0,
-            "marginLeft": 0,
-            "marginRight": 0,
-            "marginTop": 0,
-            "textTransform": "none",
-            "userSelect": "auto",
-          }
-        }
-        suppressHighlighting={true}
-      >
-        Multiplier
-      </Text>
-      <View
-        style={
-          {
-            "flexDirection": "row",
-            "flexWrap": "wrap",
-            "gap": 24,
-          }
-        }
-      />
-    </View>
     <View
       style={
         {