Skip to content

Commit 5fe99f8

Browse files
committed
generate libp2p key
1 parent a5fffa1 commit 5fe99f8

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

cmd/migrate-curio/migrate.go

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"crypto/rand"
45
"database/sql"
56
"encoding/json"
67
"errors"
@@ -75,21 +76,6 @@ func migrate(cctx *cli.Context, repoDir string) error {
7576
return err
7677
}
7778

78-
keyStore, err := lr.KeyStore()
79-
if err != nil {
80-
return fmt.Errorf("failed to open Boost keystore")
81-
}
82-
83-
key, err := keyStore.Get("libp2p-host")
84-
if err != nil {
85-
return fmt.Errorf("failed to get key from keystore: %w", err)
86-
}
87-
88-
pkey, err := crypto.UnmarshalPrivateKey(key.PrivateKey)
89-
if err != nil {
90-
return fmt.Errorf("failed to unmarshal private key: %w", err)
91-
}
92-
9379
mds, err := lr.Datastore(ctx, "/metadata")
9480
if err != nil {
9581
return err
@@ -178,7 +164,7 @@ func migrate(cctx *cli.Context, repoDir string) error {
178164
}
179165

180166
// Migrate libp2p key
181-
if err := migrateKeys(ctx, maddr, pkey, hdb); err != nil {
167+
if err := generateNewKeys(ctx, maddr, hdb); err != nil {
182168
return xerrors.Errorf("failed to migrate libp2p key: %w", err)
183169
}
184170

@@ -578,16 +564,21 @@ func migrateDDODeals(ctx context.Context, full v1api.FullNode, activeSectors bit
578564
return nil
579565
}
580566

581-
func migrateKeys(ctx context.Context, maddr address.Address, priv crypto.PrivKey, hdb *harmonydb.DB) error {
567+
func generateNewKeys(ctx context.Context, maddr address.Address, hdb *harmonydb.DB) error {
582568

583-
pkey, err := priv.Raw()
569+
mid, err := address.IDFromAddress(maddr)
584570
if err != nil {
585571
return err
586572
}
587573

588-
mid, err := address.IDFromAddress(maddr)
574+
pk, _, err := crypto.GenerateEd25519Key(rand.Reader)
589575
if err != nil {
590-
return err
576+
return fmt.Errorf("generating private key: %w", err)
577+
}
578+
579+
pkey, err := pk.Raw()
580+
if err != nil {
581+
return fmt.Errorf("converting private key: %w", err)
591582
}
592583

593584
_, err = hdb.Exec(ctx, `INSERT INTO libp2p (sp_id, priv_key) VALUES ($1, $2) ON CONFLICT(sp_id) DO NOTHING`, mid, pkey)

0 commit comments

Comments
 (0)