chore: change some events for easier indexing

Signed-off-by: Tomás Migone <tomas@edgeandnode.com>

Author: tmigone

packages/contracts/contracts/rewards/RewardsManager.sol

@@ -38,8 +38,9 @@ contract RewardsManager is RewardsManagerV5Storage, GraphUpgradeable, IRewardsMa
 
     /**
      * @dev Emitted when rewards are assigned to an indexer.
+     * @dev We use the Horizon prefix to change the event signature which makes network subgraph development much easier
      */
-    event RewardsAssigned(address indexed indexer, address indexed allocationID, uint256 amount);
+    event HorizonRewardsAssigned(address indexed indexer, address indexed allocationID, uint256 amount);
 
     /**
      * @dev Emitted when rewards are denied to an indexer.
@@ -412,7 +413,7 @@ contract RewardsManager is RewardsManagerV5Storage, GraphUpgradeable, IRewardsMa
             graphToken().mint(rewardsIssuer, rewards);
         }
 
-        emit RewardsAssigned(indexer, _allocationID, rewards);
+        emit HorizonRewardsAssigned(indexer, _allocationID, rewards);
 
         return rewards;
     }

packages/contracts/test/unit/rewards/rewards.test.ts

@@ -675,7 +675,7 @@ describe('Rewards', () => {
         // Close allocation. At this point rewards should be collected for that indexer
         const tx = staking.connect(indexer1).closeAllocation(allocationID1, randomHexBytes())
         await expect(tx)
-          .emit(rewardsManager, 'RewardsAssigned')
+          .emit(rewardsManager, 'HorizonRewardsAssigned')
           .withArgs(indexer1.address, allocationID1, toBN(0))
       })
 
@@ -693,7 +693,7 @@ describe('Rewards', () => {
         // Close allocation. At this point rewards should be collected for that indexer
         const tx = staking.connect(indexer1).closeAllocation(allocationID1, randomHexBytes())
         await expect(tx)
-          .emit(rewardsManager, 'RewardsAssigned')
+          .emit(rewardsManager, 'HorizonRewardsAssigned')
           .withArgs(indexer1.address, allocationID1, toBN(0))
       })
 
@@ -710,7 +710,7 @@ describe('Rewards', () => {
         const tx = staking.connect(indexer1).closeAllocation(allocationID1, randomHexBytes())
 
         await expect(tx)
-          .emit(rewardsManager, 'RewardsAssigned')
+          .emit(rewardsManager, 'HorizonRewardsAssigned')
           .withArgs(indexer1.address, allocationID1, toBN(0))
       })
 

packages/contracts/test/unit/staking/allocation.test.ts

@@ -895,7 +895,7 @@ describe('Staking:Allocation', () => {
               poi,
               false,
             )
-          await expect(tx).not.to.emit(rewardsManager, 'RewardsAssigned')
+          await expect(tx).not.to.emit(rewardsManager, 'HorizonRewardsAssigned')
         })
 
         it('reject close if not the owner of allocation', async function () {

packages/subgraph-service/contracts/SubgraphService.sol

@@ -587,7 +587,7 @@ contract SubgraphService is
             }
         }
 
-        emit QueryFeesCollected(indexer, tokensCollected, tokensCurators);
+        emit QueryFeesCollected(indexer, _signedRav.rav.payer, tokensCollected, tokensCurators);
         return tokensCollected;
     }
 

packages/subgraph-service/contracts/interfaces/ISubgraphService.sol

@@ -29,10 +29,11 @@ interface ISubgraphService is IDataServiceFees {
     /**
      * @notice Emitted when a subgraph service collects query fees from Graph Payments
      * @param serviceProvider The address of the service provider
+     * @param payer The address paying for the query fees
      * @param tokensCollected The amount of tokens collected
      * @param tokensCurators The amount of tokens curators receive
      */
-    event QueryFeesCollected(address indexed serviceProvider, uint256 tokensCollected, uint256 tokensCurators);
+    event QueryFeesCollected(address indexed serviceProvider, address indexed payer, uint256 tokensCollected, uint256 tokensCurators);
 
     /**
      * @notice Emitted when the stake to fees ratio is set.

packages/subgraph-service/test/subgraphService/SubgraphService.t.sol

@@ -298,7 +298,7 @@ contract SubgraphServiceTest is SubgraphServiceSharedTest {
         uint256 tokensCurators = (paymentCollected - tokensProtocol).mulPPMRoundUp(queryFeeData.curationCut);
 
         vm.expectEmit(address(subgraphService));
-        emit ISubgraphService.QueryFeesCollected(_indexer, paymentCollected, tokensCurators);
+        emit ISubgraphService.QueryFeesCollected(_indexer, payer, paymentCollected, tokensCurators);
 
         return paymentCollected;
     }