From 5a93aa752e7278c9b7f7995a4d4c32883f12334a Mon Sep 17 00:00:00 2001 From: fraVlaca Date: Fri, 3 Sep 2021 11:30:39 +0100 Subject: [PATCH] final fixed for chaincode-javascript Signed-off-by: fraVlaca --- .../chaincode-javascript/lib/assetTransfer.js | 18 +++++++++--------- .../chaincode-javascript/package.json | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js b/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js index 0b3a86cc..0396307e 100644 --- a/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js +++ b/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js @@ -7,9 +7,9 @@ 'use strict'; -//Deterministic JSON.stringify() -const stringify = require('json-stringify-deterministic'); -const sortKeysRecursive = require('sort-keys-recursive'); +// Deterministic JSON.stringify() +const { stringify } = require('json-stringify-deterministic'); +const { sortKeysRecursive } = require('sort-keys-recursive'); const { Contract } = require('fabric-contract-api'); class AssetTransfer extends Contract { @@ -61,10 +61,10 @@ class AssetTransfer extends Contract { ]; for (const asset of assets) { - //example of how to write to world state deterministically - //use convetion of alphabetic order - //we insert data in alphabetic order using 'json-stringify-deterministic' and 'sort-keys-recursive' - //when retrieving data, in any lang, the order of data will be the same and consequently also the corresonding hash + // example of how to write to world state deterministically + // use convetion of alphabetic order + // we insert data in alphabetic order using 'json-stringify-deterministic' and 'sort-keys-recursive' + // when retrieving data, in any lang, the order of data will be the same and consequently also the corresonding hash await ctx.stub.putState(asset.ID, Buffer.from(stringify(sortKeysRecursive(asset)))); console.info(`Asset ${asset.ID} initialized`); } @@ -108,7 +108,7 @@ class AssetTransfer extends Contract { Owner: owner, AppraisedValue: appraisedValue, }; - //we insert data in alphabetic order using 'json-stringify-deterministic' and 'sort-keys-recursive' + // we insert data in alphabetic order using 'json-stringify-deterministic' and 'sort-keys-recursive' return ctx.stub.putState(id, Buffer.from(stringify(sortKeysRecursive(updatedAsset)))); } @@ -132,7 +132,7 @@ class AssetTransfer extends Contract { const assetString = await this.ReadAsset(ctx, id); const asset = JSON.parse(assetString); asset.Owner = newOwner; - //we insert data in alphabetic order using 'json-stringify-deterministic' and 'sort-keys-recursive' + // we insert data in alphabetic order using 'json-stringify-deterministic' and 'sort-keys-recursive' return ctx.stub.putState(id, Buffer.from(stringify(sortKeysRecursive(asset)))); } diff --git a/asset-transfer-basic/chaincode-javascript/package.json b/asset-transfer-basic/chaincode-javascript/package.json index b79ae948..430f9f61 100644 --- a/asset-transfer-basic/chaincode-javascript/package.json +++ b/asset-transfer-basic/chaincode-javascript/package.json @@ -19,8 +19,8 @@ "dependencies": { "fabric-contract-api": "^2.0.0", "fabric-shim": "^2.0.0", - "json-stringify-deterministic":"^1.0.0", - "sort-keys-recursive":"^2.0.0" + "json-stringify-deterministic": "^1.0.1", + "sort-keys-recursive": "^2.0.0" }, "devDependencies": { "chai": "^4.1.2",