chore: move data service framework, rework file structure

Signed-off-by: Tomás Migone <tomas@edgeandnode.com>
graphprotocol · May 20, 2024 · 7aa3798 · 7aa3798
1 parent 06d8308
commit 7aa3798
Show file tree

Hide file tree

Showing 54 changed files with 127 additions and 189 deletions.
diff --git a/packages/horizon/contracts/SimpleTest.sol b/packages/horizon/contracts/SimpleTest.sol
diff --git a/...ce/contracts/data-service/DataService.sol → ...on/contracts/data-service/DataService.sol b/...ce/contracts/data-service/DataService.sol → ...on/contracts/data-service/DataService.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IDataService } from "./IDataService.sol";
+import { IDataService } from "../interfaces/IDataService.sol";
 
-import { GraphDirectory } from "./GraphDirectory.sol";
 import { DataServiceV1Storage } from "./DataServiceStorage.sol";
+import { GraphDirectory } from "./GraphDirectory.sol";
 import { ProvisionManager } from "./utilities/ProvisionManager.sol";
 
 /**

diff --git a/...racts/data-service/DataServiceStorage.sol → ...racts/data-service/DataServiceStorage.sol b/...racts/data-service/DataServiceStorage.sol → ...racts/data-service/DataServiceStorage.sol
diff --git a/...contracts/data-service/GraphDirectory.sol → ...contracts/data-service/GraphDirectory.sol b/...contracts/data-service/GraphDirectory.sol → ...contracts/data-service/GraphDirectory.sol
@@ -3,7 +3,7 @@
 pragma solidity 0.8.24;
 
 import { IController } from "@graphprotocol/contracts/contracts/governance/IController.sol";
-import { IHorizonStaking } from "@graphprotocol/contracts/contracts/staking/IHorizonStaking.sol";
+import { IHorizonStaking } from "../interfaces/IHorizonStaking.sol";
 import { IGraphToken } from "@graphprotocol/contracts/contracts/token/IGraphToken.sol";
 // import { IGraphTokenGateway } from "@graphprotocol/contracts/contracts/gateway/IGraphTokenGateway.sol";
 import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";

diff --git a/...ta-service/extensions/DataServiceFees.sol → ...ta-service/extensions/DataServiceFees.sol b/...ta-service/extensions/DataServiceFees.sol → ...ta-service/extensions/DataServiceFees.sol
@@ -4,11 +4,11 @@ pragma solidity ^0.8.24;
 import { IDataServiceFees } from "./IDataServiceFees.sol";
 import { IGraphPayments } from "../../interfaces/IGraphPayments.sol";
 
+import { ProvisionTracker } from "../libraries/ProvisionTracker.sol";
+
 import { DataService } from "../DataService.sol";
 import { DataServiceFeesV1Storage } from "./DataServiceFeesStorage.sol";
 
-import { ProvisionTracker } from "../libraries/ProvisionTracker.sol";
-
 abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDataServiceFees {
     using ProvisionTracker for mapping(address => uint256);
 
@@ -66,7 +66,7 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
         uint256 _tokens,
         uint256 _unlockTimestamp
     ) internal {
-        feesProvisionTracker[_feeType].lock(GRAPH_STAKING, _serviceProvider, _tokens);
+        feesProvisionTracker[_feeType].lock(GRAPH_STAKING, _serviceProvider, _tokens, delegationRatio);
 
         StakeClaimsList storage claimsList = claimsLists[_feeType][_serviceProvider];
         bytes32 claimId = _buildStakeClaimId(_serviceProvider, claimsList.nonce);

diff --git a/...ice/extensions/DataServiceFeesStorage.sol → ...ice/extensions/DataServiceFeesStorage.sol b/...ice/extensions/DataServiceFeesStorage.sol → ...ice/extensions/DataServiceFeesStorage.sol
@@ -15,6 +15,8 @@ abstract contract DataServiceFeesV1Storage {
     mapping(IGraphPayments.PaymentTypes feeType => mapping(address serviceProvider => IDataServiceFees.StakeClaimsList list))
         public claimsLists;
 
+    uint32 public delegationRatio;
+
     /// @dev Gap to allow adding variables in future upgrades
     uint256[50] private __gap;
 }
diff --git a/...ervice/extensions/DataServicePausable.sol → ...ervice/extensions/DataServicePausable.sol b/...ervice/extensions/DataServicePausable.sol → ...ervice/extensions/DataServicePausable.sol
diff --git a/...rvice/extensions/DataServiceRescuable.sol → ...rvice/extensions/DataServiceRescuable.sol b/...rvice/extensions/DataServiceRescuable.sol → ...rvice/extensions/DataServiceRescuable.sol
@@ -6,7 +6,7 @@ import { IDataServiceRescuable } from "./IDataServiceRescuable.sol";
 
 import { DataService } from "../DataService.sol";
 
-import { Denominations } from "../libraries/Denominations.sol";
+import { Denominations } from "../../libraries/Denominations.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**

diff --git a/...a-service/extensions/IDataServiceFees.sol → ...a-service/extensions/IDataServiceFees.sol b/...a-service/extensions/IDataServiceFees.sol → ...a-service/extensions/IDataServiceFees.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IDataService } from "../IDataService.sol";
+import { IDataService } from "../../interfaces/IDataService.sol";
 import { IGraphPayments } from "../../interfaces/IGraphPayments.sol";
 
 interface IDataServiceFees is IDataService {

diff --git a/...rvice/extensions/IDataServicePausable.sol → ...rvice/extensions/IDataServicePausable.sol b/...rvice/extensions/IDataServicePausable.sol → ...rvice/extensions/IDataServicePausable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IDataService } from "../IDataService.sol";
+import { IDataService } from "../../interfaces/IDataService.sol";
 
 interface IDataServicePausable is IDataService {
     function pause() external;

diff --git a/...vice/extensions/IDataServiceRescuable.sol → ...vice/extensions/IDataServiceRescuable.sol b/...vice/extensions/IDataServiceRescuable.sol → ...vice/extensions/IDataServiceRescuable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IDataService } from "../IDataService.sol";
+import { IDataService } from "../../interfaces/IDataService.sol";
 
 interface IDataServiceRescuable is IDataService {
     function rescueGRT(address to, uint256 amount) external;

diff --git a/...ata-service/libraries/ProvisionGetter.sol → ...ata-service/libraries/ProvisionGetter.sol b/...ata-service/libraries/ProvisionGetter.sol → ...ata-service/libraries/ProvisionGetter.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IHorizonStaking } from "@graphprotocol/contracts/contracts/staking/IHorizonStaking.sol";
+import { IHorizonStaking } from "../../interfaces/IHorizonStaking.sol";
 
 library ProvisionGetter {
     using ProvisionGetter for IHorizonStaking.Provision;

diff --git a/...ta-service/libraries/ProvisionTracker.sol → ...ta-service/libraries/ProvisionTracker.sol b/...ta-service/libraries/ProvisionTracker.sol → ...ta-service/libraries/ProvisionTracker.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IHorizonStaking } from "@graphprotocol/contracts/contracts/staking/IHorizonStaking.sol";
+import { IHorizonStaking } from "../../interfaces/IHorizonStaking.sol";
 
 library ProvisionTracker {
     error ProvisionTrackerInsufficientTokens(uint256 tokensAvailable, uint256 tokensRequired);
@@ -10,12 +10,13 @@ library ProvisionTracker {
         mapping(address => uint256) storage self,
         IHorizonStaking graphStaking,
         address serviceProvider,
-        uint256 tokens
+        uint256 tokens,
+        uint32 delegationRatio
     ) internal {
         if (tokens == 0) return;
 
         uint256 tokensRequired = self[serviceProvider] + tokens;
-        uint256 tokensAvailable = graphStaking.getTokensAvailable(serviceProvider, address(this));
+        uint256 tokensAvailable = graphStaking.getTokensAvailable(serviceProvider, address(this), delegationRatio);
         if (tokensRequired > tokensAvailable) {
             revert ProvisionTrackerInsufficientTokens(tokensAvailable, tokensRequired);
         }
@@ -34,9 +35,10 @@ library ProvisionTracker {
     function getTokensFree(
         mapping(address => uint256) storage self,
         IHorizonStaking graphStaking,
-        address serviceProvider
+        address serviceProvider,
+        uint32 delegationRatio
     ) internal view returns (uint256) {
-        uint256 tokensAvailable = graphStaking.getTokensAvailable(serviceProvider, address(this));
+        uint256 tokensAvailable = graphStaking.getTokensAvailable(serviceProvider, address(this), delegationRatio);
         if (tokensAvailable >= self[serviceProvider]) return tokensAvailable - self[serviceProvider];
         else return 0;
     }

diff --git a/...ta-service/utilities/ProvisionManager.sol → ...ta-service/utilities/ProvisionManager.sol b/...ta-service/utilities/ProvisionManager.sol → ...ta-service/utilities/ProvisionManager.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IHorizonStaking } from "@graphprotocol/contracts/contracts/staking/IHorizonStaking.sol";
+import { IHorizonStaking } from "../../interfaces/IHorizonStaking.sol";
+
+import { ProvisionGetter } from "../libraries/ProvisionGetter.sol";
+import { UintRange } from "../../libraries/UintRange.sol";
 
 import { GraphDirectory } from "../GraphDirectory.sol";
 import { ProvisionManagerV1Storage } from "./ProvisionManagerStorage.sol";
 
-import { ProvisionGetter } from "../libraries/ProvisionGetter.sol";
-import { UintRange } from "../libraries/UintRange.sol";
-
 abstract contract ProvisionManager is GraphDirectory, ProvisionManagerV1Storage {
     using ProvisionGetter for IHorizonStaking;
     using UintRange for uint256;
@@ -50,7 +50,7 @@ abstract contract ProvisionManager is GraphDirectory, ProvisionManagerV1Storage
 
     function _checkAndAcceptProvision(address _serviceProvider) internal virtual {
         _checkProvisionParameters(_serviceProvider);
-        GRAPH_STAKING.acceptProvision(_serviceProvider);
+        GRAPH_STAKING.acceptProvisionParameters(_serviceProvider);
     }
 
     // -- Provision Parameters: setters --

diff --git a/...ice/utilities/ProvisionManagerStorage.sol → ...ice/utilities/ProvisionManagerStorage.sol b/...ice/utilities/ProvisionManagerStorage.sol → ...ice/utilities/ProvisionManagerStorage.sol
diff --git a/...e/contracts/data-service/IDataService.sol → ...zon/contracts/interfaces/IDataService.sol b/...e/contracts/data-service/IDataService.sol → ...zon/contracts/interfaces/IDataService.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { IGraphPayments } from "../interfaces/IGraphPayments.sol";
+import { IGraphPayments } from "./IGraphPayments.sol";
 
 /**
  * @title Interface of the base {DataService} contract as defined by the Graph Horizon specification.

diff --git a/...ice/contracts/interfaces/IGraphEscrow.sol → ...zon/contracts/interfaces/IGraphEscrow.sol b/...ice/contracts/interfaces/IGraphEscrow.sol → ...zon/contracts/interfaces/IGraphEscrow.sol
diff --git a/...e/contracts/interfaces/IGraphPayments.sol → ...n/contracts/interfaces/IGraphPayments.sol b/...e/contracts/interfaces/IGraphPayments.sol → ...n/contracts/interfaces/IGraphPayments.sol
diff --git a/packages/horizon/contracts/IGraphToken.sol → ...izon/contracts/interfaces/IGraphToken.sol b/packages/horizon/contracts/IGraphToken.sol → ...izon/contracts/interfaces/IGraphToken.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 interface IGraphToken is IERC20 {
     // -- Mint and Burn --

diff --git a/...ges/horizon/contracts/IHorizonStaking.sol → .../contracts/interfaces/IHorizonStaking.sol b/...ges/horizon/contracts/IHorizonStaking.sol → .../contracts/interfaces/IHorizonStaking.sol
diff --git a/...horizon/contracts/IHorizonStakingBase.sol → ...tracts/interfaces/IHorizonStakingBase.sol b/...horizon/contracts/IHorizonStakingBase.sol → ...tracts/interfaces/IHorizonStakingBase.sol
diff --git a/...on/contracts/IHorizonStakingExtension.sol → ...s/interfaces/IHorizonStakingExtension.sol b/...on/contracts/IHorizonStakingExtension.sol → ...s/interfaces/IHorizonStakingExtension.sol
diff --git a/...orizon/contracts/IHorizonStakingTypes.sol → ...racts/interfaces/IHorizonStakingTypes.sol b/...orizon/contracts/IHorizonStakingTypes.sol → ...racts/interfaces/IHorizonStakingTypes.sol
diff --git a/packages/horizon/contracts/IManaged.sol → ...horizon/contracts/interfaces/IManaged.sol b/packages/horizon/contracts/IManaged.sol → ...horizon/contracts/interfaces/IManaged.sol
diff --git a/...tracts/IStakingBackwardsCompatibility.sol → ...rfaces/IStakingBackwardsCompatibility.sol b/...tracts/IStakingBackwardsCompatibility.sol → ...rfaces/IStakingBackwardsCompatibility.sol
diff --git a/...ice/contracts/interfaces/ITAPVerifier.sol → ...zon/contracts/interfaces/ITAPVerifier.sol b/...ice/contracts/interfaces/ITAPVerifier.sol → ...zon/contracts/interfaces/ITAPVerifier.sol
diff --git a/.../data-service/libraries/Denominations.sol → ...zon/contracts/libraries/Denominations.sol b/.../data-service/libraries/Denominations.sol → ...zon/contracts/libraries/Denominations.sol
diff --git a/.../horizon/contracts/utils/LibFixedMath.sol → ...izon/contracts/libraries/LibFixedMath.sol b/.../horizon/contracts/utils/LibFixedMath.sol → ...izon/contracts/libraries/LibFixedMath.sol
diff --git a/...ges/horizon/contracts/utils/MathUtils.sol → ...horizon/contracts/libraries/MathUtils.sol b/...ges/horizon/contracts/utils/MathUtils.sol → ...horizon/contracts/libraries/MathUtils.sol
diff --git a/...tracts/data-service/libraries/PPMMath.sol → ...s/horizon/contracts/libraries/PPMMath.sol b/...tracts/data-service/libraries/PPMMath.sol → ...s/horizon/contracts/libraries/PPMMath.sol
diff --git a/...es/horizon/contracts/utils/TokenUtils.sol → ...orizon/contracts/libraries/TokenUtils.sol b/...es/horizon/contracts/utils/TokenUtils.sol → ...orizon/contracts/libraries/TokenUtils.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import { IGraphToken } from "../IGraphToken.sol";
+import { IGraphToken } from "../interfaces/IGraphToken.sol";
 
 /**
  * @title TokenUtils library

diff --git a/...acts/data-service/libraries/UintRange.sol → ...horizon/contracts/libraries/UintRange.sol b/...acts/data-service/libraries/UintRange.sol → ...horizon/contracts/libraries/UintRange.sol
diff --git a/...ubgraph-service/contracts/TAPVerifier.sol → ...racts/payments/collectors/TAPVerifier.sol b/...ubgraph-service/contracts/TAPVerifier.sol → ...racts/payments/collectors/TAPVerifier.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.24;
 
-import { ITAPVerifier } from "./interfaces/ITAPVerifier.sol";
+import { ITAPVerifier } from "../../interfaces/ITAPVerifier.sol";
 
 import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 

diff --git a/...ages/horizon/contracts/HorizonStaking.sol → ...izon/contracts/staking/HorizonStaking.sol b/...ages/horizon/contracts/HorizonStaking.sol → ...izon/contracts/staking/HorizonStaking.sol
@@ -3,12 +3,13 @@
 pragma solidity 0.8.24;
 
 import { GraphUpgradeable } from "@graphprotocol/contracts/contracts/upgrades/GraphUpgradeable.sol";
+import { IHorizonStakingBase } from "../interfaces/IHorizonStakingBase.sol";
+import { IGraphToken } from "../interfaces/IGraphToken.sol";
 
-import { IHorizonStakingBase } from "./IHorizonStakingBase.sol";
-import { TokenUtils } from "./utils/TokenUtils.sol";
-import { MathUtils } from "./utils/MathUtils.sol";
-import { Managed } from "./Managed.sol";
-import { IGraphToken } from "./IGraphToken.sol";
+import { TokenUtils } from "../libraries/TokenUtils.sol";
+import { MathUtils } from "../libraries/MathUtils.sol";
+
+import { Managed } from "./utilities/Managed.sol";
 import { HorizonStakingV1Storage } from "./HorizonStakingStorage.sol";
 
 /**

diff --git a/...zon/contracts/HorizonStakingExtension.sol → ...racts/staking/HorizonStakingExtension.sol b/...zon/contracts/HorizonStakingExtension.sol → ...racts/staking/HorizonStakingExtension.sol
@@ -2,11 +2,13 @@
 
 pragma solidity 0.8.24;
 
-import { StakingBackwardsCompatibility } from "./StakingBackwardsCompatibility.sol";
 import { IL2StakingBase } from "@graphprotocol/contracts/contracts/l2/staking/IL2StakingBase.sol";
 import { IL2StakingTypes } from "@graphprotocol/contracts/contracts/l2/staking/IL2StakingTypes.sol";
-import { IHorizonStakingExtension } from "./IHorizonStakingExtension.sol";
-import { MathUtils } from "./utils/MathUtils.sol";
+import { IHorizonStakingExtension } from "../interfaces/IHorizonStakingExtension.sol";
+
+import { MathUtils } from "../libraries/MathUtils.sol";
+
+import { StakingBackwardsCompatibility } from "./StakingBackwardsCompatibility.sol";
 
 /**
  * @title L2Staking contract
@@ -28,9 +30,8 @@ contract HorizonStakingExtension is StakingBackwardsCompatibility, IHorizonStaki
 
     constructor(
         address _controller,
-        address _subgraphDataServiceAddress,
-        address _exponentialRebates
-    ) StakingBackwardsCompatibility(_controller, _subgraphDataServiceAddress, _exponentialRebates) {}
+        address _subgraphDataServiceAddress
+    ) StakingBackwardsCompatibility(_controller, _subgraphDataServiceAddress) {}
 
     /**
      * @notice Receive ETH into the Staking contract: this will always revert

diff --git a/...rizon/contracts/HorizonStakingStorage.sol → ...ntracts/staking/HorizonStakingStorage.sol b/...rizon/contracts/HorizonStakingStorage.sol → ...ntracts/staking/HorizonStakingStorage.sol
@@ -2,9 +2,10 @@
 
 pragma solidity 0.8.24;
 
-import { Managed } from "./Managed.sol";
-import { IStakingBackwardsCompatibility } from "./IStakingBackwardsCompatibility.sol";
-import { IHorizonStakingTypes } from "./IHorizonStakingTypes.sol";
+import { IStakingBackwardsCompatibility } from "../interfaces/IStakingBackwardsCompatibility.sol";
+import { IHorizonStakingTypes } from "../interfaces/IHorizonStakingTypes.sol";
+
+import { Managed } from "./utilities/Managed.sol";
 
 /**
  * @title HorizonStakingV1Storage

diff --git a/...ntracts/StakingBackwardsCompatibility.sol → ...staking/StakingBackwardsCompatibility.sol b/...ntracts/StakingBackwardsCompatibility.sol → ...staking/StakingBackwardsCompatibility.sol
@@ -2,20 +2,20 @@
 
 pragma solidity 0.8.24;
 
-import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";
+import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol";
+import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";
+import { IGraphToken } from "../interfaces/IGraphToken.sol";
+import { IStakingBackwardsCompatibility } from "../interfaces/IStakingBackwardsCompatibility.sol";
+
+import { TokenUtils } from "../libraries/TokenUtils.sol";
+import { MathUtils } from "../libraries/MathUtils.sol";
+import { ExponentialRebates } from "./libraries/ExponentialRebates.sol";
 
 import { Multicall } from "@graphprotocol/contracts/contracts/base/Multicall.sol";
 import { GraphUpgradeable } from "@graphprotocol/contracts/contracts/upgrades/GraphUpgradeable.sol";
-import { TokenUtils } from "./utils/TokenUtils.sol";
-import { IGraphToken } from "./IGraphToken.sol";
+import { Managed } from "./utilities/Managed.sol";
 import { HorizonStakingV1Storage } from "./HorizonStakingStorage.sol";
-import { MathUtils } from "./utils/MathUtils.sol";
-import { Managed } from "./Managed.sol";
-import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";
-import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol";
-import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";
-import { ExponentialRebates } from "./utils/ExponentialRebates.sol";
-import { IStakingBackwardsCompatibility } from "./IStakingBackwardsCompatibility.sol";
 
 /**
  * @title Base Staking contract
@@ -38,15 +38,8 @@ abstract contract StakingBackwardsCompatibility is
 
     address public immutable SUBGRAPH_DATA_SERVICE_ADDRESS;
 
-    address public immutable EXPONENTIAL_REBATES_ADDRESS;
-
-    constructor(
-        address _controller,
-        address _subgraphDataServiceAddress,
-        address _exponentialRebatesAddress
-    ) Managed(_controller) {
+    constructor(address _controller, address _subgraphDataServiceAddress) Managed(_controller) {
         SUBGRAPH_DATA_SERVICE_ADDRESS = _subgraphDataServiceAddress;
-        EXPONENTIAL_REBATES_ADDRESS = _exponentialRebatesAddress;
     }
 
     /**
@@ -128,7 +121,7 @@ abstract contract StakingBackwardsCompatibility is
             // No rebates if indexer has no stake or if lambda is zero
             uint256 newRebates = (alloc.tokens == 0 || __DEPRECATED_lambdaNumerator == 0)
                 ? 0
-                : ExponentialRebates(EXPONENTIAL_REBATES_ADDRESS).exponentialRebates(
+                : ExponentialRebates.exponentialRebates(
                     alloc.collectedFees,
                     alloc.tokens,
                     __DEPRECATED_alphaNumerator,

diff --git a/...on/contracts/utils/ExponentialRebates.sol → .../staking/libraries/ExponentialRebates.sol b/...on/contracts/utils/ExponentialRebates.sol → .../staking/libraries/ExponentialRebates.sol
@@ -2,15 +2,15 @@
 
 pragma solidity 0.8.24;
 
-import { LibFixedMath } from "./LibFixedMath.sol";
+import { LibFixedMath } from "../../libraries/LibFixedMath.sol";
 
 /**
  * @title ExponentialRebates contract
  * @notice A library to compute query fee rebates using an exponential formula
  * @dev This is only used for backwards compatibility in HorizonStaking, and should
  * be removed after the transition period.
  */
-contract ExponentialRebates {
+library ExponentialRebates {
     /// @dev Maximum value of the exponent for which to compute the exponential before clamping to zero.
     uint32 private constant MAX_EXPONENT = 15;
 

diff --git a/packages/horizon/contracts/Managed.sol → ...n/contracts/staking/utilities/Managed.sol b/packages/horizon/contracts/Managed.sol → ...n/contracts/staking/utilities/Managed.sol
@@ -3,8 +3,9 @@
 pragma solidity 0.8.24;
 
 import { IController } from "@graphprotocol/contracts/contracts/governance/IController.sol";
-import { IManaged } from "./IManaged.sol";
-import { GraphDirectory } from "./GraphDirectory.sol";
+import { IManaged } from "../../interfaces/IManaged.sol";
+
+import { GraphDirectory } from "../../GraphDirectory.sol";
 
 /**
  * @title Graph Managed contract

diff --git a/packages/horizon/scripts/deploy.ts b/packages/horizon/scripts/deploy.ts