Patch go-multiaddr to handle backwards compatible cids

cmd/start.go

@@ -456,7 +456,6 @@ func (x *Start) Execute(args []string) error {
 		return errors.New("IPFS DHT routing is not configured")
 	}
 
-
 	// Get current directory root hash
 	ipnskey := namesys.IpnsDsKey(nd.Identity)
 	ival, hasherr := nd.Repo.Datastore().Get(ipnskey)
@@ -712,7 +711,7 @@ func (x *Start) Execute(args []string) error {
 				}()
 			}
 		}
-		<- core.Node.DHT.BootstrapChan
+		<-core.Node.DHT.BootstrapChan
 		core.Node.Service = service.New(core.Node, sqliteDB)
 
 		core.Node.StartMessageRetriever()

ipfs/identity_test.go

@@ -45,4 +45,4 @@ func TestIdentityKeyFromSeed(t *testing.T) {
 	if !bytes.Equal(key, keyBytes) {
 		t.Error("Failed to extract correct private key from seed")
 	}
-}
+}

net/repointer/repointer.go

@@ -17,15 +17,15 @@ const kRepointFrequency = time.Hour * 12
 const kPointerExpiration = time.Hour * 24 * 30
 
 type PointerRepublisher struct {
-	routing *dht.IpfsDHT
+	routing     *dht.IpfsDHT
 	db          repo.Datastore
 	pushNodes   []peer.ID
 	isModerator func() bool
 }
 
 func NewPointerRepublisher(dht *dht.IpfsDHT, database repo.Datastore, pushNodes []peer.ID, isModerator func() bool) *PointerRepublisher {
 	return &PointerRepublisher{
-		routing: dht,
+		routing:     dht,
 		db:          database,
 		pushNodes:   pushNodes,
 		isModerator: isModerator,

net/retriever/retriever_test.go

@@ -1,9 +1,8 @@
 package net
 
 import (
-	"testing"
-
 	"github.com/OpenBazaar/openbazaar-go/pb"
+	"testing"
 )
 
 // TestEnsureNoOmissionsInMessageProcessingOrder ensures that

vendor/gx/ipfs/QmPpYHPRGVpSJTkQDQDwTYZ1cYUR2NM4HS6M3iAXi8aoUa/go-libp2p-kad-dht/dht_bootstrap.go

@@ -6,8 +6,8 @@ import (
 	"context"
 	"crypto/rand"
 	"fmt"
-	"time"
 	"sync"
+	"time"
 
 	u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
 	goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
@@ -124,7 +124,9 @@ func (dht *IpfsDHT) bootstrapWorker(cfg BootstrapConfig) func(worker goprocess.P
 		}
 	}
 }
+
 var bootstrapOnce sync.Once
+
 // runBootstrap builds up list of peers by requesting random peer IDs
 func (dht *IpfsDHT) runBootstrap(ctx context.Context, cfg BootstrapConfig) error {
 	bslog := func(msg string) {
@@ -180,7 +182,7 @@ func (dht *IpfsDHT) runBootstrap(ctx context.Context, cfg BootstrapConfig) error
 	if len(merr) > 0 {
 		return merr
 	}
-	bootstrapOnce.Do(func(){
+	bootstrapOnce.Do(func() {
 		close(dht.BootstrapChan)
 	})
 	return nil

vendor/gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr/codec.go

@@ -156,6 +156,17 @@ func sizeForAddr(p Protocol, b []byte) (skip, size int, err error) {
 		return 0, (p.Size / 8), nil
 	case p.Size == 0:
 		return 0, 0, nil
+	case p.Code == P_P2P:
+		// OpenBazaar: this has to be patched to handle cids in this field
+		// until most nodes on the network upgrade and we do not need this
+		// anymore.
+		if b[0] == 0x01 {
+			return 0, len(b), nil
+		} else if len(b) == 37 {
+			return 3, 34, nil
+		} else {
+			return 2, 34, nil
+		}
 
 	default:
 		size, n, err := ReadVarintCode(b)

vendor/gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr/transcoders.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
+	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
 )
 
 type Transcoder interface {
@@ -189,8 +189,12 @@ func p2pStB(s string) ([]byte, error) {
 	}
 }
 
+// OpenBazaar: this has been patched to parse CIDs as well as multihashes
 func p2pVal(b []byte) error {
-	_, err := mh.Cast(b)
+	_, err := cid.Cast(b)
+	if err != nil {
+		_, err = mh.Cast(b)
+	}
 	return err
 }