Add f05 paid deal scaffolding

cmd/deal/list.go

@@ -36,7 +36,7 @@ var ListCmd = &cli.Command{
 		},
 		&cli.StringSliceFlag{
 			Name:  "deal-type",
-			Usage: "Filter deals by type: market (legacy f05), pdp (f41 PDP deals)",
+			Usage: "Filter deals by type: market, f05_paid, pdp, ddo",
 		},
 	},
 	Action: func(c *cli.Context) error {

cmd/deal/schedule/create.go

@@ -62,7 +62,7 @@ var CreateCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:     "deal-type",
 			Category: "Deal Proposal",
-			Usage:    "Deal type: market (legacy f05), pdp (f41), or ddo (DDO allocations)",
+			Usage:    "Deal type: market (legacy f05), f05_paid (f05 with on-chain payments), pdp (f41), or ddo (DDO allocations)",
 			Value:    string(model.DealTypeMarket),
 		},
 		&cli.StringSliceFlag{

cmd/deal/schedule/update.go

@@ -86,7 +86,7 @@ var UpdateCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:     "deal-type",
 			Category: "Deal Proposal",
-			Usage:    "Deal type: market (legacy f05) or pdp (f41)",
+			Usage:    "Deal type: market (legacy f05), f05_paid (f05 with on-chain payments), pdp (f41), or ddo (DDO allocations)",
 		},
 		&cli.BoolFlag{
 			Name:     "ipni",

handler/deal/list.go

@@ -15,7 +15,7 @@ type ListDealRequest struct {
 	Schedules    []uint32          `json:"schedules"`    // schedule id filter
 	Providers    []string          `json:"providers"`    // provider filter
 	States       []model.DealState `json:"states"`       // state filter
-	DealTypes    []model.DealType  `json:"dealTypes"`    // deal type filter (market for f05, pdp for f41)
+	DealTypes    []model.DealType  `json:"dealTypes"`    // deal type filter (market/f05_paid for f05, pdp for f41, ddo for allocations)
 }
 
 // ListHandler retrieves a list of deals from the database based on the specified filtering criteria in ListDealRequest.

handler/deal/schedule/create.go

@@ -25,7 +25,7 @@ import (
 type CreateRequest struct {
 	Preparation           string   `json:"preparation"           validation:"required"`  // Preparation ID or name
 	Provider              string   `json:"provider"              validation:"required"`  // Provider
-	DealType              string   `json:"dealType"`                                     // Deal type: market (f05), pdp (f41), or ddo
+	DealType              string   `json:"dealType"`                                     // Deal type: market (legacy f05), f05_paid (f05 with on-chain payments), pdp (f41), or ddo
 	HTTPHeaders           []string `json:"httpHeaders"`                                  // http headers to be passed with the request (i.e. key=value)
 	URLTemplate           string   `json:"urlTemplate"`                                  // URL template with PIECE_CID placeholder for boost to fetch the CAR file, i.e. http://127.0.0.1/piece/{PIECE_CID}.car
 	PricePerGBEpoch       float64  `default:"0"                  json:"pricePerGbEpoch"` // Price in FIL per GiB per epoch

handler/deal/schedule/create_test.go

@@ -246,6 +246,19 @@ func TestCreateHandler_PDPRejectsPreparationWithOversizedPiece(t *testing.T) {
 	})
 }
 
+func TestCreateHandler_F05PaidAccepted(t *testing.T) {
+	testutil.All(t, func(ctx context.Context, t *testing.T, db *gorm.DB) {
+		prep := createPrepWithWallet(t, db, "")
+		req := createRequest
+		req.Preparation = fmt.Sprintf("%d", prep.ID)
+		req.DealType = string(model.DealTypeF05Paid)
+
+		schedule, err := Default.CreateHandler(ctx, db, getMockLotusClient(), req)
+		require.NoError(t, err)
+		require.Equal(t, model.DealTypeF05Paid, schedule.DealType)
+	})
+}
+
 func TestCreateHandler_ProviderNormalizedToActorID(t *testing.T) {
 	testutil.All(t, func(ctx context.Context, t *testing.T, db *gorm.DB) {
 		createPrepWithWallet(t, db, "")

handler/deal/schedule/update.go

@@ -41,7 +41,7 @@ type UpdateRequest struct {
 	//nolint:tagliatelle
 	AllowedPieceCIDs []string `json:"allowedPieceCids"` // Allowed piece CIDs in this schedule
 	Force            *bool    `json:"force"`            // Force to send out deals regardless of replication restriction
-	DealType         *string  `json:"dealType"`         // Deal type: market (f05) or pdp (f41)
+	DealType         *string  `json:"dealType"`         // Deal type: market (legacy f05), f05_paid (f05 with on-chain payments), pdp (f41), or ddo
 }
 
 // UpdateHandler modifies an existing schedule record based on the provided update request.

handler/deal/schedule/update_test.go

@@ -284,6 +284,19 @@ func TestUpdateHandler_DDORequiresURLTemplate(t *testing.T) {
 	})
 }
 
+func TestUpdateHandler_F05PaidAccepted(t *testing.T) {
+	testutil.All(t, func(ctx context.Context, t *testing.T, db *gorm.DB) {
+		err := db.Create(&model.Schedule{
+			Preparation: &model.Preparation{},
+		}).Error
+		require.NoError(t, err)
+		req := UpdateRequest{DealType: ptr.Of(string(model.DealTypeF05Paid))}
+		schedule, err := Default.UpdateHandler(ctx, db, 1, req)
+		require.NoError(t, err)
+		require.Equal(t, model.DealTypeF05Paid, schedule.DealType)
+	})
+}
+
 func TestUpdateHandler_DDOClearURLTemplateRejected(t *testing.T) {
 	testutil.All(t, func(ctx context.Context, t *testing.T, db *gorm.DB) {
 		err := db.Create(&model.Schedule{