Merge pull request #1533 from chaosma/master

add ToShardID verification

node/node_cross_shard.go

@@ -221,6 +221,12 @@ func (node *Node) verifyIncomingReceipts(block *types.Block) error {
 		}
 		m[hash] = true
 
+		for _, item := range cxp.Receipts {
+			if item.ToShardID != node.Blockchain().ShardID() {
+				return ctxerror.New("[verifyIncomingReceipts] Invalid ToShardID", "myShardID", node.Blockchain().ShardID(), "expectShardID", item.ToShardID)
+			}
+		}
+
 		if err := core.IsValidCXReceiptsProof(cxp); err != nil {
 			return ctxerror.New("[verifyIncomingReceipts] verification failed").WithCause(err)
 		}

node/node_newblock.go

@@ -207,6 +207,7 @@ func (node *Node) proposeReceiptsProof() []*types.CXReceiptsProof {
 
 	m := make(map[common.Hash]bool)
 
+Loop:
 	for _, cxp := range node.pendingCXReceipts {
 		if numProposed > IncomingReceiptsLimit {
 			pendingReceiptsList = append(pendingReceiptsList, cxp)
@@ -225,6 +226,12 @@ func (node *Node) proposeReceiptsProof() []*types.CXReceiptsProof {
 			m[hash] = true
 		}
 
+		for _, item := range cxp.Receipts {
+			if item.ToShardID != node.Blockchain().ShardID() {
+				continue Loop
+			}
+		}
+
 		if err := core.IsValidCXReceiptsProof(cxp); err != nil {
 			utils.Logger().Error().Err(err).Msg("[proposeReceiptsProof] Invalid CXReceiptsProof")
 			continue