[Upgrade] Go-Ethereum release v1.9.25

core/blockchain.go

@@ -2817,7 +2817,12 @@ func (bc *BlockChain) GetTransactionLookup(hash common.Hash) *rawdb.LegacyTxLook
 func (bc *BlockChain) Config() *params.ChainConfig { return bc.chainConfig }
 
 // QuorumConfig retrieves the Quorum chain's configuration
-func (bc *BlockChain) QuorumConfig() *QuorumChainConfig { return bc.quorumConfig }
+func (bc *BlockChain) QuorumConfig() *QuorumChainConfig {
+	if bc == nil || bc.quorumConfig == nil {
+		return &QuorumChainConfig{}
+	}
+	return bc.quorumConfig
+}
 
 // Engine retrieves the blockchain's consensus engine.
 func (bc *BlockChain) Engine() consensus.Engine { return bc.engine }

core/vm/runtime/runtime_test.go

@@ -255,10 +255,10 @@ func (d *dummyChain) SupportsMultitenancy(context.Context) (*proto.PreAuthentica
 }
 
 // Config retrieves the chain's fork configuration
-func (d *dummyChain) Config() *params.ChainConfig { return nil }
+func (d *dummyChain) Config() *params.ChainConfig { return &params.ChainConfig{} }
 
 // QuorumConfig retrieves the Quorum chain's configuration
-func (d *dummyChain) QuorumConfig() *core.QuorumChainConfig { return nil }
+func (d *dummyChain) QuorumConfig() *core.QuorumChainConfig { return &core.QuorumChainConfig{} }
 
 // PrivateStateManager returns the private state manager
 func (d *dummyChain) PrivateStateManager() mps.PrivateStateManager { return nil }

light/lightchain.go

@@ -603,7 +603,7 @@ func (lc *LightChain) SupportsMultitenancy(context.Context) (*proto.PreAuthentic
 }
 
 // QuorumConfig retrieves the Quorum chain's configuration
-func (lc *LightChain) QuorumConfig() *core.QuorumChainConfig { return nil }
+func (lc *LightChain) QuorumConfig() *core.QuorumChainConfig { return &core.QuorumChainConfig{} }
 
 // PrivateStateManager returns the private state manager
 func (lc *LightChain) PrivateStateManager() mps.PrivateStateManager { return nil }