v1.3.0: dHealth Bridge for ERC20-DHP

dhealthproject · Feb 1, 2022 · 860a473 · 860a473
1 parent b61fd4e
commit 860a473
Show file tree

Hide file tree

Showing 24 changed files with 4,574 additions and 1,557 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "dhealth-wallet",
     "description": "dHealth Wallet",
     "homepage": "https://github.com/dhealthproject/dhealth-wallet",
-    "version": "1.3.0-alpha2021120112001",
+    "version": "1.3.0",
     "license": "Apache-2.0",
     "author": {
         "name": "Using Blockchain Ltd",
@@ -69,6 +69,7 @@
         "@dhealth/plugin-node-monitor": "latest",
         "@dhealth/sdk": "1.0.3-alpha-202110081200",
         "@dhealthdapps/health-to-earn": "latest",
+        "@dhealthdapps/bridge": "latest",
         "@yourdlt/plugin-dummy": "latest",
         "@yourdlt/plugin-librarian": "latest",
         "@yourdlt/plugin-ninjazzz": "latest",

diff --git a/public/plugins.js b/public/plugins.js
@@ -166,6 +166,8 @@ const registerPlugin = ($app, p) => {
     npmModule: p.plugin,
     entryPoint,
     installPath: p.path,
+    name: loadedPlugin && 'name' in loadedPlugin ? loadedPlugin.name : p.plugin,
+    friendlyName: loadedPlugin && 'friendlyName' in loadedPlugin ? loadedPlugin.friendlyName : p.plugin,
     view: loadedPlugin && 'view' in loadedPlugin ? loadedPlugin.view : '',
     routes: loadedPlugin && 'routes' in loadedPlugin ? loadedPlugin.routes : [],
     components: loadedPlugin && 'components' in loadedPlugin ? Object.keys(loadedPlugin.components) : [],

diff --git a/public/plugins/@dhealth/plugin-node-monitor/package.json b/public/plugins/@dhealth/plugin-node-monitor/package.json
@@ -1,8 +1,8 @@
 {
   "_from": "@dhealth/plugin-node-monitor@latest",
-  "_id": "@dhealth/plugin-node-monitor@1.0.2",
+  "_id": "@dhealth/plugin-node-monitor@1.0.3",
   "_inBundle": false,
-  "_integrity": "sha512-RECfhgBklGxHttHrqrr2A4KPADjDmM24U/k96mLV46JL7Z51iu2tib0lC4HxOLRQzfXDl4Lpwq7B1EGPDxDPbA==",
+  "_integrity": "sha512-LNg5Fh4Ib+Os07gmaokdNwuOf6tIEKsSzYnsISH+aVVQ0Qw3og3GbFYmt933Bs0KqNqyQw36PiHyHlhOIwjkWQ==",
   "_location": "/@dhealth/plugin-node-monitor",
   "_phantomChildren": {},
   "_requested": {
@@ -19,8 +19,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/@dhealth/plugin-node-monitor/-/plugin-node-monitor-1.0.2.tgz",
-  "_shasum": "6460734bc061d3f89b54a89d61c92c1c19515a5d",
+  "_resolved": "https://registry.npmjs.org/@dhealth/plugin-node-monitor/-/plugin-node-monitor-1.0.3.tgz",
+  "_shasum": "6dfaadfa01ead43ba2250b98b6ae5cf89eec14cb",
   "_spec": "@dhealth/plugin-node-monitor@latest",
   "_where": "/Users/greg/Sources/using-blockchain/dhealth-wallet",
   "author": {
@@ -92,5 +92,5 @@
     "serve": "vue-cli-service serve"
   },
   "types": "dist/types/Monitor.d.ts",
-  "version": "1.0.2"
+  "version": "1.0.3"
 }
diff --git a/public/plugins/@dhealthdapps/bridge/package.json b/public/plugins/@dhealthdapps/bridge/package.json
@@ -1,45 +1,53 @@
 {
-  "name": "@dhealthdapps/bridge",
-  "description": "Unidirectional Bridge for ERC20-DHP (Ethereum) to native DHP (dHealth)",
-  "homepage": "https://github.com/dhealthproject/plugin-bridge#readme",
-  "version": "1.0.0-alpha202112011201",
+  "_from": "@dhealthdapps/bridge@latest",
+  "_id": "@dhealthdapps/bridge@1.0.0",
+  "_inBundle": false,
+  "_integrity": "sha512-QQu2GG7umn0daG9jAfatUP//VX08GzBGogFhy9gcb7tVmC7ZJDZ4tgrGVVnq+eyCJAPWWkmcXcevyet1QDwLpg==",
+  "_location": "/@dhealthdapps/bridge",
+  "_phantomChildren": {
+    "follow-redirects": "1.14.7"
+  },
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "@dhealthdapps/bridge@latest",
+    "name": "@dhealthdapps/bridge",
+    "escapedName": "@dhealthdapps%2fbridge",
+    "scope": "@dhealthdapps",
+    "rawSpec": "latest",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@dhealthdapps/bridge/-/bridge-1.0.0.tgz",
+  "_shasum": "313d3a43da3558c8d51e1b275a5ff75e38cac2de",
+  "_spec": "@dhealthdapps/bridge@latest",
+  "_where": "/Users/greg/Sources/using-blockchain/dhealth-wallet",
   "author": {
     "name": "dHealth Network",
     "email": "info@dhealth.foundation",
     "url": "https://dhealth.network"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dhealthproject/plugin-bridge.git"
-  },
-  "license": "LGPL-3.0-only",
-  "main": "dist/dHealthWalletPluginBridge.umd.min.js",
-  "types": "dist/types/Bridge.d.ts",
   "browser": {
     "./sfc": "dist/views/pages/BridgeHome/BridgeHome.vue"
   },
-  "files": [
-    "dist/*",
-    "README.md",
-    "LICENSE",
-    "package.json"
-  ],
-  "scripts": {
-    "test": "cd payments-app/functions && npm run test",
-    "serve": "npm run serve --prefix payments-app/functions",
-    "build": "npm run build:lib && npm run build:ts && npm run copy:vue",
-    "build:lib": "vue-cli-service build --target lib --name dHealthWalletPluginBridge src/Bridge.ts --mode production --formats umd-min",
-    "build:ts": "tsc --emitDeclarationOnly",
-    "copy:vue": "cpy '**/*.vue' '../dist/' --cwd=src --parents"
+  "bugs": {
+    "url": "https://github.com/dhealthproject/plugin-bridge/issues"
   },
+  "bundleDependencies": false,
   "dependencies": {
     "@dhealth/sdk": "^1.0.3-alpha-202110081200",
     "@dhealth/wallet-api-bridge": "^1.3.0",
     "@dhealth/wallet-components": "^1.3.0",
-    "bignumber.js": "^9.0.1",
+    "@dhealthdapps/bridge-sdk": "1.0.0",
     "axios": "^0.24.0",
+    "bignumber.js": "^9.0.1",
     "moment": "^2.29.1"
   },
+  "deprecated": false,
+  "description": "Unidirectional Bridge for ERC20-DHP (Ethereum) to native DHP (dHealth)",
   "devDependencies": {
     "@babel/compat-data": "^7.14.0",
     "@babel/core": "^7.14.2",
@@ -56,14 +64,37 @@
     "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-stage-2": "^6.24.1",
-    "rimraf": "^3.0.2",
-    "semver": "^5.3.0",
-    "typescript": "^3.9.9",
-    "vue-template-compiler": "^2.5.2",
     "cpy-cli": "^3.1.1",
     "less": "^3.0.4",
     "less-loader": "^4.1.0",
+    "rimraf": "^3.0.2",
+    "semver": "^5.3.0",
+    "typescript": "^3.9.9",
     "vue": "^2.6.10",
-    "vue-property-decorator": "^8.1.0"
-  }
+    "vue-property-decorator": "^8.1.0",
+    "vue-template-compiler": "^2.5.2"
+  },
+  "files": [
+    "dist/*",
+    "README.md",
+    "LICENSE",
+    "package.json"
+  ],
+  "homepage": "https://github.com/dhealthproject/plugin-bridge#readme",
+  "license": "LGPL-3.0-only",
+  "main": "dist/dHealthWalletPluginBridge.umd.min.js",
+  "name": "@dhealthdapps/bridge",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dhealthproject/plugin-bridge.git"
+  },
+  "scripts": {
+    "build": "npm run plugin:build",
+    "plugin:build": "npm run plugin:build:lib && npm run plugin:build:ts && npm run plugin:copy:vue",
+    "plugin:build:lib": "vue-cli-service build --target lib --name dHealthWalletPluginBridge src/Bridge.ts --mode production --formats umd-min",
+    "plugin:build:ts": "tsc --emitDeclarationOnly",
+    "plugin:copy:vue": "cpy '**/*.vue' '../dist/' --cwd=src --parents"
+  },
+  "types": "dist/types/Bridge.d.ts",
+  "version": "1.0.0"
 }
diff --git a/public/plugins/@dhealthdapps/health-to-earn/package.json b/public/plugins/@dhealthdapps/health-to-earn/package.json
@@ -1,11 +1,11 @@
 {
   "_from": "@dhealthdapps/health-to-earn@latest",
-  "_id": "@dhealthdapps/health-to-earn@1.1.0",
+  "_id": "@dhealthdapps/health-to-earn@1.1.1",
   "_inBundle": false,
-  "_integrity": "sha512-keW60gx9m/m1Yqbq7CFLP5AFIJXVBrs8SS81NIlc0gqylGiP9M5eyAvajer+JFOWf2TkOSfTEU4WkW+z8AFLwQ==",
+  "_integrity": "sha512-gUCTPpiZK83h2RlS+1+DeaPmQL2g/1kxxclq2j3orf4AzLcJyyK7MDw7D6Zi2mzx5V3B+IQKUNlSGSJgHH9itw==",
   "_location": "/@dhealthdapps/health-to-earn",
   "_phantomChildren": {
-    "follow-redirects": "1.14.5"
+    "follow-redirects": "1.14.7"
   },
   "_requested": {
     "type": "tag",
@@ -21,8 +21,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/@dhealthdapps/health-to-earn/-/health-to-earn-1.1.0.tgz",
-  "_shasum": "724620b1fda53861a514d42cad835ae18ca3e1f3",
+  "_resolved": "https://registry.npmjs.org/@dhealthdapps/health-to-earn/-/health-to-earn-1.1.1.tgz",
+  "_shasum": "b6281b4e16da7539c3d03d1494d6270317b87f3e",
   "_spec": "@dhealthdapps/health-to-earn@latest",
   "_where": "/Users/greg/Sources/using-blockchain/dhealth-wallet",
   "author": {
@@ -95,5 +95,5 @@
     "serve": "npm run serve --prefix firebase-app/functions"
   },
   "types": "dist/types/Strava.d.ts",
-  "version": "1.1.0"
+  "version": "1.1.1"
 }
diff --git a/public/plugins/@yourdlt/plugin-dummy/package.json b/public/plugins/@yourdlt/plugin-dummy/package.json
@@ -1,8 +1,8 @@
 {
   "_from": "@yourdlt/plugin-dummy@latest",
-  "_id": "@yourdlt/plugin-dummy@0.3.3",
+  "_id": "@yourdlt/plugin-dummy@0.3.4",
   "_inBundle": false,
-  "_integrity": "sha512-MjWBP7RFj5hmDF146VkbZWSZNzoZtG6ywM0wY2NYg9W9aET/fTnCX5w6RR+N+TRAtSJHmNdrepJD1FjmGbKowg==",
+  "_integrity": "sha512-A6KxFYw47izW8auFTU3/N7GL2RXP6wnwEyr5XV583KmrF3y5rPwwxXuInDtBax4S9GlSTEs6SjlE/Bb3xm6Sfg==",
   "_location": "/@yourdlt/plugin-dummy",
   "_phantomChildren": {},
   "_requested": {
@@ -19,8 +19,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/@yourdlt/plugin-dummy/-/plugin-dummy-0.3.3.tgz",
-  "_shasum": "6629f050eb8ae7d48743ade2d6cf6b84d72e70e5",
+  "_resolved": "https://registry.npmjs.org/@yourdlt/plugin-dummy/-/plugin-dummy-0.3.4.tgz",
+  "_shasum": "7fe9c879a9b403d3ebea1ff7a7ab62035da50485",
   "_spec": "@yourdlt/plugin-dummy@latest",
   "_where": "/Users/greg/Sources/using-blockchain/dhealth-wallet",
   "author": {
@@ -89,5 +89,5 @@
     "serve": "vue-cli-service serve src/Dummy.ts"
   },
   "types": "dist/Dummy.d.ts",
-  "version": "0.3.3"
+  "version": "0.3.4"
 }
diff --git a/public/plugins/@yourdlt/plugin-librarian/package.json b/public/plugins/@yourdlt/plugin-librarian/package.json
@@ -1,8 +1,8 @@
 {
   "_from": "@yourdlt/plugin-librarian@latest",
-  "_id": "@yourdlt/plugin-librarian@0.5.5",
+  "_id": "@yourdlt/plugin-librarian@0.5.6",
   "_inBundle": false,
-  "_integrity": "sha512-l0LqRBHyMNu2g8kvheepB7Gs8PFQ/0RfXCey432g4ntFkOawMLtmeaW1nlvxR805LOx54dCZtbZl/n9rhZNRkA==",
+  "_integrity": "sha512-usVWjpPk4K8HnCadxAXuqBo9xTsXBhWP8BCXhRZNQiv2q60+fA0kUEx8NO/c0NaLRKrhwj5x9mGGjAwh8zAH2g==",
   "_location": "/@yourdlt/plugin-librarian",
   "_phantomChildren": {},
   "_requested": {
@@ -19,8 +19,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/@yourdlt/plugin-librarian/-/plugin-librarian-0.5.5.tgz",
-  "_shasum": "107a62d945db4cbf7c79bd078de566763963ccb2",
+  "_resolved": "https://registry.npmjs.org/@yourdlt/plugin-librarian/-/plugin-librarian-0.5.6.tgz",
+  "_shasum": "2c506ef9aae6779f454ddf5afead18de35117a27",
   "_spec": "@yourdlt/plugin-librarian@latest",
   "_where": "/Users/greg/Sources/using-blockchain/dhealth-wallet",
   "author": {
@@ -92,5 +92,5 @@
     "serve": "vue-cli-service serve"
   },
   "types": "dist/types/Librarian.d.ts",
-  "version": "0.5.5"
+  "version": "0.5.6"
 }
diff --git a/public/plugins/@yourdlt/plugin-ninjazzz/package.json b/public/plugins/@yourdlt/plugin-ninjazzz/package.json
@@ -1,8 +1,8 @@
 {
   "_from": "@yourdlt/plugin-ninjazzz@latest",
-  "_id": "@yourdlt/plugin-ninjazzz@1.0.7",
+  "_id": "@yourdlt/plugin-ninjazzz@1.0.8",
   "_inBundle": false,
-  "_integrity": "sha512-Kuz2Gj4evEMfpW/EbVLnPiy9E5gI/ocjBXlk0SmYZz8rHzD3LBxNSm5GgqKGqB3qXAY7PwsBFDoTR8VR2TJPFg==",
+  "_integrity": "sha512-/kVVOv/ukKp9n8zI/M66mGQvYRjKd1Dp43zFm+8Uvedc08RUkEdiveHX6wMeMt8wHlv1V0vOMXZJBUMCcRTWdA==",
   "_location": "/@yourdlt/plugin-ninjazzz",
   "_phantomChildren": {},
   "_requested": {
@@ -19,8 +19,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/@yourdlt/plugin-ninjazzz/-/plugin-ninjazzz-1.0.7.tgz",
-  "_shasum": "a0d106b3b1eff89bd123ea77a2af783ee86626e0",
+  "_resolved": "https://registry.npmjs.org/@yourdlt/plugin-ninjazzz/-/plugin-ninjazzz-1.0.8.tgz",
+  "_shasum": "538caff1cf4f3f23a7b6642c0fa6424ec3477a61",
   "_spec": "@yourdlt/plugin-ninjazzz@latest",
   "_where": "/Users/greg/Sources/using-blockchain/dhealth-wallet",
   "author": {
@@ -92,5 +92,5 @@
     "serve": "vue-cli-service serve src/Dojo.ts"
   },
   "types": "dist/types/Dojo.d.ts",
-  "version": "1.0.7"
+  "version": "1.0.8"
 }
diff --git a/public/plugins/plugins.js b/public/plugins/plugins.js
@@ -32,13 +32,14 @@ const registerPlugin = ($app, p) => {
     k => $app.component(k, p.module.components[k])
   );
 
-  console.log("[DEBUG][plugins/plugins.js] electron: ", ('electron' in window) && ('ipcRenderer' in window['electron']));
+  // console.log("[DEBUG][plugins/plugins.js] electron: ", ('electron' in window) && ('ipcRenderer' in window['electron']));
 
   // Stops here with missing IPC
   if (!('electron' in window) || !('ipcRenderer' in window['electron'])) {
     return ;
   }
 
+  // console.log("[DEBUG][plugins/plugins.js] loadedPlugin is: ", p.module);
   console.log("[DEBUG][plugins/plugins.js] Now sending onPluginLoaded");
 
   // Persists loaded plugin details
@@ -49,6 +50,8 @@ const registerPlugin = ($app, p) => {
     npmModule: p.plugin,
     entryPoint,
     installPath: p.path,
+    name: loadedPlugin && 'name' in loadedPlugin ? loadedPlugin.name : p.plugin,
+    friendlyName: loadedPlugin && 'friendlyName' in loadedPlugin ? loadedPlugin.friendlyName : p.plugin,
     view: loadedPlugin && 'view' in loadedPlugin ? loadedPlugin.view : '',
     routes: loadedPlugin && 'routes' in loadedPlugin ? loadedPlugin.routes : [],
     components: loadedPlugin && 'components' in loadedPlugin ? Object.keys(loadedPlugin.components) : [],

diff --git a/public/plugins/plugins.json b/public/plugins/plugins.json
@@ -1,8 +1,8 @@
 {
-  "@yourdlt/plugin-dummy": "0.3.3",
-  "@yourdlt/plugin-librarian": "0.5.5",
-  "@yourdlt/plugin-ninjazzz": "1.0.7",
-  "@dhealth/plugin-node-monitor": "1.0.2",
-  "@dhealthdapps/health-to-earn": "1.1.0",
-  "@dhealthdapps/bridge": "1.0.0-alpha202112101001"
+  "@yourdlt/plugin-dummy": "0.3.4",
+  "@yourdlt/plugin-librarian": "0.5.6",
+  "@yourdlt/plugin-ninjazzz": "1.0.8",
+  "@dhealth/plugin-node-monitor": "1.0.3",
+  "@dhealthdapps/health-to-earn": "1.1.1",
+  "@dhealthdapps/bridge": "1.0.0"
 }
diff --git a/src/components/TableDisplay/TableDisplay.less b/src/components/TableDisplay/TableDisplay.less
@@ -191,14 +191,19 @@
     border-right: none;
 }
 .plugin-columns {
-    grid-template-columns: 10% 25% 15% 40% 10%;
+    grid-template-columns: 10% 25% 10% 40% 15%;
     .npmModule-header,
     .npmModule-cell {
         text-align: left;
     }
     .name-header,
     .name-cell {
         text-align: center;
+        font-weight: @bolder;
+    }
+    .version-header,
+    .version-cell {
+        text-align: center;
     }
     .author-header,
     .author-cell {

diff --git a/src/components/TableDisplay/TableDisplay.vue b/src/components/TableDisplay/TableDisplay.vue
@@ -6,9 +6,10 @@
                     <span v-if="assetType === 'metadata'" class="add-metadata-button">
                         <ButtonAdd :title="$t('add_metadata')" :disabled="false" size="26" @click="$emit('on-add-metadata')" />
                     </span>
-                    <Checkbox v-if="!['metadata', 'plugin'].includes(assetType)" v-model="showExpired" class="table-filter-item-container">
+                    <Checkbox v-if="!['metadata'].includes(assetType)" v-model="showExpired" class="table-filter-item-container">
                         <span v-show="assetType === 'mosaic'" style="margin-left: 0.1rem;">{{ $t('show_expired_mosaics') }}</span>
                         <span v-show="assetType === 'namespace'" style="margin-left: 0.1rem;">{{ $t('show_expired_namespaces') }}</span>
+                        <span v-show="assetType === 'plugin'" style="margin-left: 0.1rem;">{{ $t('show_uninstalled_plugins') }}</span>
                     </Checkbox>
                     <div v-if="signers.length > 1" style="min-width: 2rem;">
                         <SignerFilter :signers="signers" @signer-change="onSignerSelectorChange" />