Merge pull request #9565 from filecoin-project/feat/netretr

feat: Retrieval into remote blockstores
filecoin-project · Nov 8, 2022 · a678b7f · a678b7f
2 parents 4ffded6 + 888f97a
commit a678b7f
Show file tree

Hide file tree

Showing 66 changed files with 1,975 additions and 404 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -896,6 +896,11 @@ workflows:
           suite: itest-deals_publish
           target: "./itests/deals_publish_test.go"
 
+      - test:
+          name: test-itest-deals_remote_retrieval
+          suite: itest-deals_remote_retrieval
+          target: "./itests/deals_remote_retrieval_test.go"
+
       - test:
           name: test-itest-deals_retry_deal_no_funds
           suite: itest-deals_retry_deal_no_funds

diff --git a/api/api_full.go b/api/api_full.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/google/uuid"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -1012,8 +1013,12 @@ type RetrievalOrder struct {
 	Client                  address.Address
 	Miner                   address.Address
 	MinerPeer               *retrievalmarket.RetrievalPeer
+
+	RemoteStore *RemoteStoreID `json:"RemoteStore,omitempty"`
 }
 
+type RemoteStoreID = uuid.UUID
+
 type InvocResult struct {
 	MsgCid         cid.Cid
 	Msg            *types.Message

diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go
@@ -361,6 +361,7 @@ func init() {
 			Headers: nil,
 		},
 	})
+	addExample(&uuid.UUID{})
 }
 
 func GetAPIType(name, pkg string) (i interface{}, t reflect.Type, permStruct []reflect.Type) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -361,6 +361,7 @@ func init() { @@
     			Headers: nil,
     		},
     	})
+    	addExample(&uuid.UUID{})
     }
     func GetAPIType(name, pkg string) (i interface{}, t reflect.Type, permStruct []reflect.Type) {
@@ Expand Down @@