diff --git a/api/api.go b/api/api.go index 3049694be..5bdda5c09 100644 --- a/api/api.go +++ b/api/api.go @@ -38,7 +38,6 @@ type Boost interface { BoostLegacyDealByProposalCid(ctx context.Context, propCid cid.Cid) (legacytypes.MinerDeal, error) //perm:admin BoostIndexerAnnounceDeal(ctx context.Context, deal *smtypes.ProviderDealState) (cid.Cid, error) //perm:admin BoostIndexerAnnounceLegacyDeal(ctx context.Context, proposalCid cid.Cid) (cid.Cid, error) //perm:admin - BoostMakeDeal(context.Context, smtypes.DealParams) (*ProviderDealRejectionInfo, error) //perm:write BoostDirectDeal(ctx context.Context, params smtypes.DirectDealParams) (*ProviderDealRejectionInfo, error) //perm:admin // MethodGroup: Blockstore diff --git a/api/proxy_gen.go b/api/proxy_gen.go index 337d7c174..019692161 100644 --- a/api/proxy_gen.go +++ b/api/proxy_gen.go @@ -62,8 +62,6 @@ type BoostStruct struct { BoostLegacyDealByProposalCid func(p0 context.Context, p1 cid.Cid) (legacytypes.MinerDeal, error) `perm:"admin"` - BoostMakeDeal func(p0 context.Context, p1 smtypes.DealParams) (*ProviderDealRejectionInfo, error) `perm:"write"` - BoostOfflineDealWithData func(p0 context.Context, p1 uuid.UUID, p2 string, p3 bool) (*ProviderDealRejectionInfo, error) `perm:"admin"` OnlineBackup func(p0 context.Context, p1 string) error `perm:"admin"` @@ -362,17 +360,6 @@ func (s *BoostStub) BoostLegacyDealByProposalCid(p0 context.Context, p1 cid.Cid) return *new(legacytypes.MinerDeal), ErrNotSupported } -func (s *BoostStruct) BoostMakeDeal(p0 context.Context, p1 smtypes.DealParams) (*ProviderDealRejectionInfo, error) { - if s.Internal.BoostMakeDeal == nil { - return nil, ErrNotSupported - } - return s.Internal.BoostMakeDeal(p0, p1) -} - -func (s *BoostStub) BoostMakeDeal(p0 context.Context, p1 smtypes.DealParams) (*ProviderDealRejectionInfo, error) { - return nil, ErrNotSupported -} - func (s *BoostStruct) BoostOfflineDealWithData(p0 context.Context, p1 uuid.UUID, p2 string, p3 bool) (*ProviderDealRejectionInfo, error) { if s.Internal.BoostOfflineDealWithData == nil { return nil, ErrNotSupported diff --git a/build/openrpc/boost.json.gz b/build/openrpc/boost.json.gz index 4199a5b16..c44c6cf82 100644 Binary files a/build/openrpc/boost.json.gz and b/build/openrpc/boost.json.gz differ diff --git a/documentation/en/api-v1-methods.md b/documentation/en/api-v1-methods.md index e282b358b..033e7d633 100644 --- a/documentation/en/api-v1-methods.md +++ b/documentation/en/api-v1-methods.md @@ -21,7 +21,6 @@ * [BoostIndexerAnnounceLegacyDeal](#boostindexerannouncelegacydeal) * [BoostIndexerListMultihashes](#boostindexerlistmultihashes) * [BoostLegacyDealByProposalCid](#boostlegacydealbyproposalcid) - * [BoostMakeDeal](#boostmakedeal) * [BoostOfflineDealWithData](#boostofflinedealwithdata) * [I](#i) * [ID](#id) @@ -639,61 +638,6 @@ Response: } ``` -### BoostMakeDeal - - -Perms: write - -Inputs: -```json -[ - { - "DealUUID": "07070707-0707-0707-0707-070707070707", - "IsOffline": true, - "ClientDealProposal": { - "Proposal": { - "PieceCID": { - "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" - }, - "PieceSize": 1032, - "VerifiedDeal": true, - "Client": "f01234", - "Provider": "f01234", - "Label": "", - "StartEpoch": 10101, - "EndEpoch": 10101, - "StoragePricePerEpoch": "0", - "ProviderCollateral": "0", - "ClientCollateral": "0" - }, - "ClientSignature": { - "Type": 2, - "Data": "Ynl0ZSBhcnJheQ==" - } - }, - "DealDataRoot": { - "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" - }, - "Transfer": { - "Type": "string value", - "ClientID": "string value", - "Params": "Ynl0ZSBhcnJheQ==", - "Size": 42 - }, - "RemoveUnsealedCopy": true, - "SkipIPNIAnnounce": true - } -] -``` - -Response: -```json -{ - "Accepted": true, - "Reason": "string value" -} -``` - ### BoostOfflineDealWithData diff --git a/node/impl/boost.go b/node/impl/boost.go index 104792426..fbd7a4da3 100644 --- a/node/impl/boost.go +++ b/node/impl/boost.go @@ -31,13 +31,10 @@ import ( lotus_dtypes "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/google/uuid" "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p/core/host" "go.uber.org/fx" ) -var log = logging.Logger("boost-api") - type BoostAPI struct { fx.In @@ -195,11 +192,6 @@ func (sm *BoostAPI) BoostDirectDeal(ctx context.Context, params types.DirectDeal // return sm.DirectDealsProvider.Import(ctx, params) } -func (sm *BoostAPI) BoostMakeDeal(ctx context.Context, params types.DealParams) (*api.ProviderDealRejectionInfo, error) { - log.Infow("received json-rpc deal proposal", "id", params.DealUUID) - return sm.StorageProvider.ExecuteDeal(ctx, ¶ms, "json-rpc-deal") -} - func (sm *BoostAPI) BlockstoreGet(ctx context.Context, c cid.Cid) ([]byte, error) { return sm.Pd.BlockstoreGet(ctx, c) }