Merge refs/heads/develop into new-holesky-genesis

prysmaticlabs · Sep 23, 2023 · 4802221 · 4802221
2 parents 11e46fb + 9a2c247
commit 4802221
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/beacon-chain/db/kv/genesis.go b/beacon-chain/db/kv/genesis.go
@@ -2,6 +2,7 @@ package kv
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks"
@@ -45,6 +46,10 @@ func (s *Store) SaveGenesisData(ctx context.Context, genesisState state.BeaconSt
 
 // LoadGenesis loads a genesis state from a ssz-serialized byte slice, if no genesis exists already.
 func (s *Store) LoadGenesis(ctx context.Context, sb []byte) error {
+	if len(sb) < (1 << 10) {
+		log.WithField("size", fmt.Sprintf("%d bytes", len(sb))).
+			Warn("Genesis state is smaller than one 1Kb. This could be an empty file, git lfs metadata file, or corrupt genesis state.")
+	}
 	vu, err := detect.FromState(sb)
 	if err != nil {
 		return err

diff --git a/beacon-chain/sync/genesis/BUILD.bazel b/beacon-chain/sync/genesis/BUILD.bazel
@@ -5,12 +5,14 @@ go_library(
     srcs = [
         "api.go",
         "file.go",
+        "log.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/genesis",
     visibility = ["//visibility:public"],
     deps = [
         "//api/client/beacon:go_default_library",
         "//beacon-chain/db:go_default_library",
+        "//crypto/hash:go_default_library",
         "//io/file:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",

diff --git a/beacon-chain/sync/genesis/api.go b/beacon-chain/sync/genesis/api.go
@@ -3,8 +3,6 @@ package genesis
 import (
 	"context"
 
-	log "github.com/sirupsen/logrus"
-
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v4/api/client/beacon"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/db"

diff --git a/beacon-chain/sync/genesis/file.go b/beacon-chain/sync/genesis/file.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/prysmaticlabs/prysm/v4/crypto/hash"
 	"github.com/prysmaticlabs/prysm/v4/io/file"
 
 	"github.com/pkg/errors"
@@ -42,6 +43,9 @@ func (fi *FileInitializer) Initialize(ctx context.Context, d db.Database) error
 	if err != nil {
 		return errors.Wrapf(err, "error reading state file %s for checkpoint sync init", fi.statePath)
 	}
+	log.WithField(
+		"hash", fmt.Sprintf("%#x", hash.FastSum256(serState)),
+	).Info("Loading genesis state from disk.")
 	return d.LoadGenesis(ctx, serState)
 }
 

diff --git a/beacon-chain/sync/genesis/log.go b/beacon-chain/sync/genesis/log.go
@@ -0,0 +1,5 @@
+package genesis
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "genesis")