fix(graphql): Broken upstream API fix [DEV-1726]

README.md

@@ -83,7 +83,7 @@ The only way to derive this figure from the Cosmos SDK APIs is by iterating over
 
 #### Endpoint
 
-[`data-api.cheqd.io/staking/balances/<validator-address>`](https://data-api.cheqd.io/staking/balances/cheqdvaloper1lg0vwuu888hu4arnt9egtqrm2662kcrtf2unrs)
+[`data-api.cheqd.io/staking/delegators/<validator-address>`](https://data-api.cheqd.io/staking/delegators/cheqdvaloper1lg0vwuu888hu4arnt9egtqrm2662kcrtf2unrs)
 
 #### Response
 
@@ -97,7 +97,7 @@ There is no simple Cosmos SDK API to fetch the number of delegators for a given
 
 #### Endpoint
 
-[`data-api.cheqd.io/balances/vesting/<address>`](https://data-api.cheqd.io/balances/vesting/cheqd1qs0nhyk868c246defezhz5eymlt0dmajna2csg)
+[`data-api.cheqd.io/balances/vesting/<address>`](https://data-api.cheqd.io/balances/vesting/cheqd17wrwqxsfwy4rqlltjhj6jxtz68tvxm0ykge5dr)
 
 #### Response
 
@@ -111,7 +111,7 @@ There is no Cosmos SDK API that returns balances that are yet to be vested for [
 
 #### Endpoint
 
-[`data-api.cheqd.io/balances/vested/<address>`](https://data-api.cheqd.io/balances/vesting/cheqd1qs0nhyk868c246defezhz5eymlt0dmajna2csg)
+[`data-api.cheqd.io/balances/vested/<address>`](https://data-api.cheqd.io/balances/vesting/cheqd17wrwqxsfwy4rqlltjhj6jxtz68tvxm0ykge5dr)
 
 #### Response
 
@@ -125,7 +125,7 @@ There is no Cosmos SDK API that returns balances that are already vested for [co
 
 #### Endpoint
 
-[`data-api.cheqd.io/balances/liquid/<address>`](https://data-api.cheqd.io/balances/vesting/cheqd1qs0nhyk868c246defezhz5eymlt0dmajna2csg)
+[`data-api.cheqd.io/balances/liquid/<address>`](https://data-api.cheqd.io/balances/vesting/cheqd17wrwqxsfwy4rqlltjhj6jxtz68tvxm0ykge5dr)
 
 #### Response
 
@@ -143,7 +143,7 @@ Tokens in [continuous or delayed vesting accounts](https://docs.cosmos.network/v
 
 #### Endpoint
 
-[`data-api.cheqd.io/balances/total/<address>`](https://data-api.cheqd.io/balances/total/cheqd1qs0nhyk868c246defezhz5eymlt0dmajna2csg)
+[`data-api.cheqd.io/balances/total/<address>`](https://data-api.cheqd.io/balances/total/cheqd17wrwqxsfwy4rqlltjhj6jxtz68tvxm0ykge5dr)
 
 #### Response
 
@@ -157,7 +157,8 @@ The standard Cosmos SDK REST API for account balances returns JSON with the acco
 
 #### Endpoint
 
-[`data-api.cheqd.io/arbitrage/`](https://data-api.cheqd.io/arbitrage)
+- Results filtered by threshold value: [`data-api.cheqd.io/arbitrage`](https://data-api.cheqd.io/arbitrage)
+- Unfiltered results: [`data-api.cheqd.io/arbitrage/all`](https://data-api.cheqd.io/arbitrage/all)
 
 #### Response
 

src/api/bigDipperApi.ts

@@ -1,117 +1,147 @@
-import { GraphQLClient } from "../helpers/graphql";
-import { Account } from "../types/bigDipper";
-import { Coin, Delegation, ValidatorAggregateCountResponse, ValidatorDetailResponse } from "../types/node";
+import { GraphQLClient } from '../helpers/graphql';
+import {
+  ActiveValidatorsResponse,
+  Coin,
+  TotalStakedCoinsResponse,
+  ValidatorDelegationsCountResponse,
+} from '../types/node';
+import { Account } from '../types/bigDipper';
+import { NodeApi } from './nodeApi';
 
 export class BigDipperApi {
-	constructor(public readonly graphql_client: GraphQLClient) {
-	}
-
-	async get_accounts(addresses: string[]): Promise<Account[]> {
-		let query = `query Account($addresses: [String], $utc: timestamp) {
-			account(where: { address: { _in: $addresses } }) {
-				address
-				accountBalances: account_balances(limit: 1, order_by: { height: desc }) {
-					coins
-				}
-				delegations {
-					amount
-				}
-				unbonding: unbonding_delegations(
-					where: { completion_timestamp: { _gt: $utc } }
-				) {
-					amount
-				}
-				redelegations(where: { completion_time: { _gt: $utc } }) {
-					amount
-				}
-				delegationRewards: delegation_rewards {
-					amount
-				}
-			}
-		}`
-
-		let params = {
-			utc: new Date(),
-			addresses
-		}
-
-		let resp = await this.graphql_client.query<{ account: Account[] }>(query, params);
-		return resp.account;
-	}
-
-	async get_account(address: string): Promise<Account> {
-		let accounts = await this.get_accounts([address]);
-		return accounts[0];
-	}
-
-	async get_total_supply(): Promise<Coin[]> {
-		let query = `query Supply {
-			supply(order_by: {height:desc} limit: 1) {
-				coins
-				height
-			}
-		}`;
-
-		let resp = await this.graphql_client.query<{ supply: { coins: Coin[] }[] }>(query);
-		return resp.supply[0].coins;
-	}
-
-	get_delegator_count_for_validator = async (address: string): Promise<Number> => {
-		let query = `query ValidatorDetails($address: String) {
-			validator(where: {validator_info: {operator_address: {_eq: $address}}}) {
-				delegations_aggregate {
-					aggregate {
-						count
-					}
-				}
-			}
-		}`
-
-		const params = {
-			address: address,
-		}
-
-		const resp = await this.graphql_client.query<ValidatorAggregateCountResponse>(query, params);
-		if (!resp.validator || !resp.validator.length) {
-			return 0;
-		}
-
-		return resp.validator[0].delegations_aggregate.aggregate.count;
-	}
-
-	get_total_delegator_count = async (): Promise<Number> => {
-		const query = `query ValidatorDetails {
-			validator {
-				validatorStatuses: validator_statuses(order_by: {height: desc}, limit: 1) {
-					jailed
-				}
-				delegations {
-					delegatorAddress: delegator_address
-				}
-			}
-		}`
-
-		const resp = await this.graphql_client.query<ValidatorDetailResponse>(query);
-		const set = new Set();
-		resp.validator.forEach((obj, i) => {
-			if (!obj.validatorStatuses[0]?.jailed) {
-				obj.delegations.forEach(delegation => {
-					set.add(delegation.delegatorAddress)
-				})
-			}
-		})
-
-		return set.size
-	}
-
-	get_total_staked_coins = async (): Promise<string> => {
-		let query = `query StakingInfo{
-			staking_pool {
-				bonded_tokens
-			}
-		}`
-
-		const resp = await this.graphql_client.query<{ staking_pool: [{ "bonded_tokens": string }] }>(query);
-		return resp.staking_pool[0].bonded_tokens;
-	}
+  constructor(public readonly graphql_client: GraphQLClient) {}
+
+  async get_account(address: string): Promise<Account | null> {
+    let query = `query Account($address: String!, $where: vesting_account_bool_exp) {
+          accountBalance: action_account_balance(address: $address) {
+            coins
+          }
+          delegationBalance: action_delegation_total(address: $address) {
+            coins
+          }
+          unbondingBalance: action_unbonding_delegation_total(address: $address) {
+            coins
+          }
+          redelegationBalance: action_redelegation(address: $address) {
+            redelegations
+          }
+          rewardBalance: action_delegation_reward(address: $address) {
+            coins
+          }
+          vesting_account(where: $where) {
+            id
+            type
+            original_vesting
+            start_time
+            end_time
+          }
+        }`;
+
+    let params = {
+      address: address,
+      where: {
+        address: {
+          _eq: address,
+        },
+      },
+    };
+
+    try {
+      let resp = await this.graphql_client.query<{
+        data: any;
+        errors: any;
+      }>(query, params);
+
+      return resp.data as Account;
+    } catch (e: any) {
+      console.error(new Map(e));
+      return null;
+    }
+  }
+
+  async get_total_supply(): Promise<Coin[]> {
+    let query = `query Supply {
+            supply(order_by: {height:desc} limit: 1) {
+                coins
+                height
+            }
+        }`;
+
+    let resp = await this.graphql_client.query<{
+      data: { supply: { coins: Coin[] }[] };
+    }>(query);
+
+    return resp.data.supply[0].coins;
+  }
+
+  get_delegator_count_for_validator = async (
+    address: string
+  ): Promise<Number> => {
+    let query = `query ValidatorDelegations($address: String!, $pagination: Boolean! = true) {
+        delegations: action_validator_delegations(address: $address, count_total: $pagination) {         
+          pagination
+        }
+      }
+      `;
+
+    const params = {
+      address: address,
+    };
+
+    const resp = await this.graphql_client.query<{
+      data: ValidatorDelegationsCountResponse;
+    }>(query, params);
+
+    return resp.data.delegations.pagination.total;
+  };
+
+  get_total_delegator_count = async (): Promise<Number> => {
+    const queryActiveValidators = `query ActiveValidators {
+        validator_info(distinct_on: operator_address, where: {validator: {validator_statuses: {jailed: {_eq: false}}}}) {
+          operator_address
+        }
+      }`;
+
+    const data = [];
+    const uniques = new Set();
+
+    const activeValidator = await this.graphql_client.query<{
+      data: ActiveValidatorsResponse;
+    }>(queryActiveValidators);
+
+    for (let i = 0; i < activeValidator.data.validator_info.length; i++) {
+      const operator_address =
+        activeValidator.data.validator_info[i].operator_address;
+      const resp = await new NodeApi(
+        REST_API
+      ).staking_get_delegators_per_validator(operator_address);
+      data.push({
+        validator: operator_address,
+        delegators: resp.delegation_responses,
+      });
+    }
+
+    for (let i = 0; i < data.length; i++) {
+      const delegators = data[i].delegators;
+      for (let j = 0; j < delegators.length; j++) {
+        uniques.add(
+          `${delegators[j].delegation.delegator_address}${delegators[j].delegation.validator_address}`
+        );
+      }
+    }
+    return uniques.size;
+  };
+
+  get_total_staked_coins = async (): Promise<string> => {
+    let query = `query StakingInfo{
+            staking_pool {
+                bonded_tokens
+            }
+        }`;
+
+    const resp = await this.graphql_client.query<{
+      data: TotalStakedCoinsResponse;
+    }>(query);
+    return resp.data.staking_pool[0].bonded_tokens;
+  };
 }