From 4919ac1c163b1368fbe8ba53d9fe587cd24463ab Mon Sep 17 00:00:00 2001
From: "sownak.roy" <sownak.roy@accenture.com>
Date: Mon, 22 Jan 2024 17:29:42 +0000
Subject: [PATCH] [besu] Updates

Signed-off-by: sownak.roy <sownak.roy@accenture.com>
---
 .gitignore                                    |   1 +
 .../express_nodeJS/controllers/container.js   |  14 +-
 .../express_nodeJS/controllers/general.js     |   5 +-
 .../express_nodeJS/controllers/product.js     |  15 +-
 .../besu/express_nodeJS/web3services.js       |   2 +-
 .../besu/smartContracts/package-lock.json     | 257 ++++++------------
 .../besu/smartContracts/package.json          |   4 +-
 .../charts/expressapp-besu/Chart.yaml         |   2 +-
 .../expressapp-besu/templates/deployment.yaml |   7 +-
 .../expressapp-besu/templates/service.yaml    |  49 ++--
 .../templates/deployment.yaml                 |   3 -
 .../expressapp-quorum/templates/service.yaml  |   1 -
 .../expressapp/templates/deployment.yaml      |   3 -
 .../charts/expressapp/templates/service.yaml  |   1 -
 .../templates/deployment.yaml                 |   1 -
 .../fabric-restserver/templates/service.yaml  |   1 -
 .../fabric-restserver/templates/volume.yaml   |   1 -
 .../charts/frontend/templates/deployment.yaml |   3 -
 .../charts/frontend/templates/service.yaml    |   1 -
 .../templates/deployment.yaml                 |   1 -
 .../springbootwebserver/templates/pvc.yaml    |   1 -
 .../templates/service.yaml                    |   1 -
 .../create/besu/express_api/tasks/main.yaml   |   2 +-
 .../besu/express_api/tasks/nested_main.yaml   |   2 +-
 .../smartContract/tasks/deploy_contract.yaml  |   2 +-
 .../smartContract/tasks/nested_deploy.yaml    |   4 +-
 .../templates/expressapi-besu.tpl             |   2 +-
 ...plychainDemo_besu.postman_environment.json |   8 +-
 .../dev/carrier/carrier/express-app.yaml      |  52 ----
 29 files changed, 146 insertions(+), 300 deletions(-)
 delete mode 100644 platforms/hyperledger-besu/releases/dev/carrier/carrier/express-app.yaml

diff --git a/.gitignore b/.gitignore
index 18d008bac..334708ecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 **/.vscode/
 # custom config templates
 *_custom.tpl
