Api 84 api tokens with prefix

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/*"
   ],

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",

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",

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",

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-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);
@@ -13,4 +13,17 @@ export class TokenUtils {
   static isNft(identifier: string): boolean {
     return this.nftValidateRegex.test(identifier);
   }
+
+  static isSovereignIdentifier(identifier: string): boolean {
+    const numParts = identifier.split("-").length;
+    if (this.isCollection(identifier)) {
+      return numParts === 3;
+    }
+
+    if (this.isNft(identifier)) {
+      return numParts === 4;
+    }
+
+    return false;
+  }
 }

packages/common/test/utils/token.utils.spec.ts

@@ -3,20 +3,47 @@ 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('')).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();
     });
   });
 
   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('')).toBeFalsy();
+      expect(TokenUtils.isCollection('sov-')).toBeFalsy();
+      expect(TokenUtils.isCollection('SOV-MOS-b9b4b2')).toBeFalsy();
+      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('')).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();
+    });
+  });
+
+  describe('isSovereignIdentifier', () => {
+    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();
     });
   });

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",

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",

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",

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",

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",