Fix private-data TypeScript chaincode (#1357)

The build is only testing the Go chaincode for the
asset-transfer-private-data sample. The behavior of the TypeScript
chaincode implementation is not consistent with the Go and Java
versions, which prevents it from working correctly.

This change fixes the TypeScript chaincode implementation for the
asset-transfer-private-data sample so that it works correctly.
Additionally, some JSON property names are explicitly set in the Go
client application sample, which prevented it from working with the Java
and TypeScript chaincode implementations.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>

Author: bestbeforetoday

.github/workflows/test-network-private.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Private tests 🔒
 on:
   workflow_dispatch:
   push:
-    branches: [ "main", "release-2.5" ]
+    branches: ["main", "release-2.5"]
   pull_request:
-    branches: [ "main", "release-2.5" ]
+    branches: ["main", "release-2.5"]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -22,6 +22,8 @@ jobs:
       matrix:
         chaincode-language:
           - go
+          - java
+          - typescript
         chaincode-name:
           - private
     steps:

asset-transfer-private-data/application-gateway-go/app.go

@@ -162,11 +162,11 @@ func createAssets(contract *client.Contract) {
 	fmt.Printf("\n--> Submit Transaction: CreateAsset, ID: %s\n", assetID1)
 
 	type assetTransientInput struct {
-		ObjectType     string
-		AssetID        string
-		Color          string
-		Size           uint8
-		AppraisedValue uint16
+		ObjectType     string `json:"objectType"`
+		AssetID        string `json:"assetID"`
+		Color          string `json:"color"`
+		Size           uint8  `json:"size"`
+		AppraisedValue uint16 `json:"appraisedValue"`
 	}
 
 	asset1Data := assetTransientInput{
@@ -300,7 +300,9 @@ func transferAsset(contract *client.Contract, assetID string) (err error) {
 func deleteAsset(contract *client.Contract, assetID string) (err error) {
 	fmt.Printf("\n--> Submit Transaction: DeleteAsset, ID: %s\n", assetID)
 
-	dataForDelete := struct{ AssetID string }{assetID}
+	dataForDelete := struct {
+		AssetID string `json:"assetID"`
+	}{assetID}
 
 	if _, err = contract.Submit(
 		"DeleteAsset",
@@ -318,7 +320,9 @@ func deleteAsset(contract *client.Contract, assetID string) (err error) {
 func purgeAsset(contract *client.Contract, assetID string) (err error) {
 	fmt.Printf("\n--> Submit Transaction: PurgeAsset, ID: %s\n", assetID)
 
-	dataForPurge := struct{ AssetID string }{assetID}
+	dataForPurge := struct {
+		AssetID string `json:"assetID"`
+	}{assetID}
 
 	if _, err = contract.Submit(
 		"PurgeAsset",

asset-transfer-private-data/chaincode-typescript/npm-shrinkwrap.json

@@ -27,8 +27,8 @@
     "dependencies": {
         "fabric-contract-api": "~2.5",
         "fabric-shim": "~2.5",
-        "json-stringify-deterministic": "^1.0.0",
-        "sort-keys-recursive": "^2.1.0"
+        "json-stringify-deterministic": "^1.0.12",
+        "sort-keys-recursive": "^2.1.10"
     },
     "devDependencies": {
         "@types/node": "^18.19.33",

asset-transfer-private-data/chaincode-typescript/package.json

@@ -2,41 +2,52 @@
   SPDX-License-Identifier: Apache-2.0
 */
 
-import { Object, Property } from "fabric-contract-api";
-import { nonEmptyString, positiveNumber } from "./utils";
+import { Object, Property } from 'fabric-contract-api';
+import { nonEmptyString, positiveNumber } from './utils';
 
 @Object()
 // Asset describes main asset details that are visible to all organizations
 export class Asset {
     @Property()
-    docType?: string;
+    objectType?: string;
 
     @Property()
-    ID: string = "";
+    ID: string = '';
 
     @Property()
-    Color: string = "";
+    Color: string = '';
 
     @Property()
     Size: number = 0;
 
     @Property()
-    Owner: string = "";
+    Owner: string = '';
 
     static fromBytes(bytes: Uint8Array): Asset {
         if (bytes.length === 0) {
-            throw new Error("no asset data");
+            throw new Error('no asset data');
         }
-        const json = Buffer.from(bytes).toString();
+        const json = Buffer.from(bytes).toString('utf8');
         const properties = JSON.parse(json) as Partial<Asset>;
 
-        const result = new Asset();
-        result.docType = properties.docType;
-        result.ID = nonEmptyString(properties.ID, "ID field must be a non-empty string");
-        result.Color = nonEmptyString(properties.Color, "Color field must be a non-empty string");
-        result.Size = positiveNumber(properties.Size, "Size field must be a positive integer");
-        result.Owner = nonEmptyString(properties.Owner, "appraiseOwner field must be a non-empty string");
-
-        return result;
+        return {
+            objectType: properties.objectType,
+            ID: nonEmptyString(
+                properties.ID,
+                'ID field must be a non-empty string'
+            ),
+            Color: nonEmptyString(
+                properties.Color,
+                'Color field must be a non-empty string'
+            ),
+            Size: positiveNumber(
+                properties.Size,
+                'Size field must be a positive integer'
+            ),
+            Owner: nonEmptyString(
+                properties.Owner,
+                'appraiseOwner field must be a non-empty string'
+            ),
+        };
     }
 }