Release Candidate 2023.2.7 (dev -> main)

.mergify.yml

@@ -0,0 +1,59 @@
+pull_request_rules:
+  - name: Squash merge rule to dev
+    conditions:
+      # applied for merge to the dev branch
+      - base=dev
+      # no unresolved threads
+      - "#review-threads-unresolved=0"
+      # Approved by two reviewers
+      - "#approved-reviews-by>=2"
+      # no unverified commit
+      - "#commits-unverified=0"
+      # Travis ci succeeded
+      - "check-success=Travis CI - Pull Request"
+      # git guardian succeeded
+      - "check-success=GitGuardian Security Checks"
+      # PR is not a draft
+      - -draft
+      # PR is not conflicting with the base branch
+      - -conflict
+      # conditions to avoid auto merge mistakes
+      # PR title doesn't have wip (not case sensitive)
+      - -title~=(?i)wip
+      # PR doesn't have WIP label (not case sensitive)
+      - label!=(?i)wip
+      # ready-to-merge is required to trigger the merge
+      - label=ready-to-merge
+    actions:
+      merge:
+        method: squash
+  - name: merge rule to main
+    conditions:
+      # from the dev branch : no direct PR to main
+      - head=dev
+      # applied for merge to the dev branch
+      - base=main
+      # no unresolved threads
+      - "#review-threads-unresolved=0"
+      # Approved by two reviewers
+      - "#approved-reviews-by>=2"
+      # no unverified commit
+      - "#commits-unverified=0"
+      # Travis ci succeeded
+      - "check-success=Travis CI - Pull Request"
+      # git guardian succeeded
+      - "check-success=GitGuardian Security Checks"
+      # PR is not a draft
+      - -draft
+      # PR is not conflicting with the base branch
+      - -conflict
+      # conditions to avoid auto merge mistakes
+      # PR title doesn't have wip (not case sensitive)
+      - -title~=(?i)wip
+      # PR doesn't have WIP label (not case sensitive)
+      - label!=(?i)wip
+      # ready-to-merge is required to trigger the merge
+      - label=ready-to-merge
+    actions:
+      merge:
+        method: merge

api/service/legacysync/syncing_test.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/harmony-one/harmony/api/service/legacysync/downloader"

node/node_syncing.go

@@ -352,7 +352,7 @@ func (node *Node) NodeSyncing() {
 		if node.HarmonyConfig.TiKV.Role == tikv.RoleWriter {
 			node.supportSyncing() // the writer needs to be in sync with it's other peers
 		}
-	} else if !node.HarmonyConfig.General.IsOffline && node.HarmonyConfig.DNSSync.Client {
+	} else if !node.HarmonyConfig.General.IsOffline && (node.HarmonyConfig.DNSSync.Client || node.HarmonyConfig.Sync.Downloader) {
 		node.supportSyncing() // for non-writer-reader mode a.k.a tikv nodes
 	}
 }
@@ -372,6 +372,11 @@ func (node *Node) supportSyncing() {
 		go node.SendNewBlockToUnsync()
 	}
 
+	// if stream sync client is running, don't create other sync client instances
+	if node.HarmonyConfig.Sync.Downloader {
+		return
+	}
+
 	if !node.NodeConfig.StagedSync && node.stateSync == nil {
 		node.stateSync = node.createStateSync(node.Blockchain())
 		utils.Logger().Debug().Msg("[SYNC] initialized state sync")

p2p/host.go

@@ -12,17 +12,17 @@ import (
 	"time"
 
 	"github.com/libp2p/go-libp2p"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/routing"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	libp2p_pubsub "github.com/libp2p/go-libp2p-pubsub"
 	libp2p_config "github.com/libp2p/go-libp2p/config"
 	libp2p_crypto "github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/host"
 	libp2p_host "github.com/libp2p/go-libp2p/core/host"
 	libp2p_network "github.com/libp2p/go-libp2p/core/network"
 	libp2p_peer "github.com/libp2p/go-libp2p/core/peer"
 	libp2p_peerstore "github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/protocol"
+	"github.com/libp2p/go-libp2p/core/routing"
 	"github.com/libp2p/go-libp2p/p2p/net/connmgr"
 
 	"github.com/libp2p/go-libp2p/p2p/security/noise"

p2p/stream/types/utils.go

@@ -11,7 +11,7 @@ import (
 
 	nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
 	"github.com/hashicorp/go-version"
-	libp2p_proto "github.com/libp2p/go-libp2p-core/protocol"
+	libp2p_proto "github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/pkg/errors"
 )
 

scripts/travis_go_checker.sh

@@ -84,7 +84,7 @@ fi
 echo "Running go test..."
 # Fix https://github.com/golang/go/issues/44129#issuecomment-788351567
 go get -t ./...
-if go test -v -count=1 -vet=all -race ./...
+if go test -count=1 -vet=all -race ./...
 then
 	echo "go test succeeded."
 else