From bf143d602e081347e4465ea4f2295eb028280f77 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Mon, 18 Nov 2024 14:53:13 +0200 Subject: [PATCH 01/19] API-82: tokens with prefix --- packages/common/src/utils/token.utils.ts | 4 ++-- packages/common/test/utils/token.utils.spec.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/common/src/utils/token.utils.ts b/packages/common/src/utils/token.utils.ts index 02e5cc8a..facd2992 100644 --- a/packages/common/src/utils/token.utils.ts +++ b/packages/common/src/utils/token.utils.ts @@ -1,6 +1,6 @@ export class TokenUtils { - static tokenValidateRegex: RegExp = /^[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}$/; - static nftValidateRegex: RegExp = /^[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}-[a-fA-F0-9]{2,}$/; + static tokenValidateRegex: RegExp = /^([A-Za-z0-9]{3,10}-)?[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}$/; + static nftValidateRegex: RegExp = /^([A-Za-z0-9]{3,10}-)?[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}-[a-fA-F0-9]{2,}$/; static isToken(identifier: string): boolean { return this.tokenValidateRegex.test(identifier); diff --git a/packages/common/test/utils/token.utils.spec.ts b/packages/common/test/utils/token.utils.spec.ts index d5a68ebc..8b2618fb 100644 --- a/packages/common/test/utils/token.utils.spec.ts +++ b/packages/common/test/utils/token.utils.spec.ts @@ -3,20 +3,24 @@ import { TokenUtils } from "../../src/utils/token.utils"; describe('isToken', () => { it('Check isToken function', () => { expect(TokenUtils.isToken('MEX-455c57')).toBeTruthy(); - expect(TokenUtils.isToken('EWLD-e23800-455c74')).toBeFalsy(); + expect(TokenUtils.isToken('SOV-EWLD-455c74')).toBeTruthy(); + expect(TokenUtils.isToken('PRF-SOV-e23800-455c74')).toBeFalsy(); }); }); describe('isCollection', () => { it('Check isCollection function', () => { expect(TokenUtils.isCollection('MOS-b9b4b2')).toBeTruthy(); - expect(TokenUtils.isCollection('MOS-b9b4b2-455c74')).toBeFalsy(); + expect(TokenUtils.isCollection('SOV-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isCollection('SOV-MOS-b9b4b2-455c74')).toBeFalsy(); }); }); describe('isNft', () => { it('Check isNft function', () => { expect(TokenUtils.isNft('MOS-b9b4b2-947a3912')).toBeTruthy(); + expect(TokenUtils.isNft('SOV-MOS-b9b4b2-947a3912')).toBeTruthy(); expect(TokenUtils.isNft('MOS-b9b4b2')).toBeFalsy(); + expect(TokenUtils.isNft('SOV-MOS-b9b4b2')).toBeFalsy(); }); }); From 595cb0e173a862a8fbe1a492455e6e2674d8a42f Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Mon, 18 Nov 2024 15:11:05 +0200 Subject: [PATCH 02/19] version bump --- lerna.json | 2 +- package-lock.json | 16 ++++++++-------- packages/auth/package.json | 2 +- packages/cache/package.json | 2 +- packages/common/package.json | 2 +- packages/elastic/package.json | 2 +- packages/http/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 2 +- packages/redis/package.json | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lerna.json b/lerna.json index fb2212e4..14361b64 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.0.1", + "version": "4.1.0", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index c5932422..4569f703 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13810,7 +13810,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13896,7 +13896,7 @@ }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13920,7 +13920,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13960,7 +13960,7 @@ }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.0.1", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index 5ec70a08..f2998a53 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index 5d99207a..61290c3d 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/common/package.json b/packages/common/package.json index 0556906c..6a8e17dc 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index a757be0c..1d1e05ff 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/http/package.json b/packages/http/package.json index 6c0df92c..9421547c 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 03d04ee6..19a3fc90 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 69e0031b..ade4a33c 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/redis/package.json b/packages/redis/package.json index d5f6e4bc..4673161a 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.0.1", + "version": "4.1.0", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From da784c482c7d1f2e253772f0f44060cf1bb9f5c3 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Mon, 18 Nov 2024 16:04:30 +0200 Subject: [PATCH 03/19] added helper sovereign function --- packages/common/src/utils/token.utils.ts | 13 +++++++++++++ packages/common/test/utils/token.utils.spec.ts | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/packages/common/src/utils/token.utils.ts b/packages/common/src/utils/token.utils.ts index facd2992..cdc5ba9b 100644 --- a/packages/common/src/utils/token.utils.ts +++ b/packages/common/src/utils/token.utils.ts @@ -13,4 +13,17 @@ export class TokenUtils { static isNft(identifier: string): boolean { return this.nftValidateRegex.test(identifier); } + + static isSovereignIdentifier(identifier: string): boolean { + const numDashes = identifier.split("-").length; + if (this.isCollection(identifier)) { + return numDashes === 2; + } + + if (this.isNft(identifier)) { + return numDashes === 3; + } + + return false; + } } diff --git a/packages/common/test/utils/token.utils.spec.ts b/packages/common/test/utils/token.utils.spec.ts index 8b2618fb..206224c4 100644 --- a/packages/common/test/utils/token.utils.spec.ts +++ b/packages/common/test/utils/token.utils.spec.ts @@ -24,3 +24,11 @@ describe('isToken', () => { expect(TokenUtils.isNft('SOV-MOS-b9b4b2')).toBeFalsy(); }); }); + + describe('isSovereignIdentifier', () => { + it('Check isSovereignIdentifier function', () => { + expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2-947a3912')).toBeTruthy(); + expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isSovereignIdentifier('MOS-b9b4b2-947a3912')).toBeFalsy(); + }); + }); From f2c72ce20575bbf9ab371170f709ebdf596d2bdc Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Mon, 18 Nov 2024 16:12:59 +0200 Subject: [PATCH 04/19] fixes --- packages/common/src/utils/token.utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/common/src/utils/token.utils.ts b/packages/common/src/utils/token.utils.ts index cdc5ba9b..6160a4cc 100644 --- a/packages/common/src/utils/token.utils.ts +++ b/packages/common/src/utils/token.utils.ts @@ -15,13 +15,13 @@ export class TokenUtils { } static isSovereignIdentifier(identifier: string): boolean { - const numDashes = identifier.split("-").length; + const numParts = identifier.split("-").length; if (this.isCollection(identifier)) { - return numDashes === 2; + return numParts === 3; } if (this.isNft(identifier)) { - return numDashes === 3; + return numParts === 4; } return false; From 61fccb486b9c3e40aaec322e3783fc896f6e4afc Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Mon, 18 Nov 2024 17:08:27 +0200 Subject: [PATCH 05/19] temp increase versions --- lerna.json | 2 +- package-lock.json | 16 ++++++++-------- packages/auth/package.json | 2 +- packages/cache/package.json | 2 +- packages/common/package.json | 2 +- packages/elastic/package.json | 2 +- packages/http/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 2 +- packages/redis/package.json | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lerna.json b/lerna.json index 14361b64..ec98f178 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.1.0", + "version": "4.1.1", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 4569f703..501f16b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13810,7 +13810,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13896,7 +13896,7 @@ }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13920,7 +13920,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13960,7 +13960,7 @@ }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.0", + "version": "4.1.1", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index f2998a53..4a8a3d1d 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index 61290c3d..8cf62c6d 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/common/package.json b/packages/common/package.json index 6a8e17dc..2fedad9e 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 1d1e05ff..25855a0a 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/http/package.json b/packages/http/package.json index 9421547c..06a9df0c 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 19a3fc90..677fc8ab 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index ade4a33c..af642c13 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/redis/package.json b/packages/redis/package.json index 4673161a..853f6f17 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.0", + "version": "4.1.1", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From b71ce7126cee5218a24793cc84b9b1c7d14b2c92 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Tue, 19 Nov 2024 16:37:23 +0200 Subject: [PATCH 06/19] temp increase + print --- lerna.json | 2 +- package-lock.json | 16 ++++++++-------- packages/auth/package.json | 2 +- packages/cache/package.json | 2 +- .../src/interceptors/caching.interceptor.ts | 1 + packages/common/package.json | 2 +- packages/elastic/package.json | 2 +- packages/http/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 2 +- packages/redis/package.json | 2 +- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lerna.json b/lerna.json index ec98f178..36859fbe 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.1.1", + "version": "4.1.2", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 501f16b5..2e39d060 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13810,7 +13810,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13896,7 +13896,7 @@ }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13920,7 +13920,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13960,7 +13960,7 @@ }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index 4a8a3d1d..fabf5d2a 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index 8cf62c6d..cc0c981e 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/src/interceptors/caching.interceptor.ts b/packages/cache/src/interceptors/caching.interceptor.ts index c20e6cdb..e7dfee67 100644 --- a/packages/cache/src/interceptors/caching.interceptor.ts +++ b/packages/cache/src/interceptors/caching.interceptor.ts @@ -52,6 +52,7 @@ export class CachingInterceptor implements NestInterceptor { const result = await pendingRequest; this.metricsService.incrementPendingApiHit(apiFunction); + console.log(`result : ${result}. str: ${JSON.stringify(result, null, 2)}. typeof: ${typeof result}`); if (result instanceof Error) { return throwError(() => result); } else { diff --git a/packages/common/package.json b/packages/common/package.json index 2fedad9e..8a172a9b 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 25855a0a..1494fa49 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/http/package.json b/packages/http/package.json index 06a9df0c..a3966d1b 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 677fc8ab..499cfd4d 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index af642c13..1a3ce9d8 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/redis/package.json b/packages/redis/package.json index 853f6f17..c96812a1 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.1", + "version": "4.1.2", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From 07f2dfdc9fd6b31c855a2424800cc159400aed8b Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Tue, 19 Nov 2024 17:03:01 +0200 Subject: [PATCH 07/19] temp commit --- lerna.json | 2 +- package-lock.json | 16 ++++++++-------- packages/auth/package.json | 2 +- packages/cache/package.json | 2 +- .../src/interceptors/caching.interceptor.ts | 10 +++++----- packages/common/package.json | 2 +- packages/elastic/package.json | 2 +- packages/http/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 2 +- packages/redis/package.json | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lerna.json b/lerna.json index 36859fbe..d0dd7428 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.1.2", + "version": "4.1.3", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 2e39d060..25639574 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13810,7 +13810,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13896,7 +13896,7 @@ }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13920,7 +13920,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13960,7 +13960,7 @@ }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.2", + "version": "4.1.3", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index fabf5d2a..75dc4d19 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index cc0c981e..c0f30dea 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/src/interceptors/caching.interceptor.ts b/packages/cache/src/interceptors/caching.interceptor.ts index e7dfee67..59fa4c03 100644 --- a/packages/cache/src/interceptors/caching.interceptor.ts +++ b/packages/cache/src/interceptors/caching.interceptor.ts @@ -49,12 +49,12 @@ export class CachingInterceptor implements NestInterceptor { if (cacheKey) { const pendingRequest = this.pendingRequestsDictionary[cacheKey]; if (pendingRequest) { - const result = await pendingRequest; + const [result, error] = await pendingRequest; this.metricsService.incrementPendingApiHit(apiFunction); console.log(`result : ${result}. str: ${JSON.stringify(result, null, 2)}. typeof: ${typeof result}`); - if (result instanceof Error) { - return throwError(() => result); + if (result instanceof Error || error != null) { + return throwError(() => error); } else { return of(result); } @@ -77,14 +77,14 @@ export class CachingInterceptor implements NestInterceptor { .pipe( tap(async (result: any) => { delete this.pendingRequestsDictionary[cacheKey ?? '']; - pendingRequestResolver(result); + pendingRequestResolver([result, null]); this.metricsService.setPendingRequestsCount(Object.keys(this.pendingRequestsDictionary).length); await this.cachingService.setLocal(cacheKey ?? '', result, Constants.oneSecond() * this.cacheDuration); }), catchError((err) => { delete this.pendingRequestsDictionary[cacheKey ?? '']; - pendingRequestResolver(err); + pendingRequestResolver([null, err]); this.metricsService.setPendingRequestsCount(Object.keys(this.pendingRequestsDictionary).length); return throwError(() => err); diff --git a/packages/common/package.json b/packages/common/package.json index 8a172a9b..390fee98 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 1494fa49..c7b7761b 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/http/package.json b/packages/http/package.json index a3966d1b..dc0d0caa 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 499cfd4d..02e49daa 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 1a3ce9d8..40b3e422 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/redis/package.json b/packages/redis/package.json index c96812a1..5246b94b 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.2", + "version": "4.1.3", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From 18afd52fa6efd203c7080670d521e867bd68b2f4 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Tue, 19 Nov 2024 17:07:13 +0200 Subject: [PATCH 08/19] temp commit --- lerna.json | 2 +- package-lock.json | 16 ++++++++-------- packages/auth/package.json | 2 +- packages/cache/package.json | 2 +- packages/common/package.json | 2 +- packages/elastic/package.json | 2 +- packages/http/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 2 +- packages/redis/package.json | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lerna.json b/lerna.json index d0dd7428..f1117911 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.1.3", + "version": "4.1.4", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 25639574..088eade8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13810,7 +13810,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13896,7 +13896,7 @@ }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13920,7 +13920,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13960,7 +13960,7 @@ }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.3", + "version": "4.1.4", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index 75dc4d19..79af86d9 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index c0f30dea..3ba26f2b 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/common/package.json b/packages/common/package.json index 390fee98..52a35519 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index c7b7761b..b94f9d68 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/http/package.json b/packages/http/package.json index dc0d0caa..50474822 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 02e49daa..9eb6395e 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 40b3e422..54c3f7d4 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/redis/package.json b/packages/redis/package.json index 5246b94b..01eeac87 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.3", + "version": "4.1.4", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From e4e267eca50cc3f7a8c2104b41af0ea4885c0185 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Tue, 19 Nov 2024 17:42:45 +0200 Subject: [PATCH 09/19] cleanup --- lerna.json | 2 +- package-lock.json | 16 ++++++++-------- packages/auth/package.json | 2 +- packages/cache/package.json | 2 +- .../src/interceptors/caching.interceptor.ts | 13 ++++++------- packages/common/package.json | 2 +- packages/common/src/utils/token.utils.ts | 4 ++-- packages/common/test/utils/token.utils.spec.ts | 17 +++++++++++------ packages/elastic/package.json | 2 +- packages/http/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 2 +- packages/redis/package.json | 2 +- 13 files changed, 36 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index f1117911..14361b64 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.1.4", + "version": "4.1.0", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 088eade8..4569f703 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13810,7 +13810,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13896,7 +13896,7 @@ }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13920,7 +13920,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13960,7 +13960,7 @@ }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.4", + "version": "4.1.0", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index 79af86d9..f2998a53 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index 3ba26f2b..61290c3d 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/src/interceptors/caching.interceptor.ts b/packages/cache/src/interceptors/caching.interceptor.ts index 59fa4c03..762c559b 100644 --- a/packages/cache/src/interceptors/caching.interceptor.ts +++ b/packages/cache/src/interceptors/caching.interceptor.ts @@ -49,12 +49,11 @@ export class CachingInterceptor implements NestInterceptor { if (cacheKey) { const pendingRequest = this.pendingRequestsDictionary[cacheKey]; if (pendingRequest) { - const [result, error] = await pendingRequest; + const result = await pendingRequest; this.metricsService.incrementPendingApiHit(apiFunction); - console.log(`result : ${result}. str: ${JSON.stringify(result, null, 2)}. typeof: ${typeof result}`); - if (result instanceof Error || error != null) { - return throwError(() => error); + if (result instanceof Error) { + return throwError(() => result); } else { return of(result); } @@ -77,14 +76,14 @@ export class CachingInterceptor implements NestInterceptor { .pipe( tap(async (result: any) => { delete this.pendingRequestsDictionary[cacheKey ?? '']; - pendingRequestResolver([result, null]); + pendingRequestResolver(result); this.metricsService.setPendingRequestsCount(Object.keys(this.pendingRequestsDictionary).length); await this.cachingService.setLocal(cacheKey ?? '', result, Constants.oneSecond() * this.cacheDuration); }), catchError((err) => { delete this.pendingRequestsDictionary[cacheKey ?? '']; - pendingRequestResolver([null, err]); + pendingRequestResolver(err); this.metricsService.setPendingRequestsCount(Object.keys(this.pendingRequestsDictionary).length); return throwError(() => err); @@ -100,4 +99,4 @@ export class CachingInterceptor implements NestInterceptor { return `${context.getClass().name}.${context.getHandler().name}.${JSON.stringify(request.query)}.${JSON.stringify(request.params)}`; } -} +} \ No newline at end of file diff --git a/packages/common/package.json b/packages/common/package.json index 52a35519..6a8e17dc 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/common/src/utils/token.utils.ts b/packages/common/src/utils/token.utils.ts index 6160a4cc..6a191f26 100644 --- a/packages/common/src/utils/token.utils.ts +++ b/packages/common/src/utils/token.utils.ts @@ -1,6 +1,6 @@ export class TokenUtils { - static tokenValidateRegex: RegExp = /^([A-Za-z0-9]{3,10}-)?[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}$/; - static nftValidateRegex: RegExp = /^([A-Za-z0-9]{3,10}-)?[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}-[a-fA-F0-9]{2,}$/; + static tokenValidateRegex: RegExp = /^([a-z0-9]{1,4}-)?[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}$/; + static nftValidateRegex: RegExp = /^([a-z0-9]{1,4}-)?[A-Za-z0-9]{3,10}-[a-fA-F0-9]{6}-[a-fA-F0-9]{2,}$/; static isToken(identifier: string): boolean { return this.tokenValidateRegex.test(identifier); diff --git a/packages/common/test/utils/token.utils.spec.ts b/packages/common/test/utils/token.utils.spec.ts index 206224c4..40e09e48 100644 --- a/packages/common/test/utils/token.utils.spec.ts +++ b/packages/common/test/utils/token.utils.spec.ts @@ -3,16 +3,18 @@ import { TokenUtils } from "../../src/utils/token.utils"; describe('isToken', () => { it('Check isToken function', () => { expect(TokenUtils.isToken('MEX-455c57')).toBeTruthy(); - expect(TokenUtils.isToken('SOV-EWLD-455c74')).toBeTruthy(); - expect(TokenUtils.isToken('PRF-SOV-e23800-455c74')).toBeFalsy(); + expect(TokenUtils.isToken('sov-EWLD-455c74')).toBeTruthy(); + expect(TokenUtils.isToken('SOV-EWLD-455c74')).toBeFalsy(); + expect(TokenUtils.isToken('sov-sov-e23800-455c74')).toBeFalsy(); }); }); describe('isCollection', () => { it('Check isCollection function', () => { expect(TokenUtils.isCollection('MOS-b9b4b2')).toBeTruthy(); - expect(TokenUtils.isCollection('SOV-MOS-b9b4b2')).toBeTruthy(); - expect(TokenUtils.isCollection('SOV-MOS-b9b4b2-455c74')).toBeFalsy(); + expect(TokenUtils.isCollection('sov-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isCollection('SOV-MOS-b9b4b2')).toBeFalsy(); + expect(TokenUtils.isCollection('sov-MOS-b9b4b2-455c74')).toBeFalsy(); }); }); @@ -21,14 +23,17 @@ describe('isToken', () => { expect(TokenUtils.isNft('MOS-b9b4b2-947a3912')).toBeTruthy(); expect(TokenUtils.isNft('SOV-MOS-b9b4b2-947a3912')).toBeTruthy(); expect(TokenUtils.isNft('MOS-b9b4b2')).toBeFalsy(); + expect(TokenUtils.isNft('sov-MOS-b9b4b2')).toBeTruthy(); expect(TokenUtils.isNft('SOV-MOS-b9b4b2')).toBeFalsy(); }); }); describe('isSovereignIdentifier', () => { it('Check isSovereignIdentifier function', () => { - expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2-947a3912')).toBeTruthy(); - expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isSovereignIdentifier('sov-MOS-b9b4b2-947a3912')).toBeTruthy(); + expect(TokenUtils.isSovereignIdentifier('sov-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2-947a3912')).toBeFalsy(); + expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2')).toBeFalsy(); expect(TokenUtils.isSovereignIdentifier('MOS-b9b4b2-947a3912')).toBeFalsy(); }); }); diff --git a/packages/elastic/package.json b/packages/elastic/package.json index b94f9d68..1d1e05ff 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/http/package.json b/packages/http/package.json index 50474822..9421547c 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 9eb6395e..19a3fc90 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 54c3f7d4..ade4a33c 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/redis/package.json b/packages/redis/package.json index 01eeac87..4673161a 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.4", + "version": "4.1.0", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From bfaa50c32fe39fcbb3000af4c128a847af462693 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Tue, 19 Nov 2024 17:43:44 +0200 Subject: [PATCH 10/19] add missing empty line --- packages/cache/src/interceptors/caching.interceptor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cache/src/interceptors/caching.interceptor.ts b/packages/cache/src/interceptors/caching.interceptor.ts index 762c559b..c20e6cdb 100644 --- a/packages/cache/src/interceptors/caching.interceptor.ts +++ b/packages/cache/src/interceptors/caching.interceptor.ts @@ -99,4 +99,4 @@ export class CachingInterceptor implements NestInterceptor { return `${context.getClass().name}.${context.getHandler().name}.${JSON.stringify(request.query)}.${JSON.stringify(request.params)}`; } -} \ No newline at end of file +} From 77110536243337a556bc8e9e12634a130b375304 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Tue, 19 Nov 2024 17:46:18 +0200 Subject: [PATCH 11/19] fix test --- packages/common/test/utils/token.utils.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/test/utils/token.utils.spec.ts b/packages/common/test/utils/token.utils.spec.ts index 40e09e48..37a04999 100644 --- a/packages/common/test/utils/token.utils.spec.ts +++ b/packages/common/test/utils/token.utils.spec.ts @@ -21,9 +21,9 @@ describe('isToken', () => { describe('isNft', () => { it('Check isNft function', () => { expect(TokenUtils.isNft('MOS-b9b4b2-947a3912')).toBeTruthy(); - expect(TokenUtils.isNft('SOV-MOS-b9b4b2-947a3912')).toBeTruthy(); + expect(TokenUtils.isNft('sov-MOS-b9b4b2-947a3912')).toBeTruthy(); expect(TokenUtils.isNft('MOS-b9b4b2')).toBeFalsy(); - expect(TokenUtils.isNft('sov-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isNft('sov-MOS-b9b4b2')).toBeFalsy(); expect(TokenUtils.isNft('SOV-MOS-b9b4b2')).toBeFalsy(); }); }); From 7cf274e151780c12750bf0e11faf88e32183040e Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Wed, 20 Nov 2024 12:29:26 +0200 Subject: [PATCH 12/19] added extra test cases --- packages/common/test/utils/token.utils.spec.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/common/test/utils/token.utils.spec.ts b/packages/common/test/utils/token.utils.spec.ts index 37a04999..01e1954a 100644 --- a/packages/common/test/utils/token.utils.spec.ts +++ b/packages/common/test/utils/token.utils.spec.ts @@ -4,6 +4,9 @@ describe('isToken', () => { it('Check isToken function', () => { expect(TokenUtils.isToken('MEX-455c57')).toBeTruthy(); expect(TokenUtils.isToken('sov-EWLD-455c74')).toBeTruthy(); + expect(TokenUtils.isToken('')).toBeFalsy(); + expect(TokenUtils.isToken('sov-')).toBeFalsy(); + expect(TokenUtils.isToken('sov-EWLD-455c74-00aa')).toBeFalsy(); expect(TokenUtils.isToken('SOV-EWLD-455c74')).toBeFalsy(); expect(TokenUtils.isToken('sov-sov-e23800-455c74')).toBeFalsy(); }); @@ -13,6 +16,8 @@ describe('isToken', () => { it('Check isCollection function', () => { expect(TokenUtils.isCollection('MOS-b9b4b2')).toBeTruthy(); expect(TokenUtils.isCollection('sov-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isCollection('')).toBeFalsy(); + expect(TokenUtils.isCollection('sov-')).toBeFalsy(); expect(TokenUtils.isCollection('SOV-MOS-b9b4b2')).toBeFalsy(); expect(TokenUtils.isCollection('sov-MOS-b9b4b2-455c74')).toBeFalsy(); }); @@ -22,6 +27,8 @@ describe('isToken', () => { it('Check isNft function', () => { expect(TokenUtils.isNft('MOS-b9b4b2-947a3912')).toBeTruthy(); expect(TokenUtils.isNft('sov-MOS-b9b4b2-947a3912')).toBeTruthy(); + expect(TokenUtils.isNft('')).toBeFalsy(); + expect(TokenUtils.isNft('sov-')).toBeFalsy(); expect(TokenUtils.isNft('MOS-b9b4b2')).toBeFalsy(); expect(TokenUtils.isNft('sov-MOS-b9b4b2')).toBeFalsy(); expect(TokenUtils.isNft('SOV-MOS-b9b4b2')).toBeFalsy(); @@ -32,6 +39,9 @@ describe('isToken', () => { it('Check isSovereignIdentifier function', () => { expect(TokenUtils.isSovereignIdentifier('sov-MOS-b9b4b2-947a3912')).toBeTruthy(); expect(TokenUtils.isSovereignIdentifier('sov-MOS-b9b4b2')).toBeTruthy(); + expect(TokenUtils.isSovereignIdentifier('')).toBeFalsy(); + expect(TokenUtils.isSovereignIdentifier('sov-')).toBeFalsy(); + expect(TokenUtils.isSovereignIdentifier('sov-MOS-b9b4b')).toBeFalsy(); expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2-947a3912')).toBeFalsy(); expect(TokenUtils.isSovereignIdentifier('SOV-MOS-b9b4b2')).toBeFalsy(); expect(TokenUtils.isSovereignIdentifier('MOS-b9b4b2-947a3912')).toBeFalsy(); From cf6449e419774cd4ba31b58e0d6a64089e8dbe85 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Wed, 20 Nov 2024 13:16:59 +0200 Subject: [PATCH 13/19] beta version --- lerna.json | 2 +- package-lock.json | 38 ++++++++++++++++---------------- packages/auth/package.json | 8 +++---- packages/cache/package.json | 8 +++---- packages/common/package.json | 4 ++-- packages/elastic/package.json | 4 ++-- packages/http/package.json | 6 ++--- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 4 ++-- packages/redis/package.json | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 14361b64..be88a96d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.1.0", + "version": "4.1.0-beta.0", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 4569f703..95fd01cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13802,15 +13802,15 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^4.0.0", - "@multiversx/sdk-nestjs-common": "^4.0.0", - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", + "@multiversx/sdk-nestjs-cache": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", "@nestjs/common": "^10.x" } }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13828,9 +13828,9 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^4.0.0", - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", - "@multiversx/sdk-nestjs-redis": "^4.0.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-redis": "^4.1.0-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13867,7 +13867,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13890,13 +13890,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^4.0.0", + "@multiversx/sdk-nestjs-http": "^4.1.0-beta.0", "@nestjs/common": "^10.x" } }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13912,15 +13912,15 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^4.0.0", - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13954,13 +13954,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^4.0.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", "@nestjs/common": "^10.x" } }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.0", + "version": "4.1.0-beta.0", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index f2998a53..f953dc51 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,9 +38,9 @@ "jsonwebtoken": "^9.0.0" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^4.0.0", - "@multiversx/sdk-nestjs-common": "^4.0.0", - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", + "@multiversx/sdk-nestjs-cache": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 61290c3d..ae70afde 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,9 +40,9 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^4.0.0", - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", - "@multiversx/sdk-nestjs-redis": "^4.0.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-redis": "^4.1.0-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/common/package.json b/packages/common/package.json index 6a8e17dc..68003464 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,7 +40,7 @@ "winston": "^3.7.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 1d1e05ff..bf3a45bb 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,7 +31,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^4.0.0", + "@multiversx/sdk-nestjs-http": "^4.1.0-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/http/package.json b/packages/http/package.json index 9421547c..cb99794c 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,8 +38,8 @@ "axios": "^1.7.4" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^4.0.0", - "@multiversx/sdk-nestjs-monitoring": "^4.0.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", + "@multiversx/sdk-nestjs-monitoring": "^4.1.0-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 19a3fc90..565cbd2f 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index ade4a33c..bea6088e 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,7 +37,7 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^4.0.0", + "@multiversx/sdk-nestjs-common": "^4.1.0-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/redis/package.json b/packages/redis/package.json index 4673161a..724c7ebe 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.0", + "version": "4.1.0-beta.0", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From f0c9b37fa174087c20ddd8fd6ee8eb08e1d4f0ea Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Fri, 14 Mar 2025 11:38:25 +0200 Subject: [PATCH 14/19] added support for custom hrp --- .../common/src/sc.interactions/contract.loader.ts | 4 ++-- packages/common/src/utils/address.utils.ts | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/common/src/sc.interactions/contract.loader.ts b/packages/common/src/sc.interactions/contract.loader.ts index 5818d599..b5adb844 100644 --- a/packages/common/src/sc.interactions/contract.loader.ts +++ b/packages/common/src/sc.interactions/contract.loader.ts @@ -27,13 +27,13 @@ export class ContractLoader { } } - async getContract(contractAddress: string): Promise { + async getContract(contractAddress: string, hrp?: string): Promise { if (!this.abi) { this.abi = await this.load(); } return new SmartContract({ - address: new Address(contractAddress), + address: new Address(contractAddress, hrp), abi: this.abi, }); } diff --git a/packages/common/src/utils/address.utils.ts b/packages/common/src/utils/address.utils.ts index 57f5e568..7a346989 100644 --- a/packages/common/src/utils/address.utils.ts +++ b/packages/common/src/utils/address.utils.ts @@ -3,17 +3,17 @@ import { Logger } from "@nestjs/common"; import { BinaryUtils } from "./binary.utils"; export class AddressUtils { - static bech32Encode(publicKey: string) { - return Address.fromHex(publicKey).bech32(); + static bech32Encode(publicKey: string, hrp?: string) { + return Address.fromHex(publicKey, hrp).bech32(); } static bech32Decode(address: string) { - return Address.fromBech32(address).hex(); + return Address.newFromBech32(address).hex(); } static isAddressValid(address: string): boolean { try { - Address.fromBech32(address); + Address.newFromBech32(address); return true; } catch (error) { return false; @@ -55,7 +55,7 @@ export class AddressUtils { return shard; } - static isSmartContractAddress(address: string): boolean { + static isSmartContractAddress(address: string, hrp?: string): boolean { if (address.toLowerCase() === 'metachain') { return true; } @@ -65,7 +65,7 @@ export class AddressUtils { } try { - return new Address(address).isContractAddress(); + return new Address(address, hrp).isContractAddress(); } catch (error) { const logger = new Logger(AddressUtils.name); logger.error(`Error when determining whether address '${address}' is a smart contract address`); From 7f8cab354ab4f6cd04189efe1d0c39c02d745e7a Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Fri, 14 Mar 2025 11:39:21 +0200 Subject: [PATCH 15/19] v4.1.0-beta.1 --- lerna.json | 2 +- package-lock.json | 16 ++++++++-------- packages/auth/package.json | 2 +- packages/cache/package.json | 2 +- packages/common/package.json | 2 +- packages/elastic/package.json | 2 +- packages/http/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 2 +- packages/redis/package.json | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lerna.json b/lerna.json index be88a96d..ec49209f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 95fd01cf..b7b8d6e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13786,7 +13786,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13810,7 +13810,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13849,7 +13849,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^13.4.1", @@ -13881,7 +13881,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13896,7 +13896,7 @@ }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.9", @@ -13920,7 +13920,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13939,7 +13939,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13960,7 +13960,7 @@ }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index f953dc51..a7ea8133 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index ae70afde..4be73f1d 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/common/package.json b/packages/common/package.json index 68003464..8be5655a 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index bf3a45bb..26914ae4 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/http/package.json b/packages/http/package.json index cb99794c..28d837b8 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 565cbd2f..2b236b1e 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index bea6088e..095e3d4f 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/redis/package.json b/packages/redis/package.json index 724c7ebe..a7f01de4 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "4.1.0-beta.0", + "version": "4.1.0-beta.1", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From b18d33f421af83b0780bc6ea545d5b21e42f7264 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Thu, 24 Apr 2025 11:34:19 +0300 Subject: [PATCH 16/19] update versions after merge --- lerna.json | 2 +- package-lock.json | 32 ++++++++++++++++---------------- packages/auth/package.json | 8 ++++---- packages/cache/package.json | 8 ++++---- packages/common/package.json | 4 ++-- packages/elastic/package.json | 4 ++-- packages/http/package.json | 6 +++--- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 4 ++-- packages/redis/package.json | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 89be3908..d3e50dad 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "5.0.0", + "version": "5.0.1-beta.0", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 996c8ce3..40de081e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13188,7 +13188,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13228,7 +13228,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "dependencies": { "lru-cache": "^8.0.4", @@ -13246,9 +13246,9 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^5.0.0", - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", - "@multiversx/sdk-nestjs-redis": "^5.0.0", + "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-redis": "5.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } @@ -13267,7 +13267,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13284,7 +13284,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", @@ -13298,7 +13298,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13307,13 +13307,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^5.0.0", + "@multiversx/sdk-nestjs-http": "5.0.1-beta.0", "@nestjs/common": "^10.x" } }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13330,15 +13330,15 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^5.0.0", - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", + "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "dependencies": { "prom-client": "^14.0.1", @@ -13357,7 +13357,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13372,13 +13372,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^5.0.0", + "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", "@nestjs/common": "^10.x" } }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "5.0.0", + "version": "5.0.1-beta.0", "license": "MIT", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index ada61dd5..4b31983f 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,9 +37,9 @@ "jsonwebtoken": "^9.0.0" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^5.0.0", - "@multiversx/sdk-nestjs-common": "^5.0.0", - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", + "@multiversx/sdk-nestjs-cache": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/cache/package.json b/packages/cache/package.json index f6170ff3..ca4f67e1 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,9 +40,9 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^5.0.0", - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", - "@multiversx/sdk-nestjs-redis": "^5.0.0", + "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-redis": "5.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/common/package.json b/packages/common/package.json index 807dbb7f..741835a5 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -39,7 +39,7 @@ "winston": "^3.7.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index b4a27bd8..2d0c2fa5 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,7 +31,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^5.0.0", + "@multiversx/sdk-nestjs-http": "5.0.1-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/http/package.json b/packages/http/package.json index 09dc1fb1..aeaa9197 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -39,8 +39,8 @@ "axios": "^1.7.4" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^5.0.0", - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", + "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index e5df8b6c..5f472a2b 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 706b0b75..245ad9e4 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,7 +37,7 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^5.0.0", + "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/redis/package.json b/packages/redis/package.json index e8729a05..c19dbd1c 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "5.0.0", + "version": "5.0.1-beta.0", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From 202d7002d26b0e056e137db260707d7121d827ec Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Thu, 24 Apr 2025 14:09:28 +0300 Subject: [PATCH 17/19] adjust hrp usage --- lerna.json | 2 +- package-lock.json | 38 +++++++++---------- packages/auth/package.json | 8 ++-- packages/cache/package.json | 8 ++-- packages/common/package.json | 4 +- .../src/sc.interactions/contract.loader.ts | 4 +- packages/common/src/utils/address.utils.ts | 11 +++--- packages/elastic/package.json | 4 +- packages/http/package.json | 6 +-- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 4 +- packages/redis/package.json | 2 +- 12 files changed, 46 insertions(+), 47 deletions(-) diff --git a/lerna.json b/lerna.json index d3e50dad..64c784c9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "packages": [ "packages/*" ], diff --git a/package-lock.json b/package-lock.json index 40de081e..f6488700 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13188,7 +13188,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13203,9 +13203,9 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^5.0.0", - "@multiversx/sdk-nestjs-common": "^5.0.0", - "@multiversx/sdk-nestjs-monitoring": "^5.0.0", + "@multiversx/sdk-nestjs-cache": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", "@nestjs/common": "^10.x" } }, @@ -13228,7 +13228,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "dependencies": { "lru-cache": "^8.0.4", @@ -13246,9 +13246,9 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-redis": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-redis": "5.0.2-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } @@ -13267,7 +13267,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13284,7 +13284,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", @@ -13298,7 +13298,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13307,13 +13307,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-http": "5.0.2-beta.0", "@nestjs/common": "^10.x" } }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13330,15 +13330,15 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "dependencies": { "prom-client": "^14.0.1", @@ -13357,7 +13357,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13372,13 +13372,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", "@nestjs/common": "^10.x" } }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "license": "MIT", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index 4b31983f..c45c8e71 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,9 +37,9 @@ "jsonwebtoken": "^9.0.0" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-cache": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/cache/package.json b/packages/cache/package.json index ca4f67e1..c643867e 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,9 +40,9 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-redis": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-redis": "5.0.2-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/common/package.json b/packages/common/package.json index 741835a5..363845f6 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -39,7 +39,7 @@ "winston": "^3.7.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", diff --git a/packages/common/src/sc.interactions/contract.loader.ts b/packages/common/src/sc.interactions/contract.loader.ts index b5adb844..5818d599 100644 --- a/packages/common/src/sc.interactions/contract.loader.ts +++ b/packages/common/src/sc.interactions/contract.loader.ts @@ -27,13 +27,13 @@ export class ContractLoader { } } - async getContract(contractAddress: string, hrp?: string): Promise { + async getContract(contractAddress: string): Promise { if (!this.abi) { this.abi = await this.load(); } return new SmartContract({ - address: new Address(contractAddress, hrp), + address: new Address(contractAddress), abi: this.abi, }); } diff --git a/packages/common/src/utils/address.utils.ts b/packages/common/src/utils/address.utils.ts index 7a346989..bbcabb0f 100644 --- a/packages/common/src/utils/address.utils.ts +++ b/packages/common/src/utils/address.utils.ts @@ -3,8 +3,8 @@ import { Logger } from "@nestjs/common"; import { BinaryUtils } from "./binary.utils"; export class AddressUtils { - static bech32Encode(publicKey: string, hrp?: string) { - return Address.fromHex(publicKey, hrp).bech32(); + static bech32Encode(publicKey: string) { + return Address.newFromHex(publicKey).bech32(); } static bech32Decode(address: string) { @@ -20,10 +20,9 @@ export class AddressUtils { } } - static isValidHexAddress(address: string): boolean { try { - Address.fromHex(address); + Address.newFromHex(address); return true; } catch (error) { return false; @@ -55,7 +54,7 @@ export class AddressUtils { return shard; } - static isSmartContractAddress(address: string, hrp?: string): boolean { + static isSmartContractAddress(address: string): boolean { if (address.toLowerCase() === 'metachain') { return true; } @@ -65,7 +64,7 @@ export class AddressUtils { } try { - return new Address(address, hrp).isContractAddress(); + return Address.newFromBech32(address).isSmartContract(); } catch (error) { const logger = new Logger(AddressUtils.name); logger.error(`Error when determining whether address '${address}' is a smart contract address`); diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 2d0c2fa5..0164e4cc 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,7 +31,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-http": "5.0.2-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/http/package.json b/packages/http/package.json index aeaa9197..c4bb5ea1 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -39,8 +39,8 @@ "axios": "^1.7.4" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", - "@multiversx/sdk-nestjs-monitoring": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", + "@multiversx/sdk-nestjs-monitoring": "5.0.2-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 5f472a2b..2cf85422 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 245ad9e4..a060f7f3 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,7 +37,7 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "5.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "5.0.2-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/redis/package.json b/packages/redis/package.json index c19dbd1c..1c76c85d 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "5.0.1-beta.0", + "version": "5.0.2-beta.0", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From 3a882ca60c43e55da553b3f6211d5952a5f8b909 Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Fri, 22 Aug 2025 11:43:28 +0300 Subject: [PATCH 18/19] beta version bump --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/cache/package.json | 8 ++++---- packages/common/package.json | 2 +- packages/elastic/package.json | 4 ++-- packages/http/package.json | 6 +++--- packages/monitoring/package.json | 2 +- packages/rabbitmq/package.json | 4 ++-- packages/redis/package.json | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lerna.json b/lerna.json index b59e7de1..7c6481d7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "6.0.0", + "version": "6.0.1-beta.0", "packages": [ "packages/*" ], diff --git a/packages/auth/package.json b/packages/auth/package.json index 1dadf52f..a3741c2e 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/cache/package.json b/packages/cache/package.json index 695b44d5..b0fd8d07 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,9 +40,9 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^6.0.0", - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", - "@multiversx/sdk-nestjs-redis": "^6.0.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-redis": "6.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/common/package.json b/packages/common/package.json index f6c6da23..799d3a42 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 347b9da4..7107f0f4 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,7 +31,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^6.0.0", + "@multiversx/sdk-nestjs-http": "6.0.1-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/http/package.json b/packages/http/package.json index 9ffddea5..f64fdbaf 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -39,8 +39,8 @@ "axios": "^1.7.4" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^6.0.0", - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 05d16740..b04deea3 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 6b96db11..095627b6 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,7 +37,7 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^6.0.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/redis/package.json b/packages/redis/package.json index fc481f80..a53bebdf 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "6.0.0", + "version": "6.0.1-beta.0", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", From a9efa32c17baf655232a4d18f53e5ef860c5825f Mon Sep 17 00:00:00 2001 From: bogdan-rosianu Date: Fri, 22 Aug 2025 11:47:10 +0300 Subject: [PATCH 19/19] fix versions --- package-lock.json | 38 ++++++++++++++++++------------------ packages/auth/package.json | 6 +++--- packages/common/package.json | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4899adf7..fe8da281 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13188,7 +13188,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13203,9 +13203,9 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^6.0.0", - "@multiversx/sdk-nestjs-common": "^6.0.0", - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", + "@multiversx/sdk-nestjs-cache": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", "@nestjs/common": "^10.x" } }, @@ -13228,7 +13228,7 @@ }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "dependencies": { "lru-cache": "^8.0.4", @@ -13246,9 +13246,9 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^6.0.0", - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", - "@multiversx/sdk-nestjs-redis": "^6.0.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-redis": "6.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } @@ -13267,7 +13267,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13284,7 +13284,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", @@ -13298,7 +13298,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13307,13 +13307,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^6.0.0", + "@multiversx/sdk-nestjs-http": "6.0.1-beta.0", "@nestjs/common": "^10.x" } }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "dependencies": { "@multiversx/sdk-core": "^14.0.0", @@ -13330,15 +13330,15 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^6.0.0", - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "dependencies": { "prom-client": "^14.0.1", @@ -13357,7 +13357,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13372,13 +13372,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^6.0.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", "@nestjs/common": "^10.x" } }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "6.0.0", + "version": "6.0.1-beta.0", "license": "MIT", "dependencies": { "ioredis": "^5.2.3" diff --git a/packages/auth/package.json b/packages/auth/package.json index a3741c2e..b8ba1c5c 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -37,9 +37,9 @@ "jsonwebtoken": "^9.0.0" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^6.0.0", - "@multiversx/sdk-nestjs-common": "^6.0.0", - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", + "@multiversx/sdk-nestjs-cache": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-common": "6.0.1-beta.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/common/package.json b/packages/common/package.json index 799d3a42..abe14326 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -39,7 +39,7 @@ "winston": "^3.7.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^6.0.0", + "@multiversx/sdk-nestjs-monitoring": "6.0.1-beta.0", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x",