Merge pull request #342 from multiversx/add-header-proof-round

Added header proof round
multiversx · Jan 9, 2025 · 3941ba9 · 3941ba9
2 parents 66bd6e4 + 7ff31f3
commit 3941ba9
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 52 deletions.
diff --git a/data/block/blockV2.pb.go b/data/block/blockV2.pb.go
diff --git a/data/block/blockV2.proto b/data/block/blockV2.proto
@@ -41,4 +41,5 @@ message HeaderProof {
   uint32 HeaderEpoch         = 4 [(gogoproto.jsontag) = "headerEpoch"];
   uint64 HeaderNonce         = 5 [(gogoproto.jsontag) = "headerNonce"];
   uint32 HeaderShardId       = 6 [(gogoproto.jsontag) = "headerShardId"];
+  uint64 HeaderRound         = 7 [(gogoproto.jsontag) = "headerRound"];
 }
diff --git a/data/block/metaBlock.go b/data/block/metaBlock.go
@@ -581,5 +581,6 @@ func (m *MetaBlock) SetPreviousProof(proof data.HeaderProofHandler) {
 		HeaderEpoch:         proof.GetHeaderEpoch(),
 		HeaderNonce:         proof.GetHeaderNonce(),
 		HeaderShardId:       proof.GetHeaderShardId(),
+		HeaderRound:         proof.GetHeaderRound(),
 	}
 }
diff --git a/data/block/metaBlock_test.go b/data/block/metaBlock_test.go
@@ -417,6 +417,7 @@ func TestMetaBlock2_GetPreviousProof(t *testing.T) {
 		HeaderEpoch:         123,
 		HeaderNonce:         234,
 		HeaderShardId:       0,
+		HeaderRound:         345,
 	}
 
 	metaBlock.SetPreviousProof(previousProof)
@@ -428,4 +429,5 @@ func TestMetaBlock2_GetPreviousProof(t *testing.T) {
 	require.Equal(t, previousProof.HeaderEpoch, proof.GetHeaderEpoch())
 	require.Equal(t, previousProof.HeaderNonce, proof.GetHeaderNonce())
 	require.Equal(t, previousProof.HeaderShardId, proof.GetHeaderShardId())
+	require.Equal(t, previousProof.HeaderRound, proof.GetHeaderRound())
 }
diff --git a/data/block/shardDataHandler.go b/data/block/shardDataHandler.go
@@ -226,6 +226,7 @@ func (sd *ShardData) SetPreviousProof(proof data.HeaderProofHandler) error {
 		HeaderEpoch:         proof.GetHeaderEpoch(),
 		HeaderNonce:         proof.GetHeaderNonce(),
 		HeaderShardId:       proof.GetHeaderShardId(),
+		HeaderRound:         proof.GetHeaderRound(),
 	}
 
 	return nil

diff --git a/data/interface.go b/data/interface.go
@@ -96,6 +96,7 @@ type HeaderProofHandler interface {
 	GetHeaderEpoch() uint32
 	GetHeaderNonce() uint64
 	GetHeaderShardId() uint32
+	GetHeaderRound() uint64
 }
 
 // ShardHeaderHandler defines getters and setters for the shard block header