Merge pull request #2574 from 0chain/fix/block-rewards-endpoint

Fix block rewards endpoint

code/go/0chain.net/smartcontract/dbs/event/challenge.go

@@ -36,7 +36,7 @@ func (edb *EventDb) GetAllChallengesByAllocationID(allocationID string) (Challen
 }
 
 func (edb *EventDb) GetPassedChallengesForBlobberAllocation(allocationID string) (map[string]int, error) {
-	var result map[string]int
+	result := make(map[string]int)
 
 	edb.Store.Get().Table("challenges").
 		Select("blobber_id, count(*) as count").

code/go/0chain.net/smartcontract/dbs/event/reward_provider_dev.go

@@ -171,7 +171,7 @@ func (edb *EventDb) GetBlockRewards(startBlock, endBlock string) ([]int64, error
 
 	var blockRewards []BlockReward
 
-	err := edb.Get().Table("reward_providers").Select("provider_id, sum(amount) as amount").Where("block_number >= ? AND block_number <= ?", startBlock, endBlock).Group("provider_id").Scan(&blockRewards).Error
+	err := edb.Get().Table("reward_providers").Select("provider_id, sum(amount) as amount").Where("reward_type = ? AND block_number >= ? AND block_number <= ?", spenum.BlockRewardBlobber, startBlock, endBlock).Group("provider_id").Order("provider_id").Scan(&blockRewards).Error
 	if err != nil {
 		return nil, err
 	}
@@ -182,15 +182,16 @@ func (edb *EventDb) GetBlockRewards(startBlock, endBlock string) ([]int64, error
 
 	for _, br := range blockRewards {
 
-		var delegateRewards BlockReward
-		err = edb.Get().Table("reward_delegates").Select("provider_id, sum(amount) as amount").Where("block_number >= ? AND block_number <= ?", startBlock, endBlock).Group("provider_id").Scan(&delegateRewards).Error
+		var delegateReward int64
+
+		err = edb.Get().Table("reward_delegates").Select("sum(amount) as amount").Where("reward_type = ? AND provider_id = ? AND block_number >= ? AND block_number <= ?", spenum.BlockRewardBlobber, br.ProviderID, startBlock, endBlock).Scan(&delegateReward).Error
 		if err != nil {
 			return nil, err
 		}
 
-		result = append(result, delegateRewards.Amount)
+		result = append(result, delegateReward)
 
-		totals = append(totals, br.Amount+delegateRewards.Amount)
+		totals = append(totals, br.Amount+delegateReward)
 	}
 
 	result = append(result, totals...)