From 941cc5421ef69a6a89c279728da16a766a5d02c7 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 3 Mar 2026 09:34:06 +0100 Subject: [PATCH] update version of used gradido node and gradido blockchain js --- .../apis/dltConnector/model/CommunityAccountIdentifier.ts | 4 ++-- dlt-connector/bun.lock | 4 ++-- dlt-connector/package.json | 2 +- dlt-connector/src/bootstrap/init.ts | 6 ++++++ dlt-connector/src/client/hiero/HieroClient.ts | 4 ++-- dlt-connector/src/config/schema.ts | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/backend/src/apis/dltConnector/model/CommunityAccountIdentifier.ts b/backend/src/apis/dltConnector/model/CommunityAccountIdentifier.ts index 1e8b6a64f..e40cb1e54 100644 --- a/backend/src/apis/dltConnector/model/CommunityAccountIdentifier.ts +++ b/backend/src/apis/dltConnector/model/CommunityAccountIdentifier.ts @@ -1,9 +1,9 @@ export class CommunityAccountIdentifier { // for community user, uuid and communityUuid used userUuid: string - accountNr?: number + accountNr: number - constructor(userUuid: string, accountNr?: number) { + constructor(userUuid: string, accountNr: number = 1) { this.userUuid = userUuid this.accountNr = accountNr } diff --git a/dlt-connector/bun.lock b/dlt-connector/bun.lock index 8d1e6925d..bf5b13837 100644 --- a/dlt-connector/bun.lock +++ b/dlt-connector/bun.lock @@ -7,7 +7,7 @@ "dependencies": { "bun-zigar": "^0.15.2", "cross-env": "^7.0.3", - "gradido-blockchain-js": "git+https://github.com/gradido/gradido-blockchain-js#66c8f6839dd95fc34d323066951b80043690fdc2", + "gradido-blockchain-js": "git+https://github.com/gradido/gradido-blockchain-js#5d41ff3839397588e74e77f555c8ff968c786d09", }, "devDependencies": { "@biomejs/biome": "2.0.0", @@ -585,7 +585,7 @@ "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="], - "gradido-blockchain-js": ["gradido-blockchain-js@github:gradido/gradido-blockchain-js#66c8f68", { "dependencies": { "bindings": "^1.5.0", "nan": "^2.20.0", "node-addon-api": "^7.1.1", "node-gyp-build": "^4.8.1", "prebuildify": "git+https://github.com/einhornimmond/prebuildify#65d94455fab86b902c0d59bb9c06ac70470e56b2" } }, "gradido-gradido-blockchain-js-66c8f68"], + "gradido-blockchain-js": ["gradido-blockchain-js@github:gradido/gradido-blockchain-js#5d41ff3", { "dependencies": { "bindings": "^1.5.0", "nan": "^2.20.0", "node-addon-api": "^7.1.1", "node-gyp-build": "^4.8.1", "prebuildify": "git+https://github.com/einhornimmond/prebuildify#65d94455fab86b902c0d59bb9c06ac70470e56b2" } }, "gradido-gradido-blockchain-js-5d41ff3"], "graphql": ["graphql@16.11.0", "", {}, "sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw=="], diff --git a/dlt-connector/package.json b/dlt-connector/package.json index ce74c27ba..9e93fa858 100644 --- a/dlt-connector/package.json +++ b/dlt-connector/package.json @@ -20,7 +20,7 @@ "dependencies": { "bun-zigar": "^0.15.2", "cross-env": "^7.0.3", - "gradido-blockchain-js": "git+https://github.com/gradido/gradido-blockchain-js#66c8f6839dd95fc34d323066951b80043690fdc2" + "gradido-blockchain-js": "git+https://github.com/gradido/gradido-blockchain-js#5d41ff3839397588e74e77f555c8ff968c786d09" }, "devDependencies": { "@biomejs/biome": "2.0.0", diff --git a/dlt-connector/src/bootstrap/init.ts b/dlt-connector/src/bootstrap/init.ts index 97a3a03ef..8faef0fd8 100644 --- a/dlt-connector/src/bootstrap/init.ts +++ b/dlt-connector/src/bootstrap/init.ts @@ -9,6 +9,8 @@ import { Community, communitySchema } from '../schemas/transaction.schema' import { isPortOpenRetry } from '../utils/network' import { type AppContext, type AppContextClients } from './appContext' import { initGradidoNode } from './initGradidoNode' +import { ResolveKeyPair } from '../interactions/resolveKeyPair/ResolveKeyPair.context' +import { KeyPairIdentifierLogic } from '../data/KeyPairIdentifier.logic' export function loadConfig(): Logger { // configure log4js @@ -67,6 +69,10 @@ export async function checkHomeCommunity( logger.info(`home community topic: ${homeCommunity.hieroTopicId}`) logger.info(`gradido node server: ${appContext.clients.gradidoNode.url}`) logger.info(`gradido backend server: ${appContext.clients.backend.url}`) + const keyPair = await ResolveKeyPair(new KeyPairIdentifierLogic({ + communityTopicId: homeCommunity.hieroTopicId, + communityId: homeCommunity.uuid, + })) return v.parse(communitySchema, homeCommunity) } diff --git a/dlt-connector/src/client/hiero/HieroClient.ts b/dlt-connector/src/client/hiero/HieroClient.ts index f82139854..088df0b4a 100644 --- a/dlt-connector/src/client/hiero/HieroClient.ts +++ b/dlt-connector/src/client/hiero/HieroClient.ts @@ -100,7 +100,7 @@ export class HieroClient { ) // TODO: fix issue in GradidoNode // hot fix, when gradido node is running some time, the hiero listener stop working, so we check if our new transaction is received - // after 10 seconds, else restart GradidoNode + // after 20 seconds, else restart GradidoNode setTimeout(async () => { const transaction = await GradidoNodeClient.getInstance().getTransaction({ communityId, @@ -122,7 +122,7 @@ export class HieroClient { GradidoNodeProcess.getInstance().start() } } - }, 10000) + }, 20000) if (logger.isInfoEnabled()) { // only for logging sendResponse.getReceiptWithSigner(this.wallet).then((receipt) => { diff --git a/dlt-connector/src/config/schema.ts b/dlt-connector/src/config/schema.ts index dd61e59d9..fcb1452de 100644 --- a/dlt-connector/src/config/schema.ts +++ b/dlt-connector/src/config/schema.ts @@ -84,7 +84,7 @@ export const configSchema = v.object({ v.string('The version of the DLT node server, for example: 0.9.0'), v.regex(/^\d+\.\d+\.\d+$/), ), - '0.9.3', + '0.9.4', ), DLT_GRADIDO_NODE_SERVER_HOME_FOLDER: v.optional( v.string('The home folder for the gradido dlt node server'),