added get_rewards_by_addresses_and_time_group_by_service and get_rewards_by_addresses_and_time_group_by_address_and_date functions

Author: Alann27

src/mappings/dbFunctions/dataByDelegatorAddressesAndBlocks.ts

@@ -30,6 +30,7 @@ AS $$
       SUM(mcc.num_claimed_computed_units) AS claim_computed_units,
       SUM(mcc.claimed_amount) AS claim_upokt
     FROM ${dbSchema}.msg_create_claims mcc
+    INNER JOIN matched_suppliers ms ON ms.supplier_id = mcc.supplier_id
     WHERE mcc.block_id BETWEEN start_height AND end_height
     GROUP BY mcc.supplier_id
   ),
@@ -42,6 +43,7 @@ AS $$
       SUM(ecs.num_claimed_computed_units) AS proof_computed_units,
       SUM(ecs.claimed_amount) AS proof_upokt
     FROM ${dbSchema}.event_claim_settleds ecs
+    INNER JOIN matched_suppliers ms ON ms.supplier_id = ecs.supplier_id
     WHERE ecs.block_id BETWEEN start_height AND end_height
     GROUP BY ecs.supplier_id
   ),
@@ -51,6 +53,7 @@ AS $$
       ess.supplier_id,
       SUM(ess.previous_stake_amount - ess.after_stake_amount) AS slashed
     FROM ${dbSchema}.event_supplier_slasheds ess
+    INNER JOIN matched_suppliers ms ON ms.supplier_id = ess.supplier_id
     WHERE ess.block_id BETWEEN start_height AND end_height
     GROUP BY ess.supplier_id
   )

src/mappings/dbFunctions/dataByDelegatorAddressesAndTimes.ts

@@ -31,6 +31,7 @@ AS $$
       SUM(mcc.claimed_amount) AS claim_upokt
     FROM ${dbSchema}.msg_create_claims mcc
     INNER JOIN ${dbSchema}.blocks b ON b.id = mcc.block_id
+    INNER JOIN matched_suppliers ms ON ms.supplier_id = mcc.supplier_id
     WHERE b.timestamp BETWEEN start_ts AND end_ts
     GROUP BY mcc.supplier_id
   ),
@@ -44,6 +45,7 @@ AS $$
       SUM(ecs.claimed_amount) AS proof_upokt
     FROM ${dbSchema}.event_claim_settleds ecs
     INNER JOIN ${dbSchema}.blocks b ON b.id = ecs.block_id
+    INNER JOIN matched_suppliers ms ON ms.supplier_id = ecs.supplier_id
     WHERE b.timestamp BETWEEN start_ts AND end_ts
     GROUP BY ecs.supplier_id
   ),
@@ -54,6 +56,7 @@ AS $$
       SUM(ess.previous_stake_amount - ess.after_stake_amount) AS slashed
     FROM ${dbSchema}.event_supplier_slasheds ess
     INNER JOIN ${dbSchema}.blocks b ON b.id = ess.block_id
+    INNER JOIN matched_suppliers ms ON ms.supplier_id = ess.supplier_id
     WHERE b.timestamp BETWEEN start_ts AND end_ts
     GROUP BY ess.supplier_id
   )

src/mappings/dbFunctions/index.ts

@@ -22,7 +22,12 @@ import { updateTookOnBlocksFn } from "./reports/took";
 import { updateTxsDataOnBlockFn } from "./reports/txs";
 import { updateStakedValidatorsDataOnBlockFn, updateUnstakingValidatorsDataOnBlockFn } from "./reports/validators";
 import { getRewardsByDate } from "./rewards";
-import { getRewardsByAddressesAndTime, getRewardsByAddressesAndTimeGroupByDate } from "./rewardsByAddressesAndTime";
+import {
+  getRewardsByAddressesAndTime,
+  getRewardsByAddressesAndTimeGroupByDate,
+  getRewardsByAddressesAndTimeGroupByDateAndAddress,
+} from "./rewardsByAddressesAndTime";
+import { getRewardsByDelegatorAddressesAndTimesGroupByServiceFn } from "./rewardsByAddressesAndTimes";
 import { getSuppliersStakedAndBlocksByPointJsonFn } from "./supplierStakedAndBlocksPoints";
 
 const functionsCreatedCacheKey = 'functionsCreated';
@@ -57,6 +62,8 @@ export async function createDbFunctions(): Promise<void> {
     getDataByDelegatorAddressesAndBlocksFn,
     getRewardsByAddressesAndTime,
     getRewardsByAddressesAndTimeGroupByDate,
+    getRewardsByAddressesAndTimeGroupByDateAndAddress,
+    getRewardsByDelegatorAddressesAndTimesGroupByServiceFn,
     getRewardsByDate,
   )
 

