From 4d9141c8b32366fe4076521a4ebcdc713a1481df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erich=20K=C3=A4stner?= <36450093+jdknives@users.noreply.github.com> Date: Wed, 6 Mar 2019 16:47:34 +0700 Subject: [PATCH 1/4] Updated Notes on ROADMAP.md --- ROADMAP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ROADMAP.md b/ROADMAP.md index b6e42e7bf..68d96b27d 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,6 +1,6 @@ # 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 system for monetization of network services - [ ] Integrate Coin Hour Bank / CoinJoin with the settlement system From 69f3052ade7d46c7c93cf60a5ab96c0725330516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=97=E5=AE=87?= Date: Thu, 7 Mar 2019 00:09:23 +0800 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96f91ad65..9b009717f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,19 +8,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added -- retry logic to messaging server for messaging client +- Retry logic to messaging server for messaging client. ### Fixed -- fixed channel collision for messaging clients +- Fixed channel collision for messaging clients. ### Changed -- improve readability of Skywire CLI output +- Improve readability of Skywire CLI output. -## 1.0.0 - 2019.03.04 +## 0.1.0 - 2019.03.04 ### Added -- first release of the mainnet Skywire node and applications for developer testing - +- First release of the mainnet Skywire node and apps for testing. From 739f299208a48a01c3965d16fb73b5f49ea73181 Mon Sep 17 00:00:00 2001 From: ivcosla Date: Thu, 7 Mar 2019 15:33:59 +0100 Subject: [PATCH 3/4] fix travis --- Makefile | 10 +++++----- go.mod | 3 +++ go.sum | 9 +++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e41513d94..19bb06215 100644 --- a/Makefile +++ b/Makefile @@ -5,15 +5,15 @@ lint: ## Run linters. Use make install-linters first. 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 diff --git a/go.mod b/go.mod index f4006c47c..d6d1e9bff 100644 --- a/go.mod +++ b/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 ) diff --git a/go.sum b/go.sum index 14920faf7..8644b6fda 100644 --- a/go.sum +++ b/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= From 70a15f37e12853a5cf0078b5f27c09c1f6d16d18 Mon Sep 17 00:00:00 2001 From: ivcosla Date: Thu, 7 Mar 2019 15:41:39 +0100 Subject: [PATCH 4/4] vendor --- Makefile | 2 +- vendor/modules.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 19bb06215..3eacad1b6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ 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 ./... diff --git a/vendor/modules.txt b/vendor/modules.txt index cb8035fe4..4e9410867 100644 --- a/vendor/modules.txt +++ b/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