wip

chain4travel · Oct 6, 2023 · b226e07 · b226e07
1 parent d86bd89
commit b226e07
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 36 deletions.
diff --git a/dependencies/caminoethvm b/dependencies/caminoethvm
diff --git a/services/indexes/pvm/writer.go b/services/indexes/pvm/writer.go
@@ -626,8 +626,7 @@ func (w *Writer) indexTransaction(ctx services.ConsumerCtx, blkID ids.ID, tx *tx
 	case *txs.FinishProposalsTx:
 		baseTx = castTx.BaseTx.BaseTx
 		typ = models.TransactionTypeFinishDACProposals
-		finishedProposalIDs := append(castTx.EarlyFinishedProposalIDs, castTx.ExpiredProposalIDs...) //nolint:gocritic
-		if err := w.FinishDACProposals(ctx, finishedProposalIDs, ctx.Time()); err != nil {
+		if err := w.FinishDACProposals(ctx, castTx, ctx.Time()); err != nil {
 			return err
 		}
 	default:
@@ -861,49 +860,56 @@ func (w *Writer) InsertDACProposal(
 	})
 }
 
-func (w *Writer) FinishDACProposals(ctx services.ConsumerCtx, proposalIDs []ids.ID, finishedAt time.Time) error {
-	proposalIDsStrs := make([]string, len(proposalIDs))
-	for i := range proposalIDs {
-		proposalIDsStrs[i] = proposalIDs[i].String()
+func (w *Writer) FinishDACProposals(ctx services.ConsumerCtx, tx *txs.FinishProposalsTx, finishedAt time.Time) error {
+	// Finishing successful proposals
+	successfulProposalIDsStrs := make([]string, 0, len(tx.EarlyFinishedSuccessfulProposalIDs)+len(tx.ExpiredSuccessfulProposalIDs))
+	for _, proposalID := range tx.EarlyFinishedSuccessfulProposalIDs {
+		successfulProposalIDsStrs = append(successfulProposalIDsStrs, proposalID.String())
 	}
-	dbProposals, err := ctx.Persist().GetDACProposals(ctx.Ctx(), ctx.DB(), proposalIDsStrs)
-	if err != nil {
-		return err
+	for _, proposalID := range tx.ExpiredSuccessfulProposalIDs {
+		successfulProposalIDsStrs = append(successfulProposalIDsStrs, proposalID.String())
 	}
-
-	var failedProposalIDsStrs []string
-	for _, dbProposal := range dbProposals {
-		proposal := dacProposalWrapper{}
-		if _, err := txs.Codec.Unmarshal(dbProposal.SerializedBytes, &proposal); err != nil {
-			return err
-		}
-
-		if !proposal.IsSuccessful() {
-			failedProposalIDsStrs = append(failedProposalIDsStrs, dbProposal.ID)
-			continue
-		}
-
-		outcomeBytes, err := json.Marshal(proposal.Outcome())
+	if len(successfulProposalIDsStrs) > 0 {
+		successfulProposals, err := ctx.Persist().GetDACProposals(ctx.Ctx(), ctx.DB(), successfulProposalIDsStrs)
 		if err != nil {
 			return err
 		}
+		for _, dbProposal := range successfulProposals {
+			proposal := dacProposalWrapper{}
+			if _, err := txs.Codec.Unmarshal(dbProposal.SerializedBytes, &proposal); err != nil {
+				return err
+			}
 
-		if err := ctx.Persist().FinishDACProposalWithOutcome(
-			ctx.Ctx(),
-			ctx.DB(),
-			dbProposal.ID,
-			finishedAt,
-			models.ProposalStatusSuccess,
-			outcomeBytes,
-		); err != nil {
-			return err
+			outcomeBytes, err := json.Marshal(proposal.Outcome())
+			if err != nil {
+				return err
+			}
+
+			if err := ctx.Persist().FinishDACProposalWithOutcome(
+				ctx.Ctx(),
+				ctx.DB(),
+				dbProposal.ID,
+				finishedAt,
+				models.ProposalStatusSuccess,
+				outcomeBytes,
+			); err != nil {
+				return err
+			}
 		}
 	}
 
-	if len(failedProposalIDsStrs) > 0 {
-		return ctx.Persist().FinishDACProposals(ctx.Ctx(), ctx.DB(), failedProposalIDsStrs, finishedAt, models.ProposalStatusFailed)
+	// Finishing failed proposals
+	failedProposalIDsStrs := make([]string, 0, len(tx.EarlyFinishedFailedProposalIDs)+len(tx.ExpiredFailedProposalIDs))
+	for _, proposalID := range tx.EarlyFinishedFailedProposalIDs {
+		failedProposalIDsStrs = append(failedProposalIDsStrs, proposalID.String())
 	}
-	return nil
+	for _, proposalID := range tx.ExpiredFailedProposalIDs {
+		failedProposalIDsStrs = append(failedProposalIDsStrs, proposalID.String())
+	}
+	if len(failedProposalIDsStrs) == 0 {
+		return nil
+	}
+	return ctx.Persist().FinishDACProposals(ctx.Ctx(), ctx.DB(), failedProposalIDsStrs, finishedAt, models.ProposalStatusFailed)
 }
 
 func (w *Writer) InsertDACVote(