[PSL-1256] handle multi-vol ticket reg & act confirmations edge cases

Author: j-rafique

common/storage/ticketstore/activation_attempts.go

@@ -1,8 +1,10 @@
 package ticketstore
 
 import (
-	"github.com/pastelnetwork/gonode/common/types"
+	"database/sql"
 	"time"
+
+	"github.com/pastelnetwork/gonode/common/types"
 )
 
 type ActivationAttemptsQueries interface {
@@ -16,14 +18,14 @@ type ActivationAttemptsQueries interface {
 func (s *TicketStore) InsertActivationAttempt(attempt types.ActivationAttempt) (int64, error) {
 	const insertQuery = `
         INSERT INTO activation_attempts (
-            file_id, base_file_id, activation_attempt_at, is_successful, error_message, created_at, updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?)
+            file_id, base_file_id, activation_attempt_at, is_successful, is_confirmed, error_message, created_at, updated_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         RETURNING id;`
 
 	var id int64
 	err := s.db.QueryRow(insertQuery,
 		attempt.FileID, attempt.BaseFileID, attempt.ActivationAttemptAt,
-		attempt.IsSuccessful, attempt.ErrorMessage, time.Now().UTC(), time.Now().UTC()).Scan(&id)
+		attempt.IsSuccessful, attempt.IsConfirmed, attempt.ErrorMessage, time.Now().UTC(), time.Now().UTC()).Scan(&id)
 	if err != nil {
 		return 0, err
 	}
@@ -58,27 +60,35 @@ func (s *TicketStore) UpdateActivationAttempt(attempt types.ActivationAttempt) (
 // GetActivationAttemptByID retrieves an activation attempt by its ID from the activation_attempts table
 func (s *TicketStore) GetActivationAttemptByID(id int) (*types.ActivationAttempt, error) {
 	const selectQuery = `
-        SELECT id, file_id, activation_attempt_at, is_successful, error_message
+        SELECT id, file_id, activation_attempt_at, is_successful, is_confirmed, error_message
         FROM activation_attempts
         WHERE id = ?;`
 
 	row := s.db.QueryRow(selectQuery, int64(id))
 
-	var attempt types.ActivationAttempt
+	var (
+		attempt     types.ActivationAttempt
+		isConfirmed sql.NullBool
+	)
 	err := row.Scan(
 		&attempt.ID, &attempt.FileID, &attempt.ActivationAttemptAt,
-		&attempt.IsSuccessful, &attempt.ErrorMessage)
+		&attempt.IsSuccessful, &isConfirmed, &attempt.ErrorMessage)
 	if err != nil {
 		return nil, err
 	}
 
+	attempt.IsConfirmed = false
+	if isConfirmed.Valid {
+		attempt.IsConfirmed = isConfirmed.Bool
+	}
+
 	return &attempt, nil
 }
 
 // GetActivationAttemptsByFileIDAndBaseFileID retrieves activation attempts by file_id from the activation_attempts table
 func (s *TicketStore) GetActivationAttemptsByFileIDAndBaseFileID(fileID, baseFileID string) ([]*types.ActivationAttempt, error) {
 	const selectQuery = `
-        SELECT id, file_id, activation_attempt_at, is_successful, error_message
+        SELECT id, file_id, activation_attempt_at, is_successful, is_confirmed, error_message
         FROM activation_attempts
         WHERE file_id = ? and base_file_id=?;`
 
@@ -90,13 +100,22 @@ func (s *TicketStore) GetActivationAttemptsByFileIDAndBaseFileID(fileID, baseFil
 
 	var attempts []*types.ActivationAttempt
 	for rows.Next() {
-		var attempt types.ActivationAttempt
+		var (
+			attempt     types.ActivationAttempt
+			isConfirmed sql.NullBool
+		)
 		err := rows.Scan(
 			&attempt.ID, &attempt.FileID, &attempt.ActivationAttemptAt,
-			&attempt.IsSuccessful, &attempt.ErrorMessage)
+			&attempt.IsSuccessful, &isConfirmed, &attempt.ErrorMessage)
 		if err != nil {
 			return nil, err
 		}
+
+		attempt.IsConfirmed = false
+		if isConfirmed.Valid {
+			attempt.IsConfirmed = isConfirmed.Bool
+		}
+
 		attempts = append(attempts, &attempt)
 	}
 

common/storage/ticketstore/registration_attempts.go

@@ -1,8 +1,10 @@
 package ticketstore
 
 import (
-	"github.com/pastelnetwork/gonode/common/types"
+	"database/sql"
 	"time"
+
+	"github.com/pastelnetwork/gonode/common/types"
 )
 
 type RegistrationAttemptsQueries interface {
@@ -16,14 +18,14 @@ type RegistrationAttemptsQueries interface {
 func (s *TicketStore) InsertRegistrationAttempt(attempt types.RegistrationAttempt) (int64, error) {
 	const insertQuery = `
         INSERT INTO registration_attempts (
-            file_id, base_file_id, reg_started_at, processor_sns, finished_at, is_successful, error_message, created_at, updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+            file_id, base_file_id, reg_started_at, processor_sns, finished_at, is_successful, is_confirmed, error_message, created_at, updated_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         RETURNING id;`
 
 	var id int64
 	err := s.db.QueryRow(insertQuery,
 		attempt.FileID, attempt.BaseFileID, attempt.RegStartedAt, attempt.ProcessorSNS,
-		attempt.FinishedAt, attempt.IsSuccessful, attempt.ErrorMessage, time.Now().UTC(), time.Now().UTC()).Scan(&id)
+		attempt.FinishedAt, attempt.IsSuccessful, attempt.IsConfirmed, attempt.ErrorMessage, time.Now().UTC(), time.Now().UTC()).Scan(&id)
 	if err != nil {
 		return 0, err
 	}
@@ -61,28 +63,36 @@ func (s *TicketStore) UpdateRegistrationAttempt(attempt types.RegistrationAttemp
 func (s *TicketStore) GetRegistrationAttemptByID(id int) (*types.RegistrationAttempt, error) {
 	const selectQuery = `
         SELECT id, file_id, reg_started_at, processor_sns, finished_at, 
-               is_successful, error_message
+               is_successful, is_confirmed, error_message
         FROM registration_attempts
         WHERE id = ?;`
 
 	row := s.db.QueryRow(selectQuery, int64(id))
+	var (
+		isConfirmed sql.NullBool
+		attempt     types.RegistrationAttempt
+	)
 
-	var attempt types.RegistrationAttempt
 	err := row.Scan(
 		&attempt.ID, &attempt.FileID, &attempt.RegStartedAt, &attempt.ProcessorSNS,
-		&attempt.FinishedAt, &attempt.IsSuccessful, &attempt.ErrorMessage)
+		&attempt.FinishedAt, &attempt.IsSuccessful, &isConfirmed, &attempt.ErrorMessage)
 	if err != nil {
 		return nil, err
 	}
 
+	attempt.IsConfirmed = false
+	if isConfirmed.Valid {
+		attempt.IsConfirmed = isConfirmed.Bool
+	}
+
 	return &attempt, nil
 }
 
 // GetRegistrationAttemptsByFileIDAndBaseFileID retrieves registration attempts by file_id and baseFileID from the registration_attempts table
 func (s *TicketStore) GetRegistrationAttemptsByFileIDAndBaseFileID(fileID, baseFileID string) ([]*types.RegistrationAttempt, error) {
 	const selectQuery = `
         SELECT id, file_id, base_file_id, reg_started_at, processor_sns, finished_at, 
-               is_successful, error_message
+               is_successful, is_confirmed, error_message
         FROM registration_attempts
         WHERE file_id = ? and base_file_id=?;`
 
@@ -94,13 +104,21 @@ func (s *TicketStore) GetRegistrationAttemptsByFileIDAndBaseFileID(fileID, baseF
 
 	var attempts []*types.RegistrationAttempt
 	for rows.Next() {
-		var attempt types.RegistrationAttempt
+		var (
+			attempt     types.RegistrationAttempt
+			isConfirmed sql.NullBool
+		)
 		err := rows.Scan(
 			&attempt.ID, &attempt.FileID, &attempt.BaseFileID, &attempt.RegStartedAt, &attempt.ProcessorSNS,
-			&attempt.FinishedAt, &attempt.IsSuccessful, &attempt.ErrorMessage)
+			&attempt.FinishedAt, &attempt.IsSuccessful, &isConfirmed, &attempt.ErrorMessage)
 		if err != nil {
 			return nil, err
 		}
+		attempt.IsConfirmed = false
+		if isConfirmed.Valid {
+			attempt.IsConfirmed = isConfirmed.Bool
+		}
+
 		attempts = append(attempts, &attempt)
 	}
 

mixins/pasteld_handler.go

@@ -422,6 +422,10 @@ func (pt *PastelHandler) WaitConfirmation(ctx context.Context, txid string, minC
 
 				txResult, err := pt.PastelClient.GetRawTransactionVerbose1(gctx, txid)
 				if err != nil {
+					if strings.Contains(err.Error(), "No such mempool or blockchain transaction") {
+						ch <- errors.Errorf("No such mempool or blockchain transaction. Use gettransaction for wallet transactions.")
+						return
+					}
 					log.WithContext(ctx).WithError(err).WithField("txid", txid).Error("GetRawTransactionVerbose1 err")
 				} else {
 					if txResult.Confirmations >= minConfirmation {

walletnode/api/design/cascade.go

@@ -505,6 +505,7 @@ var RegistrationAttempt = Type("RegistrationAttempt", func() {
 		Format(FormatDateTime)
 	})
 	Attribute("is_successful", Boolean, "Indicates if the registration was successful")
+	Attribute("is_confirmed", Boolean, "Indicates if the reg-tx-id is confirmed")
 	Attribute("error_message", String, "Error Message")
 	Required("id", "file_id", "reg_started_at", "finished_at")
 })
@@ -516,6 +517,7 @@ var ActivationAttempt = Type("ActivationAttempt", func() {
 		Format(FormatDateTime)
 	})
 	Attribute("is_successful", Boolean, "Indicates if the activation was successful")
+	Attribute("is_confirmed", Boolean, "Indicates if the act-tx-id is confirmed")
 	Attribute("error_message", String, "Error Message")
 	Required("id", "file_id", "activation_attempt_at")
 })