From db156bfeed787ac4d8048aa8e04eaa63332ee190 Mon Sep 17 00:00:00 2001
From: Victor Castell <victor@polygon.technology>
Date: Tue, 29 Aug 2023 15:33:04 +0200
Subject: [PATCH] Fix merge

---
 blockchain/blockchain.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blockchain/blockchain.go b/blockchain/blockchain.go
index ee664fe9b9..99633f6756 100644
--- a/blockchain/blockchain.go
+++ b/blockchain/blockchain.go
@@ -1395,8 +1395,8 @@ func (b *Blockchain) CalculateBaseFee(parent *types.Header) uint64 {
 	// Check if this is the first London hardfork block.
 	// Should return chain.GenesisBaseFee ins this case.
 	if parent.BaseFee == 0 {
-		if b.config.Genesis.BaseFee > 0 {
-			return b.config.Genesis.BaseFee
+		if b.config.Chain.Genesis.BaseFee > 0 {
+			return b.config.Chain.Genesis.BaseFee
 		}
 
 		return chain.GenesisBaseFee