+.env*
diff --git a/examples/supplychain-app/besu/express_nodeJS/controllers/container.js b/examples/supplychain-app/besu/express_nodeJS/controllers/container.js
index f5aa41982..544dc7144 100644
--- a/examples/supplychain-app/besu/express_nodeJS/controllers/container.js
+++ b/examples/supplychain-app/besu/express_nodeJS/controllers/container.js
@@ -42,10 +42,11 @@ router.get("/:trackingID?", function(req, res) {
           container.custodian = newContainer.custodian;
           container.custodian = container.custodian + "," + newContainer.lastScannedAt;
           container.trackingID = newContainer.trackingID;
+          let timestampAsNumber = Number(newContainer.timestamp);
           if(protocol==="raft")
-            container.timestamp  = (new Date(newContainer.timestamp/1000000)).getTime();
+            container.timestamp  = (new Date(timestampAsNumber/1000000)).getTime();
           else
-            container.timestamp  = (new Date(newContainer.timestamp*1000)).getTime();     
+            container.timestamp  = (new Date(timestampAsNumber*1000)).getTime();     
           container.containerID = newContainer.containerID;
           container.linearId = {};
           container.linearId.externalId = null;
@@ -90,10 +91,11 @@ router.get("/:trackingID?", function(req, res) {
           container.custodian = container.custodian + "," + toPush.lastScannedAt;
           container.lastScannedAt = toPush.lastScannedAt;
           container.trackingID = toPush.trackingID;
+          let timestampAsNumber = Number(toPush.timestamp);
           if(protocol==="raft")
-            container.timestamp  = (new Date(toPush.timestamp/1000000)).getTime();
+            container.timestamp  = (new Date(timestampAsNumber/1000000)).getTime();
           else
-            container.timestamp  = (new Date(toPush.timestamp*1000)).getTime(); 
+            container.timestamp  = (new Date(timestampAsNumber*1000)).getTime(); 
           container.containerID = toPush.containerID;
           container.linearId = {};
           container.linearId.externalId = null;
@@ -124,7 +126,9 @@ router.post("/", upload.array(), function(req, res) {
   };
   // Add this.address in the counterparties list
   newContainer.counterparties.push(fromAddress+","+fromNodeSubject);
-
+  web3.eth.getBalance(fromAddress).then(balance => {
+    console.log(`Account Balance: ${balance}`);
+  });
   
   var misc = [];
   var keys = Object.keys(newContainer.misc);
diff --git a/examples/supplychain-app/besu/express_nodeJS/controllers/general.js b/examples/supplychain-app/besu/express_nodeJS/controllers/general.js
index 78080816e..c89840c82 100644
--- a/examples/supplychain-app/besu/express_nodeJS/controllers/general.js
+++ b/examples/supplychain-app/besu/express_nodeJS/controllers/general.js
@@ -61,10 +61,11 @@ router.get('/:trackingID/history', function (req, res) {
           var history = {};
           history.party = toPush.custodian;
           history.party = history.party+","+toPush.lastScannedAt;
+          let timestampAsNumber = Number(toPush.timestamp);
           if(protocol==="raft")
-            history.time  = (new Date(toPush.timestamp/1000000)).getTime();
+            history.time  = (new Date(timestampAsNumber/1000000)).getTime();
           else
-            history.time  = (new Date(toPush.timestamp * 1000)).getTime(); 
+            history.time  = (new Date(timestampAsNumber * 1000)).getTime(); 
           history.location = toPush.lastScannedAt;
           allTransaction.push(history);
     }
diff --git a/examples/supplychain-app/besu/express_nodeJS/controllers/product.js b/examples/supplychain-app/besu/express_nodeJS/controllers/product.js
index 5914eeafc..c87f28e9e 100644
--- a/examples/supplychain-app/besu/express_nodeJS/controllers/product.js
+++ b/examples/supplychain-app/besu/express_nodeJS/controllers/product.js
@@ -39,10 +39,11 @@ router.get('/containerless', function (req, res) {
           product.recalled = toPush.recalled;
           product.custodian = toPush.custodian;
           product.custodian = product.custodian + "," + toPush.lastScannedAt;
+          let timestampAsNumber = Number(toPush.timestamp);
           if(protocol==="raft")
-            product.time  = (new Date(toPush.timestamp/1000000)).getTime();
+            product.time  = (new Date(timestampAsNumber/1000000)).getTime();
           else
-            product.time  = (new Date(toPush.timestamp * 1000)).getTime();
+            product.time  = (new Date(timestampAsNumber * 1000)).getTime();
           product.lastScannedAt = toPush.lastScannedAt;
           product.containerID = toPush.containerID;
           product.misc = {};
@@ -90,10 +91,11 @@ router.get('/:trackingID?', function (req, res) {
         product.custodian = newProduct.custodian;
           product.custodian = product.custodian + "," + newProduct.lastScannedAt;
           product.trackingID = newProduct.trackingID;
+          let timestampAsNumber = Number(newProduct.timestamp);
           if(protocol==="raft")
-            product.timestamp  = (new Date(newProduct.timestamp/1000000)).getTime();
+            product.timestamp  = (new Date(timestampAsNumber/1000000)).getTime();
           else
-            product.timestamp  = (new Date(newProduct.timestamp * 1000)).getTime();
+            product.timestamp  = (new Date(timestampAsNumber * 1000)).getTime();
           product.containerID = newProduct.containerID;
           product.linearId = {
             "externalId": null,
@@ -137,10 +139,11 @@ router.get('/:trackingID?', function (req, res) {
           product.custodian = toPush.custodian;
             product.custodian = product.custodian + "," + toPush.lastScannedAt;
             product.trackingID = toPush.trackingID;
+            let timestampAsNumber = Number(toPush.timestamp);
             if(protocol==="raft")
-              product.timestamp  = (new Date(toPush.timestamp/1000000)).getTime();
+              product.timestamp  = (new Date(timestampAsNumber/1000000)).getTime();
             else
-              product.timestamp  = (new Date(toPush.timestamp * 1000)).getTime();
+              product.timestamp  = (new Date(timestampAsNumber * 1000)).getTime();
             product.containerID = toPush.containerID;
             product.linearId = {
               "externalId": null,
diff --git a/examples/supplychain-app/besu/express_nodeJS/web3services.js b/examples/supplychain-app/besu/express_nodeJS/web3services.js
index 7b3ac4756..d2d30cf69 100644
--- a/examples/supplychain-app/besu/express_nodeJS/web3services.js
+++ b/examples/supplychain-app/besu/express_nodeJS/web3services.js
@@ -4,7 +4,7 @@
 //  SPDX-License-Identifier: Apache-2.0                                                        //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
-var Web3 = require("web3");
+const { Web3 } = require("web3");
 var {productABI} = require("./ABI/productABI");
 var {productContractAddress,quorumServer, ganacheServer, nodeIdentity, nodeOrganization, nodeOrganizationUnit, nodeSubject,protocol} = require("./config");
 
diff --git a/examples/supplychain-app/besu/smartContracts/package-lock.json b/examples/supplychain-app/besu/smartContracts/package-lock.json
index fd205440f..a3b6c27cb 100644
--- a/examples/supplychain-app/besu/smartContracts/package-lock.json
+++ b/examples/supplychain-app/besu/smartContracts/package-lock.json
@@ -12,8 +12,8 @@
         "fs": "0.0.1-security",
         "path": "^0.12.7",
         "solc": "^0.6.6",
-        "web3": "^1.5.0",
-        "web3js-quorum": "^21.7.0-rc1"
+        "web3": "^1.10.0",
+        "web3js-quorum": "^22.4.0"
       }
     },
     "node_modules/@ethereumjs/common": {
@@ -715,22 +715,6 @@
         "node": "*"
       }
     },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bip66": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
-      "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/blakejs": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz",
@@ -1230,19 +1214,6 @@
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
     },
-    "node_modules/drbg.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
-      "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
-      "dependencies": {
-        "browserify-aes": "^1.0.6",
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -1645,11 +1616,6 @@
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-    },
     "node_modules/finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -2478,11 +2444,6 @@
         "buffer": "^5.5.0"
       }
     },
-    "node_modules/nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="
-    },
     "node_modules/nano-json-stream-parser": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz",
@@ -3928,74 +3889,62 @@
       "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
     },
     "node_modules/web3js-quorum": {
-      "version": "21.7.0-rc1",
-      "resolved": "https://registry.npmjs.org/web3js-quorum/-/web3js-quorum-21.7.0-rc1.tgz",
-      "integrity": "sha512-cCqdGlmfGCu4B1oecQWUPI/MfEA7Wc9w1Vou+o6xp4EvaPvqpHeZG17IYVZyXz8FGx7En/oA7meF+cYypyPieA==",
+      "version": "22.4.0",
+      "resolved": "https://registry.npmjs.org/web3js-quorum/-/web3js-quorum-22.4.0.tgz",
+      "integrity": "sha512-mrziohkZGBXQnN6j9i96KoFQxreOljwFrjce6FiPChIsw7gP0WLb9S/g0+lgl4ODudrXHr5I0KEOLd+6Myo91w==",
       "dependencies": {
         "ethereumjs-tx": "^2.1.2",
-        "ethereumjs-util": "6.1.0",
+        "ethereumjs-util": "6.2.1",
         "lodash": "^4.17.21",
         "request-promise-native": "^1.0.9",
-        "rlp": "2.2.4"
-      }
-    },
-    "node_modules/web3js-quorum/node_modules/ethereumjs-util": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
-      "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
-      "dependencies": {
-        "bn.js": "^4.11.0",
-        "create-hash": "^1.1.2",
-        "ethjs-util": "0.1.6",
-        "keccak": "^1.0.2",
-        "rlp": "^2.0.0",
-        "safe-buffer": "^5.1.1",
-        "secp256k1": "^3.0.1"
+        "rlp": "2.2.7"
+      },
+      "peerDependencies": {
+        "web3": "^1.x"
       }
     },
-    "node_modules/web3js-quorum/node_modules/keccak": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz",
-      "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==",
-      "hasInstallScript": true,
+    "node_modules/web3js-quorum/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
       "dependencies": {
-        "bindings": "^1.2.1",
-        "inherits": "^2.0.3",
-        "nan": "^2.2.1",
-        "safe-buffer": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/web3js-quorum/node_modules/rlp": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.4.tgz",
-      "integrity": "sha512-fdq2yYCWpAQBhwkZv+Z8o/Z4sPmYm1CUq6P7n6lVTOdb949CnqA0sndXal5C1NleSVSZm6q5F3iEbauyVln/iw==",
+    "node_modules/web3js-quorum/node_modules/ethereum-cryptography": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
+      "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
       "dependencies": {
-        "bn.js": "^4.11.1"
-      },
-      "bin": {
-        "rlp": "bin/rlp"
+        "@types/pbkdf2": "^3.0.0",
+        "@types/secp256k1": "^4.0.1",
+        "blakejs": "^1.1.0",
+        "browserify-aes": "^1.2.0",
+        "bs58check": "^2.1.2",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "hash.js": "^1.1.7",
+        "keccak": "^3.0.0",
+        "pbkdf2": "^3.0.17",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.1.2",
+        "scrypt-js": "^3.0.0",
+        "secp256k1": "^4.0.1",
+        "setimmediate": "^1.0.5"
       }
     },
-    "node_modules/web3js-quorum/node_modules/secp256k1": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
-      "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
-      "hasInstallScript": true,
+    "node_modules/web3js-quorum/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
       "dependencies": {
-        "bindings": "^1.5.0",
-        "bip66": "^1.1.5",
-        "bn.js": "^4.11.8",
-        "create-hash": "^1.2.0",
-        "drbg.js": "^1.0.1",
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
         "elliptic": "^6.5.2",
-        "nan": "^2.14.0",
-        "safe-buffer": "^5.1.2"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
       }
     },
     "node_modules/webidl-conversions": {
@@ -4573,22 +4522,6 @@
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
       "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="
     },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "bip66": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
-      "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "blakejs": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz",
@@ -4987,16 +4920,6 @@
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
     },
-    "drbg.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
-      "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
-      "requires": {
-        "browserify-aes": "^1.0.6",
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4"
-      }
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -5375,11 +5298,6 @@
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-    },
     "finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -6013,11 +5931,6 @@
         }
       }
     },
