Merge branch 'horizon' into tmigone/thawing-fixes

Author: tmigone

.gitignore

@@ -54,3 +54,7 @@ cache_forge
 
 tx-builder-*.json
 !tx-builder-template.json
+
+# Hardhat Ignition
+**/chain-31337/
+!**/ignition/**/artifacts/

packages/contracts/contracts/disputes/DisputeManager.sol

@@ -579,7 +579,7 @@ contract DisputeManager is DisputeManagerV1Storage, GraphUpgradeable, IDisputeMa
      * @notice Ignore a dispute with ID `_disputeID`
      * @param _disputeID ID of the dispute to be disregarded
      */
-    function drawDispute(bytes32 _disputeID) public override onlyArbitrator onlyPendingDispute(_disputeID) {
+    function drawDispute(bytes32 _disputeID) external override onlyArbitrator onlyPendingDispute(_disputeID) {
         Dispute storage dispute = disputes[_disputeID];
 
         // Return deposit to the fisherman

packages/contracts/contracts/governance/Controller.sol

@@ -89,10 +89,10 @@ contract Controller is Governed, Pausable, IController {
     /**
      * @notice Change the partial paused state of the contract
      * Partial pause is intended as a partial pause of the protocol
-     * @param _toPause True if the contracts should be (partially) paused, false otherwise
+     * @param _toPartialPause True if the contracts should be (partially) paused, false otherwise
      */
-    function setPartialPaused(bool _toPause) external override onlyGovernorOrGuardian {
-        _setPartialPaused(_toPause);
+    function setPartialPaused(bool _toPartialPause) external override onlyGovernorOrGuardian {
+        _setPartialPaused(_toPartialPause);
     }
 
     /**

packages/contracts/contracts/governance/Pausable.sol

@@ -14,7 +14,7 @@ abstract contract Pausable {
     bool internal _paused;
 
     /// Timestamp for the last time the partial pause was set
-    uint256 public lastPausePartialTime;
+    uint256 public lastPartialPauseTime;
     /// Timestamp for the last time the full pause was set
     uint256 public lastPauseTime;
 
@@ -31,15 +31,15 @@ abstract contract Pausable {
 
     /**
      * @dev Change the partial paused state of the contract
-     * @param _toPause New value for the partial pause state (true means the contracts will be partially paused)
+     * @param _toPartialPause New value for the partial pause state (true means the contracts will be partially paused)
      */
-    function _setPartialPaused(bool _toPause) internal {
-        if (_toPause == _partialPaused) {
+    function _setPartialPaused(bool _toPartialPause) internal {
+        if (_toPartialPause == _partialPaused) {
             return;
         }
-        _partialPaused = _toPause;
+        _partialPaused = _toPartialPause;
         if (_partialPaused) {
-            lastPausePartialTime = block.timestamp;
+            lastPartialPauseTime = block.timestamp;
         }
         emit PartialPauseChanged(_partialPaused);
     }

packages/contracts/test/unit/disputes/common.ts

@@ -16,7 +16,7 @@ export interface Dispute {
 export function createQueryDisputeID(
   attestation: Attestation,
   indexerAddress: string,
-  submitterAddress: string,
+  fishermanAddress: string,
 ): string {
   return solidityKeccak256(
     ['bytes32', 'bytes32', 'bytes32', 'address', 'address'],
@@ -25,7 +25,7 @@ export function createQueryDisputeID(
       attestation.responseCID,
       attestation.subgraphDeploymentID,
       indexerAddress,
-      submitterAddress,
+      fishermanAddress,
     ],
   )
 }

packages/horizon/README.md

@@ -1,13 +1,17 @@
-# Sample Hardhat Project
+# 🌅 Graph Horizon 🌅
 
-This project demonstrates a basic Hardhat use case. It comes with a sample contract, a test for that contract, and a script that deploys that contract.
+Graph Horizon is the next evolution of the Graph Protocol.
 
-Try running some of the following tasks:
+## Deployment 
 
-```shell
-npx hardhat help
-npx hardhat test
-REPORT_GAS=true npx hardhat test
-npx hardhat node
-npx hardhat run scripts/deploy.ts
+We use Hardhat Ignition to deploy the contracts. To build and deploy the contracts run the following commands:
+
+```bash
+yarn install
+yarn build
+npx hardhat ignition deploy ./ignition/modules/horizon.ts \
+  --parameters ./ignition/configs/graph.hardhat.json \
+  --network hardhat
 ```
+
+You can use any network defined in `hardhat.config.ts` by replacing `hardhat` with the network name.

packages/horizon/contracts/data-service/extensions/DataServiceFees.sol

@@ -22,8 +22,8 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
     /**
      * @notice See {IDataServiceFees-releaseStake}
      */
-    function releaseStake(uint256 n) external virtual override {
-        _releaseStake(msg.sender, n);
+    function releaseStake(uint256 numClaimsToRelease) external virtual override {
+        _releaseStake(msg.sender, numClaimsToRelease);
     }
 
     /**
@@ -49,7 +49,7 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
         claims[claimId] = StakeClaim({
             tokens: _tokens,
             createdAt: block.timestamp,
-            releaseAt: _unlockTimestamp,
+            releasableAt: _unlockTimestamp,
             nextClaim: bytes32(0)
         });
         if (claimsList.count != 0) claims[claimsList.tail].nextClaim = claimId;
@@ -61,14 +61,14 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
     /**
      * @notice See {IDataServiceFees-releaseStake}
      */
-    function _releaseStake(address _serviceProvider, uint256 _n) internal {
+    function _releaseStake(address _serviceProvider, uint256 _numClaimsToRelease) internal {
         LinkedList.List storage claimsList = claimsLists[_serviceProvider];
         (uint256 claimsReleased, bytes memory data) = claimsList.traverse(
             _getNextStakeClaim,
             _processStakeClaim,
             _deleteStakeClaim,
             abi.encode(0, _serviceProvider),
-            _n
+            _numClaimsToRelease
         );
 
         emit StakeClaimsReleased(_serviceProvider, claimsReleased, abi.decode(data, (uint256)));
@@ -86,7 +86,7 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
         StakeClaim memory claim = _getStakeClaim(_claimId);
 
         // early exit
-        if (claim.releaseAt > block.timestamp) {
+        if (claim.releasableAt > block.timestamp) {
             return (true, LinkedList.NULL_BYTES);
         }
 
@@ -95,7 +95,7 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
 
         // process
         feesProvisionTracker.release(serviceProvider, claim.tokens);
-        emit StakeClaimReleased(serviceProvider, _claimId, claim.tokens, claim.releaseAt);
+        emit StakeClaimReleased(serviceProvider, _claimId, claim.tokens, claim.releasableAt);
 
         // encode
         _acc = abi.encode(tokensClaimed + claim.tokens, serviceProvider);

packages/horizon/contracts/data-service/extensions/DataServiceRescuable.sol

@@ -70,6 +70,6 @@ abstract contract DataServiceRescuable is DataService, IDataServiceRescuable {
         if (Denominations.isNativeToken(_token)) Address.sendValue(payable(_to), _tokens);
         else SafeERC20.safeTransfer(IERC20(_token), _to, _tokens);
 
-        emit TokensRescued(msg.sender, _to, _tokens);
+        emit TokensRescued(msg.sender, _to, _token, _tokens);
     }
 }

packages/horizon/contracts/data-service/interfaces/IDataService.sol

@@ -25,7 +25,7 @@ interface IDataService {
      * @notice Emitted when a service provider accepts a provision in {Graph Horizon staking contract}.
      * @param serviceProvider The address of the service provider.
      */
-    event ProvisionAccepted(address indexed serviceProvider);
+    event ProvisionPendingParametersAccepted(address indexed serviceProvider);
 
     /**
      * @notice Emitted when a service provider starts providing the service.
@@ -60,11 +60,6 @@ interface IDataService {
      */
     event ServiceProviderSlashed(address indexed serviceProvider, uint256 tokens);
 
-    /**
-     * @notice Thrown to signal that a feature is not implemented by a data service.
-     */
-    error DataServiceFeatureNotImplemented();
-
     /**
      * @notice Registers a service provider with the data service. The service provider can now
      * start providing the service.
@@ -84,16 +79,16 @@ interface IDataService {
     function register(address serviceProvider, bytes calldata data) external;
 
     /**
-     * @notice Accepts staged parameters in the provision of a service provider in the {Graph Horizon staking
+     * @notice Accepts pending parameters in the provision of a service provider in the {Graph Horizon staking
      * contract}.
      * @dev Provides a way for the data service to validate and accept provision parameter changes. Call {_acceptProvision}.
      *
-     * Emits a {ProvisionAccepted} event.
+     * Emits a {ProvisionPendingParametersAccepted} event.
      *
      * @param serviceProvider The address of the service provider.
      * @param data Custom data, usage defined by the data service.
      */
-    function acceptProvision(address serviceProvider, bytes calldata data) external;
+    function acceptProvisionPendingParameters(address serviceProvider, bytes calldata data) external;
 
     /**
      * @notice Service provider starts providing the service.

packages/horizon/contracts/data-service/interfaces/IDataServiceFees.sol

@@ -32,7 +32,7 @@ interface IDataServiceFees is IDataService {
         // Timestamp when the claim was created
         uint256 createdAt;
         // Timestamp when the claim will expire and tokens can be released
-        uint256 releaseAt;
+        uint256 releasableAt;
         // Next claim in the linked list
         bytes32 nextClaim;
     }
@@ -56,13 +56,13 @@ interface IDataServiceFees is IDataService {
      * @param serviceProvider The address of the service provider
      * @param claimId The id of the stake claim
      * @param tokens The amount of tokens released
-     * @param releaseAt The timestamp when the tokens were released
+     * @param releasableAt The timestamp when the tokens were released
      */
     event StakeClaimReleased(
         address indexed serviceProvider,
         bytes32 indexed claimId,
         uint256 tokens,
-        uint256 releaseAt
+        uint256 releasableAt
     );
 
     /**
@@ -89,7 +89,7 @@ interface IDataServiceFees is IDataService {
      * stake claims that releasing them all at once would exceed the block gas limit.
      * @dev This function can be overriden and/or disabled.
      * @dev Emits a {StakeClaimsReleased} event, and a {StakeClaimReleased} event for each claim released.
-     * @param n Amount of stake claims to process. If 0, all stake claims are processed.
+     * @param numClaimsToRelease Amount of stake claims to process. If 0, all stake claims are processed.
      */
-    function releaseStake(uint256 n) external;
+    function releaseStake(uint256 numClaimsToRelease) external;
 }