chore: ensure contract size is below 24kB

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

packages/contracts/contracts/rewards/IRewardsIssuer.sol

@@ -31,11 +31,4 @@ interface IRewardsIssuer {
      * @return Total tokens allocated to subgraph
      */
     function getSubgraphAllocatedTokens(bytes32 _subgraphDeploymentId) external view returns (uint256);
-
-    /**
-     * @notice Whether or not an allocation is active (i.e open)
-     * @param _allocationId Allocation Id
-     * @return Whether or not the allocation is active
-     */
-    function isActiveAllocation(address _allocationId) external view returns (bool);
 }

packages/contracts/contracts/rewards/IRewardsManager.sol

@@ -39,7 +39,7 @@ interface IRewardsManager {
 
     function getAccRewardsPerAllocatedToken(bytes32 _subgraphDeploymentID) external view returns (uint256, uint256);
 
-    function getRewards(address _allocationID) external view returns (uint256);
+    function getRewards(address _rewardsIssuer, address _allocationID) external view returns (uint256);
 
     function calcRewards(uint256 _tokens, uint256 _accRewardsPerAllocatedToken) external pure returns (uint256);
 

packages/contracts/contracts/rewards/RewardsManager.sol

@@ -322,32 +322,19 @@ contract RewardsManager is RewardsManagerV5Storage, GraphUpgradeable, IRewardsMa
      * @param _allocationID Allocation
      * @return Rewards amount for an allocation
      */
-    function getRewards(address _allocationID) external view override returns (uint256) {
-        address rewardsIssuer = address(0);
-
-        // Check both the legacy and new allocations
-        address[2] memory rewardsIssuers = [address(staking()), address(subgraphService)];
-        for (uint256 i = 0; i < rewardsIssuers.length; i++) {
-            if (rewardsIssuers[i] != address(0)) {
-                if (IRewardsIssuer(rewardsIssuers[i]).isActiveAllocation(_allocationID)) {
-                    rewardsIssuer = address(rewardsIssuers[i]);
-                    break;
-                }
-            }
-        }
-
-        // Bail if allo does not exist
-        if (rewardsIssuer == address(0)) {
-            return 0;
-        }
+    function getRewards(address _rewardsIssuer, address _allocationID) external view override returns (uint256) {
+        require(
+            _rewardsIssuer == address(staking()) || _rewardsIssuer == address(subgraphService),
+            "Not a rewards issuer"
+        );
 
         (
             ,
             bytes32 subgraphDeploymentId,
             uint256 tokens,
             uint256 alloAccRewardsPerAllocatedToken,
             uint256 accRewardsPending
-        ) = IRewardsIssuer(rewardsIssuer).getAllocationData(_allocationID);
+        ) = IRewardsIssuer(_rewardsIssuer).getAllocationData(_allocationID);
 
         (uint256 accRewardsPerAllocatedToken, ) = getAccRewardsPerAllocatedToken(subgraphDeploymentId);
         return

packages/horizon/contracts/staking/HorizonStakingExtension.sol

@@ -274,15 +274,6 @@ contract HorizonStakingExtension is HorizonStakingBase, IHorizonStakingExtension
         return __DEPRECATED_subgraphAllocations[subgraphDeploymentID];
     }
 
-    /**
-     * @notice Return true if allocation is active.
-     * @param allocationID Allocation identifier
-     * @return True if allocation is active
-     */
-    function isActiveAllocation(address allocationID) external view override returns (bool) {
-        return _getAllocationState(allocationID) == AllocationState.Active;
-    }
-
     /**
      * @notice Get the total amount of tokens staked by the indexer.
      * @param indexer Address of the indexer

packages/subgraph-service/contracts/SubgraphService.sol

@@ -449,18 +449,6 @@ contract SubgraphService is
         return _subgraphAllocatedTokens[subgraphDeploymentId];
     }
 
-    /**
-     * @notice Check if an allocation is open
-     * @dev Implements {IRewardsIssuer.isAllocationActive}
-     * @dev To be used by the {RewardsManager}.
-     *
-     * @param allocationId The allocation Id
-     * @return Wether or not the allocation is active
-     */
-    function isActiveAllocation(address allocationId) external view override returns (bool) {
-        return _allocations[allocationId].isOpen();
-    }
-
     /**
      * @notice See {ISubgraphService.getLegacyAllocation}
      */
@@ -475,13 +463,6 @@ contract SubgraphService is
         return _encodeAllocationProof(indexer, allocationId);
     }
 