-    "nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="
-    },
     "nano-json-stream-parser": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz",
@@ -7141,63 +7054,59 @@
       }
     },
     "web3js-quorum": {
-      "version": "21.7.0-rc1",
-      "resolved": "https://registry.npmjs.org/web3js-quorum/-/web3js-quorum-21.7.0-rc1.tgz",
-      "integrity": "sha512-cCqdGlmfGCu4B1oecQWUPI/MfEA7Wc9w1Vou+o6xp4EvaPvqpHeZG17IYVZyXz8FGx7En/oA7meF+cYypyPieA==",
+      "version": "22.4.0",
+      "resolved": "https://registry.npmjs.org/web3js-quorum/-/web3js-quorum-22.4.0.tgz",
+      "integrity": "sha512-mrziohkZGBXQnN6j9i96KoFQxreOljwFrjce6FiPChIsw7gP0WLb9S/g0+lgl4ODudrXHr5I0KEOLd+6Myo91w==",
       "requires": {
         "ethereumjs-tx": "^2.1.2",
-        "ethereumjs-util": "6.1.0",
+        "ethereumjs-util": "6.2.1",
         "lodash": "^4.17.21",
         "request-promise-native": "^1.0.9",
-        "rlp": "2.2.4"
+        "rlp": "2.2.7"
       },
       "dependencies": {
-        "ethereumjs-util": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
-          "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
-          "requires": {
-            "bn.js": "^4.11.0",
-            "create-hash": "^1.1.2",
-            "ethjs-util": "0.1.6",
-            "keccak": "^1.0.2",
-            "rlp": "^2.0.0",
-            "safe-buffer": "^5.1.1",
-            "secp256k1": "^3.0.1"
-          }
-        },
-        "keccak": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz",
-          "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==",
+        "@types/bn.js": {
+          "version": "4.11.6",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+          "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
           "requires": {
-            "bindings": "^1.2.1",
-            "inherits": "^2.0.3",
-            "nan": "^2.2.1",
-            "safe-buffer": "^5.1.0"
+            "@types/node": "*"
           }
         },
-        "rlp": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.4.tgz",
-          "integrity": "sha512-fdq2yYCWpAQBhwkZv+Z8o/Z4sPmYm1CUq6P7n6lVTOdb949CnqA0sndXal5C1NleSVSZm6q5F3iEbauyVln/iw==",
+        "ethereum-cryptography": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
+          "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
           "requires": {
-            "bn.js": "^4.11.1"
+            "@types/pbkdf2": "^3.0.0",
+            "@types/secp256k1": "^4.0.1",
+            "blakejs": "^1.1.0",
+            "browserify-aes": "^1.2.0",
+            "bs58check": "^2.1.2",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "hash.js": "^1.1.7",
+            "keccak": "^3.0.0",
+            "pbkdf2": "^3.0.17",
+            "randombytes": "^2.1.0",
+            "safe-buffer": "^5.1.2",
+            "scrypt-js": "^3.0.0",
+            "secp256k1": "^4.0.1",
+            "setimmediate": "^1.0.5"
           }
         },
