minor fixes

Author: LexLuthr

lib/filecoinpayment/utils.go

@@ -61,9 +61,8 @@ func SettleLockupPeriod(ctx context.Context, db *harmonydb.DB, ethClient *ethcli
 					railIds = append(railIds, r.RailId)
 				}
 
-				// If rail terminated in the last 15 days, we should try to settle it
-				// TODO: Rethink this to be more generic
-				if uint64(r.EndEpoch.Int64()) > current-(builtin.EpochsInDay*15) {
+				// If rail terminated in the last 30 days, we should consider it for settlement
+				if uint64(r.EndEpoch.Int64()) > current-(builtin.EpochsInDay*30) {
 					railIds = append(railIds, r.RailId)
 				}
 			}

tasks/pay/settle_task.go

@@ -92,7 +92,7 @@ func (s *SettleTask) TypeDetails() harmonytask.TaskTypeDetails {
 			Ram: 64 << 20,
 		},
 		MaxFailures: 3,
-		IAmBored:    harmonytask.SingletonTaskAdder(time.Hour*24, s),
+		IAmBored:    harmonytask.SingletonTaskAdder(time.Hour*48, s),
 	}
 }
 

tasks/pdp/task_terminate_data_set.go

@@ -132,7 +132,7 @@ func (t *DeleteDataSetTask) TypeDetails() harmonytask.TaskTypeDetails {
 			Ram: 64 << 20,
 		},
 		MaxFailures: 3,
-		IAmBored: passcall.Every(time.Minute, func(taskFunc harmonytask.AddTaskFunc) error {
+		IAmBored: passcall.Every(time.Hour, func(taskFunc harmonytask.AddTaskFunc) error {
 			return t.schedule(context.Background(), taskFunc)
 		}),
 	}
@@ -174,7 +174,12 @@ func (t *DeleteDataSetTask) schedule(ctx context.Context, addTaskFunc harmonytas
 
 			pending := pendings[0]
 
-			n, err := tx.Exec(`UPDATE pdp_delete_data_set SET terminate_service_task_id = $1 WHERE id = $2 AND terminate_service_task_id IS NULL AND after_terminate_service = FALSE`, taskID, pending)
+			n, err := tx.Exec(`UPDATE pdp_delete_data_set 
+									SET terminate_service_task_id = $1 
+									WHERE id = $2 
+									  AND delete_data_set_task_id IS NULL 
+									  AND after_delete_data_set = FALSE
+									  AND after_terminate_service = TRUE`, taskID, pending)
 
 			if err != nil {
 				return false, xerrors.Errorf("failed to update pdp_delete_data_set: %w", err)

tasks/pdp/task_terminate_service.go

@@ -6,6 +6,7 @@ import (
 	"math/big"
 	"time"
 
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -46,6 +47,32 @@ func (t *TerminateServiceTask) Do(taskID harmonytask.TaskID, stillOwned func() b
 		return false, xerrors.Errorf("failed to select data set: %w", err)
 	}
 
+	sAddr := contract.ContractAddresses().AllowedPublicRecordKeepers.FWSService
+	fwssv, err := FWSS.NewFilecoinWarmStorageServiceStateView(sAddr, t.ethClient)
+	if err != nil {
+		return false, xerrors.Errorf("failed to instantiate FWSS service state view: %w", err)
+	}
+
+	ds, err := fwssv.GetDataSet(&bind.CallOpts{Context: ctx}, big.NewInt(dataSetId))
+	if err != nil {
+		return false, xerrors.Errorf("failed to get data set %d: %w", dataSetId, err)
+	}
+
+	if ds.PdpEndEpoch.Int64() != 0 {
+		n, err := t.db.Exec(ctx, `UPDATE pdp_delete_data_set 
+									SET after_terminate_service = TRUE,
+									    terminate_service_task_id = NULL,
+									    termination_epoch = $2
+									WHERE terminate_service_task_id = $1`, taskID, ds.PdpEndEpoch.Int64())
+		if err != nil {
+			return false, xerrors.Errorf("failed to update pdp_delete_data_set: %w", err)
+		}
+
+		if n != 1 {
+			return false, xerrors.Errorf("expected to update 1 row but got %d", n)
+		}
+	}
+
 	sender, err := getPDPOwner(ctx, t.db)
 	if err != nil {
 		return false, xerrors.Errorf("failed to get pdp owner: %w", err)

tasks/pdp/watch_data_set_delete.go

@@ -35,7 +35,12 @@ func NewDataSetDeleteWatcher(db *harmonydb.DB, ethClient *ethclient.Client, pcs
 func processPendingDeletes(ctx context.Context, db *harmonydb.DB, ethClient *ethclient.Client) error {
 	var deletes []dataSetDelete
 
-	err := db.Select(ctx, &deletes, `SELECT id, delete_tx_hash FROM pdp_delete_data_set WHERE termination_epoch IS NOT NULL AND terminated = FALSE`)
+	err := db.Select(ctx, &deletes, `SELECT id, delete_tx_hash 
+										FROM pdp_delete_data_set 
+										WHERE termination_epoch IS NOT NULL 
+										  AND terminated = FALSE
+										  AND after_delete_data_set = TRUE
+										  AND delete_tx_hash IS NOT NULL`)
 	if err != nil {
 		return xerrors.Errorf("failed to select pending data sets: %w", err)
 	}

tasks/pdp/watch_fwss_terminate.go

@@ -82,6 +82,11 @@ func processPendingTermination(ctx context.Context, db *harmonydb.DB, client *et
 		return xerrors.Errorf("failed to get data set %d: %w", term.DataSetId, err)
 	}
 
+	if ds.PdpEndEpoch.Int64() == 0 {
+		// Huston! we have a serious problem
+		return xerrors.Errorf("data set %d has no termination epoch", term.DataSetId)
+	}
+
 	n, err := db.Exec(ctx, `UPDATE pdp_delete_data_set SET termination_epoch = $1 WHERE id = $2`, ds.PdpEndEpoch.Int64(), term.DataSetId)
 	if err != nil {
 		return xerrors.Errorf("failed to update pdp_delete_data_set: %w", err)