core: verify genesis extradata for clique (#24470)

gurukamath · fjl · holiman · web-flow · commit 8cacb4227829 · 2022-03-30T10:27:25.000+02:00
* Add extra-data checks for clique genesis

* Update genesis.go

* Update genesis.go

* core: simplify clique genesis check

Co-authored-by: Felix Lange &lt;fjl@twurst.com&gt;
Co-authored-by: Martin Holst Swende &lt;martin@swende.se&gt;
diff --git a/core/genesis.go b/core/genesis.go
@@ -397,7 +397,7 @@ func (g *Genesis) Commit(db ethdb.Database) (*types.Block, error) {
 	if err := config.CheckConfigForkOrder(); err != nil {
 		return nil, err
 	}
-	if config.Clique != nil && len(block.Extra()) == 0 {
+	if config.Clique != nil && len(block.Extra()) < 32+crypto.SignatureLength {
 		return nil, errors.New("can't start clique chain without signers")
 	}
 	if err := g.Alloc.write(db, block.Hash()); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ func (g Genesis) Commit(db ethdb.Database) (types.Block, error) {`
`397`	`397`	`if err := config.CheckConfigForkOrder(); err != nil {`
`398`	`398`	`return nil, err`
`399`	`399`	`}`
`400`		`- if config.Clique != nil && len(block.Extra()) == 0 {`
	`400`	`+ if config.Clique != nil && len(block.Extra()) < 32+crypto.SignatureLength {`
`401`	`401`	`return nil, errors.New("can't start clique chain without signers")`
`402`	`402`	`}`
`403`	`403`	`if err := g.Alloc.write(db, block.Hash()); err != nil {`