-        "secp256k1": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
-          "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
+        "ethereumjs-util": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+          "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
           "requires": {
-            "bindings": "^1.5.0",
-            "bip66": "^1.1.5",
-            "bn.js": "^4.11.8",
-            "create-hash": "^1.2.0",
-            "drbg.js": "^1.0.1",
+            "@types/bn.js": "^4.11.3",
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
             "elliptic": "^6.5.2",
-            "nan": "^2.14.0",
-            "safe-buffer": "^5.1.2"
+            "ethereum-cryptography": "^0.1.3",
+            "ethjs-util": "0.1.6",
+            "rlp": "^2.2.3"
           }
         }
       }
diff --git a/examples/supplychain-app/besu/smartContracts/package.json b/examples/supplychain-app/besu/smartContracts/package.json
index d25a91b94..b24cd5468 100644
--- a/examples/supplychain-app/besu/smartContracts/package.json
+++ b/examples/supplychain-app/besu/smartContracts/package.json
@@ -9,7 +9,7 @@
     "fs": "0.0.1-security",
     "path": "^0.12.7",
     "solc": "^0.6.6",
-    "web3": "^1.5.0",
-    "web3js-quorum": "^21.7.0-rc1"
+    "web3": "^1.10.0",
+    "web3js-quorum": "^22.4.0"
   }
 }
diff --git a/examples/supplychain-app/charts/expressapp-besu/Chart.yaml b/examples/supplychain-app/charts/expressapp-besu/Chart.yaml
index 9d9c886c9..d8dc363e9 100644
--- a/examples/supplychain-app/charts/expressapp-besu/Chart.yaml
+++ b/examples/supplychain-app/charts/expressapp-besu/Chart.yaml
@@ -8,4 +8,4 @@ apiVersion: v1
 appVersion: "2.0"
 description: A Helm chart for deploying express app for besu
 name: expressapp-besu
-version: 0.2.0
+version: 0.15.3
diff --git a/examples/supplychain-app/charts/expressapp-besu/templates/deployment.yaml b/examples/supplychain-app/charts/expressapp-besu/templates/deployment.yaml
index 8595d4576..0b1af96b7 100644
--- a/examples/supplychain-app/charts/expressapp-besu/templates/deployment.yaml
+++ b/examples/supplychain-app/charts/expressapp-besu/templates/deployment.yaml
@@ -15,7 +15,6 @@ metadata:
   namespace: {{ .Values.metadata.namespace }}
   labels:
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app: {{ .Values.nodeName }}
@@ -25,7 +24,6 @@ spec:
     matchLabels:
       app: {{ .Values.nodeName }}
       app.kubernetes.io/name: {{ .Values.nodeName }}
-      helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
     type: Recreate
