Skip to content

Commit f343f79

Browse files
Eslam-NawaraEslam-Nawara
committed
use private key instead of seed in registrar client
1 parent c27651f commit f343f79

File tree

9 files changed

+22
-29
lines changed

9 files changed

+22
-29
lines changed

‎registrar-cli/cmd/create_account.go

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var createAccountCmd = &cobra.Command{
6060

6161
log.Info().Msgf("public key (Hex): %s", hex.EncodeToString(publicKey))
6262

63-
cli, err := client.NewRegistrarClient(u, seedBytes)
63+
cli, err := client.NewRegistrarClient(u, privateKey)
6464
if err != nil {
6565
return err
6666
}
@@ -94,24 +94,3 @@ func generateRandomSeed() (string, error) {
9494
seed := hex.EncodeToString(s)
9595
return seed, nil
9696
}
97-
98-
func createAccount(c client.RegistrarClient, relays []string, rmbEncKey string) (client.Account, error) {
99-
account, err := c.CreateAccount(relays, rmbEncKey)
100-
if err != nil {
101-
log.Fatal().Err(err).Msg("failed to create new account on registrar")
102-
}
103-
104-
return account, err
105-
}
106-
107-
func parseSeed(seed string) (ed25519.PublicKey, ed25519.PrivateKey, []byte, error) {
108-
privateKeyBytes, err := hex.DecodeString(seed)
109-
if err != nil {
110-
return nil, nil, nil, err
111-
}
112-
113-
privateKey := ed25519.NewKeyFromSeed(privateKeyBytes)
114-
publicKey := privateKey.Public().(ed25519.PublicKey)
115-
116-
return publicKey, privateKey, privateKeyBytes, nil
117-
}

‎registrar-cli/cmd/create_farm.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package cmd
33

44
import (
5+
"crypto/ed25519"
56
"encoding/hex"
67
"fmt"
78

@@ -49,7 +50,8 @@ var createFarmCmd = &cobra.Command{
4950
return err
5051
}
5152

52-
cli, err := client.NewRegistrarClient(u, seedBytes)
53+
privateKey := ed25519.NewKeyFromSeed(seedBytes)
54+
cli, err := client.NewRegistrarClient(u, privateKey)
5355
if err != nil {
5456
return err
5557
}

‎registrar-cli/cmd/get_account.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package cmd
33

44
import (
5+
"crypto/ed25519"
56
"encoding/hex"
67
"fmt"
78

@@ -50,7 +51,8 @@ var getAccountCmd = &cobra.Command{
5051
return err
5152
}
5253

53-
cli, err := client.NewRegistrarClient(u, seedBytes)
54+
privateKey := ed25519.NewKeyFromSeed(seedBytes)
55+
cli, err := client.NewRegistrarClient(u, privateKey)
5456
if err != nil {
5557
return err
5658
}

‎registrar-cli/cmd/get_node.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package cmd
33

44
import (
5+
"crypto/ed25519"
56
"encoding/hex"
67
"fmt"
78

@@ -45,7 +46,8 @@ var getNodeCmd = &cobra.Command{
4546
return err
4647
}
4748

48-
cli, err := client.NewRegistrarClient(u, seedBytes)
49+
privateKey := ed25519.NewKeyFromSeed(seedBytes)
50+
cli, err := client.NewRegistrarClient(u, privateKey)
4951
if err != nil {
5052
return err
5153
}

‎registrar-cli/cmd/get_zos_version.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package cmd
33

44
import (
5+
"crypto/ed25519"
56
"encoding/hex"
67
"fmt"
78

@@ -35,7 +36,8 @@ var getZosVersionCmd = &cobra.Command{
3536
return err
3637
}
3738

38-
cli, err := client.NewRegistrarClient(u, seedBytes)
39+
privateKey := ed25519.NewKeyFromSeed(seedBytes)
40+
cli, err := client.NewRegistrarClient(u, privateKey)
3941
if err != nil {
4042
return err
4143
}

‎registrar-cli/cmd/update_account.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package cmd
33

44
import (
5+
"crypto/ed25519"
56
"encoding/hex"
67
"fmt"
78

@@ -49,7 +50,8 @@ var UpdateAccountCmd = &cobra.Command{
4950
return err
5051
}
5152

52-
cli, err := client.NewRegistrarClient(u, seedBytes)
53+
privateKey := ed25519.NewKeyFromSeed(seedBytes)
54+
cli, err := client.NewRegistrarClient(u, privateKey)
5355
if err != nil {
5456
return err
5557
}

‎registrar-cli/cmd/update_farm.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package cmd
33

44
import (
5+
"crypto/ed25519"
56
"encoding/hex"
67
"fmt"
78

@@ -54,7 +55,8 @@ var UpdateFarmCmd = &cobra.Command{
5455
return err
5556
}
5657

57-
cli, err := client.NewRegistrarClient(u, seedBytes)
58+
privateKey := ed25519.NewKeyFromSeed(seedBytes)
59+
cli, err := client.NewRegistrarClient(u, privateKey)
5860
if err != nil {
5961
return err
6062
}

‎registrar-cli/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.21.0
55
require (
66
github.com/rs/zerolog v1.33.0
77
github.com/spf13/cobra v1.9.1
8-
github.com/threefoldtech/tfgrid4-sdk-go/node-registrar v0.0.0-20250226140024-dc119126c93f
8+
github.com/threefoldtech/tfgrid4-sdk-go/node-registrar v0.0.0-20250226194238-c27651fbdd6e
99
)
1010

1111
require (

‎registrar-cli/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
2727
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
2828
github.com/threefoldtech/tfgrid4-sdk-go/node-registrar v0.0.0-20250226140024-dc119126c93f h1:IJ0BULHQuYWT6UFFiZEhEB0QyFSSbyCPgcKaAVII4a4=
2929
github.com/threefoldtech/tfgrid4-sdk-go/node-registrar v0.0.0-20250226140024-dc119126c93f/go.mod h1:x6Sluj6YKfelWzcNwsD2oqGO8dpRlH7fbmeIqEsK8hI=
30+
github.com/threefoldtech/tfgrid4-sdk-go/node-registrar v0.0.0-20250226194238-c27651fbdd6e h1:n/hq2t7txZNuQ53EMR+ikwvu3bSvZIerm1d6JiXbmro=
31+
github.com/threefoldtech/tfgrid4-sdk-go/node-registrar v0.0.0-20250226194238-c27651fbdd6e/go.mod h1:x6Sluj6YKfelWzcNwsD2oqGO8dpRlH7fbmeIqEsK8hI=
3032
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3133
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3234
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

0 commit comments

Comments
 (0)