-    /**
-     * @notice See {ISubgraphService.isStaleAllocation}
-     */
-    function isStaleAllocation(address allocationId) external view override returns (bool) {
-        return _allocations.get(allocationId).isStale(maxPOIStaleness);
-    }
-
     /**
      * @notice See {ISubgraphService.isOverAllocated}
      */

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

@@ -241,13 +241,6 @@ interface ISubgraphService is IDataServiceFees {
      */
     function encodeAllocationProof(address indexer, address allocationId) external view returns (bytes32);
 
-    /**
-     * @notice Checks if an allocation is stale
-     * @param allocationId The id of the allocation
-     * @return True if the allocation is stale, false otherwise
-     */
-    function isStaleAllocation(address allocationId) external view returns (bool);
-
     /**
      * @notice Checks if an indexer is over-allocated
      * @param allocationId The id of the allocation

packages/subgraph-service/hardhat.config.ts

@@ -17,6 +17,15 @@ if (process.env.BUILD_RUN !== 'true') {
 
 const config: HardhatUserConfig = {
   ...hardhatBaseConfig,
+  solidity: {
+    version: '0.8.27',
+    settings: {
+      optimizer: {
+        enabled: true,
+        runs: 50,
+      },
+    },
+  },
   graph: {
     deployments: {
       ...hardhatBaseConfig.graph?.deployments,

packages/subgraph-service/test/mocks/MockRewardsManager.sol

@@ -61,7 +61,7 @@ contract MockRewardsManager is IRewardsManager {
 
     function getAccRewardsPerAllocatedToken(bytes32) external view returns (uint256, uint256) {}
 
-    function getRewards(address) external view returns (uint256) {}
+    function getRewards(address,address) external view returns (uint256) {}
 
     function calcRewards(uint256, uint256) external pure returns (uint256) {}
 

packages/subgraph-service/test/shared/SubgraphServiceShared.t.sol

@@ -11,6 +11,8 @@ import { ISubgraphService } from "../../contracts/interfaces/ISubgraphService.so
 import { HorizonStakingSharedTest } from "./HorizonStakingShared.t.sol";
 
 abstract contract SubgraphServiceSharedTest is HorizonStakingSharedTest {
+    using Allocation for Allocation.State;
+
     /*
      * VARIABLES
      */
@@ -101,13 +103,7 @@ abstract contract SubgraphServiceSharedTest is HorizonStakingSharedTest {
 
         vm.expectEmit(address(subgraphService));
         emit IDataService.ServiceStarted(_indexer, _data);
-        emit AllocationManager.AllocationCreated(
-            _indexer,
-            allocationId,
-            subgraphDeploymentId,
-            tokens,
-            currentEpoch
-        );
+        emit AllocationManager.AllocationCreated(_indexer, allocationId, subgraphDeploymentId, tokens, currentEpoch);
 
         // TODO: improve this
         uint256 accRewardsPerAllocatedToken = 0;
@@ -137,9 +133,9 @@ abstract contract SubgraphServiceSharedTest is HorizonStakingSharedTest {
 
     function _stopService(address _indexer, bytes memory _data) internal {
         address allocationId = abi.decode(_data, (address));
-        assertTrue(subgraphService.isActiveAllocation(allocationId));
 
         Allocation.State memory allocation = subgraphService.getAllocation(allocationId);
+        assertTrue(allocation.isOpen());
         uint256 previousSubgraphAllocatedTokens = subgraphService.getSubgraphAllocatedTokens(
             allocation.subgraphDeploymentId
         );

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

@@ -149,9 +149,8 @@ contract SubgraphServiceTest is SubgraphServiceSharedTest {
     }
 
     function _closeStaleAllocation(address _allocationId) internal {
-        assertTrue(subgraphService.isActiveAllocation(_allocationId));
-
         Allocation.State memory allocation = subgraphService.getAllocation(_allocationId);
+        assertTrue(allocation.isOpen());
         uint256 previousSubgraphAllocatedTokens = subgraphService.getSubgraphAllocatedTokens(
             allocation.subgraphDeploymentId
         );