Merge pull request hashgraph#2141 from hashgraph/feature/2100

Feature/2100
IntellectEU · May 15, 2023 · 51f71d2 · 51f71d2
2 parents 414ec91 + b076628
commit 51f71d2
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 20 deletions.
diff --git a/auth-service/src/api/account-service.ts b/auth-service/src/api/account-service.ts
@@ -7,7 +7,8 @@ import {
     MessageResponse,
     MessageError,
     Logger,
-    DataBaseHelper, NatsService, Singleton
+    DataBaseHelper, NatsService, Singleton,
+    SecretManager
 } from '@guardian/common';
 import {
     AuthEvents, UserRole,
@@ -27,7 +28,6 @@ import {
     IStandardRegistryUserResponse,
     IGetUsersByAccountMessage, GenerateUUIDv4
 } from '@guardian/interfaces';
-import { SecretManager } from '@guardian/common/dist/secret-manager';
 
 /**
  * Account service

diff --git a/auth-service/src/app.ts b/auth-service/src/app.ts
@@ -8,16 +8,15 @@ import {
     DataBaseHelper,
     Migration,
     COMMON_CONNECTION_CONFIG,
-    LargePayloadContainer
+    LargePayloadContainer,
+    SecretManager, OldSecretManager
 } from '@guardian/common';
 import { ApplicationStates } from '@guardian/interfaces';
 import { MikroORM } from '@mikro-orm/core';
 import { MongoDriver } from '@mikro-orm/mongodb';
 import { InitializeVault } from './vaults';
 import { ImportKeysFromDatabase } from '@helpers/import-keys-from-database';
 import process from 'process';
-import { SecretManager } from '@guardian/common/dist/secret-manager';
-import { OldSecretManager } from '@guardian/common/dist/secret-manager/old-style/old-secret-manager';
 import { startMetricsServer } from './utils/metrics';
 
 Promise.all([

diff --git a/common/src/index.ts b/common/src/index.ts
@@ -8,5 +8,6 @@ export * from './interfaces';
 export * from './entity';
 export * from './document-loader';
 export * from './hedera-modules';
-export * from './database-modules'
+export * from './database-modules';
+export * from './secret-manager';
 export const entities = Object.values(ent);
diff --git a/common/src/secret-manager/index.ts b/common/src/secret-manager/index.ts
@@ -1,4 +1,5 @@
 export * from './secret-manager-base';
 export * from './secret-manager-config-base';
 export * from './secret-manager';
-export * from './secret-manager-config';
+export * from './secret-manager-config';
+export * from './old-style/old-secret-manager'
diff --git a/guardian-service/src/api/config.service.ts b/guardian-service/src/api/config.service.ts
@@ -8,11 +8,11 @@ import {
     Topic,
     Settings,
     Environment,
-    Workers
+    Workers,
+    SecretManager
 } from '@guardian/common';
 import { MessageAPI, CommonSettings } from '@guardian/interfaces';
 import { AccountId, PrivateKey } from '@hashgraph/sdk';
-import { SecretManager } from '@guardian/common/dist/secret-manager';
 
 /**
  * Connecting to the message broker methods of working with root address book.

diff --git a/guardian-service/src/api/demo.service.ts b/guardian-service/src/api/demo.service.ts
@@ -7,11 +7,11 @@ import {
     Policy,
     Settings,
     DatabaseServer,
-    Workers
+    Workers,
+    SecretManager
 } from '@guardian/common';
 import { MessageAPI, WorkerTaskType } from '@guardian/interfaces';
 import { emptyNotifier, initNotifier, INotifier } from '@helpers/notifier';
-import { SecretManager } from '@guardian/common/dist/secret-manager';
 
 /**
  * Demo key

diff --git a/guardian-service/src/app.ts b/guardian-service/src/app.ts
@@ -33,7 +33,8 @@ import {
     TopicMemo,
     TransactionLogger,
     TransactionLogLvl,
-    Workers, LargePayloadContainer
+    Workers, LargePayloadContainer,
+    SecretManager, OldSecretManager
 } from '@guardian/common';
 import { ApplicationStates, WorkerTaskType } from '@guardian/interfaces';
 import { AccountId, PrivateKey, TopicId } from '@hashgraph/sdk';
@@ -53,8 +54,6 @@ import { GridFSBucket } from 'mongodb';
 import { tagsAPI } from '@api/tag.service';
 import { setDefaultSchema } from '@api/helpers/schema-helper';
 import { demoAPI } from '@api/demo.service';
-import { SecretManager } from '@guardian/common/dist/secret-manager';
-import { OldSecretManager } from '@guardian/common/dist/secret-manager/old-style/old-secret-manager';
 import { themeAPI } from '@api/theme.service';
 import { startMetricsServer } from './utils/metrics';
 

diff --git a/policy-service/src/api/policy-process.ts b/policy-service/src/api/policy-process.ts
@@ -12,6 +12,7 @@ import {
     Workers,
     IPFS,
     DatabaseServer, LargePayloadContainer,
+    OldSecretManager
 } from '@guardian/common';
 import { MikroORM } from '@mikro-orm/core';
 import { MongoDriver } from '@mikro-orm/mongodb';
@@ -21,7 +22,6 @@ import process from 'process';
 import { CommonVariables } from '@helpers/common-variables';
 import { PolicyEvents } from '@guardian/interfaces';
 import { GridFSBucket } from 'mongodb';
-import { OldSecretManager } from '@guardian/common/dist/secret-manager/old-style/old-secret-manager';
 import { SynchronizationService } from '@policy-engine/multi-policy-service';
 
 const {

diff --git a/worker-service/configs/.env.worker b/worker-service/configs/.env.worker
@@ -17,6 +17,7 @@ IPFS_STORAGE_API_KEY="..."
 IPFS_NODE_ADDRESS="http://localhost:5002"
 MAX_HEDERA_TIMEOUT="600"
 MQ_MAX_PAYLOAD="1048576"
+#HEDERA_MAX_CHUNKS="20"
 #LOG_LEVEL="2"
 #MAX_TRANSACTION_FEE="10"
 #MQ_MESSAGE_CHUNK=5000000
diff --git a/worker-service/configs/.env.worker.develop b/worker-service/configs/.env.worker.develop
@@ -17,6 +17,7 @@ IPFS_STORAGE_API_KEY="..."
 IPFS_NODE_ADDRESS="http://localhost:5002"
 MAX_HEDERA_TIMEOUT="600"
 MQ_MAX_PAYLOAD="1048576"
+#HEDERA_MAX_CHUNKS="20"
 #LOG_LEVEL="2"
 #MAX_TRANSACTION_FEE="10"
 #MQ_MESSAGE_CHUNK=5000000
diff --git a/worker-service/configs/.env.worker.template b/worker-service/configs/.env.worker.template
@@ -17,6 +17,7 @@ IPFS_STORAGE_API_KEY="..."
 IPFS_NODE_ADDRESS="http://localhost:5002"
 MAX_HEDERA_TIMEOUT=""
 MQ_MAX_PAYLOAD=""
+#HEDERA_MAX_CHUNKS="20"
 #LOG_LEVEL="2"
 #MAX_TRANSACTION_FEE="10"
 #MQ_MESSAGE_CHUNK=5000000
diff --git a/worker-service/src/api/helpers/hedera-sdk-helper.ts b/worker-service/src/api/helpers/hedera-sdk-helper.ts
@@ -867,6 +867,8 @@ export class HederaSDKHelper {
      * @param topicId Topic identifier
      * @param message Message to publish
      *
+     * @param privateKey
+     * @param transactionMemo
      * @returns Message timestamp
      */
     @timeout(HederaSDKHelper.MAX_TIMEOUT)
@@ -878,9 +880,11 @@ export class HederaSDKHelper {
     ): Promise<string> {
         const client = this.client;
 
+        const maxChunks = (process.env.HEDERA_MAX_CHUNKS) ? parseInt(process.env.HEDERA_MAX_CHUNKS, 10) : 20;
         let messageTransaction: Transaction = new TopicMessageSubmitTransaction({
             topicId,
             message,
+            maxChunks
         }).setMaxTransactionFee(MAX_FEE);
 
         if (transactionMemo) {

diff --git a/worker-service/src/api/worker.ts b/worker-service/src/api/worker.ts
@@ -3,7 +3,8 @@ import {
     MessageBrokerChannel,
     MessageResponse,
     NatsService,
-    ValidateConfiguration
+    ValidateConfiguration,
+    SecretManager
 } from '@guardian/common';
 import {
     ExternalMessageEvents, GenerateUUIDv4,
@@ -19,7 +20,6 @@ import { AccountId, ContractFunctionParameters, PrivateKey, TokenId } from '@has
 import { HederaUtils } from './helpers/utils';
 import axios from 'axios';
 import process from 'process';
-import { SecretManager } from '@guardian/common/dist/secret-manager';
 
 /**
  * Sleep helper

diff --git a/worker-service/src/app.ts b/worker-service/src/app.ts
@@ -2,15 +2,14 @@ import {
     ApplicationState, LargePayloadContainer,
     Logger,
     MessageBrokerChannel,
-    ValidateConfiguration
+    ValidateConfiguration,
+    SecretManager, OldSecretManager
 } from '@guardian/common';
 import { Worker } from './api/worker';
 import { HederaSDKHelper } from './api/helpers/hedera-sdk-helper';
 import { ApplicationStates } from '@guardian/interfaces';
 import { decode } from 'jsonwebtoken';
 import * as process from 'process';
-import { OldSecretManager } from '@guardian/common/dist/secret-manager/old-style/old-secret-manager';
-import { SecretManager } from '@guardian/common/dist/secret-manager';
 
 Promise.all([
     MessageBrokerChannel.connect('WORKERS_SERVICE')