update cmds to use new registrar gateway instead of substrate

cmds/identityd/main.go

@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/threefoldtech/zos4/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/app"
-	"github.com/threefoldtech/zosbase/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/upgrade"
 
+	"github.com/threefoldtech/zos4/pkg"
 	"github.com/threefoldtech/zos4/pkg/identity"
-	"github.com/threefoldtech/zosbase/pkg"
 	"github.com/threefoldtech/zosbase/pkg/environment"
 
 	"github.com/rs/zerolog/log"

cmds/modules/api_gateway/main.go

@@ -11,8 +11,8 @@ 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/zos4/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/environment"
-	"github.com/threefoldtech/zosbase/pkg/stubs"
 	substrategw "github.com/threefoldtech/zosbase/pkg/substrate_gateway"
 	"github.com/threefoldtech/zosbase/pkg/utils"
 	zosapi "github.com/threefoldtech/zosbase/pkg/zos_api_light"

cmds/modules/netlightd/main.go

@@ -20,8 +20,8 @@ import (
 	"github.com/cenkalti/backoff/v3"
 	"github.com/rs/zerolog/log"
 	"github.com/threefoldtech/zbus"
+	"github.com/threefoldtech/zos4/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/netlight/bootstrap"
-	"github.com/threefoldtech/zosbase/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/utils"
 )
 
@@ -58,7 +58,7 @@ var Module cli.Command = cli.Command{
 }
 
 func myceliumSeedFromIdentity(privKey []byte) []byte {
-	seed := x25519.PrivateKey(x25519.EdPrivateKeyToX25519([]byte(privKey)))
+	seed := x25519.PrivateKey(x25519.EdPrivateKeyToX25519(privKey))
 	return seed[:]
 }
 

cmds/modules/powerd/main.go

@@ -8,6 +8,7 @@ import (
 	"github.com/rs/zerolog/log"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
 	"github.com/threefoldtech/zbus"
+	zos4stub "github.com/threefoldtech/zos4/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/environment"
 	"github.com/threefoldtech/zosbase/pkg/events"
 	"github.com/threefoldtech/zosbase/pkg/power"
@@ -58,7 +59,7 @@ func action(cli *cli.Context) error {
 		log.Info().Err(zuiErr).Send()
 	}
 
-	identity := stubs.NewIdentityManagerStub(cl)
+	identity := zos4stub.NewIdentityManagerStub(cl)
 	register := stubs.NewRegistrarStub(cl)
 
 	nodeID, err := register.NodeID(ctx)

cmds/modules/provisiond/main.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
+	zos4stubs "github.com/threefoldtech/zos4/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/utils"
 
@@ -81,7 +82,6 @@ var Module cli.Command = cli.Command{
 // state
 func integrityChecks(ctx context.Context, rootDir string) error {
 	err := ReportChecks(filepath.Join(rootDir, metricsStorageDB))
-
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 	}
@@ -176,12 +176,12 @@ func action(cli *cli.Context) error {
 		select {}
 	}
 
-	identity := stubs.NewIdentityManagerStub(cl)
+	identity := zos4stubs.NewIdentityManagerStub(cl)
 	sk := ed25519.PrivateKey(identity.PrivateKey(ctx))
 
 	// the v1 endpoint will be used by all components to register endpoints
 	// that are specific for that component
-	//v1 := router.PathPrefix("/api/v1").Subrouter()
+	// v1 := router.PathPrefix("/api/v1").Subrouter()
 	// keep track of resource units reserved and amount of workloads provisionned
 
 	// to store reservation locally on the node
@@ -313,7 +313,7 @@ func action(cli *cli.Context) error {
 			zos.PublicIPv4Type,
 			zos.PublicIPType,
 			zos.ZMachineLightType,
-			zos.ZLogsType, //make sure zlogs comes after zmachine
+			zos.ZLogsType, // make sure zlogs comes after zmachine
 		),
 		// if this is a node reboot, the node needs to
 		// recreate all reservations. so we set rerun = true
@@ -323,7 +323,6 @@ func action(cli *cli.Context) error {
 		// capacity on chain.
 		provision.WithCallback(setter.Callback),
 	)
-
 	if err != nil {
 		return errors.Wrap(err, "failed to instantiate provision engine")
 	}

cmds/modules/provisiond/reporter.go

@@ -13,6 +13,7 @@ import (
 	"github.com/rs/zerolog/log"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
 	"github.com/threefoldtech/zbus"
+	zos4stubs "github.com/threefoldtech/zos4/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg"
 	gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes"
 	"github.com/threefoldtech/zosbase/pkg/rrd"
@@ -57,7 +58,7 @@ func ReportChecks(metricsPath string) error {
 
 // NewReporter creates a new capacity reporter
 func NewReporter(metricsPath string, cl zbus.Client, root string) (*Reporter, error) {
-	idMgr := stubs.NewIdentityManagerStub(cl)
+	idMgr := zos4stubs.NewIdentityManagerStub(cl)
 	sk := ed25519.PrivateKey(idMgr.PrivateKey(context.TODO()))
 	id, err := substrate.NewIdentityFromEd25519Key(sk)
 	if err != nil {

cmds/modules/zui/service.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gizak/termui/v3/widgets"
 	"github.com/threefoldtech/zbus"
 
+	zos4stubs "github.com/threefoldtech/zos4/pkg/stubs"
 	"github.com/threefoldtech/zosbase/pkg/stubs"
 )
 
@@ -161,6 +162,6 @@ func getNodedStatus(ctx context.Context, client zbus.Client) {
 }
 
 func getPowerdStatus(ctx context.Context, client zbus.Client) {
-	powerd := stubs.NewIdentityManagerStub(client)
+	powerd := zos4stubs.NewIdentityManagerStub(client)
 	powerd.NodeID(ctx)
 }