From e1e56211ba65daeccc9529b92840e8758974e16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Thu, 7 Mar 2019 01:11:48 +0100
Subject: [PATCH] update libp2p-related submodules and its build process

---
 Makefile                                         | 3 ++-
 env.sh                                           | 1 +
 vendor/go/src/github.com/libp2p/go-libp2p-daemon | 2 +-
 vendor/nim-libp2p                                | 2 +-
 vendor/nimcrypto                                 | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 15470348c..9c73b4e17 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,8 @@ eth2_network_simulation: | beacon_node validator_keygen clean_eth2_network_simul
 
 vendor/go/bin/p2pd:
 	cd vendor/go/src/github.com/libp2p/go-libp2p-daemon && \
-		$(ENV_SCRIPT) $(MAKE)
+		$(ENV_SCRIPT) go get ./... && \
+		$(ENV_SCRIPT) go install ./...
 
 test-libp2p-daemon: | vendor/go/bin/p2pd deps
 	cd vendor/nim-libp2p && \
diff --git a/env.sh b/env.sh
index c758da828..d2d53b2d2 100755
--- a/env.sh
+++ b/env.sh
@@ -9,6 +9,7 @@ abs_path="$(cd $rel_path; ${PWD_CMD})"
 
 # used by libp2p/go-libp2p-daemon
 export GOPATH="${abs_path}/vendor/go"
+export GO111MODULE=on
 
 # make it an absolute path, so we can call this script from other dirs
 export PATH="${abs_path}/vendor/Nim/bin:${GOPATH}/bin:${PATH}"
diff --git a/vendor/go/src/github.com/libp2p/go-libp2p-daemon b/vendor/go/src/github.com/libp2p/go-libp2p-daemon
index de7ca070e..baf8c6500 160000
--- a/vendor/go/src/github.com/libp2p/go-libp2p-daemon
+++ b/vendor/go/src/github.com/libp2p/go-libp2p-daemon
@@ -1 +1 @@
-Subproject commit de7ca070e6f487655d787d82d819e70ca96ada2d
+Subproject commit baf8c65000ca510eadecd3881d82bd02f402155b
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index cb334cc8a..a736334fe 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit cb334cc8ab186496d8b73d5a2fe1b6298598b7f6
+Subproject commit a736334fe132527ec4fd6a0b34b848f006c869c5
diff --git a/vendor/nimcrypto b/vendor/nimcrypto
index b06fc1a65..9410cb61d 160000
--- a/vendor/nimcrypto
+++ b/vendor/nimcrypto
@@ -1 +1 @@
-Subproject commit b06fc1a658e8930eb2ed7423f52c2968104df3df
+Subproject commit 9410cb61dff80ddcf5b91bcc13a573c5935fe8c3