feat: Add RPC method to fetch DDO deal

strahe · strahe · commit af674e9d9bad · 2024-08-22T16:15:50.000+08:00
diff --git a/api/api.go b/api/api.go
@@ -39,6 +39,7 @@ type Boost interface {
 	BoostIndexerAnnounceDeal(ctx context.Context, deal *smtypes.ProviderDealState) (cid.Cid, error)                                             //perm:admin
 	BoostIndexerAnnounceLegacyDeal(ctx context.Context, proposalCid cid.Cid) (cid.Cid, error)                                                   //perm:admin
 	BoostDirectDeal(ctx context.Context, params smtypes.DirectDealParams) (*ProviderDealRejectionInfo, error)                                   //perm:admin
+	BoostGetDirectDeal(ctx context.Context, dealID uuid.UUID) (*smtypes.DirectDeal, error)                                                      //perm:admin
 	MarketGetAsk(ctx context.Context) (*legacytypes.SignedStorageAsk, error)                                                                    //perm:read
 
 	// MethodGroup: Blockstore
diff --git a/api/proxy_gen.go b/api/proxy_gen.go
diff --git a/build/openrpc/boost.json.gz b/build/openrpc/boost.json.gz
diff --git a/documentation/en/api-v1-methods.md b/documentation/en/api-v1-methods.md
@@ -13,6 +13,7 @@
   * [BoostDealBySignedProposalCid](#boostdealbysignedproposalcid)
   * [BoostDirectDeal](#boostdirectdeal)
   * [BoostDummyDeal](#boostdummydeal)
+  * [BoostGetDirectDeal](#boostgetdirectdeal)
   * [BoostIndexerAnnounceAllDeals](#boostindexerannouncealldeals)
   * [BoostIndexerAnnounceDeal](#boostindexerannouncedeal)
   * [BoostIndexerAnnounceDealRemoved](#boostindexerannouncedealremoved)
@@ -373,6 +374,45 @@ Response:
 }
 ```
 
+### BoostGetDirectDeal
+
+
+Perms: admin
+
+Inputs:
+```json
+[
+  "07070707-0707-0707-0707-070707070707"
+]
+```
+
+Response:
+```json
+{
+  "ID": "07070707-0707-0707-0707-070707070707",
+  "CreatedAt": "0001-01-01T00:00:00Z",
+  "PieceCID": null,
+  "PieceSize": 1032,
+  "Client": "f01234",
+  "Provider": "f01234",
+  "AllocationID": 0,
+  "CleanupData": true,
+  "InboundFilePath": "string value",
+  "InboundFileSize": 9,
+  "SectorID": 9,
+  "Offset": 1032,
+  "Length": 1032,
+  "Checkpoint": 1,
+  "CheckpointAt": "0001-01-01T00:00:00Z",
+  "StartEpoch": 10101,
+  "EndEpoch": 10101,
+  "Err": "string value",
+  "Retry": "auto",
+  "KeepUnsealedCopy": true,
+  "AnnounceToIPNI": true
+}
+```
+
 ### BoostIndexerAnnounceAllDeals
 There are not yet any comments for this method.
 
diff --git a/go.work.sum b/go.work.sum
@@ -2732,6 +2732,7 @@ github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa/go.mod h1:f
 github.com/whyrusleeping/cbor-gen v0.0.0-20230418232409-daab9ece03a0/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/cbor-gen v0.0.0-20230818171029-f91ae536ca25/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/cbor-gen v0.0.0-20240109153615-66e95c3e8a87/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
+github.com/whyrusleeping/cbor-gen v0.1.0/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so=
 github.com/whyrusleeping/go-ctrlnet v0.0.0-20180313164037-f564fbbdaa95 h1:c23eYhe7i8MG6dUSPzyIDDy5+cWOoZMovPamBKqrjYQ=
 github.com/whyrusleeping/go-logging v0.0.1 h1:fwpzlmT0kRC/Fmd0MdmGgJG/CXIZ6gFq46FQZjprUcc=
 github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f h1:M/lL30eFZTKnomXY6huvM6G0+gVquFNf6mxghaWlFUg=
diff --git a/node/impl/boost.go b/node/impl/boost.go
@@ -231,3 +231,7 @@ func (sm *BoostAPI) PdCleanup(ctx context.Context) error {
 func (sm *BoostAPI) MarketGetAsk(ctx context.Context) (*legacytypes.SignedStorageAsk, error) {
 	return sm.StorageProvider.GetAsk(), nil
 }
+
+func (sm *BoostAPI) BoostGetDirectDeal(ctx context.Context, dealID uuid.UUID) (*types.DirectDeal, error) {
+	return sm.DirectDealsProvider.GetDeal(ctx, dealID)
+}
diff --git a/storagemarket/direct_deals_provider.go b/storagemarket/direct_deals_provider.go
@@ -2,6 +2,7 @@ package storagemarket
 
 import (
 	"context"
+	"database/sql"
 	"errors"
 	"fmt"
 	"os"
@@ -780,3 +781,11 @@ func (ddp *DirectDealsProvider) trackCurioSealing(sectorNum abi.SectorNumber) *d
 		}
 	}
 }
+
+func (ddp *DirectDealsProvider) GetDeal(ctx context.Context, dealUuid uuid.UUID) (*types.DirectDeal, error) {
+	deal, err := ddp.directDealsDB.ByID(ctx, dealUuid)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, fmt.Errorf("getting direct deal %s: %w", dealUuid, ErrDealNotFound)
+	}
+	return deal, nil
+}

Original file line number	Diff line number	Diff line change
`@@ -231,3 +231,7 @@ func (sm *BoostAPI) PdCleanup(ctx context.Context) error {`
`231`	`231`	`func (sm BoostAPI) MarketGetAsk(ctx context.Context) (legacytypes.SignedStorageAsk, error) {`
`232`	`232`	`return sm.StorageProvider.GetAsk(), nil`
`233`	`233`	`}`
	`234`	`+`
	`235`	`+func (sm BoostAPI) BoostGetDirectDeal(ctx context.Context, dealID uuid.UUID) (types.DirectDeal, error) {`
	`236`	`+ return sm.DirectDealsProvider.GetDeal(ctx, dealID)`
	`237`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package storagemarket`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "database/sql"`
`5`	`6`	`"errors"`
`6`	`7`	`"fmt"`
`7`	`8`	`"os"`
`@@ -780,3 +781,11 @@ func (ddp DirectDealsProvider) trackCurioSealing(sectorNum abi.SectorNumber) d`
`780`	`781`	`}`
`781`	`782`	`}`
`782`	`783`	`}`
	`784`	`+`
	`785`	`+func (ddp DirectDealsProvider) GetDeal(ctx context.Context, dealUuid uuid.UUID) (types.DirectDeal, error) {`
	`786`	`+ deal, err := ddp.directDealsDB.ByID(ctx, dealUuid)`
	`787`	`+ if errors.Is(err, sql.ErrNoRows) {`
	`788`	`+ return nil, fmt.Errorf("getting direct deal %s: %w", dealUuid, ErrDealNotFound)`
	`789`	`+ }`
	`790`	`+ return deal, nil`
	`791`	`+}`