@human-protocol/sdk 3.0.1 → 3.0.3

package/src/constants.ts

@@ -63,7 +63,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/ethereum/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/BtC96WCK6ZpZ35v94MK6rZNiBzDEZYHFzDmhMYyZ369D',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmWGUDcQG1e8bjp9LRcyWCo4xfWcVCdgApi59sY6rgdRkS',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -109,7 +109,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/sepolia/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/UMLaZHtLE9LxzDyvBLBgfWj4erzYzYMeGUbQtxtyMaE',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmfCCRC1cGKWuoRtaj2ZJKyaw97Ry15TbGiC4u3veTq8iX',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -125,7 +125,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/bsc/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/JBJPC3YmRSNjyjRTTpazhhSX5CCZ4CeBx6ptRsM8PCBb',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmWNVgcdzBkDyCNBYd7jBp1vChj9B3ah7nKMSXoDkzzXYm',
     oldSubgraphUrl: 'https://api.thegraph.com/subgraphs/name/humanprotocol/bsc',
     oldFactoryAddress: '0xc88bC422cAAb2ac8812de03176402dbcA09533f4',
   },
@@ -141,7 +141,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/bsc-testnet/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/BnaC4CDqgdbGvcgM7KoZ6d7Yeebsm7NvLFrr61Lxg6Ao',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmaEPv3KDMJJJ8EWfcKWX7FJGDBudHhuHDCMR2LkbYhdNR',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/bsctest',
     oldFactoryAddress: '0xaae6a2646c1f88763e62e0cd08ad050ea66ac46f',
@@ -158,7 +158,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/polygon/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/HHYwCHBvDrjckpNB4jbB8k63pSot6rGtBYLBygGji3vD',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmS2jKUstRaGWyAhytjA2b84grhXFKouZ3fzP9fPp2etum',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/polygon',
     oldFactoryAddress: '0x45eBc3eAE6DA485097054ae10BA1A0f8e8c7f794',
@@ -191,7 +191,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/amoy/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/FmdCVzHV3bB4abPVYtBALtBHr7ZRZmZ67m5c432S7GZH',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmVfssyiU81KwrTVL1QRjj4LPpTkA1ZmexHTRVg51J5YxP',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -207,7 +207,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/moonbeam/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/BH5Sm6exn76o5frV5VeCufChB43DCfMXCQsdtWt4AuQP',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmU5hSFUvu2fp8EWU3uqxcz477gWjXjRq3jnpMT3KG14Sg',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/moonbeam',
     oldFactoryAddress: '0x98108c28B7767a52BE38B4860832dd4e11A7ecad',
@@ -224,7 +224,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/moonbase-alpha/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/AmmRkJszUbjfUwHubcRkU6CfG1Q9psRWRbbHADVmsLjE',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmf9qH6CCxBzxkruDLLJzJTm4ig8LkSZYErGCNfJC5vsgQ',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -240,7 +240,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/fuji/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/CnZCDsWziQF3jNoqgQMkmJbF9frof5osM3hN5eUgyL5u',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmXcSyzYPk4AFyWq4wubxrgVNYuse8zHiQYUZR7WFinRSj',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/fuji',
     oldFactoryAddress: '0xfb4469201951C3B9a7F1996c477cb7BDBEcE0A88',
@@ -257,7 +257,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/avalanche/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/FweDaDWZ6ZDcsA63wsjnWgdgw4aCbkiVQYMYvtcP5p2u',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmbKoD9diMdiLoVgAzJmjM4Qj6jeUQAD8ztquPMMcaZVFA',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/avalanche',
     oldFactoryAddress: '0x9767a578ba7a5FA1563c8229943cB01cd8446BB4',
