feat(contracts): add getIssuanceAllocator to IIssuanceTarget interface

Every issuance target should expose its allocator. Add
getIssuanceAllocator() returning IIssuanceAllocationDistribution to
IIssuanceTarget. Implement in RecurringAgreementManager (reads from
storage), DirectAllocation (stores and returns), and RewardsManager
(existing impl, moved from IRewardsManager to IIssuanceTarget).

Also change IIssuanceTarget.setIssuanceAllocator parameter from address
to IIssuanceAllocationDistribution for compile-time type safety.

Author: RembrandtK

packages/contracts-test/tests/unit/rewards/rewards-interface.test.ts

@@ -54,11 +54,11 @@ describe('RewardsManager interfaces', () => {
     })
 
     it('IIssuanceTarget should have stable interface ID', () => {
-      expect(IIssuanceTarget__factory.interfaceId).to.equal('0xaee4dc43')
+      expect(IIssuanceTarget__factory.interfaceId).to.equal('0x19f6601a')
     })
 
     it('IRewardsManager should have stable interface ID', () => {
-      expect(IRewardsManager__factory.interfaceId).to.equal('0x337b092e')
+      expect(IRewardsManager__factory.interfaceId).to.equal('0x8469b577')
     })
   })
 

packages/contracts/contracts/rewards/RewardsManager.sol

@@ -173,24 +173,25 @@ contract RewardsManager is
      * Note that the IssuanceAllocator can be set to the zero address to disable use of an allocator, and
      * use the local `issuancePerBlock` variable instead to control issuance.
      */
