From fab7417e02ecb8e1b1441a1848026ae2134b3bc7 Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Tue, 30 Jan 2024 11:57:27 +0300 Subject: [PATCH 1/4] update referral link schema --- package-lock.json | 4 ++-- package.json | 2 +- src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts | 2 +- src/services/ReferralSystem/schemas/linkSchema.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01ec2eb..f2708ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.45", + "version": "0.20.50", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.20.45", + "version": "0.20.50", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 19d7b15..ab6bd22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.49", + "version": "0.20.50", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts b/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts index 248ff96..468d773 100644 --- a/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts +++ b/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts @@ -3,8 +3,8 @@ import { z } from 'zod'; const inviteCodeLinkSchema = z.object({ link: z .object({ + status: z.string(), referer: z.string(), - ref_link: z.string(), }) .nullable(), invite: z diff --git a/src/services/ReferralSystem/schemas/linkSchema.ts b/src/services/ReferralSystem/schemas/linkSchema.ts index 20545f2..f9d3a4c 100644 --- a/src/services/ReferralSystem/schemas/linkSchema.ts +++ b/src/services/ReferralSystem/schemas/linkSchema.ts @@ -1,8 +1,8 @@ import { z } from 'zod'; const linkSchema = z.object({ + status: z.string(), referer: z.string(), - ref_link: z.string(), }); export default linkSchema; From 85963892cb8769efc08f67800f1d26b741451b1f Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Tue, 30 Jan 2024 12:13:44 +0300 Subject: [PATCH 2/4] fix: invite code link schema --- package-lock.json | 4 ++-- package.json | 2 +- src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2708ec..6aabaf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.50", + "version": "0.20.51", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.20.50", + "version": "0.20.51", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index ab6bd22..8958aad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.50", + "version": "0.20.51", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts b/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts index 468d773..248ff96 100644 --- a/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts +++ b/src/services/ReferralSystem/schemas/inviteCodeLinkSchema.ts @@ -3,8 +3,8 @@ import { z } from 'zod'; const inviteCodeLinkSchema = z.object({ link: z .object({ - status: z.string(), referer: z.string(), + ref_link: z.string(), }) .nullable(), invite: z From c597fa0805be4391a239838db16c453961e5d8b6 Mon Sep 17 00:00:00 2001 From: Mikhail Gladchenko Date: Fri, 2 Feb 2024 07:39:02 +0000 Subject: [PATCH 3/4] Make Indexer optional (#231) * feature: added new Thena exchange and indexer was made optional * fix: updated indexer types * Update package.json * fix: updated indexer types * fix: updated indexer types * fix: updated indexer types --------- Co-authored-by: TheJuze --- package-lock.json | 4 ++-- package.json | 2 +- src/Orion/index.ts | 2 +- src/Unit/index.ts | 24 +++++++++++++----------- src/config/schemas/pureEnvSchema.ts | 2 +- src/types.ts | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6aabaf4..3dc62e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.51", + "version": "0.20.36-rc103", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.20.51", + "version": "0.20.36-rc103", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 8958aad..a40345b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.51", + "version": "0.20.36-rc103", "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 649b293..02ccd5c 100644 --- a/src/Orion/index.ts +++ b/src/Orion/index.ts @@ -59,7 +59,7 @@ export default class Orion { api: networkConfig.api + networkConfig.services.priceFeed.all, }, indexer: { - api: networkConfig.api + networkConfig.services.indexer.http, + api: networkConfig.api + networkConfig.services.indexer?.http, } }, }; diff --git a/src/Unit/index.ts b/src/Unit/index.ts index c77bf1c..33badc5 100644 --- a/src/Unit/index.ts +++ b/src/Unit/index.ts @@ -1,16 +1,16 @@ import { JsonRpcProvider } from 'ethers'; -import { Aggregator } from '../services/Aggregator/index.js'; -import { BlockchainService } from '../services/BlockchainService/index.js'; -import { PriceFeed } from '../services/PriceFeed/index.js'; +import { Aggregator } from '../services/Aggregator'; +import { BlockchainService } from '../services/BlockchainService'; +import { PriceFeed } from '../services/PriceFeed'; import type { KnownEnv, SupportedChainId, VerboseUnitConfig, } from '../types.js'; import Exchange from './Exchange/index.js'; -import { chains, envs } from '../config/index.js'; +import { chains, envs } from '../config'; import type { networkCodes } from '../constants/index.js'; -import { IndexerService } from '../services/Indexer/index.js'; +import { IndexerService } from '../services/Indexer'; type KnownConfig = { env: KnownEnv @@ -26,7 +26,7 @@ export default class Unit { public readonly blockchainService: BlockchainService; - public readonly indexer: IndexerService; + public readonly indexer: IndexerService | undefined; public readonly aggregator: Aggregator; @@ -83,7 +83,7 @@ export default class Unit { api: networkConfig.api + networkConfig.services.priceFeed.all, }, indexer: { - api: networkConfig.api + networkConfig.services.indexer.http, + api: networkConfig.api + networkConfig.services.indexer?.http, }, }, }; @@ -106,10 +106,12 @@ export default class Unit { this.config.services.blockchainService.http, this.config.basicAuth ); - this.indexer = new IndexerService( - this.config.services.indexer.api, - intNetwork - ); + this.indexer = this.config.services.indexer + ? new IndexerService( + this.config.services.indexer.api, + intNetwork + ) + : undefined; this.aggregator = new Aggregator( this.config.services.aggregator.http, this.config.services.aggregator.ws, diff --git a/src/config/schemas/pureEnvSchema.ts b/src/config/schemas/pureEnvSchema.ts index ca5bb3e..642dd0b 100644 --- a/src/config/schemas/pureEnvSchema.ts +++ b/src/config/schemas/pureEnvSchema.ts @@ -16,7 +16,7 @@ export const pureEnvNetworksSchema = z.object({ }), indexer: z.object({ http: z.string(), - }), + }).optional(), }), rpc: z.string().optional(), liquidityMigratorAddress: z.string().optional(), diff --git a/src/types.ts b/src/types.ts index dcc0324..b5f0330 100644 --- a/src/types.ts +++ b/src/types.ts @@ -262,12 +262,12 @@ export type VerboseUnitConfig = { // http://10.23.5.11:3003/, // https://price-feed:3003/ } - indexer: { + indexer?: { api: string // For example: // http://localhost:3004/, // http:// - } + } | undefined } basicAuth?: BasicAuthCredentials } From 384b581a0f0cb06d614c0cb6e0a685554ecaf648 Mon Sep 17 00:00:00 2001 From: TheJuze Date: Fri, 2 Feb 2024 10:39:53 +0300 Subject: [PATCH 4/4] bump version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3dc62e5..cb5fa69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.36-rc103", + "version": "0.20.52", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.20.36-rc103", + "version": "0.20.52", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index a40345b..c190ffc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.36-rc103", + "version": "0.20.52", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js",