@@ -274,7 +274,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/celo-alfajores/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/EGWCWuzBNkbypW8ipRKuyGwq8azoCy6LKKosGgSPMGRD',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmWSLvacfR6xiJ8dYJbABtMg3r2TuoKBSjMGSofJVh2uoR',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -290,7 +290,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/celo/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/HTgMnYWGsdsw41o8dyph1bwhotuXh6va3L8r8DGgLjsA',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmXCUVfazFdQ9s1gWHyr7eNGTUY1zLVhmVGoVYhLbkT4ib',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -306,7 +306,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/xlayer/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/CrratkbjCraj1BZLgJmck1GGxbMb2Y2iPZiW4Lh5DdcX',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmY7z7abXHxFBSqzeM67q5AYxF4uRLFvpVrQQQpwVJqMkQ',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -322,7 +322,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/xlayer-testnet/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-testnet-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/subgraphs/id/9zd1LcywWjuSUtde4ofC8oyyzpawPwGUiPsvqTq247xk',
+      'https://gateway-testnet-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmVw3K8cdbommhhH6jhmkLGQAbPjgWuYYeUfBCQv6rmJTr',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -349,6 +349,7 @@ export const KVStoreKeys = {
   webhookUrl: 'webhook_url',
   url: 'url',
   jobTypes: 'job_types',
+  registrationNeeded: 'registration_needed',
 };
 
 export const Role = {

package/src/escrow.ts

@@ -1484,11 +1484,8 @@ export class EscrowUtils {
    *   manifestHash?: string;
    *   manifestUrl?: string;
    *   recordingOracle?: string;
-   *   recordingOracleFee?: string;
    *   reputationOracle?: string;
-   *   reputationOracleFee?: string;
    *   exchangeOracle?: string;
-   *   exchangeOracleFee?: string;
    *   status: EscrowStatus;
    *   token: string;
    *   totalFundedAmount: string;
@@ -1618,11 +1615,8 @@ export class EscrowUtils {
    *   manifestHash?: string;
    *   manifestUrl?: string;
    *   recordingOracle?: string;
-   *   recordingOracleFee?: string;
    *   reputationOracle?: string;
-   *   reputationOracleFee?: string;
    *   exchangeOracle?: string;
-   *   exchangeOracleFee?: string;
    *   status: EscrowStatus;
    *   token: string;
    *   totalFundedAmount: string;

package/src/graphql/queries/escrow.ts

@@ -16,11 +16,8 @@ const ESCROW_FRAGMENT = gql`
     manifestHash
     manifestUrl
     recordingOracle
-    recordingOracleFee
     reputationOracle
-    reputationOracleFee
     exchangeOracle
-    exchangeOracleFee
     status
     token
     totalFundedAmount

package/src/graphql/queries/kvstore.ts

@@ -21,3 +21,14 @@ export const GET_KVSTORE_BY_ADDRESS_QUERY = () => {
     ${KVSTORE_FRAGMENT}
   `;
 };
+
+export const GET_KVSTORE_BY_ADDRESS_AND_KEY_QUERY = () => {
+  return gql`
+    query getKVStoreDataByKey($address: String!, $key: String!) {
+      kvstores(where: { address: $address, key: $key }) {
+        ...KVStoreFields
+      }
+    }
+    ${KVSTORE_FRAGMENT}
+  `;
+};

package/src/graphql/queries/operator.ts

@@ -13,7 +13,7 @@ const LEADER_FRAGMENT = gql`
     amountSlashed
     reputation
     reward
-    amountJobsLaunched
+    amountJobsProcessed
     role
     fee
     publicKey

package/src/graphql/queries/statistics.ts

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { IStatisticsParams } from '../../interfaces';
+import { IStatisticsFilter } from '../../interfaces';
 
 const HMTOKEN_STATISTICS_FRAGMENT = gql`
   fragment HMTokenStatisticsFields on HMTokenStatistics {
@@ -70,25 +70,29 @@ export const GET_ESCROW_STATISTICS_QUERY = gql`
   ${ESCROW_STATISTICS_FRAGMENT}
 `;
 
-export const GET_EVENT_DAY_DATA_QUERY = (params: IStatisticsParams) => {
-  const { from, to, limit } = params;
+export const GET_EVENT_DAY_DATA_QUERY = (params: IStatisticsFilter) => {
+  const { from, to } = params;
   const WHERE_CLAUSE = `
     where: {
       ${from !== undefined ? `timestamp_gte: $from` : ''}
       ${to !== undefined ? `timestamp_lte: $to` : ''}
     }
   `;
-  const LIMIT_CLAUSE = `
-    first: ${limit ? `$limit` : `1000`}
-  `;
 
   return gql`
-    query GetEscrowDayData($from: Int, $to: Int) {
+    query GetEscrowDayData(
+        $from: Int, 
+        $to: Int,
+        $orderDirection: String
+        $first: Int
+        $skip: Int
+    ) {
       eventDayDatas(
         ${WHERE_CLAUSE},
         orderBy: timestamp,
-        orderDirection: desc,
-        ${LIMIT_CLAUSE}
+        orderDirection: $orderDirection,
+        first: $first,
+        skip: $skip
       ) {
         ...EventDayDataFields
       }

package/src/graphql/types.ts

@@ -13,11 +13,8 @@ export type EscrowData = {
   manifestHash?: string;
   manifestUrl?: string;
   recordingOracle?: string;
-  recordingOracleFee?: string;
   reputationOracle?: string;
-  reputationOracleFee?: string;
   exchangeOracle?: string;
-  exchangeOracleFee?: string;
   status: string;
   token: string;
   totalFundedAmount: string;
@@ -141,8 +138,6 @@ export type HMTStatistics = {
   totalTransferAmount: bigint;
   totalTransferCount: number;
   totalHolders: number;
-  holders: HMTHolder[];
-  dailyHMTData: DailyHMTData[];
 };
 
 export type IMDataEntity = {

package/src/index.ts

@@ -1,6 +1,6 @@
 import { StakingClient } from './staking';
 import { StorageClient } from './storage';
-import { KVStoreClient } from './kvstore';
+import { KVStoreClient, KVStoreUtils } from './kvstore';
 import { EscrowClient, EscrowUtils } from './escrow';
 import { StatisticsClient } from './statistics';
 import { Encryption, EncryptionUtils } from './encryption';
@@ -16,6 +16,7 @@ export {
   StakingClient,
   StorageClient,
   KVStoreClient,
+  KVStoreUtils,
   EscrowClient,
   EscrowUtils,
   StatisticsClient,

package/src/interfaces.ts

@@ -26,7 +26,7 @@ export interface ILeader {
   amountSlashed: bigint;
   reputation: bigint;
   reward: bigint;
-  amountJobsLaunched: bigint;
+  amountJobsProcessed: bigint;
   role?: string;
   fee?: bigint;
   publicKey?: string;
@@ -96,15 +96,13 @@ export interface IKeyPair {
   revocationCertificate?: string;
 }
 
-export interface IStatisticsParams {
+export interface IStatisticsFilter extends IPagination {
   from?: Date;
   to?: Date;
-  limit?: number;
 }
 
-export interface IHMTHoldersParams {
+export interface IHMTHoldersParams extends IPagination {
   address?: string;
-  orderDirection?: 'asc' | 'desc';
 }
 
 export interface IPayoutFilter {

package/src/kvstore.ts

@@ -19,7 +19,10 @@ import {
 import gqlFetch from 'graphql-request';
 import { NetworkData } from './types';
 import { getSubgraphUrl, isValidUrl } from './utils';
-import { GET_KVSTORE_BY_ADDRESS_QUERY } from './graphql/queries/kvstore';
+import {
+  GET_KVSTORE_BY_ADDRESS_AND_KEY_QUERY,
+  GET_KVSTORE_BY_ADDRESS_QUERY,
+} from './graphql/queries/kvstore';
 import { KVStoreData } from './graphql';
 import { IKVStore } from './interfaces';
 /**
@@ -277,71 +280,162 @@ export class KVStoreClient extends BaseEthersClient {
         throw Error(`Failed to set URL and hash: ${e.message}`);
     }
   }
+}
+
+/**
+ * ## Introduction
+ *
+ * Utility class for KVStore-related operations.
+ *
+ * ## Installation
+ *
+ * ### npm
+ * ```bash
+ * npm install @human-protocol/sdk
+ * ```
+ *
+ * ### yarn
+ * ```bash
+ * yarn install @human-protocol/sdk
+ * ```
+ *
+ * ## Code example
+ *
+ * ### Signer
+ *
+ * **Using private key (backend)**
+ *
+ * ```ts
+ * import { ChainId, KVStoreUtils } from '@human-protocol/sdk';
+ *
+ * const KVStoreAddresses = new KVStoreUtils.getKVStoreData({
+ *   ChainId.POLYGON_AMOY,
+ *   "0x1234567890123456789012345678901234567890",
+ * );
+ * ```
+ */
+export class KVStoreUtils {
+  /**
+   * This function returns the KVStore data for a given address.
+   *
+   * @param {ChainId} chainId Network in which the KVStore is deployed
+   * @param {string} address Address of the KVStore
+   * @returns {Promise<IKVStore[]>} KVStore data
+   * @throws {ErrorUnsupportedChainID} - Thrown if the network's chainId is not supported
+   * @throws {ErrorInvalidAddress} - Thrown if the Address sent is invalid
+   *
+   * **Code example**
+   *
+   * ```ts
+   * import { ChainId, KVStoreUtils } from '@human-protocol/sdk';
+   *
+   * const kvStoreData = await KVStoreUtils.getKVStoreData(ChainId.POLYGON_AMOY, "0x1234567890123456789012345678901234567890");
+   * console.log(kvStoreData);
+   * ```
+   */
+  public static async getKVStoreData(
+    chainId: ChainId,
+    address: string
+  ): Promise<IKVStore[]> {
+    const networkData = NETWORKS[chainId];
+
+    if (!networkData) {
+      throw ErrorUnsupportedChainID;
+    }
+
+    if (address && !ethers.isAddress(address)) {
+      throw ErrorInvalidAddress;
+    }
+
+    const { kvstores } = await gqlFetch<{ kvstores: KVStoreData[] }>(
+      getSubgraphUrl(networkData),
+      GET_KVSTORE_BY_ADDRESS_QUERY(),
+      { address: address.toLowerCase() }
+    );
+
+    const kvStoreData = kvstores.map((item) => ({
+      key: item.key,
+      value: item.value,
+    }));
+
+    return kvStoreData || [];
+  }
 
   /**
-   * Gets the value of a key-value pair in the contract.
+   * Gets the value of a key-value pair in the KVStore using the subgraph.
    *
+   * @param {ChainId} chainId Network in which the KVStore is deployed
    * @param {string} address Address from which to get the key value.
    * @param {string} key Key to obtain the value.
-   * @returns {string} Value of the key.
-   *
+   * @returns {Promise<string>} Value of the key.
+   * @throws {ErrorUnsupportedChainID} - Thrown if the network's chainId is not supported
+   * @throws {ErrorInvalidAddress} - Thrown if the Address sent is invalid
+   * @throws {ErrorKVStoreEmptyKey} - Thrown if the key is empty
    *
    * **Code example**
    *
-   * > Need to have available stake.
-   *
    * ```ts
-   * import { providers } from 'ethers';
-   * import { KVStoreClient } from '@human-protocol/sdk';
-   *
-   * const rpcUrl = 'YOUR_RPC_URL';
+   * import { ChainId, KVStoreUtils } from '@human-protocol/sdk';
    *
-   * const provider = new providers.JsonRpcProvider(rpcUrl);
-   * const kvstoreClient = await KVStoreClient.build(provider);
+   * const chainId = ChainId.POLYGON_AMOY;
+   * const address = '0x1234567890123456789012345678901234567890';
+   * const key = 'role';
    *
-   * const value = await kvstoreClient.get('0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266', 'Role');
+   * const value = await KVStoreUtils.get(chainId, address, key);
+   * console.log(value);
    * ```
    */
-  public async get(address: string, key: string): Promise<string> {
+  public static async get(
+    chainId: ChainId,
+    address: string,
+    key: string
+  ): Promise<string> {
     if (key === '') throw ErrorKVStoreEmptyKey;
     if (!ethers.isAddress(address)) throw ErrorInvalidAddress;
 
-    try {
-      const result = await this.contract?.get(address, key);
-      return result;
-    } catch (e) {
-      if (e instanceof Error) throw Error(`Failed to get value: ${e.message}`);
-      return e;
+    const networkData = NETWORKS[chainId];
+
+    if (!networkData) {
+      throw ErrorUnsupportedChainID;
+    }
+
+    const { kvstores } = await gqlFetch<{ kvstores: KVStoreData[] }>(
+      getSubgraphUrl(networkData),
+      GET_KVSTORE_BY_ADDRESS_AND_KEY_QUERY(),
+      { address: address.toLowerCase(), key }
+    );
+
+    if (!kvstores || kvstores.length === 0) {
+      throw new Error(`Key "${key}" not found for address ${address}`);
     }
+
+    const value = kvstores[0].value;
+
+    return value;
   }
 
   /**
-   * Gets the URL value of the given entity, and verify its hash.
+   * Gets the URL value of the given entity, and verifies its hash.
    *
+   * @param {ChainId} chainId Network in which the KVStore is deployed
    * @param {string} address Address from which to get the URL value.
-   * @param {string} urlKey  Configurable URL key. `url` by default.
-   * @returns {string} URL value for the given address if exists, and the content is valid
-   *
+   * @param {string} urlKey Configurable URL key. `url` by default.
+   * @returns {Promise<string>} URL value for the given address if it exists, and the content is valid
    *
    * **Code example**
    *
    * ```ts
-   * import { providers } from 'ethers';
-   * import { KVStoreClient } from '@human-protocol/sdk';
+   * import { ChainId, KVStoreUtils } from '@human-protocol/sdk';
    *
-   * const rpcUrl = 'YOUR_RPC_URL';
+   * const chainId = ChainId.POLYGON_AMOY;
+   * const address = '0x1234567890123456789012345678901234567890';
    *
-   * const provider = new providers.JsonRpcProvider(rpcUrl);
-   * const kvstoreClient = await KVStoreClient.build(provider);
-   *
-   * const url = await kvstoreClient.getFileUrlAndVerifyHash('0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266');
-   * const linkedinUrl = await kvstoreClient.getFileUrlAndVerifyHash(
-   *    '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
-   *    'linkedin_url'
-   * );
+   * const url = await KVStoreUtils.getFileUrlAndVerifyHash(chainId, address);
+   * console.log(url);
    * ```
    */
-  public async getFileUrlAndVerifyHash(
+  public static async getFileUrlAndVerifyHash(
+    chainId: ChainId,
     address: string,
     urlKey = 'url'
   ): Promise<string> {
@@ -352,7 +446,7 @@ export class KVStoreClient extends BaseEthersClient {
       hash = '';
 
     try {
-      url = await this.contract?.get(address, urlKey);
+      url = await this.get(chainId, address, urlKey);
     } catch (e) {
       if (e instanceof Error) throw Error(`Failed to get URL: ${e.message}`);
     }
@@ -363,7 +457,7 @@ export class KVStoreClient extends BaseEthersClient {
     }
 
     try {
-      hash = await this.contract?.get(address, hashKey);
+      hash = await this.get(chainId, address, hashKey);
     } catch (e) {
       if (e instanceof Error) throw Error(`Failed to get Hash: ${e.message}`);
     }
@@ -379,28 +473,30 @@ export class KVStoreClient extends BaseEthersClient {
   }
 
   /**
-   * Gets the public key of the given entity, and verify its hash.
+   * Gets the public key of the given entity, and verifies its hash.
    *
+   * @param {ChainId} chainId Network in which the KVStore is deployed
    * @param {string} address Address from which to get the public key.
-   * @returns {string} Public key for the given address if exists, and the content is valid
-   *
+   * @returns {Promise<string>} Public key for the given address if it exists, and the content is valid
    *
    * **Code example**
    *
    * ```ts
-   * import { providers } from 'ethers';
-   * import { KVStoreClient } from '@human-protocol/sdk';
-   *
-   * const rpcUrl = 'YOUR_RPC_URL';
+   * import { ChainId, KVStoreUtils } from '@human-protocol/sdk';
    *
-   * const provider = new providers.JsonRpcProvider(rpcUrl);
-   * const kvstoreClient = await KVStoreClient.build(provider);
+   * const chainId = ChainId.POLYGON_AMOY;
+   * const address = '0x1234567890123456789012345678901234567890';
    *
-   * const publicKey = await kvstoreClient.getPublicKey('0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266');
+   * const publicKey = await KVStoreUtils.getPublicKey(chainId, address);
+   * console.log(publicKey);
    * ```
    */
-  public async getPublicKey(address: string): Promise<string> {
+  public static async getPublicKey(
+    chainId: ChainId,
+    address: string
+  ): Promise<string> {
     const publicKeyUrl = await this.getFileUrlAndVerifyHash(
+      chainId,
       address,
       KVStoreKeys.publicKey
     );
@@ -414,112 +510,3 @@ export class KVStoreClient extends BaseEthersClient {
     return publicKey;
   }
 }
-
-/**
- * ## Introduction
- *
- * Utility class for KVStore-related operations.
- *
- * ## Installation
- *
- * ### npm
- * ```bash
- * npm install @human-protocol/sdk
- * ```
- *
- * ### yarn
- * ```bash
- * yarn install @human-protocol/sdk
- * ```
- *
- * ## Code example
- *
- * ### Signer
- *
- * **Using private key (backend)**
- *
- * ```ts
- * import { ChainId, KVStoreUtils } from '@human-protocol/sdk';
- *
- * const KVStoreAddresses = new KVStoreUtils.getData({
- *   network: ChainId.POLYGON_AMOY
- * });
- * ```
- */
-export class KVStoreUtils {
-  /**
-   * This function returns the KVStore data for a given address.
-   *
-   * > This uses Subgraph
-   *
-   * **Input parameters**
-   *
-   * ```ts
-   * enum ChainId {
-   *   ALL = -1,
-   *   MAINNET = 1,
-   *   RINKEBY = 4,
-   *   GOERLI = 5,
-   *   BSC_MAINNET = 56,
-   *   BSC_TESTNET = 97,
-   *   POLYGON = 137,
-   *   POLYGON_MUMBAI = 80001,
-   *   POLYGON_AMOY = 80002,
-   *   MOONBEAM = 1284,
-   *   MOONBASE_ALPHA = 1287,
-   *   AVALANCHE = 43114,
-   *   AVALANCHE_TESTNET = 43113,
-   *   CELO = 42220,
-   *   CELO_ALFAJORES = 44787,
-   *   LOCALHOST = 1338,
-   * }
-   * ```
-   *
-   * ```ts
-   * interface IKVStore {
-   *   key: string;
-   *   value: string;
-   * }
-   * ```
-   *
-   * @param {ChainId} chainId Network in which the KVStore is deployed
-   * @param {string} address Address of the KVStore
-   * @returns {Promise<IKVStore[]>} KVStore data
-   *
-   * **Code example**
-   *
-   * ```ts
-   * import { ChainId, KVStoreUtils } from '@human-protocol/sdk';
-   *
-   * const kvStoreData = await KVStoreUtils.getKVStoreData(ChainId.POLYGON_AMOY, "0x1234567890123456789012345678901234567890");
-   * console.log(kvStoreData);
-   * ```
-   */
-  public static async getKVStoreData(
-    chainId: ChainId,
-    address: string
-  ): Promise<IKVStore[]> {
-    const networkData = NETWORKS[chainId];
-
-    if (!networkData) {
-      throw ErrorUnsupportedChainID;
-    }
-
-    if (address && !ethers.isAddress(address)) {
-      throw ErrorInvalidAddress;
-    }
-
-    const { kvstores } = await gqlFetch<{ kvstores: KVStoreData[] }>(
-      getSubgraphUrl(networkData),
-      GET_KVSTORE_BY_ADDRESS_QUERY(),
-      { address: address.toLowerCase() }
-    );
-
-    const kvStoreData = kvstores.map((item) => ({
-      key: item.key,
-      value: item.value,
-    }));
-
-    return kvStoreData || [];
-  }
-}