Merge tag 'v1-20190914.1' into s3

Mainnet v1 release candidate 20190914.1

cmd/harmony/main.go

@@ -10,7 +10,6 @@ import (
 	"path"
 	"runtime"
 	"strconv"
-	"strings"
 	"time"
 
 	ethCommon "github.com/ethereum/go-ethereum/common"
@@ -463,7 +462,10 @@ func main() {
 		go currentNode.SupportBeaconSyncing()
 	}
 
-	startMsg := fmt.Sprintf("==== New %s Node ====", strings.Title(*nodeType))
+	startMsg := "==== New Harmony Node ===="
+	if *nodeType == "explorer" {
+		startMsg = "==== New Explorer Node ===="
+	}
 
 	utils.Logger().Info().
 		Str("BlsPubKey", hex.EncodeToString(nodeConfig.ConsensusPubKey.Serialize())).

hmy/api_backend.go

@@ -246,6 +246,7 @@ func (b *APIBackend) ResendCx(ctx context.Context, txID common.Hash) (uint64, bo
 		return 0, false
 	}
 	tx := txs[int(index)]
+	// check whether it is a valid cross shard tx
 	if tx.ShardID() == tx.ToShardID() || blk.Header().ShardID() != tx.ShardID() {
 		return 0, false
 	}

node/node_cross_shard.go

@@ -91,7 +91,7 @@ func (node *Node) BroadcastMissingCXReceipts() {
 		}
 		sig := nextHeader.LastCommitSignature()
 		bitmap := nextHeader.LastCommitBitmap()
-		go node.BroadcastCXReceiptsWithShardID(blk, sig[:], bitmap, toShardID)
+		node.BroadcastCXReceiptsWithShardID(blk, sig[:], bitmap, toShardID)
 	}
 	node.CxPool.Clear()
 	// this should not happen or maybe happen for impatient user

node/node_handler.go

@@ -390,6 +390,7 @@ func (node *Node) PostConsensusProcessing(newBlock *types.Block, commitSigAndBit
 		}
 	}
 
+	// Broadcast client requested missing cross shard receipts if there is any
 	node.BroadcastMissingCXReceipts()
 
 	// TODO chao: uncomment this after beacon syncing is stable

node/node_syncing.go

@@ -177,6 +177,7 @@ func (node *Node) DoBeaconSyncing() {
 		}
 		if node.beaconSync.GetActivePeerNumber() == 0 {
 			utils.Logger().Info().Msg("no peers; bootstrapping beacon sync config")
+			// 0 means shardID=0 here
 			peers, err := node.SyncingPeerProvider.SyncingPeers(0)
 			if err != nil {
 				utils.Logger().Warn().

scripts/go_executable_build.sh

@@ -162,7 +162,7 @@ function release
       if [ -e $BINDIR/$bin ]; then
          $AWSCLI s3 cp $BINDIR/$bin s3://${PUBBUCKET}/$FOLDER/$bin --acl public-read
       else
-         echo "!! MISSGIN $bin !!"
+         echo "!! MISSGING $bin !!"
       fi
    done