Merge branch 'bug/fix-vendor-lint' into bug/fix-mchannel-close

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added 
+
+- Retry logic to messaging server for messaging client.
+
+### Fixed
+
+- Fixed channel collision for messaging clients.
+
+### Changed
+
+- Improve readability of Skywire CLI output.
+
+## 0.1.0 - 2019.03.04
+
+### Added
+
+- First release of the mainnet Skywire node and apps for testing.

Makefile

@@ -1,19 +1,19 @@
 lint: ## Run linters. Use make install-linters first.
-	GO111MODULE=on vendorcheck ./...
+	# GO111MODULE=on vendorcheck ./... # TODO: fix vendor check
 	GO111MODULE=on golangci-lint run -c .golangci.yml ./...
 	# The govet version in golangci-lint is out of date and has spurious warnings, run it separately
 	GO111MODULE=on go vet -all ./...
 
 install-linters: ## Install linters
-	go get -u github.com/FiloSottile/vendorcheck
+	GO111MODULE=on go get -u github.com/FiloSottile/vendorcheck
 	# For some reason this install method is not recommended, see https://github.com/golangci/golangci-lint#install
 	# However, they suggest `curl ... | bash` which we should not do
-	go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+	GO111MODULE=on go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 
 format: ## Formats the code. Must have goimports installed (use make install-linters).
-	goimports -w -local github.com/skycoin/skywire ./pkg
-	goimports -w -local github.com/skycoin/skywire ./cmd
-	goimports -w -local github.com/skycoin/skywire ./internal
+	GO111MODULE=on goimports -w -local github.com/skycoin/skywire ./pkg
+	GO111MODULE=on goimports -w -local github.com/skycoin/skywire ./cmd
+	GO111MODULE=on goimports -w -local github.com/skycoin/skywire ./internal
 
 dep: ## sorts dependencies
 	GO111MODULE=on go mod vendor -v

README.md

@@ -143,3 +143,7 @@ func (app *App) Dial(raddr *Addr) (net.Conn, error) {}
 // Close implements io.Closer for App.
 func (app *App) Close() error {}
 ```
+
+## Updater
+
+This software comes with an updater, which is located in this repo: https://github.com/skycoin/skywire-updater. Follow the instructions in the README.md for further information. It can be used with a CLI for now and will be usable with the manager interface. 

ROADMAP.md

@@ -1,12 +1,12 @@
 # Next steps:
 
-Detailed documentation of the software will follow soon and will be updated as the development continues. The next development steps are: 
+This document defines a high level roadmap for Skywire mainnet development. It does not commit the development team to deliver the features, since product requirements might change at any time. The items do not appear in a chronological order. 
 
-- [ ] implement bandwidth settlement for monetization of network services
-- [ ] CHB / CoinJoin 
-- [ ] new UI for the manager
-- [ ] Remote manager that allows management of unlimited nodes from anywhere
-- [ ] Run CXO on Skywire
+- [ ] Implement bandwidth settlement system for monetization of network services
+- [ ] Integrate Coin Hour Bank / CoinJoin with the settlement system
+- [ ] Integrate the new manager interface with the manager backend
+- [ ] Add support for remote management of unlimited nodes via messaging system
+- [ ] Integrate CXO with Skywire
 - [ ] Create service discovery for peer discovery
-- [ ] Documentation and guides on development on Skywire, application development, how to use it and the architecture itself
+- [ ] Document the software and provide tutorials and help for developing applications using Skywire and to contribute to the development
 - [ ] Integrate Skywire with package manager

cmd/apps/therealproxy/README.org

@@ -2,7 +2,7 @@
 
 ~therealproxy~ app implements SOCKS5 functionality over skywire
 net. Any conventional SOCKS5 client should be able to connect to the
-proxy client.
+proxy client. Currently the server supports authentication with a user and passcode pair that are set in the configuration file. If none are provided, the server does not require authentication. 
 
 ** Local setup
 

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/google/uuid v1.1.0
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
 	github.com/kr/pty v1.1.3
 	github.com/mattn/go-colorable v0.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.4 // indirect
@@ -21,4 +22,6 @@ require (
 	golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2
 	golang.org/x/net v0.0.0-20190213061140-3a22650c66bd
 	golang.org/x/sys v0.0.0-20190220154126-629670e5acc5 // indirect
+	golang.org/x/text v0.3.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )

go.sum

@@ -16,8 +16,13 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3 h1:/Um6a/ZmD5tF7peoOJ5oN5KMQ0DrGVQSXLNwyckutPk=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mattn/go-colorable v0.1.0 h1:v2XXALHHh6zHfYTJ+cSkwtyffnaOyR1MXaA91mTrb8o=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
@@ -51,3 +56,7 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190220154126-629670e5acc5 h1:3Nsfe5Xa1wTt01QxlAFIY5j9ycDtS+d7mhvI8ZY5bn0=
 golang.org/x/sys v0.0.0-20190220154126-629670e5acc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

vendor/modules.txt

@@ -30,8 +30,8 @@ github.com/pmezard/go-difflib/difflib
 # github.com/sirupsen/logrus v1.3.0
 github.com/sirupsen/logrus
 # github.com/skycoin/skycoin v0.25.1
-github.com/skycoin/skycoin/src/cipher
 github.com/skycoin/skycoin/src/util/logging
+github.com/skycoin/skycoin/src/cipher
 github.com/skycoin/skycoin/src/cipher/base58
 github.com/skycoin/skycoin/src/cipher/ripemd160
 github.com/skycoin/skycoin/src/cipher/secp256k1-go