fix(statistics): consider deposit-requests when calculating validator-stats

Author: guybrush

backend/pkg/commons/db/statistics.go

@@ -831,54 +831,109 @@ func gatherValidatorDepositWithdrawals(day uint64, data []*types.ValidatorStatsT
 		DepositsAmount uint64 `db:"deposits_amount"`
 	}
 	resDeposits := make([]*resRowDeposits, 0, 1024)
+	// In this query we are collecting all deposits per validator and sum them up. We need to consider that all deposits after the first valid deposits are valid. Note that there are currently only valid requests in the deposit_requests table.
 	depositsQry := `
-		with first_valid_deposits as (
-			select
-				distinct on (publickey)
+		with 
+		first_valid_deposits as (
+			select distinct on (publickey)
 				publickey,
 				block_slot,
 				block_index
 			from
 				blocks_deposits
 			where
 				valid_signature
-				and publickey in (  -- doesnt need to be 100% accurate, we only filter for performance reasons
-					select
-						publickey
-					from
-						blocks_deposits
-					where
-						blocks_deposits.block_slot >= $1
-						and blocks_deposits.block_slot <= $2
-				)
+				and publickey in (select bd.publickey from blocks_deposits bd where bd.valid_signature and bd.block_slot >= $1 and bd.block_slot <= $2)
 			order by
 				publickey,
 				block_slot,
 				block_index
+		),
+		first_valid_deposit_requests as (
+			select
+				distinct on (pubkey)
+				pubkey,
+				block_slot,
+				request_index
+			from
+				blocks_deposit_requests
+			where
+				pubkey in (select bdr.pubkey from blocks_deposit_requests bdr where bdr.block_slot >= $1 and bdr.block_slot <= $2)
+			order by
+				pubkey,
+				block_slot,
+				request_index
+		),
+		deposits as (
+			select
+				validators.validatorindex,
+				count(*) as deposits,
+				sum(amount) as deposits_amount
+			from
+				blocks_deposits
+			inner join validators on
+				blocks_deposits.publickey = validators.pubkey
+			inner join blocks on
+				blocks_deposits.block_root = blocks.blockroot
+			inner join first_valid_deposits on
+				blocks_deposits.publickey = first_valid_deposits.publickey
+			where
+				blocks_deposits.valid_signature
+				and blocks.slot >= $1
+				and blocks.slot <= $2
+				and (blocks.status = '1'
+					or blocks.slot = 0)
+				and (blocks_deposits.block_slot > first_valid_deposits.block_slot  -- any slot after the first valid deposit
+					or (blocks_deposits.block_slot = first_valid_deposits.block_slot -- or the same slot but a equal or higher block-index
+						and blocks_deposits.block_index >= first_valid_deposits.block_index)
+				)
+				group by
+					validators.validatorindex
+		),
+		deposit_requests as (
+			select
+				validators.validatorindex,
+				count(*) as deposits,
+				sum(amount) as deposits_amount
+			from
+				blocks_deposit_requests bdr
+			inner join validators on
+				bdr.pubkey = validators.pubkey
+			inner join blocks on
+				bdr.block_root = blocks.blockroot
+			left join first_valid_deposits on
+				bdr.pubkey = first_valid_deposits.publickey
+			left join first_valid_deposit_requests on
+				bdr.pubkey = first_valid_deposit_requests.pubkey
+			where
+				blocks.slot >= $1
+				and blocks.slot <= $2
+				and (blocks.status = '1'
+					or blocks.slot = 0)
+				and (
+					(first_valid_deposits.block_slot is not null 
+						and bdr.block_slot > first_valid_deposits.block_slot)  -- any slot after the first valid deposit
+					or (first_valid_deposit_requests.block_slot is not null
+						and (bdr.block_slot > first_valid_deposit_requests.block_slot -- or any slot after the first valid deposit request
+							or (bdr.block_slot = first_valid_deposit_requests.block_slot -- or the same slot but a equal or higher index
+							and bdr.request_index >= first_valid_deposit_requests.request_index)
+						)
+					)
+				)
+			group by
+				validators.validatorindex
 		)
 		select
-			validators.validatorindex,
-			count(*) as deposits,
-			sum(amount) as deposits_amount
-		from
-			blocks_deposits
-		inner join validators on
-			blocks_deposits.publickey = validators.pubkey
-		inner join blocks on
-			blocks_deposits.block_root = blocks.blockroot
-		inner join first_valid_deposits on
-			blocks_deposits.publickey = first_valid_deposits.publickey
-		where
-			blocks.slot >= $1
-			and blocks.slot <= $2
-			and (blocks.status = '1'
-				or blocks.slot = 0)
-			and (blocks_deposits.block_slot > first_valid_deposits.block_slot  -- any slot after the valid deposit
-				or (blocks_deposits.block_slot = first_valid_deposits.block_slot -- or the same slot but a higher index
-					and blocks_deposits.block_index >= first_valid_deposits.block_index)
-			)
-		group by
-			validators.validatorindex;`
+			validatorindex,
+			sum(deposits) as deposits,
+			sum(deposits_amount) as deposits_amount
+		from (
+			select validatorindex, deposits, deposits_amount from deposits
+			union all
+			select validatorindex, deposits, deposits_amount from deposit_requests
+		) a
+		group by validatorindex
+		;`
 
 	err := WriterDb.Select(&resDeposits, depositsQry, firstSlot, lastSlot)
 	if err != nil {