fix: change staking interface

graphprotocol · Apr 19, 2024 · 76539f7 · 76539f7
1 parent 9b6ed9b
commit 76539f7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/packages/contracts/contracts/staking/IHorizonStaking.sol b/packages/contracts/contracts/staking/IHorizonStaking.sol
@@ -147,5 +147,5 @@ interface IHorizonStaking {
 
     function getProvision(bytes32 provision) external view returns (Provision memory);
 
-    function getDelegatorCut(address serviceProvider, uint256256 paymentType) external returns (address, uint256);
+    function getDelegatorCut(address serviceProvider, uint256 paymentType) external returns (uint256 delegatorCut);
 }
diff --git a/packages/horizon/contracts/GraphPayments.sol b/packages/horizon/contracts/GraphPayments.sol
@@ -100,9 +100,11 @@ contract GraphPayments is IGraphPayments, GraphPaymentsStorageV1Storage, GraphDi
         graphToken.transfer(msg.sender, dataServicePayment);
 
         // Get delegation cut
-        (address delegatorAddress, uint256 delegatorCut) = graphStaking.getDelegatorCut(receiver, uint256(paymentType));
+        uint256 delegatorCut = graphStaking.getDelegatorCut(receiver, uint256(paymentType));
         uint256 delegatorPayment = (amount * delegatorCut) / MAX_PPM;
-        graphToken.transfer(delegatorAddress, delegatorPayment);
+        // TODO: Add to delegation pool
+        // graphStaking.addToDelegationPool(receiver, delegatorPayment);
+        graphToken.burn(delegatorPayment);
 
         // Pay the rest to the receiver
         uint256 receiverPayment = amount - protocolCut - dataServicePayment - delegatorPayment;

diff --git a/packages/horizon/contracts/interfaces/IGraphPayments.sol b/packages/horizon/contracts/interfaces/IGraphPayments.sol
@@ -8,7 +8,7 @@ interface IGraphPayments {
         QueryFees
     }
 
-    // Authorized collector
+    // Collector
     struct Collector {
         bool authorized;
         uint256 thawEndTimestamp;

diff --git a/packages/horizon/test/GraphDeployments.t.sol b/packages/horizon/test/GraphDeployments.t.sol
@@ -33,7 +33,6 @@ contract GraphDeployments is Test {
 
     // Staking parameters
 
-    address public delegatorAddress = address(0xbdC1c9f94A729E47d6877217eC995916EAD457B7);
     uint256 public delegatorCut = 50000; // 5%
 
     // Setup
@@ -62,7 +61,7 @@ contract GraphDeployments is Test {
 
         // HorizonStaking
         vm.prank(deployer);
-        staking = new MockHorizonStaking(delegatorAddress, delegatorCut);
+        staking = new MockHorizonStaking(delegatorCut);
 
         // Setup controller
         vm.startPrank(governor);

diff --git a/packages/horizon/test/GraphPayments.t.sol b/packages/horizon/test/GraphPayments.t.sol
@@ -24,9 +24,6 @@ contract GraphPaymentsTest is Test {
     uint256 revokeCollectorThawingPeriod;
     uint256 protocolPaymentCut;
 
-    address delegatorAddress;
-    uint256 delegatorCut;
-
     address sender;
     address dataService;
 
@@ -44,9 +41,6 @@ contract GraphPaymentsTest is Test {
         revokeCollectorThawingPeriod = deployments.revokeCollectorThawingPeriod();
         protocolPaymentCut = deployments.protocolPaymentCut();
 
-        delegatorAddress = deployments.delegatorAddress();
-        delegatorCut = deployments.delegatorCut();
-
         sender = address(0xA1);
         dataService = address(0xA2);
     }
@@ -127,7 +121,8 @@ contract GraphPaymentsTest is Test {
         uint256 dataServiceBalance = token.balanceOf(dataService);
         assertEq(dataServiceBalance, 30 ether);
 
-        uint256 delegatorBalance = token.balanceOf(delegatorAddress);
-        assertEq(delegatorBalance, 50 ether);
+        // TODO: test delegator cut payment
+        // uint256 delegatorBalance = token.balanceOf(delegationPool);
+        // assertEq(delegatorBalance, 50 ether);
     }
 }
diff --git a/packages/horizon/test/mocks/MockHorizonStaking.sol b/packages/horizon/test/mocks/MockHorizonStaking.sol
@@ -7,11 +7,9 @@ import { IHorizonStaking } from "@graphprotocol/contracts/contracts/staking/IHor
 import { MockGRTToken } from "./MockGRTToken.sol";
 
 contract MockHorizonStaking is IHorizonStaking {
-    address public delegatorAddress;
     uint256 public delegatorCut;
 
-    constructor(address _delegatorAddress, uint256 _delegatorCut) {
-        delegatorAddress = _delegatorAddress;
+    constructor(uint256 _delegatorCut) {
         delegatorCut = _delegatorCut;
     }
 
@@ -37,7 +35,7 @@ contract MockHorizonStaking is IHorizonStaking {
     function getServiceProvider(address serviceProvider) external view returns (ServiceProvider memory) {}
     function getProvision(bytes32 provision) external view returns (Provision memory) {}
 
-    function getDelegatorCut(address serviceProvider, uint256 paymentType) external returns (address, uint256) {
-        return (delegatorAddress, delegatorCut);
+    function getDelegatorCut(address serviceProvider, uint256 paymentType) external returns (uint256) {
+        return delegatorCut;
     }
 }