Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update postcli for compatibility with multismeshing #270

Merged
merged 8 commits into from
Feb 27, 2024
Merged

Update postcli for compatibility with multismeshing #270

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f20c2e1
Update gomock
fasmat Feb 26, 2024
4685a7a
Update postcli for new multi-smesher setup
fasmat Feb 26, 2024
6ba594d
Tell user what to do with key.
fasmat Feb 26, 2024
74a913f
Use log.Fatalln
fasmat Feb 26, 2024
db22fab
Fix staticcheck
fasmat Feb 26, 2024
04e4e10
Review feedback
fasmat Feb 27, 2024
30a14bf
Review feedback
fasmat Feb 27, 2024
61f0fbc
Update README.md
fasmat Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 17 additions & 25 deletions cmd/postcli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,7 @@ func processFlags() {
log.Println("WARNING: it appears that", opts.DataDir, "was previously initialized with a different `id` value.")
log.Println("\tCurrent value:", hex.EncodeToString(meta.NodeId))
log.Println("\tValue passed to postcli:", idHex)
if !yes {
log.Println("CONTINUING MIGHT ERASE EXISTING DATA. MAKE ABSOLUTELY SURE YOU SPECIFY THE CORRECT VALUE.")
}
askForConfirmation()
log.Fatalln("aborting")
}
}

Expand All @@ -144,10 +141,7 @@ func processFlags() {
log.Println("The provided id does not match the generated key.")
log.Println("\tCurrent value:", hex.EncodeToString(key))
log.Println("\tValue passed to postcli:", idHex)
if !yes {
log.Println("CONTINUING MIGHT ERASE EXISTING DATA. MAKE ABSOLUTELY SURE YOU SPECIFY THE CORRECT VALUE.")
}
askForConfirmation()
log.Fatalln("aborting")
}
}

Expand Down Expand Up @@ -190,11 +184,7 @@ func processFlags() {
log.Println("WARNING: it appears that", opts.DataDir, "was previously initialized with a different `commitmentAtxId` value.")
log.Println("\tCurrent value:", hex.EncodeToString(meta.CommitmentAtxId))
log.Println("\tValue passed to postcli:", commitmentAtxIdHex)
if !yes {
log.Println("CONTINUING MIGHT ERASE EXISTING DATA. MAKE ABSOLUTELY SURE YOU SPECIFY THE CORRECT VALUE.")
}
askForConfirmation()
commitmentAtxIdHex = hex.EncodeToString(meta.CommitmentAtxId)
log.Fatalln("aborting")
}
}

Expand Down Expand Up @@ -416,23 +406,25 @@ func loadKey() (ed25519.PublicKey, error) {
func cmdVerifyPos(opts config.InitOpts, fraction float64, logger *zap.Logger) {
log.Println("cli: verifying", edKeyFileName)
pub, err := loadKey()
if err != nil {
switch {
case errors.Is(err, os.ErrNotExist):
log.Println("cli:", edKeyFileName, "does not exist. Skipping verification")
fasmat marked this conversation as resolved.
Show resolved Hide resolved
case err != nil:
log.Fatalf("failed to load public key from %s: %s\n", edKeyFileName, err)
}

metaFile := filepath.Join(opts.DataDir, initialization.MetadataFileName)
meta, err := initialization.LoadMetadata(opts.DataDir)
if err != nil {
log.Fatalf("failed to load metadata from %s: %s\n", opts.DataDir, err)
}
default:
metaFile := filepath.Join(opts.DataDir, initialization.MetadataFileName)
meta, err := initialization.LoadMetadata(opts.DataDir)
if err != nil {
log.Fatalf("failed to load metadata from %s: %s\n", opts.DataDir, err)
}

if !bytes.Equal(meta.NodeId, pub) {
log.Fatalf("NodeID in %s (%x) does not match public key from %s (%x)", metaFile, meta.NodeId, edKeyFileName, pub)
if !bytes.Equal(meta.NodeId, pub) {
log.Fatalf("NodeID in %s (%x) does not match public key from %s (%x)", metaFile, meta.NodeId, edKeyFileName, pub)
}
log.Println("cli:", edKeyFileName, "is valid")
}

log.Println("cli:", edKeyFileName, "is valid")
log.Println("cli: verifying POS data")

params := postrs.NewScryptParams(opts.Scrypt.N, opts.Scrypt.R, opts.Scrypt.P)
verifyOpts := []postrs.VerifyPosOptionsFunc{
postrs.WithFraction(fraction),
Expand Down