-    function setIssuanceAllocator(address newIssuanceAllocator) external override onlyGovernor {
-        if (address(issuanceAllocator) != newIssuanceAllocator) {
+    function setIssuanceAllocator(IIssuanceAllocationDistribution newIssuanceAllocator) external override onlyGovernor {
+        if (issuanceAllocator != newIssuanceAllocator) {
             // Update rewards calculation before changing the issuance allocator
             updateAccRewardsPerSignal();
 
             // Check that the contract supports the IIssuanceAllocationDistribution interface
             // Allow zero address to disable the allocator
-            if (newIssuanceAllocator != address(0)) {
+            if (address(newIssuanceAllocator) != address(0)) {
                 // solhint-disable-next-line gas-small-strings
                 require(
-                    IERC165(newIssuanceAllocator).supportsInterface(type(IIssuanceAllocationDistribution).interfaceId),
+                    IERC165(address(newIssuanceAllocator)).supportsInterface(
+                        type(IIssuanceAllocationDistribution).interfaceId
+                    ),
                     "Contract does not support IIssuanceAllocationDistribution interface"
                 );
             }
 
-            address oldIssuanceAllocator = address(issuanceAllocator);
-            issuanceAllocator = IIssuanceAllocationDistribution(newIssuanceAllocator);
-            emit IssuanceAllocatorSet(oldIssuanceAllocator, newIssuanceAllocator);
+            emit IssuanceAllocatorSet(issuanceAllocator, newIssuanceAllocator);
+            issuanceAllocator = newIssuanceAllocator;
         }
     }
 
@@ -325,7 +326,7 @@ contract RewardsManager is
     }
 
     /**
-     * @inheritdoc IRewardsManager
+     * @inheritdoc IIssuanceTarget
      */
     function getIssuanceAllocator() external view override returns (IIssuanceAllocationDistribution) {
         return issuanceAllocator;

packages/deployment/lib/abis.ts

@@ -21,7 +21,7 @@ function loadAbi(artifactPath: string): Abi {
 // Verified by tests: packages/issuance/testing/tests/allocate/InterfaceIdStability.test.ts
 // and packages/contracts-test/tests/unit/rewards/rewards-interface.test.ts
 export const IERC165_INTERFACE_ID = '0x01ffc9a7' as const
-export const IISSUANCE_TARGET_INTERFACE_ID = '0xaee4dc43' as const
+export const IISSUANCE_TARGET_INTERFACE_ID = '0x19f6601a' as const
 export const IREWARDS_MANAGER_INTERFACE_ID = '0xa0a2f219' as const
 
 export const REWARDS_MANAGER_ABI = loadAbi(

packages/interfaces/contracts/contracts/rewards/IRewardsManager.sol

@@ -2,7 +2,6 @@
 
 pragma solidity ^0.7.6 || ^0.8.0;
 
-import { IIssuanceAllocationDistribution } from "../../issuance/allocate/IIssuanceAllocationDistribution.sol";
 import { IRewardsIssuer } from "./IRewardsIssuer.sol";
 
 /**
@@ -179,13 +178,6 @@ interface IRewardsManager {
      */
     function subgraphService() external view returns (IRewardsIssuer);
 
-    /**
-     * @notice Get the issuance allocator address
-     * @dev When set, this allocator controls issuance distribution instead of issuancePerBlock
-     * @return The issuance allocator contract (zero address if not set)
-     */
-    function getIssuanceAllocator() external view returns (IIssuanceAllocationDistribution);
-
     /**
      * @notice Get the reclaim address for a specific reason
      * @param reason The reclaim reason identifier

packages/interfaces/contracts/issuance/allocate/IIssuanceTarget.sol

@@ -2,6 +2,8 @@
 
 pragma solidity ^0.7.6 || ^0.8.0;
 
+import { IIssuanceAllocationDistribution } from "./IIssuanceAllocationDistribution.sol";
+
 /**
  * @title IIssuanceTarget
  * @author Edge & Node
@@ -13,7 +15,10 @@ interface IIssuanceTarget {
      * @param oldIssuanceAllocator Old issuance allocator address
      * @param newIssuanceAllocator New issuance allocator address
      */
-    event IssuanceAllocatorSet(address indexed oldIssuanceAllocator, address indexed newIssuanceAllocator);
+    event IssuanceAllocatorSet(
+        IIssuanceAllocationDistribution indexed oldIssuanceAllocator,
+        IIssuanceAllocationDistribution indexed newIssuanceAllocator
+    );
 
     /// @notice Emitted before the issuance allocation changes
     event BeforeIssuanceAllocationChange();
@@ -27,11 +32,17 @@ interface IIssuanceTarget {
      */
     function beforeIssuanceAllocationChange() external;
 
+    /**
+     * @notice Returns the current issuance allocator
+     * @return The issuance allocator contract (zero address if not set)
+     */
+    function getIssuanceAllocator() external view returns (IIssuanceAllocationDistribution);
+
     /**
      * @notice Sets the issuance allocator for this target
      * @dev This function facilitates upgrades by providing a standard way for targets
      * to change their allocator. Implementations can define their own access control.
      * @param newIssuanceAllocator Address of the issuance allocator
      */
-    function setIssuanceAllocator(address newIssuanceAllocator) external;
+    function setIssuanceAllocator(IIssuanceAllocationDistribution newIssuanceAllocator) external;
 }

packages/issuance/contracts/agreement/RecurringAgreementManager.sol

@@ -275,6 +275,11 @@ contract RecurringAgreementManager is
     /// @inheritdoc IIssuanceTarget
     function beforeIssuanceAllocationChange() external virtual override {}
 
+    /// @inheritdoc IIssuanceTarget
+    function getIssuanceAllocator() external view virtual override returns (IIssuanceAllocationDistribution) {
+        return _getStorage().issuanceAllocator;
+    }
+
     /// @inheritdoc IIssuanceTarget
     /// @dev The allocator is expected to call distributeIssuance() (bringing distribution up to
     /// the current block) before any configuration change. As a result, the same-block dedup in
@@ -283,21 +288,23 @@ contract RecurringAgreementManager is
     /// in a standalone transaction to avoid interleaving with collection in the same block.
     /// Even if interleaved, the only effect is a one-block lag before the new allocator's
     /// distribution is picked up — corrected automatically on the next block.
-    function setIssuanceAllocator(address newIssuanceAllocator) external virtual override onlyRole(GOVERNOR_ROLE) {
+    function setIssuanceAllocator(
+        IIssuanceAllocationDistribution newIssuanceAllocator
+    ) external virtual override onlyRole(GOVERNOR_ROLE) {
         RecurringAgreementManagerStorage storage $ = _getStorage();
-        if (address($.issuanceAllocator) == newIssuanceAllocator) return;
+        if (address($.issuanceAllocator) == address(newIssuanceAllocator)) return;
 
-        if (newIssuanceAllocator != address(0))
+        if (address(newIssuanceAllocator) != address(0))
             require(
                 ERC165Checker.supportsInterface(
-                    newIssuanceAllocator,
+                    address(newIssuanceAllocator),
                     type(IIssuanceAllocationDistribution).interfaceId
                 ),
-                InvalidIssuanceAllocator(newIssuanceAllocator)
+                InvalidIssuanceAllocator(address(newIssuanceAllocator))
             );
 
-        emit IssuanceAllocatorSet(address($.issuanceAllocator), newIssuanceAllocator);
-        $.issuanceAllocator = IIssuanceAllocationDistribution(newIssuanceAllocator);
+        emit IssuanceAllocatorSet($.issuanceAllocator, newIssuanceAllocator);
+        $.issuanceAllocator = newIssuanceAllocator;
     }
 
     // -- IAgreementOwner --

packages/issuance/contracts/allocate/DirectAllocation.sol

@@ -2,6 +2,9 @@
 
 pragma solidity ^0.8.27;
 
+import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
+
+import { IIssuanceAllocationDistribution } from "@graphprotocol/interfaces/contracts/issuance/allocate/IIssuanceAllocationDistribution.sol";
 import { IIssuanceTarget } from "@graphprotocol/interfaces/contracts/issuance/allocate/IIssuanceTarget.sol";
 import { ISendTokens } from "@graphprotocol/interfaces/contracts/issuance/allocate/ISendTokens.sol";
 import { BaseUpgradeable } from "../common/BaseUpgradeable.sol";
@@ -24,13 +27,47 @@ import { ERC165Upgradeable } from "@openzeppelin/contracts-upgradeable/utils/int
  * @custom:security-contact Please email security+contracts@thegraph.com if you find any bugs. We might have an active bug bounty program.
  */
 contract DirectAllocation is BaseUpgradeable, IIssuanceTarget, ISendTokens {
+    // -- Namespaced Storage --
+
+    /// @notice ERC-7201 storage location for DirectAllocation
+    bytes32 private constant DIRECT_ALLOCATION_STORAGE_LOCATION =
+        // solhint-disable-next-line gas-small-strings
+        keccak256(abi.encode(uint256(keccak256("graphprotocol.storage.DirectAllocation")) - 1)) &
+            ~bytes32(uint256(0xff));
+
+    /// @notice Main storage structure for DirectAllocation using ERC-7201 namespaced storage
+    /// @param issuanceAllocator The issuance allocator that distributes tokens to this contract
+    /// @custom:storage-location erc7201:graphprotocol.storage.DirectAllocation
+    struct DirectAllocationData {
+        IIssuanceAllocationDistribution issuanceAllocator;
+    }
+
+    /**
+     * @notice Returns the storage struct for DirectAllocation
+     * @return $ contract storage
+     */
+    function _getDirectAllocationStorage() private pure returns (DirectAllocationData storage $) {
+        // solhint-disable-previous-line use-natspec
+        // Solhint does not support $ return variable in natspec
+
+        bytes32 slot = DIRECT_ALLOCATION_STORAGE_LOCATION;
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            $.slot := slot
+        }
+    }
+
     // -- Custom Errors --
 
     /// @notice Thrown when token transfer fails
     /// @param to The address that the transfer was attempted to
     /// @param amount The amount of tokens that failed to transfer
     error SendTokensFailed(address to, uint256 amount);
 
+    /// @notice Thrown when the issuance allocator does not support IIssuanceAllocationDistribution
+    /// @param allocator The rejected allocator address
+    error InvalidIssuanceAllocator(address allocator);
+
     // -- Events --
 
     /// @notice Emitted when tokens are sent
@@ -89,9 +126,28 @@ contract DirectAllocation is BaseUpgradeable, IIssuanceTarget, ISendTokens {
      */
     function beforeIssuanceAllocationChange() external virtual override {}
 
-    /**
-     * @dev No-op for DirectAllocation; issuanceAllocator is not stored.
-     * @inheritdoc IIssuanceTarget
-     */
-    function setIssuanceAllocator(address issuanceAllocator) external virtual override onlyRole(GOVERNOR_ROLE) {}
+    /// @inheritdoc IIssuanceTarget
+    function getIssuanceAllocator() external view virtual override returns (IIssuanceAllocationDistribution) {
+        return _getDirectAllocationStorage().issuanceAllocator;
+    }
+
+    /// @inheritdoc IIssuanceTarget
+    function setIssuanceAllocator(
+        IIssuanceAllocationDistribution newIssuanceAllocator
+    ) external virtual override onlyRole(GOVERNOR_ROLE) {
+        DirectAllocationData storage $ = _getDirectAllocationStorage();
+        if (address(newIssuanceAllocator) == address($.issuanceAllocator)) return;
+
+        if (address(newIssuanceAllocator) != address(0))
+            require(
+                ERC165Checker.supportsInterface(
+                    address(newIssuanceAllocator),
+                    type(IIssuanceAllocationDistribution).interfaceId
+                ),
+                InvalidIssuanceAllocator(address(newIssuanceAllocator))
+            );
+
+        emit IssuanceAllocatorSet($.issuanceAllocator, newIssuanceAllocator);
+        $.issuanceAllocator = newIssuanceAllocator;
+    }
 }

packages/issuance/contracts/test/allocate/MockNotificationTracker.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
+import { IIssuanceAllocationDistribution } from "@graphprotocol/interfaces/contracts/issuance/allocate/IIssuanceAllocationDistribution.sol";
 import { IIssuanceTarget } from "@graphprotocol/interfaces/contracts/issuance/allocate/IIssuanceTarget.sol";
 import { ERC165 } from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 
@@ -30,7 +31,12 @@ contract MockNotificationTracker is IIssuanceTarget, ERC165 {
     }
 
     /// @inheritdoc IIssuanceTarget
-    function setIssuanceAllocator(address _issuanceAllocator) external pure override {}
+    function getIssuanceAllocator() external pure override returns (IIssuanceAllocationDistribution) {
+        return IIssuanceAllocationDistribution(address(0));
+    }
+
+    /// @inheritdoc IIssuanceTarget
+    function setIssuanceAllocator(IIssuanceAllocationDistribution _issuanceAllocator) external pure override {}
 
     /// @inheritdoc ERC165
     function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {

packages/issuance/contracts/test/allocate/MockReentrantTarget.sol

@@ -85,8 +85,13 @@ contract MockReentrantTarget is IIssuanceTarget, ERC165 {
     }
 
     /// @inheritdoc IIssuanceTarget
-    function setIssuanceAllocator(address _issuanceAllocator) external override {
-        issuanceAllocator = _issuanceAllocator;
+    function getIssuanceAllocator() external view override returns (IIssuanceAllocationDistribution) {
+        return IIssuanceAllocationDistribution(issuanceAllocator);
+    }
+
+    /// @inheritdoc IIssuanceTarget
+    function setIssuanceAllocator(IIssuanceAllocationDistribution _issuanceAllocator) external override {
+        issuanceAllocator = address(_issuanceAllocator);
     }
 
     /// @inheritdoc ERC165

packages/issuance/contracts/test/allocate/MockRevertingTarget.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
+import { IIssuanceAllocationDistribution } from "@graphprotocol/interfaces/contracts/issuance/allocate/IIssuanceAllocationDistribution.sol";
 import { IIssuanceTarget } from "@graphprotocol/interfaces/contracts/issuance/allocate/IIssuanceTarget.sol";
 import { ERC165 } from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 
@@ -23,7 +24,14 @@ contract MockRevertingTarget is IIssuanceTarget, ERC165 {
     /**
      * @inheritdoc IIssuanceTarget
      */
-    function setIssuanceAllocator(address _issuanceAllocator) external pure override {
+    function getIssuanceAllocator() external pure override returns (IIssuanceAllocationDistribution) {
+        return IIssuanceAllocationDistribution(address(0));
+    }
+
+    /**
+     * @inheritdoc IIssuanceTarget
+     */
+    function setIssuanceAllocator(IIssuanceAllocationDistribution _issuanceAllocator) external pure override {
         // No-op
     }