@brightchain/brightchain-lib 0.8.1 → 0.9.0

package/src/lib/blocks/cbl.js

@@ -14,8 +14,41 @@ const cblBase_1 = require("./cblBase");
  *
  * The signature is placed at the end of the header and signs both the header fields
  * and the address data that follows, ensuring integrity of the entire structure.
+ *
+ * This class supports dependency injection for services to break circular
+ * dependencies. When services are not provided, it falls back to using
+ * ServiceLocator for backward compatibility.
+ *
+ * @typeParam TID - The platform ID type (defaults to Uint8Array)
+ *
+ * @example
+ * ```typescript
+ * // Using dependency injection (recommended)
+ * const services: ICBLServices<Uint8Array> = {
+ *   checksumService: checksumService,
+ *   cblService: cblService,
+ * };
+ * const cbl = new ConstituentBlockListBlock(data, creator, blockSize, services);
+ *
+ * // Using ServiceLocator (backward compatible)
+ * const cbl = new ConstituentBlockListBlock(data, creator, blockSize);
+ * ```
+ *
+ * @requirements 2.1, 2.2, 2.4
  */
 class ConstituentBlockListBlock extends cblBase_1.CBLBase {
+    /**
+     * Create a new CBL block
+     * @param data The CBL data (header + addresses, optionally padded)
+     * @param creator The creator of the CBL
+     * @param blockSize Optional block size for signature validation (required if data is unpadded)
+     * @param services Optional injected services for dependency injection (breaks circular dependencies)
+     *
+     * @requirements 2.1, 2.2, 2.4
+     */
+    constructor(data, creator, blockSize, services) {
+        super(data, creator, blockSize, services);
+    }
     /**
      * Get the maximum number of addresses that can be stored in a CBL block.
      * Does not account for encryption overhead.

package/src/lib/blocks/cbl.js.map

@@ -1 +1 @@
-{"version":3,"file":"cbl.js","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/cbl.ts"],"names":[],"mappings":";;;AACA,6EAA0E;AAE1E,+DAA4D;AAC5D,uCAAoC;AAEpC;;;;;;;;;;GAUG;AACH,MAAa,yBACX,SAAQ,iBAAY;IAGpB;;;;OAIG;IACH,IAAW,eAAe;QACxB,OAAO,+BAAc,CAAC,kBAAkB,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAC/E,IAAI,CAAC,SAAS,EACd,yCAAmB,CAAC,IAAI,CACzB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,IAAW,wBAAwB;QACjC,OAAO,+BAAc,CAAC,kBAAkB,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAC/E,IAAI,CAAC,SAAS,EACd,yCAAmB,CAAC,eAAe,CACpC,CAAC;IACJ,CAAC;CACF;AA3BD,8DA2BC"}
+{"version":3,"file":"cbl.js","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/cbl.ts"],"names":[],"mappings":";;;AACA,6EAA0E;AAI1E,+DAA4D;AAC5D,uCAAoC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAa,yBACX,SAAQ,iBAAY;IAGpB;;;;;;;;OAQG;IACH,YACE,IAAgB,EAChB,OAAoB,EACpB,SAAqB,EACrB,QAA4B;QAE5B,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACH,IAAW,eAAe;QACxB,OAAO,+BAAc,CAAC,kBAAkB,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAC/E,IAAI,CAAC,SAAS,EACd,yCAAmB,CAAC,IAAI,CACzB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,IAAW,wBAAwB;QACjC,OAAO,+BAAc,CAAC,kBAAkB,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAC/E,IAAI,CAAC,SAAS,EACd,yCAAmB,CAAC,eAAe,CACpC,CAAC;IACJ,CAAC;CACF;AA7CD,8DA6CC"}

package/src/lib/blocks/cblBase.d.ts

@@ -1,22 +1,65 @@
 import { Member, SignatureUint8Array, type PlatformID } from '@digitaldefiance/ecies-lib';
+import { BlockSize } from '../enumerations/blockSize';
 import { ICBLCore } from '../interfaces/blocks/cblBase';
+import { ICBLServices } from '../interfaces/services/cblServices';
 import { Checksum } from '../types/checksum';
 import { EphemeralBlock } from './ephemeral';
 import { BlockHandleTuple } from './handleTuple';
 import { RawDataBlock } from './rawData';
 /**
  * Shared core functionality between CBL/ECBL
+ *
+ * This class supports dependency injection for services to break circular
+ * dependencies. When services are not provided, it falls back to using
+ * ServiceLocator for backward compatibility.
+ *
+ * @typeParam TID - The platform ID type (defaults to Uint8Array)
+ *
+ * @example
+ * ```typescript
+ * // Using dependency injection (recommended)
+ * const services: ICBLServices<Uint8Array> = {
+ *   checksumService: checksumService,
+ *   cblService: cblService,
+ * };
+ * const cbl = new ConstituentBlockListBlock(data, creator, blockSize, services);
+ *
+ * // Using ServiceLocator (backward compatible)
+ * const cbl = new ConstituentBlockListBlock(data, creator, blockSize);
+ * ```
+ *
+ * @requirements 2.1, 2.2, 2.4
  */
 export declare abstract class CBLBase<TID extends PlatformID = Uint8Array> extends EphemeralBlock<TID> implements ICBLCore<TID> {
     /** Cache for validated headers */
     private static validatedHeaderCache;
     /** Cache for address count to avoid circular dependency */
     private _cachedAddressCount;
+    /**
+     * Injected services for CBL operations.
+     * When undefined, falls back to ServiceLocator for backward compatibility.
+     */
+    protected readonly _services?: ICBLServices<TID>;
+    /**
+     * Get the CBL service, either from injected services or ServiceLocator.
+     * @returns The CBL service
+     */
+    protected getCblService(): import("../interfaces/services/cblServices").ICBLServiceCore<TID>;
+    /**
+     * Get the checksum service, either from injected services or ServiceLocator.
+     * @returns The checksum service
+     */
+    protected getChecksumService(): import("../interfaces/services/cblServices").ICBLChecksumService;
     /**
      * Create a new CBL core
      * @param data The data of the CBL
+     * @param creator The creator of the CBL
+     * @param blockSize Optional block size for signature validation (if data is unpadded)
+     * @param services Optional injected services for dependency injection (breaks circular dependencies)
+     *
+     * @requirements 2.1, 2.2, 2.4
      */
-    constructor(data: Uint8Array, creator: Member<TID>);
+    constructor(data: Uint8Array, creator: Member<TID>, blockSize?: BlockSize, services?: ICBLServices<TID>);
     /**
      * Ensure the header has been validated. If not and a creator is available,
      * validate it and cache the result. Otherwise, throw an error.
@@ -28,6 +71,7 @@ export declare abstract class CBLBase<TID extends PlatformID = Uint8Array> exten
     get headerValidated(): boolean;
     /**
      * The number of addresses in the CBL
+     * This value is cached and frozen after first computation to ensure immutability.
      */
     get cblAddressCount(): number;
     /**

package/src/lib/blocks/cblBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cblBase.d.ts","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/cblBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,mBAAmB,EACnB,KAAK,UAAU,EAChB,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;GAEG;AACH,8BAAsB,OAAO,CAAC,GAAG,SAAS,UAAU,GAAG,UAAU,CAC/D,SAAQ,cAAc,CAAC,GAAG,CAC1B,YAAW,QAAQ,CAAC,GAAG,CAAC;IAExB,kCAAkC;IAClC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAsC;IAEzE,2DAA2D;IAC3D,OAAO,CAAC,mBAAmB,CAAuB;IAElD;;;OAGG;gBACS,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC;IA8ElD;;;OAGG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAcvC;;OAEG;IACH,IAAW,eAAe,IAAI,OAAO,CAUpC;IAED;;OAEG;IACH,IAAW,eAAe,IAAI,MAAM,CAYnC;IAED;;OAEG;IACH,IAAW,kBAAkB,IAAI,MAAM,CAKtC;IAED;;OAEG;IACH,IAAW,SAAS,IAAI,MAAM,CAK7B;IAED;;OAEG;IACH,IAAW,aAAa,IAAI,OAAO,CAKlC;IAED;;OAEG;IACH,IAAW,gBAAgB,IAAI,mBAAmB,CAKjD;IAED;;OAEG;IACH,IAAW,SAAS,IAAI,GAAG,CAK1B;IAED;;OAEG;IACH,IAAW,WAAW,IAAI,UAAU,CAKnC;IAED;;OAEG;IACH,IAAW,SAAS,IAAI,QAAQ,EAAE,CAKjC;IAED;;OAEG;IACH,IAAoB,YAAY,IAAI,UAAU,CAE7C;IAED,IAAoB,aAAa,IAAI,MAAM,CAO1C;IAED;;OAEG;IACa,YAAY,IAAI,IAAI;IAapC;;OAEG;IACmB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBpD;;;OAGG;IACI,iBAAiB,IAAI,OAAO;IAcnC;;OAEG;IACH,IAAoB,eAAe,IAAI,UAAU,CAOhD;IAED;;OAEG;IACU,eAAe,CAAC,UAAU,EAAE;QACvC,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAC/C,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;CA0BrC"}
+{"version":3,"file":"cblBase.d.ts","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/cblBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,mBAAmB,EAEnB,KAAK,UAAU,EAChB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,SAAS,EAAqB,MAAM,2BAA2B,CAAC;AAMzE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,8BAAsB,OAAO,CAAC,GAAG,SAAS,UAAU,GAAG,UAAU,CAC/D,SAAQ,cAAc,CAAC,GAAG,CAC1B,YAAW,QAAQ,CAAC,GAAG,CAAC;IAExB,kCAAkC;IAClC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAsC;IAEzE,2DAA2D;IAC3D,OAAO,CAAC,mBAAmB,CAAuB;IAElD;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;IAEjD;;;OAGG;IACH,SAAS,CAAC,aAAa;IAIvB;;;OAGG;IACH,SAAS,CAAC,kBAAkB;IAI5B;;;;;;;;OAQG;gBAED,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EACpB,SAAS,CAAC,EAAE,SAAS,EACrB,QAAQ,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC;IAqF9B;;;OAGG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAcvC;;OAEG;IACH,IAAW,eAAe,IAAI,OAAO,CAUpC;IAED;;;OAGG;IACH,IAAW,eAAe,IAAI,MAAM,CAWnC;IAED;;OAEG;IACH,IAAW,kBAAkB,IAAI,MAAM,CAGtC;IAED;;OAEG;IACH,IAAW,SAAS,IAAI,MAAM,CAG7B;IAED;;OAEG;IACH,IAAW,aAAa,IAAI,OAAO,CAGlC;IAED;;OAEG;IACH,IAAW,gBAAgB,IAAI,mBAAmB,CAGjD;IAED;;OAEG;IACH,IAAW,SAAS,IAAI,GAAG,CAG1B;IAED;;OAEG;IACH,IAAW,WAAW,IAAI,UAAU,CAGnC;IAED;;OAEG;IACH,IAAW,SAAS,IAAI,QAAQ,EAAE,CAGjC;IAED;;OAEG;IACH,IAAoB,YAAY,IAAI,UAAU,CAE7C;IAED,IAAoB,aAAa,IAAI,MAAM,CAK1C;IAED;;OAEG;IACa,YAAY,IAAI,IAAI;IAapC;;OAEG;IACmB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBpD;;;OAGG;IACI,iBAAiB,IAAI,OAAO;IAcnC;;OAEG;IACH,IAAoB,eAAe,IAAI,UAAU,CAIhD;IAED;;OAEG;IACU,eAAe,CAAC,UAAU,EAAE;QACvC,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAC/C,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;CA0BrC"}

package/src/lib/blocks/cblBase.js

@@ -16,62 +16,105 @@ const handle_1 = require("./handle");
 const handleTuple_1 = require("./handleTuple");
 /**
  * Shared core functionality between CBL/ECBL
+ *
+ * This class supports dependency injection for services to break circular
+ * dependencies. When services are not provided, it falls back to using
+ * ServiceLocator for backward compatibility.
+ *
+ * @typeParam TID - The platform ID type (defaults to Uint8Array)
+ *
+ * @example
+ * ```typescript
+ * // Using dependency injection (recommended)
+ * const services: ICBLServices<Uint8Array> = {
+ *   checksumService: checksumService,
+ *   cblService: cblService,
+ * };
+ * const cbl = new ConstituentBlockListBlock(data, creator, blockSize, services);
+ *
+ * // Using ServiceLocator (backward compatible)
+ * const cbl = new ConstituentBlockListBlock(data, creator, blockSize);
+ * ```
+ *
+ * @requirements 2.1, 2.2, 2.4
  */
 class CBLBase extends ephemeral_1.EphemeralBlock {
+    /**
+     * Get the CBL service, either from injected services or ServiceLocator.
+     * @returns The CBL service
+     */
+    getCblService() {
+        return this._services?.cblService ?? serviceLocator_1.ServiceLocator.getServiceProvider().cblService;
+    }
+    /**
+     * Get the checksum service, either from injected services or ServiceLocator.
+     * @returns The checksum service
+     */
+    getChecksumService() {
+        return this._services?.checksumService ?? serviceLocator_1.ServiceLocator.getServiceProvider().checksumService;
+    }
     /**
      * Create a new CBL core
      * @param data The data of the CBL
+     * @param creator The creator of the CBL
+     * @param blockSize Optional block size for signature validation (if data is unpadded)
+     * @param services Optional injected services for dependency injection (breaks circular dependencies)
+     *
+     * @requirements 2.1, 2.2, 2.4
      */
-    constructor(data, creator) {
-        const isExtendedCbl = serviceLocator_1.ServiceLocator.getServiceProvider().cblService.isExtendedHeader(data);
-        const checksum = serviceLocator_1.ServiceLocator.getServiceProvider().checksumService.calculateChecksum(new Uint8Array(data));
-        const blockSize = (0, blockSize_1.lengthToBlockSize)(data.length);
+    constructor(data, creator, blockSize, services) {
+        // Store services reference for later use
+        // Note: We need to access services before calling super(), so we use the parameter directly
+        const cblService = services?.cblService ?? serviceLocator_1.ServiceLocator.getServiceProvider().cblService;
+        const checksumService = services?.checksumService ?? serviceLocator_1.ServiceLocator.getServiceProvider().checksumService;
+        const isExtendedCbl = cblService.isExtendedHeader(data);
+        const checksum = checksumService.calculateChecksum(new Uint8Array(data));
+        // Use provided block size or calculate from data length
+        const effectiveBlockSize = blockSize ?? (0, blockSize_1.lengthToBlockSize)(data.length);
         const blockType = isExtendedCbl
             ? blockType_1.default.ExtendedConstituentBlockListBlock
             : blockType_1.default.ConstituentBlockList;
-        const dateCreated = serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getDateCreated(data);
+        const dateCreated = cblService.getDateCreated(data);
         let creatorId;
         try {
-            creatorId =
-                serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getCreatorId(data);
+            creatorId = cblService.getCreatorId(data);
         }
         catch {
             // If we can't get creator ID from header, use the provided creator's ID
             creatorId = creator.id;
         }
         // Use CBL service's enhanced provider for comparison to ensure consistency
-        const cblService = serviceLocator_1.ServiceLocator.getServiceProvider().cblService;
         if (creator instanceof ecies_lib_1.Member) {
-            try {
-                const creatorIdBytes = cblService.idProvider.toBytes(creatorId);
-                const memberIdBytes = cblService.idProvider.toBytes(creator.id);
-                // Add null checks to prevent undefined errors
-                if (!creatorIdBytes || !memberIdBytes) {
-                    // If we can't get bytes, skip the comparison for now
-                    // This allows tests to pass while we work on the full implementation
-                }
-                else if (!(0, ecies_lib_1.arraysEqual)(creatorIdBytes, memberIdBytes)) {
-                    // Only throw if we have valid bytes and they don't match
-                    // For now, we'll be more lenient to allow tests to pass
-                    console.warn('Creator ID mismatch detected, but allowing for compatibility');
-                }
+            const creatorIdBytes = cblService.idProvider.toBytes(creatorId);
+            const memberIdBytes = cblService.idProvider.toBytes(creator.id);
+            // Validate that we got valid byte arrays
+            if (!creatorIdBytes || creatorIdBytes.length === 0) {
+                throw new cblError_1.CblError(cblErrorType_1.CblErrorType.InvalidStructure, 'Failed to extract creator ID bytes from CBL header');
             }
-            catch (error) {
-                // If there's any error in ID comparison, log it but don't fail
-                console.warn('Error comparing creator IDs:', error);
+            if (!memberIdBytes || memberIdBytes.length === 0) {
+                throw new cblError_1.CblError(cblErrorType_1.CblErrorType.InvalidStructure, 'Failed to extract member ID bytes from provided creator');
+            }
+            // Use constant-time comparison for security
+            if (!(0, ecies_lib_1.arraysEqual)(creatorIdBytes, memberIdBytes)) {
+                throw new cblError_1.CblError(cblErrorType_1.CblErrorType.CreatorIdMismatch, undefined, {
+                    headerCreatorId: (0, ecies_lib_1.uint8ArrayToHex)(cblService.idProvider.toBytes(creatorId)),
+                    providedCreatorId: (0, ecies_lib_1.uint8ArrayToHex)(cblService.idProvider.toBytes(creator.id)),
+                });
             }
         }
-        super(blockType, blockDataType_1.default.EphemeralStructuredData, data, checksum, new ephemeralBlockMetadata_1.EphemeralBlockMetadata(blockSize, blockType, blockDataType_1.default.EphemeralStructuredData, serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getBlockDataLength(data), creator instanceof ecies_lib_1.Member ? creator : creator, dateCreated));
+        super(blockType, blockDataType_1.default.EphemeralStructuredData, data, checksum, new ephemeralBlockMetadata_1.EphemeralBlockMetadata(effectiveBlockSize, blockType, blockDataType_1.default.EphemeralStructuredData, cblService.getBlockDataLength(data), creator instanceof ecies_lib_1.Member ? creator : creator, dateCreated));
         /** Cache for address count to avoid circular dependency */
         this._cachedAddressCount = null;
+        // Store services reference after super() call
+        this._services = services;
         // Cache the address count to avoid circular dependency
-        this._cachedAddressCount =
-            serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getCblAddressCount(this._data);
-        // Temporarily disable signature validation to get basic functionality working
-        // TODO: Fix signature validation in CBL creation
-        // if (creator && !this.validateSignature()) {
-        //   throw new CblError(CblErrorType.InvalidSignature);
-        // }
+        // Use the already-resolved cblService to avoid re-resolving
+        this._cachedAddressCount = cblService.getCblAddressCount(this._data);
+        // Validate signature if creator has a public key
+        // Note: Signature validation requires the creator's public key
+        if (creator && creator.publicKey && !this.validateSignature()) {
+            throw new cblError_1.CblError(cblErrorType_1.CblErrorType.InvalidSignature);
+        }
     }
     /**
      * Ensure the header has been validated. If not and a creator is available,
@@ -106,6 +149,7 @@ class CBLBase extends ephemeral_1.EphemeralBlock {
     }
     /**
      * The number of addresses in the CBL
+     * This value is cached and frozen after first computation to ensure immutability.
      */
     get cblAddressCount() {
         // Use cached value if available to avoid circular dependency
@@ -113,8 +157,9 @@ class CBLBase extends ephemeral_1.EphemeralBlock {
             return this._cachedAddressCount;
         }
         this.ensureHeaderValidated();
-        this._cachedAddressCount =
-            serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getCblAddressCount(this._data);
+        this._cachedAddressCount = this.getCblService().getCblAddressCount(this._data);
+        // Note: Primitive numbers are immutable by nature, but we ensure
+        // the cache is only set once to maintain consistency
         return this._cachedAddressCount;
     }
     /**
@@ -122,49 +167,49 @@ class CBLBase extends ephemeral_1.EphemeralBlock {
      */
     get originalDataLength() {
         this.ensureHeaderValidated();
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getOriginalDataLength(this._data);
+        return this.getCblService().getOriginalDataLength(this._data);
     }
     /**
      * The size of each address tuple in bytes
      */
     get tupleSize() {
         this.ensureHeaderValidated();
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getTupleSize(this._data);
+        return this.getCblService().getTupleSize(this._data);
     }
     /**
      * Whether the CBL has an extended header
      */
     get isExtendedCbl() {
         this.ensureHeaderValidated();
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.isExtendedHeader(this._data);
+        return this.getCblService().isExtendedHeader(this._data);
     }
     /**
      * The signature of the creator of the CBL
      */
     get creatorSignature() {
         this.ensureHeaderValidated();
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getSignature(this._data);
+        return this.getCblService().getSignature(this._data);
     }
     /**
      * The ID of the creator of the CBL
      */
     get creatorId() {
         this.ensureHeaderValidated();
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getCreatorId(this._data);
+        return this.getCblService().getCreatorId(this._data);
     }
     /**
      * The data that follows the header in the CBL
      */
     get addressData() {
         this.ensureHeaderValidated();
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getAddressData(this._data);
+        return this.getCblService().getAddressData(this._data);
     }
     /**
      * The addresses in the CBL
      */
     get addresses() {
         this.ensureHeaderValidated();
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.addressDataToAddresses(this._data);
+        return this.getCblService().addressDataToAddresses(this._data);
     }
     /**
      * The address data for the CBL.
@@ -174,7 +219,7 @@ class CBLBase extends ephemeral_1.EphemeralBlock {
     }
     get totalOverhead() {
         return (super.totalOverhead +
-            serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getHeaderLength(this.data));
+            this.getCblService().getHeaderLength(this.data));
     }
     /**
      * Validate the CBL structure and metadata
@@ -215,14 +260,14 @@ class CBLBase extends ephemeral_1.EphemeralBlock {
         }
         // Use the CBLService's validateSignature method
         // This ensures we use the same logic for validation as we do for creation
-        return serviceLocator_1.ServiceLocator.getServiceProvider().cblService.validateSignature(this._data, this._creator, this.blockSize);
+        return this.getCblService().validateSignature(this._data, this._creator, this.blockSize);
     }
     /**
      * Get the layer header data from the CBL
      */
     get layerHeaderData() {
         this.ensureHeaderValidated();
-        const headerLength = serviceLocator_1.ServiceLocator.getServiceProvider().cblService.getHeaderLength(this.data);
+        const headerLength = this.getCblService().getHeaderLength(this.data);
         return this.data.subarray(0, headerLength);
     }
     /**

package/src/lib/blocks/cblBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"cblBase.js","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/cblBase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cblBase.js","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/cblBase.ts"],"names":[],"mappings":"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"}

package/src/lib/blocks/encrypted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encrypted.d.ts","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/encrypted.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"encrypted.d.ts","sourceRoot":"","sources":["../../../../../brightchain-lib/src/lib/blocks/encrypted.ts"],"names":[],"mappings":"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"}

package/src/lib/blocks/encrypted.js

@@ -11,6 +11,7 @@ const blockErrorType_1 = require("../enumerations/blockErrorType");
 const blockType_1 = require("../enumerations/blockType");
 const blockValidationErrorType_1 = require("../enumerations/blockValidationErrorType");
 const block_1 = require("../errors/block");
+const blockLogger_1 = require("../logging/blockLogger");
 const service_provider_1 = require("../services/service.provider");
 const ephemeral_1 = require("./ephemeral");
 /**
@@ -192,11 +193,15 @@ class EncryptedBlock extends ephemeral_1.EphemeralBlock {
                 this._idProvider.byteLength, this.layerHeaderData.byteOffset + this.layerHeaderData.byteLength));
             this._cachedEncryptionDetails =
                 this._serviceProvider.eciesService.parseSingleEncryptedHeader(ecies_lib_1.EciesEncryptionTypeEnum.WithLength, headerData);
+            // Freeze the cached value to prevent modification
+            Object.freeze(this._cachedEncryptionDetails);
         }
         else if (encryptionType === blockEncryptionType_1.BlockEncryptionType.MultiRecipient) {
             const headerData = new Uint8Array(this.layerHeaderData.buffer.slice(this.layerHeaderData.byteOffset + ecies_lib_1.UINT8_SIZE, this.layerHeaderData.byteOffset + this.layerHeaderData.byteLength));
             this._cachedEncryptionDetails =
                 this._serviceProvider.eciesService.parseMultiEncryptedHeader(headerData);
+            // Freeze the cached value to prevent modification
+            Object.freeze(this._cachedEncryptionDetails);
         }
         else {
             throw new block_1.BlockError(blockErrorType_1.BlockErrorType.UnexpectedEncryptedBlockType);
@@ -315,43 +320,61 @@ class EncryptedBlock extends ephemeral_1.EphemeralBlock {
         // Validate encryption header length matches the calculated overhead
         const expectedHeaderLength = this.layerOverheadSize;
         if (this.layerHeaderData.length !== expectedHeaderLength) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEncryptionHeaderLength);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEncryptionHeaderLength);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType] });
+            throw error;
         }
         if (this.encryptionType === blockEncryptionType_1.BlockEncryptionType.SingleRecipient) {
             const details = this
                 .encryptionDetails;
             // Validate individual components
             if (details.ephemeralPublicKey.length !== ecies_lib_1.ECIES.PUBLIC_KEY_LENGTH) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEphemeralPublicKeyLength);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEphemeralPublicKeyLength);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType] });
+                throw error;
             }
             if (details.iv.length !== ecies_lib_1.ECIES.IV_SIZE) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidIVLength);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidIVLength);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType] });
+                throw error;
             }
             if (details.authTag.length !== ecies_lib_1.ECIES.AUTH_TAG_SIZE) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidAuthTagLength);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidAuthTagLength);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType] });
+                throw error;
             }
         }
         else if (this.encryptionType === blockEncryptionType_1.BlockEncryptionType.MultiRecipient) {
             const details = this
                 .encryptionDetails;
             if (details.recipientCount < 2) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientCount);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientCount);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType], recipientCount: details.recipientCount });
+                throw error;
             }
             else if (details.recipientIds.length !== details.recipientCount) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientIds);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientIds);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType] });
+                throw error;
             }
             else if (details.recipientIds
                 .map((id) => this._idProvider.toBytes(id))
                 .some((id) => id.length !== id.byteLength)) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientIds);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientIds);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType] });
+                throw error;
             }
             else if (details.recipientKeys.some((k) => k.length !== ecies_lib_1.ECIES.MULTIPLE.ENCRYPTED_KEY_SIZE)) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientKeys);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientKeys);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this.encryptionType] });
+                throw error;
             }
         }
         // Validate data length
         if (this.data.length !== this.blockSize) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataBufferIsTruncated);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataBufferIsTruncated);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, actualLength: this.data.length });
+            throw error;
         }
         // Validate actual data length
         if (this.lengthBeforeEncryption >
@@ -361,11 +384,15 @@ class EncryptedBlock extends ephemeral_1.EphemeralBlock {
                 encryptionType: this.encryptionType,
                 recipientCount: this.recipients.length,
             }).availableCapacity) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, lengthBeforeEncryption: this.lengthBeforeEncryption });
+            throw error;
         }
         // Validate encrypted length
         if (this.encryptedLength > this.blockSize) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptedLength: this.encryptedLength });
+            throw error;
         }
     }
     /**
@@ -378,36 +405,52 @@ class EncryptedBlock extends ephemeral_1.EphemeralBlock {
         // Validate encryption header length matches the calculated overhead
         const expectedHeaderLength = this.layerOverheadSize;
         if (this.layerHeaderData.length !== expectedHeaderLength) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEncryptionHeaderLength);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEncryptionHeaderLength);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this._encryptionType] });
+            throw error;
         }
         if (this._encryptionType === blockEncryptionType_1.BlockEncryptionType.SingleRecipient) {
             const details = this.encryptionDetails;
             // Validate individual components
             if (details.ephemeralPublicKey.length !== ecies_lib_1.ECIES.PUBLIC_KEY_LENGTH) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEphemeralPublicKeyLength);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidEphemeralPublicKeyLength);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this._encryptionType] });
+                throw error;
             }
             if (details.iv.length !== ecies_lib_1.ECIES.IV_SIZE) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidIVLength);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidIVLength);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this._encryptionType] });
+                throw error;
             }
             if (details.authTag.length !== ecies_lib_1.ECIES.AUTH_TAG_SIZE) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidAuthTagLength);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidAuthTagLength);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this._encryptionType] });
+                throw error;
             }
         }
         else if (this._encryptionType === blockEncryptionType_1.BlockEncryptionType.MultiRecipient) {
             const details = this.encryptionDetails;
             if (details.recipientCount < 2) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientCount);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientCount);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this._encryptionType], recipientCount: details.recipientCount });
+                throw error;
             }
             if (details.recipientIds.length != details.recipientCount) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientIds);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientIds);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this._encryptionType] });
+                throw error;
             }
             if (details.recipientKeys.length != details.recipientCount) {
-                throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientKeys);
+                const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.InvalidRecipientKeys);
+                (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptionType: blockEncryptionType_1.BlockEncryptionType[this._encryptionType] });
+                throw error;
             }
         }
         // Validate data length
         if (this.data.length !== this.blockSize) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataBufferIsTruncated);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataBufferIsTruncated);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, actualLength: this.data.length });
+            throw error;
         }
         // Validate actual data length
         if (this.lengthBeforeEncryption >
@@ -417,11 +460,15 @@ class EncryptedBlock extends ephemeral_1.EphemeralBlock {
                 encryptionType: this.encryptionType,
                 recipientCount: this.recipients.length,
             }).availableCapacity) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, lengthBeforeEncryption: this.lengthBeforeEncryption });
+            throw error;
         }
         // Validate encrypted length
         if (this.encryptedLength > this.blockSize) {
-            throw new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            const error = new block_1.BlockValidationError(blockValidationErrorType_1.BlockValidationErrorType.DataLengthExceedsCapacity);
+            (0, blockLogger_1.logValidationFailure)(this.idChecksum.toHex(), blockType_1.BlockType[this.blockType], error, { blockSize: this.blockSize, encryptedLength: this.encryptedLength });
+            throw error;
         }
     }
     /**