From 68b36f85e9008b71c83eabdd63f8e32300ffc78a Mon Sep 17 00:00:00 2001
From: Nikita Kryuchkov <nkryuchkov10@gmail.com>
Date: Thu, 2 Apr 2020 20:25:53 +0300
Subject: [PATCH] Update dmsg version

---
 go.mod                                        |  2 +-
 go.sum                                        |  2 +
 .../github.com/SkycoinProject/dmsg/.gitignore |  3 ++
 .../github.com/SkycoinProject/dmsg/Makefile   | 37 ++++++++++++++-----
 vendor/modules.txt                            |  2 +-
 5 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index 1a5a7b4030..0469b5d5e6 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/SkycoinProject/skywire-mainnet
 go 1.13
 
 require (
-	github.com/SkycoinProject/dmsg v0.1.0
+	github.com/SkycoinProject/dmsg v0.2.0
 	github.com/SkycoinProject/skycoin v0.27.0
 	github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
diff --git a/go.sum b/go.sum
index 68c9860d3e..4107b64284 100644
--- a/go.sum
+++ b/go.sum
@@ -5,6 +5,8 @@ github.com/SkycoinProject/dmsg v0.0.0-20200306152741-acee74fa4514 h1:Ysxe5a/uGJq
 github.com/SkycoinProject/dmsg v0.0.0-20200306152741-acee74fa4514/go.mod h1:DzykXMLlx6Fx0fGjZsCIRas/MIvxW8DZpmDA6f2nCRk=
 github.com/SkycoinProject/dmsg v0.1.0 h1:dHzzSWpIOlqA99wT7hR6ZOk/Wyv0x1F94u/BHOIKLuo=
 github.com/SkycoinProject/dmsg v0.1.0/go.mod h1:MiX+UG/6fl3g+9rS13/fq7BwUQ2eOlg1yOBOnNf6J6A=
+github.com/SkycoinProject/dmsg v0.2.0 h1:YAalAHTs89Ncu0AbuCz00umX/ITYPAkPRT2w4tp4odE=
+github.com/SkycoinProject/dmsg v0.2.0/go.mod h1:MiX+UG/6fl3g+9rS13/fq7BwUQ2eOlg1yOBOnNf6J6A=
 github.com/SkycoinProject/skycoin v0.26.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo=
 github.com/SkycoinProject/skycoin v0.27.0 h1:N3IHxj8ossHOcsxLYOYugT+OaELLncYHJHxbbYLPPmY=
 github.com/SkycoinProject/skycoin v0.27.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo=
diff --git a/vendor/github.com/SkycoinProject/dmsg/.gitignore b/vendor/github.com/SkycoinProject/dmsg/.gitignore
index aa289b34c6..3aa72e870b 100644
--- a/vendor/github.com/SkycoinProject/dmsg/.gitignore
+++ b/vendor/github.com/SkycoinProject/dmsg/.gitignore
@@ -14,3 +14,6 @@ bin/
 
 dmsg-discovery
 dmsg-server
+dmsgpty-cli
+dmsgpty-host
+dmsgpty-ui
diff --git a/vendor/github.com/SkycoinProject/dmsg/Makefile b/vendor/github.com/SkycoinProject/dmsg/Makefile
index 1ada3f390c..c9898b9086 100644
--- a/vendor/github.com/SkycoinProject/dmsg/Makefile
+++ b/vendor/github.com/SkycoinProject/dmsg/Makefile
@@ -1,10 +1,34 @@
 .DEFAULT_GOAL := help
-.PHONY : check lint install-linters dep test bin build
+.PHONY : check lint install-linters dep test build
+
+VERSION := $(shell git describe --always)
+
+RFC_3339 := "+%Y-%m-%dT%H:%M:%SZ"
+DATE := $(shell date -u $(RFC_3339))
+COMMIT := $(shell git rev-list -1 HEAD)
 
 OPTS?=GO111MODULE=on GOBIN=${PWD}/bin
-TEST_OPTS?=-race -tags no_ci -cover -timeout=5m
 BIN_DIR?=./bin
-BUILD_OPTS?=
+
+TEST_OPTS:=-tags no_ci -cover -timeout=5m
+
+RACE_FLAG:=-race
+GOARCH:=$(shell go env GOARCH)
+
+ifneq (,$(findstring 64,$(GOARCH)))
+    TEST_OPTS:=$(TEST_OPTS) $(RACE_FLAG)
+endif
+
+SKYWIRE_MAINNET := github.com/SkycoinProject/skywire-mainnet
+BUILDINFO_PATH := $(SKYWIRE_MAINNET)/pkg/util/buildinfo
+
+BUILDINFO_VERSION := -X $(BUILDINFO_PATH).version=$(VERSION)
+BUILDINFO_DATE := -X $(BUILDINFO_PATH).date=$(DATE)
+BUILDINFO_COMMIT := -X $(BUILDINFO_PATH).commit=$(COMMIT)
+
+BUILDINFO?=-ldflags="$(BUILDINFO_VERSION) $(BUILDINFO_DATE) $(BUILDINFO_COMMIT)"
+
+BUILD_OPTS?=$(BUILDINFO)
 
 check: lint test ## Run linters and tests
 
@@ -36,7 +60,7 @@ dep: ## Sorts dependencies
 	${OPTS} go mod tidy -v
 
 build: ## Build binaries into ./bin
-	${OPTS} go install ./cmd/*
+	${OPTS} go install ${BUILD_OPTS} ./cmd/*
 
 start-db: ## Init local database env.
 	source ./integration/env.sh && init_redis
@@ -67,10 +91,5 @@ attach-pty: ## Attach local dmsgpty tmux session.
 
 stop-all: stop-pty stop-dmsg stop-db ## Stop all local tmux sessions.
 
-# TODO(evanlinjin): We should get rid of this at some point.
-bin: ## Build `dmsg-discovery`, `dmsg-server`
-	${OPTS} go build ${BUILD_OPTS} -o ./dmsg-discovery ./cmd/dmsg-discovery
-	${OPTS} go build ${BUILD_OPTS} -o ./dmsg-server  ./cmd/dmsg-server
-
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 5c15c282fa..818b8bc9f0 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/SkycoinProject/dmsg v0.1.0
+# github.com/SkycoinProject/dmsg v0.2.0
 github.com/SkycoinProject/dmsg
 github.com/SkycoinProject/dmsg/cipher
 github.com/SkycoinProject/dmsg/disc