Merge branch 'main' of github.com:threefoldtech/zos4 into development…

…_rollout_configs

.golangci.yml

@@ -0,0 +1,17 @@
+linters:
+  enable:
+    - errcheck
+    - gofmt
+    - govet
+    - ineffassign
+    - unconvert
+    - staticcheck
+    - gocyclo
+  enable-all: false
+linters-settings:
+  gocyclo:
+    # Minimal code complexity to report.
+    # Default: 30 (but we recommend 10-20)
+    min-complexity: 100
+run:
+  timeout: 20m

CONTRIBUTING.md

@@ -40,8 +40,8 @@ exact code change can help focus discussions, so the choice is up to you.
 
 ## Setting up a development environment
 
-Check out the [documentation](https://github.com/threefoldtech/zos/tree/master/docs) learn about the code
-base and setting up your [development environment](https://github.com/threefoldtech/zos/blob/master/qemu/README.md).
+Check out the [documentation](https://github.com/threefoldtech/zos4/tree/master/docs) learn about the code
+base and setting up your [development environment](https://github.com/threefoldtech/zos4/blob/master/qemu/README.md).
 
 ## Pull requests
 
@@ -74,7 +74,7 @@ pull requests.
 
 ## Issues
 
-[GitHub issues](https://github.com/threefoldtech/zos/issues/new) can be used to report bugs or submit feature requests.
+[GitHub issues](https://github.com/threefoldtech/zos4/issues/new) can be used to report bugs or submit feature requests.
 
 When reporting a bug please include the following key pieces of information:
 

README.md

@@ -1,4 +1,4 @@
-# 0-OS ![Tests](https://github.com/threefoldtech/zos/workflows/Tests%20and%20Coverage/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/threefoldtech/zos)](https://goreportcard.com/report/github.com/threefoldtech/zos)
+# 0-OS ![Tests](https://github.com/threefoldtech/zos4/workflows/Tests%20and%20Coverage/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/threefoldtech/zos)](https://goreportcard.com/report/github.com/threefoldtech/zos)
 
 0-OS is an autonomous operating system design to expose raw compute, storage and network capacity.
 

VALUES.md

@@ -20,7 +20,7 @@ values we hold as a team:
     personally. Consider other people’s perspectives. Empathize with our users. Focus on the specific
     issue at hand, and remember that we all care about the project, first and
     foremost.
-  - [GitHub issues](https://github.com/threefoldtech/zos/issues/new),
+  - [GitHub issues](https://github.com/threefoldtech/zos4/issues/new),
     document comments, or meetings are often better and higher bandwidth ways to
     communicate complex and nuanced design issues, as opposed to protracted
     heated live chats.

bins/packages/mycelium/mycelium.sh

@@ -1,5 +1,5 @@
-MYCELIUM_VERSION="0.5.3"
-MYCELIUM_CHECKSUM="a41979ca85b2d60ec4757a2dbd88e95c"
+MYCELIUM_VERSION="0.5.6"
+MYCELIUM_CHECKSUM="9e33aad058bf331c8ebbf1aa2a5a6793"
 MYCELIUM_LINK="https://github.com/threefoldtech/mycelium/releases/download/v${MYCELIUM_VERSION}/mycelium-x86_64-unknown-linux-musl.tar.gz"
 
 download_mycelium() {

client/_http/client.go

@@ -13,7 +13,7 @@ import (
 	"github.com/lestrrat-go/jwx/jwt"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
-	zoscrypt "github.com/threefoldtech/zos/pkg/crypto"
+	zoscrypt "github.com/threefoldtech/zos4/pkg/crypto"
 	"github.com/yggdrasil-network/yggdrasil-go/src/address"
 	"github.com/yggdrasil-network/yggdrasil-go/src/crypto"
 )

client/_http/node.go

@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 
 	"github.com/pkg/errors"
-	"github.com/threefoldtech/zos/pkg/gridtypes"
+	"github.com/threefoldtech/zos4/pkg/gridtypes"
 )
 
 var (

client/node.go

@@ -77,10 +77,10 @@ import (
 	"net"
 
 	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go"
-	"github.com/threefoldtech/zos/pkg"
-	"github.com/threefoldtech/zos/pkg/capacity/dmi"
-	"github.com/threefoldtech/zos/pkg/diagnostics"
-	"github.com/threefoldtech/zos/pkg/gridtypes"
+	"github.com/threefoldtech/zos4/pkg"
+	"github.com/threefoldtech/zos4/pkg/capacity/dmi"
+	"github.com/threefoldtech/zos4/pkg/diagnostics"
+	"github.com/threefoldtech/zos4/pkg/gridtypes"
 )
 
 // NodeClient struct

cmds/Makefile

@@ -2,7 +2,7 @@ OUT = $(shell realpath -m ../bin)
 branch = $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
 revision = $(shell git rev-parse HEAD)
 dirty = $(shell test -n "`git diff --shortstat 2> /dev/null | tail -n1`" && echo "*")
-version = github.com/threefoldtech/zos/pkg/version
+version = github.com/threefoldtech/zos4/pkg/version
 ldflags = '-w -s -X $(version).Branch=$(branch) -X $(version).Revision=$(revision) -X $(version).Dirty=$(dirty) -extldflags "-static"'
 
 all: identityd internet zos

cmds/identityd/main.go

@@ -8,18 +8,18 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/threefoldtech/zos/pkg/app"
-	"github.com/threefoldtech/zos/pkg/stubs"
-	"github.com/threefoldtech/zos/pkg/upgrade"
+	"github.com/threefoldtech/zos4/pkg/app"
+	"github.com/threefoldtech/zos4/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/upgrade"
 
-	"github.com/threefoldtech/zos/pkg"
-	"github.com/threefoldtech/zos/pkg/environment"
-	"github.com/threefoldtech/zos/pkg/identity"
+	"github.com/threefoldtech/zos4/pkg"
+	"github.com/threefoldtech/zos4/pkg/environment"
+	"github.com/threefoldtech/zos4/pkg/identity"
 
 	"github.com/rs/zerolog/log"
 	"github.com/threefoldtech/zbus"
-	"github.com/threefoldtech/zos/pkg/utils"
-	"github.com/threefoldtech/zos/pkg/version"
+	"github.com/threefoldtech/zos4/pkg/utils"
+	"github.com/threefoldtech/zos4/pkg/version"
 )
 
 const (

cmds/identityd/monitor.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/threefoldtech/zos/pkg"
+	"github.com/threefoldtech/zos4/pkg"
 )
 
 type monitorStream struct {

cmds/identityd/ssh.go

@@ -11,9 +11,9 @@ import (
 
 	"github.com/cenkalti/backoff"
 	"github.com/rs/zerolog/log"
-	"github.com/threefoldtech/zos/pkg"
-	"github.com/threefoldtech/zos/pkg/environment"
-	"github.com/threefoldtech/zos/pkg/kernel"
+	"github.com/threefoldtech/zos4/pkg"
+	"github.com/threefoldtech/zos4/pkg/environment"
+	"github.com/threefoldtech/zos4/pkg/kernel"
 )
 
 var (

cmds/internet/main.go

@@ -11,17 +11,17 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/vishvananda/netlink"
 
-	"github.com/threefoldtech/zos/pkg/app"
-	"github.com/threefoldtech/zos/pkg/environment"
-	"github.com/threefoldtech/zos/pkg/netlight/bootstrap"
-	"github.com/threefoldtech/zos/pkg/netlight/bridge"
-	"github.com/threefoldtech/zos/pkg/netlight/dhcp"
-	"github.com/threefoldtech/zos/pkg/netlight/ifaceutil"
-	"github.com/threefoldtech/zos/pkg/netlight/options"
-	"github.com/threefoldtech/zos/pkg/netlight/types"
-	"github.com/threefoldtech/zos/pkg/zinit"
-
-	"github.com/threefoldtech/zos/pkg/version"
+	"github.com/threefoldtech/zos4/pkg/app"
+	"github.com/threefoldtech/zos4/pkg/environment"
+	"github.com/threefoldtech/zos4/pkg/netlight/bootstrap"
+	"github.com/threefoldtech/zos4/pkg/netlight/bridge"
+	"github.com/threefoldtech/zos4/pkg/netlight/dhcp"
+	"github.com/threefoldtech/zos4/pkg/netlight/ifaceutil"
+	"github.com/threefoldtech/zos4/pkg/netlight/options"
+	"github.com/threefoldtech/zos4/pkg/netlight/types"
+	"github.com/threefoldtech/zos4/pkg/zinit"
+
+	"github.com/threefoldtech/zos4/pkg/version"
 )
 
 func main() {

cmds/modules/api_gateway/main.go

@@ -11,11 +11,11 @@ import (
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
 	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	"github.com/threefoldtech/zbus"
-	"github.com/threefoldtech/zos/pkg/environment"
-	"github.com/threefoldtech/zos/pkg/stubs"
-	substrategw "github.com/threefoldtech/zos/pkg/substrate_gateway"
-	"github.com/threefoldtech/zos/pkg/utils"
-	zosapi "github.com/threefoldtech/zos/pkg/zos_api"
+	"github.com/threefoldtech/zos4/pkg/environment"
+	"github.com/threefoldtech/zos4/pkg/stubs"
+	substrategw "github.com/threefoldtech/zos4/pkg/substrate_gateway"
+	"github.com/threefoldtech/zos4/pkg/utils"
+	zosapi "github.com/threefoldtech/zos4/pkg/zos_api"
 	"github.com/urfave/cli/v2"
 )
 

cmds/modules/contd/main.go

@@ -12,13 +12,13 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/threefoldtech/zbus"
-	"github.com/threefoldtech/zos/pkg/container"
-	"github.com/threefoldtech/zos/pkg/utils"
+	"github.com/threefoldtech/zos4/pkg/container"
+	"github.com/threefoldtech/zos4/pkg/utils"
 )
 
 const module = "container"
 
-//Module is contd entry point
+// Module is contd entry point
 var Module cli.Command = cli.Command{
 	Name:  "contd",
 	Usage: "handles containers creations",

cmds/modules/flistd/main.go

@@ -5,14 +5,14 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/threefoldtech/zos/pkg/stubs"
-	"github.com/threefoldtech/zos/pkg/utils"
+	"github.com/threefoldtech/zos4/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/utils"
 	"github.com/urfave/cli/v2"
 
 	"github.com/rs/zerolog/log"
 
 	"github.com/threefoldtech/zbus"
-	"github.com/threefoldtech/zos/pkg/flist"
+	"github.com/threefoldtech/zos4/pkg/flist"
 )
 
 const (

cmds/modules/netlightd/main.go

@@ -11,17 +11,17 @@ import (
 
 	"github.com/oasisprotocol/curve25519-voi/primitives/x25519"
 	"github.com/pkg/errors"
-	"github.com/threefoldtech/zos/pkg/netlight"
-	"github.com/threefoldtech/zos/pkg/netlight/nft"
-	"github.com/threefoldtech/zos/pkg/netlight/resource"
+	"github.com/threefoldtech/zos4/pkg/netlight"
+	"github.com/threefoldtech/zos4/pkg/netlight/nft"
+	"github.com/threefoldtech/zos4/pkg/netlight/resource"
 	"github.com/urfave/cli/v2"
 
 	"github.com/cenkalti/backoff/v3"
 	"github.com/rs/zerolog/log"
 	"github.com/threefoldtech/zbus"
-	"github.com/threefoldtech/zos/pkg/netlight/bootstrap"
-	"github.com/threefoldtech/zos/pkg/stubs"
-	"github.com/threefoldtech/zos/pkg/utils"
+	"github.com/threefoldtech/zos4/pkg/netlight/bootstrap"
+	"github.com/threefoldtech/zos4/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/utils"
 )
 
 const (

cmds/modules/noded/main.go

@@ -11,19 +11,19 @@ import (
 	"github.com/urfave/cli/v2"
 
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
-	"github.com/threefoldtech/zos/pkg/app"
-	"github.com/threefoldtech/zos/pkg/capacity"
-	"github.com/threefoldtech/zos/pkg/environment"
-	"github.com/threefoldtech/zos/pkg/events"
-	"github.com/threefoldtech/zos/pkg/monitord"
-	"github.com/threefoldtech/zos/pkg/perf"
-	"github.com/threefoldtech/zos/pkg/perf/cpubench"
-	"github.com/threefoldtech/zos/pkg/perf/healthcheck"
-	"github.com/threefoldtech/zos/pkg/perf/iperf"
-	"github.com/threefoldtech/zos/pkg/perf/publicip"
-	"github.com/threefoldtech/zos/pkg/registrar"
-	"github.com/threefoldtech/zos/pkg/stubs"
-	"github.com/threefoldtech/zos/pkg/utils"
+	"github.com/threefoldtech/zos4/pkg/app"
+	"github.com/threefoldtech/zos4/pkg/capacity"
+	"github.com/threefoldtech/zos4/pkg/environment"
+	"github.com/threefoldtech/zos4/pkg/events"
+	"github.com/threefoldtech/zos4/pkg/monitord"
+	"github.com/threefoldtech/zos4/pkg/perf"
+	"github.com/threefoldtech/zos4/pkg/perf/cpubench"
+	"github.com/threefoldtech/zos4/pkg/perf/healthcheck"
+	"github.com/threefoldtech/zos4/pkg/perf/iperf"
+	"github.com/threefoldtech/zos4/pkg/perf/publicip"
+	"github.com/threefoldtech/zos4/pkg/registrar"
+	"github.com/threefoldtech/zos4/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/utils"
 
 	"github.com/rs/zerolog/log"
 

cmds/modules/powerd/main.go

@@ -8,11 +8,11 @@ import (
 	"github.com/rs/zerolog/log"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
 	"github.com/threefoldtech/zbus"
-	"github.com/threefoldtech/zos/pkg/environment"
-	"github.com/threefoldtech/zos/pkg/events"
-	"github.com/threefoldtech/zos/pkg/power"
-	"github.com/threefoldtech/zos/pkg/stubs"
-	"github.com/threefoldtech/zos/pkg/utils"
+	"github.com/threefoldtech/zos4/pkg/environment"
+	"github.com/threefoldtech/zos4/pkg/events"
+	"github.com/threefoldtech/zos4/pkg/power"
+	"github.com/threefoldtech/zos4/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/utils"
 	"github.com/urfave/cli/v2"
 )
 

cmds/modules/provisiond/cap.go

@@ -8,9 +8,9 @@ import (
 	"github.com/centrifuge/go-substrate-rpc-client/v4/types"
 	"github.com/rs/zerolog/log"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
-	"github.com/threefoldtech/zos/pkg/gridtypes"
-	"github.com/threefoldtech/zos/pkg/provision"
-	"github.com/threefoldtech/zos/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/gridtypes"
+	"github.com/threefoldtech/zos4/pkg/provision"
+	"github.com/threefoldtech/zos4/pkg/stubs"
 )
 
 type DeploymentID struct {

cmds/modules/provisiond/events.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
-	"github.com/threefoldtech/zos/pkg/events"
-	"github.com/threefoldtech/zos/pkg/gridtypes"
-	"github.com/threefoldtech/zos/pkg/provision"
-	"github.com/threefoldtech/zos/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/events"
+	"github.com/threefoldtech/zos4/pkg/gridtypes"
+	"github.com/threefoldtech/zos4/pkg/provision"
+	"github.com/threefoldtech/zos4/pkg/stubs"
 )
 
 type ContractEventHandler struct {