refactor: merge from main

filecoin-project · Mar 14, 2023 · 28881a9 · 28881a9
2 parents 60806af + 9c0b02c
commit 28881a9
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 144 deletions.
diff --git a/api/api.go b/api/api.go
@@ -46,7 +46,8 @@ type Boost interface {
 	BoostDagstoreRecoverShard(ctx context.Context, key string) error                                                               //perm:admin
 	BoostDagstoreGC(ctx context.Context) ([]DagstoreShardResult, error)                                                            //perm:admin
 	BoostDagstorePiecesContainingMultihash(ctx context.Context, mh multihash.Multihash) ([]cid.Cid, error)                         //perm:read
-	BoostDagstoreListShards(ctx context.Context) ([]DagstoreShardInfo, error)                                                      //perm:read
+	BoostDagstoreListShards(ctx context.Context) ([]DagstoreShardInfo, error)                                                      //perm:admin
+	BoostMakeDeal(context.Context, smtypes.DealParams) (*ProviderDealRejectionInfo, error)                                         //perm:write
 
 	// MethodGroup: Blockstore
 	BlockstoreGet(ctx context.Context, c cid.Cid) ([]byte, error)  //perm:read

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/build/version.go b/build/version.go
@@ -2,7 +2,7 @@ package build
 
 var CurrentCommit string
 
-const BuildVersion = "1.6.0-rc3"
+const BuildVersion = "1.6.0"
 
 func UserVersion() string {
 	return BuildVersion + CurrentCommit

diff --git a/docker/devnet/boost/sample/random.sh b/docker/devnet/boost/sample/random.sh
diff --git a/documentation/en/api-v1-methods.md b/documentation/en/api-v1-methods.md
@@ -22,6 +22,7 @@
   * [BoostDummyDeal](#boostdummydeal)
   * [BoostIndexerAnnounceAllDeals](#boostindexerannouncealldeals)
   * [BoostIndexerListMultihashes](#boostindexerlistmultihashes)
+  * [BoostMakeDeal](#boostmakedeal)
   * [BoostOfflineDealWithData](#boostofflinedealwithdata)
 * [Deals](#deals)
   * [DealsConsiderOfflineRetrievalDeals](#dealsconsiderofflineretrievaldeals)
@@ -272,7 +273,7 @@ Response: `{}`
 ### BoostDagstoreListShards
 
 
-Perms: read
+Perms: admin
 
 Inputs: `null`
 
@@ -553,6 +554,61 @@ 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
@@ -513,6 +513,11 @@ func (sm *BoostAPI) BoostDagstoreDestroyShard(ctx context.Context, key string) e
 	return nil
 }
 
+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, &params, "json-rpc-deal")
+}
+
 func (sm *BoostAPI) BlockstoreGet(ctx context.Context, c cid.Cid) ([]byte, error) {
 	return sm.Pd.BlockstoreGet(ctx, c)
 }

diff --git a/react/package-lock.json b/react/package-lock.json