@@ -35,7 +33,6 @@ spec:
       labels:
         app: {{ .Values.nodeName }}
         app.kubernetes.io/name: {{ .Values.nodeName }}
-        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       serviceAccountName: {{ .Values.vault.serviceaccountname }}
@@ -121,8 +118,8 @@ spec:
                 ${VAULT_ADDR}/v1/${NODE_ADDRESS_SECRET} | \
                 jq -r 'if .errors then . else . end')
               validateVaultResponse "secret (${NODE_ADDRESS_SECRET})" "${LOOKUP_SECRET_RESPONSE}" "LOOKUPSECRETRESPONSE"
-              node_address=$(echo ${LOOKUP_SECRET_RESPONSE} | jq -r '.data.data["nodeAddress"]')
-              node_key=$(echo ${LOOKUP_SECRET_RESPONSE} | jq -r '.data.data["nodekey"]')
+              node_address=$(echo ${LOOKUP_SECRET_RESPONSE} | jq -r '.data.data["accountAddress"]')
+              node_key=$(echo ${LOOKUP_SECRET_RESPONSE} | jq -r '.data.data["accountPrivateKey"]')
 
               echo "node address: ${node_address}"
               echo "node key: ${node_key}"
diff --git a/examples/supplychain-app/charts/expressapp-besu/templates/service.yaml b/examples/supplychain-app/charts/expressapp-besu/templates/service.yaml
index c6fa6e473..702c2a42a 100644
--- a/examples/supplychain-app/charts/expressapp-besu/templates/service.yaml
+++ b/examples/supplychain-app/charts/expressapp-besu/templates/service.yaml
@@ -9,32 +9,9 @@ apiVersion: v1
 metadata:
   name: {{ .Values.nodeName }}
   namespace: {{ .Values.metadata.namespace }}
-  {{- if eq $.Values.proxy.provider "ambassador" }}
-  annotations:
-    getambassador.io/config: | 
-      ---
-      apiVersion: ambassador/v2
-      kind: TLSContext
-      name: {{ .Values.proxy.name }}_api_context
-      hosts:
-      - {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
-      secret: {{ .Values.proxy.peer_name }}-ambassador-certs.{{ .Values.metadata.namespace }}
-      secret_namespacing: true
-      min_tls_version: v1.2
-      ---
-      apiVersion: ambassador/v2
-      kind: Mapping
-      name: {{ .Values.proxy.name }}_api_p2p_mapping
-      prefix: /
-      host: {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
-      service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.expressapp.nodePorts.port }}
-      timeout_ms: 20000
-      tls: false
-  {{ end }}
   labels:
     run: {{ .Values.nodeName }}
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
 spec:
@@ -46,7 +23,31 @@ spec:
     targetPort: {{ .Values.expressapp.nodePorts.targetPort }}
     protocol: TCP
     name: {{ .Values.expressapp.nodePorts.name }}
-    
+{{- if eq $.Values.proxy.provider "ambassador" }}
+---
+apiVersion: getambassador.io/v3alpha1
+kind: TLSContext
+metadata:
+  name: {{ .Values.proxy.name }}api-tlscontext
+  namespace: {{ .Values.metadata.namespace }}
+spec:
+  hosts:
+  - {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
+  secret: tls-tls-certs.{{ .Values.metadata.namespace }}
+  secret_namespacing: true
+  min_tls_version: v1.2
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: {{ .Values.proxy.name }}api-mapping
+  namespace: {{ .Values.metadata.namespace }}
+spec:
+  prefix: /
+  host: {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
+  service: {{ .Values.proxy.name }}-expressapi.{{ .Values.metadata.namespace }}:{{ .Values.expressapp.nodePorts.port }}
+  timeout_ms: 20000
+{{ end }}
 {{- if eq $.Values.proxy.provider "haproxy" }}
 ---
 apiVersion: networking.k8s.io/v1
diff --git a/examples/supplychain-app/charts/expressapp-quorum/templates/deployment.yaml b/examples/supplychain-app/charts/expressapp-quorum/templates/deployment.yaml
index a3d74681e..5a597c738 100644
--- a/examples/supplychain-app/charts/expressapp-quorum/templates/deployment.yaml
+++ b/examples/supplychain-app/charts/expressapp-quorum/templates/deployment.yaml
@@ -15,7 +15,6 @@ metadata:
   namespace: {{ .Values.metadata.namespace }}
   labels:
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app: {{ .Values.nodeName }}
@@ -25,7 +24,6 @@ spec:
     matchLabels:
       app: {{ .Values.nodeName }}
       app.kubernetes.io/name: {{ .Values.nodeName }}
-      helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
     type: Recreate
@@ -35,7 +33,6 @@ spec:
       labels:
         app: {{ .Values.nodeName }}
         app.kubernetes.io/name: {{ .Values.nodeName }}
-        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       serviceAccountName: {{ .Values.vault.serviceaccountname }}
diff --git a/examples/supplychain-app/charts/expressapp-quorum/templates/service.yaml b/examples/supplychain-app/charts/expressapp-quorum/templates/service.yaml
index 1b581bdd0..66376418b 100644
--- a/examples/supplychain-app/charts/expressapp-quorum/templates/service.yaml
+++ b/examples/supplychain-app/charts/expressapp-quorum/templates/service.yaml
@@ -12,7 +12,6 @@ metadata:
   labels:
     run: {{ .Values.nodeName }}
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
 spec:
diff --git a/examples/supplychain-app/charts/expressapp/templates/deployment.yaml b/examples/supplychain-app/charts/expressapp/templates/deployment.yaml
index 6ec53d162..ba2a78f01 100644
--- a/examples/supplychain-app/charts/expressapp/templates/deployment.yaml
+++ b/examples/supplychain-app/charts/expressapp/templates/deployment.yaml
@@ -15,7 +15,6 @@ metadata:
   namespace: {{ .Values.metadata.namespace }}
   labels:
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
@@ -23,7 +22,6 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ .Values.nodeName }}
-      helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
       app: {{ .Values.nodeName }}
