From 1f4b7b366efb4aa300d7fc1510fff4d793c8452f Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Fri, 27 Dec 2019 12:25:39 +0300 Subject: [PATCH] cli/server: skip genesis block on restore if it matches ours Enables more convenient imports without skipping over the block 0. --- cli/server/server.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cli/server/server.go b/cli/server/server.go index ae2288b01..9f994827d 100644 --- a/cli/server/server.go +++ b/cli/server/server.go @@ -259,6 +259,13 @@ func restoreDB(ctx *cli.Context) error { if err != nil { return cli.NewExitError(err, 1) } + if block.Index == 0 && i == 0 && skip == 0 { + genesis, err := chain.GetBlock(block.Hash()) + if err == nil && genesis.Index == 0 { + log.Info("skipped genesis block ", block.Hash().StringLE()) + continue + } + } err = chain.AddBlock(block) if err != nil { return cli.NewExitError(fmt.Errorf("failed to add block %d: %s", i, err), 1)