diff --git a/go.mod b/go.mod index e8747930..91f8c4ba 100644 --- a/go.mod +++ b/go.mod @@ -23,8 +23,8 @@ require ( github.com/json-iterator/go v1.1.12 github.com/rs/cors v1.11.1 github.com/sirupsen/logrus v1.9.3 - github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670 - github.com/skycoin/skywire v1.3.29-rc1.0.20241217192205-cb65518c5522 + github.com/skycoin/dmsg v1.3.29-0.20241218010226-56d92f2ef624 + github.com/skycoin/skywire v1.3.29-rc1.0.20241217211947-72c9d0b82083 github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index d4f975d0..6c44eb7c 100644 --- a/go.sum +++ b/go.sum @@ -298,14 +298,14 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670 h1:4RUr5DtDwsvpT6NIgRsWy6zffiljW42aP3PsEBBazhc= -github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670/go.mod h1:BU69yZysa088J/wV+9Z2Kbwq4Auup2tcvFiAlEle74M= +github.com/skycoin/dmsg v1.3.29-0.20241218010226-56d92f2ef624 h1:QGQBG2XnVdCUa/n2G9Yw5HHASkoEShSirHNsGCnr+Is= +github.com/skycoin/dmsg v1.3.29-0.20241218010226-56d92f2ef624/go.mod h1:SkVfpDNf4O1D2QcOJ4uG/0AQ8Cs1M5dUD49Xndi5Jig= github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA= github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o= github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f h1:isCGulVHahQfFoS37B7JT3rb8n4Ih2o9oMg2p25D7o8= github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f/go.mod h1:1iZLomiHUOEvmJaBNrzE+Tllf09uhrCZ5JLL3cHdKKQ= -github.com/skycoin/skywire v1.3.29-rc1.0.20241217192205-cb65518c5522 h1:P79IKUboXySZWCjxBn1cOOUZh0r5c27UXZtdp6jabY0= -github.com/skycoin/skywire v1.3.29-rc1.0.20241217192205-cb65518c5522/go.mod h1:IPjjLQ/fcE6EKgNQffCEGWP3oUf+VnTDXxl6+rTjk5E= +github.com/skycoin/skywire v1.3.29-rc1.0.20241217211947-72c9d0b82083 h1:PlmCehf92cYq7UF+IC2OOnGo7TWrYcM2iqWhZr2nHh4= +github.com/skycoin/skywire v1.3.29-rc1.0.20241217211947-72c9d0b82083/go.mod h1:6Hn74SjGARoWTvSPQryDxI9eB0jlh1iIwN2tcXCJvgw= github.com/skycoin/systray v1.10.0 h1:fQZJHMylpVvfmOOTLvUssfyHVDoC8Idx6Ba2BlLEuGg= github.com/skycoin/systray v1.10.0/go.mod h1:/i17Eni5GxFiboIZceeamY5LktDSFFRCvd3fBMerQ+4= github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 h1:TG/diQgUe0pntT/2D9tmUCz4VNwm9MfrtPr0SU2qSX8= diff --git a/vendor/github.com/skycoin/skywire/Makefile b/vendor/github.com/skycoin/skywire/Makefile index fa16cf70..0e8b8cde 100644 --- a/vendor/github.com/skycoin/skywire/Makefile +++ b/vendor/github.com/skycoin/skywire/Makefile @@ -11,7 +11,7 @@ RFC_3339 := "+%Y-%m-%dT%H:%M:%SZ" COMMIT := $(shell git rev-list -1 HEAD) PROJECT_BASE := github.com/skycoin/skywire -SKYWIRE_UTILITIES_BASE := github.com/skycoin/skywire-utilities +SKYWIRE_UTILITIES_BASE := github.com/skycoin/skywire/pkg/skywire-utilities ifeq ($(OS),Windows_NT) SHELL := pwsh OPTS?=powershell -Command setx GO111MODULE on; diff --git a/vendor/github.com/skycoin/skywire/README.md b/vendor/github.com/skycoin/skywire/README.md index f5cbf795..fe31b652 100644 --- a/vendor/github.com/skycoin/skywire/README.md +++ b/vendor/github.com/skycoin/skywire/README.md @@ -63,6 +63,21 @@ Visor apps are not executed directly by the user, but hosted by the visor proces Further documentation can be found in the [skywire wiki](https://github.com/skycoin/skywire/wiki). +## `go install` or `go run` Skywire + +If you have golang set up - including setting GOPATH, GOBIN, and appending GOBIN to your PATH reenvironmental variable, skywire may be installed to your GOBIN as follows: + +``` +_skywire="github.com/skycoin/skywire" go install -ldflags=" -X ${_skywire}/pkg/skywire-utilities/pkg/buildinfo.golist=$(go list -mod=mod -m -json ${_skywire}@develop)" ${_skywire}/cmd/skywire@develop +``` + +`-ldflags` compiles the version into the binary, so that the visor will be eligible for rewards. + +It's also possible to `go run` skywire from outside the source code, but this is generally not recommended: +``` +_skywire="github.com/skycoin/skywire" go run -ldflags=" -X ${_skywire}/pkg/skywire-utilities/pkg/buildinfo.golist=$(go list -mod=mod -m -json ${_skywire}@develop)" ${_skywire}/cmd/skywire@develop +``` + ## Installing Skywire from Release Releases for windows & macOS are available from the [release section](https://github.com/skycoin/skywire/releases/) diff --git a/vendor/modules.txt b/vendor/modules.txt index 5d01f4c0..a00a2457 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -480,7 +480,7 @@ github.com/rs/cors/internal ## explicit; go 1.13 github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/syslog -# github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670 +# github.com/skycoin/dmsg v1.3.29-0.20241218010226-56d92f2ef624 ## explicit; go 1.23 github.com/skycoin/dmsg/internal/servermetrics github.com/skycoin/dmsg/pkg/direct @@ -504,7 +504,7 @@ github.com/skycoin/skycoin/src/cipher/ripemd160 github.com/skycoin/skycoin/src/cipher/secp256k1-go github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2 github.com/skycoin/skycoin/src/util/logging -# github.com/skycoin/skywire v1.3.29-rc1.0.20241217192205-cb65518c5522 +# github.com/skycoin/skywire v1.3.29-rc1.0.20241217211947-72c9d0b82083 ## explicit; go 1.23 github.com/skycoin/skywire github.com/skycoin/skywire/cmd/setup-node/commands