Merge pull request #253 from multiversx/merge-rc-in-feat-logs

Merge rc in feat logs

.github/workflows/golangci-lint.yml

@@ -0,0 +1,37 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches: [ main, feat/*, rc/* ]
+
+permissions:
+  contents: read
+
+jobs:
+  golangci:
+    name: golangci linter
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.7
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.53.2
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          args: --timeout 10m0s --max-issues-per-linter 0 --max-same-issues 0 --print-issued-lines
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          only-new-issues: true
+
+          # Optional: if set to true then the action will use pre-installed Go
+          # skip-go-installation: true

.github/workflows/pr-tests.yml

@@ -1,20 +1,21 @@
 name: Tests
 
 on:
-  push:
-    branches: [ main, development, feat/*, rc/* ]
   pull_request:
-    branches: [ main, development, feat/*, rc/* ]
+    branches: [ main, rc/*, feat/* ]
+    types: [ opened, ready_for_review ]
+  push:
+  workflow_dispatch:
 
 jobs:
   test:
     name: Unit
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.17.6
+      - name: Set up Go 1.20.7
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.7
         id: go
 
       - name: Check out code

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"];
 }

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