Hotfix/2.6.1 (#1469)

* #1465 * set version 2.6.1 Signed-off-by: Stepan Kiryakov <[email protected]> Signed-off-by: Stepan Kiryakov <[email protected]> Co-authored-by: Stepan Kiryakov <[email protected]>
hashgraph · Nov 1, 2022 · 69e0494 · 69e0494
1 parent 9d31ba7
commit 69e0494
Show file tree

Hide file tree

Showing 17 changed files with 78 additions and 54 deletions.
diff --git a/api-docs/api/swagger/swagger.yaml b/api-docs/api/swagger/swagger.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   title: "Guardian"
   description: "The Guardian is a modular open-source solution that includes best-in-class identity management and decentralized ledger technology (DLT) libraries. At the heart of the Guardian solution is a sophisticated Policy Workflow Engine (PWE) that enables applications to offer a requirements-based tokenization implementation."
-  version: "2.6.0"
+  version: "2.6.1"
   contact:
     name: "API developer"
     url: "https://envisionblockchain.com"

diff --git a/api-docs/package.json b/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api-docs",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Swagger Documentation",
   "main": "dist/index.js",
   "scripts": {

diff --git a/api-gateway/package.json b/api-gateway/package.json
@@ -8,8 +8,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.6.0",
-    "@guardian/interfaces": "^2.6.0",
+    "@guardian/common": "^2.6.1",
+    "@guardian/interfaces": "^2.6.1",
     "@types/express-fileupload": "^1.4.1",
     "dotenv": "^16.0.0",
     "express": "^4.17.1",
@@ -51,5 +51,5 @@
     "start": "node dist/index.js",
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/auth-service/package.json b/auth-service/package.json
@@ -6,8 +6,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.6.0",
-    "@guardian/interfaces": "^2.6.0",
+    "@guardian/common": "^2.6.1",
+    "@guardian/interfaces": "^2.6.1",
     "@mikro-orm/core": "^5.3.0",
     "@mikro-orm/mongodb": "^5.3.0",
     "dotenv": "^16.0.0",
@@ -46,5 +46,5 @@
     "start": "node dist/index.js",
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/common/package.json b/common/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/interfaces": "^2.6.0",
+    "@guardian/interfaces": "^2.6.1",
     "@mikro-orm/core": "^5.3.0",
     "@mikro-orm/migrations-mongodb": "^5.3.1",
     "@mikro-orm/mongodb": "^5.3.0",
@@ -34,5 +34,5 @@
     "prepare": "npm run build",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/frontend/package.json b/frontend/package.json
@@ -57,5 +57,5 @@
         "test": "ng test",
         "watch": "ng build --watch --configuration development --output-path ../www-data"
     },
-    "version": "2.6.0"
+    "version": "2.6.1"
 }
diff --git a/guardian-service/package.json b/guardian-service/package.json
@@ -12,8 +12,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.6.0",
-    "@guardian/interfaces": "^2.6.0",
+    "@guardian/common": "^2.6.1",
+    "@guardian/interfaces": "^2.6.1",
     "@hashgraph/sdk": "^2.18.3",
     "@mikro-orm/core": "^5.3.0",
     "@mikro-orm/mongodb": "^5.3.0",
@@ -74,5 +74,5 @@
     "test:local": "mocha tests/**/*.test.js",
     "test:stability": "mocha tests/stability.test.js"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/guardian-service/src/policy-engine/helpers/utils.ts b/guardian-service/src/policy-engine/helpers/utils.ts
@@ -259,14 +259,13 @@ export class PolicyUtils {
         const adminKey = token.adminKey;
 
         if (token.tokenType === 'non-fungible') {
-            const metaData = new Uint8Array(Buffer.from(uuid));
-            const data = new Array<Uint8Array>(Math.floor(tokenValue));
-            data.fill(metaData);
+            const data = new Array<string>(Math.floor(tokenValue));
+            data.fill(uuid);
             const serials: number[] = [];
             const dataChunk = PolicyUtils.splitChunk(data, 10);
             const mintPromiseArray: Promise<any>[] = [];
             for (let i = 0; i < dataChunk.length; i++) {
-                const element = dataChunk[i];
+                const metaData = dataChunk[i];
                 if (i % 100 === 0) {
                     ref.log(`Mint(${mintId}): Minting (Chunk: ${i + 1}/${dataChunk.length})`);
                 }
@@ -277,7 +276,10 @@ export class PolicyUtils {
                         hederaAccountId: root.hederaAccountId,
                         hederaAccountKey: root.hederaAccountKey,
                         dryRun: ref.dryRun,
-                        tokenId, supplyKey, element, transactionMemo
+                        tokenId,
+                        supplyKey,
+                        metaData,
+                        transactionMemo
                     }
                 }, 1));
 
