@decaf-ts/for-fabric 0.1.74 → 0.1.76

package/lib/shared/decorators.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImplicitPrivateCollection = exports.ModelCollection = void 0;
+exports.SEGREGATED_COLLECTION_EXTRACTION_PRIORITY = exports.ImplicitPrivateCollection = exports.ModelCollection = void 0;
 exports.Owner = Owner;
 exports.ownedByOnCreate = ownedByOnCreate;
 exports.ownedBy = ownedBy;
@@ -11,6 +11,8 @@ exports.createMirrorHandler = createMirrorHandler;
 exports.updateMirrorHandler = updateMirrorHandler;
 exports.deleteMirrorHandler = deleteMirrorHandler;
 exports.mirror = mirror;
+exports.NamespaceCollection = NamespaceCollection;
+exports.extractSegregatedCollections = extractSegregatedCollections;
 exports.segregatedDataOnCreate = segregatedDataOnCreate;
 exports.segregatedDataOnRead = segregatedDataOnRead;
 exports.segregatedDataOnUpdate = segregatedDataOnUpdate;
@@ -24,6 +26,18 @@ const constants_1 = require("./constants.cjs");
 const decoration_1 = require("@decaf-ts/decoration");
 const logging_1 = require("@decaf-ts/logging");
 require("./overrides/index.cjs");
