From 49742f8fdc47e405e01e245edefd7f2f13d815ce Mon Sep 17 00:00:00 2001 From: hannahhoward Date: Wed, 9 Mar 2022 17:53:23 +0000 Subject: [PATCH] feat(deps): update to graphsync v0.13.0 with 2.0 protocol --- api/docgen/docgen.go | 2 +- api/types.go | 2 +- build/openrpc/miner.json.gz | Bin 13155 -> 13154 bytes documentation/en/api-v0-methods-miner.md | 4 ++-- go.mod | 8 ++++---- go.sum | 18 ++++++++++++------ node/impl/storminer.go | 8 ++++---- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go index 1190b0dc4..2579610fe 100644 --- a/api/docgen/docgen.go +++ b/api/docgen/docgen.go @@ -122,7 +122,7 @@ func init() { addExample(api.FullAPIVersion1) addExample(api.PCHInbound) addExample(time.Minute) - addExample(graphsync.RequestID(4)) + addExample(graphsync.NewRequestID()) addExample(datatransfer.TransferID(3)) addExample(datatransfer.Ongoing) addExample(storeIDExample) diff --git a/api/types.go b/api/types.go index c688edf4b..7cb60bdc2 100644 --- a/api/types.go +++ b/api/types.go @@ -58,7 +58,7 @@ type MessageSendSpec struct { // GraphSyncDataTransfer provides diagnostics on a data transfer happening over graphsync type GraphSyncDataTransfer struct { // GraphSync request id for this transfer - RequestID graphsync.RequestID + RequestID *graphsync.RequestID // Graphsync state for this transfer RequestState string // If a channel ID is present, indicates whether this is the current graphsync request for this channel diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index 8475edc774d242279a71b35451b62df7ffe6a875..2ef745e363f046bd79be12f9150368b0af11e933 100644 GIT binary patch delta 9169 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 E0C#yF_W%F@ diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md index c7b04f323..a941d04c0 100644 --- a/documentation/en/api-v0-methods-miner.md +++ b/documentation/en/api-v0-methods-miner.md @@ -939,7 +939,7 @@ Response: { "ReceivingTransfers": [ { - "RequestID": 4, + "RequestID": {}, "RequestState": "string value", "IsCurrentChannelRequest": true, "ChannelID": { @@ -983,7 +983,7 @@ Response: ], "SendingTransfers": [ { - "RequestID": 4, + "RequestID": {}, "RequestState": "string value", "IsCurrentChannelRequest": true, "ChannelID": { diff --git a/go.mod b/go.mod index 060613d19..330990715 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/filecoin-project/go-cbor-util v0.0.1 github.com/filecoin-project/go-commp-utils v0.1.3 github.com/filecoin-project/go-crypto v0.0.1 - github.com/filecoin-project/go-data-transfer v1.14.0 + github.com/filecoin-project/go-data-transfer v1.15.0 github.com/filecoin-project/go-fil-commcid v0.1.0 github.com/filecoin-project/go-fil-commp-hashhash v0.1.0 github.com/filecoin-project/go-fil-markets v1.20.1 @@ -82,7 +82,7 @@ require ( github.com/ipfs/go-ds-leveldb v0.5.0 github.com/ipfs/go-ds-measure v0.2.0 github.com/ipfs/go-fs-lock v0.0.7 - github.com/ipfs/go-graphsync v0.12.0 + github.com/ipfs/go-graphsync v0.13.0 github.com/ipfs/go-ipfs-blockstore v1.1.2 github.com/ipfs/go-ipfs-blocksutil v0.0.1 github.com/ipfs/go-ipfs-chunker v0.0.5 @@ -101,12 +101,12 @@ require ( github.com/ipfs/go-metrics-interface v0.0.1 github.com/ipfs/go-metrics-prometheus v0.0.2 github.com/ipfs/go-unixfs v0.3.1 - github.com/ipfs/go-unixfsnode v1.2.0 + github.com/ipfs/go-unixfsnode v1.4.0 github.com/ipfs/interface-go-ipfs-core v0.5.2 github.com/ipld/go-car v0.3.3 github.com/ipld/go-car/v2 v2.1.1 github.com/ipld/go-codec-dagpb v1.3.0 - github.com/ipld/go-ipld-prime v0.14.4 + github.com/ipld/go-ipld-prime v0.16.0 github.com/ipld/go-ipld-selector-text-lite v0.0.1 github.com/jonboulle/clockwork v0.2.2 // indirect github.com/kelseyhightower/envconfig v1.4.0 diff --git a/go.sum b/go.sum index d07b83200..a874bda2e 100644 --- a/go.sum +++ b/go.sum @@ -324,8 +324,9 @@ github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03/go.mod github.com/filecoin-project/go-crypto v0.0.1 h1:AcvpSGGCgjaY8y1az6AMfKQWreF/pWO2JJGLl6gCq6o= github.com/filecoin-project/go-crypto v0.0.1/go.mod h1:+viYnvGtUTgJRdy6oaeF4MTFKAfatX071MPDPBL11EQ= github.com/filecoin-project/go-dagaggregator-unixfs v0.2.0/go.mod h1:WTuJWgBQY0omnQqa8kRPT9O0Uj5wQOgslVMUuTeHdJ8= -github.com/filecoin-project/go-data-transfer v1.14.0 h1:4pnfJk8FYtqcdAg+QRGzaz57seUC/Tz+HJgPuGB7zdg= github.com/filecoin-project/go-data-transfer v1.14.0/go.mod h1:wNJKhaLLYBJDM3VFvgvYi4iUjPa69pz/1Q5Q4HzX2wE= +github.com/filecoin-project/go-data-transfer v1.15.0 h1:gVH7MxEgoj/qXPz+S6ggFlHlDv1mLlRZuJtTvcq8r1o= +github.com/filecoin-project/go-data-transfer v1.15.0/go.mod h1:RaJIYjh6x6z+FXKNvUULOdUZdN+JutKigfcMMbfykWA= github.com/filecoin-project/go-ds-versioning v0.0.0-20211206185234-508abd7c2aff/go.mod h1:C9/l9PnB1+mwPa26BBVpCjG/XQCB0yj/q5CK2J8X1I4= github.com/filecoin-project/go-ds-versioning v0.1.1 h1:JiyBqaQlwC+UM0WhcBtVEeT3XrX59mQhT8U3p7nu86o= github.com/filecoin-project/go-ds-versioning v0.1.1/go.mod h1:C9/l9PnB1+mwPa26BBVpCjG/XQCB0yj/q5CK2J8X1I4= @@ -410,8 +411,9 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= +github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= +github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= @@ -551,8 +553,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -754,8 +757,9 @@ github.com/ipfs/go-fs-lock v0.0.6/go.mod h1:OTR+Rj9sHiRubJh3dRhD15Juhd/+w6VPOY28 github.com/ipfs/go-fs-lock v0.0.7 h1:6BR3dajORFrFTkb5EpCUFIAypsoxpGpDSVUdFwzgL9U= github.com/ipfs/go-fs-lock v0.0.7/go.mod h1:Js8ka+FNYmgQRLrRXzU3CB/+Csr1BwrRilEcvYrHhhc= github.com/ipfs/go-graphsync v0.11.0/go.mod h1:wC+c8vGVjAHthsVIl8LKr37cUra2GOaMYcQNNmMxDqE= -github.com/ipfs/go-graphsync v0.12.0 h1:QCsVHVzb9FTkcm3NEa8GjXnUeGit1L9s08HcSVQ4m/g= github.com/ipfs/go-graphsync v0.12.0/go.mod h1:nASYWYETgsnMbQ3+DirNImOHQ8TY0a5AhAqyOY55tUg= +github.com/ipfs/go-graphsync v0.13.0 h1:8reYjVKxKocJ9jD471xs9XNuegquPrnBFuGZmCqT8zU= +github.com/ipfs/go-graphsync v0.13.0/go.mod h1:oPBU9JGNlyWHyH9lWYmyl19M++5yiXjBnNC4boh5nVU= github.com/ipfs/go-ipfs v0.11.0/go.mod h1:g68Thu2Ho11AWoHsN34P5fSK7iA6OWWRy3T/g8HLixc= github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08= github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw= @@ -886,8 +890,9 @@ github.com/ipfs/go-unixfs v0.3.1 h1:LrfED0OGfG98ZEegO4/xiprx2O+yS+krCMQSp7zLVv8= github.com/ipfs/go-unixfs v0.3.1/go.mod h1:h4qfQYzghiIc8ZNFKiLMFWOTzrWIAtzYQ59W/pCFf1o= github.com/ipfs/go-unixfsnode v1.1.2/go.mod h1:5dcE2x03pyjHk4JjamXmunTMzz+VUtqvPwZjIEkfV6s= github.com/ipfs/go-unixfsnode v1.1.3/go.mod h1:ZZxUM5wXBC+G0Co9FjrYTOm+UlhZTjxLfRYdWY9veZ4= -github.com/ipfs/go-unixfsnode v1.2.0 h1:tHHBJftsJyHGa8bS62PpkYNqHy/Sug3c/vxxC8NaGQY= github.com/ipfs/go-unixfsnode v1.2.0/go.mod h1:mQEgLjxkV/1mohkC4p7taRRBYPBeXu97SA3YaerT2q0= +github.com/ipfs/go-unixfsnode v1.4.0 h1:9BUxHBXrbNi8mWHc6j+5C580WJqtVw9uoeEKn4tMhwA= +github.com/ipfs/go-unixfsnode v1.4.0/go.mod h1:qc7YFFZ8tABc58p62HnIYbUMwj9chhUuFWmxSokfePo= github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E= github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0= github.com/ipfs/interface-go-ipfs-core v0.4.0/go.mod h1:UJBcU6iNennuI05amq3FQ7g0JHUkibHFAfhfUIy927o= @@ -918,8 +923,9 @@ github.com/ipld/go-ipld-prime v0.14.0/go.mod h1:9ASQLwUFLptCov6lIYc70GRB4V7UTyLD github.com/ipld/go-ipld-prime v0.14.1/go.mod h1:QcE4Y9n/ZZr8Ijg5bGPT0GqYWgZ1704nH0RDcQtgTP0= github.com/ipld/go-ipld-prime v0.14.2/go.mod h1:QcE4Y9n/ZZr8Ijg5bGPT0GqYWgZ1704nH0RDcQtgTP0= github.com/ipld/go-ipld-prime v0.14.3-0.20211207234443-319145880958/go.mod h1:QcE4Y9n/ZZr8Ijg5bGPT0GqYWgZ1704nH0RDcQtgTP0= -github.com/ipld/go-ipld-prime v0.14.4 h1:bqhmume8+nbNsX4/+J6eohktfZHAI8GKrF3rQ0xgOyc= github.com/ipld/go-ipld-prime v0.14.4/go.mod h1:QcE4Y9n/ZZr8Ijg5bGPT0GqYWgZ1704nH0RDcQtgTP0= +github.com/ipld/go-ipld-prime v0.16.0 h1:RS5hhjB/mcpeEPJvfyj0qbOj/QL+/j05heZ0qa97dVo= +github.com/ipld/go-ipld-prime v0.16.0/go.mod h1:axSCuOCBPqrH+gvXr2w9uAOulJqBPhHPT2PjoiiU1qA= github.com/ipld/go-ipld-prime-proto v0.0.0-20191113031812-e32bd156a1e5/go.mod h1:gcvzoEDBjwycpXt3LBE061wT9f46szXGHAmj9uoP6fU= github.com/ipld/go-ipld-prime/storage/bsadapter v0.0.0-20211210234204-ce2a1c70cd73 h1:TsyATB2ZRRQGTwafJdgEUQkmjOExRV0DNokcihZxbnQ= github.com/ipld/go-ipld-prime/storage/bsadapter v0.0.0-20211210234204-ce2a1c70cd73/go.mod h1:2PJ0JgxyB08t0b2WKrcuqI3di0V+5n6RS/LTUJhkoxY= diff --git a/node/impl/storminer.go b/node/impl/storminer.go index c3577d9f5..4c0f889a6 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -676,18 +676,18 @@ func (tc *transferConverter) convertTransfer(channelID datatransfer.ChannelID, h } var channelIDPtr *datatransfer.ChannelID if !hasChannelID { - diagnostics = append(diagnostics, fmt.Sprintf("No data transfer channel id for GraphSync request ID %d", requestID)) + diagnostics = append(diagnostics, fmt.Sprintf("No data transfer channel id for GraphSync request ID %s", requestID)) } else { channelIDPtr = &channelID if isCurrentChannelRequest && !hasState { diagnostics = append(diagnostics, fmt.Sprintf("No current request state for data transfer channel id %s", channelID)) } else if !isCurrentChannelRequest && hasState { - diagnostics = append(diagnostics, fmt.Sprintf("Graphsync request %d is a previous request on data transfer channel id %s that was restarted, but it is still running", requestID, channelID)) + diagnostics = append(diagnostics, fmt.Sprintf("Graphsync request %s is a previous request on data transfer channel id %s that was restarted, but it is still running", requestID, channelID)) } } diagnostics = append(diagnostics, tc.gsDiagnostics[requestID]...) transfer := &api.GraphSyncDataTransfer{ - RequestID: requestID, + RequestID: &requestID, RequestState: stateString, IsCurrentChannelRequest: isCurrentChannelRequest, ChannelID: channelIDPtr, @@ -717,7 +717,7 @@ func (tc *transferConverter) collectRemainingTransfers() { channelID := channelID cs := api.NewDataTransferChannel(channelState.SelfPeer(), channelState) transfer := &api.GraphSyncDataTransfer{ - RequestID: graphsync.RequestID(-1), + RequestID: nil, RequestState: "graphsync state unknown", IsCurrentChannelRequest: false, ChannelID: &channelID,