Skip to content

Commit

Permalink
refactor: remove unneeded Uniswap data API references and update Grap…
Browse files Browse the repository at this point in the history
…hQL queries for AMMV3
  • Loading branch information
yrjkqq committed Dec 3, 2024
1 parent d5a1afd commit c0ead38
Show file tree
Hide file tree
Showing 20 changed files with 74 additions and 3,517 deletions.
24 changes: 0 additions & 24 deletions packages/dodoex-api/codegen-uniswap.ts

This file was deleted.

7 changes: 1 addition & 6 deletions packages/dodoex-api/codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ import { CodegenConfig } from '@graphql-codegen/cli';
// Config: https://the-guild.dev/graphql/codegen/docs/config-reference/codegen-config
const config: CodegenConfig = {
schema: process.env.SCHEMA_URL,
documents: [
'src/**/*.{ts,tsx}',
'!src/gql/**/*',
'!src/uniswap-data-api/**/*',
'!src/services/ammv3/queries.ts',
],
documents: ['src/**/*.{ts,tsx}', '!src/gql/**/*'],
generates: {
'./src/gql/': {
// https://the-guild.dev/graphql/codegen/plugins/presets/preset-client
Expand Down
5 changes: 1 addition & 4 deletions packages/dodoex-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dodoex/api",
"version": "3.0.1-taiko.3",
"version": "3.0.1-taiko.4",
"description": "DODO API Kit",
"source": "src/index.ts",
"types": "dist/types/index.d.ts",
Expand All @@ -17,8 +17,6 @@
"build": "rollup --config",
"schema:compile": "export $(cat .env | xargs) && env graphql-codegen",
"schema:watch": "export $(cat .env | xargs) && env graphql-codegen -w",
"graphql:schema:uniswap": "get-graphql-schema https://api.uniswap.org/v1/graphql -h Origin=https://app.uniswap.org > ./src/uniswap-data-api/schema.graphql",
"schema:compile:uniswap": "export $(cat .env | xargs) && env graphql-codegen --config ./codegen-uniswap.ts",
"prerelease": "yarn run build",
"release": "semantic-release",
"release:local": "np --any-branch --no-cleanup --no-tests",
Expand Down Expand Up @@ -94,7 +92,6 @@
"babel-plugin-macros": "^3.1.0",
"babel-runtime": "^6.26.0",
"dotenv": "^16.0.2",
"get-graphql-schema": "^2.1.2",
"jest": "^29.0.3",
"jest-environment-hardhat": "^1.1.9",
"jest-environment-jsdom": "^29.0.3",
Expand Down
8 changes: 8 additions & 0 deletions packages/dodoex-api/src/gql/gql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ const documents = {
types.FetchErc20SwapCrossChainListDocument,
'\n query FetchErc20ForecastSlippage($where: Erc20_extenderc20ExtendV2Filter) {\n erc20_extend_erc20ExtendV2(where: $where) {\n forecastSlippageList {\n forecastSlippage\n forecastValue\n confidenceRatio\n confidenceIntervalUpper\n confidenceIntervalLower\n }\n }\n }\n ':
types.FetchErc20ForecastSlippageDocument,
'\n query Ticks($where: Tick_filter, $skip: Int, $first: Int) {\n ticks(where: $where, skip: $skip, first: $first) {\n id\n poolAddress\n tickIdx\n liquidityNet\n price0\n price1\n }\n }\n':
types.TicksDocument,
'\n query FetchMiningList($where: Miningmining_list_filter) {\n mining_list(where: $where) {\n list {\n chainId\n type\n version\n address\n baseApy\n baseLpToken {\n decimals\n address: id\n symbol\n }\n baseToken {\n decimals\n address: id\n price\n symbol\n logoImg\n }\n endBlock\n miningContractAddress\n miningTotalDollar\n baseLpTokenMining\n quoteLpTokenMining\n quoteApy\n quoteLpToken {\n decimals\n address: id\n symbol\n }\n quoteToken {\n decimals\n address: id\n price\n symbol\n logoImg\n }\n rewardTokenInfos {\n apy\n decimals\n address: id\n price\n logoImg\n rewardNumIndex\n rewardPerBlock\n startBlock\n endBlock\n startTime\n endTime\n symbol\n }\n rewardQuoteTokenInfos {\n apy\n decimals\n address: id\n price\n logoImg\n rewardNumIndex\n rewardPerBlock\n startBlock\n endBlock\n startTime\n endTime\n symbol\n }\n startBlock\n title\n platform\n startTime\n endTime\n }\n totalCount\n chains\n }\n }\n ':
types.FetchMiningListDocument,
'\n query MiningList($where: Miningmining_list_filter) {\n mining_list(where: $where) {\n list {\n chainId\n type\n version\n address\n isGSP\n isNewERCMineV3\n baseApy\n baseLpToken {\n decimals\n id\n symbol\n }\n baseToken {\n decimals\n id\n price\n symbol\n logoImg\n }\n endBlock\n miningContractAddress\n miningTotalDollar\n baseLpTokenMining\n quoteLpTokenMining\n quoteApy\n quoteLpToken {\n decimals\n id\n symbol\n }\n quoteToken {\n decimals\n id\n price\n symbol\n logoImg\n }\n rewardTokenInfos {\n apy\n decimals\n id\n price\n logoImg\n rewardNumIndex\n rewardPerBlock\n startBlock\n endBlock\n startTime\n endTime\n symbol\n }\n rewardQuoteTokenInfos {\n apy\n decimals\n id\n price\n logoImg\n rewardNumIndex\n rewardPerBlock\n startBlock\n endBlock\n startTime\n endTime\n symbol\n }\n startBlock\n title\n platform\n blockNumber\n startTime\n endTime\n }\n totalCount\n chains\n }\n }\n ':
Expand Down Expand Up @@ -62,6 +64,12 @@ export function graphql(
export function graphql(
source: '\n query FetchErc20ForecastSlippage($where: Erc20_extenderc20ExtendV2Filter) {\n erc20_extend_erc20ExtendV2(where: $where) {\n forecastSlippageList {\n forecastSlippage\n forecastValue\n confidenceRatio\n confidenceIntervalUpper\n confidenceIntervalLower\n }\n }\n }\n ',
): typeof import('./graphql').FetchErc20ForecastSlippageDocument;
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(
source: '\n query Ticks($where: Tick_filter, $skip: Int, $first: Int) {\n ticks(where: $where, skip: $skip, first: $first) {\n id\n poolAddress\n tickIdx\n liquidityNet\n price0\n price1\n }\n }\n',
): typeof import('./graphql').TicksDocument;
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
Expand Down
29 changes: 29 additions & 0 deletions packages/dodoex-api/src/gql/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20391,6 +20391,23 @@ export type FetchErc20ForecastSlippageQuery = {
} | null;
};

export type TicksQueryVariables = Exact<{
where?: InputMaybe<Tick_Filter>;
skip?: InputMaybe<Scalars['Int']['input']>;
first?: InputMaybe<Scalars['Int']['input']>;
}>;

export type TicksQuery = {
ticks: Array<{
id: string;
poolAddress?: string | null;
tickIdx: any;
liquidityNet: any;
price0: any;
price1: any;
}>;
};

export type FetchMiningListQueryVariables = Exact<{
where?: InputMaybe<Miningmining_List_Filter>;
}>;
Expand Down Expand Up @@ -21183,6 +21200,18 @@ export const FetchErc20ForecastSlippageDocument = new TypedDocumentString(`
FetchErc20ForecastSlippageQuery,
FetchErc20ForecastSlippageQueryVariables
>;
export const TicksDocument = new TypedDocumentString(`
query Ticks($where: Tick_filter, $skip: Int, $first: Int) {
ticks(where: $where, skip: $skip, first: $first) {
id
poolAddress
tickIdx
liquidityNet
price0
price1
}
}
`) as unknown as TypedDocumentString<TicksQuery, TicksQueryVariables>;
export const FetchMiningListDocument = new TypedDocumentString(`
query FetchMiningList($where: Miningmining_list_filter) {
mining_list(where: $where) {
Expand Down
13 changes: 4 additions & 9 deletions packages/dodoex-api/src/helper/GraphQLRequests.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import type { TypedDocumentNode } from '@graphql-typed-document-node/core';
import crossFetch from 'cross-fetch';
import { GraphQLClient, RequestDocument, Variables } from 'graphql-request';
import type { TypedDocumentNode } from '@graphql-typed-document-node/core';
import { TypedDocumentString } from '../gql/graphql';
import { TypedDocumentString as UniswapTypedDocumentString } from '../uniswap-data-api/graphql';
import { GraphQLClientRequestHeaders } from 'graphql-request/build/esm/types';
import { TypedDocumentString } from '../gql/graphql';

type Fetch = typeof crossFetch;

Expand Down Expand Up @@ -62,9 +61,7 @@ export default class GraphQLRequests {
}

getQuery<TResult, TVariables>(
document:
| TypedDocumentString<TResult, TVariables>
| UniswapTypedDocumentString<TResult, TVariables>,
document: TypedDocumentString<TResult, TVariables>,
...[variables]: TVariables extends Record<string, never> ? [] : [TVariables]
) {
return {
Expand All @@ -86,9 +83,7 @@ export default class GraphQLRequests {
}

getInfiniteQuery<TResult, TVariables>(
document:
| TypedDocumentString<TResult, TVariables>
| UniswapTypedDocumentString<TResult, TVariables>,
document: TypedDocumentString<TResult, TVariables>,
pageKey: string,
...[variables]: TVariables extends Record<string, never> ? [] : [TVariables]
) {
Expand Down
4 changes: 2 additions & 2 deletions packages/dodoex-api/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export { setContractRequests } from '@dodoex/dodo-contract-request';
export {
ChainId,
basicTokenMap,
contractConfig,
etherTokenAddress,
platformIdMap,
} from './chainConfig';
export { setContractRequests } from '@dodoex/dodo-contract-request';

export {
ABIName,
Expand All @@ -17,7 +17,7 @@ export { default as GraphQLRequests } from './helper/GraphQLRequests';
export { default as RestApiRequests } from './helper/RestApiRequests';

export { AMMV3Api } from './services/ammv3';
export type { TickData, Ticks, UniswapGraphqlChainId } from './services/ammv3';
export type { TickData, Ticks } from './services/ammv3';
export {
PMMHelper,
PMMModel,
Expand Down
7 changes: 2 additions & 5 deletions packages/dodoex-api/src/services/ammv3/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { AllV3TicksQuery } from '../../uniswap-data-api/graphql';
import { TicksQuery } from '../../gql/graphql';

export type { Chain as UniswapGraphqlChainId } from '../../uniswap-data-api/graphql';
export { AMMV3Api } from './AMMV3Api';

export type Ticks = NonNullable<
NonNullable<AllV3TicksQuery['v3Pool']>['ticks']
>;
export type Ticks = NonNullable<TicksQuery['ticks']>;
export type TickData = Ticks[number];
18 changes: 9 additions & 9 deletions packages/dodoex-api/src/services/ammv3/queries.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { graphql } from '../../uniswap-data-api/gql';
import { graphql } from '../../gql';

export const AllV3TicksDocument = graphql(/* GraphQL */ `
query AllV3Ticks($chain: Chain!, $address: String!, $skip: Int, $first: Int) {
v3Pool(chain: $chain, address: $address) {
ticks(skip: $skip, first: $first) {
tick: tickIdx
liquidityNet
price0
price1
}
query Ticks($where: Tick_filter, $skip: Int, $first: Int) {
ticks(where: $where, skip: $skip, first: $first) {
id
poolAddress
tickIdx
liquidityNet
price0
price1
}
}
`);
79 changes: 0 additions & 79 deletions packages/dodoex-api/src/uniswap-data-api/fragment-masking.ts

This file was deleted.

28 changes: 0 additions & 28 deletions packages/dodoex-api/src/uniswap-data-api/gql.ts

This file was deleted.

Loading

0 comments on commit c0ead38

Please sign in to comment.