From 093bb7b113b7272b99863d12ed7c761744a131fd Mon Sep 17 00:00:00 2001 From: Demid Date: Mon, 1 May 2023 04:39:31 +0300 Subject: [PATCH 1/6] Updated referral methods and schemas --- src/services/ReferralSystem/index.ts | 23 ++++++----- .../schemas/aggregatedHistorySchema.ts | 38 +++++++++++-------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/services/ReferralSystem/index.ts b/src/services/ReferralSystem/index.ts index 41061bc..3572fe5 100644 --- a/src/services/ReferralSystem/index.ts +++ b/src/services/ReferralSystem/index.ts @@ -1,4 +1,4 @@ -import { fetchWithValidation } from 'simple-typed-fetch'; +import {fetchWithValidation} from 'simple-typed-fetch'; import { errorSchema, miniStatsSchema, @@ -11,6 +11,7 @@ import { claimInfoSchema, aggregatedHistorySchema, } from './schemas/index.js'; +import {SupportedChainId} from "../../types.js"; type CreateLinkPayloadType = { referer: string @@ -127,7 +128,7 @@ class ReferralSystem { 'Content-type': 'application/json', }, method: 'POST', - body: JSON.stringify({ payload, signature }), + body: JSON.stringify({payload, signature}), } ); @@ -140,7 +141,7 @@ class ReferralSystem { 'Content-type': 'application/json', }, method: 'POST', - body: JSON.stringify({ payload, signature }), + body: JSON.stringify({payload, signature}), }); subscribeToReferral = ( @@ -155,19 +156,17 @@ class ReferralSystem { 'Content-type': 'application/json', }, method: 'POST', - body: JSON.stringify({ payload, signature }), + body: JSON.stringify({payload, signature}), }, errorSchema ); - getRating = (refererAddress: string) => + getRating = (refererAddress: string | undefined, chainId: SupportedChainId) => fetchWithValidation( - `${this.apiUrl}/referer/ve/rating-table-leaderboard`, + `${this.apiUrl}/referer/ve/rating-table-leaderboard?chain_id=${chainId}`, ratingSchema, { - headers: { - 'referer-address': refererAddress, - }, + headers: refererAddress !== undefined ? { 'referer-address': refererAddress } : {}, }, errorSchema ); @@ -184,9 +183,9 @@ class ReferralSystem { errorSchema ); - getAggregatedHistory = (refererAddress: string) => + getAggregatedHistory = (refererAddress: string, chainId: SupportedChainId, itemPerPage: number, page: number) => fetchWithValidation( - `${this.apiUrl}/referer/view/aggregated-history`, + `${this.apiUrl}/referer/view/aggregated-history?chain_id=${chainId}&n_per_page=${itemPerPage}&page=${page}`, aggregatedHistorySchema, { headers: { @@ -198,4 +197,4 @@ class ReferralSystem { } export * as schemas from './schemas/index.js'; -export { ReferralSystem }; +export {ReferralSystem}; diff --git a/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts b/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts index 648e2d9..8a94b6e 100644 --- a/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts +++ b/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts @@ -1,20 +1,26 @@ import { z } from 'zod'; -const aggregatedHistorySchema = z.array(z.object({ - history_type: z.object({ - RewardDistribution: z.string() - }), - chain_type: z.string(), - chain_comp: z.string(), - date_unix: z.number(), - date_time_local: z.string(), - date_time_utc: z.string(), - amount_orn: z.string(), - amount_orn_fmt: z.number(), - amount_usd: z.string(), - amount_usd_fmt: z.number(), - orn_price: z.string(), - orn_price_fmt: z.number() -})) +const aggregatedHistorySchema = z.object({ + data: z.array(z.object({ + history_type: z.object({ + RewardDistribution: z.string() + }), + chain_type: z.string(), + chain_comp: z.string(), + date_unix: z.number(), + date_time_local: z.string(), + date_time_utc: z.string(), + amount_orn: z.string(), + amount_orn_fmt: z.number(), + amount_usd: z.string(), + amount_usd_fmt: z.number(), + orn_price: z.string(), + orn_price_fmt: z.number() + })), + pagination_info: z.object({ + c_page: z.number(), + t_pages: z.number() + }) +}) export default aggregatedHistorySchema; From d417031c143303e1ca7bd113ca2a191c8e3bd88d Mon Sep 17 00:00:00 2001 From: Demid Date: Tue, 2 May 2023 12:23:09 +0300 Subject: [PATCH 2/6] Updated referral methods / schemas --- package-lock.json | 4 +-- package.json | 2 +- src/services/ReferralSystem/index.ts | 27 ++++++++++++++----- .../schemas/aggregatedHistorySchema.ts | 5 ++-- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index df2341c..afb175d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.22", + "version": "0.18.21-rc0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.18.22", + "version": "0.18.21-rc0", "license": "ISC", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index 23b7097..d189807 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.22", + "version": "0.18.21-rc0", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/ReferralSystem/index.ts b/src/services/ReferralSystem/index.ts index 3572fe5..356e82d 100644 --- a/src/services/ReferralSystem/index.ts +++ b/src/services/ReferralSystem/index.ts @@ -65,9 +65,9 @@ class ReferralSystem { }); getMyReferral = (myWalletAddress: string) => - fetchWithValidation(`${this.apiUrl}/referral/view/link`, linkSchema, { + fetchWithValidation(`${this.apiUrl}/referer/view/link`, linkSchema, { headers: { - referral: myWalletAddress, + 'referer-address': myWalletAddress, }, }); @@ -166,14 +166,14 @@ class ReferralSystem { `${this.apiUrl}/referer/ve/rating-table-leaderboard?chain_id=${chainId}`, ratingSchema, { - headers: refererAddress !== undefined ? { 'referer-address': refererAddress } : {}, + headers: refererAddress !== undefined ? {'referer-address': refererAddress} : {}, }, errorSchema ); getClamInfo = (refererAddress: string) => fetchWithValidation( - `${this.apiUrl}/referer/view/claim-info-with-stats`, + `${this.apiUrl}/referer/view/claim-info-with-stats?&suppress_error=1`, claimInfoSchema, { headers: { @@ -183,9 +183,21 @@ class ReferralSystem { errorSchema ); - getAggregatedHistory = (refererAddress: string, chainId: SupportedChainId, itemPerPage: number, page: number) => - fetchWithValidation( - `${this.apiUrl}/referer/view/aggregated-history?chain_id=${chainId}&n_per_page=${itemPerPage}&page=${page}`, + getAggregatedHistory = (refererAddress: string, chainId: SupportedChainId | undefined, itemPerPage: number, page: number) => { + const queryParams: Record = { + n_per_page: itemPerPage, + page, + suppress_error: 1 + }; + + if (chainId !== undefined) { + queryParams['chain_id'] = chainId; + } + + const queryString = Object.entries(queryParams).map(([k, v]) => `${k}=${v}`).join('&') + + return fetchWithValidation( + `${this.apiUrl}/referer/view/aggregated-history?${queryString}`, aggregatedHistorySchema, { headers: { @@ -194,6 +206,7 @@ class ReferralSystem { }, errorSchema ); + } } export * as schemas from './schemas/index.js'; diff --git a/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts b/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts index 8a94b6e..c4d143e 100644 --- a/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts +++ b/src/services/ReferralSystem/schemas/aggregatedHistorySchema.ts @@ -2,11 +2,10 @@ import { z } from 'zod'; const aggregatedHistorySchema = z.object({ data: z.array(z.object({ - history_type: z.object({ - RewardDistribution: z.string() - }), + history_type: z.string(), chain_type: z.string(), chain_comp: z.string(), + chain_id: z.number(), date_unix: z.number(), date_time_local: z.string(), date_time_utc: z.string(), From a8f065ff5eac99467255ad694f182291c7185952 Mon Sep 17 00:00:00 2001 From: Demid Date: Tue, 2 May 2023 12:30:00 +0300 Subject: [PATCH 3/6] updated 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 afb175d..2a920cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc0", + "version": "0.18.21-rc1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc0", + "version": "0.18.21-rc1", "license": "ISC", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index d189807..8a66ebe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc0", + "version": "0.18.21-rc1", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", From 3d915b7f666d9df6088b8941f5b13a44834167ed Mon Sep 17 00:00:00 2001 From: Demid Date: Wed, 3 May 2023 00:26:08 +0300 Subject: [PATCH 4/6] referral history search update --- package-lock.json | 4 ++-- package.json | 2 +- src/services/ReferralSystem/index.ts | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a920cc..f5e96f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc1", + "version": "0.18.21-rc2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc1", + "version": "0.18.21-rc2", "license": "ISC", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index 8a66ebe..fc7f7de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc1", + "version": "0.18.21-rc2", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/ReferralSystem/index.ts b/src/services/ReferralSystem/index.ts index 356e82d..cc6a14e 100644 --- a/src/services/ReferralSystem/index.ts +++ b/src/services/ReferralSystem/index.ts @@ -65,9 +65,9 @@ class ReferralSystem { }); getMyReferral = (myWalletAddress: string) => - fetchWithValidation(`${this.apiUrl}/referer/view/link`, linkSchema, { + fetchWithValidation(`${this.apiUrl}/referral/view/link`, linkSchema, { headers: { - 'referer-address': myWalletAddress, + referral: myWalletAddress, }, }); @@ -183,7 +183,13 @@ class ReferralSystem { errorSchema ); - getAggregatedHistory = (refererAddress: string, chainId: SupportedChainId | undefined, itemPerPage: number, page: number) => { + getAggregatedHistory = ( + refererAddress: string, + chainId: SupportedChainId | undefined, + types: string[] | undefined, + itemPerPage: number, + page: number + ) => { const queryParams: Record = { n_per_page: itemPerPage, page, @@ -194,6 +200,10 @@ class ReferralSystem { queryParams['chain_id'] = chainId; } + if (types !== undefined) { + queryParams['history_filter'] = encodeURIComponent(types.join(',')); + } + const queryString = Object.entries(queryParams).map(([k, v]) => `${k}=${v}`).join('&') return fetchWithValidation( From b8fcce15e9c3df9d57658d8fdb8e2263c60275fc Mon Sep 17 00:00:00 2001 From: Demid Date: Wed, 3 May 2023 00:40:46 +0300 Subject: [PATCH 5/6] version up --- 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 f5e96f5..bb458c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc2", + "version": "0.18.21-rc3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc2", + "version": "0.18.21-rc3", "license": "ISC", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index fc7f7de..c4e7894 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc2", + "version": "0.18.21-rc3", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", From 29d8aafc5f3b4b51e2e134c9ec456adfb7f28777 Mon Sep 17 00:00:00 2001 From: Demid Date: Mon, 8 May 2023 08:33:16 +0300 Subject: [PATCH 6/6] Version up, removed rc --- 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 bb458c8..a95fb75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc3", + "version": "0.18.23", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc3", + "version": "0.18.23", "license": "ISC", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index c4e7894..0502fc5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.21-rc3", + "version": "0.18.23", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js",