update vendor deps (#1913)

* update vendor deps

* update makefile and readme

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;

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/)

go.mod

@@ -34,10 +34,10 @@ require (
 	github.com/pterm/pterm v0.12.79
 	github.com/robert-nix/ansihtml v1.0.1
 	github.com/sirupsen/logrus v1.9.3
-	github.com/skycoin/dmsg v1.3.29-0.20241019182716-022283c93835
+	github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670
 	github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f
-	github.com/skycoin/skycoin-service-discovery v1.3.29-0.20241019190420-233c2d68bce0
-	github.com/skycoin/skywire-services v1.3.29-0.20241105123837-b4869a32c8db
+	github.com/skycoin/skycoin-service-discovery v1.3.29-0.20241217194518-634b05d94b2e
+	github.com/skycoin/skywire-services v1.3.29-0.20241217194941-6269f3c618c3
 	github.com/skycoin/systray v1.10.0
 	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
 	github.com/spf13/cobra v1.8.1
@@ -140,7 +140,6 @@ require (
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
-	github.com/skycoin/skywire-utilities v1.3.25 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.7.0 // indirect
@@ -186,16 +185,18 @@ require (
 //replace github.com/skycoin/dmsg => ../dmsg
 //replace github.com/skycoin/skywire-services => ../skywire-services
 //replace github.com/skycoin/skycoin-service-discovery => ../skycoin-service-discovery
-//replace github.com/skycoin/skywire-utilities => ../skywire-utilities
 
-// Uncomment to update other skywire deps to specific commit hash.
+// To update other skywire deps to specific commit hash:
 // run `go mod tidy ; go mod vendor`
 // copy the changed line to the correct place in the above
 // then, re-comment the line before saving.
+// replace github.com/skycoin/skycoin => github.com/skycoin/skycoin <commit-hash>
 // replace github.com/skycoin/dmsg => github.com/skycoin/dmsg <commit-hash>
 // replace github.com/skycoin/skywire-services => github.com/skycoin/skywire-services <commit-hash>
-//replace github.com/skycoin/skywire-services => github.com/skycoin/skywire-services <commit-hash>
-// replace github.com/skycoin/skycoin => github.com/skycoin/skycoin <commit-hash>
-
 // replace github.com/skycoin/skycoin-service-discovery => github.com/skycoin/skycoin-service-discovery <commit-hash>
-// replace github.com/skycoin/skywire-utilities => github.com/skycoin/skywire-utilities <commit-hash>
+
+// Below should reflect the current versions of the following deps
+// replace github.com/skycoin/skycoin => github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f
+// replace github.com/skycoin/dmsg => github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670
+// replace github.com/skycoin/skywire-services => github.com/skycoin/skywire-services v1.3.29-0.20241217194941-6269f3c618c3
+// replace github.com/skycoin/skycoin-service-discovery => github.com/skycoin/skycoin-service-discovery v1.3.29-0.20241217194518-634b05d94b2e

go.sum

@@ -629,20 +629,18 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
 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.20241019182716-022283c93835 h1:29jU+cxqQGJCWoxGsrgk3nIF+JDipvJsQU89x6FKSZw=
-github.com/skycoin/dmsg v1.3.29-0.20241019182716-022283c93835/go.mod h1:hFJtHnX+pDC6v5Z81QPbpVktMMfMNzL/kgcZmCKu3Bg=
+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/encodertest v0.0.0-20190217072920-14c2e31898b9 h1:DElGw1Fhj4amuW1KM5q8Xowosb3RiOQce0lDJw0Qv0Y=
 github.com/skycoin/encodertest v0.0.0-20190217072920-14c2e31898b9/go.mod h1:OQz8NXVJUWEw7PWYASZ/1BIw5GXgVMTGvrCGDlZa9+k=
 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/skycoin-service-discovery v1.3.29-0.20241019190420-233c2d68bce0 h1:2F9JSOHefkyTLsREj8bMMXk1z13fJhnVa0R/XCxbUwM=
-github.com/skycoin/skycoin-service-discovery v1.3.29-0.20241019190420-233c2d68bce0/go.mod h1:3/WomvXyOLcjEMV4GiLv8b+bueohWa9ceoNwtQSB9KI=
-github.com/skycoin/skywire-services v1.3.29-0.20241105123837-b4869a32c8db h1:Uo9I2qYuM4njAS8ZFNKprUlaFx78S8Fz62OkLVXKRns=
-github.com/skycoin/skywire-services v1.3.29-0.20241105123837-b4869a32c8db/go.mod h1:Q3s3Ea+tcT3M4zkMT89ywk5NmLCdXZWHRsPhNBEo7Zw=
-github.com/skycoin/skywire-utilities v1.3.25 h1:mk8dUonFdhVopFF3d9wbOyXXoiuAO+mN1y+ve6SzgX4=
-github.com/skycoin/skywire-utilities v1.3.25/go.mod h1:yFKWpL1bDRPKU3uK+cTF4PnYUMe+eyIj5N2bk4sF5Cw=
+github.com/skycoin/skycoin-service-discovery v1.3.29-0.20241217194518-634b05d94b2e h1:0IknW9LPP0Ct7aIzG3K9mR90txhe4KkNLrO6AaIgkU4=
+github.com/skycoin/skycoin-service-discovery v1.3.29-0.20241217194518-634b05d94b2e/go.mod h1:nRAM1h+k3TPe22Ga5wwKqM2ZLzoYuobD9K+f5GT6aEM=
+github.com/skycoin/skywire-services v1.3.29-0.20241217194941-6269f3c618c3 h1:p+0xzdepWJw0yzsj0XHGpuQV1ooscGUjDm5wRuC3Q6o=
+github.com/skycoin/skywire-services v1.3.29-0.20241217194941-6269f3c618c3/go.mod h1:AxxX+4dxIU/NGNFFzi5z4dXGEADlVEb0FXJdLKEp5QY=
 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=