fix linter

Author: miiu96

data/block.go

@@ -2,6 +2,8 @@ package data
 
 import (
 	"time"
+
+	"github.com/multiversx/mx-chain-core-go/data/api"
 )
 
 // Block is a structure containing all the fields that need
@@ -39,6 +41,7 @@ type Block struct {
 	MaxGasLimit           uint64                 `json:"maxGasLimit"`
 	ScheduledData         *ScheduledData         `json:"scheduledData,omitempty"`
 	EpochStartShardsData  []*EpochStartShardData `json:"epochStartShardsData,omitempty"`
+	PreviousHeaderProof   *api.HeaderProof       `json:"previousHeaderProof,omitempty"`
 	RandSeed              string                 `json:"randSeed,omitempty"`
 	PrevRandSeed          string                 `json:"prevRandSeed,omitempty"`
 	Signature             string                 `json:"signature,omitempty"`

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
 	github.com/multiversx/mx-chain-communication-go v1.1.1
-	github.com/multiversx/mx-chain-core-go v1.2.24
+	github.com/multiversx/mx-chain-core-go v1.2.25-0.20250217130858-055baa51891a
 	github.com/multiversx/mx-chain-logger-go v1.0.15
 	github.com/multiversx/mx-chain-vm-common-go v1.5.16
 	github.com/prometheus/client_model v0.4.0

go.sum

@@ -253,8 +253,8 @@ github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiversx/mx-chain-communication-go v1.1.1 h1:y4DoQeQOJTaSUsRzczQFazf8JYQmInddypApqA3AkwM=
 github.com/multiversx/mx-chain-communication-go v1.1.1/go.mod h1:WK6bP4pGEHGDDna/AYRIMtl6G9OA0NByI1Lw8PmOnRM=
-github.com/multiversx/mx-chain-core-go v1.2.24 h1:O0X7N9GfNVUCE9fukXA+dvfCRRjViYn88zOaE7feUog=
-github.com/multiversx/mx-chain-core-go v1.2.24/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
+github.com/multiversx/mx-chain-core-go v1.2.25-0.20250217130858-055baa51891a h1:iX2qWuxBO3nUKfT5Vs2QGG4KqlB4SgYAv3yW7YWA3GI=
+github.com/multiversx/mx-chain-core-go v1.2.25-0.20250217130858-055baa51891a/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
 github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk=
 github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc=
 github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ=

process/elasticproc/block/blockProcessor.go

@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"github.com/multiversx/mx-chain-core-go/data/api"
 	"strconv"
 	"time"
 
@@ -131,9 +132,29 @@ func (bp *blockProcessor) PrepareBlockForDB(obh *outport.OutportBlockWithHeader)
 	appendBlockDetailsFromHeaders(elasticBlock, obh.Header, obh.BlockData.Body, obh.TransactionPool)
 	appendBlockDetailsFromIntraShardMbs(elasticBlock, obh.BlockData.IntraShardMiniBlocks, obh.TransactionPool, len(obh.Header.GetMiniBlockHeaderHandlers()))
 
+	appendPreviousHeaderProof(elasticBlock, obh.Header)
+
 	return elasticBlock, nil
 }
 
+func appendPreviousHeaderProof(elasticBlock *data.Block, header coreData.HeaderHandler) {
+	prevHeaderProof := header.GetPreviousProof()
+	if prevHeaderProof == nil {
+		return
+	}
+
+	elasticBlock.PreviousHeaderProof = &api.HeaderProof{
+		PubKeysBitmap:       hex.EncodeToString(prevHeaderProof.GetPubKeysBitmap()),
+		AggregatedSignature: hex.EncodeToString(prevHeaderProof.GetAggregatedSignature()),
+		HeaderHash:          hex.EncodeToString(prevHeaderProof.GetHeaderHash()),
+		HeaderEpoch:         prevHeaderProof.GetHeaderEpoch(),
+		HeaderNonce:         prevHeaderProof.GetHeaderNonce(),
+		HeaderShardId:       prevHeaderProof.GetHeaderShardId(),
+		HeaderRound:         prevHeaderProof.GetHeaderRound(),
+		IsStartOfEpoch:      prevHeaderProof.GetIsStartOfEpoch(),
+	}
+}
+
 func getTxsCount(header coreData.HeaderHandler) (numTxs, notarizedTxs uint32) {
 	numTxs = header.GetTxCount()
 

process/elasticproc/block/blockProcessor_test.go

@@ -3,6 +3,7 @@ package block
 import (
 	"encoding/hex"
 	"errors"
+	"github.com/multiversx/mx-chain-core-go/data/api"
 	"math/big"
 	"testing"
 
@@ -258,6 +259,16 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) {
 				TxCount: 120,
 			},
 		},
+		PreviousHeaderProof: &dataBlock.HeaderProof{
+			PubKeysBitmap:       []byte("bitmap"),
+			AggregatedSignature: []byte("sig"),
+			HeaderHash:          []byte("hash"),
+			HeaderEpoch:         1,
+			HeaderNonce:         3,
+			HeaderShardId:       2,
+			HeaderRound:         4,
+			IsStartOfEpoch:      true,
+		},
 	}
 
 	headerBytes, _ := bp.marshalizer.Marshal(header)
@@ -293,7 +304,7 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) {
 		Proposer:              0,
 		Validators:            nil,
 		PubKeyBitmap:          "",
-		Size:                  898,
+		Size:                  1090,
 		SizeTxs:               0,
 		Timestamp:             0,
 		StateRootHash:         "",
@@ -331,6 +342,16 @@ func TestBlockProcessor_PrepareBlockForDBEpochStartMeta(t *testing.T) {
 				TxsHashes:                []string{},
 			},
 		},
+		PreviousHeaderProof: &api.HeaderProof{
+			PubKeysBitmap:       "6269746d6170",
+			AggregatedSignature: "736967",
+			HeaderHash:          "68617368",
+			HeaderEpoch:         1,
+			HeaderNonce:         3,
+			HeaderShardId:       2,
+			HeaderRound:         4,
+			IsStartOfEpoch:      true,
+		},
 		EpochStartShardsData: []*data.EpochStartShardData{
 			{
 				ShardID:               1,