@@ -34,7 +32,6 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: {{ .Values.nodeName }}
-        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         app: {{ .Values.nodeName }}
diff --git a/examples/supplychain-app/charts/expressapp/templates/service.yaml b/examples/supplychain-app/charts/expressapp/templates/service.yaml
index 0223db97c..dbc0ed845 100644
--- a/examples/supplychain-app/charts/expressapp/templates/service.yaml
+++ b/examples/supplychain-app/charts/expressapp/templates/service.yaml
@@ -38,7 +38,6 @@ metadata:
   labels:
     run: {{ .Values.nodeName }}
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
 spec:
diff --git a/examples/supplychain-app/charts/fabric-restserver/templates/deployment.yaml b/examples/supplychain-app/charts/fabric-restserver/templates/deployment.yaml
index 3d51ab7bf..3e8cf1848 100644
--- a/examples/supplychain-app/charts/fabric-restserver/templates/deployment.yaml
+++ b/examples/supplychain-app/charts/fabric-restserver/templates/deployment.yaml
@@ -12,7 +12,6 @@ metadata:
   labels:
     name: {{ $.Values.server.name }}
     app.kubernetes.io/name: {{ $.Values.server.name }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
diff --git a/examples/supplychain-app/charts/fabric-restserver/templates/service.yaml b/examples/supplychain-app/charts/fabric-restserver/templates/service.yaml
index 4c6e323db..b74c91388 100644
--- a/examples/supplychain-app/charts/fabric-restserver/templates/service.yaml
+++ b/examples/supplychain-app/charts/fabric-restserver/templates/service.yaml
@@ -12,7 +12,6 @@ metadata:
   labels:
     run: {{ $.Values.server.name }}
     app.kubernetes.io/name: {{ $.Values.server.name }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
 spec:
diff --git a/examples/supplychain-app/charts/fabric-restserver/templates/volume.yaml b/examples/supplychain-app/charts/fabric-restserver/templates/volume.yaml
index a05cef139..890bcb073 100644
--- a/examples/supplychain-app/charts/fabric-restserver/templates/volume.yaml
+++ b/examples/supplychain-app/charts/fabric-restserver/templates/volume.yaml
@@ -11,7 +11,6 @@ metadata:
   namespace: {{ $.Values.metadata.namespace }}
   labels:
     app.kubernetes.io/name: {{ .Values.server.name }}-pvc
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
 spec:
diff --git a/examples/supplychain-app/charts/frontend/templates/deployment.yaml b/examples/supplychain-app/charts/frontend/templates/deployment.yaml
index 2bbb187ea..53ba2739b 100644
--- a/examples/supplychain-app/charts/frontend/templates/deployment.yaml
+++ b/examples/supplychain-app/charts/frontend/templates/deployment.yaml
@@ -16,7 +16,6 @@ metadata:
   labels:
     app: {{ .Values.nodeName }}
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
@@ -25,7 +24,6 @@ spec:
     matchLabels:
       app: {{ .Values.nodeName }}
       app.kubernetes.io/name: {{ .Values.nodeName }}
-      helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
@@ -36,7 +34,6 @@ spec:
       labels:
         app: {{ .Values.nodeName }}
         app.kubernetes.io/name: {{ .Values.nodeName }}
-        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
diff --git a/examples/supplychain-app/charts/frontend/templates/service.yaml b/examples/supplychain-app/charts/frontend/templates/service.yaml
index 13dc4d99c..48b9e2b09 100644
--- a/examples/supplychain-app/charts/frontend/templates/service.yaml
+++ b/examples/supplychain-app/charts/frontend/templates/service.yaml
@@ -12,7 +12,6 @@ metadata:
   labels:
     run: {{ .Values.nodeName }}
     app.kubernetes.io/name: {{ .Values.nodeName }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
diff --git a/examples/supplychain-app/charts/springbootwebserver/templates/deployment.yaml b/examples/supplychain-app/charts/springbootwebserver/templates/deployment.yaml
index 62d98daad..c353b367a 100644
--- a/examples/supplychain-app/charts/springbootwebserver/templates/deployment.yaml
+++ b/examples/supplychain-app/charts/springbootwebserver/templates/deployment.yaml
@@ -15,7 +15,6 @@ metadata:
     namespace: {{ .Values.metadata.namespace }}
     labels:
       app.kubernetes.io/name: {{ .Values.nodeName }}
-      helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
diff --git a/examples/supplychain-app/charts/springbootwebserver/templates/pvc.yaml b/examples/supplychain-app/charts/springbootwebserver/templates/pvc.yaml
index ed662b428..f1eb3085c 100644
--- a/examples/supplychain-app/charts/springbootwebserver/templates/pvc.yaml
+++ b/examples/supplychain-app/charts/springbootwebserver/templates/pvc.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: {{ .Values.metadata.namespace }}
   labels:
     app.kubernetes.io/name: {{ .Values.nodeName }}-pvc
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
 spec:
diff --git a/examples/supplychain-app/charts/springbootwebserver/templates/service.yaml b/examples/supplychain-app/charts/springbootwebserver/templates/service.yaml
index 6b3ac68ee..741c9493a 100644
--- a/examples/supplychain-app/charts/springbootwebserver/templates/service.yaml
+++ b/examples/supplychain-app/charts/springbootwebserver/templates/service.yaml
@@ -12,7 +12,6 @@ metadata:
     labels:
       run: {{ .Values.nodeName }}
       app.kubernetes.io/name: {{ .Values.nodeName }}
-      helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }} 
 spec:
diff --git a/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/main.yaml b/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/main.yaml
index 60307ba5d..4e8dbf7ec 100644
--- a/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/main.yaml
+++ b/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/main.yaml
@@ -78,7 +78,7 @@
 # Replace accountid in postman env file
 - name: Replace accountid in postman env file
   replace:
-    path: "{{ playbook_dir }}/../tests/SupplychainDemo_besu.postman_environment.json"
+    path: "{{ playbook_dir }}/../../../build/SupplychainDemo_besu.postman_environment.json"
     regexp: "{{ organization_data.name | lower }}_account"
     replace: "{{ node_info.node_address }}"
   loop: "{{ node_address_list }}"
diff --git a/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/nested_main.yaml b/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/nested_main.yaml
index 70699851e..56f538a2f 100644
--- a/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/nested_main.yaml
+++ b/examples/supplychain-app/configuration/roles/create/besu/express_api/tasks/nested_main.yaml
@@ -7,7 +7,7 @@
 # Fetch node addresses from vault
 - name: Getting node addresses from vault
   shell: |
-    vault kv get -field=nodeAddress {{ component_vault.secret_path | default('secretsv2') }}/{{ component_ns }}/crypto/{{ peer.name }}/data
+    vault kv get -field=accountAddress {{ component_vault.secret_path | default('secretsv2') }}/{{ network.env.type }}{{ organization_data.name }}/besu-node-{{ peer.name }}-keys
   environment:
     VAULT_ADDR: "{{ component_vault.url }}"
     VAULT_TOKEN: "{{ component_vault.root_token }}"
diff --git a/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/deploy_contract.yaml b/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/deploy_contract.yaml
index 54bdc413a..228c898d2 100644
--- a/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/deploy_contract.yaml
+++ b/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/deploy_contract.yaml
@@ -10,7 +10,7 @@
 - name: Run {{ js_file }} for "{{ organization_data.name | lower }}"
   shell: |
     cd "{{ playbook_dir }}/../../../{{ smart_contract.deployjs_path }}"
-    node "{{ js_file }}" -v --url "{{ URL }}" --path "{{ contract_path }}" --entryPoint "{{ entrypoint }}" --contractName "{{ contract }}" --chainId 2018 --tmKey "{{ tm_key.stdout }}" --privateKey "{{ nodekey.stdout | regex_replace('0x', '') }}" --nodeAddress "{{ node_address.stdout | regex_replace('0x', '') }}" --privateFor '{{ privateFor }}' --numberOfIteration "{{ numberOfIteration }}"
+    node "{{ js_file }}" -v --url "{{ URL }}" --path "{{ contract_path }}" --entryPoint "{{ entrypoint }}" --contractName "{{ contract }}" --chainId 2018 --tmKey "{{ tm_key.stdout | default('')}}" --privateKey "{{ nodekey.stdout | regex_replace('0x', '') }}" --nodeAddress "{{ node_address.stdout | regex_replace('0x', '') }}" --privateFor '{{ privateFor }}' --numberOfIteration "{{ numberOfIteration }}"
   vars:
     URL: "{{ peer.geth_url }}"
     contract_path: "{{ smart_contract.contract_path }}"
diff --git a/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/nested_deploy.yaml b/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/nested_deploy.yaml
index f14daa337..1c06b7412 100644
--- a/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/nested_deploy.yaml
+++ b/examples/supplychain-app/configuration/roles/deploy/besu/smartContract/tasks/nested_deploy.yaml
@@ -36,7 +36,7 @@
 # This task gets the node private key from the vault
 - name: get nodekey from vault
   shell: |
-    vault kv get -field=nodekey {{ component_vault.secret_path | default('secretsv2') }}/{{ network.env.type }}{{ organization_data.name }}/besu-node-{{ peer.name }}-keys
+    vault kv get -field=accountPrivateKey {{ component_vault.secret_path | default('secretsv2') }}/{{ network.env.type }}{{ organization_data.name }}/besu-node-{{ peer.name }}-keys
   environment:
     VAULT_ADDR: "{{ component_vault.url }}"
     VAULT_TOKEN: "{{ component_vault.root_token }}"
@@ -45,7 +45,7 @@
 # This task gets the node address from the vault
 - name: get nodeAddress from vault
   shell: |
-    vault kv get -field=nodeAddress {{ component_vault.secret_path | default('secretsv2') }}/{{ network.env.type }}{{ organization_data.name }}/besu-node-{{ peer.name }}-keys
+    vault kv get -field=accountAddress {{ component_vault.secret_path | default('secretsv2') }}/{{ network.env.type }}{{ organization_data.name }}/besu-node-{{ peer.name }}-keys
   environment:
     VAULT_ADDR: "{{ component_vault.url }}"
     VAULT_TOKEN: "{{ component_vault.root_token }}"
diff --git a/examples/supplychain-app/configuration/roles/helm_component/templates/expressapi-besu.tpl b/examples/supplychain-app/configuration/roles/helm_component/templates/expressapi-besu.tpl
index 45d1562e5..4eb3c46e6 100644
--- a/examples/supplychain-app/configuration/roles/helm_component/templates/expressapi-besu.tpl
+++ b/examples/supplychain-app/configuration/roles/helm_component/templates/expressapi-besu.tpl
@@ -32,7 +32,7 @@ spec:
       alpineutils: {{ network.docker.url }}/alpine-utils:1.0
     expressapp:
       serviceType: ClusterIP
-      image: ghcr.io/mgcepeda/{{ express_app_image }}
+      image: ghcr.io/hyperledger/bevel-supplychain-besu:latest
       pullPolicy: IfNotPresent
       pullSecrets: regcred
       nodePorts:
diff --git a/examples/supplychain-app/tests/SupplychainDemo_besu.postman_environment.json b/examples/supplychain-app/tests/SupplychainDemo_besu.postman_environment.json
index 10a6fa4bb..fd85d7c0b 100644
--- a/examples/supplychain-app/tests/SupplychainDemo_besu.postman_environment.json
+++ b/examples/supplychain-app/tests/SupplychainDemo_besu.postman_environment.json
@@ -4,22 +4,22 @@
 	"values": [
 		{
 			"key": "manufacturer-host",
-			"value": "manufacturerapi.bes.dev2.aws.blockchaincloudpoc-develop.com",
+			"value": "manufacturerapi.bes.demo.aws.blockchaincloudpoc.com",
 			"enabled": true
 		},
 		{
 			"key": "store-host",
-			"value": "storeapi.bes.dev2.aws.blockchaincloudpoc-develop.com",
+			"value": "storeapi.bes.demo.aws.blockchaincloudpoc.com",
 			"enabled": true
 		},
 		{
 			"key": "carrier-host",	
-			"value": "carrierapi.bes.dev2.aws.blockchaincloudpoc-develop.com",
+			"value": "carrierapi.bes.demo.aws.blockchaincloudpoc.com",
 			"enabled": true
 		},
 		{
 			"key": "warehouse-host",
-			"value": "warehouseapi.bes.dev2.aws.blockchaincloudpoc-develop.com",
+			"value": "warehouseapi.bes.demo.aws.blockchaincloudpoc.com",
 			"enabled": true
 		},
 		{
diff --git a/platforms/hyperledger-besu/releases/dev/carrier/carrier/express-app.yaml b/platforms/hyperledger-besu/releases/dev/carrier/carrier/express-app.yaml
deleted file mode 100644
index 0f3f48d93..000000000
--- a/platforms/hyperledger-besu/releases/dev/carrier/carrier/express-app.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: carrier-expressapi
-  namespace: carrier-bes
-  annotations:
-    fluxcd.io/automated: "false"
-spec:
-  releaseName: carrierbesu-expressapi
-  interval: 1m
-  chart:
-   spec:
-    chart: examples/supplychain-app/charts/expressapp-besu
-    sourceRef:
-      kind: GitRepository
-      name: flux-besu-app
-      namespace: flux-besu-app
-  values:
-    nodeName: carrier-expressapi
-    metadata:
-      namespace: carrier-bes
-    replicaCount: 1
-    vault:
-      address: http://vault.internal.demo.aws.blockchaincloudpoc.com:9001
-      secretprefix: secretsv2/data/besucarrier/smartContracts
-      node_address_secret: secretsv2/data/besucarrier/besu-node-carrier-keys
-      serviceaccountname: vault-auth
-      contractName: General
-      role: vault-role
-      authpath: besucarrier
-    images:
-      alpineutils: ghcr.io/hyperledger/alpine-utils:1.0
-    expressapp:
-      serviceType: ClusterIP
-      image: ghcr.io/mgcepeda/bevel-supplychain-besu:express-app-latest
-      pullPolicy: IfNotPresent
-      pullSecrets: regcred
-      nodePorts:
-        port: 3000
-        targetPort: 3000
-        name: tcp
-      env:
-        geth_address: http://carrierrpc.bes.demo.aws.blockchaincloudpoc.com
-        node_subject: O=Carrier,OU=Carrier,L=51.50/-0.13/London,C=GB
-        node_organization: Carrier
-        node_organization_unit: carrier
-        protocol: qbft
-    proxy:
-      provider: ambassador
-      name: carrier
-      external_url_suffix: bes.demo.aws.blockchaincloudpoc.com
-      peer_name: carrier