feat(clientutils): encode cid directly (#398)

encode CIDs directly in the label field in either Base58 (V0) or Base64 (V1)

go.mod

@@ -41,6 +41,7 @@ require (
 	github.com/libp2p/go-libp2p v0.10.0
 	github.com/libp2p/go-libp2p-core v0.6.0
 	github.com/multiformats/go-multiaddr v0.2.2
+	github.com/multiformats/go-multibase v0.0.3
 	github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e
 	github.com/stretchr/testify v1.6.1
 	github.com/whyrusleeping/cbor-gen v0.0.0-20200814224545-656e08ce49ee

storagemarket/impl/client.go

@@ -359,7 +359,7 @@ func (c *Client) ProposeStorageDeal(ctx context.Context, params storagemarket.Pr
 		PieceSize:            pieceSize.Padded(),
 		Client:               params.Addr,
 		Provider:             params.Info.Address,
-		Label:                string(label),
+		Label:                label,
 		StartEpoch:           params.StartEpoch,
 		EndEpoch:             params.EndEpoch,
 		StoragePricePerEpoch: params.Price,

storagemarket/impl/clientutils/clientutils.go

@@ -2,14 +2,10 @@
 package clientutils
 
 import (
-	"bytes"
 	"context"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipld/go-ipld-prime/codec/dagcbor"
-	"github.com/ipld/go-ipld-prime/fluent"
-	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/multiformats/go-multibase"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
@@ -64,23 +60,12 @@ func VerifyResponse(ctx context.Context, resp network.SignedResponse, minerAddr
 	return nil
 }
 
-// LabelField makes a label field for a deal proposal as a CBOR encoded struct
-// with the following structure:
+// LabelField makes a label field for a deal proposal as a multibase encoding
+// of the payload CID (B58BTC for V0, B64 for V1)
 //
-// {
-//	 "pcids": [payloadCID]
-// }
-//
-func LabelField(payloadCID cid.Cid) ([]byte, error) {
-	nd := fluent.MustBuildMap(basicnode.Style.Any, 1, func(ma fluent.MapAssembler) {
-		ma.AssembleEntry("pcids").CreateList(1, func(la fluent.ListAssembler) {
-			la.AssembleValue().AssignLink(cidlink.Link{Cid: payloadCID})
-		})
-	})
-	buf := new(bytes.Buffer)
-	err := dagcbor.Encoder(nd, buf)
-	if err != nil {
-		return nil, err
+func LabelField(payloadCID cid.Cid) (string, error) {
+	if payloadCID.Version() == 0 {
+		return payloadCID.StringOfBase(multibase.Base58BTC)
 	}
-	return buf.Bytes(), nil
+	return payloadCID.StringOfBase(multibase.Base64)
 }

storagemarket/impl/clientutils/clientutils_test.go

@@ -1,7 +1,6 @@
 package clientutils_test
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -11,9 +10,6 @@ import (
 
 	"github.com/ipfs/go-cid"
 	"github.com/ipld/go-ipld-prime"
-	"github.com/ipld/go-ipld-prime/codec/dagcbor"
-	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/go-address"
@@ -153,16 +149,7 @@ func TestLabelField(t *testing.T) {
 	payloadCID := shared_testutil.GenerateCids(1)[0]
 	label, err := clientutils.LabelField(payloadCID)
 	require.NoError(t, err)
-	nb := basicnode.Style.Any.NewBuilder()
-	err = dagcbor.Decoder(nb, bytes.NewReader(label))
+	resultCid, err := cid.Decode(label)
 	require.NoError(t, err)
-	nd := nb.Build()
-	pcidsNd, err := nd.LookupString("pcids")
-	require.NoError(t, err)
-	linkNd, err := pcidsNd.LookupIndex(0)
-	require.NoError(t, err)
-	link, err := linkNd.AsLink()
-	require.NoError(t, err)
-	resultCid := link.(cidlink.Link).Cid
 	require.True(t, payloadCID.Equals(resultCid))
 }