|
1 | 1 | package main
|
2 | 2 |
|
3 | 3 | import (
|
| 4 | + "crypto/rand" |
4 | 5 | "database/sql"
|
5 | 6 | "encoding/json"
|
6 | 7 | "errors"
|
@@ -75,21 +76,6 @@ func migrate(cctx *cli.Context, repoDir string) error {
|
75 | 76 | return err
|
76 | 77 | }
|
77 | 78 |
|
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 |
| - |
93 | 79 | mds, err := lr.Datastore(ctx, "/metadata")
|
94 | 80 | if err != nil {
|
95 | 81 | return err
|
@@ -178,7 +164,7 @@ func migrate(cctx *cli.Context, repoDir string) error {
|
178 | 164 | }
|
179 | 165 |
|
180 | 166 | // Migrate libp2p key
|
181 |
| - if err := migrateKeys(ctx, maddr, pkey, hdb); err != nil { |
| 167 | + if err := generateNewKeys(ctx, maddr, hdb); err != nil { |
182 | 168 | return xerrors.Errorf("failed to migrate libp2p key: %w", err)
|
183 | 169 | }
|
184 | 170 |
|
@@ -578,16 +564,21 @@ func migrateDDODeals(ctx context.Context, full v1api.FullNode, activeSectors bit
|
578 | 564 | return nil
|
579 | 565 | }
|
580 | 566 |
|
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 { |
582 | 568 |
|
583 |
| - pkey, err := priv.Raw() |
| 569 | + mid, err := address.IDFromAddress(maddr) |
584 | 570 | if err != nil {
|
585 | 571 | return err
|
586 | 572 | }
|
587 | 573 |
|
588 |
| - mid, err := address.IDFromAddress(maddr) |
| 574 | + pk, _, err := crypto.GenerateEd25519Key(rand.Reader) |
589 | 575 | 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) |
591 | 582 | }
|
592 | 583 |
|
593 | 584 | _, 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