+/**
+ * @description Extracts the MSP ID from either a string or ClientIdentity object
+ * @param identity - The identity value which can be a string MSP ID or ClientIdentity object
+ * @returns The MSP ID as a string, or undefined if not available
+ */
+function extractMspId(identity) {
+    if (!identity)
+        return undefined;
+    if (typeof identity === "string")
+        return identity;
+    return identity.getMSPID();
+}
 /**
  * Decorator for marking methods that require ownership authorization.
  * Checks the owner of the token before allowing the method to be executed.
@@ -172,9 +186,18 @@ const ModelCollection = (model, mspId) => {
     const constr = typeof model === "function" ? model : model.constructor;
     if (!orgName)
         throw new db_decorators_1.InternalError(`Model ${constr.name} is not owned by any organization. did you use @ownedBy() (or provide the name)?`);
-    return `${(0, logging_1.toPascalCase)(constr.name)}${mspId ? (0, logging_1.toPascalCase)(mspId) : ""}`;
+    return `${(0, logging_1.toPascalCase)(constr.name)}${orgName ? (0, logging_1.toPascalCase)(orgName) : ""}`;
 };
 exports.ModelCollection = ModelCollection;
+function NamespaceCollection(namespace) {
+    return (model, mspId) => {
+        const orgName = mspId || (typeof model !== "function" ? decorator_validation_1.Model.ownerOf(model) : undefined);
+        const constr = typeof model === "function" ? model : model.constructor;
+        if (!orgName)
+            throw new db_decorators_1.InternalError(`Model ${constr.name} is not owned by any organization. did you use @ownedBy() (or provide the name)?`);
+        return `${namespace}${orgName ? (0, logging_1.toPascalCase)(orgName) : ""}`;
+    };
+}
 const ImplicitPrivateCollection = (model, mspId) => {
     const orgName = mspId || (typeof model !== "function" ? decorator_validation_1.Model.ownerOf(model) : undefined);
     if (!orgName)
@@ -182,64 +205,126 @@ const ImplicitPrivateCollection = (model, mspId) => {
     return `__${(0, logging_1.toPascalCase)(orgName)}PrivateCollection`;
 };
 exports.ImplicitPrivateCollection = ImplicitPrivateCollection;
+/**
+ * @description Priority for early collection extraction (before pk generation at priority 60)
+ * @summary This priority ensures collections are registered in context before any sequence
+ * operations occur, allowing sequences to be replicated to private/shared collections.
+ */
+exports.SEGREGATED_COLLECTION_EXTRACTION_PRIORITY = 35;
+/**
+ * @description Early handler to extract and register collections in context
+ * @summary Runs with priority < 40 to extract collection names before pk generation (priority 60).
+ * This allows FabricContractSequence to know which collections to replicate to.
+ * @template M - Type that extends Model
+ * @param {ContextOf<Repository<M, any>>} context - The execution context
+ * @param {SegregatedDataMetadata | SegregatedDataMetadata[]} data - The segregated data metadata
+ * @param {string | string[]} keys - The property key(s) being segregated
+ * @param {M} model - The model instance
+ * @return {Promise<void>}
+ */
+async function extractSegregatedCollections(context, data, keys, model) {
+    const dataArray = (Array.isArray(data) ? data : [data]);
+    const msp = decorator_validation_1.Model.ownerOf(model) ||
+        extractMspId(context.get("identity"));
+    if (!msp) {
+        // Can't extract collections without MSP, will be caught by later handlers
+        return;
+    }
+    const collections = [];
+    for (const metadata of dataArray) {
+        const collectionResolver = metadata.collections;
+        const collection = typeof collectionResolver === "string"
+            ? collectionResolver
+            : collectionResolver(model, msp, context);
+        if (collection && !collections.includes(collection)) {
+            collections.push(collection);
+        }
+    }
+    // Register collections early using readFrom - this allows sequence code
+    // to know which collections to replicate to during pk generation
+    if (collections.length > 0) {
+        context.readFrom(collections);
+    }
+}
 async function segregatedDataOnCreate(context, data, keys, model) {
-    if (keys.length !== data.length)
+    const dataArray = (Array.isArray(data) ? data : [data]);
+    const keyArray = (Array.isArray(keys) ? keys : [keys]);
+    if (keyArray.length !== dataArray.length)
         throw new db_decorators_1.InternalError(`Segregated data keys and metadata length mismatch`);
-    const msp = decorator_validation_1.Model.ownerOf(model);
+    const msp = decorator_validation_1.Model.ownerOf(model) ||
+        extractMspId(context.get("identity"));
     if (!msp)
         throw new db_decorators_1.ValidationError(`There's no assigned organization for model ${model.constructor.name}`);
-    const collectionResolver = data[0].collections;
+    const collectionResolver = dataArray[0].collections;
     const collection = typeof collectionResolver === "string"
         ? collectionResolver
         : collectionResolver(model, msp, context);
-    const rebuilt = keys.reduce((acc, k, i) => {
-        const c = typeof data[i].collections === "string"
-            ? data[i].collections
-            : data[i].collections(model, msp, context);
+    const rebuilt = keyArray.reduce((acc, k, i) => {
+        const c = typeof dataArray[i].collections === "string"
+            ? dataArray[i].collections
+            : dataArray[i].collections(model, msp, context);
         if (c !== collection)
             throw new core_1.UnsupportedError(`Segregated data collection mismatch: ${c} vs ${collection}`);
         acc[k] = model[k];
         return acc;
     }, {});
     const toCreate = new this.class(rebuilt);
-    // const segregated = Model.segregate(model);
-    const created = await this.override({
-        segregated: collection,
-        mergeModel: false,
-        ignoreHandlers: true,
-        ignoreValidation: true,
-    }).create(toCreate, context);
-    Object.assign(model, created);
+    const segregated = decorator_validation_1.Model.segregate(model);
+    //  to the context the model, seggregated bu colelction (and including the non transient part)
+    context.writeTo(collection, segregated);
 }
 async function segregatedDataOnRead(context, data, keys, model) {
-    if (keys.length !== data.length)
+    const dataArray = (Array.isArray(data) ? data : [data]);
+    const keyArray = (Array.isArray(keys) ? keys : [keys]);
+    if (keyArray.length !== dataArray.length)
         throw new db_decorators_1.InternalError(`Segregated data keys and metadata length mismatch`);
-    const msp = decorator_validation_1.Model.ownerOf(model);
+    const msp = decorator_validation_1.Model.ownerOf(model) || extractMspId(context.get("identity"));
     if (!msp)
         throw new db_decorators_1.ValidationError(`There's no assigned organization for model ${model.constructor.name}`);
-    const collectionResolver = data[0].collections;
+    const collectionResolver = dataArray[0].collections;
     const collection = typeof collectionResolver === "string"
         ? collectionResolver
         : await collectionResolver(model, msp, context);
-    const rebuilt = keys.reduce((acc, k, i) => {
-        const c = typeof data[i].collections === "string"
-            ? data[i].collections
-            : data[i].collections(model, msp, context);
+    context.readFrom(collection);
+}
+async function segregatedDataOnUpdate(context, data, key, model, oldModel) {
+    const dataArray = (Array.isArray(data) ? data : [data]);
+    const keyArray = (Array.isArray(key) ? key : [key]);
+    if (keyArray.length !== dataArray.length)
+        throw new db_decorators_1.InternalError(`Segregated data keys and metadata length mismatch`);
+    const msp = decorator_validation_1.Model.ownerOf(model) ||
+        extractMspId(context.get("identity"));
+    if (!msp)
+        throw new db_decorators_1.ValidationError(`There's no assigned organization for model ${model.constructor.name}`);
+    const collectionResolver = dataArray[0].collections;
+    const collection = typeof collectionResolver === "string"
+        ? collectionResolver
+        : collectionResolver(model, msp, context);
+    keyArray.forEach((k, i) => {
+        const c = typeof dataArray[i].collections === "string"
+            ? dataArray[i].collections
+            : dataArray[i].collections(model, msp, context);
         if (c !== collection)
-            return acc;
-        acc[k] = model[k];
-        return acc;
-    }, {});
-    // const segregated = Model.segregate(model);
-    //
-    // const created = await this.override({ segregated: collection } as any).readAll(
-    //   toCreate,
-    //   context
-    // );
-    // Object.assign(model, created);
+            throw new core_1.UnsupportedError(`Segregated data collection mismatch: ${c} vs ${collection}`);
+    });
+    const segregated = decorator_validation_1.Model.segregate(model);
+    context.writeTo(collection, segregated);
+}
+async function segregatedDataOnDelete(context, data, key, model) {
+    const dataArray = (Array.isArray(data) ? data : [data]);
+    const keyArray = (Array.isArray(key) ? key : [key]);
+    if (keyArray.length !== dataArray.length)
+        throw new db_decorators_1.InternalError(`Segregated data keys and metadata length mismatch`);
+    const msp = decorator_validation_1.Model.ownerOf(model) ||
+        extractMspId(context.get("identity"));
+    if (!msp)
+        throw new db_decorators_1.ValidationError(`There's no assigned organization for model ${model.constructor.name}`);
+    const collectionResolver = dataArray[0].collections;
+    const collection = typeof collectionResolver === "string"
+        ? collectionResolver
+        : collectionResolver(model, msp, context);
+    context.readFrom(collection);
 }
-async function segregatedDataOnUpdate(context, data, key, model, oldModel) { }
-async function segregatedDataOnDelete(context, data, key, model) { }
 function segregated(collection, type, filter) {
     return function innerSegregated(target, propertyKey) {
         function segregatedDec(target, propertyKey) {
@@ -253,39 +338,50 @@ function segregated(collection, type, filter) {
             const constrMeta = decoration_1.Metadata.get(constr, type) || {};
             const constrCollections = new Set(constrMeta.collections || []);
             constrCollections.add(collection);
-            meta.collections = [...collections];
-            decoration_1.Metadata.set(constr, type, meta);
+            constrMeta.collections = [...constrCollections];
+            decoration_1.Metadata.set(constr, type, constrMeta);
+            const transientMeta = decoration_1.Metadata.get(constr, db_decorators_1.DBKeys.TRANSIENT) || {};
+            const updatedTransientMeta = {
+                ...transientMeta,
+                [propertyKey]: {},
+            };
+            decoration_1.Metadata.set(constr, db_decorators_1.DBKeys.TRANSIENT, updatedTransientMeta);
         }
         const decs = [];
         if (!propertyKey) {
             // decorated at the class level
-            decoration_1.Metadata.properties(target)?.forEach((p) => {
+            const properties = decoration_1.Metadata.validatableProperties(target);
+            properties?.forEach((p) => {
                 if (!filter || filter(p)) {
                     segregated(collection, type)(target.prototype, p);
                 }
             });
         }
         else {
-            decs.push((0, decoration_1.prop)(), (0, db_decorators_1.transient)(), segregatedDec, (0, db_decorators_1.onCreate)(segregatedDataOnCreate, { collections: collection }, {
+            const groupName = typeof collection === "string" ? collection : collection.toString();
+            const earlyExtractionMeta = { collections: collection };
+            const earlyExtractionGroupSort = {
+                priority: exports.SEGREGATED_COLLECTION_EXTRACTION_PRIORITY,
+                group: groupName,
+            };
+            decs.push((0, decoration_1.prop)(), (0, db_decorators_1.transient)(), segregatedDec, 
+            // Early extraction handlers - run BEFORE pk generation (priority 60)
+            // This ensures collections are registered in context for sequence replication
+            // We register for each operation explicitly to ensure proper handler lookup
+            (0, db_decorators_1.on)(db_decorators_1.DBOperations.ALL, extractSegregatedCollections, earlyExtractionMeta, earlyExtractionGroupSort), 
+            // Main handlers for segregated data operations (priority 95)
+            (0, db_decorators_1.onCreate)(segregatedDataOnCreate, { collections: collection }, {
                 priority: 95,
-                group: typeof collection === "string"
-                    ? collection
-                    : collection.toString(),
+                group: groupName,
             }), (0, db_decorators_1.onRead)(segregatedDataOnRead, { collections: collection }, {
                 priority: 95,
-                group: typeof collection === "string"
-                    ? collection
-                    : collection.toString(),
+                group: groupName,
             }), (0, db_decorators_1.onUpdate)(segregatedDataOnUpdate, { collections: collection }, {
                 priority: 95,
-                group: typeof collection === "string"
-                    ? collection
-                    : collection.toString(),
+                group: groupName,
             }), (0, db_decorators_1.onDelete)(segregatedDataOnDelete, { collections: collection }, {
                 priority: 95,
-                group: typeof collection === "string"
-                    ? collection
-                    : collection.toString(),
+                group: groupName,
             }));
         }
         return (0, decoration_1.apply)(...decs)(target, propertyKey);

package/lib/shared/decorators.d.ts

@@ -37,13 +37,32 @@ export declare function deleteMirrorHandler<M extends Model, R extends Repositor
 export declare function mirror(collection: CollectionResolver | string, condition?: MirrorCondition): (target: any, propertyKey?: any, descriptor?: TypedPropertyDescriptor<any>) => any;
 export type CollectionResolver = <M extends Model>(model: M | Constructor<M>, msp?: string, ...args: any[]) => string;
 export declare const ModelCollection: CollectionResolver;
+export declare function NamespaceCollection(namespace: string): CollectionResolver;
 export declare const ImplicitPrivateCollection: CollectionResolver;
 export type SegregatedDataMetadata = {
     collections: string | CollectionResolver;
 };
-export declare function segregatedDataOnCreate<M extends Model>(this: Repository<M, any>, context: ContextOf<typeof this>, data: SegregatedDataMetadata[], keys: (keyof M)[], model: M): Promise<void>;
-export declare function segregatedDataOnRead<M extends Model>(this: Repository<M, any>, context: Context<FabricFlags>, data: SegregatedDataMetadata[], keys: (keyof M)[], model: M): Promise<void>;
-export declare function segregatedDataOnUpdate<M extends Model>(this: Repository<M, any>, context: ContextOf<typeof this>, data: SegregatedDataMetadata[], key: keyof M[], model: M, oldModel: M): Promise<void>;
-export declare function segregatedDataOnDelete<M extends Model, R extends Repository<M, any>, V extends SegregatedDataMetadata>(this: R, context: ContextOf<R>, data: V[], key: keyof M[], model: M): Promise<void>;
+/**
+ * @description Priority for early collection extraction (before pk generation at priority 60)
+ * @summary This priority ensures collections are registered in context before any sequence
+ * operations occur, allowing sequences to be replicated to private/shared collections.
+ */
+export declare const SEGREGATED_COLLECTION_EXTRACTION_PRIORITY = 35;
+/**
+ * @description Early handler to extract and register collections in context
+ * @summary Runs with priority < 40 to extract collection names before pk generation (priority 60).
+ * This allows FabricContractSequence to know which collections to replicate to.
+ * @template M - Type that extends Model
+ * @param {ContextOf<Repository<M, any>>} context - The execution context
+ * @param {SegregatedDataMetadata | SegregatedDataMetadata[]} data - The segregated data metadata
+ * @param {string | string[]} keys - The property key(s) being segregated
+ * @param {M} model - The model instance
+ * @return {Promise<void>}
+ */
+export declare function extractSegregatedCollections<M extends Model>(this: Repository<M, any>, context: ContextOf<typeof this>, data: SegregatedDataMetadata | SegregatedDataMetadata[], keys: keyof M | (keyof M)[], model: M): Promise<void>;
+export declare function segregatedDataOnCreate<M extends Model>(this: Repository<M, any>, context: ContextOf<typeof this>, data: SegregatedDataMetadata | SegregatedDataMetadata[], keys: keyof M | (keyof M)[], model: M): Promise<void>;
+export declare function segregatedDataOnRead<M extends Model>(this: Repository<M, any>, context: Context<FabricFlags>, data: SegregatedDataMetadata | SegregatedDataMetadata[], keys: keyof M | (keyof M)[], model: M): Promise<void>;
+export declare function segregatedDataOnUpdate<M extends Model>(this: Repository<M, any>, context: ContextOf<typeof this>, data: SegregatedDataMetadata | SegregatedDataMetadata[], key: keyof M | (keyof M)[], model: M, oldModel: M): Promise<void>;
+export declare function segregatedDataOnDelete<M extends Model, R extends Repository<M, any>, V extends SegregatedDataMetadata>(this: R, context: ContextOf<R>, data: V | V[], key: (keyof M)[], model: M): Promise<void>;
 export declare function privateData(collection?: string | CollectionResolver): (target: any, propertyKey?: any, descriptor?: TypedPropertyDescriptor<any>) => any;
 export declare function sharedData(collection: string | CollectionResolver): (target: any, propertyKey?: any, descriptor?: TypedPropertyDescriptor<any>) => any;

package/lib/shared/decorators.js.map

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

package/lib/shared/overrides/overrides.cjs

@@ -19,7 +19,7 @@ decorator_validation_1.Model.segregate = function segregate(model) {
     const decoratedProperties = decoration_1.Metadata.validatableProperties(model.constructor);
     const transientProps = decoration_1.Metadata.get(model.constructor, db_decorators_1.DBKeys.TRANSIENT);
     const privateProperties = decoration_1.Metadata.get(model.constructor, constants_1.FabricModelKeys.PRIVATE);
-    const sharedProperties = decoration_1.Metadata.get(model.constructor, constants_1.FabricModelKeys.PRIVATE);
+    const sharedProperties = decoration_1.Metadata.get(model.constructor, constants_1.FabricModelKeys.SHARED);
     const result = {
         model: {},
         transient: {},
@@ -29,25 +29,32 @@ decorator_validation_1.Model.segregate = function segregate(model) {
     const transientKeys = Object.keys(transientProps || {});
     const privateKeys = Object.keys(privateProperties || {});
     const sharedKeys = Object.keys(sharedProperties || {});
+    const pkKey = decorator_validation_1.Model.pk(model.constructor);
     for (const key of decoratedProperties) {
+        const value = model[key];
         const isTransient = transientKeys.includes(key);
         const isPrivate = privateKeys.includes(key);
         const isShared = sharedKeys.includes(key);
-        if (isTransient) {
+        const isPrimaryKey = key === pkKey;
+        const decoratedValue = isPrimaryKey && typeof value === "string" && !value.endsWith(",")
+            ? `${value},`
+            : value;
+        if (isTransient || isPrivate || isShared) {
             result.transient = result.transient || {};
-            result.transient[key] = model[key];
-            if (isPrivate) {
-                result.privates = result.privates || {};
-                result.privates[key] = model[key];
-            }
-            if (isShared) {
-                result.shared = result.shared || {};
-                result.shared[key] = model[key];
-            }
+            result.transient[key] = decoratedValue;
         }
-        else {
+        if (isPrivate) {
+            result.privates = result.privates || {};
+            result.privates[key] = decoratedValue;
+        }
+        if (isShared) {
+            result.shared = result.shared || {};
+            result.shared[key] = decoratedValue;
+        }
+        const shouldIncludeInModel = !isTransient && !isPrivate && !isShared;
+        if (shouldIncludeInModel) {
             result.model = result.model || {};
-            result.model[key] = model[key];
+            result.model[key] = value;
         }
     }
     result.model = decorator_validation_1.Model.build(result.model, model.constructor.name);

package/lib/shared/overrides/overrides.js.map

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

package/lib/shared/types.d.ts

@@ -1,4 +1,5 @@
 import { TLSOptions } from "fabric-ca-client";
+import { ClientIdentity } from "fabric-shim-api";
 import { Model } from "@decaf-ts/decorator-validation";
 import { AdapterFlags } from "@decaf-ts/core";
 import { Logger } from "@decaf-ts/logging";
@@ -90,4 +91,5 @@ export type SegregatedModel<M extends Model> = {
 };
 export type FabricFlags<LOG extends Logger = Logger> = AdapterFlags<LOG> & {
     segregated?: string;
+    identity?: string | ClientIdentity;
 };

package/lib/version.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_NAME = exports.VERSION = void 0;
 const decoration_1 = require("@decaf-ts/decoration");
-exports.VERSION = "0.1.73";
+exports.VERSION = "0.1.75";
 exports.PACKAGE_NAME = "@decaf-ts/for-fabric";
 decoration_1.Metadata.registerLibrary(exports.PACKAGE_NAME, exports.VERSION);
 //# sourceMappingURL=version.js.map

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.73";
+export declare const VERSION = "0.1.75";
 export declare const PACKAGE_NAME = "@decaf-ts/for-fabric";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/for-fabric",
-  "version": "0.1.74",
+  "version": "0.1.76",
   "description": "Abstracts fabric logic",
   "type": "module",
   "exports": {
@@ -55,7 +55,7 @@
     "uml": "cd workdocs/uml && for FILE in ./*.puml; do docker run --rm -v $(pwd):/work -w /work miy4/plantuml -DPLANTUML_LIMIT_SIZE=8192 -tpng $FILE; done && cd ../.. && cp -fr workdocs/uml/*.png workdocs/resources/",
     "docs": "npx rimraf ./docs && mkdir docs && npx build-scripts --docs",
     "extract:indexes": "LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/GlobalContract",
-    "extract:collections": "LEVEL=verbose node ./lib/bin/cli.cjs extract-collections --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/GlobalContract --mspIds '[\"org-a\",\"org-b\"]' --mainMspId org-c",
+    "extract:collections": "LEVEL=verbose node ./lib/bin/cli.cjs extract-collections --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/GlobalContract --mspIds '[\"org-a\",\"org-b\"]' --mainMspId main-org",
     "infrastructure:up": "docker compose -f ./docker/infrastructure/docker-compose.yaml up -d",
     "infrastructure:down": "docker compose -f ./docker/infrastructure/docker-compose.yaml down --rmi local -v && rm -rf ./docker/docker-data && rm -f ./tests/integration/chaincodeTrackers/*.count",
     "infrastructure-hsm:up": "docker compose -f ./docker/infrastructure/docker-compose-hsm.yaml up -d",
@@ -63,7 +63,7 @@
     "build:contract2": "npx decaf fabric compile-contract --debug --bundle --name ${CONTRACT_NAME:-GlobalContract} --input ./src/contract --output ./docker/infrastructure/chaincode && LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract}",
     "update:contract": "npm run build:contract && npm run deploy:contract",
     "build:contract": "node ./lib/bin/cli.cjs compile-contract --dev --debug --bundle --name ${CONTRACT_NAME:-GlobalContract} --input ./src/contract --output ./docker/infrastructure/chaincode && LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract}",
-    "deploy:contract": "node ./lib/bin/cli.cjs deploy-contract --name ${CONTRACT_NAME:-GlobalContract} --input ${CONTRACT_NAME:-GlobalContract}",
+    "deploy:contract": "node ./lib/bin/cli.cjs deploy-contract --name ${CONTRACT_NAME:-GlobalContract} --input ${CONTRACT_NAME:-GlobalContract} --collections-config /home/tvenceslau/local-workspace/decaf-ts/for-fabric/docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract}/collections-config.json",
     "publish-docs": "docker run -it --rm --user $(id -u):$(id -g) -v \"$(pwd)/workdocs/confluence:/content\" -e ATLASSIAN_API_TOKEN=$(cat .confluence-token) ghcr.io/markdown-confluence/publish:latest",
     "copy-storage": "sudo cp -R docker/infrastructure/storage docker/docker-data/ && sudo chmod -R 755 docker/docker-data",
     "copy:crypto": "node ./lib/bin/cli.cjs get-crypto-material --folder ./docker/docker-data",
@@ -133,8 +133,6 @@
     "fabric-contract-api": "^2.5.8",
     "fabric-network": "^2.2.20",
     "fabric-shim": "^2.5.8",
-    "jsrsasign": "^11.1.0",
-    "jsrsasign-util": "^1.0.5",
     "rollup-plugin-ts": "^3.4.5"
   },
   "overrides": {