From 1e75d48bbd5890f9b8fe5d1fa73fe6f07a6a817b Mon Sep 17 00:00:00 2001 From: AlexandruPislariu Date: Mon, 27 Sep 2021 12:46:06 +0300 Subject: [PATCH 1/7] show website,twitter and location for identity --- src/endpoints/identities/entities/identity.detailed.ts | 2 +- src/endpoints/identities/entities/identity.ts | 9 +++++++++ src/endpoints/identities/identities.service.ts | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/endpoints/identities/entities/identity.detailed.ts b/src/endpoints/identities/entities/identity.detailed.ts index 084eb6c39..968203b3b 100644 --- a/src/endpoints/identities/entities/identity.detailed.ts +++ b/src/endpoints/identities/entities/identity.detailed.ts @@ -2,5 +2,5 @@ import { KeybaseIdentity } from "src/common/entities/keybase.identity"; import { Node } from "src/endpoints/nodes/entities/node"; export class IdentityDetailed extends KeybaseIdentity { - nodes?: Node[] = []; + nodes?: Node[]; } \ No newline at end of file diff --git a/src/endpoints/identities/entities/identity.ts b/src/endpoints/identities/entities/identity.ts index e6b1213e5..f6577a44f 100644 --- a/src/endpoints/identities/entities/identity.ts +++ b/src/endpoints/identities/entities/identity.ts @@ -13,6 +13,15 @@ export class Identity { @ApiProperty() avatar?: string; + @ApiProperty() + website?: string; + + @ApiProperty() + twitter?: string; + + @ApiProperty() + location?: string; + @ApiProperty() score?: number; diff --git a/src/endpoints/identities/identities.service.ts b/src/endpoints/identities/identities.service.ts index d180ad83c..d77fb766d 100644 --- a/src/endpoints/identities/identities.service.ts +++ b/src/endpoints/identities/identities.service.ts @@ -189,6 +189,9 @@ export class IdentitiesService { identity.avatar = identityDetailed.avatar; identity.description = identityDetailed.description; identity.name = identityDetailed.name; + identity.website = identityDetailed.website; + identity.twitter = identityDetailed.twitter; + identity.location = identityDetailed.location; const stakeInfo = this.getStakeInfoForIdentity(identityDetailed, BigInt(parseInt(totalLocked))); identity.score = stakeInfo.score ; From 2f6a013f44468cf86c64ce1a88269286fa922616 Mon Sep 17 00:00:00 2001 From: AlexandruPislariu Date: Mon, 27 Sep 2021 13:29:04 +0300 Subject: [PATCH 2/7] for instead of forEach --- src/endpoints/identities/identities.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/endpoints/identities/identities.service.ts b/src/endpoints/identities/identities.service.ts index d77fb766d..de11cda58 100644 --- a/src/endpoints/identities/identities.service.ts +++ b/src/endpoints/identities/identities.service.ts @@ -163,8 +163,8 @@ export class IdentitiesService { } } - nodes.forEach((node) => { - const found = identitiesDetailed.find((identityDetailed) => identityDetailed.identity === node.identity); + for (let node of nodes) { + const found = identitiesDetailed.find((identityDetailed) => identityDetailed.identity == node.identity); if (found && node.identity && !!node.identity) { if (!found.nodes) { @@ -178,7 +178,7 @@ export class IdentitiesService { identityDetailed.nodes = [node]; identitiesDetailed.push(identityDetailed); } - }); + }; const { locked: totalLocked } = this.computeTotalStakeAndTopUp(nodes); From 7a781f62b37d718f57cc4efce28a17bf6c6b253d Mon Sep 17 00:00:00 2001 From: AlexandruPislariu Date: Mon, 27 Sep 2021 14:18:00 +0300 Subject: [PATCH 3/7] set node identity based on provider --- src/endpoints/nodes/node.service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/endpoints/nodes/node.service.ts b/src/endpoints/nodes/node.service.ts index 0974dd420..39b7b7ab3 100644 --- a/src/endpoints/nodes/node.service.ts +++ b/src/endpoints/nodes/node.service.ts @@ -230,6 +230,10 @@ export class NodeService { if (provider) { node.provider = provider.provider; node.owner = provider.owner ?? ''; + + if (provider.identity) { + node.identity = provider.identity; + } } } } From 058fd819061faf650b89324a352f11705cbe695b Mon Sep 17 00:00:00 2001 From: AlexandruPislariu Date: Mon, 27 Sep 2021 14:30:39 +0300 Subject: [PATCH 4/7] remove node identity check --- src/test/integration/nodes.e2e-spec.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/integration/nodes.e2e-spec.ts b/src/test/integration/nodes.e2e-spec.ts index 0eb932e58..c806abf70 100644 --- a/src/test/integration/nodes.e2e-spec.ts +++ b/src/test/integration/nodes.e2e-spec.ts @@ -49,9 +49,6 @@ describe('Node Service', () => { if (nodeKeybases[node.bls] && nodeKeybases[node.bls].confirmed) { expect(node.identity).toStrictEqual(nodeKeybases[node.bls].identity); } - else { - expect(node.identity).toBeUndefined(); - } } } }); From 5a70834338e54f1578039ba65c3e342d3684f4fc Mon Sep 17 00:00:00 2001 From: AlexandruPislariu Date: Mon, 27 Sep 2021 15:12:04 +0300 Subject: [PATCH 5/7] remove sync with keybase confirmations check --- src/test/integration/nodes.e2e-spec.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/integration/nodes.e2e-spec.ts b/src/test/integration/nodes.e2e-spec.ts index c806abf70..cdc9e1042 100644 --- a/src/test/integration/nodes.e2e-spec.ts +++ b/src/test/integration/nodes.e2e-spec.ts @@ -40,18 +40,18 @@ describe('Node Service', () => { } }); - it('should be in sync with keybase confirmations', async () => { - const nodeKeybases:{ [key: string]: KeybaseState } | undefined = await cachingService.getCache('nodeKeybases'); - expect(nodeKeybases).toBeDefined(); - - if(nodeKeybases) { - for (let node of nodes) { - if (nodeKeybases[node.bls] && nodeKeybases[node.bls].confirmed) { - expect(node.identity).toStrictEqual(nodeKeybases[node.bls].identity); - } - } - } - }); + // it('should be in sync with keybase confirmations', async () => { + // const nodeKeybases:{ [key: string]: KeybaseState } | undefined = await cachingService.getCache('nodeKeybases'); + // expect(nodeKeybases).toBeDefined(); + + // if(nodeKeybases) { + // for (let node of nodes) { + // if (nodeKeybases[node.bls] && nodeKeybases[node.bls].confirmed) { + // expect(node.identity).toStrictEqual(nodeKeybases[node.bls].identity); + // } + // } + // } + // }); it('should be filtered by bls, name or version', async () => { const nodeFilter: NodeFilter = new NodeFilter(); From 4027ab201889f821d7628e24030133a2d3919f19 Mon Sep 17 00:00:00 2001 From: AlexandruPislariu Date: Mon, 27 Sep 2021 15:19:34 +0300 Subject: [PATCH 6/7] unused variables --- config/config.mainnet.yaml | 6 +++--- src/test/integration/nodes.e2e-spec.ts | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/config.mainnet.yaml b/config/config.mainnet.yaml index 39797342b..69e445407 100644 --- a/config/config.mainnet.yaml +++ b/config/config.mainnet.yaml @@ -5,9 +5,9 @@ api: public: true private: true cron: - transactionProcessor: true + transactionProcessor: false transactionProcessorMaxLookBehind: 1000 - cacheWarmer: true + cacheWarmer: false urls: api: - 'https://api.elrond.com' @@ -45,4 +45,4 @@ inflation: - 719203 security: admins: - jwtSecret: \ No newline at end of file + jwtSecret: diff --git a/src/test/integration/nodes.e2e-spec.ts b/src/test/integration/nodes.e2e-spec.ts index cdc9e1042..9b9c77b9b 100644 --- a/src/test/integration/nodes.e2e-spec.ts +++ b/src/test/integration/nodes.e2e-spec.ts @@ -1,6 +1,4 @@ import { Test } from "@nestjs/testing"; -import { CachingService } from "src/common/caching.service"; -import { KeybaseState } from "src/common/entities/keybase.state"; import { Node } from "src/endpoints/nodes/entities/node"; import { NodeFilter } from "src/endpoints/nodes/entities/node.filter"; import { NodeSort } from "src/endpoints/nodes/entities/node.sort"; @@ -13,7 +11,6 @@ import Initializer from "./e2e-init"; describe('Node Service', () => { let nodeService: NodeService; - let cachingService: CachingService; let nodes: Node[]; let nodeSentinel: Node; @@ -27,7 +24,6 @@ describe('Node Service', () => { }).compile(); nodeService = publicAppModule.get(NodeService); - cachingService = publicAppModule.get(CachingService); nodes = await nodeService.getAllNodes(); nodeSentinel = nodes[0]; }); From 88331062c15dd695fc95aeb45c15871ef4dc4a5a Mon Sep 17 00:00:00 2001 From: Traian Anghel Date: Mon, 27 Sep 2021 15:36:22 +0300 Subject: [PATCH 7/7] reverted transactionProcessor and cacheWarmer settings --- config/config.mainnet.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.mainnet.yaml b/config/config.mainnet.yaml index 69e445407..765dca0cb 100644 --- a/config/config.mainnet.yaml +++ b/config/config.mainnet.yaml @@ -5,9 +5,9 @@ api: public: true private: true cron: - transactionProcessor: false + transactionProcessor: true transactionProcessorMaxLookBehind: 1000 - cacheWarmer: false + cacheWarmer: true urls: api: - 'https://api.elrond.com'