Merge pull request #170 from ElrondNetwork/delete-scrs-at-soruce

Delete also scrs at source
multiversx · Sep 20, 2022 · 78d3e7f · 78d3e7f
2 parents 0c41f75 + d4b2b44
commit 78d3e7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/process/transactions/transactionsProcessor.go b/process/transactions/transactionsProcessor.go
@@ -172,8 +172,9 @@ func (tdp *txsDatabaseProcessor) GetHexEncodedHashesForRemove(header coreData.He
 	encodedTxsHashes := make([]string, 0)
 	encodedScrsHashes := make([]string, 0)
 	for _, miniblock := range body.MiniBlocks {
-		if isCrossShardAtSourceAndNoRewardsMB(selfShardID, miniblock) {
-			// ignore cross-shard miniblocks at source ( exception to this rule are rewards miniblocks)
+		shouldIgnore := isCrossShardAtSourceNormalTx(selfShardID, miniblock)
+		if shouldIgnore {
+			// ignore cross-shard miniblocks at source with normal txs
 			continue
 		}
 
@@ -193,12 +194,12 @@ func (tdp *txsDatabaseProcessor) GetHexEncodedHashesForRemove(header coreData.He
 	return encodedTxsHashes, encodedScrsHashes
 }
 
-func isCrossShardAtSourceAndNoRewardsMB(selfShardID uint32, miniblock *block.MiniBlock) bool {
+func isCrossShardAtSourceNormalTx(selfShardID uint32, miniblock *block.MiniBlock) bool {
 	isCrossShard := miniblock.SenderShardID != miniblock.ReceiverShardID
 	isAtSource := miniblock.SenderShardID == selfShardID
-	noRewardsMb := miniblock.Type != block.RewardsBlock
+	txBlock := miniblock.Type == block.TxBlock
 
-	return isCrossShard && isAtSource && noRewardsMb
+	return isCrossShard && isAtSource && txBlock
 }
 
 func shouldIgnoreProcessedMBScheduled(header coreData.HeaderHandler, mbIndex int) bool {

diff --git a/process/transactions/transactionsProcessor_test.go b/process/transactions/transactionsProcessor_test.go
@@ -562,14 +562,22 @@ func TestGetRewardsTxsHashesHexEncoded(t *testing.T) {
 				SenderShardID:   2,
 				ReceiverShardID: core.MetachainShardId,
 			},
+			{
+				TxHashes: [][]byte{
+					[]byte("h7"),
+				},
+				Type:            block.SmartContractResultBlock,
+				SenderShardID:   core.MetachainShardId,
+				ReceiverShardID: 0,
+			},
 		},
 	}
 
 	expectedHashes := []string{
 		"6831", "6832", "6833", "6835",
 	}
 	expectedScrHashes := []string{
-		"6836",
+		"6836", "6837",
 	}
 
 	txsHashes, scrHashes := txDBProc.GetHexEncodedHashesForRemove(header, body)