@@ -308,7 +310,12 @@ export class PolicyUtils {
                         hederaAccountId: root.hederaAccountId,
                         hederaAccountKey: root.hederaAccountKey,
                         dryRun: ref.dryRun,
-                        tokenId, targetAccount, adminId, adminKey, element, transactionMemo
+                        tokenId,
+                        targetAccount,
+                        adminId,
+                        adminKey,
+                        element,
+                        transactionMemo
                     }
                 }, 1));
 
@@ -326,7 +333,10 @@ export class PolicyUtils {
                         hederaAccountId: root.hederaAccountId,
                         hederaAccountKey: root.hederaAccountKey,
                         dryRun: ref.dryRun,
-                        tokenId, supplyKey, tokenValue, transactionMemo
+                        tokenId,
+                        supplyKey,
+                        tokenValue,
+                        transactionMemo
                     }
                 }, 1);
                 await workers.addTask({
@@ -335,7 +345,12 @@ export class PolicyUtils {
                         hederaAccountId: root.hederaAccountId,
                         hederaAccountKey: root.hederaAccountKey,
                         dryRun: ref.dryRun,
-                        tokenId, targetAccount, adminId, adminKey, tokenValue, transactionMemo
+                        tokenId,
+                        targetAccount,
+                        adminId,
+                        adminKey,
+                        tokenValue,
+                        transactionMemo
                     }
                 }, 1);
             } catch (error) {

diff --git a/interfaces/package.json b/interfaces/package.json
@@ -24,5 +24,5 @@
     "lint": "tslint --config ../tslint.json --project .",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/ipfs-client/package.json b/ipfs-client/package.json
@@ -4,8 +4,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.6.0",
-    "@guardian/interfaces": "^2.6.0",
+    "@guardian/common": "^2.6.1",
+    "@guardian/interfaces": "^2.6.1",
     "@web-std/fetch": "3.0.0",
     "axios": "^0.26.1",
     "axios-retry": "^3.2.4",
@@ -44,5 +44,5 @@
     "test": "mocha tests/**/*.test.js  --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ipfs-client.xml",
     "watch": "nodemon src/index.ts"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/logger-service/package.json b/logger-service/package.json
@@ -1,8 +1,8 @@
 {
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.6.0",
-    "@guardian/interfaces": "^2.6.0",
+    "@guardian/common": "^2.6.1",
+    "@guardian/interfaces": "^2.6.1",
     "@mikro-orm/core": "^5.3.0",
     "@mikro-orm/mongodb": "^5.3.0",
     "@web-std/fetch": "3.0.0",
@@ -36,5 +36,5 @@
     "start": "node dist/index.js",
     "watch": "nodemon src/index.ts"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/mrv-sender/package.json b/mrv-sender/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.6.0",
+    "@guardian/common": "^2.6.1",
     "@transmute/credentials-context": "0.7.0-unstable.40",
     "@transmute/did-context": "0.7.0-unstable.40",
     "@transmute/ed25519-signature-2018": "0.7.0-unstable.40",
@@ -29,5 +29,5 @@
     "dev:docker": "nodemon .",
     "start": "node dist/index.js"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/package.json b/package.json
@@ -14,5 +14,5 @@
     "mrv-sender",
     "worker-service"
   ],
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/topic-viewer/package.json b/topic-viewer/package.json
@@ -19,5 +19,5 @@
     "dev": "tsc -w",
     "start": "node dist/index.js"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/worker-service/package.json b/worker-service/package.json
@@ -1,8 +1,8 @@
 {
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.6.0",
-    "@guardian/interfaces": "^2.6.0",
+    "@guardian/common": "^2.6.1",
+    "@guardian/interfaces": "^2.6.1",
     "@hashgraph/sdk": "^2.18.3",
     "@transmute/credentials-context": "^0.7.0-unstable.60",
     "@transmute/did-context": "^0.7.0-unstable.60",
@@ -46,5 +46,5 @@
     "start": "node dist/index.js",
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/worker-service.xml --exit"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/worker-service/src/api/worker.ts b/worker-service/src/api/worker.ts
@@ -403,9 +403,18 @@ export class Worker {
                 }
 
                 case WorkerTaskType.MINT_NFT: {
-                    const { hederaAccountId, hederaAccountKey, dryRun, tokenId, supplyKey, element, transactionMemo } = task.data;
+                    const { hederaAccountId, hederaAccountKey, dryRun, tokenId, supplyKey, metaData, transactionMemo } = task.data;
                     const client = new HederaSDKHelper(hederaAccountId, hederaAccountKey, dryRun);
-                    result.data = await client.mintNFT(tokenId, supplyKey, element, transactionMemo);
+                    let data: Uint8Array[];
+                    if (Array.isArray(metaData)) {
+                        data = new Array<Uint8Array>(metaData.length);
+                        for (let i = 0; i < metaData.length; i++) {
+                            data[i] = new Uint8Array(Buffer.from(metaData[i]));
+                        }
+                    } else {
+                        data = [new Uint8Array(Buffer.from(metaData))];
+                    }
+                    result.data = await client.mintNFT(tokenId, supplyKey, data, transactionMemo);
                     break;
                 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -187,11 +187,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@guardian/common@^2.6.0, @guardian/common@workspace:common":
+"@guardian/common@^2.6.1, @guardian/common@workspace:common":
   version: 0.0.0-use.local
   resolution: "@guardian/common@workspace:common"
   dependencies:
-    "@guardian/interfaces": ^2.6.0
+    "@guardian/interfaces": ^2.6.1
     "@mikro-orm/core": ^5.3.0
     "@mikro-orm/migrations-mongodb": ^5.3.1
     "@mikro-orm/mongodb": ^5.3.0
@@ -209,7 +209,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@guardian/interfaces@^2.6.0, @guardian/interfaces@workspace:interfaces":
+"@guardian/interfaces@^2.6.1, @guardian/interfaces@workspace:interfaces":
   version: 0.0.0-use.local
   resolution: "@guardian/interfaces@workspace:interfaces"
   dependencies:
@@ -1834,8 +1834,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "api-gateway@workspace:api-gateway"
   dependencies:
-    "@guardian/common": ^2.6.0
-    "@guardian/interfaces": ^2.6.0
+    "@guardian/common": ^2.6.1
+    "@guardian/interfaces": ^2.6.1
     "@types/express": ^4.17.13
     "@types/express-fileupload": ^1.4.1
     "@types/jszip": ^3.4.1
@@ -2015,8 +2015,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "auth-service@workspace:auth-service"
   dependencies:
-    "@guardian/common": ^2.6.0
-    "@guardian/interfaces": ^2.6.0
+    "@guardian/common": ^2.6.1
+    "@guardian/interfaces": ^2.6.1
     "@mikro-orm/core": ^5.3.0
     "@mikro-orm/mongodb": ^5.3.0
     "@types/jsonwebtoken": ^8.5.4
@@ -4389,8 +4389,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "guardian-service@workspace:guardian-service"
   dependencies:
-    "@guardian/common": ^2.6.0
-    "@guardian/interfaces": ^2.6.0
+    "@guardian/common": ^2.6.1
+    "@guardian/interfaces": ^2.6.1
     "@hashgraph/sdk": ^2.18.3
     "@mikro-orm/core": ^5.3.0
     "@mikro-orm/mongodb": ^5.3.0
@@ -4960,8 +4960,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "ipfs-client@workspace:ipfs-client"
   dependencies:
-    "@guardian/common": ^2.6.0
-    "@guardian/interfaces": ^2.6.0
+    "@guardian/common": ^2.6.1
+    "@guardian/interfaces": ^2.6.1
     "@types/fs-extra": ^9.0.12
     "@types/js-yaml": ^4.0.3
     "@types/node": ^17.0.13
@@ -6141,8 +6141,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "logger-service@workspace:logger-service"
   dependencies:
-    "@guardian/common": ^2.6.0
-    "@guardian/interfaces": ^2.6.0
+    "@guardian/common": ^2.6.1
+    "@guardian/interfaces": ^2.6.1
     "@mikro-orm/core": ^5.3.0
     "@mikro-orm/mongodb": ^5.3.0
     "@types/fs-extra": ^9.0.12
@@ -6706,7 +6706,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "mrv-sender@workspace:mrv-sender"
   dependencies:
-    "@guardian/common": ^2.6.0
+    "@guardian/common": ^2.6.1
     "@transmute/credentials-context": 0.7.0-unstable.40
     "@transmute/did-context": 0.7.0-unstable.40
     "@transmute/ed25519-signature-2018": 0.7.0-unstable.40
@@ -9744,8 +9744,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "worker-service@workspace:worker-service"
   dependencies:
-    "@guardian/common": ^2.6.0
-    "@guardian/interfaces": ^2.6.0
+    "@guardian/common": ^2.6.1
+    "@guardian/interfaces": ^2.6.1
     "@hashgraph/sdk": ^2.18.3
     "@transmute/credentials-context": ^0.7.0-unstable.60
     "@transmute/did-context": ^0.7.0-unstable.60