more fixes

gballet · Oct 25, 2024 · 4afce0a · 4afce0a
1 parent 606e682
commit 4afce0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/block_validator.go b/core/block_validator.go
@@ -132,8 +132,7 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 	if root := statedb.IntermediateRoot(v.config.IsEIP158(header.Number)); header.Root != root {
 		return fmt.Errorf("invalid merkle root (remote: %x local: %x) dberr: %w", header.Root, root, statedb.Error())
 	}
-
-	if blockEw := block.ExecutionWitness(); blockEw != nil && v.bc.Config().IsVerkle(header.Number, header.Time) {
+	if blockEw := block.ExecutionWitness(); blockEw != nil {
 		parent := v.bc.GetHeaderByNumber(header.Number.Uint64() - 1)
 		if parent == nil {
 			return fmt.Errorf("nil parent header for block %d", header.Number)

diff --git a/tests/block_test_util.go b/tests/block_test_util.go
@@ -65,7 +65,7 @@ type btBlock struct {
 	ExpectException  string
 	Rlp              string
 	UncleHeaders     []*btHeader
-	ExecutionWitness types.ExecutionWitness `json:"witness"`
+	ExecutionWitness *types.ExecutionWitness `json:"witness"`
 }
 
 //go:generate go run github.com/fjl/gencodec -type btHeader -field-override btHeaderMarshaling -out gen_btheader.go
@@ -333,6 +333,6 @@ func (bb *btBlock) decode() (*types.Block, error) {
 	if err := rlp.DecodeBytes(data, &b); err != nil {
 		return nil, err
 	}
-	b.SetExecutionWitness(&bb.ExecutionWitness)
+	b.SetExecutionWitness(bb.ExecutionWitness)
 	return &b, nil
 }