Retrieval query ask v2 #671
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/filecoin-project/boost/retrievalmarket/lp2pimpl" | ||
| "github.com/filecoin-project/boost/retrievalmarket/types" | ||
| "github.com/libp2p/go-libp2p" | ||
| "github.com/libp2p/go-libp2p-core/peer" | ||
| "github.com/libp2p/go-libp2p-core/peerstore" | ||
| "github.com/libp2p/go-libp2p-peerstore/pstoremem" | ||
| ) | ||
|
|
||
| // RetrievalClient runs retrieval queries with Boost over libp2p | ||
| type RetrievalClient struct { | ||
| PeerStore peerstore.Peerstore | ||
| queryClient *lp2pimpl.QueryClient | ||
| } | ||
|
|
||
| // NewRetrievalClient sets up a libp2p host to run retrieval query ask v2 queries | ||
| func NewRetrievalClient() (*RetrievalClient, error) { | ||
| pstore, err := pstoremem.NewPeerstore() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("creating peer store: %w", err) | ||
| } | ||
| opts := []libp2p.Option{ | ||
| libp2p.DefaultTransports, | ||
| libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"), | ||
| libp2p.Peerstore(pstore), | ||
| libp2p.NoListenAddrs, | ||
| } | ||
|
|
||
| h, err := libp2p.New(opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| retryOpts := lp2pimpl.RetryParameters(time.Millisecond, time.Millisecond, 1, 1) | ||
| return &RetrievalClient{ | ||
| queryClient: lp2pimpl.NewQueryClient(h, retryOpts), | ||
| PeerStore: pstore, | ||
| }, nil | ||
| } | ||
|
|
||
| // Query sends a retrieval query v2 to another peer | ||
| func (c *RetrievalClient) Query(ctx context.Context, providerID peer.ID, query types.Query) (*types.QueryResponse, error) { | ||
|
There was a problem hiding this comment. Given that the RetrievalClient only has one method, I wonder if we can consolidate everything into the QueryClient? |
||
| // Send the deal proposal to the provider | ||
| return c.queryClient.SendQuery(ctx, providerID, query) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ func main() { | |
| offlineDealCmd, | ||
| providerCmd, | ||
| walletCmd, | ||
| retrievePieceCmd, | ||
| }, | ||
| } | ||
| app.Setup() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,82 @@ | ||||||||||||||
| package main | ||||||||||||||
|
|
||||||||||||||
| import ( | ||||||||||||||
| "fmt" | ||||||||||||||
|
|
||||||||||||||
| bcli "github.com/filecoin-project/boost/cli" | ||||||||||||||
| clinode "github.com/filecoin-project/boost/cli/node" | ||||||||||||||
| "github.com/filecoin-project/boost/cmd" | ||||||||||||||
| "github.com/filecoin-project/boost/retrievalmarket/lp2pimpl" | ||||||||||||||
| "github.com/filecoin-project/boost/retrievalmarket/types" | ||||||||||||||
| "github.com/filecoin-project/go-address" | ||||||||||||||
| lcli "github.com/filecoin-project/lotus/cli" | ||||||||||||||
| "github.com/ipfs/go-cid" | ||||||||||||||
| "github.com/urfave/cli/v2" | ||||||||||||||
| ) | ||||||||||||||
|
|
||||||||||||||
| var retrievePieceCmd = &cli.Command{ | ||||||||||||||
| Name: "retrieve-piece", | ||||||||||||||
|
There was a problem hiding this comment. I'd suggest adding a I also don't think we really need to provide the piece cid. The path to get things can be "well-known", eg |
||||||||||||||
| Usage: "", | ||||||||||||||
| Flags: []cli.Flag{ | ||||||||||||||
| &cli.StringFlag{ | ||||||||||||||
| Name: "provider", | ||||||||||||||
| Usage: "storage provider on-chain address", | ||||||||||||||
| Required: true, | ||||||||||||||
| }, | ||||||||||||||
| &cli.StringFlag{ | ||||||||||||||
| Name: "piece-cid", | ||||||||||||||
| Usage: "", | ||||||||||||||
| Required: true, | ||||||||||||||
| }, | ||||||||||||||
| }, | ||||||||||||||
| Before: before, | ||||||||||||||
| Action: func(cctx *cli.Context) error { | ||||||||||||||
| ctx := bcli.ReqContext(cctx) | ||||||||||||||
|
|
||||||||||||||
| pieceCID, err := cid.Parse(cctx.String("piece-cid")) | ||||||||||||||
| if err != nil { | ||||||||||||||
| return err | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| n, err := clinode.Setup(cctx.String(cmd.FlagRepo.Name)) | ||||||||||||||
| if err != nil { | ||||||||||||||
| return err | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| api, closer, err := lcli.GetGatewayAPI(cctx) | ||||||||||||||
| if err != nil { | ||||||||||||||
| return fmt.Errorf("cant setup gateway connection: %w", err) | ||||||||||||||
| } | ||||||||||||||
| defer closer() | ||||||||||||||
|
|
||||||||||||||
| maddr, err := address.NewFromString(cctx.String("provider")) | ||||||||||||||
| if err != nil { | ||||||||||||||
| return err | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| addrInfo, err := cmd.GetAddrInfo(ctx, api, maddr) | ||||||||||||||
| if err != nil { | ||||||||||||||
| return err | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| log.Debugw("found storage provider", "id", addrInfo.ID, "multiaddrs", addrInfo.Addrs, "addr", maddr) | ||||||||||||||
|
|
||||||||||||||
| if err := n.Host.Connect(ctx, *addrInfo); err != nil { | ||||||||||||||
| return fmt.Errorf("failed to connect to peer %s: %w", addrInfo.ID, err) | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| dc := lp2pimpl.NewQueryClient(n.Host) | ||||||||||||||
| resp, err := dc.SendQuery(ctx, addrInfo.ID, types.Query{ | ||||||||||||||
| PieceCID: &pieceCID, | ||||||||||||||
| }) | ||||||||||||||
| if err != nil { | ||||||||||||||
| return fmt.Errorf("send deal status request failed: %w", err) | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| if resp.Error != "" { | ||||||||||||||
| return fmt.Errorf("query response error: %s", resp.Error) | ||||||||||||||
| } | ||||||||||||||
| fmt.Println(resp.Protocols.HTTPFilecoinV1.URL) | ||||||||||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. I'd suggest outputting all protocols and let the user parse for the one they want to use. |
||||||||||||||
| return nil | ||||||||||||||
| }, | ||||||||||||||
| } | ||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need the
ListenAddrStringsoption if we're also supplyingNoListenAddr?