Include more blocks in snapshots

common/query/blockQuery.go

@@ -194,8 +194,8 @@ func (bq *BlockQuery) Rollback(height uint32) (multiQueries [][]interface{}) {
 
 // SelectDataForSnapshot select only the block at snapshot height (fromHeight is unused)
 func (bq *BlockQuery) SelectDataForSnapshot(fromHeight, toHeight uint32) string {
-	return fmt.Sprintf(`SELECT %s FROM %s WHERE height = %d`,
-		strings.Join(bq.Fields, ","), bq.getTableName(), toHeight)
+	return fmt.Sprintf(`SELECT %s FROM %s WHERE height >= %d AND height <= %d`,
+		strings.Join(bq.Fields, ","), bq.getTableName(), fromHeight, toHeight)
 }
 
 // TrimDataBeforeSnapshot delete entries to assure there are no duplicates before applying a snapshot

common/query/blockQuery_test.go

@@ -357,7 +357,7 @@ func TestBlockQuery_SelectDataForSnapshot(t *testing.T) {
 			},
 			want: "SELECT id,block_hash,previous_block_hash,height,timestamp,block_seed,block_signature," +
 				"cumulative_difficulty,payload_length,payload_hash,blocksmith_public_key,total_amount,total_fee,total_coinbase," +
-				"version FROM main_block WHERE height = 10",
+				"version FROM main_block WHERE height >= 0 AND height <= 10",
 		},
 	}
 	for _, tt := range tests {

core/service/snapshotMainBlockService.go

@@ -98,6 +98,11 @@ func (ss *SnapshotMainBlockService) NewSnapshotFile(block *model.Block) (snapsho
 				fromHeight uint32
 				rows       *sql.Rows
 			)
+			if qryRepoName == "block" {
+				if snapshotPayloadHeight > constant.MinRollbackBlocks {
+					fromHeight = snapshotPayloadHeight - constant.MinRollbackBlocks
+				}
+			}
 			if qryRepoName == "publishedReceipt" {
 				if snapshotPayloadHeight > constant.LinkedReceiptBlocksLimit {
 					fromHeight = snapshotPayloadHeight - constant.LinkedReceiptBlocksLimit