Merge pull request #20 from migalabs/fix/depositors_insert_not_applying

Fix: depositors insert not applying

Author: santi1234567

db/depositors_insert.go

@@ -4,20 +4,28 @@ import "github.com/pkg/errors"
 
 const (
 	applyDepositorsInsertQuery = `
-	INSERT INTO t_identified_validators (
-		f_validator_pubkey,
-		f_pool_name
-	)
-	SELECT DISTINCT 
-		t1.f_validator_pubkey, 
-		f_pool_name 
-	FROM 
-		t_beacon_deposits t1
-	RIGHT JOIN 
-		t_depositors_insert t2 
-	ON 
-		t1.f_depositor = t2.f_depositor
-	ON CONFLICT (f_validator_pubkey) DO UPDATE SET f_pool_name = EXCLUDED.f_pool_name;
+		INSERT INTO t_identified_validators (
+			f_validator_pubkey,
+			f_pool_name
+		)
+		SELECT DISTINCT 
+			t1.f_validator_pubkey, 
+			t2.f_pool_name 
+		FROM (
+			SELECT 
+				f_validator_pubkey,
+				f_depositor,
+				ROW_NUMBER() OVER (
+					PARTITION BY f_validator_pubkey 
+					ORDER BY f_block_num DESC
+				) as rn
+			FROM t_beacon_deposits
+		) t1
+		INNER JOIN t_depositors_insert t2 
+			ON t1.f_depositor = t2.f_depositor
+		WHERE t1.rn = 1
+		ON CONFLICT (f_validator_pubkey) DO UPDATE SET 
+			f_pool_name = EXCLUDED.f_pool_name;
 	`
 )
 
@@ -30,7 +38,7 @@ func (p *PostgresDBService) ApplyDepositorsInsert() error {
 	}
 	defer conn.Release()
 
-	_, err = conn.Query(p.ctx, applyDepositorsInsertQuery)
+	_, err = conn.Exec(p.ctx, applyDepositorsInsertQuery)
 	if err != nil {
 		return errors.Wrap(err, "error applying validators insert")
 	}