From 7c5b7c5f612f115b3f0daa6f324994dda74ca57b Mon Sep 17 00:00:00 2001 From: Moses Narrow Date: Tue, 17 Dec 2024 13:47:01 -0600 Subject: [PATCH] replace github.com/skycoin/skywire-utilities import & update vendor deps --- Makefile | 2 +- cmd/address-resolver/commands/root.go | 16 +- cmd/config-bootstrapper/commands/root.go | 10 +- cmd/keys-gen/commands/root.go | 4 +- cmd/network-monitor/commands/root.go | 14 +- cmd/node-visualizer/commands/root.go | 8 +- cmd/public-visor-monitor/commands/root.go | 10 +- cmd/route-finder/commands/root.go | 14 +- .../skysocks-lite-client.go | 6 +- cmd/skysocks-monitor/commands/root.go | 10 +- cmd/skywire-services/commands/root.go | 2 +- cmd/sw-env/commands/root.go | 2 +- cmd/tpd-monitor/commands/root.go | 10 +- cmd/transport-discovery/commands/root.go | 16 +- cmd/transport-setup/commands/root.go | 6 +- cmd/uptime-tracker/commands/root.go | 18 +- cmd/visor-map/commands/root.go | 4 +- cmd/vpn-lite-client/vpn-lite-client.go | 2 +- cmd/vpn-monitor/commands/root.go | 10 +- go.mod | 17 +- go.sum | 57 +-- internal/armetrics/victoria_metrics.go | 2 +- internal/config/env.go | 2 +- internal/config/skywire.go | 2 +- internal/config/visors.go | 2 +- internal/integration/ci_test.go | 2 +- internal/integration/env_test.go | 2 +- internal/lc/data.go | 2 +- internal/nmmetrics/victoria_metrics.go | 2 +- internal/tpdiscmetrics/victoria_metrics.go | 2 +- internal/utmetrics/victoria_metrics.go | 2 +- internal/vpn/client.go | 4 +- internal/vpn/client_config.go | 2 +- pkg/address-resolver/api/api.go | 16 +- pkg/address-resolver/store/address_test.go | 2 +- pkg/address-resolver/store/memory_store.go | 2 +- .../store/memory_store_test.go | 4 +- pkg/address-resolver/store/redis_store.go | 6 +- .../store/redis_store_test.go | 4 +- pkg/address-resolver/store/store.go | 6 +- pkg/config-bootstrapper/api/api.go | 8 +- pkg/network-monitor/api/api.go | 12 +- pkg/network-monitor/store/memory_store.go | 2 +- pkg/network-monitor/store/redis_store.go | 2 +- pkg/network-monitor/store/redis_store_test.go | 2 +- pkg/network-monitor/store/store.go | 4 +- pkg/node-visualizer/api/api.go | 8 +- pkg/public-visor-monitor/api/api.go | 10 +- pkg/route-finder/api/api.go | 8 +- pkg/route-finder/store/dijkstra.go | 2 +- pkg/route-finder/store/graph_test.go | 2 +- pkg/route-finder/store/mark_and_sweep.go | 2 +- pkg/skysocks-monitor/api/api.go | 10 +- pkg/tpd-monitor/api/api.go | 10 +- pkg/transport-discovery/api/api.go | 12 +- pkg/transport-discovery/api/api_test.go | 8 +- pkg/transport-discovery/api/endpoints.go | 8 +- pkg/transport-discovery/store/memory_store.go | 2 +- .../store/memory_store_test.go | 2 +- .../store/postgres_store.go | 4 +- pkg/transport-discovery/store/store.go | 4 +- .../store/transport_test.go | 2 +- pkg/transport-setup/api/api.go | 4 +- pkg/transport-setup/api/endpoints.go | 2 +- pkg/transport-setup/api/utils.go | 4 +- pkg/transport-setup/config/config.go | 4 +- pkg/uptime-tracker/api/api.go | 16 +- pkg/uptime-tracker/api/api_test.go | 8 +- pkg/uptime-tracker/store/memory_store.go | 2 +- pkg/uptime-tracker/store/memory_store_test.go | 4 +- pkg/uptime-tracker/store/postgres_store.go | 4 +- pkg/uptime-tracker/store/store.go | 4 +- pkg/uptime-tracker/store/visors_response.go | 4 +- pkg/vpn-monitor/api/api.go | 10 +- vendor/github.com/fatih/color/README.md | 23 +- vendor/github.com/fatih/color/color.go | 32 +- .../servermetrics/victoria_metrics.go | 2 +- .../skycoin/dmsg/pkg/direct/client.go | 4 +- .../skycoin/dmsg/pkg/direct/direct.go | 4 +- .../skycoin/dmsg/pkg/direct/entries.go | 2 +- .../skycoin/dmsg/pkg/disc/client.go | 4 +- .../github.com/skycoin/dmsg/pkg/disc/entry.go | 2 +- .../skycoin/dmsg/pkg/disc/testing.go | 2 +- .../skycoin/dmsg/pkg/dmsg/client.go | 6 +- .../skycoin/dmsg/pkg/dmsg/client_session.go | 4 +- .../skycoin/dmsg/pkg/dmsg/entity_common.go | 6 +- .../skycoin/dmsg/pkg/dmsg/listener.go | 2 +- .../skycoin/dmsg/pkg/dmsg/server.go | 6 +- .../skycoin/dmsg/pkg/dmsg/server_session.go | 2 +- .../skycoin/dmsg/pkg/dmsg/session_common.go | 2 +- .../skycoin/dmsg/pkg/dmsg/stream.go | 2 +- .../github.com/skycoin/dmsg/pkg/dmsg/types.go | 2 +- .../skycoin/dmsg/pkg/dmsgcurl/dmsgcurl.go | 4 +- .../skycoin/dmsg/pkg/dmsgcurl/flags.go | 2 +- .../skycoin/dmsg/pkg/dmsghttp/http.go | 4 +- .../skycoin/dmsg/pkg/dmsghttp/util.go | 2 +- .../skycoin/dmsg/pkg/dmsgpty/cli.go | 4 +- .../skycoin/dmsg/pkg/dmsgpty/host.go | 4 +- .../skycoin/dmsg/pkg/dmsgpty/pty_client.go | 4 +- .../github.com/skycoin/dmsg/pkg/dmsgpty/ui.go | 4 +- .../skycoin/dmsg/pkg/dmsgpty/whitelist.go | 2 +- .../dmsg/pkg/dmsgpty/whitelist_client.go | 2 +- .../dmsg/pkg/dmsgpty/whitelist_gateway.go | 2 +- .../skycoin/dmsg/pkg/dmsgserver/config.go | 2 +- .../skycoin/dmsg/pkg/ioutil/logging.go | 2 +- .../github.com/skycoin/dmsg/pkg/noise/net.go | 2 +- .../skycoin/dmsg/pkg/noise/noise.go | 4 +- .../skycoin/dmsg/pkg/noise/read_writer.go | 2 +- .../skycoin/src/cipher/base58/base58_old.go | 6 +- .../skycoin/skycoin/src/cipher/crypto.go | 2 +- .../secp256k1-go/secp256k1-go2/secp256k1.go | 4 +- .../cipher/secp256k1-go/secp256k1-go2/xy.go | 2 +- .../pkg/buildinfo/buildinfo.go | 53 --- .../github.com/skycoin/skywire/.golangci.yml | 3 + .../github.com/skycoin/skywire/CHANGELOG.md | 15 + vendor/github.com/skycoin/skywire/Makefile | 27 +- vendor/github.com/skycoin/skywire/arches.json | 1 + .../skywire/cmd/setup-node/commands/root.go | 8 +- .../skywire/internal/httpauth/client.go | 4 +- .../skywire/internal/httpauth/nonce.go | 2 +- .../internal/packetfilter/address-filter.go | 2 +- .../internal/packetfilter/kcp-filter.go | 2 +- .../skycoin/skywire/internal/vpn/client.go | 7 +- .../skywire/internal/vpn/client_config.go | 2 +- .../skycoin/skywire/internal/vpn/env.go | 2 +- .../skycoin/skywire/internal/vpn/server.go | 2 +- .../internal/vpn/subnet_ip_incrementer.go | 3 + .../skycoin/skywire/mainnet_rules.md | 341 +++++++----------- .../skywire/pkg/app/appcommon/hello.go | 2 +- .../skywire/pkg/app/appcommon/log_store.go | 2 +- .../skywire/pkg/app/appcommon/proc_config.go | 2 +- .../skywire/pkg/app/appdisc/factory.go | 4 +- .../skywire/pkg/app/appevent/broadcaster.go | 2 +- .../skycoin/skywire/pkg/app/appevent/rpc.go | 2 +- .../skycoin/skywire/pkg/app/appnet/addr.go | 2 +- .../skywire/pkg/app/appnet/dmsg_networker.go | 2 +- .../skywire/pkg/app/appnet/forwarding.go | 2 +- .../skywire/pkg/app/appnet/http_transport.go | 2 +- .../skywire/pkg/app/appnet/mock_networker.go | 2 +- .../skywire/pkg/app/appnet/networker.go | 2 +- .../pkg/app/appnet/skywire_networker.go | 4 +- .../skycoin/skywire/pkg/app/appserver/proc.go | 3 +- .../skywire/pkg/app/appserver/proc_manager.go | 4 +- .../pkg/app/appserver/rpc_ingress_gateway.go | 2 +- .../skywire/pkg/app/launcher/launcher.go | 2 +- .../skycoin/skywire/pkg/dmsgc/dmsgc.go | 4 +- .../pkg/routefinder/rfclient/client.go | 2 +- .../skywire/pkg/router/dmsg_wrapper.go | 2 +- .../skycoin/skywire/pkg/router/id_reserver.go | 2 +- .../skycoin/skywire/pkg/router/map.go | 2 +- .../skywire/pkg/router/mock_id_reserver.go | 2 +- .../pkg/router/mock_route_group_dialer.go | 4 +- .../skycoin/skywire/pkg/router/mock_router.go | 2 +- .../skywire/pkg/router/network_stats.go | 2 +- .../skycoin/skywire/pkg/router/route_group.go | 14 +- .../skycoin/skywire/pkg/router/router.go | 14 +- .../skywire/pkg/router/routerclient.go | 4 +- .../skycoin/skywire/pkg/router/rpc_gateway.go | 2 +- .../skywire/pkg/router/setup_rpc_gateway.go | 4 +- .../skycoin/skywire/pkg/router/setupclient.go | 4 +- .../skycoin/skywire/pkg/router/setupconfig.go | 2 +- .../router/setupmetrics/victoria_metrics.go | 2 +- .../skycoin/skywire/pkg/router/setupnode.go | 4 +- .../skycoin/skywire/pkg/router/wrappers.go | 4 +- .../skycoin/skywire/pkg/routing/addr.go | 2 +- .../skycoin/skywire/pkg/routing/packet.go | 10 +- .../skycoin/skywire/pkg/routing/route.go | 2 +- .../skywire/pkg/routing/route_descriptor.go | 2 +- .../skycoin/skywire/pkg/routing/rule.go | 6 +- .../skycoin/skywire/pkg/routing/table.go | 4 +- .../skywire/pkg/servicedisc/autoconnect.go | 6 +- .../skycoin/skywire/pkg/servicedisc/client.go | 8 +- .../skycoin/skywire/pkg/servicedisc/types.go | 4 +- .../skycoin/skywire/pkg/skyenv/skyenv.go | 181 +++++++--- .../pkg/buildinfo/buildinfo.go | 81 +++++ .../skywire-utilities/pkg/cipher/cipher.go | 0 .../pkg/cipher/utils_pubkey.go | 0 .../skywire-utilities/pkg/cmdutil/catch.go | 0 .../skywire-utilities/pkg/cmdutil/cmd_name.go | 0 .../pkg/cmdutil/service_flags.go | 2 +- .../pkg/cmdutil/signal_context.go | 0 .../pkg/cmdutil/signal_unix.go | 0 .../pkg/cmdutil/signal_windows.go | 0 .../pkg/cmdutil/sysloghook_unix.go | 2 +- .../pkg/cmdutil/sysloghook_windows.go | 2 +- .../pkg}/skywire-utilities/pkg/geo/geo.go | 5 +- .../skywire-utilities/pkg/httpauth/auth.go | 2 +- .../skywire-utilities/pkg/httpauth/handler.go | 8 +- .../pkg/httpauth/memory_store.go | 2 +- .../pkg/httpauth/nonce-storer.go | 4 +- .../pkg/httpauth/redis-store.go | 6 +- .../pkg/httputil/dmsghttp.go | 0 .../skywire-utilities/pkg/httputil/error.go | 0 .../skywire-utilities/pkg/httputil/health.go | 2 +- .../pkg/httputil/httputil.go | 2 +- .../skywire-utilities/pkg/httputil/log.go | 0 .../pkg/logging/formatter.go | 0 .../skywire-utilities/pkg/logging/hooks.go | 0 .../skywire-utilities/pkg/logging/logger.go | 0 .../skywire-utilities/pkg/logging/logging.go | 0 .../skywire-utilities/pkg/metricsutil/http.go | 2 +- .../request_duration_middleware.go | 0 .../requests_in_flight_count_middleware.go | 0 .../pkg/metricsutil/status_response_writer.go | 4 +- .../victoria_metrics_int_gauge_wrapper.go | 0 .../victoria_metrics_uint_gauge_wrapper.go | 0 .../skywire-utilities/pkg/netutil/copy.go | 0 .../pkg}/skywire-utilities/pkg/netutil/net.go | 4 +- .../pkg/netutil/net_darwin.go | 0 .../pkg/netutil/net_linux.go | 0 .../pkg/netutil/net_windows.go | 0 .../skywire-utilities/pkg/netutil/porter.go | 0 .../skywire-utilities/pkg/netutil/retrier.go | 0 .../pkg/networkmonitor/networkmonitor.go | 0 .../skywire-utilities/pkg/skyenv/values.go | 0 .../pkg/storeconfig/storeconfig.go | 4 +- .../skywire-utilities/pkg/tcpproxy/http.go | 0 .../skywire/pkg/transport/discovery.go | 2 +- .../skycoin/skywire/pkg/transport/entry.go | 2 +- .../skywire/pkg/transport/handshake.go | 8 +- .../skycoin/skywire/pkg/transport/log.go | 2 +- .../pkg/transport/managed_transport.go | 12 +- .../skycoin/skywire/pkg/transport/manager.go | 4 +- .../transport/network/addrresolver/client.go | 6 +- .../network/addrresolver/mock_api_client.go | 2 +- .../skywire/pkg/transport/network/client.go | 4 +- .../pkg/transport/network/connection.go | 4 +- .../skywire/pkg/transport/network/dmsg.go | 2 +- .../transport/network/handshake/handshake.go | 3 +- .../skywire/pkg/transport/network/listener.go | 2 +- .../pkg/transport/network/mock_dialer.go | 2 +- .../skywire/pkg/transport/network/network.go | 2 +- .../skywire/pkg/transport/network/stcp.go | 2 +- .../pkg/transport/network/stcp/pktable.go | 2 +- .../skywire/pkg/transport/network/stcpr.go | 4 +- .../pkg/transport/network/stun_client.go | 2 +- .../skywire/pkg/transport/network/sudph.go | 2 +- .../skywire/pkg/transport/setup/rpc.go | 4 +- .../skywire/pkg/transport/setup/visor.go | 4 +- .../skywire/pkg/transport/tpdclient/client.go | 6 +- .../skywire/pkg/transport/transport.go | 2 +- .../skycoin/skywire/pkg/utclient/client.go | 6 +- .../skywire/pkg/util/cipherutil/cipherutil.go | 2 +- .../pkg/util/osutil/privileges_windows.go | 2 +- .../skywire/pkg/util/pathutil/configpath.go | 2 +- .../skycoin/skywire/pkg/visor/api.go | 22 +- .../skycoin/skywire/pkg/visor/cmd.go | 8 +- .../pkg/visor/dmsgtracker/dmsg_tracker.go | 4 +- .../skycoin/skywire/pkg/visor/etc.go | 4 +- .../skycoin/skywire/pkg/visor/gui.go | 4 +- .../skycoin/skywire/pkg/visor/hypervisor.go | 14 +- .../skycoin/skywire/pkg/visor/init.go | 15 +- .../skywire/pkg/visor/logserver/api.go | 8 +- .../skywire/pkg/visor/logstore/logstore.go | 6 +- .../skycoin/skywire/pkg/visor/ping.go | 2 +- .../skycoin/skywire/pkg/visor/rpc.go | 2 +- .../skycoin/skywire/pkg/visor/rpc_client.go | 6 +- .../skywire/pkg/visor/rpc_client_serve.go | 2 +- .../skycoin/skywire/pkg/visor/survey.go | 2 +- .../skywire/pkg/visor/usermanager/user.go | 2 +- .../pkg/visor/usermanager/user_manager.go | 4 +- .../skycoin/skywire/pkg/visor/visor.go | 6 +- .../skywire/pkg/visor/visorconfig/common.go | 4 +- .../skywire/pkg/visor/visorconfig/config.go | 7 +- .../pkg/visor/visorconfig/hypervisorconfig.go | 2 +- .../skywire/pkg/visor/visorconfig/parse.go | 4 +- .../skywire/pkg/visor/visorconfig/services.go | 4 +- .../skywire/pkg/visor/visorconfig/v1.go | 12 +- .../skywire/pkg/visor/visorconfig/values.go | 194 +++++++--- .../pkg/visor/visorconfig/values_darwin.go | 95 ++++- .../pkg/visor/visorconfig/values_linux.go | 20 +- .../pkg/visor/visorconfig/values_windows.go | 124 ++++++- .../skywire/pkg/visor/visorinit/module.go | 2 +- .../skywire/pkg/visor/withoutsystray.go | 2 +- vendor/github.com/skycoin/skywire/skywire.go | 28 +- vendor/modules.txt | 46 ++- 276 files changed, 1374 insertions(+), 987 deletions(-) delete mode 100644 vendor/github.com/skycoin/skywire-utilities/pkg/buildinfo/buildinfo.go create mode 100644 vendor/github.com/skycoin/skywire/arches.json create mode 100644 vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo/buildinfo.go rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cipher/cipher.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cipher/utils_pubkey.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/catch.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/cmd_name.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/service_flags.go (98%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/signal_context.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/signal_unix.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/signal_windows.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/sysloghook_unix.go (95%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/cmdutil/sysloghook_windows.go (92%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/geo/geo.go (94%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httpauth/auth.go (97%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httpauth/handler.go (95%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httpauth/memory_store.go (93%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httpauth/nonce-storer.go (91%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httpauth/redis-store.go (93%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httputil/dmsghttp.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httputil/error.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httputil/health.go (94%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httputil/httputil.go (97%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/httputil/log.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/logging/formatter.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/logging/hooks.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/logging/logger.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/logging/logging.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/metricsutil/http.go (92%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/metricsutil/request_duration_middleware.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/metricsutil/requests_in_flight_count_middleware.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/metricsutil/status_response_writer.go (97%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/metricsutil/victoria_metrics_int_gauge_wrapper.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/metricsutil/victoria_metrics_uint_gauge_wrapper.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/netutil/copy.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/netutil/net.go (97%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/netutil/net_darwin.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/netutil/net_linux.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/netutil/net_windows.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/netutil/porter.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/netutil/retrier.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/networkmonitor/networkmonitor.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/skyenv/values.go (100%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/storeconfig/storeconfig.go (98%) rename vendor/github.com/skycoin/{ => skywire/pkg}/skywire-utilities/pkg/tcpproxy/http.go (100%) diff --git a/Makefile b/Makefile index 67e17640..22e3409f 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ifneq (,$(findstring 64,$(GOARCH))) endif PROJECT_BASE := github.com/skycoin/skywire-services -SKYWIRE_UTILITIES_REPO := github.com/skycoin/skywire-utilities +SKYWIRE_UTILITIES_REPO := github.com/skycoin/skywire/pkg/skywire-utilities BUILDINFO_PATH := $(SKYWIRE_UTILITIES_REPO)/pkg/buildinfo BUILDINFO_VERSION := -X $(BUILDINFO_PATH).version=$(VERSION) diff --git a/cmd/address-resolver/commands/root.go b/cmd/address-resolver/commands/root.go index dea96d2a..662a9368 100644 --- a/cmd/address-resolver/commands/root.go +++ b/cmd/address-resolver/commands/root.go @@ -13,14 +13,14 @@ import ( "github.com/skycoin/dmsg/pkg/direct" "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsghttp" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "github.com/xtaci/kcp-go" diff --git a/cmd/config-bootstrapper/commands/root.go b/cmd/config-bootstrapper/commands/root.go index bf43495b..0dedad5c 100644 --- a/cmd/config-bootstrapper/commands/root.go +++ b/cmd/config-bootstrapper/commands/root.go @@ -14,11 +14,11 @@ import ( "github.com/skycoin/dmsg/pkg/direct" "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsghttp" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "github.com/skycoin/skywire-services/pkg/config-bootstrapper/api" diff --git a/cmd/keys-gen/commands/root.go b/cmd/keys-gen/commands/root.go index c03e1249..30a6f2cb 100644 --- a/cmd/keys-gen/commands/root.go +++ b/cmd/keys-gen/commands/root.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/spf13/cobra" ) diff --git a/cmd/network-monitor/commands/root.go b/cmd/network-monitor/commands/root.go index 385fc8bd..71c206c3 100644 --- a/cmd/network-monitor/commands/root.go +++ b/cmd/network-monitor/commands/root.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "github.com/skycoin/skywire-services/internal/nmmetrics" diff --git a/cmd/node-visualizer/commands/root.go b/cmd/node-visualizer/commands/root.go index dfff85cc..a7d5374b 100644 --- a/cmd/node-visualizer/commands/root.go +++ b/cmd/node-visualizer/commands/root.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" "github.com/spf13/cobra" "github.com/skycoin/skywire-services/internal/tpdiscmetrics" diff --git a/cmd/public-visor-monitor/commands/root.go b/cmd/public-visor-monitor/commands/root.go index 06eb9db1..6231f8e6 100644 --- a/cmd/public-visor-monitor/commands/root.go +++ b/cmd/public-visor-monitor/commands/root.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "github.com/skycoin/skywire-services/pkg/public-visor-monitor/api" diff --git a/cmd/route-finder/commands/root.go b/cmd/route-finder/commands/root.go index 669f7aae..66fd9e0b 100644 --- a/cmd/route-finder/commands/root.go +++ b/cmd/route-finder/commands/root.go @@ -13,13 +13,13 @@ import ( "github.com/skycoin/dmsg/pkg/direct" "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsghttp" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "gorm.io/gorm" diff --git a/cmd/skysocks-lite-client/skysocks-lite-client.go b/cmd/skysocks-lite-client/skysocks-lite-client.go index 6b044503..3ffa94b4 100644 --- a/cmd/skysocks-lite-client/skysocks-lite-client.go +++ b/cmd/skysocks-lite-client/skysocks-lite-client.go @@ -11,13 +11,13 @@ import ( "os" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/visor/visorconfig" "github.com/skycoin/skywire-services/internal/skysocks" diff --git a/cmd/skysocks-monitor/commands/root.go b/cmd/skysocks-monitor/commands/root.go index 9ad25519..8507530f 100644 --- a/cmd/skysocks-monitor/commands/root.go +++ b/cmd/skysocks-monitor/commands/root.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "github.com/skycoin/skywire-services/pkg/skysocks-monitor/api" diff --git a/cmd/skywire-services/commands/root.go b/cmd/skywire-services/commands/root.go index 580d85f5..0233fbdd 100644 --- a/cmd/skywire-services/commands/root.go +++ b/cmd/skywire-services/commands/root.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" "github.com/spf13/cobra" ar "github.com/skycoin/skywire-services/cmd/address-resolver/commands" diff --git a/cmd/sw-env/commands/root.go b/cmd/sw-env/commands/root.go index f9283b36..756cfd95 100644 --- a/cmd/sw-env/commands/root.go +++ b/cmd/sw-env/commands/root.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" "github.com/spf13/cobra" cfg "github.com/skycoin/skywire-services/internal/config" diff --git a/cmd/tpd-monitor/commands/root.go b/cmd/tpd-monitor/commands/root.go index f495d153..6db74b6d 100644 --- a/cmd/tpd-monitor/commands/root.go +++ b/cmd/tpd-monitor/commands/root.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "github.com/skycoin/skywire-services/pkg/tpd-monitor/api" diff --git a/cmd/transport-discovery/commands/root.go b/cmd/transport-discovery/commands/root.go index 68152474..553d6dff 100644 --- a/cmd/transport-discovery/commands/root.go +++ b/cmd/transport-discovery/commands/root.go @@ -15,14 +15,14 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsghttp" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "gorm.io/gorm" diff --git a/cmd/transport-setup/commands/root.go b/cmd/transport-setup/commands/root.go index d22716a0..45431659 100644 --- a/cmd/transport-setup/commands/root.go +++ b/cmd/transport-setup/commands/root.go @@ -13,9 +13,9 @@ import ( "github.com/bitfield/script" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/spf13/cobra" "github.com/tidwall/pretty" diff --git a/cmd/uptime-tracker/commands/root.go b/cmd/uptime-tracker/commands/root.go index 6fb3cbff..3e320791 100644 --- a/cmd/uptime-tracker/commands/root.go +++ b/cmd/uptime-tracker/commands/root.go @@ -13,15 +13,15 @@ import ( "github.com/skycoin/dmsg/pkg/direct" "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsghttp" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/geo" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "gorm.io/gorm" diff --git a/cmd/visor-map/commands/root.go b/cmd/visor-map/commands/root.go index d45ac81e..79fab930 100644 --- a/cmd/visor-map/commands/root.go +++ b/cmd/visor-map/commands/root.go @@ -15,8 +15,8 @@ import ( sm "github.com/flopp/go-staticmaps" "github.com/golang/geo/s2" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/spf13/cobra" ) diff --git a/cmd/vpn-lite-client/vpn-lite-client.go b/cmd/vpn-lite-client/vpn-lite-client.go index 0c0a4529..c77ce877 100644 --- a/cmd/vpn-lite-client/vpn-lite-client.go +++ b/cmd/vpn-lite-client/vpn-lite-client.go @@ -9,10 +9,10 @@ import ( "os/signal" "syscall" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-services/internal/vpn" ) diff --git a/cmd/vpn-monitor/commands/root.go b/cmd/vpn-monitor/commands/root.go index 42ebcb86..428c8188 100644 --- a/cmd/vpn-monitor/commands/root.go +++ b/cmd/vpn-monitor/commands/root.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/tcpproxy" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy" "github.com/spf13/cobra" "github.com/skycoin/skywire-services/pkg/vpn-monitor/api" diff --git a/go.mod b/go.mod index e21d6197..e8747930 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/skycoin/skywire-services -go 1.22.0 +go 1.23 -toolchain go1.23.1 +toolchain go1.23.4 require ( github.com/bitfield/script v0.23.0 @@ -23,9 +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.20241019182716-022283c93835 - github.com/skycoin/skywire v1.3.28 - github.com/skycoin/skywire-utilities v1.3.25 + github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670 + github.com/skycoin/skywire v1.3.29-rc1.0.20241217192205-cb65518c5522 github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 @@ -55,14 +54,14 @@ require ( github.com/cloudwego/iasm v0.2.0 // indirect github.com/coder/websocket v1.8.12 // indirect github.com/creack/pty v1.1.23 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/fatih/color v1.17.0 // indirect + github.com/fatih/color v1.18.0 // indirect github.com/flopp/go-coordsparser v0.0.0-20240403152942-4891dc40d0a7 // indirect github.com/fogleman/gg v1.3.0 // indirect github.com/gabriel-vasile/mimetype v1.4.6 // indirect @@ -115,10 +114,10 @@ require ( github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pires/go-proxyproto v0.8.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/quic-go/quic-go v0.48.0 // indirect github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 // indirect - github.com/skycoin/skycoin v0.28.0 // indirect + github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f // indirect github.com/skycoin/systray v1.10.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.2 // indirect diff --git a/go.sum b/go.sum index 32649720..d4f975d0 100644 --- a/go.sum +++ b/go.sum @@ -16,14 +16,11 @@ github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDO github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VictoriaMetrics/metrics v1.35.1 h1:o84wtBKQbzLdDy14XeskkCZih6anG+veZ1SwJHFGwrU= github.com/VictoriaMetrics/metrics v1.35.1/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/bitfield/script v0.23.0 h1:N0R5yLEl6wJIS9PR/A6xXwjMsplMubyxdi05N5l0X28= github.com/bitfield/script v0.23.0/go.mod h1:fv+6x4OzVsRs6qAlc7wiGq8fq1b5orhtQdtW0dwjUHI= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU= github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= @@ -31,7 +28,6 @@ github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/ccding/go-stun/stun v0.0.0-20200514191101-4dc67bcdb029 h1:POmUHfxXdeyM8Aomg4tKDcwATCFuW+cYLkj6pwsw9pc= github.com/ccding/go-stun/stun v0.0.0-20200514191101-4dc67bcdb029/go.mod h1:Rpr5n9cGHYdM3S3IK8ROSUUUYjQOu+MSUCZDcJbYWi8= -github.com/cenkalti/backoff v1.1.0/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -57,8 +53,9 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0= github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgraph-io/badger/v3 v3.2103.2 h1:dpyM5eCJAtQCBcMCZcT4UBZchuTJgCywerHHgmxfxM8= github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M= github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= @@ -83,8 +80,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= -github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/flopp/go-coordsparser v0.0.0-20240403152942-4891dc40d0a7 h1:ZYEbOgGPFGLZwkLxRjV9zxZAIR1lExrNfFnObG/peek= github.com/flopp/go-coordsparser v0.0.0-20240403152942-4891dc40d0a7/go.mod h1:7y/2PxXfR1mGtIQFNtFE1daHIka2e8J480Bsm+MiCpk= github.com/flopp/go-staticmaps v0.0.0-20240606055734-0bdd9c1c1478 h1:rKlN4NCEUFdQ+pFGHchbZmRarzflkKtupcmqbxZNOZY= @@ -92,8 +89,8 @@ github.com/flopp/go-staticmaps v0.0.0-20240606055734-0bdd9c1c1478/go.mod h1:Rr7/ github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/gen2brain/dlgs v0.0.0-20220603100644-40c77870fa8d h1:dHYKX8CBAs1zSGXm3q3M15CLAEwPEkwrK1ed8FCo+Xo= @@ -235,8 +232,6 @@ github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZY github.com/klauspost/reedsolomon v1.12.4 h1:5aDr3ZGoJbgu/8+j45KtUJxzYm8k08JGtB9Wx1VQ4OA= github.com/klauspost/reedsolomon v1.12.4/go.mod h1:d3CzOMOt0JXGIFZm1StgkyF14EYr3xneR2rNWo7NcMU= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= -github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -249,11 +244,9 @@ github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjS github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -261,12 +254,10 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mazznoer/csscolorparser v0.1.5 h1:Wr4uNIE+pHWN3TqZn2SGpA2nLRG064gB7WdSfSS5cz4= github.com/mazznoer/csscolorparser v0.1.5/go.mod h1:OQRVvgCyHDCAquR1YWfSwwaDcM0LhnSffGnlbOew/3I= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= @@ -292,35 +283,29 @@ github.com/pires/go-proxyproto v0.8.0 h1:5unRmEAPbHXHuLjDg01CxJWf91cw3lKHc/0xzKp github.com/pires/go-proxyproto v0.8.0/go.mod h1:iknsfgnH8EkjrMeMyvfKByp9TiBZCKZM0jx2xmKqnVY= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/quic-go/quic-go v0.48.0 h1:2TCyvBrMu1Z25rvIAlnp2dPT4lgh/uTqLqiXVpp5AeU= github.com/quic-go/quic-go v0.48.0/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/sirupsen/logrus v1.1.1/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A= 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/encodertest v0.0.0-20190217072920-14c2e31898b9/go.mod h1:OQz8NXVJUWEw7PWYASZ/1BIw5GXgVMTGvrCGDlZa9+k= +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/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.0 h1:0TN2tsU8CbCnGANKKxMr4jcG8RuBa8hWREeYtjDDtlk= -github.com/skycoin/skycoin v0.28.0/go.mod h1:E9RvlMn8iQGX/upaIQvkHHcw/180JBqAQbRIzkLrkSQ= -github.com/skycoin/skywire v1.3.28 h1:CWg/GE2WV68TvPoIn2edqdq/pfu3a96hJF12ofNKb8U= -github.com/skycoin/skywire v1.3.28/go.mod h1:zmOIJReAmueQ6HHp6SbwCSWCS/CXBLpJN2LcWgnXsFI= -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 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/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= @@ -329,22 +314,17 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= @@ -370,7 +350,6 @@ github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/tkrajina/gpxgo v1.4.0 h1:cSD5uSwy3VZuNFieTEZLyRnuIwhonQEkGPkPGW4XNag= github.com/tkrajina/gpxgo v1.4.0/go.mod h1:BXSMfUAvKiEhMEXAFM2NvNsbjsSvp394mOvdcNjettg= -github.com/toqueteos/webbrowser v1.1.0/go.mod h1:Hqqqmzj8AHn+VlZyVjaRWY20i25hoOZGAABCcg2el4A= github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ= github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -378,7 +357,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8= github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ= github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ= @@ -402,8 +380,6 @@ go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -429,7 +405,6 @@ golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -458,9 +433,6 @@ golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181023152157-44b849a8bc13/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -556,7 +528,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/armetrics/victoria_metrics.go b/internal/armetrics/victoria_metrics.go index 30e53c1f..1d206291 100644 --- a/internal/armetrics/victoria_metrics.go +++ b/internal/armetrics/victoria_metrics.go @@ -1,7 +1,7 @@ package armetrics import ( - "github.com/skycoin/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`. diff --git a/internal/config/env.go b/internal/config/env.go index 5a6cd38d..4f468a85 100644 --- a/internal/config/env.go +++ b/internal/config/env.go @@ -4,7 +4,7 @@ import ( "encoding/json" "log" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // EnvConfig defines configuration of skywire environment diff --git a/internal/config/skywire.go b/internal/config/skywire.go index dc4c1728..a9c3c5fd 100644 --- a/internal/config/skywire.go +++ b/internal/config/skywire.go @@ -2,9 +2,9 @@ package config import ( msg "github.com/skycoin/dmsg/pkg/dmsgserver" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/dmsgc" "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/internal/config/visors.go b/internal/config/visors.go index 240de998..63b76d61 100644 --- a/internal/config/visors.go +++ b/internal/config/visors.go @@ -6,9 +6,9 @@ import ( "log" "text/template" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/dmsgc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/internal/integration/ci_test.go b/internal/integration/ci_test.go index 6735de63..d22adc79 100644 --- a/internal/integration/ci_test.go +++ b/internal/integration/ci_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/docker/docker/api/types/swarm" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" "github.com/stretchr/testify/require" ) diff --git a/internal/integration/env_test.go b/internal/integration/env_test.go index fc2cc615..15354664 100644 --- a/internal/integration/env_test.go +++ b/internal/integration/env_test.go @@ -20,10 +20,10 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" skyvisor "github.com/skycoin/skywire/pkg/visor" "github.com/stretchr/testify/require" diff --git a/internal/lc/data.go b/internal/lc/data.go index 0854f69e..edfa79b4 100644 --- a/internal/lc/data.go +++ b/internal/lc/data.go @@ -2,7 +2,7 @@ package lc import ( - "github.com/skycoin/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" ) // ServiceSummary summary of a visor connection diff --git a/internal/nmmetrics/victoria_metrics.go b/internal/nmmetrics/victoria_metrics.go index 65fc7eb5..1aea9727 100644 --- a/internal/nmmetrics/victoria_metrics.go +++ b/internal/nmmetrics/victoria_metrics.go @@ -1,7 +1,7 @@ package nmmetrics import ( - "github.com/skycoin/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`. diff --git a/internal/tpdiscmetrics/victoria_metrics.go b/internal/tpdiscmetrics/victoria_metrics.go index 265aae14..25285a81 100644 --- a/internal/tpdiscmetrics/victoria_metrics.go +++ b/internal/tpdiscmetrics/victoria_metrics.go @@ -3,7 +3,7 @@ package tpdiscmetrics import ( "sync" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/internal/utmetrics/victoria_metrics.go b/internal/utmetrics/victoria_metrics.go index 76e9dae3..32c799a7 100644 --- a/internal/utmetrics/victoria_metrics.go +++ b/internal/utmetrics/victoria_metrics.go @@ -1,7 +1,7 @@ package utmetrics import ( - "github.com/skycoin/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`. diff --git a/internal/vpn/client.go b/internal/vpn/client.go index ffe41f66..a216312a 100644 --- a/internal/vpn/client.go +++ b/internal/vpn/client.go @@ -13,13 +13,13 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/util/osutil" ) diff --git a/internal/vpn/client_config.go b/internal/vpn/client_config.go index 5ae334d2..c8eda908 100644 --- a/internal/vpn/client_config.go +++ b/internal/vpn/client_config.go @@ -1,7 +1,7 @@ package vpn import ( - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // ClientConfig is a configuration for VPN client. diff --git a/pkg/address-resolver/api/api.go b/pkg/address-resolver/api/api.go index 7c56f1d6..4a4916dc 100644 --- a/pkg/address-resolver/api/api.go +++ b/pkg/address-resolver/api/api.go @@ -16,14 +16,14 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/netutil" - "github.com/skycoin/skywire-utilities/pkg/networkmonitor" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/networkmonitor" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" "github.com/skycoin/skywire/pkg/transport/network/handshake" diff --git a/pkg/address-resolver/store/address_test.go b/pkg/address-resolver/store/address_test.go index 1846f491..2940205c 100644 --- a/pkg/address-resolver/store/address_test.go +++ b/pkg/address-resolver/store/address_test.go @@ -8,7 +8,7 @@ import ( "context" "testing" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" "github.com/stretchr/testify/require" diff --git a/pkg/address-resolver/store/memory_store.go b/pkg/address-resolver/store/memory_store.go index c4145e37..2dbb1acd 100644 --- a/pkg/address-resolver/store/memory_store.go +++ b/pkg/address-resolver/store/memory_store.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" ) diff --git a/pkg/address-resolver/store/memory_store_test.go b/pkg/address-resolver/store/memory_store_test.go index 120643c4..aa73dbd7 100644 --- a/pkg/address-resolver/store/memory_store_test.go +++ b/pkg/address-resolver/store/memory_store_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) diff --git a/pkg/address-resolver/store/redis_store.go b/pkg/address-resolver/store/redis_store.go index 71d68f3a..d609e0cb 100644 --- a/pkg/address-resolver/store/redis_store.go +++ b/pkg/address-resolver/store/redis_store.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/go-redis/redis/v8" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" ) diff --git a/pkg/address-resolver/store/redis_store_test.go b/pkg/address-resolver/store/redis_store_test.go index 2d441578..1720c36e 100644 --- a/pkg/address-resolver/store/redis_store_test.go +++ b/pkg/address-resolver/store/redis_store_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/go-redis/redis" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) diff --git a/pkg/address-resolver/store/store.go b/pkg/address-resolver/store/store.go index 4e8f587c..cccc7a69 100644 --- a/pkg/address-resolver/store/store.go +++ b/pkg/address-resolver/store/store.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" ) diff --git a/pkg/config-bootstrapper/api/api.go b/pkg/config-bootstrapper/api/api.go index 9851c15a..ebcd13fc 100644 --- a/pkg/config-bootstrapper/api/api.go +++ b/pkg/config-bootstrapper/api/api.go @@ -14,10 +14,10 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/pkg/network-monitor/api/api.go b/pkg/network-monitor/api/api.go index f337fa26..572a3f9d 100644 --- a/pkg/network-monitor/api/api.go +++ b/pkg/network-monitor/api/api.go @@ -16,13 +16,13 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - utilenv "github.com/skycoin/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + utilenv "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor" "github.com/skycoin/skywire/pkg/visor/visorconfig" diff --git a/pkg/network-monitor/store/memory_store.go b/pkg/network-monitor/store/memory_store.go index a94fb184..a013dd52 100644 --- a/pkg/network-monitor/store/memory_store.go +++ b/pkg/network-monitor/store/memory_store.go @@ -6,7 +6,7 @@ import ( "errors" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-services/internal/nm" ) diff --git a/pkg/network-monitor/store/redis_store.go b/pkg/network-monitor/store/redis_store.go index 06a4197f..6c4e405c 100644 --- a/pkg/network-monitor/store/redis_store.go +++ b/pkg/network-monitor/store/redis_store.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/go-redis/redis" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire-services/internal/nm" ) diff --git a/pkg/network-monitor/store/redis_store_test.go b/pkg/network-monitor/store/redis_store_test.go index 3824f395..ec29bf31 100644 --- a/pkg/network-monitor/store/redis_store_test.go +++ b/pkg/network-monitor/store/redis_store_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/stretchr/testify/require" "github.com/skycoin/skywire-services/internal/nm" diff --git a/pkg/network-monitor/store/store.go b/pkg/network-monitor/store/store.go index b53fee1a..30747607 100644 --- a/pkg/network-monitor/store/store.go +++ b/pkg/network-monitor/store/store.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" "github.com/skycoin/skywire-services/internal/nm" ) diff --git a/pkg/node-visualizer/api/api.go b/pkg/node-visualizer/api/api.go index 8bd07f39..21c8ab60 100644 --- a/pkg/node-visualizer/api/api.go +++ b/pkg/node-visualizer/api/api.go @@ -19,10 +19,10 @@ import ( json "github.com/json-iterator/go" "github.com/rs/cors" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire-services/internal/tpdiscmetrics" diff --git a/pkg/public-visor-monitor/api/api.go b/pkg/public-visor-monitor/api/api.go index d13fc526..086b85cd 100644 --- a/pkg/public-visor-monitor/api/api.go +++ b/pkg/public-visor-monitor/api/api.go @@ -14,13 +14,13 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - utilenv "github.com/skycoin/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + utilenv "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor" "github.com/skycoin/skywire/pkg/visor/visorconfig" diff --git a/pkg/route-finder/api/api.go b/pkg/route-finder/api/api.go index 0ade0a80..9095b3ce 100644 --- a/pkg/route-finder/api/api.go +++ b/pkg/route-finder/api/api.go @@ -10,12 +10,12 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire/pkg/routefinder/rfclient" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" routeFinder "github.com/skycoin/skywire-services/pkg/route-finder/store" "github.com/skycoin/skywire-services/pkg/transport-discovery/store" diff --git a/pkg/route-finder/store/dijkstra.go b/pkg/route-finder/store/dijkstra.go index 6775d358..0ab4e60c 100644 --- a/pkg/route-finder/store/dijkstra.go +++ b/pkg/route-finder/store/dijkstra.go @@ -7,8 +7,8 @@ import ( "errors" "sort" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // package level errors diff --git a/pkg/route-finder/store/graph_test.go b/pkg/route-finder/store/graph_test.go index 78f354f0..8a936c70 100644 --- a/pkg/route-finder/store/graph_test.go +++ b/pkg/route-finder/store/graph_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/stretchr/testify/require" diff --git a/pkg/route-finder/store/mark_and_sweep.go b/pkg/route-finder/store/mark_and_sweep.go index f72645f0..8253a986 100644 --- a/pkg/route-finder/store/mark_and_sweep.go +++ b/pkg/route-finder/store/mark_and_sweep.go @@ -3,7 +3,7 @@ package store import ( "context" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire-services/pkg/transport-discovery/store" diff --git a/pkg/skysocks-monitor/api/api.go b/pkg/skysocks-monitor/api/api.go index 88ae6813..f56b8b5e 100644 --- a/pkg/skysocks-monitor/api/api.go +++ b/pkg/skysocks-monitor/api/api.go @@ -16,14 +16,14 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - utilenv "github.com/skycoin/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + utilenv "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor" "github.com/skycoin/skywire/pkg/visor/visorconfig" diff --git a/pkg/tpd-monitor/api/api.go b/pkg/tpd-monitor/api/api.go index 60fce30b..93d49c69 100644 --- a/pkg/tpd-monitor/api/api.go +++ b/pkg/tpd-monitor/api/api.go @@ -16,12 +16,12 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - utilenv "github.com/skycoin/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + utilenv "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor" diff --git a/pkg/transport-discovery/api/api.go b/pkg/transport-discovery/api/api.go index 74cff6ee..b5e423e1 100644 --- a/pkg/transport-discovery/api/api.go +++ b/pkg/transport-discovery/api/api.go @@ -11,12 +11,12 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/networkmonitor" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/networkmonitor" "github.com/skycoin/skywire-services/internal/tpdiscmetrics" "github.com/skycoin/skywire-services/pkg/transport-discovery/store" diff --git a/pkg/transport-discovery/api/api_test.go b/pkg/transport-discovery/api/api_test.go index ee729db3..af09f2c5 100644 --- a/pkg/transport-discovery/api/api_test.go +++ b/pkg/transport-discovery/api/api_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" "github.com/skycoin/skywire/pkg/transport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transport-discovery/api/endpoints.go b/pkg/transport-discovery/api/endpoints.go index b6432316..b722190d 100644 --- a/pkg/transport-discovery/api/endpoints.go +++ b/pkg/transport-discovery/api/endpoints.go @@ -9,10 +9,10 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire-services/pkg/transport-discovery/store" diff --git a/pkg/transport-discovery/store/memory_store.go b/pkg/transport-discovery/store/memory_store.go index 57dee61a..9dd82159 100644 --- a/pkg/transport-discovery/store/memory_store.go +++ b/pkg/transport-discovery/store/memory_store.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/pkg/transport-discovery/store/memory_store_test.go b/pkg/transport-discovery/store/memory_store_test.go index 833e7335..9f04d8ec 100644 --- a/pkg/transport-discovery/store/memory_store_test.go +++ b/pkg/transport-discovery/store/memory_store_test.go @@ -6,7 +6,7 @@ package store import ( "testing" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "gorm.io/gorm" diff --git a/pkg/transport-discovery/store/postgres_store.go b/pkg/transport-discovery/store/postgres_store.go index 10d00d85..7d0fae7c 100644 --- a/pkg/transport-discovery/store/postgres_store.go +++ b/pkg/transport-discovery/store/postgres_store.go @@ -5,8 +5,8 @@ import ( "time" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "gorm.io/gorm" diff --git a/pkg/transport-discovery/store/store.go b/pkg/transport-discovery/store/store.go index 925b1b6a..c4402e1e 100644 --- a/pkg/transport-discovery/store/store.go +++ b/pkg/transport-discovery/store/store.go @@ -5,8 +5,8 @@ import ( "errors" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "gorm.io/gorm" diff --git a/pkg/transport-discovery/store/transport_test.go b/pkg/transport-discovery/store/transport_test.go index 68d0e6a6..c16e915d 100644 --- a/pkg/transport-discovery/store/transport_test.go +++ b/pkg/transport-discovery/store/transport_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transport-setup/api/api.go b/pkg/transport-setup/api/api.go index eb89a18e..978f9061 100644 --- a/pkg/transport-setup/api/api.go +++ b/pkg/transport-setup/api/api.go @@ -9,8 +9,8 @@ import ( "github.com/go-playground/validator/v10" "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire-services/pkg/transport-setup/config" ) diff --git a/pkg/transport-setup/api/endpoints.go b/pkg/transport-setup/api/endpoints.go index 01f5c047..9204a500 100644 --- a/pkg/transport-setup/api/endpoints.go +++ b/pkg/transport-setup/api/endpoints.go @@ -7,7 +7,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/setup" ) diff --git a/pkg/transport-setup/api/utils.go b/pkg/transport-setup/api/utils.go index 0a678e05..a6d77bd5 100644 --- a/pkg/transport-setup/api/utils.go +++ b/pkg/transport-setup/api/utils.go @@ -11,9 +11,9 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" ) // visor RPC helpers diff --git a/pkg/transport-setup/config/config.go b/pkg/transport-setup/config/config.go index 3ef0584c..e8dc3eed 100644 --- a/pkg/transport-setup/config/config.go +++ b/pkg/transport-setup/config/config.go @@ -6,9 +6,9 @@ import ( "io" "os" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/dmsgc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Config defines configuration for transport setup diff --git a/pkg/uptime-tracker/api/api.go b/pkg/uptime-tracker/api/api.go index c0b88829..79c20bae 100644 --- a/pkg/uptime-tracker/api/api.go +++ b/pkg/uptime-tracker/api/api.go @@ -21,14 +21,14 @@ import ( "github.com/go-echarts/go-echarts/v2/charts" "github.com/go-echarts/go-echarts/v2/opts" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/geo" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire-services/internal/utmetrics" "github.com/skycoin/skywire-services/pkg/uptime-tracker/store" diff --git a/pkg/uptime-tracker/api/api_test.go b/pkg/uptime-tracker/api/api_test.go index 77615d5a..ca2476ee 100644 --- a/pkg/uptime-tracker/api/api_test.go +++ b/pkg/uptime-tracker/api/api_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/geo" - "github.com/skycoin/skywire-utilities/pkg/httpauth" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/uptime-tracker/store/memory_store.go b/pkg/uptime-tracker/store/memory_store.go index e0430d33..e1870700 100644 --- a/pkg/uptime-tracker/store/memory_store.go +++ b/pkg/uptime-tracker/store/memory_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" ) type memStore struct { diff --git a/pkg/uptime-tracker/store/memory_store_test.go b/pkg/uptime-tracker/store/memory_store_test.go index 1fb482ac..22bf6588 100644 --- a/pkg/uptime-tracker/store/memory_store_test.go +++ b/pkg/uptime-tracker/store/memory_store_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" "github.com/stretchr/testify/require" ) diff --git a/pkg/uptime-tracker/store/postgres_store.go b/pkg/uptime-tracker/store/postgres_store.go index a94f589b..a5203c41 100644 --- a/pkg/uptime-tracker/store/postgres_store.go +++ b/pkg/uptime-tracker/store/postgres_store.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/geo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "gorm.io/gorm" ) diff --git a/pkg/uptime-tracker/store/store.go b/pkg/uptime-tracker/store/store.go index 5ab10e75..12706154 100644 --- a/pkg/uptime-tracker/store/store.go +++ b/pkg/uptime-tracker/store/store.go @@ -3,8 +3,8 @@ package store import ( "time" - "github.com/skycoin/skywire-utilities/pkg/geo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "gorm.io/gorm" ) diff --git a/pkg/uptime-tracker/store/visors_response.go b/pkg/uptime-tracker/store/visors_response.go index c1624405..2ff6c5f8 100644 --- a/pkg/uptime-tracker/store/visors_response.go +++ b/pkg/uptime-tracker/store/visors_response.go @@ -4,8 +4,8 @@ import ( "math" "net" - "github.com/skycoin/skywire-utilities/pkg/geo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var log = logging.MustGetLogger("uptime_store") diff --git a/pkg/vpn-monitor/api/api.go b/pkg/vpn-monitor/api/api.go index 95039d2d..c4b70fde 100644 --- a/pkg/vpn-monitor/api/api.go +++ b/pkg/vpn-monitor/api/api.go @@ -16,14 +16,14 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - utilenv "github.com/skycoin/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + utilenv "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor" "github.com/skycoin/skywire/pkg/visor/visorconfig" diff --git a/vendor/github.com/fatih/color/README.md b/vendor/github.com/fatih/color/README.md index be82827c..d135bfe0 100644 --- a/vendor/github.com/fatih/color/README.md +++ b/vendor/github.com/fatih/color/README.md @@ -9,7 +9,7 @@ suits you. ## Install -```bash +``` go get github.com/fatih/color ``` @@ -30,6 +30,18 @@ color.Magenta("And many others ..") ``` +### RGB colors + +If your terminal supports 24-bit colors, you can use RGB color codes. + +```go +color.RGB(255, 128, 0).Println("foreground orange") +color.RGB(230, 42, 42).Println("foreground red") + +color.BgRGB(255, 128, 0).Println("background orange") +color.BgRGB(230, 42, 42).Println("background red") +``` + ### Mix and reuse colors ```go @@ -49,6 +61,11 @@ boldRed.Println("This will print text in bold red.") whiteBackground := red.Add(color.BgWhite) whiteBackground.Println("Red text with white background.") + +// Mix with RGB color codes +color.RGB(255, 128, 0).AddBgRGB(0, 0, 0).Println("orange with black background") + +color.BgRGB(255, 128, 0).AddRGB(255, 255, 255).Println("orange background with white foreground") ``` ### Use your own output (io.Writer) @@ -161,10 +178,6 @@ c.Println("This prints again cyan...") To output color in GitHub Actions (or other CI systems that support ANSI colors), make sure to set `color.NoColor = false` so that it bypasses the check for non-tty output streams. -## Todo - -* Save/Return previous values -* Evaluate fmt.Formatter interface ## Credits diff --git a/vendor/github.com/fatih/color/color.go b/vendor/github.com/fatih/color/color.go index 81094e87..ee39b408 100644 --- a/vendor/github.com/fatih/color/color.go +++ b/vendor/github.com/fatih/color/color.go @@ -98,6 +98,9 @@ const ( FgMagenta FgCyan FgWhite + + // used internally for 256 and 24-bit coloring + foreground ) // Foreground Hi-Intensity text colors @@ -122,6 +125,9 @@ const ( BgMagenta BgCyan BgWhite + + // used internally for 256 and 24-bit coloring + background ) // Background Hi-Intensity text colors @@ -150,6 +156,30 @@ func New(value ...Attribute) *Color { return c } +// RGB returns a new foreground color in 24-bit RGB. +func RGB(r, g, b int) *Color { + return New(foreground, 2, Attribute(r), Attribute(g), Attribute(b)) +} + +// BgRGB returns a new background color in 24-bit RGB. +func BgRGB(r, g, b int) *Color { + return New(background, 2, Attribute(r), Attribute(g), Attribute(b)) +} + +// AddRGB is used to chain foreground RGB SGR parameters. Use as many as parameters to combine +// and create custom color objects. Example: .Add(34, 0, 12).Add(255, 128, 0). +func (c *Color) AddRGB(r, g, b int) *Color { + c.params = append(c.params, foreground, 2, Attribute(r), Attribute(g), Attribute(b)) + return c +} + +// AddRGB is used to chain background RGB SGR parameters. Use as many as parameters to combine +// and create custom color objects. Example: .Add(34, 0, 12).Add(255, 128, 0). +func (c *Color) AddBgRGB(r, g, b int) *Color { + c.params = append(c.params, background, 2, Attribute(r), Attribute(g), Attribute(b)) + return c +} + // Set sets the given parameters immediately. It will change the color of // output with the given SGR parameters until color.Unset() is called. func Set(p ...Attribute) *Color { @@ -401,7 +431,7 @@ func (c *Color) format() string { func (c *Color) unformat() string { //return fmt.Sprintf("%s[%dm", escape, Reset) - //for each element in sequence let's use the speficic reset escape, ou the generic one if not found + //for each element in sequence let's use the specific reset escape, or the generic one if not found format := make([]string, len(c.params)) for i, v := range c.params { format[i] = strconv.Itoa(int(Reset)) diff --git a/vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go b/vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go index 900acedf..b02f8673 100644 --- a/vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go +++ b/vendor/github.com/skycoin/dmsg/internal/servermetrics/victoria_metrics.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/VictoriaMetrics/metrics" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`. diff --git a/vendor/github.com/skycoin/dmsg/pkg/direct/client.go b/vendor/github.com/skycoin/dmsg/pkg/direct/client.go index 2939b7ed..9e878426 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/direct/client.go +++ b/vendor/github.com/skycoin/dmsg/pkg/direct/client.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/dmsg/pkg/disc" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go b/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go index 3c1310ba..ba8f7bcf 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go +++ b/vendor/github.com/skycoin/dmsg/pkg/direct/direct.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/dmsg/pkg/disc" dmsg "github.com/skycoin/dmsg/pkg/dmsg" diff --git a/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go b/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go index 1f146d1d..407f5521 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go +++ b/vendor/github.com/skycoin/dmsg/pkg/direct/entries.go @@ -2,7 +2,7 @@ package direct import ( - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/dmsg/pkg/disc" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/disc/client.go b/vendor/github.com/skycoin/dmsg/pkg/disc/client.go index a74be3be..5403d7bb 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/disc/client.go +++ b/vendor/github.com/skycoin/dmsg/pkg/disc/client.go @@ -11,8 +11,8 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var json = jsoniter.ConfigFastest diff --git a/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go b/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go index 365b270c..705b4b37 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go +++ b/vendor/github.com/skycoin/dmsg/pkg/disc/entry.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/vendor/github.com/skycoin/dmsg/pkg/disc/testing.go b/vendor/github.com/skycoin/dmsg/pkg/disc/testing.go index 9ced8bd5..d1e3e2b1 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/disc/testing.go +++ b/vendor/github.com/skycoin/dmsg/pkg/disc/testing.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockClient is an APIClient mock. The mock doesn't reply with the same errors as the diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go index 9b3fd8c9..99271f72 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/dmsg/pkg/disc" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go index ba3cfff3..3a4f2eda 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/client_session.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/yamux" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // ClientSession represents a session from the perspective of a dmsg client. diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go index 4779984e..fe1ff56b 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/entity_common.go @@ -9,9 +9,9 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/dmsg/pkg/disc" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/listener.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/listener.go index 292d37d2..24d01ce7 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/listener.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/listener.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // Listener listens for remote-initiated streams. diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go index 9c8c461d..77105b83 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/dmsg/internal/servermetrics" "github.com/skycoin/dmsg/pkg/disc" diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/server_session.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server_session.go index 4b8376ee..e92aa28b 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/server_session.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/server_session.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/yamux" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/dmsg/internal/servermetrics" "github.com/skycoin/dmsg/pkg/noise" diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/session_common.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/session_common.go index d38afd1a..69903a10 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/session_common.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/session_common.go @@ -12,7 +12,7 @@ import ( "github.com/chen3feng/safecast" "github.com/hashicorp/yamux" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/dmsg/pkg/noise" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/stream.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/stream.go index 6bc61f1a..69f1dfed 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/stream.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/stream.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/yamux" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/dmsg/pkg/noise" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsg/types.go b/vendor/github.com/skycoin/dmsg/pkg/dmsg/types.go index 9fbb2ca3..d98ed291 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsg/types.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsg/types.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/dmsgcurl.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/dmsgcurl.go index 5a32d63f..785c471d 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/dmsgcurl.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/dmsgcurl.go @@ -14,8 +14,8 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/dmsg/pkg/disc" dmsg "github.com/skycoin/dmsg/pkg/dmsg" diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/flags.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/flags.go index 4a5264c6..79849aff 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/flags.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgcurl/flags.go @@ -6,7 +6,7 @@ import ( "flag" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" ) // ExecName contains the execution name. diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http.go b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http.go index 95ed68a6..40f93f2c 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/http.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/dmsg/pkg/disc" dmsg "github.com/skycoin/dmsg/pkg/dmsg" diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go index a3ac740f..e3565bfe 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli.go index eb9ca022..cba70222 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/cli.go @@ -12,8 +12,8 @@ import ( "syscall" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // CLI connects with and has ownership over a dmsgpty.Host. diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host.go index 7ebaa920..7e583a84 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/host.go @@ -13,8 +13,8 @@ import ( "sync/atomic" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" dmsg "github.com/skycoin/dmsg/pkg/dmsg" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client.go index d6e10063..058c757a 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/pty_client.go @@ -8,8 +8,8 @@ import ( "sync" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // PtyClient represents the client end of a dmsgpty session. diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui.go index ba30e1ad..42a0b1b6 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/ui.go @@ -14,8 +14,8 @@ import ( "github.com/coder/websocket" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist.go index a944d23b..a8bcfb4f 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist.go @@ -12,7 +12,7 @@ import ( "sync" jsoniter "github.com/json-iterator/go" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_client.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_client.go index 7a7382e0..47b12416 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_client.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_client.go @@ -5,7 +5,7 @@ import ( "io" "net/rpc" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // WhitelistClient interacts with a whitelist's API. diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_gateway.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_gateway.go index 0bd73546..b3c5527c 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_gateway.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgpty/whitelist_gateway.go @@ -2,7 +2,7 @@ package dmsgpty import ( - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // WhitelistGateway is the configuration gateway. diff --git a/vendor/github.com/skycoin/dmsg/pkg/dmsgserver/config.go b/vendor/github.com/skycoin/dmsg/pkg/dmsgserver/config.go index 396c6258..e6daff4b 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/dmsgserver/config.go +++ b/vendor/github.com/skycoin/dmsg/pkg/dmsgserver/config.go @@ -7,7 +7,7 @@ import ( "time" "github.com/skycoin/skycoin/src/util/logging" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/dmsg/pkg/dmsg" ) diff --git a/vendor/github.com/skycoin/dmsg/pkg/ioutil/logging.go b/vendor/github.com/skycoin/dmsg/pkg/ioutil/logging.go index c6235e46..36c4ce39 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/ioutil/logging.go +++ b/vendor/github.com/skycoin/dmsg/pkg/ioutil/logging.go @@ -2,7 +2,7 @@ package ioutil import ( - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var log = logging.MustGetLogger("ioutil") diff --git a/vendor/github.com/skycoin/dmsg/pkg/noise/net.go b/vendor/github.com/skycoin/dmsg/pkg/noise/net.go index 87f2561c..4080fa0e 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/noise/net.go +++ b/vendor/github.com/skycoin/dmsg/pkg/noise/net.go @@ -9,7 +9,7 @@ import ( "time" "github.com/skycoin/noise" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/vendor/github.com/skycoin/dmsg/pkg/noise/noise.go b/vendor/github.com/skycoin/dmsg/pkg/noise/noise.go index aa35d668..66550f73 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/noise/noise.go +++ b/vendor/github.com/skycoin/dmsg/pkg/noise/noise.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/skycoin/noise" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var noiseLogger = logging.MustGetLogger("noise") diff --git a/vendor/github.com/skycoin/dmsg/pkg/noise/read_writer.go b/vendor/github.com/skycoin/dmsg/pkg/noise/read_writer.go index a393266a..c728eef6 100644 --- a/vendor/github.com/skycoin/dmsg/pkg/noise/read_writer.go +++ b/vendor/github.com/skycoin/dmsg/pkg/noise/read_writer.go @@ -12,7 +12,7 @@ import ( "time" "github.com/chen3feng/safecast" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/dmsg/pkg/ioutil" ) diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/base58/base58_old.go b/vendor/github.com/skycoin/skycoin/src/cipher/base58/base58_old.go index ffa4bca5..cd051e0f 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/base58/base58_old.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/base58/base58_old.go @@ -11,7 +11,7 @@ import ( "math/big" ) -//alphabet used by Bitcoins +// alphabet used by Bitcoins var alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz" var ( @@ -26,7 +26,7 @@ var ( // oldBase58 type to hold the oldBase58 string type oldBase58 string -//reverse alphabet used for quckly converting base58 strings into numbers +// reverse alphabet used for quckly converting base58 strings into numbers var revalp = map[string]int{ "1": 0, "2": 1, "3": 2, "4": 3, "5": 4, "6": 5, "7": 6, "8": 7, "9": 8, "A": 9, "B": 10, "C": 11, "D": 12, "E": 13, "F": 14, "G": 15, "H": 16, "J": 17, "K": 18, "L": 19, @@ -76,7 +76,7 @@ func (b oldBase58) ToInt() (int, error) { return answer, nil } -//ToHex converts base58 to hex bytes +// ToHex converts base58 to hex bytes func (b oldBase58) ToHex() ([]byte, error) { value, err := b.ToBig() //convert to big.Int if err != nil { diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go b/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go index 53bce1fe..60c24fa9 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/crypto.go @@ -270,7 +270,7 @@ func (sk SecKey) Null() bool { return sk == SecKey{} } -//ECDH generates a shared secret +// ECDH generates a shared secret // A: pub1,sec1 // B: pub2,sec2 // person A sends their public key pub1 diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/secp256k1.go b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/secp256k1.go index 1cbb4ae3..db8f044e 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/secp256k1.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/secp256k1.go @@ -22,8 +22,8 @@ func initConstants() { 0xBA, 0xAE, 0xDC, 0xE6, 0xAF, 0x48, 0xA0, 0x3B, 0xBF, 0xD2, 0x5E, 0x8C, 0xD0, 0x36, 0x41, 0x41}) TheCurve.halfOrder.SetBytes([]byte{ - 0X7F, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, - 0X5D, 0X57, 0X6E, 0X73, 0X57, 0XA4, 0X50, 0X1D, 0XDF, 0XE9, 0X2F, 0X46, 0X68, 0X1B, 0X20, 0XA0}) + 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x5D, 0x57, 0x6E, 0x73, 0x57, 0xA4, 0x50, 0x1D, 0xDF, 0xE9, 0x2F, 0x46, 0x68, 0x1B, 0x20, 0xA0}) TheCurve.p.SetBytes([]byte{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, diff --git a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/xy.go b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/xy.go index a6f9d6c8..afdd64ef 100644 --- a/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/xy.go +++ b/vendor/github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2/xy.go @@ -86,7 +86,7 @@ func (xy XY) Bytes() []byte { } // BytesUncompressed returns serialized key in uncompressed format "<04> " -//65 bytes +// 65 bytes func (xy *XY) BytesUncompressed() (raw []byte) { xy.X.Normalize() // See https://github.com/piotrnar/gocoin/issues/15 xy.Y.Normalize() // See https://github.com/piotrnar/gocoin/issues/15 diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/buildinfo/buildinfo.go b/vendor/github.com/skycoin/skywire-utilities/pkg/buildinfo/buildinfo.go deleted file mode 100644 index 4c4ade60..00000000 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/buildinfo/buildinfo.go +++ /dev/null @@ -1,53 +0,0 @@ -// Package buildinfo pkg/buildinfo/buildinfo.go -package buildinfo - -import ( - "fmt" - "io" -) - -const unknown = "unknown" - -var ( - version = unknown - commit = unknown - date = unknown -) - -// Version returns version from git describe. -func Version() string { - return version -} - -// Commit returns commit hash. -func Commit() string { - return commit -} - -// Date returns date of build in RFC3339 format. -func Date() string { - return date -} - -// Get returns build info summary. -func Get() *Info { - return &Info{ - Version: Version(), - Commit: Commit(), - Date: Date(), - } -} - -// Info is build info summary. -type Info struct { - Version string `json:"version"` - Commit string `json:"commit"` - Date string `json:"date"` -} - -// WriteTo writes build info summary to io.Writer. -func (info *Info) WriteTo(w io.Writer) (int64, error) { - msg := fmt.Sprintf("Version %q built on %q against commit %q\n", info.Version, info.Date, info.Commit) - n, err := w.Write([]byte(msg)) - return int64(n), err -} diff --git a/vendor/github.com/skycoin/skywire/.golangci.yml b/vendor/github.com/skycoin/skywire/.golangci.yml index 60bac573..96968553 100644 --- a/vendor/github.com/skycoin/skywire/.golangci.yml +++ b/vendor/github.com/skycoin/skywire/.golangci.yml @@ -159,6 +159,9 @@ linters: - ineffassign - typecheck - gosec + - gosimple + - staticcheck + - unused - misspell - nakedret enable-all: false diff --git a/vendor/github.com/skycoin/skywire/CHANGELOG.md b/vendor/github.com/skycoin/skywire/CHANGELOG.md index 1a2f050c..0c61d795 100644 --- a/vendor/github.com/skycoin/skywire/CHANGELOG.md +++ b/vendor/github.com/skycoin/skywire/CHANGELOG.md @@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. updates may be generated with `scripts/changelog.sh ` +## 1.3.29 + +- Fix Mac installer issue [#1900](https://github.com/skycoin/skywire/pull/1900) +- Fix WIX issue on versioning of Windows installer [#1899](https://github.com/skycoin/skywire/pull/1899) +- Fix issue on release workflow [#1896](https://github.com/skycoin/skywire/pull/1896) +- Improve Mac survey [#1895](https://github.com/skycoin/skywire/pull/1895) +- Improve Windows installer [#1894](https://github.com/skycoin/skywire/pull/1894) +- Reward on Windows [#1892](https://github.com/skycoin/skywire/pull/1892) +- Embed scripts for reward system [#1888](https://github.com/skycoin/skywire/pull/1888) +- Fix codebase issues [#1885](https://github.com/skycoin/skywire/pull/1885) +- Update Reward Calculation Cli & UI [#1884](https://github.com/skycoin/skywire/pull/1884) +- Update dependencies [#1880](https://github.com/skycoin/skywire/pull/1880) +- Fix dmsghttp config gen logic [#1877](https://github.com/skycoin/skywire/pull/1877) +- Fix services-config.json path reference for `skywire cli config gen` [#1875](https://github.com/skycoin/skywire/pull/1875) + ## 1.3.26 - Embed Deployment Configuration [#1873](https://github.com/skycoin/skywire/pull/1873) diff --git a/vendor/github.com/skycoin/skywire/Makefile b/vendor/github.com/skycoin/skywire/Makefile index 917533f0..fa16cf70 100644 --- a/vendor/github.com/skycoin/skywire/Makefile +++ b/vendor/github.com/skycoin/skywire/Makefile @@ -132,8 +132,14 @@ check-windows: lint-windows test-windows ## Run linters and tests on windows ima build: clean build-merged ## Install dependencies, build apps and binaries. `go build` with ${OPTS} +print-build: ## Print the command used to build the binary + @echo "${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)skywire ./cmd/skywire" + +print-run-source: ## Print the command used to go run from source + @echo "${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go cli config gen -n | sudo ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go visor -n || true" + build-merged: ## Install dependencies, build apps and binaries. `go build` with ${OPTS} - ${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)skywire ./cmd/skywire + ${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)skywire ./cmd/skycoin-skywire build-merged-windows: clean-windows powershell '${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)skywire.exe ./cmd/skywire' @@ -177,10 +183,16 @@ lint: ## Run linters. Use make install-linters first ${OPTS} golangci-lint run -c .golangci.yml ./pkg/... ${OPTS} golangci-lint run -c .golangci.yml ./... +gocyclo: ## Run gocyclo + gocyclo -over 14 . + lint-windows: ## Run linters. Use make install-linters-windows first powershell 'golangci-lint --version' powershell 'golangci-lint run -c .golangci.yml ./...' +gocyclo-windows: ## Run gocyclo on windows + powershell 'gocyclo -over 14 .' + test: ## Run tests -go clean -testcache &>/dev/null ${OPTS} go test ${TEST_OPTS} ./internal/... ./pkg/... ./cmd/... @@ -259,7 +271,7 @@ build-race: ## Build for testing Docker images CGO_ENABLED=1 ${OPTS} go build -tags netgo ${BUILD_OPTS} -race -o /release/skywire ./cmd/skywire github-prepare-release: - $(eval GITHUB_TAG=$(shell git describe --abbrev=0 --tags | cut -c 2-6)) + $(eval GITHUB_TAG=$(shell git describe --abbrev=0 --tags | sed 's/-.*//')) sed '/^## ${GITHUB_TAG}$$/,/^## .*/!d;//d;/^$$/d' ./CHANGELOG.md > releaseChangelog.md github-release: github-prepare-release @@ -321,19 +333,19 @@ prepare: run-source: prepare ## Run skywire from source, without compiling binaries - go run ./cmd/skywire/skywire.go cli config gen -in | sudo go run ./cmd/skywire/skywire.go visor -n || true + ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go cli config gen -n | sudo ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go visor -n || true run-systray: prepare ## Run skywire from source, with vpn server enabled - go run ./cmd/skywire/skywire.go cli config gen -ni | sudo go run ./cmd/skywire/skywire.go visor -n --systray || true + ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go cli config gen -n | sudo ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go visor -n --systray || true run-vpnsrv: prepare ## Run skywire from source, without compiling binaries - go run ./cmd/skywire/skywire.go cli config gen -in --servevpn | sudo go run ./cmd/skywire/skywire.go visor -n || true + ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go cli config gen -n --servevpn | sudo ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go visor -n || true run-source-dmsghttp: prepare ## Run skywire from source with dmsghttp config - go run ./cmd/skywire/skywire.go cli config gen -din | sudo go run ./cmd/skywire/skywire.go visor -n || true + ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go cli config gen -dn | sudo ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go visor -n || true run-vpnsrv-dmsghttp: prepare ## Run skywire from source with dmsghttp config and vpn server - go run ./cmd/skywire/skywire.go cli config gen -din --servevpn | sudo go run ./cmd/skywire/skywire.go visor -n || true + ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go cli config gen -dn --servevpn | sudo ${OPTS} go run ${BUILD_OPTS} ./cmd/skywire/skywire.go visor -n || true lint-ui: ## Lint the UI code cd $(MANAGER_UI_DIR) && npm run lint @@ -374,7 +386,6 @@ windows-installer-release: $(eval GITHUB_TAG=$(shell git describe --abbrev=0 --tags)) make win-installer CUSTOM_VERSION=$(GITHUB_TAG) gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./skywire-installer-${GITHUB_TAG}-windows-amd64.msi - gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./skywire-installer-${GITHUB_TAG}-windows-386.msi # useful commands #dmsghttp-update: ## update dmsghttp config diff --git a/vendor/github.com/skycoin/skywire/arches.json b/vendor/github.com/skycoin/skywire/arches.json new file mode 100644 index 00000000..7961f97b --- /dev/null +++ b/vendor/github.com/skycoin/skywire/arches.json @@ -0,0 +1 @@ +["amd64","arm64","386","arm","ppc64","riscv64","wasm","loong64","mips","mips64","mips64le","mipsle","ppc64le","s390x"] diff --git a/vendor/github.com/skycoin/skywire/cmd/setup-node/commands/root.go b/vendor/github.com/skycoin/skywire/cmd/setup-node/commands/root.go index ddc170d1..15821f84 100644 --- a/vendor/github.com/skycoin/skywire/cmd/setup-node/commands/root.go +++ b/vendor/github.com/skycoin/skywire/cmd/setup-node/commands/root.go @@ -15,12 +15,12 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/router/setupmetrics" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) var ( diff --git a/vendor/github.com/skycoin/skywire/internal/httpauth/client.go b/vendor/github.com/skycoin/skywire/internal/httpauth/client.go index 6d4f6ac8..b86fd36a 100644 --- a/vendor/github.com/skycoin/skywire/internal/httpauth/client.go +++ b/vendor/github.com/skycoin/skywire/internal/httpauth/client.go @@ -15,8 +15,8 @@ import ( "sync" "sync/atomic" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/vendor/github.com/skycoin/skywire/internal/httpauth/nonce.go b/vendor/github.com/skycoin/skywire/internal/httpauth/nonce.go index 30813d05..99a3c1ad 100644 --- a/vendor/github.com/skycoin/skywire/internal/httpauth/nonce.go +++ b/vendor/github.com/skycoin/skywire/internal/httpauth/nonce.go @@ -4,7 +4,7 @@ package httpauth import ( "fmt" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Nonce is used to sign requests in order to avoid replay attack diff --git a/vendor/github.com/skycoin/skywire/internal/packetfilter/address-filter.go b/vendor/github.com/skycoin/skywire/internal/packetfilter/address-filter.go index 726e7f0a..fdadb5bb 100644 --- a/vendor/github.com/skycoin/skywire/internal/packetfilter/address-filter.go +++ b/vendor/github.com/skycoin/skywire/internal/packetfilter/address-filter.go @@ -4,7 +4,7 @@ package packetfilter import ( "net" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // AddressFilter filters packets from specified address. diff --git a/vendor/github.com/skycoin/skywire/internal/packetfilter/kcp-filter.go b/vendor/github.com/skycoin/skywire/internal/packetfilter/kcp-filter.go index 634dc7ff..feea783e 100644 --- a/vendor/github.com/skycoin/skywire/internal/packetfilter/kcp-filter.go +++ b/vendor/github.com/skycoin/skywire/internal/packetfilter/kcp-filter.go @@ -8,7 +8,7 @@ import ( "github.com/xtaci/kcp-go" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/vendor/github.com/skycoin/skywire/internal/vpn/client.go b/vendor/github.com/skycoin/skywire/internal/vpn/client.go index b250f96b..c25d2774 100644 --- a/vendor/github.com/skycoin/skywire/internal/vpn/client.go +++ b/vendor/github.com/skycoin/skywire/internal/vpn/client.go @@ -17,13 +17,13 @@ import ( ipc "github.com/james-barrow/golang-ipc" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) const ( @@ -342,6 +342,9 @@ func (c *Client) setupTUN(tunIP, tunGateway net.IP) error { return c.SetupTUN(c.tun.Name(), tunIP.String()+TUNNetmaskCIDR, tunGateway.String(), TUNMTU) } +// TODO: fix gocyclo error. +// +//gocyclo:ignore func (c *Client) serveConn(conn net.Conn) error { tunIP, tunGateway, err := c.shakeHands(conn) if err != nil { diff --git a/vendor/github.com/skycoin/skywire/internal/vpn/client_config.go b/vendor/github.com/skycoin/skywire/internal/vpn/client_config.go index 0cb48c63..4b51771c 100644 --- a/vendor/github.com/skycoin/skywire/internal/vpn/client_config.go +++ b/vendor/github.com/skycoin/skywire/internal/vpn/client_config.go @@ -1,7 +1,7 @@ // Package vpn internal/vpn/client_config.go package vpn -import "github.com/skycoin/skywire-utilities/pkg/cipher" +import "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" // ClientConfig is a configuration for VPN client. type ClientConfig struct { diff --git a/vendor/github.com/skycoin/skywire/internal/vpn/env.go b/vendor/github.com/skycoin/skywire/internal/vpn/env.go index c424d7b3..d4a9acbc 100644 --- a/vendor/github.com/skycoin/skywire/internal/vpn/env.go +++ b/vendor/github.com/skycoin/skywire/internal/vpn/env.go @@ -10,7 +10,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsgcurl" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/vendor/github.com/skycoin/skywire/internal/vpn/server.go b/vendor/github.com/skycoin/skywire/internal/vpn/server.go index da38c981..bbc11c9c 100644 --- a/vendor/github.com/skycoin/skywire/internal/vpn/server.go +++ b/vendor/github.com/skycoin/skywire/internal/vpn/server.go @@ -9,9 +9,9 @@ import ( "strings" "sync" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app" "github.com/skycoin/skywire/pkg/app/appserver" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // Server is a VPN server. diff --git a/vendor/github.com/skycoin/skywire/internal/vpn/subnet_ip_incrementer.go b/vendor/github.com/skycoin/skywire/internal/vpn/subnet_ip_incrementer.go index f686a3ee..a940bb0f 100644 --- a/vendor/github.com/skycoin/skywire/internal/vpn/subnet_ip_incrementer.go +++ b/vendor/github.com/skycoin/skywire/internal/vpn/subnet_ip_incrementer.go @@ -29,6 +29,9 @@ func newSubnetIPIncrementer(octetLowerBorders, octetBorders [4]uint8, step uint8 } } +// TODO: fix gocyclo error. +// +//gocyclo:ignore func (inc *subnetIPIncrementer) next() (net.IP, error) { inc.mx.Lock() defer inc.mx.Unlock() diff --git a/vendor/github.com/skycoin/skywire/mainnet_rules.md b/vendor/github.com/skycoin/skywire/mainnet_rules.md index 68e8d5df..937069e0 100644 --- a/vendor/github.com/skycoin/skywire/mainnet_rules.md +++ b/vendor/github.com/skycoin/skywire/mainnet_rules.md @@ -11,43 +11,31 @@ The required minimum Skywire version will be incremented periodically. -#### Table of Contents -* [Introduction](#introduction) -* [Uptime Reward Pool](#uptime-reward-pool) -* [Rules & Requirements](#rules--requirements) -* [Exceptions](#exceptions-for-deployment-changes-with-dmsghttp-config-chinese-users) -* [Verifying Requirements & Eligibility](#verifying-requirements--eligibility) - * [Version](#version) - * [Deployment](#deployment) - * [Uptime](#uptime) - * [Deployment](#deployment) - * [Skycoin Address](#skycoin-address) - * [Connection to DMSG network](#connection-to-dmsg-network) - * [Verifying other requirements](#verifying-other-requirements) -* [Reward System Overview](#reward-system-overview) -* ~~[Hardware](#hardware)~~ - ## Introduction
Updates to this article will be followed by a notification via the official Skywire PSA channel on Telegram.

-All information about rewards will be published here. Please ask for clarification in the [@skywire](https://t.me/skywire) Telegram channel if some things appear to not be covered. Please join [@SkywirePSA](https://t.me/SkywirePSA) for public service announcements (PSA) regarding the skywire network, update notices, changes to this article, etc. +All information about rewards will be published here. Please ask for clarification in the [@skywire](https://t.me/skywire) Telegram channel if some things appear to not be covered. + +Please join [@SkywirePSA](https://t.me/SkywirePSA) for public service announcements (PSA) regarding the skywire network, update notices, changes to this article, etc. Reward distribution notifications are on telegram [@skywire_reward](https://t.me/skywire_reward). Information about reward distribution as well as other metrics for the skywire network can be found at [fiber.skywire.dev](https://fiber.skywire.dev) -# Uptime Reward Pool +# Uptime Reward Pools -408000 Skycoin are distributed annually to those visors which meet the mimimum uptime and the other requirements listed below. +816000 Skycoin are distributed annually to those visors which meet the mimimum uptime and the other requirements listed below, in two equally sized reward pools. -The reward amount for a day is evenly divided among those eligible participants on the basis of having met uptime and other requirements, for the previous day. +The reward amount for a day is evenly divided among those eligible participants for a given reward pool on the basis of having met uptime and other requirements, for the previous day. -A total of up to ~1117.808 Skycoin are distributed daily in non leap-years. +A total of up to ~1117.808 Skycoin __per pool__ are distributed daily in non leap-years. -A total of up to ~1114.754 Skycoin are distributed daily in leap-years. +A total of up to ~1114.754 Skycoin __per pool__ are distributed daily in leap-years. + +The two reward pools are differentiated by architecture ; one pool for ARM / RISC / MIPS architectures, the other pool for AMD64 / x86_64 / i686 architecture machines. The requirements are otherwise identical for reward eligibility in these pools. ## Rules & Requirements @@ -58,7 +46,7 @@ To receive Skycoin rewards for running skywire, the following requirements must * 2) **75% [uptime](#uptime) per day** minimum is required to be eligible to receive rewards -* 3) The visor must be an **ARM or RISC architecture SBC** ~running on approved [hardware](#hardware)~ +* 3) ~The visor must be an **ARM or RISC architecture SBC** running on approved [hardware](#hardware)~ * 4) Visors must be running on **[the skywire production deployment](#deployment)** with a config that is updated on every version. No default keys or addresses of this configuration may be removed - but you can add keys where applicable. @@ -85,17 +73,25 @@ To receive Skycoin rewards for running skywire, the following requirements must All the production deployment services may be accessed by the visor over the dmsg network when the visor runs with a dmsghttp config. -This type of config is generated automatically based on region (via `skywire cli config gen -b --bestproto`), to circumvent ISP blocking of http requests. +This type of config is generated automatically based on region via: +``` +skywire cli config gen -b --bestproto +``` +to circumvent ISP blocking of http requests. -In order to bootstrap the visor's to connection to the dmsg network (via TCP connection to an individual dmsg server) the `dmsghttp-config.json` is provided with the skywire binary release. +In order to bootstrap the visor's to connection to the dmsg network (via TCP connection to an individual dmsg server) the [dmsghttp-config.json](/dmsghttp-config.json) is provided with the skywire binary release. -In the instance that the skywire production deployment changes - specifically the dmsg servers - it will be necessary to update to the next version or package release which fixes the dmsg servers - or else to manually update the `dmsghttp-config.json` which is provided by your skywire installation. +In the instance that the skywire production deployment changes - specifically the dmsg servers: +* it will be necessary to update to the next version or package release which fixes the dmsg servers. +OR +* it will be necessary to manually update the [dmsghttp-config.json](/dmsghttp-config.json) which is provided by your skywire installation. Currently, **there is no mechanism for updating the dmsghttp-config.json which does not require an http request** ; a request which may be blocked depending on region. -In this instance, the visor will not connect to any service because it is not connected to the dmsg network, so it will not be possible for the visor to accumulate uptime or for the reward system to collect the survey, which are prerequisite for reward eligibility. +In this instance, the visor will not connect to any service because it is not connected to the dmsg network, so it will not be possible for the visor to accumulate uptime or for the reward system to collect the survey, which are prerequisites for reward eligibility. -As a consequence of this; any visors running a dmsghttp-config, and hence any visors running in regions such as China, the minimum version requirement for obtaining rewards is not only the latest available version, but __the latest release of the package__ unless the dmsghttp-config.json is updated manually. +As a consequence of this; any visors running a dmsghttp-config, and hence any visors running in regions such as China, the minimum version requirement for obtaining rewards is not only the latest available version, +but __the latest release of the package__ unless the dmsghttp-config.json is updated manually within your installation. ## Verifying Requirements & Eligibility @@ -124,7 +120,7 @@ Rewards Cutoff date for updating 10-1-2024 ### Deployment -The deployment your visor is running on can be verified by comparing the services configured in the visor's `.json` config against [conf.skywire.skycoin.com](https://conf.skywire.skycoin.com) +The deployment your visor is running on can be verified by comparing the services configured in the visor's .json config against [conf.skywire.skycoin.com](https://conf.skywire.skycoin.com) ``` cat /opt/skywire/skywire.json @@ -134,13 +130,27 @@ The service configuration will be automatically updated any time a config is gen For those visors in china or those running a dmsghttp-config, compare the dmsghttp-config of your current installation with the dmsghttp-config on the develop branch of [github.com/skycoin/skywire](https://github.com/skycoin/skywire) +The same data in a different format should be displayed in the [dmsg-discovery all_servers](https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers) page. Ensure that the dmsghttp-config.json in your installation has the same ip addresses and ports for the dmsg server keys. + +The data from the dmsg discovery should be considered authoritative or current. ### Uptime Daily uptime statistics for all visors may be accessed via the + - [uptime tracker](https://ut.skywire.skycoin.com/uptimes?v=v2) + or using skywire cli -- `skywire cli ut -n0 -k ` + +``` +skywire cli ut -n0 -k +``` + +For example with a locally running visor: +``` +skywire cli ut -n0 -k $(skywire cli visor pk) +``` + ### Skycoin Address @@ -153,23 +163,76 @@ skywire cli reward ![image](https://user-images.githubusercontent.com/36607567/213941582-f57213b8-2acd-4c9a-a2c0-9089a8c2604e.png) +``` +$ skywire cli reward --help + + reward address setting + + Sets the skycoin reward address for the visor. + The config is written to the root of the default local directory + + this config is served via dmsghttp along with transport logs + and the system hardware survey for automating reward distribution + +Flags: + --all show all flags + +``` + +``` +$ skywire cli reward 2jBbGxZRGoQG1mqhPBnXnLTxK6oxsTf8os6 +Reward address: + 2jBbGxZRGoQG1mqhPBnXnLTxK6oxsTf8os6 +``` + +``` +$ skywire cli reward --help + + skycoin reward address set to: + 2jBbGxZRGoQG1mqhPBnXnLTxK6oxsTf8os6 + +Flags: + --all show all flags +``` + or via the hypervisor UI. ![image](https://user-images.githubusercontent.com/36607567/213941478-34c81493-9c3c-40c2-ac22-e33e3683a16f.png) the example above shows the genesis address for the skycoin blockchain. **Please do not use the genesis address.** -It is __highly recommended__ to set the reward address in the file `/etc/skywire.conf` by adding this line to the file: +It is __highly recommended__ to set the reward address in the file '/etc/skywire.conf' by adding this line to the file: + +``` +echo "REWARDSKYADDR=('2jBbGxZRGoQG1mqhPBnXnLTxK6oxsTf8os6')" | sudo tee -a /etc/skywire.conf +``` + +**PLEASE DO NOT USE THE GENESIS ADDRESS!** + +Add your skycoin address there and run: ``` -REWARDSKYADDR=('') +skywire-autoconfig ``` -Add your skycoin address there and run `skywire-autoconfig` on linux (assumes you have installed the package) +on linux (assumes you have installed the package) -If this file does not exist for you, it can be created with `skywire cli config gen -q | tee /etc/skywire.conf` +If this file does not exist for you, it can be created with +``` +skywire cli config gen -q | sudo tee /etc/skywire.conf +``` -**If you do this, please uncomment `PKGENV=true` before saving the file** +**If you do this, YOU MUST UNCOMMENT THE FOLLOWING LINES OF THE FILE:** +``` +PKGENV=true +BESTPROTO=TRUE +``` + +you can open the file in an editor to make that change, for instance nano + +``` +sudo nano /etc/skywire.conf +``` ### Connection to DMSG network @@ -179,6 +242,12 @@ This can be verified by examining the visor's logging: ![image](https://github.com/skycoin/skywire/assets/36607567/eb66bca1-fc9e-4c80-a38a-e00a73f675d0) +``` +[DMSGHTTP] 2024/10/09 - 22:31:45 | 200 | 47.2µs | | 03714c8bdaee0fb48f47babbc47c33e1880752b6620317c9d56b30f3b0ff58a9c3:51405 | GET /health +[DMSGHTTP] 2024/10/09 - 22:31:46 | 200 | 193.325µs | | 03714c8bdaee0fb48f47babbc47c33e1880752b6620317c9d56b30f3b0ff58a9c3:51457 | GET /node-info +[DMSGHTTP] 2024/10/09 - 22:31:47 | 200 | 98.93µs | | 03714c8bdaee0fb48f47babbc47c33e1880752b6620317c9d56b30f3b0ff58a9c3:51503 | GET /2024-10-10.csv +``` + The collected surveys and transport bandwidth log files should be visible in the survey index here: [fiber.skywire.dev/log-collection/tree](https://fiber.skywire.dev/log-collection/tree) @@ -205,11 +274,16 @@ If your visor is not generating such logging or errors are indicated, please rea ### Transportability -It is not required that a visor run any service, such as a vpn or socks5 proxy server, whichpermitsdirect access tothe internet from yor ip address. However, it is required that the visor is able to act as a hop along a route. A module is active at runtime which checks that transports may be established to that visor - the visor crates a dmsg transport to itself every few minutes to ensure transportability. If it's not possible to create a dmsg transport to the same visor after three attempts,the visor will shut down automatically. **It is expected that the visor will be restarted by a process control mechanism if the visor shuts down for any reason.** In the officially supported linux packages, systemd will restart the visor if it stops; regardless of the exit status of the process. +It is not required that a visor run any service, such as a vpn or socks5 proxy server, which permits direct access to the internet from your ip address. +However, it is required that the visor is able to act as a hop along a route. +A module is active at runtime which checks that transports may be established to that visor - the visor creates a dmsg transport to itself every few minutes to ensure transportability. +If it's not possible to create a dmsg transport to the same visor after three attempts,the visor will shut down automatically. +**It is expected that the visor will be restarted by a process control mechanism if the visor shuts down for any reason.** In the officially supported linux packages, systemd will restart the visor if it stops; regardless of the exit status of the process. ### Transport setup node -Previously, the transport setup node was run continuously as part of the reward system to ensure that visors were responding as expected to transport setup-node requests. However, there were intermittent issues with reliability of the results ; because there is no caching mechanism for responsiveness to transport setup-node requests as there exists for uptime. +Previously, the transport setup node was run continuously as part of the reward system to ensure that visors were responding as expected to transport setup-node requests. +However, there were intermittent issues with reliability of the results ; because there is no caching mechanism for responsiveness to transport setup-node requests as there exists for uptime. Currently, the transport setup-nodes which are configured for the visor are included in the survey and verified as an eligibility requirement for rewards by the reward system. @@ -225,12 +299,21 @@ In the future, it is anticipated that the transport bandwidth logs and ping metr ### Survey -On setting the skycoin reward address, the visor will generate and serve a sysytem survey over dmsg. Only keys which are whitelisted in the survey_whitelist array of the visor's config will have access to collect the survey. +On setting the skycoin reward address, the visor will generate and serve a system survey over dmsg. -To print the survey (approximately) as it would be served, one can use `skywire cli survey` +Only keys which are whitelisted in the survey_whitelist array of the visor's config will have access to collect the survey. + +To print the survey (approximately) as it would be served, one can use: +``` +skywire cli survey -p +``` **The purpose of the survey is strictly for checking [eligibility requirements](#rules--requirements) numbers 3 through 7.** +**Setting a skycoin address is considered as consent for collecting the survey ; the survey is not generated unless you set a skycoin address** + +We respect your privacy. + ### Verifying other requirements If the visor is not able to meet the [eligibility requirements](#rules--requirements) numbers 8 through 13, that is usually not the fault of the user - nor is it something the user is expected to troubleshoot on their own at this time. Please ask for assistance on telegram [@skywire](https://t.me/skywire) @@ -243,9 +326,11 @@ The skycoin reward address is in a text file contained in the "local" folder (lo The skycoin reward address is also included with the [system hardware survey](https://github.com/skycoin/skywire/tree/develop/cmd/skywire/README.md#survey) and served, along with transport logs, via dmsghttp. -The system survey (`local/node-info.json`) is fetched hourly by the reward system via `skywire cli log`; along with transport bandwidth logs. - -A survey of transports which have been set by transport setup-nodes are also collected hourly, from all visors which have had surveys collected +The system survey ('local/node-info.json') is fetched hourly by the reward system via +``` +skywire cli log +``` +along with transport bandwidth logs. The index of the collected files may be viewed at [fiber.skywire.dev/log-collection/tree](https://fiber.skywire.dev/log-collection/tree) @@ -259,7 +344,11 @@ The public keys which require to be whitelisted in order to collect the surveys, ## Reward System Funding & Distributions -The reward system is funded on a monthly basis. Sometimes there are unexpected or unavoidable delays in the funding. In these instances, rewards will be distributed based on the data generated wen the system is funded +The reward system is funded on a monthly basis. **Sometimes there are unexpected or unavoidable delays in the funding.** In these instances, rewards will be distributed based on the data generated when the system is funded. +In some instances, it's necessary to discard previous reward data and do multiple distributions to handle backlog of reward system funds. + +**We do our best to ensure fair reward distribution** - but the system itself is not infinitely flexible. +If there is no good way to rectify historical or undistributed rewards backlog, it will be distributed going forward as multiple distributions on the same day to those current active participants in the network. ## Deployment Outages @@ -269,166 +358,6 @@ The policy for handling rewards in the instance of a deployment outage is to rep ## Hardware -**Virtual Machines, servers, and personal computers are currently not eligible to collect rewards** - -_NOTE: this list of hardware was used with the initial implementation of the reward system - which required an application with pictures to be submitted. This no longer applies. The new reward system does not differentiate hardware except by architecture - only x86_64 / amd64 hardware is excluded from rewards currently. Every visor will receive the same reward amount, regardless of the hardware specs. It should be noted that the main difference between using cheap or low-end hardware and high-end hardware is the ease of maintenance and speed of updates for the node operator._ - -The following hardware is eligible for rewards: - -#### Orange Pi - - Prime - - 2G-IOT - - 4G-IOT - - i96 - - Lite - - Lite2 - - One - - One-Plus - - PC - - PC-Plus - - PC2 - - Plus - - Plus2 - - Plus2E - - RK3399 - - Win - - Win-Plus - - Zero - - Zero LTS - - Zero-Plus - - Zero-Plus2 - - 3 - -#### Raspberry Pi - - 1-Model-A+ - - 1-Model-B+ - - 2-Model-B - - 3-Model-B - - 3-Model-B+ - - 4-Model-B - - Compute Module 3 - - Compute Module 4 - - Zero-W - - Zero - -#### Asus - - Tinkerboard - -#### Banana Pi - - BPI-D1 - - BPI-G1 - - BPI-M1 - - BPI-M1+ - - BPI-M2 - - BPI-M2+ - - BPI-M2-Berry - - BPI-M2M - - BPI-M2U - - BPI-M64 - - BPI-R2 - - BPI-R3 - - BPI-Zero - -#### Beelink - - X2 - -#### Cubieboard - - Cubietruck - - Cubietruck-Plus - - 1 - - 2 - - 4 - -#### Geniatech - - Developer Board IV - -#### Helios - - 4 - -#### Libre Computer - - Le-Potato-AML-S905X-CC - - Renegade-ROC-RK3328-CC - - Tritium-ALL-H3-CC - -#### MQMaker - - MiQi - -#### NanoPi - - NanoPi - - 2 - - 2-Fire - - A64 - - K2 - - M1 - - M1-plus - - M2 - - M2A - - M3 - - M4 - - NEO - - NEO-Air - - NEO-Core - - NEO-Core2 - - NEO2 - - NEO2-Black - - S2 - - Smart4418 - -#### Odroid - - C2 - - C4 - - HC1 - - HC2 - - MC1 - - XU4 - -#### Olimex - - Lime1 - - Lime2 - - Lime2-eMMC - - LimeA33 - - Micro - -#### Pine - - Pine-A64 - - Pinebook-A64 - - Sopine-A64 - - Rock64 - - ROCKPro64 - -#### ROCKPI - - Rockpi 4 - - Rockpi S - - Rockpi E - - Rockpi N10 - -#### SolidRun - - CuBox-i - - CuBox-Pulse - - Humming-Board - - Humming-Board-Pulse - - ClearCloud-8K - - ClearFog-A38 - - ClearFog-GT-8K - -#### Udoo - - Blu - - Bricks - - Dual - - Neo - - Quad - - X86 - -#### X96 Android TV Box - - X96 mini - -#### Dolamee - - A95X F1 Smart TV Box - -#### Radxa - - ROCK Pi S - -#### ZTE - - ZXV10 B860H - -~~If you would like to use other boards please contact the team first for approval ; only the boards on the list are guaranteed to be eligible for rewards.~~ +As of November 2024, skywire rewards are open to all computer hardware and architectures. + +If there is not a release for your desired architecture, we can attempt to add it, on request. diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appcommon/hello.go b/vendor/github.com/skycoin/skywire/pkg/app/appcommon/hello.go index a648d15d..83d3194a 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appcommon/hello.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appcommon/hello.go @@ -63,7 +63,7 @@ func WriteHello(w io.Writer, hello Hello) error { raw := make([]byte, 2+len(helloRaw)) size := len(helloRaw) - binary.BigEndian.PutUint16(raw[:2], uint16(size)) //nolint + binary.BigEndian.PutUint16(raw[:2], uint16(size)) //nolint: gosec if n := copy(raw[2:], helloRaw); n != size { panic("hello write does not add up") } diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appcommon/log_store.go b/vendor/github.com/skycoin/skywire/pkg/app/appcommon/log_store.go index 88b732c9..7558f0c5 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appcommon/log_store.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appcommon/log_store.go @@ -13,7 +13,7 @@ import ( log "github.com/sirupsen/logrus" "go.etcd.io/bbolt" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appcommon/proc_config.go b/vendor/github.com/skycoin/skywire/pkg/app/appcommon/proc_config.go index fa7e1ee5..533a27b2 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appcommon/proc_config.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appcommon/proc_config.go @@ -11,8 +11,8 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appdisc/factory.go b/vendor/github.com/skycoin/skywire/pkg/app/appdisc/factory.go index 9b193610..e37c73ad 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appdisc/factory.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appdisc/factory.go @@ -8,11 +8,11 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Factory creates appdisc.Updater instances based on the app name. diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appevent/broadcaster.go b/vendor/github.com/skycoin/skywire/pkg/app/appevent/broadcaster.go index d782c663..1bf34418 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appevent/broadcaster.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appevent/broadcaster.go @@ -8,7 +8,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Broadcaster combines multiple RPCClients (which connects to the RPCGateway of the apps). diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appevent/rpc.go b/vendor/github.com/skycoin/skywire/pkg/app/appevent/rpc.go index 4d5e03b3..0cc2d372 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appevent/rpc.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appevent/rpc.go @@ -9,8 +9,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // RPCGateway represents the RPC gateway that opens up an app for incoming events from visor. diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appnet/addr.go b/vendor/github.com/skycoin/skywire/pkg/app/appnet/addr.go index 37d512bc..1970bffd 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appnet/addr.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appnet/addr.go @@ -8,8 +8,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appnet/dmsg_networker.go b/vendor/github.com/skycoin/skywire/pkg/app/appnet/dmsg_networker.go index 2c2a365f..bae30a3e 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appnet/dmsg_networker.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appnet/dmsg_networker.go @@ -8,7 +8,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // DmsgNetworker implements `Networker` for dmsg network. diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appnet/forwarding.go b/vendor/github.com/skycoin/skywire/pkg/app/appnet/forwarding.go index fdc9d48d..b8e08d73 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appnet/forwarding.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appnet/forwarding.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // nolint: gochecknoglobals diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appnet/http_transport.go b/vendor/github.com/skycoin/skywire/pkg/app/appnet/http_transport.go index 4875b238..8a0fda26 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appnet/http_transport.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appnet/http_transport.go @@ -6,7 +6,7 @@ import ( "net" "net/http" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // HTTPTransport implements http.RoundTripper diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appnet/mock_networker.go b/vendor/github.com/skycoin/skywire/pkg/app/appnet/mock_networker.go index 11a1d2ef..06bab8df 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appnet/mock_networker.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appnet/mock_networker.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockNetworker is an autogenerated mock type for the Networker type diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appnet/networker.go b/vendor/github.com/skycoin/skywire/pkg/app/appnet/networker.go index e57571a8..5005598d 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appnet/networker.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appnet/networker.go @@ -7,7 +7,7 @@ import ( "net" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) //go:generate mockery --name Networker --case underscore --inpackage diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appnet/skywire_networker.go b/vendor/github.com/skycoin/skywire/pkg/app/appnet/skywire_networker.go index 1b2d4ea8..e7468cba 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appnet/skywire_networker.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appnet/skywire_networker.go @@ -12,10 +12,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) var ( diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc.go b/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc.go index 96b6f9d2..8d916d0f 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc.go @@ -19,12 +19,12 @@ import ( "github.com/orandin/lumberjackrus" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( @@ -439,7 +439,6 @@ func (p *Proc) ConnectionsSummary() []ConnectionSummary { } var summaries []ConnectionSummary - // rpcGW.cm.DoRange(func(id uint16, v interface{}) bool { rpcGW.cm.DoRange(func(_ uint16, v interface{}) bool { if v == nil { summaries = append(summaries, ConnectionSummary{}) diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc_manager.go b/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc_manager.go index b79e6278..b3db19b0 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc_manager.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appserver/proc_manager.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) //go:generate mockery --name ProcManager --case underscore --inpackage @@ -221,7 +221,7 @@ func (m *procManager) Start(conf appcommon.ProcConfig) (appcommon.ProcID, error) return 0, err } delete(m.errors, conf.AppName) - return appcommon.ProcID(proc.cmd.Process.Pid), nil //nolint + return appcommon.ProcID(proc.cmd.Process.Pid), nil //nolint: gosec } // Register registers a proc for an external app. diff --git a/vendor/github.com/skycoin/skywire/pkg/app/appserver/rpc_ingress_gateway.go b/vendor/github.com/skycoin/skywire/pkg/app/appserver/rpc_ingress_gateway.go index cb9c18c5..8c6ba33f 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/appserver/rpc_ingress_gateway.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/appserver/rpc_ingress_gateway.go @@ -8,10 +8,10 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/idmanager" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/util/rpcutil" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/app/launcher/launcher.go b/vendor/github.com/skycoin/skywire/pkg/app/launcher/launcher.go index ad5ce004..6ea4ee9a 100644 --- a/vendor/github.com/skycoin/skywire/pkg/app/launcher/launcher.go +++ b/vendor/github.com/skycoin/skywire/pkg/app/launcher/launcher.go @@ -16,11 +16,11 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/util/pathutil" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/dmsgc/dmsgc.go b/vendor/github.com/skycoin/skywire/pkg/dmsgc/dmsgc.go index 0313b01b..feaad32e 100644 --- a/vendor/github.com/skycoin/skywire/pkg/dmsgc/dmsgc.go +++ b/vendor/github.com/skycoin/skywire/pkg/dmsgc/dmsgc.go @@ -8,9 +8,9 @@ import ( "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appevent" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // DmsgConfig defines config for Dmsg network. diff --git a/vendor/github.com/skycoin/skywire/pkg/routefinder/rfclient/client.go b/vendor/github.com/skycoin/skywire/pkg/routefinder/rfclient/client.go index 4bcae562..a9322de0 100644 --- a/vendor/github.com/skycoin/skywire/pkg/routefinder/rfclient/client.go +++ b/vendor/github.com/skycoin/skywire/pkg/routefinder/rfclient/client.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) //go:generate mockery -name Client -case underscore -inpkg diff --git a/vendor/github.com/skycoin/skywire/pkg/router/dmsg_wrapper.go b/vendor/github.com/skycoin/skywire/pkg/router/dmsg_wrapper.go index adb093d8..4558c750 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/dmsg_wrapper.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/dmsg_wrapper.go @@ -7,7 +7,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/router/id_reserver.go b/vendor/github.com/skycoin/skywire/pkg/router/id_reserver.go index 05dd78eb..ae3053bf 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/id_reserver.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/id_reserver.go @@ -9,8 +9,8 @@ import ( "io" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/router/map.go b/vendor/github.com/skycoin/skywire/pkg/router/map.go index 8bd0b477..8b599678 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/map.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/map.go @@ -4,7 +4,7 @@ package router import ( "context" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/router/mock_id_reserver.go b/vendor/github.com/skycoin/skywire/pkg/router/mock_id_reserver.go index cb4428af..4fb01523 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/mock_id_reserver.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/mock_id_reserver.go @@ -7,8 +7,8 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" routing "github.com/skycoin/skywire/pkg/routing" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockIDReserver is an autogenerated mock type for the IDReserver type diff --git a/vendor/github.com/skycoin/skywire/pkg/router/mock_route_group_dialer.go b/vendor/github.com/skycoin/skywire/pkg/router/mock_route_group_dialer.go index a0d53a7c..74516118 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/mock_route_group_dialer.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/mock_route_group_dialer.go @@ -8,9 +8,9 @@ import ( dmsg "github.com/skycoin/dmsg/pkg/dmsg" mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" - logging "github.com/skycoin/skywire-utilities/pkg/logging" routing "github.com/skycoin/skywire/pkg/routing" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + logging "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // MockRouteGroupDialer is an autogenerated mock type for the RouteGroupDialer type diff --git a/vendor/github.com/skycoin/skywire/pkg/router/mock_router.go b/vendor/github.com/skycoin/skywire/pkg/router/mock_router.go index 00c1ab61..af5fe501 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/mock_router.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/mock_router.go @@ -8,8 +8,8 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" routing "github.com/skycoin/skywire/pkg/routing" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockRouter is an autogenerated mock type for the Router type diff --git a/vendor/github.com/skycoin/skywire/pkg/router/network_stats.go b/vendor/github.com/skycoin/skywire/pkg/router/network_stats.go index c151e3ef..333a072d 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/network_stats.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/network_stats.go @@ -32,7 +32,7 @@ func (s *networkStats) SetLatency(latency uint32) { func (s *networkStats) Latency() time.Duration { latencyMs := atomic.LoadUint32(&s.latency) // the latency is store in uint32 of millisecond but time.Duration takes nanosecond - return time.Duration(latencyMs * uint32(time.Millisecond.Nanoseconds())) //nolint + return time.Duration(latencyMs * uint32(time.Millisecond.Nanoseconds())) //nolint: gosec } func (s *networkStats) SetUploadSpeed(speed uint32) { diff --git a/vendor/github.com/skycoin/skywire/pkg/router/route_group.go b/vendor/github.com/skycoin/skywire/pkg/router/route_group.go index ca694c4a..768999ae 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/route_group.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/route_group.go @@ -15,8 +15,8 @@ import ( "github.com/skycoin/dmsg/pkg/ioutil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/util/deadline" ) @@ -449,7 +449,7 @@ func (rg *RouteGroup) sendPing() error { throughput := rg.networkStats.RemoteThroughput() timestamp := time.Now().UTC().UnixNano() / int64(time.Millisecond) - rg.networkStats.SetDownloadSpeed(uint32(throughput)) //nolint + rg.networkStats.SetDownloadSpeed(uint32(throughput)) //nolint: gosec packet := routing.MakePingPacket(rule.NextRouteID(), timestamp, throughput) @@ -697,7 +697,7 @@ func (rg *RouteGroup) handleErrorPacket(packet routing.Packet) error { return nil } - rg.SetError(fmt.Errorf("%v", string(packet.Payload()))) + rg.SetError(errors.New((string(packet.Payload())))) return nil } @@ -723,9 +723,9 @@ func (rg *RouteGroup) handlePingPacket(packet routing.Packet) error { rg.logger.WithField("func", "RouteGroup.handlePingPacket").Tracef("Throughput is around %d", throughput) - rg.networkStats.SetUploadSpeed(uint32(throughput)) //nolint + rg.networkStats.SetUploadSpeed(uint32(throughput)) //nolint: gosec - return rg.sendPong(int64(timestamp)) //nolint + return rg.sendPong(int64(timestamp)) //nolint: gosec } func (rg *RouteGroup) handlePongPacket(packet routing.Packet) error { @@ -734,13 +734,13 @@ func (rg *RouteGroup) handlePongPacket(packet routing.Packet) error { sentAtMs := binary.BigEndian.Uint64(payload) ms := sentAtMs % 1000 - sentAt := time.Unix(int64(sentAtMs/1000), int64(ms)*int64(time.Millisecond)).UTC() //nolint + sentAt := time.Unix(int64(sentAtMs/1000), int64(ms)*int64(time.Millisecond)).UTC() //nolint: gosec latency := time.Now().UTC().Sub(sentAt).Milliseconds() rg.logger.WithField("func", "RouteGroup.handlePongPacket").Tracef("Latency is around %d ms", latency) - rg.networkStats.SetLatency(uint32(latency)) //nolint + rg.networkStats.SetLatency(uint32(latency)) //nolint: gosec return nil } diff --git a/vendor/github.com/skycoin/skywire/pkg/router/router.go b/vendor/github.com/skycoin/skywire/pkg/router/router.go index 45a99a36..0094e204 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/router.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/router.go @@ -15,11 +15,11 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/noise" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routefinder/rfclient" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) @@ -484,6 +484,9 @@ func (r *router) serveSetup() { } } +// TODO: fix gocyclo error. +// +//gocyclo:ignore func (r *router) saveRouteGroupRules(rules routing.EdgeRules, nsConf noise.Config) (*NoiseRouteGroup, error) { r.logger.Debugf("Saving route group rules with desc: %s", &rules.Desc) @@ -990,11 +993,11 @@ func (r *router) forwardPacket(ctx context.Context, packet routing.Packet, rule case routing.ClosePacket: p = routing.MakeClosePacket(rule.NextRouteID(), routing.CloseCode(packet.Payload()[0])) case routing.PingPacket: - timestamp := int64(binary.BigEndian.Uint64(packet[routing.PacketPayloadOffset:])) //nolint - throughput := int64(binary.BigEndian.Uint64(packet[routing.PacketPayloadOffset+8:])) //nolint + timestamp := int64(binary.BigEndian.Uint64(packet[routing.PacketPayloadOffset:])) //nolint: gosec + throughput := int64(binary.BigEndian.Uint64(packet[routing.PacketPayloadOffset+8:])) //nolint: gosec p = routing.MakePingPacket(rule.NextRouteID(), timestamp, throughput) case routing.PongPacket: - timestamp := int64(binary.BigEndian.Uint64(packet[routing.PacketPayloadOffset:])) //nolint + timestamp := int64(binary.BigEndian.Uint64(packet[routing.PacketPayloadOffset:])) //nolint: gosec p = routing.MakePongPacket(rule.NextRouteID(), timestamp) case routing.ErrorPacket: var err error @@ -1328,7 +1331,6 @@ func (r *router) removeRouteGroupOfRule(rule routing.Rule) { } func (r *router) checkIfTransportAvailable() (ok bool) { - // r.tm.WalkTransports(func(tp *transport.ManagedTransport) bool { r.tm.WalkTransports(func(_ *transport.ManagedTransport) bool { ok = true return ok diff --git a/vendor/github.com/skycoin/skywire/pkg/router/routerclient.go b/vendor/github.com/skycoin/skywire/pkg/router/routerclient.go index 4a7f4590..b81bcfa4 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/routerclient.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/routerclient.go @@ -9,10 +9,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/router/rpc_gateway.go b/vendor/github.com/skycoin/skywire/pkg/router/rpc_gateway.go index 99e1a288..0ad54df8 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/rpc_gateway.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/rpc_gateway.go @@ -2,8 +2,8 @@ package router import ( - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // RPCGateway is a RPC interface for router. diff --git a/vendor/github.com/skycoin/skywire/pkg/router/setup_rpc_gateway.go b/vendor/github.com/skycoin/skywire/pkg/router/setup_rpc_gateway.go index 53bce1d7..fa0a4042 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/setup_rpc_gateway.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/setup_rpc_gateway.go @@ -6,10 +6,10 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/router/setupmetrics" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/router/setupclient.go b/vendor/github.com/skycoin/skywire/pkg/router/setupclient.go index f795fb20..89baec45 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/setupclient.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/setupclient.go @@ -9,10 +9,10 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const rpcName = "SetupRPCGateway" diff --git a/vendor/github.com/skycoin/skywire/pkg/router/setupconfig.go b/vendor/github.com/skycoin/skywire/pkg/router/setupconfig.go index b9f4949f..bcb95b75 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/setupconfig.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/setupconfig.go @@ -4,8 +4,8 @@ package router import ( "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/dmsgc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Various timeouts for setup node. diff --git a/vendor/github.com/skycoin/skywire/pkg/router/setupmetrics/victoria_metrics.go b/vendor/github.com/skycoin/skywire/pkg/router/setupmetrics/victoria_metrics.go index 6a2b5929..69a8553a 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/setupmetrics/victoria_metrics.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/setupmetrics/victoria_metrics.go @@ -6,8 +6,8 @@ import ( "github.com/VictoriaMetrics/metrics" - "github.com/skycoin/skywire-utilities/pkg/metricsutil" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil" ) // Metrics collects metrics in prometheus format. diff --git a/vendor/github.com/skycoin/skywire/pkg/router/setupnode.go b/vendor/github.com/skycoin/skywire/pkg/router/setupnode.go index 95f930fc..74fde7a0 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/setupnode.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/setupnode.go @@ -13,11 +13,11 @@ import ( "github.com/skycoin/dmsg/pkg/disc" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/router/setupmetrics" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/router/wrappers.go b/vendor/github.com/skycoin/skywire/pkg/router/wrappers.go index 9120332e..b3b31049 100644 --- a/vendor/github.com/skycoin/skywire/pkg/router/wrappers.go +++ b/vendor/github.com/skycoin/skywire/pkg/router/wrappers.go @@ -7,9 +7,9 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) //go:generate mockery -name RouteGroupDialer -case underscore -inpkg diff --git a/vendor/github.com/skycoin/skywire/pkg/routing/addr.go b/vendor/github.com/skycoin/skywire/pkg/routing/addr.go index 005d83a7..de38e824 100644 --- a/vendor/github.com/skycoin/skywire/pkg/routing/addr.go +++ b/vendor/github.com/skycoin/skywire/pkg/routing/addr.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Port is a network port number diff --git a/vendor/github.com/skycoin/skywire/pkg/routing/packet.go b/vendor/github.com/skycoin/skywire/pkg/routing/packet.go index 5fbd602a..647c733b 100644 --- a/vendor/github.com/skycoin/skywire/pkg/routing/packet.go +++ b/vendor/github.com/skycoin/skywire/pkg/routing/packet.go @@ -105,7 +105,7 @@ func MakeDataPacket(id RouteID, payload []byte) (Packet, error) { packet[PacketTypeOffset] = byte(DataPacket) binary.BigEndian.PutUint32(packet[PacketRouteIDOffset:], uint32(id)) - binary.BigEndian.PutUint16(packet[PacketPayloadSizeOffset:], uint16(len(payload))) //nolint + binary.BigEndian.PutUint16(packet[PacketPayloadSizeOffset:], uint16(len(payload))) //nolint: gosec copy(packet[PacketPayloadOffset:], payload) return packet, nil @@ -141,8 +141,8 @@ func MakePingPacket(id RouteID, timestamp, throughput int64) Packet { packet[PacketTypeOffset] = byte(PingPacket) binary.BigEndian.PutUint32(packet[PacketRouteIDOffset:], uint32(id)) binary.BigEndian.PutUint16(packet[PacketPayloadSizeOffset:], uint16(16)) - binary.BigEndian.PutUint64(packet[PacketPayloadOffset:], uint64(timestamp)) - binary.BigEndian.PutUint64(packet[PacketPayloadOffset+8:], uint64(throughput)) + binary.BigEndian.PutUint64(packet[PacketPayloadOffset:], uint64(timestamp)) //nolint: gosec + binary.BigEndian.PutUint64(packet[PacketPayloadOffset+8:], uint64(throughput)) //nolint: gosec return packet } @@ -154,7 +154,7 @@ func MakePongPacket(id RouteID, timestamp int64) Packet { packet[PacketTypeOffset] = byte(PongPacket) binary.BigEndian.PutUint32(packet[PacketRouteIDOffset:], uint32(id)) binary.BigEndian.PutUint16(packet[PacketPayloadSizeOffset:], uint16(16)) - binary.BigEndian.PutUint64(packet[PacketPayloadOffset:], uint64(timestamp)) + binary.BigEndian.PutUint64(packet[PacketPayloadOffset:], uint64(timestamp)) //nolint: gosec return packet } @@ -187,7 +187,7 @@ func MakeErrorPacket(id RouteID, errPayload []byte) (Packet, error) { packet[PacketTypeOffset] = byte(ErrorPacket) binary.BigEndian.PutUint32(packet[PacketRouteIDOffset:], uint32(id)) - binary.BigEndian.PutUint16(packet[PacketPayloadSizeOffset:], uint16(len(errPayload))) //nolint + binary.BigEndian.PutUint16(packet[PacketPayloadSizeOffset:], uint16(len(errPayload))) //nolint: gosec copy(packet[PacketPayloadOffset:], errPayload) return packet, nil diff --git a/vendor/github.com/skycoin/skywire/pkg/routing/route.go b/vendor/github.com/skycoin/skywire/pkg/routing/route.go index 8c271e6d..40409453 100644 --- a/vendor/github.com/skycoin/skywire/pkg/routing/route.go +++ b/vendor/github.com/skycoin/skywire/pkg/routing/route.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Route is a succession of transport entries that denotes a path from source visor to destination visor diff --git a/vendor/github.com/skycoin/skywire/pkg/routing/route_descriptor.go b/vendor/github.com/skycoin/skywire/pkg/routing/route_descriptor.go index 3a47e508..c79e4eb1 100644 --- a/vendor/github.com/skycoin/skywire/pkg/routing/route_descriptor.go +++ b/vendor/github.com/skycoin/skywire/pkg/routing/route_descriptor.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "fmt" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // RouteDescriptor describes a route (from the perspective of the source and destination edges). diff --git a/vendor/github.com/skycoin/skywire/pkg/routing/rule.go b/vendor/github.com/skycoin/skywire/pkg/routing/rule.go index 6aa22cfe..7dd15000 100644 --- a/vendor/github.com/skycoin/skywire/pkg/routing/rule.go +++ b/vendor/github.com/skycoin/skywire/pkg/routing/rule.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // RuleHeaderSize represents the base size of a rule. @@ -65,7 +65,7 @@ func (r Rule) assertLen(l int) { // KeepAlive returns rule's keep-alive timeout. func (r Rule) KeepAlive() time.Duration { r.assertLen(RuleHeaderSize) - return time.Duration(binary.BigEndian.Uint64(r[0:8])) //nolint + return time.Duration(binary.BigEndian.Uint64(r[0:8])) //nolint: gosec } // setKeepAlive sets rule's keep-alive timeout. @@ -76,7 +76,7 @@ func (r Rule) setKeepAlive(keepAlive time.Duration) { keepAlive = 0 } - binary.BigEndian.PutUint64(r[0:8], uint64(keepAlive)) + binary.BigEndian.PutUint64(r[0:8], uint64(keepAlive)) //nolint: gosec } // Type returns type of a rule. diff --git a/vendor/github.com/skycoin/skywire/pkg/routing/table.go b/vendor/github.com/skycoin/skywire/pkg/routing/table.go index 954986ab..b1a2c54c 100644 --- a/vendor/github.com/skycoin/skywire/pkg/routing/table.go +++ b/vendor/github.com/skycoin/skywire/pkg/routing/table.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( @@ -92,7 +92,7 @@ func (mt *memTable) reserveKeysImpl(n int) (first, last RouteID, err error) { } first = mt.nextID + 1 - mt.nextID += RouteID(n) //nolint + mt.nextID += RouteID(n) //nolint: gosec last = mt.nextID return first, last, nil diff --git a/vendor/github.com/skycoin/skywire/pkg/servicedisc/autoconnect.go b/vendor/github.com/skycoin/skywire/pkg/servicedisc/autoconnect.go index 3cc1ac4f..3f25e061 100644 --- a/vendor/github.com/skycoin/skywire/pkg/servicedisc/autoconnect.go +++ b/vendor/github.com/skycoin/skywire/pkg/servicedisc/autoconnect.go @@ -10,9 +10,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/servicedisc/client.go b/vendor/github.com/skycoin/skywire/pkg/servicedisc/client.go index e10a5c13..f1e27026 100644 --- a/vendor/github.com/skycoin/skywire/pkg/servicedisc/client.go +++ b/vendor/github.com/skycoin/skywire/pkg/servicedisc/client.go @@ -16,11 +16,11 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // ErrVisorUnreachable is returned when visor is not reachable diff --git a/vendor/github.com/skycoin/skywire/pkg/servicedisc/types.go b/vendor/github.com/skycoin/skywire/pkg/servicedisc/types.go index 9e9b2c5b..34eb4dac 100644 --- a/vendor/github.com/skycoin/skywire/pkg/servicedisc/types.go +++ b/vendor/github.com/skycoin/skywire/pkg/servicedisc/types.go @@ -12,8 +12,8 @@ import ( pq "github.com/lib/pq" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/geo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo" ) const ( diff --git a/vendor/github.com/skycoin/skywire/pkg/skyenv/skyenv.go b/vendor/github.com/skycoin/skywire/pkg/skyenv/skyenv.go index 518a592a..fd2eb067 100644 --- a/vendor/github.com/skycoin/skywire/pkg/skyenv/skyenv.go +++ b/vendor/github.com/skycoin/skywire/pkg/skyenv/skyenv.go @@ -18,87 +18,170 @@ const ( // Dmsg port constants. // TODO(evanlinjin): Define these properly. These are currently random. - DmsgCtrlPort uint16 = 7 // DmsgCtrlPort Listening port for dmsgctrl protocol (similar to TCP Echo Protocol). //nolint - DmsgSetupPort uint16 = 36 // DmsgSetupPort Listening port of a setup node. - DmsgHypervisorPort uint16 = 46 // DmsgHypervisorPort Listening port of a hypervisor for incoming RPC visor connections over dmsg. - DmsgTransportSetupPort uint16 = 47 // DmsgTransportSetupPort Listening port for transport setup RPC over dmsg. - DmsgAwaitSetupPort uint16 = 136 // DmsgAwaitSetupPort Listening port of a visor for setup operations. + // DmsgCtrlPort Listening port for dmsgctrl protocol (similar to TCP Echo Protocol). //nolint + DmsgCtrlPort uint16 = 7 + + // DmsgSetupPort Listening port of a setup node. + DmsgSetupPort uint16 = 36 + + // DmsgHypervisorPort Listening port of a hypervisor for incoming RPC visor connections over dmsg. + DmsgHypervisorPort uint16 = 46 + + // DmsgTransportSetupPort Listening port for transport setup RPC over dmsg. + DmsgTransportSetupPort uint16 = 47 + + // DmsgAwaitSetupPort Listening port of a visor for setup operations. + DmsgAwaitSetupPort uint16 = 136 // Transport port constants. - TransportPort uint16 = 45 // TransportPort Listening port of a visor for incoming transports. - PublicAutoconnect = true // PublicAutoconnect ... + // TransportPort Listening port of a visor for incoming transports. + TransportPort uint16 = 45 + + // PublicAutoconnect determines if the visor automatically creates stcpr transports to public visors + PublicAutoconnect = true // Dmsgpty constants. - DmsgPtyPort uint16 = 22 // DmsgPtyPort ... - DmsgPtyCLINet = "unix" // DmsgPtyCLINet ... + // DmsgPtyPort is the dmsg port to listen on for dmsgpty connections + DmsgPtyPort uint16 = 22 + + // DmsgPtyCLINet is the type of cli net used by dmsgpty + DmsgPtyCLINet = "unix" // Skywire-TCP constants. - STCPAddr = ":7777" // STCPAddr ... + // STCPAddr is the address to listen for stcpr or stcp transports + STCPAddr = ":7777" // Default skywire app constants. - SkychatName = "skychat" // SkychatName ... - SkychatPort uint16 = 1 // SkychatPort ... - SkychatAddr = ":8001" // SkychatAddr ... - PingTestName = "pingtest" // PingTestName ... - PingTestPort uint16 = 2 // PingTestPort ... - SkysocksName = "skysocks" // SkysocksName ... - SkysocksPort uint16 = 3 // SkysocksPort ... + // SkychatName is the name of the skychat app + SkychatName = "skychat" + + // SkychatPort is the dmsg port used by skychat + SkychatPort uint16 = 1 + + // SkychatAddr is the non-dmsg port used to access the skychat app on localhost + SkychatAddr = ":8001" + + // PingTestName is the namew of the ping test + PingTestName = "pingtest" - SkysocksClientName = "skysocks-client" // SkysocksClientName ... - SkysocksClientPort uint16 = 13 // SkysocksClientPort ... - SkysocksClientAddr = ":1080" // SkysocksClientAddr ... + // PingTestPort is the port to user for ping tests + PingTestPort uint16 = 2 - VPNServerName = "vpn-server" // VPNServerName ... - VPNServerPort uint16 = 44 // VPNServerPort ... + // SkysocksName is the name of the skysocks app + SkysocksName = "skysocks" - VPNClientName = "vpn-client" // VPNClientName ... + // SkysocksPort is the skysocks port on dmsg + SkysocksPort uint16 = 3 + + // SkysocksClientName is the skysocks-client app name + SkysocksClientName = "skysocks-client" + + // SkysocksClientPort is the skysocks-client app dmsg port + SkysocksClientPort uint16 = 13 + + // SkysocksClientAddr is the default port the socks5 proxy client serves on + SkysocksClientAddr = ":1080" + + // VPNServerName is the name of the vpn server app + VPNServerName = "vpn-server" + + // VPNServerPort is the vpn server dmsg port + VPNServerPort uint16 = 44 + + // VPNClientName is the name of the vpn client app + VPNClientName = "vpn-client" // TODO(darkrengarius): this one's not needed for the app to run but lack of it causes errors - VPNClientPort uint16 = 43 // VPNClientPort ... - ExampleServerName = "example-server-app" // ExampleServerName ... - ExampleServerPort uint16 = 45 // ExampleServerPort ... - ExampleClientName = "example-client-app" // ExampleClientName ... - ExampleClientPort uint16 = 46 // ExampleClientPort ... - SkyForwardingServerName = "sky-forwarding" // SkyForwardingServerName ... - SkyForwardingServerPort uint16 = 47 // SkyForwardingServerPort ... - SkyPingName = "sky-ping" // SkyPingName ... - SkyPingPort uint16 = 48 // SkyPingPort ... + // VPNClientPort over dmsg + VPNClientPort uint16 = 43 + + // ExampleServerName is the name of the example server app + ExampleServerName = "example-server-app" + + // ExampleServerPort is dmsg port of example server app + ExampleServerPort uint16 = 45 + + // ExampleClientName is the name of the example client app + ExampleClientName = "example-client-app" + + // ExampleClientPort dmsg port of example client app + ExampleClientPort uint16 = 46 + + // SkyForwardingServerName name of sky forwarding server app + SkyForwardingServerName = "sky-forwarding" + + // SkyForwardingServerPort dmsg port of skyfwd server app + SkyForwardingServerPort uint16 = 47 + + // SkyPingName is the name of the sky ping + SkyPingName = "sky-ping" + + // SkyPingPort dmsg port of sky ping + SkyPingPort uint16 = 48 // RPC constants. - RPCAddr = "localhost:3435" // RPCAddr ... - RPCTimeout = 20 * time.Second // RPCTimeout ... - TransportRPCTimeout = 1 * time.Minute // TransportRPCTimeout ... - UpdateRPCTimeout = 6 * time.Hour // UpdateRPCTimeout update requires huge timeout + // RPCAddr for skywire-cli to access skywire-visor + RPCAddr = "localhost:3435" + + // RPCTimeout timeout of rpc requests + RPCTimeout = 20 * time.Second + + // TransportRPCTimeout timeout of transport rpc + TransportRPCTimeout = 1 * time.Minute + + // UpdateRPCTimeout update requires huge timeout - NOTE: this is likely unused + UpdateRPCTimeout = 6 * time.Hour // Default skywire app server and discovery constants - AppSrvAddr = "localhost:5505" // AppSrvAddr ... - ServiceDiscUpdateInterval = time.Minute // ServiceDiscUpdateInterval ... - AppBinPath = "./" // AppBinPath ... - LogLevel = "info" // LogLevel ... + // AppSrvAddr address of app server + AppSrvAddr = "localhost:5505" + + // ServiceDiscUpdateInterval update interval for apps in service discovery + ServiceDiscUpdateInterval = time.Minute + + // AppBinPath is the default path for the apps + AppBinPath = "./" + + // LogLevel is the default log level of the visor + LogLevel = "info" // Routing constants - TpLogStore = "transport_logs" // TpLogStore ... - Custom = "custom" // Custom ... + // TpLogStore is where tp logs are stored + TpLogStore = "transport_logs" - // LocalPath constants + // Custom path to serve files from dmsghttp log server over dmsg + Custom = "custom" + + // LocalPath where the visor writes files to LocalPath = "./local" // Default hypervisor constants - HypervisorDB = ".skycoin/hypervisor/users.db" //HypervisorDB ... - EnableAuth = false // EnableAuth ... - PackageEnableAuth = true // PackageEnableAuth ... - EnableTLS = false // EnableTLS ... - TLSKey = "./ssl/key.pem" // TLSKey ... - TLSCert = "./ssl/cert.pem" // TLSCert ... + //HypervisorDB stores the password to access the hypervisor + HypervisorDB = ".skycoin/hypervisor/users.db" + + // EnableAuth enables auth on the hypervisor UI + EnableAuth = false + + // PackageEnableAuth is the default auth for package-based installations for hypervisor UI + PackageEnableAuth = true + + // EnableTLS enables tls for accessing hypervisor ui + EnableTLS = false + + // TLSKey for access to hvui + TLSKey = "./ssl/key.pem" + + // TLSCert for access to hvui + TLSCert = "./ssl/cert.pem" // IPCShutdownMessageType sends IPC shutdown message type IPCShutdownMessageType = 68 diff --git a/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo/buildinfo.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo/buildinfo.go new file mode 100644 index 00000000..a807e642 --- /dev/null +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo/buildinfo.go @@ -0,0 +1,81 @@ +// Package buildinfo pkg/buildinfo/buildinfo.go +package buildinfo + +import ( + "encoding/json" + "fmt" + "io" +) + +const unknown = "unknown" + +//$ go build -mod=vendor -ldflags="-X 'github.com/skycoin/skywire-utilities/pkg/buildinfo.version=$(git describe)' -X 'github.com/skycoin/skywire-utilities/pkg/buildinfo.date=$(date -u "+%Y-%m-%dT%H:%M:%SZ")' -X 'github.com/skycoin/skywire-utilities/pkg/buildinfo.commit=$(git rev-list -1 HEAD)'" . + +var ( + version = unknown + commit = unknown + date = unknown +) + +// $ go build -ldflags="-X 'github.com/skycoin/skywire-utilities/pkg/buildinfo.golist=$(go list -m -json -mod=mod github.com/skycoin/@)' -X 'github.com/skycoin/skywire-utilities/pkg/buildinfo.date=$(date -u "+%Y-%m-%dT%H:%M:%SZ")'" . +var golist string + +// ModuleInfo represents the JSON structure returned by `go list -m -json`. +type ModuleInfo struct { + Version string `json:"Version"` + Origin struct { + Hash string `json:"Hash"` + } `json:"Origin"` +} + +func init() { + if golist != "" { + var mInfo ModuleInfo + if err := json.Unmarshal([]byte(golist), &mInfo); err == nil { + if mInfo.Version != "" && version == unknown { + version = mInfo.Version + } + if mInfo.Origin.Hash != "" && commit == unknown { + commit = mInfo.Origin.Hash + } + } + } +} + +// Version returns version from the parsed module info. +func Version() string { + return version +} + +// Commit returns commit hash from the parsed module info. +func Commit() string { + return commit +} + +// Date returns date of build in RFC3339 format. +func Date() string { + return date +} + +// Get returns build info summary. +func Get() *Info { + return &Info{ + Version: Version(), + Commit: Commit(), + Date: Date(), + } +} + +// Info is build info summary. +type Info struct { + Version string `json:"version"` + Commit string `json:"commit"` + Date string `json:"date"` +} + +// WriteTo writes build info summary to io.Writer. +func (info *Info) WriteTo(w io.Writer) (int64, error) { + msg := fmt.Sprintf("Version %q built on %q against commit %q\n", info.Version, info.Date, info.Commit) + n, err := w.Write([]byte(msg)) + return int64(n), err +} diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cipher/cipher.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher/cipher.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cipher/cipher.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher/cipher.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cipher/utils_pubkey.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher/utils_pubkey.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cipher/utils_pubkey.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher/utils_pubkey.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/catch.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/catch.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/catch.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/catch.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/cmd_name.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/cmd_name.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/cmd_name.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/cmd_name.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/service_flags.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/service_flags.go similarity index 98% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/service_flags.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/service_flags.go index c8a8d7c9..e8823d42 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/service_flags.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/service_flags.go @@ -12,7 +12,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Associated errors. diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/signal_context.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/signal_context.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/signal_context.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/signal_context.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/signal_unix.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/signal_unix.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/signal_unix.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/signal_unix.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/signal_windows.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/signal_windows.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/signal_windows.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/signal_windows.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/sysloghook_unix.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go similarity index 95% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/sysloghook_unix.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go index 0a902810..e9184ebd 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/sysloghook_unix.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/sysloghook_unix.go @@ -11,7 +11,7 @@ import ( "github.com/sirupsen/logrus" logrussyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func (sf *ServiceFlags) sysLogHook(log *logging.Logger, sysLvl int) { diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/sysloghook_windows.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go similarity index 92% rename from vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/sysloghook_windows.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go index 83ddf4f8..9690fb7d 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/cmdutil/sysloghook_windows.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil/sysloghook_windows.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func (sf *ServiceFlags) sysLogHook(_ *logging.Logger, _ int) { diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/geo/geo.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo/geo.go similarity index 94% rename from vendor/github.com/skycoin/skywire-utilities/pkg/geo/geo.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo/geo.go index 1d8cdac6..9b80290a 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/geo/geo.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo/geo.go @@ -11,9 +11,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" - - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) // Errors associated with geo calls. diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/auth.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/auth.go similarity index 97% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/auth.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/auth.go index 2f2d99fd..05c4a066 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/auth.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/auth.go @@ -9,7 +9,7 @@ import ( "net/http" "strconv" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Auth holds authentication mandatory values diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/handler.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/handler.go similarity index 95% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/handler.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/handler.go index cd1e1ee0..e1b91947 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/handler.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/handler.go @@ -10,9 +10,9 @@ import ( "net/url" "strings" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( @@ -96,7 +96,7 @@ func WithAuth(store NonceStore, original http.Handler, shouldVerifyAuth bool) ht sw := statusWriter{ResponseWriter: w} httputil.LogEntrySetField(r, LogAuthKey, auth.Key) original.ServeHTTP(&sw, r.WithContext(context.WithValue( - r.Context(), ContextAuthKey, auth.Key))) + r.Context(), ContextAuthKey, auth.Key))) //nolint if sw.status == http.StatusOK { _, err := store.IncrementNonce(r.Context(), auth.Key) diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/memory_store.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/memory_store.go similarity index 93% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/memory_store.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/memory_store.go index b0b4151d..3831c877 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/memory_store.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/memory_store.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) type memStore struct { diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/nonce-storer.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/nonce-storer.go similarity index 91% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/nonce-storer.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/nonce-storer.go index e2f8fe7b..4214b3b3 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/nonce-storer.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/nonce-storer.go @@ -5,8 +5,8 @@ import ( "context" "fmt" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/storeconfig" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig" ) // Nonce is used to sign requests in order to avoid replay attack diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/redis-store.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/redis-store.go similarity index 93% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/redis-store.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/redis-store.go index 4d9d0d13..f182ae3d 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/httpauth/redis-store.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth/redis-store.go @@ -10,7 +10,7 @@ import ( "github.com/go-redis/redis/v8" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) type redisStore struct { @@ -62,7 +62,7 @@ func (s *redisStore) Nonce(ctx context.Context, remotePK cipher.PubKey) (Nonce, if err != nil { return 0, fmt.Errorf("malformed nonce: %s", nonce) } - return Nonce(n), nil + return Nonce(n), nil //nolint } func (s *redisStore) IncrementNonce(ctx context.Context, remotePK cipher.PubKey) (Nonce, error) { @@ -76,7 +76,7 @@ func (s *redisStore) IncrementNonce(ctx context.Context, remotePK cipher.PubKey) return 0, fmt.Errorf("redis: %w", err) } - return Nonce(nonce), nil + return Nonce(nonce), nil //nolint } func (s *redisStore) Count(ctx context.Context) (n int, err error) { diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httputil/dmsghttp.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/dmsghttp.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httputil/dmsghttp.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/dmsghttp.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httputil/error.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/error.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httputil/error.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/error.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httputil/health.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/health.go similarity index 94% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httputil/health.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/health.go index 015071d7..38737f96 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/httputil/health.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/health.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" ) var path = "/health" diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httputil/httputil.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/httputil.go similarity index 97% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httputil/httputil.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/httputil.go index f63b08ba..75836224 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/httputil/httputil.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/httputil.go @@ -12,7 +12,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var json = jsoniter.ConfigFastest diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/httputil/log.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/log.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/httputil/log.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil/log.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/logging/formatter.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/formatter.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/logging/formatter.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/formatter.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/logging/hooks.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/hooks.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/logging/hooks.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/hooks.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/logging/logger.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/logger.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/logging/logger.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/logger.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/logging/logging.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/logging.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/logging/logging.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging/logging.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/http.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/http.go similarity index 92% rename from vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/http.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/http.go index 2515cdab..6957dc29 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/http.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/http.go @@ -12,7 +12,7 @@ import ( // AddMetricsHandler adds a prometheus-format Handle at '/metrics' to the provided serve mux. func AddMetricsHandler(mux *chi.Mux) { - mux.HandleFunc("/metrics", func(w http.ResponseWriter, r *http.Request) { + mux.HandleFunc("/metrics", func(w http.ResponseWriter, _ *http.Request) { metrics.WritePrometheus(w, true) }) } diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/request_duration_middleware.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/request_duration_middleware.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/request_duration_middleware.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/request_duration_middleware.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/requests_in_flight_count_middleware.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/requests_in_flight_count_middleware.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/requests_in_flight_count_middleware.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/requests_in_flight_count_middleware.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/status_response_writer.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/status_response_writer.go similarity index 97% rename from vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/status_response_writer.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/status_response_writer.go index 578de431..a2fd762e 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/status_response_writer.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/status_response_writer.go @@ -1,7 +1,9 @@ // Package metricsutil pkg/metricsutil/status_response_writer.go package metricsutil -import "net/http" +import ( + "net/http" +) // StatusResponseWriter wraps `http.ResponseWriter` but stores status code // on call to `WriteHeader`. diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/victoria_metrics_int_gauge_wrapper.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/victoria_metrics_int_gauge_wrapper.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/victoria_metrics_int_gauge_wrapper.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/victoria_metrics_int_gauge_wrapper.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/victoria_metrics_uint_gauge_wrapper.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/victoria_metrics_uint_gauge_wrapper.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/metricsutil/victoria_metrics_uint_gauge_wrapper.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil/victoria_metrics_uint_gauge_wrapper.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/copy.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/copy.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/netutil/copy.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/copy.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net.go similarity index 97% rename from vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net.go index f629b999..fe5e5689 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net.go @@ -126,9 +126,9 @@ func HasPublicIP() (bool, error) { func ExtractPort(addr net.Addr) (uint16, error) { switch address := addr.(type) { case *net.TCPAddr: - return uint16(address.Port), nil + return uint16(address.Port), nil //nolint case *net.UDPAddr: - return uint16(address.Port), nil + return uint16(address.Port), nil //nolint default: return 0, fmt.Errorf("extract port: invalid address: %s", addr.String()) } diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net_darwin.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net_darwin.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net_darwin.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net_darwin.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net_linux.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net_linux.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net_linux.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net_linux.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net_windows.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net_windows.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/netutil/net_windows.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/net_windows.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/porter.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/porter.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/netutil/porter.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/porter.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/netutil/retrier.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/retrier.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/netutil/retrier.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil/retrier.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/networkmonitor/networkmonitor.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/networkmonitor/networkmonitor.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/networkmonitor/networkmonitor.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/networkmonitor/networkmonitor.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/skyenv/values.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv/values.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/skyenv/values.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv/values.go diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/storeconfig/storeconfig.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig/storeconfig.go similarity index 98% rename from vendor/github.com/skycoin/skywire-utilities/pkg/storeconfig/storeconfig.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig/storeconfig.go index 8924398e..8d178191 100644 --- a/vendor/github.com/skycoin/skywire-utilities/pkg/storeconfig/storeconfig.go +++ b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig/storeconfig.go @@ -1,7 +1,9 @@ // Package storeconfig pkg/storeconfig/storeconfig.go package storeconfig -import "os" +import ( + "os" +) // Type is a config type. type Type int diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/tcpproxy/http.go b/vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy/http.go similarity index 100% rename from vendor/github.com/skycoin/skywire-utilities/pkg/tcpproxy/http.go rename to vendor/github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy/http.go diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/discovery.go b/vendor/github.com/skycoin/skywire/pkg/transport/discovery.go index aaf93df3..b1e245cd 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/discovery.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/discovery.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // DiscoveryClient performs Transport discovery operations. diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/entry.go b/vendor/github.com/skycoin/skywire/pkg/transport/entry.go index 17952dc0..11d2182b 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/entry.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/entry.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/handshake.go b/vendor/github.com/skycoin/skywire/pkg/transport/handshake.go index a773da67..70759293 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/handshake.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/handshake.go @@ -9,9 +9,9 @@ import ( "io" "net/http" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) @@ -96,7 +96,7 @@ func (hs SettlementHS) Do(ctx context.Context, dc DiscoveryClient, transport net // The handshake logic only REGISTERS the transport, and does not update the status of the transport. func MakeSettlementHS(init bool, log *logging.Logger) SettlementHS { // initiating logic. - initHS := func(ctx context.Context, dc DiscoveryClient, transport network.Transport, sk cipher.SecKey) (err error) { //nolint + initHS := func(_ context.Context, _ DiscoveryClient, transport network.Transport, sk cipher.SecKey) (err error) { entry := makeEntryFromTransport(transport) // create signed entry and send it to responding visor. diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/log.go b/vendor/github.com/skycoin/skywire/pkg/transport/log.go index c16eea21..d5f66546 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/log.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/log.go @@ -17,7 +17,7 @@ import ( "github.com/gocarina/gocsv" "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const dateFormat string = "2006-01-02" diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/managed_transport.go b/vendor/github.com/skycoin/skywire/pkg/transport/managed_transport.go index 22e0d428..2fef47f5 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/managed_transport.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/managed_transport.go @@ -12,13 +12,13 @@ import ( "sync/atomic" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport/network" ) @@ -374,7 +374,7 @@ func (mt *ManagedTransport) WritePacket(ctx context.Context, packet routing.Pack return err } if n > routing.PacketHeaderSize { - mt.logSent(uint64(n - routing.PacketHeaderSize)) + mt.logSent(uint64(n - routing.PacketHeaderSize)) //nolint: gosec } return nil } @@ -412,7 +412,7 @@ func (mt *ManagedTransport) readPacket() (packet routing.Packet, err error) { packet = append(h, p...) if n := len(packet); n > routing.PacketHeaderSize { - mt.logRecv(uint64(n - routing.PacketHeaderSize)) + mt.logRecv(uint64(n - routing.PacketHeaderSize)) //nolint: gosec } log.WithField("type", packet.Type().String()). diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/manager.go b/vendor/github.com/skycoin/skywire/pkg/transport/manager.go index 07a6db97..9a8d934f 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/manager.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/manager.go @@ -12,11 +12,11 @@ import ( "github.com/google/uuid" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/client.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/client.go index 514e8f1d..0d5a0759 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/client.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/client.go @@ -18,11 +18,11 @@ import ( "github.com/AudriusButkevicius/pfilter" "github.com/xtaci/kcp-go" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/httpauth" "github.com/skycoin/skywire/internal/packetfilter" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) const ( diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/mock_api_client.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/mock_api_client.go index 5ed51368..6ad5f708 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/mock_api_client.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/addrresolver/mock_api_client.go @@ -8,7 +8,7 @@ import ( pfilter "github.com/AudriusButkevicius/pfilter" mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockAPIClient is an autogenerated mock type for the APIClient type diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/client.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/client.go index 2742f88d..44ce48f9 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/client.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/client.go @@ -12,9 +12,9 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appevent" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" "github.com/skycoin/skywire/pkg/transport/network/handshake" "github.com/skycoin/skywire/pkg/transport/network/porter" diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/connection.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/connection.go index 668fb62d..41521fe4 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/connection.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/connection.go @@ -9,8 +9,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/noise" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network/handshake" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/dmsg.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/dmsg.go index b990c36b..db83d1f6 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/dmsg.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/dmsg.go @@ -8,7 +8,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // dmsgClientAdapter is a wrapper around dmsg.Client to conform to Client diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/handshake/handshake.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/handshake/handshake.go index 46fccfc7..513694f5 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/handshake/handshake.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/handshake/handshake.go @@ -12,7 +12,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( @@ -113,7 +113,6 @@ func MakeF2PortChecker(portChecker func(port uint16) error) CheckF2 { // ResponderHandshake creates the handshake logic on the responder's side. func ResponderHandshake(checkF2 CheckF2) Handshake { - // return handshakeMiddleware(func(conn net.Conn, deadline time.Time) (lAddr, rAddr dmsg.Addr, err error) { return handshakeMiddleware(func(conn net.Conn, _ time.Time) (lAddr, rAddr dmsg.Addr, err error) { if err = readFrame0(conn); err != nil { return dmsg.Addr{}, dmsg.Addr{}, err diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/listener.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/listener.go index 4bb2b378..f9117628 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/listener.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/listener.go @@ -8,7 +8,7 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Listener represents a skywire network listener. It wraps net.Listener diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/mock_dialer.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/mock_dialer.go index 7de80431..c9049803 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/mock_dialer.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/mock_dialer.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" - cipher "github.com/skycoin/skywire-utilities/pkg/cipher" + cipher "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // MockDialer is an autogenerated mock type for the Dialer type diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/network.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/network.go index 8ea2b017..938e2933 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/network.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/network.go @@ -6,7 +6,7 @@ import ( "errors" "net" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // Type is a type of network. Type affects the way connection is established diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp.go index 1595a43b..87cfddcb 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp.go @@ -7,7 +7,7 @@ import ( "io" "net" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network/stcp" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp/pktable.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp/pktable.go index eddb8551..8065dc4e 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp/pktable.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/stcp/pktable.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const expectedFieldsLen = 2 diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/stcpr.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/stcpr.go index 3e882ca5..8690a453 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/stcpr.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/stcpr.go @@ -8,8 +8,8 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) type stcprClient struct { diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/stun_client.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/stun_client.go index cf3d81bd..3e28b30e 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/stun_client.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/stun_client.go @@ -4,7 +4,7 @@ package network import ( "github.com/ccding/go-stun/stun" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // StunDetails represents the visors public network details. diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/network/sudph.go b/vendor/github.com/skycoin/skywire/pkg/transport/network/sudph.go index e03785e9..c6c01bea 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/network/sudph.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/network/sudph.go @@ -12,8 +12,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/xtaci/kcp-go" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/internal/packetfilter" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" "github.com/skycoin/skywire/pkg/transport/network/handshake" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/setup/rpc.go b/vendor/github.com/skycoin/skywire/pkg/transport/setup/rpc.go index 3fd4d1f4..7754ca19 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/setup/rpc.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/setup/rpc.go @@ -7,8 +7,8 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/setup/visor.go b/vendor/github.com/skycoin/skywire/pkg/transport/setup/visor.go index c62a4469..8a7aff5c 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/setup/visor.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/setup/visor.go @@ -9,9 +9,9 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/tpdclient/client.go b/vendor/github.com/skycoin/skywire/pkg/transport/tpdclient/client.go index b96e9c53..d694f348 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/tpdclient/client.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/tpdclient/client.go @@ -10,10 +10,10 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/transport/transport.go b/vendor/github.com/skycoin/skywire/pkg/transport/transport.go index 2174a546..b0061a0b 100644 --- a/vendor/github.com/skycoin/skywire/pkg/transport/transport.go +++ b/vendor/github.com/skycoin/skywire/pkg/transport/transport.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport/network" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/utclient/client.go b/vendor/github.com/skycoin/skywire/pkg/utclient/client.go index eb2fbbbf..41fd2f75 100644 --- a/vendor/github.com/skycoin/skywire/pkg/utclient/client.go +++ b/vendor/github.com/skycoin/skywire/pkg/utclient/client.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/httpauth" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) //go:generate mockery -name APIClient -case underscore -inpkg diff --git a/vendor/github.com/skycoin/skywire/pkg/util/cipherutil/cipherutil.go b/vendor/github.com/skycoin/skywire/pkg/util/cipherutil/cipherutil.go index 0d5407d1..0adc893c 100644 --- a/vendor/github.com/skycoin/skywire/pkg/util/cipherutil/cipherutil.go +++ b/vendor/github.com/skycoin/skywire/pkg/util/cipherutil/cipherutil.go @@ -1,7 +1,7 @@ // Package cipherutil works with public keys package cipherutil -import "github.com/skycoin/skywire-utilities/pkg/cipher" +import "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" // KeyPair is a pair of public and secret keys type KeyPair struct { diff --git a/vendor/github.com/skycoin/skywire/pkg/util/osutil/privileges_windows.go b/vendor/github.com/skycoin/skywire/pkg/util/osutil/privileges_windows.go index 32ae6459..5c1eb3cd 100644 --- a/vendor/github.com/skycoin/skywire/pkg/util/osutil/privileges_windows.go +++ b/vendor/github.com/skycoin/skywire/pkg/util/osutil/privileges_windows.go @@ -13,6 +13,6 @@ func GainRoot() (int, error) { } // ReleaseRoot releases root privileges, not needed on windows -func ReleaseRoot(oldUID int) error { +func ReleaseRoot(_ int) error { return nil } diff --git a/vendor/github.com/skycoin/skywire/pkg/util/pathutil/configpath.go b/vendor/github.com/skycoin/skywire/pkg/util/pathutil/configpath.go index 1479cafd..89664c9c 100644 --- a/vendor/github.com/skycoin/skywire/pkg/util/pathutil/configpath.go +++ b/vendor/github.com/skycoin/skywire/pkg/util/pathutil/configpath.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var log = logging.MustGetLogger("pathutil") diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/api.go b/vendor/github.com/skycoin/skywire/pkg/visor/api.go index 8e63206d..39d878bf 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/api.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/api.go @@ -21,16 +21,16 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/visor/dmsgtracker" @@ -1393,19 +1393,19 @@ func (v *Visor) TestVisor(conf PingConfig) ([]TestResult, error) { result = append(result, TestResult{PK: conf.PK.String(), Max: fmt.Sprint(0), Min: fmt.Sprint(0), Mean: fmt.Sprint(0), Status: "Failed"}) continue } - var max, min, mean, sumLatency time.Duration - min = time.Duration(10000000000) + var maxx, minn, mean, sumLatency time.Duration + minn = time.Duration(10000000000) for _, latency := range latencies { - if latency > max { - max = latency + if latency > maxx { + maxx = latency } - if latency < min { - min = latency + if latency < minn { + minn = latency } sumLatency += latency } mean = sumLatency / time.Duration(len(latencies)) - result = append(result, TestResult{PK: conf.PK.String(), Max: fmt.Sprint(max), Min: fmt.Sprint(min), Mean: fmt.Sprint(mean), Status: "Success"}) + result = append(result, TestResult{PK: conf.PK.String(), Max: fmt.Sprint(maxx), Min: fmt.Sprint(minn), Mean: fmt.Sprint(mean), Status: "Success"}) v.StopPing(conf.PK) //nolint } return result, nil diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/cmd.go b/vendor/github.com/skycoin/skywire/pkg/visor/cmd.go index 9b626b07..31a23965 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/cmd.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/cmd.go @@ -16,8 +16,8 @@ import ( "github.com/bitfield/script" "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) @@ -57,8 +57,10 @@ var ( isForceColor bool ) +// TODO: fix gocyclo error. +// +//gocyclo:ignore func init() { - root = visorconfig.IsRoot() RootCmd.Flags().SortFlags = false //the default is not set to fix the aesthetic of the help command diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/dmsgtracker/dmsg_tracker.go b/vendor/github.com/skycoin/skywire/pkg/visor/dmsgtracker/dmsg_tracker.go index 6acbf1ea..c5d375fd 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/dmsgtracker/dmsg_tracker.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/dmsgtracker/dmsg_tracker.go @@ -11,8 +11,8 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/skycoin/dmsg/pkg/dmsgctrl" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/etc.go b/vendor/github.com/skycoin/skywire/pkg/visor/etc.go index 02989ec6..0798670f 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/etc.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/etc.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // func initPProf(log *logging.MasterLogger, profMode string, profAddr string) (stop func()) { diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/gui.go b/vendor/github.com/skycoin/skywire/pkg/visor/gui.go index 3d3b60ca..81d9d5b4 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/gui.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/gui.go @@ -25,9 +25,9 @@ import ( "github.com/skycoin/systray" "github.com/toqueteos/webbrowser" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" "github.com/skycoin/skywire/static/icons" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/hypervisor.go b/vendor/github.com/skycoin/skywire/pkg/visor/hypervisor.go index 182b4e50..b4dc9d0b 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/hypervisor.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/hypervisor.go @@ -23,13 +23,13 @@ import ( "github.com/skycoin/dmsg/pkg/dmsgpty" coincipher "github.com/skycoin/skycoin/src/cipher" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/visor/dmsgtracker" "github.com/skycoin/skywire/pkg/visor/rewardconfig" @@ -179,7 +179,7 @@ func (hv *Hypervisor) AddMockData(config MockConfig) error { hv.remoteVisors[pk] = Conn{ Addr: dmsg.Addr{ PK: pk, - Port: uint16(i), //nolint + Port: uint16(i), //nolint: gosec }, API: client, } @@ -619,8 +619,10 @@ func (hv *Hypervisor) getAppStats() http.HandlerFunc { }) } -// TODO: simplify // nolint: funlen,gocognit,godox +// TODO: fix gocyclo error. +// +//gocyclo:ignore func (hv *Hypervisor) putApp() http.HandlerFunc { return hv.withCtx(hv.appCtx, func(w http.ResponseWriter, r *http.Request, ctx *httpCtx) { type req struct { diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/init.go b/vendor/github.com/skycoin/skywire/pkg/visor/init.go index c793712a..3e25e46a 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/init.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/init.go @@ -31,9 +31,6 @@ import ( "github.com/skycoin/dmsg/pkg/dmsgpty" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" - "github.com/skycoin/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/internal/vpn" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appevent" @@ -46,6 +43,9 @@ import ( "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" @@ -887,6 +887,9 @@ func handlePingConn(log *logging.Logger, remoteConn net.Conn, v *Visor) { } // getRouteSetupHooks aka autotransport +// TODO: fix gocyclo error. +// +//gocyclo:ignore func getRouteSetupHooks(ctx context.Context, v *Visor, log *logging.Logger) []router.RouteSetupHook { retrier := netutil.NewRetrier(log, time.Second, time.Second*20, 3, 1.3) return []router.RouteSetupHook{ @@ -1298,6 +1301,9 @@ func initEnsureVisorIsTransportable(ctx context.Context, v *Visor, log *logging. return nil } +// TODO: fix gocyclo error. +// +//gocyclo:ignore func initEnsureTPDConcurrency(ctx context.Context, v *Visor, log *logging.Logger) error { //nolint:all const tickDuration = 5 * time.Minute ticker := time.NewTicker(tickDuration) @@ -1408,6 +1414,9 @@ func initPublicVisor(_ context.Context, v *Visor, log *logging.Logger) error { / return nil } +// TODO: fix gocyclo error. +// +//gocyclo:ignore func initDmsgpty(ctx context.Context, v *Visor, log *logging.Logger) error { conf := v.conf.Dmsgpty diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/logserver/api.go b/vendor/github.com/skycoin/skywire/pkg/visor/logserver/api.go index 7dc85550..9011860b 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/logserver/api.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/logserver/api.go @@ -12,10 +12,10 @@ import ( "github.com/gin-gonic/gin" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/logstore/logstore.go b/vendor/github.com/skycoin/skywire/pkg/visor/logstore/logstore.go index 87fa134a..2b3e408a 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/logstore/logstore.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/logstore/logstore.go @@ -24,10 +24,10 @@ type Store interface { // overwriting the oldest entry when over the capacity // returned hook should be registered in logrus master logger to // store log entries -func MakeStore(max int) (Store, logrus.Hook) { - entries := make([]string, max) +func MakeStore(maxx int) (Store, logrus.Hook) { + entries := make([]string, maxx) formatter := &logrus.JSONFormatter{} - store := &store{cap: int64(max), entries: entries, formatter: formatter} + store := &store{cap: int64(maxx), entries: entries, formatter: formatter} return store, store } diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/ping.go b/vendor/github.com/skycoin/skywire/pkg/visor/ping.go index 45263ef9..e2025353 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/ping.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/ping.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) type ping struct { diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/rpc.go b/vendor/github.com/skycoin/skywire/pkg/visor/rpc.go index 2b713bf8..690de4ca 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/rpc.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/rpc.go @@ -10,12 +10,12 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/util/rpcutil" diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client.go b/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client.go index ab8381a6..600d4fff 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client.go @@ -16,15 +16,15 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appcommon" "github.com/skycoin/skywire/pkg/app/appnet" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/router" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/servicedisc" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/util/cipherutil" diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client_serve.go b/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client_serve.go index 0dafa105..cdbc4778 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client_serve.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/rpc_client_serve.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/netutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil" ) func isDone(ctx context.Context) bool { diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/survey.go b/vendor/github.com/skycoin/skywire/pkg/visor/survey.go index 7574b2a6..3dd43d54 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/survey.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/survey.go @@ -10,7 +10,7 @@ import ( coincipher "github.com/skycoin/skycoin/src/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/util/pathutil" visconf "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user.go b/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user.go index 9f469b8e..f889226a 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user.go @@ -12,7 +12,7 @@ import ( "go.etcd.io/bbolt" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) const ( diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user_manager.go b/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user_manager.go index f7d8d274..edb1dce5 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user_manager.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/usermanager/user_manager.go @@ -13,8 +13,8 @@ import ( "github.com/google/uuid" "github.com/gorilla/securecookie" - "github.com/skycoin/skywire-utilities/pkg/httputil" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/visor/visorconfig" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visor.go b/vendor/github.com/skycoin/skywire/pkg/visor/visor.go index 4fb66884..510ef987 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visor.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visor.go @@ -18,9 +18,6 @@ import ( "github.com/skycoin/dmsg/pkg/dmsg" "github.com/toqueteos/webbrowser" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/cmdutil" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appdisc" "github.com/skycoin/skywire/pkg/app/appevent" "github.com/skycoin/skywire/pkg/app/appnet" @@ -28,6 +25,9 @@ import ( "github.com/skycoin/skywire/pkg/app/launcher" "github.com/skycoin/skywire/pkg/routefinder/rfclient" "github.com/skycoin/skywire/pkg/router" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" "github.com/skycoin/skywire/pkg/transport/network/addrresolver" diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/common.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/common.go index 9c492b28..9abc743e 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/common.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/common.go @@ -6,8 +6,8 @@ import ( "errors" "os" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) const ( diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/config.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/config.go index b5984103..2d22ed78 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/config.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/config.go @@ -12,12 +12,12 @@ import ( coinCipher "github.com/skycoin/skycoin/src/cipher" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/dmsgc" "github.com/skycoin/skywire/pkg/routing" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" "github.com/skycoin/skywire/pkg/transport/network" ) @@ -126,6 +126,9 @@ func MakeBaseConfig(common *Common, testEnv bool, dmsgHTTP bool, services *Servi // The config's 'sk' field will be nil if not specified. // Generated config will be saved to 'confPath'. // This function always returns the latest config version. +// TODO: fix gocyclo error. +// +//gocyclo:ignore func MakeDefaultConfig(log *logging.MasterLogger, sk *cipher.SecKey, usrEnv bool, pkgEnv bool, testEnv bool, dmsgHTTP bool, hypervisor bool, confPath, hypervisorPKs string, services *Services) (*V1, error) { if usrEnv && pkgEnv { log.Fatal("usrEnv and pkgEnv are mutually exclusive") diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/hypervisorconfig.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/hypervisorconfig.go index aa2476cd..b9ae59ad 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/hypervisorconfig.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/hypervisorconfig.go @@ -12,7 +12,7 @@ import ( "time" "github.com/skycoin/skywire" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/util/pathutil" ) diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/parse.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/parse.go index 9dd3afb1..bf6559fe 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/parse.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/parse.go @@ -8,8 +8,8 @@ import ( "github.com/blang/semver/v4" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) var ( diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/services.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/services.go index c3f3c4c8..9d610fa4 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/services.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/services.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/skycoin/skywire-utilities/pkg/cipher" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Fetch fetches the service URLs & ip:ports from the config service endpoint diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/v1.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/v1.go index 3f19d26f..bd80d471 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/v1.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/v1.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/app/appserver" "github.com/skycoin/skywire/pkg/app/launcher" "github.com/skycoin/skywire/pkg/dmsgc" "github.com/skycoin/skywire/pkg/routing" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/transport" "github.com/skycoin/skywire/pkg/transport/network" ) @@ -288,15 +288,15 @@ func (v1 *V1) AddAppConfig(launch *launcher.AppLauncher, appName, binaryName str } var randomNumber int for { - min := 10 - max := 99 - randomNumber = rand.Intn(max-min+1) + min //nolint - if _, ok := busyPorts[routing.Port(randomNumber)]; !ok { //nolint + minn := 10 + maxx := 99 + randomNumber = rand.Intn(maxx-minn+1) + minn //nolint: gosec + if _, ok := busyPorts[routing.Port(randomNumber)]; !ok { //nolint: gosec break } } - conf.Apps = append(conf.Apps, appserver.AppConfig{Name: appName, Binary: binaryName, Port: routing.Port(randomNumber)}) //nolint + conf.Apps = append(conf.Apps, appserver.AppConfig{Name: appName, Binary: binaryName, Port: routing.Port(randomNumber)}) //nolint: gosec launch.ResetConfig(launcher.AppLauncherConfig{ VisorPK: v1.PK, diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values.go index 4fa7cb98..73bb5001 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values.go @@ -5,16 +5,15 @@ import ( "fmt" "os" "os/exec" - "os/user" "path/filepath" "strings" "github.com/bitfield/script" "github.com/skycoin/dmsg/pkg/dmsg" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) var ( @@ -37,92 +36,175 @@ var ( // Dmsg port constants. // TODO(evanlinjin): Define these properly. These are currently random. - DmsgCtrlPort = skyenv.DmsgCtrlPort // DmsgCtrlPort Listening port for dmsgctrl protocol (similar to TCP Echo Protocol). - DmsgSetupPort = skyenv.DmsgSetupPort // DmsgSetupPort Listening port of a setup node. - DmsgHypervisorPort = skyenv.DmsgHypervisorPort // DmsgHypervisorPort Listening port of a hypervisor for incoming RPC visor connections over dmsg. - DmsgTransportSetupPort = skyenv.DmsgTransportSetupPort // DmsgTransportSetupPort Listening port for transport setup RPC over dmsg. - DmsgHTTPPort = dmsg.DefaultDmsgHTTPPort // DmsgHTTPPort Listening port for dmsghttp logserver. - DmsgAwaitSetupPort = skyenv.DmsgAwaitSetupPort // DmsgAwaitSetupPort Listening port of a visor for setup operations. + // DmsgCtrlPort Listening port for dmsgctrl protocol (similar to TCP Echo Protocol). + DmsgCtrlPort = skyenv.DmsgCtrlPort + + // DmsgSetupPort Listening port of a setup node. + DmsgSetupPort = skyenv.DmsgSetupPort + + // DmsgHypervisorPort Listening port of a hypervisor for incoming RPC visor connections over dmsg. + DmsgHypervisorPort = skyenv.DmsgHypervisorPort + + // DmsgTransportSetupPort Listening port for transport setup RPC over dmsg. + DmsgTransportSetupPort = skyenv.DmsgTransportSetupPort + + // DmsgHTTPPort Listening port for dmsghttp logserver. + DmsgHTTPPort = dmsg.DefaultDmsgHTTPPort + + // DmsgAwaitSetupPort Listening port of a visor for setup operations. + DmsgAwaitSetupPort = skyenv.DmsgAwaitSetupPort // Transport port constants. - TransportPort = skyenv.TransportPort // TransportPort Listening port of a visor for incoming transports. - PublicAutoconnect = skyenv.PublicAutoconnect // PublicAutoconnect ... + // TransportPort Listening port of a visor for incoming transports. + TransportPort = skyenv.TransportPort + + // PublicAutoconnect ... + PublicAutoconnect = skyenv.PublicAutoconnect // Dmsgpty constants. - DmsgPtyPort = skyenv.DmsgPtyPort // DmsgPtyPort ... - DmsgPtyCLINet = skyenv.DmsgPtyCLINet // DmsgPtyCLINet ... + // DmsgPtyPort ... + DmsgPtyPort = skyenv.DmsgPtyPort + + // DmsgPtyCLINet ... + DmsgPtyCLINet = skyenv.DmsgPtyCLINet // Skywire-TCP constants. - STCPAddr = skyenv.STCPAddr // STCPAddr ... + // STCPAddr ... + STCPAddr = skyenv.STCPAddr // Default skywire app constants. - SkychatName = skyenv.SkychatName // SkychatName ... - SkychatPort = skyenv.SkychatPort // SkychatPort ... - SkychatAddr = skyenv.SkychatAddr // SkychatAddr ... + // SkychatName ... + SkychatName = skyenv.SkychatName + + // SkychatPort ... + SkychatPort = skyenv.SkychatPort + + // SkychatAddr ... + SkychatAddr = skyenv.SkychatAddr - PingTestName = skyenv.PingTestName // PingTestName ... - PingTestPort = skyenv.PingTestPort // PingTestPort ... + // PingTestName ... + PingTestName = skyenv.PingTestName - SkysocksName = skyenv.SkysocksName // SkysocksName ... - SkysocksPort = skyenv.SkysocksPort // SkysocksPort ... + // PingTestPort ... + PingTestPort = skyenv.PingTestPort - SkysocksClientName = skyenv.SkysocksClientName // SkysocksClientName ... - SkysocksClientPort = skyenv.SkysocksClientPort // SkysocksClientPort ... - SkysocksClientAddr = skyenv.SkysocksClientAddr // SkysocksClientAddr ... + // SkysocksName ... + SkysocksName = skyenv.SkysocksName - VPNServerName = skyenv.VPNServerName // VPNServerName ... - VPNServerPort = skyenv.VPNServerPort // VPNServerPort ... + // SkysocksPort ... + SkysocksPort = skyenv.SkysocksPort - VPNClientName = skyenv.VPNClientName // VPNClientName ... + // SkysocksClientName ... + SkysocksClientName = skyenv.SkysocksClientName + + // SkysocksClientPort ... + SkysocksClientPort = skyenv.SkysocksClientPort + + // SkysocksClientAddr ... + SkysocksClientAddr = skyenv.SkysocksClientAddr + + // VPNServerName ... + VPNServerName = skyenv.VPNServerName + + // VPNServerPort ... + VPNServerPort = skyenv.VPNServerPort + + // VPNClientName ... + VPNClientName = skyenv.VPNClientName // TODO(darkrengarius): this one's not needed for the app to run but lack of it causes errors - VPNClientPort = skyenv.VPNClientPort // VPNClientPort ... + // VPNClientPort ... + VPNClientPort = skyenv.VPNClientPort + + // ExampleServerName ... + ExampleServerName = skyenv.ExampleServerName + + // ExampleServerPort ... + ExampleServerPort = skyenv.ExampleServerPort + + // ExampleClientName ... + ExampleClientName = skyenv.ExampleClientName + + // ExampleClientPort ... + ExampleClientPort = skyenv.ExampleClientPort - ExampleServerName = skyenv.ExampleServerName // ExampleServerName ... - ExampleServerPort = skyenv.ExampleServerPort // ExampleServerPort ... - ExampleClientName = skyenv.ExampleClientName // ExampleClientName ... - ExampleClientPort = skyenv.ExampleClientPort // ExampleClientPort ... - SkyForwardingServerName = skyenv.SkyForwardingServerName // SkyForwardingServerName ... - SkyForwardingServerPort = skyenv.SkyForwardingServerPort // SkyForwardingServerPort ... - SkyPingName = skyenv.SkyPingName // SkyPingName ... - SkyPingPort = skyenv.SkyPingPort // SkyPingPort ... + // SkyForwardingServerName ... + SkyForwardingServerName = skyenv.SkyForwardingServerName + + // SkyForwardingServerPort ... + SkyForwardingServerPort = skyenv.SkyForwardingServerPort + + // SkyPingName ... + SkyPingName = skyenv.SkyPingName + + // SkyPingPort ... + SkyPingPort = skyenv.SkyPingPort // RPC constants. - RPCAddr = skyenv.RPCAddr // RPCAddr ... - RPCTimeout = skyenv.RPCTimeout // RPCTimeout ... - TransportRPCTimeout = skyenv.TransportRPCTimeout // TransportRPCTimeout ... - UpdateRPCTimeout = skyenv.UpdateRPCTimeout // UpdateRPCTimeout ... + // RPCAddr ... + RPCAddr = skyenv.RPCAddr + + // RPCTimeout ... + RPCTimeout = skyenv.RPCTimeout + + // TransportRPCTimeout ... + TransportRPCTimeout = skyenv.TransportRPCTimeout + + // UpdateRPCTimeout ... + UpdateRPCTimeout = skyenv.UpdateRPCTimeout // Default skywire app server and discovery constants - AppSrvAddr = skyenv.AppSrvAddr // AppSrvAddr ... - ServiceDiscUpdateInterval = skyenv.ServiceDiscUpdateInterval // ServiceDiscUpdateInterval ... - AppBinPath = skyenv.AppBinPath // AppBinPath ... - LogLevel = skyenv.LogLevel // LogLevel ... + // AppSrvAddr ... + AppSrvAddr = skyenv.AppSrvAddr + + // ServiceDiscUpdateInterval ... + ServiceDiscUpdateInterval = skyenv.ServiceDiscUpdateInterval + + // AppBinPath ... + AppBinPath = skyenv.AppBinPath + + // LogLevel ... + LogLevel = skyenv.LogLevel // Routing constants - TpLogStore = skyenv.TpLogStore // TpLogStore ... - Custom = skyenv.Custom // Custom ... + // TpLogStore ... + TpLogStore = skyenv.TpLogStore + + // Custom ... + Custom = skyenv.Custom // Local constants - LocalPath = skyenv.LocalPath // LocalPath ... + // LocalPath ... + LocalPath = skyenv.LocalPath // Default hypervisor constants - HypervisorDB = skyenv.HypervisorDB // HypervisorDB ... - EnableAuth = skyenv.EnableAuth // EnableAuth ... - PackageEnableAuth = skyenv.PackageEnableAuth // PackageEnableAuth ... - EnableTLS = skyenv.EnableTLS // EnableTLS ... - TLSKey = skyenv.TLSKey // TLSKey ... - TLSCert = skyenv.TLSCert // TLSCert ... + // HypervisorDB ... + HypervisorDB = skyenv.HypervisorDB + + // EnableAuth ... + EnableAuth = skyenv.EnableAuth + + // PackageEnableAuth ... + PackageEnableAuth = skyenv.PackageEnableAuth + + // EnableTLS ... + EnableTLS = skyenv.EnableTLS + + // TLSKey ... + TLSKey = skyenv.TLSKey + + // TLSCert ... + TLSCert = skyenv.TLSCert // IPCShutdownMessageType sends IPC shutdown message type IPCShutdownMessageType = skyenv.IPCShutdownMessageType @@ -221,12 +303,6 @@ func Config() skyenv.PkgConfig { return UserConfig() } -// IsRoot checks for root permissions -func IsRoot() bool { - userLvl, _ := user.Current() //nolint - return userLvl.Username == "root" -} - var ( // VisorConfigFile will contain the path to the visor's config or `stdin` to denote that the config was read from STDIN VisorConfigFile string diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_darwin.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_darwin.go index bc0e7e2e..31c2fe5d 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_darwin.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_darwin.go @@ -4,13 +4,19 @@ package visorconfig import ( + "net" + "os" + "os/user" "runtime" + "strings" + "time" "github.com/google/uuid" "github.com/jaypipes/ghw" + "github.com/zcalusic/sysinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // UserConfig contains installation paths for running skywire as the user @@ -28,10 +34,12 @@ func UserConfig() skyenv.PkgConfig { // Survey system hardware survey struct type Survey struct { + Timestamp time.Time `json:"timestamp"` PubKey cipher.PubKey `json:"public_key,omitempty"` SkycoinAddress string `json:"skycoin_address,omitempty"` GOOS string `json:"go_os,omitempty"` GOARCH string `json:"go_arch,omitempty"` + SYSINFO customSysinfo `json:"zcalusic_sysinfo,omitempty"` IPAddr string `json:"ip_address,omitempty"` Disks *ghw.BlockInfo `json:"ghw_blockinfo,omitempty"` UUID uuid.UUID `json:"uuid,omitempty"` @@ -46,20 +54,89 @@ func SystemSurvey() (Survey, error) { if err != nil { return Survey{}, err } - // var ipAddr string - // for { - // ipAddr, err = FetchIP(dmsgDisc) - // if err == nil { - // break - // } - // } s := Survey{ - // IPAddr: ipAddr, + Timestamp: time.Now(), GOOS: runtime.GOOS, GOARCH: runtime.GOARCH, + SYSINFO: genSysInfo(), UUID: uuid.New(), Disks: disks, SkywireVersion: Version(), } return s, nil } + +// IsRoot checks for root permissions +func IsRoot() bool { + userLvl, _ := user.Current() //nolint + return userLvl.Username == "root" +} + +type customSysinfo struct { + Network []sysinfo.NetworkDevice `json:"network,omitempty"` + Node sysinfo.Node `json:"node,omitempty"` +} + +func genSysInfo() customSysinfo { + var sysInfo customSysinfo + sysInfo.Network = getMacAddr() + sysInfo.Node.Hypervisor = getNodeHypervisor() + return sysInfo +} + +func getMacAddr() []sysinfo.NetworkDevice { + si := make([]sysinfo.NetworkDevice, 1) + interfaces, err := net.Interfaces() + if err != nil { + return si + } + for _, ifa := range interfaces { + si[0].MACAddress = ifa.HardwareAddr.String() + if si[0].MACAddress != "" { + return si + } + } + return si +} + +func getNodeHypervisor() string { + // Check docker + // Check for the /.dockerenv file + if _, err := os.Stat("/.dockerenv"); err == nil { + return "docker" + } + // Check for cgroup indicating Docker or container environment + data, err := os.ReadFile("/proc/self/cgroup") + if err == nil && strings.Contains(string(data), "docker") { + return "docker" + } + + // Check other virtualization: kvm, xenhvm, virtualbox, vmware, qemu, hyperv + dmiFiles := []string{ + "/sys/class/dmi/id/product_name", + "/sys/class/dmi/id/sys_vendor", + } + + for _, file := range dmiFiles { + data, err := os.ReadFile(file) //nolint: gosec + if err == nil { + content := strings.ToLower(string(data)) + if strings.Contains(content, "kvm") { + return "kvm" + } else if strings.Contains(content, "xenhvm") { + return "xenhvm" + } else if strings.Contains(content, "virtualbox") { + return "virtualbox" + } else if strings.Contains(content, "vmware") { + return "vmware" + } else if strings.Contains(content, "qemu") { + return "qemu" + } else if strings.Contains(content, "hyperv") { + return "hyperv" + } + } + } + + // no virtual + return "" +} diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_linux.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_linux.go index 33f67550..ae7200db 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_linux.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_linux.go @@ -4,6 +4,7 @@ package visorconfig import ( + "os/user" "runtime" "strings" "time" @@ -12,8 +13,8 @@ import ( "github.com/jaypipes/ghw" "github.com/zcalusic/sysinfo" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // UserConfig contains installation paths for running skywire as the user @@ -63,16 +64,9 @@ func SystemSurvey() (Survey, error) { if err != nil && !strings.Contains(err.Error(), "Could not determine total usable bytes of memory") { return Survey{}, err } - // var ipAddr string - // for { - // ipAddr, err = FetchIP(dmsgDisc) - // if err == nil { - // break - // } - // } + s := Survey{ - Timestamp: time.Now(), - // IPAddr: ipAddr, + Timestamp: time.Now(), GOOS: runtime.GOOS, GOARCH: runtime.GOARCH, SYSINFO: si, @@ -84,3 +78,9 @@ func SystemSurvey() (Survey, error) { } return s, nil } + +// IsRoot checks for root permissions +func IsRoot() bool { + userLvl, _ := user.Current() //nolint + return userLvl.Username == "root" +} diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_windows.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_windows.go index a1831289..05a9702a 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_windows.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorconfig/values_windows.go @@ -4,13 +4,19 @@ package visorconfig import ( + "log" + "net" + "os" "runtime" + "strings" + "time" "github.com/google/uuid" "github.com/jaypipes/ghw" + "golang.org/x/sys/windows" - "github.com/skycoin/skywire-utilities/pkg/cipher" "github.com/skycoin/skywire/pkg/skyenv" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) // UserConfig contains installation paths for running skywire as the user @@ -28,10 +34,12 @@ func UserConfig() skyenv.PkgConfig { // Survey system hardware survey struct type Survey struct { + Timestamp time.Time `json:"timestamp"` PubKey cipher.PubKey `json:"public_key,omitempty"` SkycoinAddress string `json:"skycoin_address,omitempty"` GOOS string `json:"go_os,omitempty"` GOARCH string `json:"go_arch,omitempty"` + SYSINFO customSysinfo `json:"zcalusic_sysinfo,omitempty"` IPAddr string `json:"ip_address,omitempty"` Disks *ghw.BlockInfo `json:"ghw_blockinfo,omitempty"` Product *ghw.ProductInfo `json:"ghw_productinfo,omitempty"` @@ -56,18 +64,12 @@ func SystemSurvey() (Survey, error) { if err != nil { return Survey{}, err } - // var ipAddr string - // for { - // ipAddr, err = FetchIP(dmsgDisc) - // if err == nil { - // break - // } - // } s := Survey{ - // IPAddr: ipAddr, + Timestamp: time.Now(), GOOS: runtime.GOOS, GOARCH: runtime.GOARCH, + SYSINFO: genSysInfo(), UUID: uuid.New(), Disks: disks, Product: product, @@ -76,3 +78,107 @@ func SystemSurvey() (Survey, error) { } return s, nil } + +type customSysinfo struct { + Network []networkDevice `json:"network,omitempty"` + Node node `json:"node,omitempty"` +} +type networkDevice struct { + MACAddress string `json:"macaddress,omitempty"` +} + +type node struct { + Hypervisor string `json:"hypervisor,omitempty"` +} + +func genSysInfo() customSysinfo { + var sysInfo customSysinfo + sysInfo.Network = getMacAddr() + sysInfo.Node.Hypervisor = getNodeHypervisor() + return sysInfo +} + +func getMacAddr() []networkDevice { + si := make([]networkDevice, 1) + interfaces, err := net.Interfaces() + if err != nil { + return si + } + for _, ifa := range interfaces { + si[0].MACAddress = ifa.HardwareAddr.String() + if si[0].MACAddress != "" { + return si + } + } + return si +} + +func getNodeHypervisor() string { + // Check docker + // Check for the /.dockerenv file + if _, err := os.Stat("/.dockerenv"); err == nil { + return "docker" + } + // Check for cgroup indicating Docker or container environment + data, err := os.ReadFile("/proc/self/cgroup") + if err == nil && strings.Contains(string(data), "docker") { + return "docker" + } + + // Check other virtualization: kvm, xenhvm, virtualbox, vmware, qemu, hyperv + dmiFiles := []string{ + "/sys/class/dmi/id/product_name", + "/sys/class/dmi/id/sys_vendor", + } + + for _, file := range dmiFiles { + data, err := os.ReadFile(file) //nolint: gosec + if err == nil { + content := strings.ToLower(string(data)) + if strings.Contains(content, "kvm") { + return "kvm" + } else if strings.Contains(content, "xenhvm") { + return "xenhvm" + } else if strings.Contains(content, "virtualbox") { + return "virtualbox" + } else if strings.Contains(content, "vmware") { + return "vmware" + } else if strings.Contains(content, "qemu") { + return "qemu" + } else if strings.Contains(content, "hyperv") { + return "hyperv" + } + } + } + + // no virtual + return "" +} + +// IsRoot checks for root permissions +func IsRoot() bool { + var sid *windows.SID + + err := windows.AllocateAndInitializeSid( + &windows.SECURITY_NT_AUTHORITY, + 2, + windows.SECURITY_BUILTIN_DOMAIN_RID, + windows.DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &sid) + if err != nil { + log.Fatalf("SID Error: %s", err) + return false + } + defer windows.FreeSid(sid) //nolint: errcheck + + token := windows.Token(0) + + member, err := token.IsMember(sid) + if err != nil { + log.Fatalf("Token Membership Error: %s", err) + return false + } + + return member +} diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/visorinit/module.go b/vendor/github.com/skycoin/skywire/pkg/visor/visorinit/module.go index a522a09c..f5176868 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/visorinit/module.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/visorinit/module.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) // Hook is a function that can be run at some point as part diff --git a/vendor/github.com/skycoin/skywire/pkg/visor/withoutsystray.go b/vendor/github.com/skycoin/skywire/pkg/visor/withoutsystray.go index 5b367072..2c71c299 100644 --- a/vendor/github.com/skycoin/skywire/pkg/visor/withoutsystray.go +++ b/vendor/github.com/skycoin/skywire/pkg/visor/withoutsystray.go @@ -7,7 +7,7 @@ package visor import ( "context" - "github.com/skycoin/skywire-utilities/pkg/logging" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging" ) func runAppSystray() { diff --git a/vendor/github.com/skycoin/skywire/skywire.go b/vendor/github.com/skycoin/skywire/skywire.go index ee99b806..9eade585 100644 --- a/vendor/github.com/skycoin/skywire/skywire.go +++ b/vendor/github.com/skycoin/skywire/skywire.go @@ -1,4 +1,6 @@ -// Package skywire skywire.go +// Package skywire github.com/skycoin/skywire/skywire.go +// +//go:generate go run cmd/gen/gen.go -jo arches.json package skywire import ( @@ -6,7 +8,7 @@ import ( "encoding/json" "log" - "github.com/skycoin/skywire-utilities/pkg/cipher" + "github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher" ) /* @@ -25,6 +27,22 @@ var ServicesJSON []byte //go:embed dmsghttp-config.json var DmsghttpJSON []byte +// ArchesJSON is the embedded arches.json file +// go run cmd/gen/gen.go -jo arches.json +// ["amd64","arm64","386","arm","ppc64","riscv64","wasm","loong64","mips","mips64","mips64le","mipsle","ppc64le","s390x"] +// +//go:embed arches.json +var ArchesJSON []byte + +// Architectures is an array of GOARCH architectures +var Architectures []string + +// MainnetRules is the mainnet_rules.md ; it shouldn't have to be embedded here but goland doesn't allow 'embed ../../../../mainnet_rules.md' +// print the mainnet rules with `skywire cli reward rules` +// +//go:embed mainnet_rules.md +var MainnetRules string + // EnvServices is the wrapper struct for the outer JSON - i.e. 'prod' or 'test' deployment config type EnvServices struct { Test json.RawMessage `json:"test"` @@ -64,8 +82,12 @@ var Test Services var TestConf Conf func init() { + err := json.Unmarshal(ArchesJSON, &Architectures) + if err != nil { + log.Panic("arches.json ", err) + } var js interface{} - err := json.Unmarshal([]byte(ServicesJSON), &js) + err = json.Unmarshal([]byte(ServicesJSON), &js) if err != nil { log.Panic("services-config.json ", err) } diff --git a/vendor/modules.txt b/vendor/modules.txt index f1fbafb4..5d01f4c0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -95,7 +95,7 @@ github.com/coder/websocket/internal/xsync # github.com/creack/pty v1.1.23 ## explicit; go 1.18 github.com/creack/pty -# github.com/davecgh/go-spew v1.1.1 +# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew # github.com/dgraph-io/badger/v3 v3.2103.2 @@ -150,7 +150,7 @@ github.com/docker/go-units # github.com/dustin/go-humanize v1.0.1 ## explicit; go 1.16 github.com/dustin/go-humanize -# github.com/fatih/color v1.17.0 +# github.com/fatih/color v1.18.0 ## explicit; go 1.17 github.com/fatih/color # github.com/flopp/go-coordsparser v0.0.0-20240403152942-4891dc40d0a7 @@ -453,7 +453,7 @@ github.com/pires/go-proxyproto # github.com/pkg/errors v0.9.1 ## explicit github.com/pkg/errors -# github.com/pmezard/go-difflib v1.0.0 +# github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 ## explicit github.com/pmezard/go-difflib/difflib # github.com/quic-go/quic-go v0.48.0 @@ -480,8 +480,8 @@ 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.20241019182716-022283c93835 -## explicit; go 1.22 +# github.com/skycoin/dmsg v1.3.29-0.20241217193208-d32ec623e670 +## explicit; go 1.23 github.com/skycoin/dmsg/internal/servermetrics github.com/skycoin/dmsg/pkg/direct github.com/skycoin/dmsg/pkg/disc @@ -496,16 +496,16 @@ github.com/skycoin/dmsg/pkg/noise # github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 ## explicit github.com/skycoin/noise -# github.com/skycoin/skycoin v0.28.0 -## explicit; go 1.14 +# github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f +## explicit; go 1.22.0 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 github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2 github.com/skycoin/skycoin/src/util/logging -# github.com/skycoin/skywire v1.3.28 -## explicit; go 1.21 +# github.com/skycoin/skywire v1.3.29-rc1.0.20241217192205-cb65518c5522 +## explicit; go 1.23 github.com/skycoin/skywire github.com/skycoin/skywire/cmd/setup-node/commands github.com/skycoin/skywire/internal/httpauth @@ -526,6 +526,19 @@ github.com/skycoin/skywire/pkg/router/setupmetrics github.com/skycoin/skywire/pkg/routing github.com/skycoin/skywire/pkg/servicedisc github.com/skycoin/skywire/pkg/skyenv +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/geo +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httpauth +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/httputil +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/metricsutil +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/netutil +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/networkmonitor +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/skyenv +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/storeconfig +github.com/skycoin/skywire/pkg/skywire-utilities/pkg/tcpproxy github.com/skycoin/skywire/pkg/transport github.com/skycoin/skywire/pkg/transport/network github.com/skycoin/skywire/pkg/transport/network/addrresolver @@ -550,21 +563,6 @@ github.com/skycoin/skywire/pkg/visor/usermanager github.com/skycoin/skywire/pkg/visor/visorconfig github.com/skycoin/skywire/pkg/visor/visorinit github.com/skycoin/skywire/static/icons -# github.com/skycoin/skywire-utilities v1.3.25 -## explicit; go 1.21 -github.com/skycoin/skywire-utilities/pkg/buildinfo -github.com/skycoin/skywire-utilities/pkg/cipher -github.com/skycoin/skywire-utilities/pkg/cmdutil -github.com/skycoin/skywire-utilities/pkg/geo -github.com/skycoin/skywire-utilities/pkg/httpauth -github.com/skycoin/skywire-utilities/pkg/httputil -github.com/skycoin/skywire-utilities/pkg/logging -github.com/skycoin/skywire-utilities/pkg/metricsutil -github.com/skycoin/skywire-utilities/pkg/netutil -github.com/skycoin/skywire-utilities/pkg/networkmonitor -github.com/skycoin/skywire-utilities/pkg/skyenv -github.com/skycoin/skywire-utilities/pkg/storeconfig -github.com/skycoin/skywire-utilities/pkg/tcpproxy # github.com/skycoin/systray v1.10.0 ## explicit; go 1.17 github.com/skycoin/systray