Merge pull request #272 from 0xProject/release/1.0.4-beta

Release version 1.0.4-beta

Author: albrow

DEPLOYMENT.md

@@ -1,4 +1,4 @@
-[![Version](https://img.shields.io/badge/version-1.0.3--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
+[![Version](https://img.shields.io/badge/version-1.0.4--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
 
 # 0x Mesh Deployment Guide
 

DEVELOPMENT.md

@@ -1,4 +1,4 @@
-[![Version](https://img.shields.io/badge/version-1.0.3--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
+[![Version](https://img.shields.io/badge/version-1.0.4--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
 
 # 0x Mesh Development Guide
 

README.md

@@ -1,4 +1,4 @@
-[![Version](https://img.shields.io/badge/version-1.0.3--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
+[![Version](https://img.shields.io/badge/version-1.0.4--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
 [![Chat with us on Discord](https://img.shields.io/badge/chat-Discord-blueViolet.svg)](https://discord.gg/HF7fHwk)
 [![GoDoc](https://godoc.org/github.com/0xProject/0x-mesh?status.svg)](https://godoc.org/github.com/0xProject/0x-mesh)
 [![Circle CI](https://img.shields.io/circleci/project/0xProject/0x-mesh/master.svg)](https://circleci.com/gh/0xProject/0x-mesh/tree/master)
@@ -12,7 +12,7 @@
 
 ## Versions
 
-You are looking at the documentation for version `1.0.3-beta`. To see the
+You are looking at the documentation for version `1.0.4-beta`. To see the
 documentation for a different version, visit the
 [Releases Page](https://github.com/0xProject/0x-mesh/releases).
 

USAGE.md

@@ -1,4 +1,4 @@
-[![Version](https://img.shields.io/badge/version-1.0.3--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
+[![Version](https://img.shields.io/badge/version-1.0.4--beta-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
 
 # 0x Mesh Usage Guide
 

core/core.go

@@ -107,7 +107,7 @@ func New(config Config) (*App, error) {
 	log.SetLevel(log.Level(config.Verbosity))
 	log.WithFields(map[string]interface{}{
 		"config":  config,
-		"version": "1.0.3-beta",
+		"version": "1.0.4-beta",
 	}).Info("Initializing new core.App")
 
 	if config.EthereumRPCMaxContentLength < maxOrderSizeInBytes {

examples/beta_telemetry_node/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
     mesh:
-        image: 0xorg/mesh:1.0.3-beta
+        image: 0xorg/mesh:1.0.4-beta
         restart: always
         logging:
             driver: fluentd

p2p/node.go

@@ -22,6 +22,7 @@ import (
 	peer "github.com/libp2p/go-libp2p-peer"
 	peerstore "github.com/libp2p/go-libp2p-peerstore"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
+	routing "github.com/libp2p/go-libp2p-routing"
 	ma "github.com/multiformats/go-multiaddr"
 	log "github.com/sirupsen/logrus"
 )
@@ -97,6 +98,7 @@ type Config struct {
 
 // New creates a new Node with the given config.
 func New(config Config) (*Node, error) {
+
 	nodeCtx, cancel := context.WithCancel(context.Background())
 
 	if config.MessageHandler == nil {
@@ -107,6 +109,18 @@ func New(config Config) (*Node, error) {
 		return nil, errors.New("config.RendezvousString is required")
 	}
 
+	// We need to declare the newDHT function ahead of time so we can use it in
+	// the libp2p.Routing option.
+	var kadDHT *dht.IpfsDHT
+	newDHT := func(h host.Host) (routing.PeerRouting, error) {
+		var err error
+		kadDHT, err = NewDHT(nodeCtx, h)
+		if err != nil {
+			log.WithField("error", err).Fatal("could not create DHT")
+		}
+		return kadDHT, err
+	}
+
 	// Set up the transport and the host.
 	// Note: 0.0.0.0 will use all available addresses.
 	hostAddr, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/0.0.0.0/tcp/%d", config.ListenPort))
@@ -119,6 +133,9 @@ func New(config Config) (*Node, error) {
 		libp2p.ListenAddrs(hostAddr),
 		libp2p.Identity(config.PrivateKey),
 		libp2p.ConnectionManager(connManager),
+		libp2p.EnableAutoRelay(),
+		libp2p.EnableRelay(),
+		libp2p.Routing(newDHT),
 	}
 	if config.Insecure {
 		opts = append(opts, libp2p.NoSecurity)
@@ -130,11 +147,6 @@ func New(config Config) (*Node, error) {
 	}
 
 	// Set up DHT for peer discovery.
-	kadDHT, err := NewDHT(nodeCtx, basicHost)
-	if err != nil {
-		cancel()
-		return nil, err
-	}
 	routingDiscovery := discovery.NewRoutingDiscovery(kadDHT)
 
 	// Set up pubsub.