Merge pull request #7777 from multiversx/fix-api-meta-block

Fix api epoch start meta block root hash

Author: ssd04

epochStart/bootstrap/process.go

@@ -914,7 +914,11 @@ func (e *epochStartBootstrap) syncEpochStartMetaHeaders(
 
 	if meta.GetEpoch() == e.startEpoch+1 {
 		// for genesis block there is no epoch start header to sync, so we set an empty meta block
-		syncedHeaders[string(meta.GetEpochStartHandler().GetEconomicsHandler().GetPrevEpochStartHash())] = &block.MetaBlock{}
+		var metaBlock data.MetaHeaderHandler = &block.MetaBlock{}
+		if meta.IsHeaderV3() {
+			metaBlock = &block.MetaBlockV3{}
+		}
+		syncedHeaders[string(meta.GetEpochStartHandler().GetEconomicsHandler().GetPrevEpochStartHash())] = metaBlock
 	}
 
 	return syncedHeaders, nil

epochStart/bootstrap/storageProcess.go

@@ -397,7 +397,11 @@ func (sesb *storageEpochStartBootstrap) syncHeadersFromStorage(meta data.MetaHea
 	}
 
 	if meta.GetEpoch() == sesb.startEpoch+1 {
-		syncedHeaders[string(meta.GetEpochStartHandler().GetEconomicsHandler().GetPrevEpochStartHash())] = &block.MetaBlock{}
+		var metaBlock data.MetaHeaderHandler = &block.MetaBlock{}
+		if meta.IsHeaderV3() {
+			metaBlock = &block.MetaBlockV3{}
+		}
+		syncedHeaders[string(meta.GetEpochStartHandler().GetEconomicsHandler().GetPrevEpochStartHash())] = metaBlock
 	}
 
 	return syncedHeaders, nil

epochStart/shardchain/trigger.go

@@ -956,12 +956,11 @@ func (t *trigger) getHeaderWithHashFromPool(neededHash []byte) data.HeaderHandle
 func (t *trigger) getHeaderWithHashFromStorage(neededHash []byte) data.HeaderHandler {
 	storageData, err := t.metaHdrStorage.Get(neededHash)
 	if err == nil {
-		var neededHdr block.MetaBlock
-		err = t.marshaller.Unmarshal(&neededHdr, storageData)
+		neededHdr, err := process.UnmarshalMetaHeader(t.marshaller, storageData)
 		if err == nil {
-			t.mapHashHdr[string(neededHash)] = &neededHdr
-			t.mapNonceHashes[neededHdr.Nonce] = append(t.mapNonceHashes[neededHdr.Nonce], string(neededHash))
-			return &neededHdr
+			t.mapHashHdr[string(neededHash)] = neededHdr
+			t.mapNonceHashes[neededHdr.GetNonce()] = append(t.mapNonceHashes[neededHdr.GetNonce()], string(neededHash))
+			return neededHdr
 		}
 	}
 

node/external/blockAPI/metaBlock.go

@@ -246,7 +246,6 @@ func (mbp *metaAPIBlockProcessor) convertMetaBlockBytesToAPIBlock(hash []byte, b
 		DeveloperFeesInEpoch:   blockHeader.GetDevFeesInEpoch().String(),
 		Timestamp:              int64(timestampSec),
 		TimestampMs:            int64(timestampMs),
-		StateRootHash:          hex.EncodeToString(blockHeader.GetRootHash()),
 		Status:                 BlockStatusOnChain,
 		LeaderSignature:        hex.EncodeToString(blockHeader.GetLeaderSignature()),
 		ChainID:                string(blockHeader.GetChainID()),

node/node.go

@@ -16,7 +16,6 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/api"
-	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/endProcess"
 	"github.com/multiversx/mx-chain-core-go/data/esdt"
 	"github.com/multiversx/mx-chain-core-go/data/guardians"
@@ -1289,18 +1288,37 @@ func (n *Node) getMetaFirstNonceOfEpoch(epoch uint32) (*common.EpochStartDataAPI
 		return nil, fmt.Errorf("cannot load epoch start block for epoch %d (%w)", epoch, err)
 	}
 
-	var metaBlock block.MetaBlock
-	err = n.coreComponents.InternalMarshalizer().Unmarshal(&metaBlock, result)
+	metaBlock, err := process.UnmarshalMetaHeader(n.coreComponents.InternalMarshalizer(), result)
 	if err != nil {
 		return nil, err
 	}
 
-	return n.prepareEpochStartDataResponse(&metaBlock), nil
+	return n.prepareEpochStartDataResponse(metaBlock), nil
+}
+
+func (n *Node) getLastExecutionRootHashOnHeader(
+	header data.HeaderHandler,
+) []byte {
+	rootHash := header.GetRootHash()
+	if !header.IsHeaderV3() {
+		return rootHash
+	}
+
+	lastExecRes, err := common.ExtractBaseExecutionResultHandler(header.GetLastExecutionResultHandler())
+	if err != nil {
+		// this should not happen, last execution result should be set on header v3
+		log.Error("failed to get last execution result on header", "error", err)
+		return rootHash
+	}
+
+	return lastExecRes.GetRootHash()
 }
 
 func (n *Node) prepareEpochStartDataResponse(header data.HeaderHandler) *common.EpochStartDataAPI {
 	timestampSec, timestampMs, _ := common.GetHeaderTimestamps(header, n.coreComponents.EnableEpochsHandler())
 
+	rootHash := n.getLastExecutionRootHashOnHeader(header)
+
 	response := &common.EpochStartDataAPI{
 		Nonce:         header.GetNonce(),
 		Round:         header.GetRound(),
@@ -1309,7 +1327,7 @@ func (n *Node) prepareEpochStartDataResponse(header data.HeaderHandler) *common.
 		TimestampMs:   int64(timestampMs),
 		Epoch:         header.GetEpoch(),
 		PrevBlockHash: hex.EncodeToString(header.GetPrevHash()),
-		StateRootHash: hex.EncodeToString(header.GetRootHash()),
+		StateRootHash: hex.EncodeToString(rootHash),
 	}
 
 	if header.GetAdditionalData() != nil {

process/sync/metablock.go

@@ -168,8 +168,7 @@ func (boot *MetaBootstrap) setLastEpochStartRound() {
 		return
 	}
 
-	epochStartMetaBlock := &block.MetaBlock{}
-	err = boot.marshalizer.Unmarshal(epochStartMetaBlock, epochStartHdr)
+	epochStartMetaBlock, err := process.UnmarshalMetaHeader(boot.marshalizer, epochStartHdr)
 	if err != nil {
 		return
 	}
@@ -235,13 +234,7 @@ func (boot *MetaBootstrap) getPrevHeader(
 		return nil, err
 	}
 
-	prevHeader := &block.MetaBlock{}
-	err = boot.marshalizer.Unmarshal(prevHeader, buffHeader)
-	if err != nil {
-		return nil, err
-	}
-
-	return prevHeader, nil
+	return process.UnmarshalMetaHeader(boot.marshalizer, buffHeader)
 }
 
 func (boot *MetaBootstrap) getCurrHeader() (data.HeaderHandler, error) {