src/mappings/dbFunctions/rewardsByAddressesAndTime.ts

@@ -49,3 +49,38 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql STABLE;`
 }
+
+export function getRewardsByAddressesAndTimeGroupByDateAndAddress(dbSchema: string): string {
+  return `CREATE OR REPLACE FUNCTION ${dbSchema}.get_rewards_by_addresses_and_time_group_by_address_and_date(
+    addresses TEXT[],
+    start_date TIMESTAMP,
+    end_date TIMESTAMP,
+    trunc_interval TEXT  -- 'day' or 'hour'
+)
+RETURNS JSON AS $$
+BEGIN
+    RETURN (
+        SELECT json_agg(
+            json_build_object(
+                'address', address,
+                'date_truncated', date_truncated,
+                'total_amount', total_amount
+            )
+            ORDER BY date_truncated
+        )
+        FROM (
+            SELECT 
+                t.recipient_id as address,
+                date_trunc(trunc_interval, b.timestamp) AS date_truncated,
+                SUM(t.amount)::NUMERIC AS total_amount
+            FROM ${dbSchema}.mod_to_acct_transfers t
+            INNER JOIN ${dbSchema}.blocks b ON b.id = t.block_id
+            WHERE t.recipient_id = ANY(addresses) 
+                AND b.timestamp BETWEEN start_date AND end_date
+            GROUP BY address, date_truncated
+            ORDER BY date_truncated
+        ) subquery
+    );
+END;
+$$ LANGUAGE plpgsql STABLE;`
+}

src/mappings/dbFunctions/rewardsByAddressesAndTimes.ts

@@ -0,0 +1,66 @@
+// Used to get the proof, claim and slash data between block timestamps and for the list of delegator addresses
+export function getRewardsByDelegatorAddressesAndTimesGroupByServiceFn (dbSchema: string): string {
+  return `CREATE OR REPLACE FUNCTION ${dbSchema}.get_rewards_by_addresses_and_time_group_by_service(
+  addresses TEXT[],
+  start_ts TIMESTAMP,
+  end_ts TIMESTAMP
+)
+RETURNS jsonb
+LANGUAGE sql
+STABLE
+AS $$
+WITH matched_suppliers AS (
+  	SELECT
+      distinct ssc.supplier_id,
+      elem->>'address' AS address
+    FROM ${dbSchema}.supplier_service_configs ssc
+    INNER JOIN ${dbSchema}.suppliers s ON s.id = ssc.supplier_id
+    CROSS JOIN jsonb_array_elements(ssc.rev_share) AS elem
+    WHERE elem->>'address' = ANY (addresses)
+      AND upper_inf(ssc._block_range)
+      AND s.stake_status = 'Staked'
+      AND upper_inf(s._block_range)
+  ),
+  services as (
+	SELECT
+	  distinct ssc.service_id
+	FROM ${dbSchema}.supplier_service_configs ssc
+	INNER JOIN matched_suppliers ON ssc.supplier_id = matched_suppliers.supplier_id
+	WHERE upper_inf(ssc._block_range)
+  ),
+  rewards as (
+	SELECT
+		e.service_id,
+		SUM(m.amount) net_rewards,
+		SUM(e.claimed_amount) gross_rewards,
+		SUM(e.num_relays) relays,
+		SUM(e.num_claimed_computed_units) computed_units
+	FROM ${dbSchema}.mod_to_acct_transfers m
+	INNER JOIN ${dbSchema}.blocks b ON b.id = m.block_id
+	INNER JOIN ${dbSchema}.event_claim_settleds e ON e.id = m.event_claim_settled_id
+	WHERE m.recipient_id = ANY (addresses) AND
+			b.timestamp BETWEEN start_ts AND end_ts
+	GROUP BY e.service_id
+  )
+
+  SELECT jsonb_agg(
+    jsonb_build_object(
+      'service_id', service_id,
+      'relays', COALESCE(relays, 0),
+      'computed_units', COALESCE(computed_units, 0),
+      'gross_rewards', COALESCE(gross_rewards, 0),
+      'net_rewards', COALESCE(net_rewards, 0)
+    )
+  ) FROM (
+	SELECT 
+		COALESCE(s.service_id, r.service_id, '') as service_id,
+		r.relays as relays,
+		r.computed_units as computed_units,
+		r.gross_rewards as gross_rewards,
+		r.net_rewards net_rewards
+	FROM services s
+	LEFT JOIN rewards r ON r.service_id = s.service_id
+);
+$$;
+`
+}