Merge pull request #250 from multiversx/merge_rc160_into_feat_refacto…

…r_enable_epochs_handler_2023.08.16 Merge rc160 into feat refactor enable epochs handler 2023.08.16
multiversx · Aug 16, 2023 · e993142 · e993142
2 parents c57a59e + a72af3e
commit e993142
Show file tree

Hide file tree

Showing 5 changed files with 739 additions and 205 deletions.
diff --git a/data/outport/config.pb.go b/data/outport/config.pb.go
diff --git a/data/outport/config.proto b/data/outport/config.proto
@@ -8,5 +8,6 @@ option (gogoproto.stable_marshaler_all) = true;
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 message OutportConfig {
-  bool IsInImportDBMode = 1 [(gogoproto.jsontag) = "isInImportDBMode"];
+  uint32 ShardID          = 1 [(gogoproto.jsontag) = "shardID"];
+  bool   IsInImportDBMode = 2 [(gogoproto.jsontag) = "isInImportDBMode"];
 }
diff --git a/data/outport/outportBlock.go b/data/outport/outportBlock.go
@@ -4,6 +4,7 @@ package outport
 
 import (
 	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
 )
 
 // OutportBlockWithHeader will extend the OutportBlock structure
@@ -14,9 +15,10 @@ type OutportBlockWithHeader struct {
 
 // HeaderDataWithBody holds header and body data
 type HeaderDataWithBody struct {
-	Body       data.BodyHandler
-	Header     data.HeaderHandler
-	HeaderHash []byte
+	Body                 data.BodyHandler
+	Header               data.HeaderHandler
+	IntraShardMiniBlocks []*block.MiniBlock
+	HeaderHash           []byte
 }
 
 // OutportBlockWithHeaderAndBody is a wrapper for OutportBlock used for outport handler