diff --git a/package.json b/package.json index bb8bac5..cdfa0f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.10-rc23", + "version": "0.20.10-rc24", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/Orion/index.ts b/src/Orion/index.ts index b2a6b44..649b293 100644 --- a/src/Orion/index.ts +++ b/src/Orion/index.ts @@ -58,8 +58,8 @@ export default class Orion { priceFeed: { api: networkConfig.api + networkConfig.services.priceFeed.all, }, - integrator: { - api: networkConfig.api + networkConfig.services.integrator.http, + indexer: { + api: networkConfig.api + networkConfig.services.indexer.http, } }, }; diff --git a/src/Unit/index.ts b/src/Unit/index.ts index 5fd9e87..d79200e 100644 --- a/src/Unit/index.ts +++ b/src/Unit/index.ts @@ -11,7 +11,7 @@ import Exchange from './Exchange/index.js'; import FarmingManager from './FarmingManager/index.js'; import { chains, envs } from '../config/index.js'; import type { networkCodes } from '../constants/index.js'; -import { IntegratorService } from '../services/Integrator/index.js'; +import { IndexerService } from '../services/Indexer/index.js'; type KnownConfig = { env: KnownEnv @@ -27,7 +27,7 @@ export default class Unit { public readonly blockchainService: BlockchainService; - public readonly integrator: IntegratorService; + public readonly indexer: IndexerService; public readonly aggregator: Aggregator; @@ -85,8 +85,8 @@ export default class Unit { priceFeed: { api: networkConfig.api + networkConfig.services.priceFeed.all, }, - integrator: { - api: networkConfig.api + networkConfig.services.integrator.http, + indexer: { + api: networkConfig.api + networkConfig.services.indexer.http, }, }, }; @@ -109,8 +109,8 @@ export default class Unit { this.config.services.blockchainService.http, this.config.basicAuth ); - this.integrator = new IntegratorService( - this.config.services.integrator.api, + this.indexer = new IndexerService( + this.config.services.indexer.api, intNetwork ); this.aggregator = new Aggregator( diff --git a/src/__tests__/basic.test.ts b/src/__tests__/basic.test.ts index 7967396..d4de381 100644 --- a/src/__tests__/basic.test.ts +++ b/src/__tests__/basic.test.ts @@ -177,7 +177,7 @@ describe('Orion', () => { priceFeed: { api: orionPriceFeedAPI + '/price-feed', }, - integrator: { + indexer: { api: '', } }, diff --git a/src/config/envs.json b/src/config/envs.json index 8359aa9..be254cf 100644 --- a/src/config/envs.json +++ b/src/config/envs.json @@ -16,8 +16,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } }, "liquidityMigratorAddress": "0x23a1820a47BcD022E29f6058a5FD224242F50D1A" @@ -35,8 +35,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -53,8 +53,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -71,8 +71,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -89,8 +89,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } } @@ -113,8 +113,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } }, "liquidityMigratorAddress": "0x01b10dds12478C88A5E18e2707E729906bC25CfF6" @@ -132,8 +132,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -150,8 +150,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -168,8 +168,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -186,8 +186,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -204,8 +204,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } } @@ -228,8 +228,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -246,8 +246,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -264,8 +264,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -282,8 +282,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -300,8 +300,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } } @@ -324,8 +324,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -342,8 +342,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } } @@ -366,8 +366,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } }, "liquidityMigratorAddress": "0x23a1820a47BcD022E29f6058a5FD224242F50D1A" @@ -385,8 +385,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -403,8 +403,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -421,8 +421,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } }, @@ -439,8 +439,8 @@ "priceFeed": { "all": "/price-feed" }, - "integrator": { - "http": "/orion-integrator/" + "indexer": { + "http": "/orion-indexer/" } } } diff --git a/src/config/schemas/pureEnvSchema.ts b/src/config/schemas/pureEnvSchema.ts index 854e9f4..ca5bb3e 100644 --- a/src/config/schemas/pureEnvSchema.ts +++ b/src/config/schemas/pureEnvSchema.ts @@ -14,7 +14,7 @@ export const pureEnvNetworksSchema = z.object({ priceFeed: z.object({ all: z.string(), }), - integrator: z.object({ + indexer: z.object({ http: z.string(), }), }), diff --git a/src/services/Integrator/constants.ts b/src/services/Indexer/constants.ts similarity index 100% rename from src/services/Integrator/constants.ts rename to src/services/Indexer/constants.ts diff --git a/src/services/Integrator/index.ts b/src/services/Indexer/index.ts similarity index 99% rename from src/services/Integrator/index.ts rename to src/services/Indexer/index.ts index d205261..23eaaa8 100644 --- a/src/services/Integrator/index.ts +++ b/src/services/Indexer/index.ts @@ -71,7 +71,7 @@ type Payload = | ListAmountPayload | GetAmountByORNPayload; -class IntegratorService { +class IndexerService { private readonly apiUrl: string; private readonly chainId: number; @@ -261,4 +261,4 @@ class IntegratorService { } export * as schemas from './schemas/index.js'; -export { IntegratorService }; +export { IndexerService }; diff --git a/src/services/Integrator/schemas/basic-pool-info-schema.ts b/src/services/Indexer/schemas/basic-pool-info-schema.ts similarity index 100% rename from src/services/Integrator/schemas/basic-pool-info-schema.ts rename to src/services/Indexer/schemas/basic-pool-info-schema.ts diff --git a/src/services/Integrator/schemas/environment-response-schema.ts b/src/services/Indexer/schemas/environment-response-schema.ts similarity index 100% rename from src/services/Integrator/schemas/environment-response-schema.ts rename to src/services/Indexer/schemas/environment-response-schema.ts diff --git a/src/services/Integrator/schemas/get-pool-response-schema.ts b/src/services/Indexer/schemas/get-pool-response-schema.ts similarity index 100% rename from src/services/Integrator/schemas/get-pool-response-schema.ts rename to src/services/Indexer/schemas/get-pool-response-schema.ts diff --git a/src/services/Integrator/schemas/index.ts b/src/services/Indexer/schemas/index.ts similarity index 100% rename from src/services/Integrator/schemas/index.ts rename to src/services/Indexer/schemas/index.ts diff --git a/src/services/Integrator/schemas/info-schema.ts b/src/services/Indexer/schemas/info-schema.ts similarity index 100% rename from src/services/Integrator/schemas/info-schema.ts rename to src/services/Indexer/schemas/info-schema.ts diff --git a/src/services/Integrator/schemas/list-amount-schema.ts b/src/services/Indexer/schemas/list-amount-schema.ts similarity index 100% rename from src/services/Integrator/schemas/list-amount-schema.ts rename to src/services/Indexer/schemas/list-amount-schema.ts diff --git a/src/services/Integrator/schemas/list-nft-order-response-schema.ts b/src/services/Indexer/schemas/list-nft-order-response-schema.ts similarity index 100% rename from src/services/Integrator/schemas/list-nft-order-response-schema.ts rename to src/services/Indexer/schemas/list-nft-order-response-schema.ts diff --git a/src/services/Integrator/schemas/list-pool-schema.ts b/src/services/Indexer/schemas/list-pool-schema.ts similarity index 100% rename from src/services/Integrator/schemas/list-pool-schema.ts rename to src/services/Indexer/schemas/list-pool-schema.ts diff --git a/src/services/Integrator/schemas/list-pool-v2-response-schema.ts b/src/services/Indexer/schemas/list-pool-v2-response-schema.ts similarity index 100% rename from src/services/Integrator/schemas/list-pool-v2-response-schema.ts rename to src/services/Indexer/schemas/list-pool-v2-response-schema.ts diff --git a/src/services/Integrator/schemas/list-pool-v3-response-schema.ts b/src/services/Indexer/schemas/list-pool-v3-response-schema.ts similarity index 100% rename from src/services/Integrator/schemas/list-pool-v3-response-schema.ts rename to src/services/Indexer/schemas/list-pool-v3-response-schema.ts diff --git a/src/services/Integrator/schemas/pool-schema.ts b/src/services/Indexer/schemas/pool-schema.ts similarity index 100% rename from src/services/Integrator/schemas/pool-schema.ts rename to src/services/Indexer/schemas/pool-schema.ts diff --git a/src/services/Integrator/schemas/pool-v2-info-schema.ts b/src/services/Indexer/schemas/pool-v2-info-schema.ts similarity index 100% rename from src/services/Integrator/schemas/pool-v2-info-schema.ts rename to src/services/Indexer/schemas/pool-v2-info-schema.ts diff --git a/src/services/Integrator/schemas/test-incrementor-schema.ts b/src/services/Indexer/schemas/test-incrementor-schema.ts similarity index 100% rename from src/services/Integrator/schemas/test-incrementor-schema.ts rename to src/services/Indexer/schemas/test-incrementor-schema.ts diff --git a/src/services/Integrator/schemas/util-schemas.ts b/src/services/Indexer/schemas/util-schemas.ts similarity index 100% rename from src/services/Integrator/schemas/util-schemas.ts rename to src/services/Indexer/schemas/util-schemas.ts diff --git a/src/services/Integrator/schemas/veORN-info-schema.ts b/src/services/Indexer/schemas/veORN-info-schema.ts similarity index 100% rename from src/services/Integrator/schemas/veORN-info-schema.ts rename to src/services/Indexer/schemas/veORN-info-schema.ts diff --git a/src/services/Integrator/schemas/voting-info-schema.ts b/src/services/Indexer/schemas/voting-info-schema.ts similarity index 100% rename from src/services/Integrator/schemas/voting-info-schema.ts rename to src/services/Indexer/schemas/voting-info-schema.ts diff --git a/src/services/index.ts b/src/services/index.ts index 7d35c9e..ca04ebd 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -2,4 +2,4 @@ export * as aggregator from './Aggregator/index.js'; export * as blockchainService from './BlockchainService/index.js'; export * as priceFeed from './PriceFeed/index.js'; export * as referralSystem from './ReferralSystem/index.js'; -export * as integrator from './Integrator/index.js'; +export * as indexer from './Indexer/index.js'; diff --git a/src/types.ts b/src/types.ts index a528108..ecc3568 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ -import factories from './constants/factories.js'; +import type factories from './constants/factories.js'; import type { BigNumber } from 'bignumber.js'; import type subOrderStatuses from './constants/subOrderStatuses.js'; import type positionStatuses from './constants/positionStatuses.js'; @@ -253,7 +253,7 @@ export type VerboseUnitConfig = { // http://10.23.5.11:3003/, // https://price-feed:3003/ } - integrator: { + indexer: { api: string // For example: // http://localhost:3004/,