Merge pull request #6158 from filecoin-project/feat/market/add-id

feat: add id to MinerDeal
filecoin-project · Sep 20, 2023 · 3ff535a · 3ff535a
2 parents b78d8c6 + dd01c67
commit 3ff535a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 2 deletions.
diff --git a/venus-shared/api/market/v0/method.md b/venus-shared/api/market/v0/method.md
@@ -570,6 +570,7 @@ Inputs:
 [
   [
     {
+      "ID": "07070707-0707-0707-0707-070707070707",
       "Proposal": {
         "PieceCID": {
           "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1287,6 +1288,7 @@ Inputs:
 Response:
 ```json
 {
+  "ID": "07070707-0707-0707-0707-070707070707",
   "Proposal": {
     "PieceCID": {
       "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1363,6 +1365,7 @@ Inputs: `[]`
 Response:
 ```json
 {
+  "ID": "07070707-0707-0707-0707-070707070707",
   "Proposal": {
     "PieceCID": {
       "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1542,6 +1545,7 @@ Inputs:
 ```json
 [
   {
+    "ID": "07070707-0707-0707-0707-070707070707",
     "Proposal": {
       "PieceCID": {
         "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1721,6 +1725,7 @@ Response:
 ```json
 [
   {
+    "ID": "07070707-0707-0707-0707-070707070707",
     "Proposal": {
       "PieceCID": {
         "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"

diff --git a/venus-shared/api/market/v1/method.md b/venus-shared/api/market/v1/method.md
@@ -571,6 +571,7 @@ Inputs:
 [
   [
     {
+      "ID": "07070707-0707-0707-0707-070707070707",
       "Proposal": {
         "PieceCID": {
           "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1288,6 +1289,7 @@ Inputs:
 Response:
 ```json
 {
+  "ID": "07070707-0707-0707-0707-070707070707",
   "Proposal": {
     "PieceCID": {
       "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1364,6 +1366,7 @@ Inputs: `[]`
 Response:
 ```json
 {
+  "ID": "07070707-0707-0707-0707-070707070707",
   "Proposal": {
     "PieceCID": {
       "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1543,6 +1546,7 @@ Inputs:
 ```json
 [
   {
+    "ID": "07070707-0707-0707-0707-070707070707",
     "Proposal": {
       "PieceCID": {
         "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
@@ -1722,6 +1726,7 @@ Response:
 ```json
 [
   {
+    "ID": "07070707-0707-0707-0707-070707070707",
     "Proposal": {
       "PieceCID": {
         "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"

diff --git a/venus-shared/types/market/cbor_gen.go b/venus-shared/types/market/cbor_gen.go
diff --git a/venus-shared/types/market/storage.go b/venus-shared/types/market/storage.go
@@ -11,12 +11,14 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	crypto "github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
 )
 
 type MinerDeal struct {
+	ID uuid.UUID
 	types.ClientDealProposal
 	ProposalCid           cid.Cid
 	AddFundsCid           *cid.Cid