fix: proper fix for type issues with GNS and SubgraphNFT

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

Author: tmigone

packages/hardhat-graph-protocol/CHANGELOG.md

@@ -1,5 +1,12 @@
 # hardhat-graph-protocol
 
+## 0.1.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @graphprotocol/toolshed@0.5.5
+
 ## 0.1.21
 
 ### Patch Changes

packages/hardhat-graph-protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hardhat-graph-protocol",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "publishConfig": {
     "access": "public"
   },

packages/horizon/package.json

@@ -55,7 +55,7 @@
     "hardhat": "^2.22.18",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-gas-reporter": "^1.0.8",
-    "hardhat-graph-protocol": "workspace:^0.1.21",
+    "hardhat-graph-protocol": "workspace:^0.1.22",
     "hardhat-secure-accounts": "^1.0.5",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",

packages/subgraph-service/contracts/mocks/imports.sol

@@ -2,13 +2,14 @@
 pragma solidity ^0.7.6 || 0.8.27;
 
 // These are needed to get artifacts for toolshed
-import "@graphprotocol/contracts/contracts/l2/discovery/IL2GNS.sol";
 import "@graphprotocol/contracts/contracts/disputes/IDisputeManager.sol";
+import "@graphprotocol/contracts/contracts/discovery/ISubgraphNFT.sol";
 
 // Also for toolshed, solidity version in @graphprotocol/contracts does not support overriding public getters
 // in interface file, so we need to amend them here.
 import { IServiceRegistry } from "@graphprotocol/contracts/contracts/discovery/IServiceRegistry.sol";
 import { IL2Curation } from "@graphprotocol/contracts/contracts/l2/curation/IL2Curation.sol";
+import { IGNS } from "@graphprotocol/contracts/contracts/discovery/IGNS.sol";
 
 interface IL2CurationToolshed is IL2Curation {
     function subgraphService() external view returns (address);
@@ -17,3 +18,7 @@ interface IL2CurationToolshed is IL2Curation {
 interface IServiceRegistryToolshed is IServiceRegistry {
     function services(address indexer) external view returns (IServiceRegistry.IndexerService memory);
 }
+
+interface IGNSToolshed is IGNS {
+    function subgraphNFT() external view returns (address);
+}

packages/subgraph-service/package.json

@@ -56,7 +56,7 @@
     "hardhat": "^2.22.18",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-gas-reporter": "^1.0.8",
-    "hardhat-graph-protocol": "workspace:^0.1.21",
+    "hardhat-graph-protocol": "workspace:^0.1.22",
     "hardhat-secure-accounts": "^1.0.5",
     "json5": "^2.2.3",
     "lint-staged": "^15.2.2",

packages/toolshed/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphprotocol/toolshed
 
+## 0.5.5
+
+### Patch Changes
+
+- Properly address type issues
+  - @graphprotocol/horizon@0.3.3
+  - @graphprotocol/subgraph-service@0.3.5
+
 ## 0.5.4
 
 ### Patch Changes

packages/toolshed/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/toolshed",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "publishConfig": {
     "access": "public"
   },

packages/toolshed/src/deployments/subgraph-service/contracts.ts

@@ -9,6 +9,7 @@ import type {
   L2GNS,
   LegacyDisputeManager,
   LegacyServiceRegistry,
+  SubgraphNFT,
 } from './types'
 import type { ContractList } from '../contract'
 
@@ -49,7 +50,7 @@ export interface SubgraphServiceContracts extends ContractList<SubgraphServiceCo
   // @graphprotocol/contracts
   L2Curation: L2Curation
   L2GNS: L2GNS
-  // SubgraphNFT: SubgraphNFT
+  SubgraphNFT: SubgraphNFT
 
   // @graphprotocol/subgraph-service
   SubgraphService: SubgraphService

packages/toolshed/src/deployments/subgraph-service/types.ts

@@ -1,17 +1,16 @@
 import type {
   IDisputeManager,
+  IGNSToolshed,
   IL2CurationToolshed,
   IServiceRegistryToolshed,
+  ISubgraphNFT,
 } from '@graphprotocol/subgraph-service'
 
-import {
-  L2GNS,
-} from '../horizon'
-
 // These are just type re-declarations to keep naming conventions consistent
 export {
   IL2CurationToolshed as L2Curation,
-  L2GNS,
+  IGNSToolshed as L2GNS,
   IDisputeManager as LegacyDisputeManager,
   IServiceRegistryToolshed as LegacyServiceRegistry,
+  ISubgraphNFT as SubgraphNFT,
 }