Merge pull request #1626 from jdknives/master

Vendor dmsg@master and replace two yamux deps

cmd/skywire-cli/commands/completion/completion.go

@@ -13,7 +13,7 @@ var RootCmd = &cobra.Command{
 	Short:                 "Generate completion script",
 	DisableFlagsInUseLine: true,
 	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-	Args:                  cobra.ExactValidArgs(1),
+	Args:                  cobra.MatchAll(cobra.ExactArgs(1)),
 	Run: func(cmd *cobra.Command, args []string) {
 		switch args[0] {
 		case "bash":

go.mod

@@ -3,122 +3,137 @@ module github.com/skycoin/skywire
 go 1.18
 
 require (
-	github.com/AudriusButkevicius/pfilter v0.0.0-20210515103320-4b4b86609d51
-	github.com/VictoriaMetrics/metrics v1.18.1
+	github.com/AudriusButkevicius/pfilter v0.0.11
+	github.com/VictoriaMetrics/metrics v1.24.0
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/ccding/go-stun/stun v0.0.0-20200514191101-4dc67bcdb029
-	github.com/gen2brain/dlgs v0.0.0-20210911090025-cbd38e821b98
-	github.com/google/uuid v1.1.2
+	github.com/gen2brain/dlgs v0.0.0-20220603100644-40c77870fa8d
+	github.com/google/uuid v1.3.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/hashicorp/yamux v0.1.1
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/reedsolomon v1.9.9 // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2
-	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/klauspost/reedsolomon v1.11.7 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.3
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
-	github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061 // indirect
-	github.com/shirou/gopsutil/v3 v3.21.4
-	github.com/sirupsen/logrus v1.8.1
+	github.com/shirou/gopsutil/v3 v3.23.5
+	github.com/sirupsen/logrus v1.9.3
 	github.com/skycoin/skycoin v0.27.1
 	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
-	github.com/spf13/cobra v1.5.0
-	github.com/stretchr/testify v1.8.3
+	github.com/spf13/cobra v1.7.0
+	github.com/stretchr/testify v1.8.4
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
 	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
 	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
-	github.com/tjfoc/gmsm v1.4.0 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/toqueteos/webbrowser v1.2.0
 	github.com/xtaci/kcp-go v5.4.20+incompatible
-	go.etcd.io/bbolt v1.3.6
-	golang.org/x/net v0.10.0
-	golang.org/x/sys v0.8.0
-	golang.org/x/term v0.8.0 // indirect
-	golang.org/x/tools v0.9.3 // indirect
-	golang.zx2c4.com/wireguard v0.0.0-20211012180210-dfd688b6aa7b
-	nhooyr.io/websocket v1.8.2 // indirect
+	go.etcd.io/bbolt v1.3.7
+	golang.org/x/net v0.11.0
+	golang.org/x/sys v0.9.0
+	golang.org/x/term v0.9.0 // indirect
+	golang.org/x/tools v0.10.0 // indirect
+	golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b
+	nhooyr.io/websocket v1.8.7 // indirect
 )
 
 require (
-	github.com/bitfield/script v0.19.0
+	github.com/bitfield/script v0.22.0
 	github.com/blang/semver/v4 v4.0.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-chi/chi/v5 v5.0.8-0.20220103230436-7dbe9a0bd10f
-	github.com/gocarina/gocsv v0.0.0-20220927221512-ad3251f9fa25
+	github.com/go-chi/chi/v5 v5.0.8
+	github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
 	github.com/hashicorp/go-version v1.6.0
 	github.com/ivanpirog/coloredcobra v1.0.1
-	github.com/james-barrow/golang-ipc v0.0.0-20210227130457-95e7cc81f5e2
-	github.com/jaypipes/ghw v0.10.0
-	github.com/lib/pq v1.10.7
+	github.com/james-barrow/golang-ipc v1.1.0
+	github.com/jaypipes/ghw v0.11.0
+	github.com/lib/pq v1.10.9
 	github.com/orandin/lumberjackrus v1.0.1
-	github.com/pterm/pterm v0.12.49
-	github.com/skycoin/dmsg v1.3.11
-	github.com/skycoin/skywire-utilities v0.0.0-20230609191923-1e678802e17e
+	github.com/pterm/pterm v0.12.62
+	github.com/skycoin/dmsg v1.3.0-rc1.0.20230619181939-277586bbacd7
+	github.com/skycoin/skywire-utilities v0.0.0-20230601232053-0abbc9604fbc
 	github.com/skycoin/systray v1.10.0
 	github.com/spf13/pflag v1.0.5
-	github.com/zcalusic/sysinfo v0.9.5
-	golang.org/x/sync v0.2.0
+	github.com/zcalusic/sysinfo v1.0.0
+	golang.org/x/sync v0.3.0
 )
 
 require (
-	atomicgo.dev/cursor v0.1.1 // indirect
-	atomicgo.dev/keyboard v0.2.8 // indirect
-	bitbucket.org/creachadair/shell v0.0.7 // indirect
+	atomicgo.dev/cursor v0.1.2 // indirect
+	atomicgo.dev/keyboard v0.2.9 // indirect
+	atomicgo.dev/schedule v0.0.2 // indirect
 	github.com/ActiveState/termtest/conpty v0.5.0 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/containerd/console v1.0.3 // indirect
-	github.com/creack/pty v1.1.15 // indirect
+	github.com/creack/pty v1.1.18 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.13.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.14.1 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/gookit/color v1.5.2 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
+	github.com/gookit/color v1.5.3 // indirect
+	github.com/gopherjs/gopherjs v1.17.2 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/itchyny/gojq v0.12.12 // indirect
+	github.com/itchyny/timefmt-go v0.1.5 // indirect
 	github.com/jaypipes/pcidb v1.0.0 // indirect
-	github.com/klauspost/compress v1.11.0 // indirect
-	github.com/klauspost/cpuid v1.2.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/compress v1.16.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/lithammer/fuzzysearch v1.1.5 // indirect
+	github.com/lithammer/fuzzysearch v1.1.8 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/onsi/ginkgo/v2 v2.2.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
+	github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
+	github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
+	github.com/quic-go/quic-go v0.32.0 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.4 // indirect
-	github.com/tklauser/numcpus v0.2.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/valyala/fastrand v1.1.0 // indirect
 	github.com/valyala/histogram v1.2.0 // indirect
-	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/crypto v0.10.0 // indirect
+	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
+	golang.org/x/mod v0.11.0 // indirect
+	golang.org/x/text v0.10.0 // indirect
+	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v1.0.0 // indirect
+	mvdan.cc/sh/v3 v3.6.0 // indirect
 )
 
 // Uncomment for tests with alternate branches of 'dmsg'