From 3922f2ec805edb6e58320b0594511ef2d4283bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Sun, 30 Dec 2018 22:58:51 +0100
Subject: [PATCH 01/41] refactor chain config to facilitate multi chain usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 package.json                             |   1 +
 src/components/node-select.vue           |  55 +-
 src/config/config.js                     | 711 ++++++++++++-----------
 src/lib/blockchains/BitShares.js         |  45 ++
 src/lib/blockchains/BlockchainAPI.js     |  25 +
 src/lib/blockchains/Steem.js             |  51 ++
 src/lib/blockchains/blockchainFactory.js |  14 +
 7 files changed, 521 insertions(+), 381 deletions(-)
 create mode 100644 src/lib/blockchains/BitShares.js
 create mode 100644 src/lib/blockchains/BlockchainAPI.js
 create mode 100644 src/lib/blockchains/Steem.js
 create mode 100644 src/lib/blockchains/blockchainFactory.js

diff --git a/package.json b/package.json
index 6bcdb545..5567bbee 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "readline": "^1.3.0",
     "secure-ls": "^1.2.1",
     "socket.io": "^2.1.1",
+    "steem": "^0.7.3",
     "typeface-rajdhani": "0.0.54",
     "typeface-roboto": "0.0.54",
     "uuid": "^3.3.2",
diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index fa2f2d0f..3d9ef4d0 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -5,22 +5,22 @@
         </div>
         <div class="col-8 p-0">
             <div class="input-group mb-0">
-                <select 
-                    id="node-select" 
-                    v-model="selectedNode" 
+                <select
+                    id="node-select"
+                    v-model="selectedNode"
                     class="form-control "
                 >
-                    <option 
-                        v-for="node in nodes" 
-                        :key="node.url" 
+                    <option
+                        v-for="node in nodes"
+                        :key="node.url"
                         :value="node.url"
                     >{{ node.url }}</option>
                 </select>
             </div>
         </div>
         <div class="col-2 p-0 text-center d-flex  justify-content-center">
-            <span 
-                class="status align-self-center" 
+            <span
+                class="status align-self-center"
                 :class="{'icon-connected': isConnected,'icon-disconnected': !isConnected}"
             />
         </div>
@@ -28,8 +28,7 @@
 </template>
 
 <script>
-import { Apis } from "bitsharesjs-ws";
-import { nodeList } from "../config/config";
+import getBlockchain from "../lib/blockchains/blockchainFactory"
 import RendererLogger from "../lib/RendererLogger";
 
 const logger = new RendererLogger();
@@ -39,7 +38,8 @@ export default {
   i18nOptions: { namespaces: "common" },
   data() {
     return {
-      nodes: nodeList,
+      blockchain: getBlockchain("BTS"),
+      nodes: getBlockchain("BTS").getNodes(),
       isConnected: false,
       api: null,
       selectedNode: this.$store.state.SettingsStore.settings.selected_node
@@ -47,37 +47,24 @@ export default {
   },
   watch: {
     selectedNode: function() {
-      Apis.close().then(() => {
-        this.isConnected = false;
-        Apis.instance(
-          this.selectedNode,
-          true,
-          10000,
-          { enableCrypto: false, enableOrders: false },
-          this.onClose
-        ).init_promise.then(() => {
-          this.$store.dispatch("SettingsStore/setNode", {
-            node: this.selectedNode
-          });
-          this.isConnected = true;
+      this.blockchain.connect(this.selectedNode).then(() => {
+        this._updateConnectionStatus();
+        this.$store.dispatch("SettingsStore/setNode", {
+          node: this.selectedNode
         });
       });
     }
   },
   mounted() {
-    Apis.instance(
-      this.selectedNode,
-      true,
-      10000,
-      { enableCrypto: false, enableOrders: false },
-      this.onClose
-    ).init_promise.then(() => {
-      this.isConnected = true;
+    this.blockchain.connect(this.selectedNode).then(() => {
+      this._updateConnectionStatus();
       this.$emit("first-connect");
     });
   },
-  onClose() {
-    this.isConnected = false;
+  methods: {
+    _updateConnectionStatus() {
+      this.isConnected = this.blockchain.isConnected();
+    },
   }
 };
 </script>
diff --git a/src/config/config.js b/src/config/config.js
index 4b380a7a..aa6e0c97 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -2,352 +2,369 @@ export const version = {
     release: 2,
     name: '0.5.0'
 };
-export const chainList = [{
-    short: 'BTS',
-    name: 'BitShares',
-    chainId: '4018d7844c78f6a6c41c6a552b898022310fc5dec06da467ee7905a8dad512c8'
-}];
-export const nodeList = [
+export const blockchains = {
+    BTS: {
+        short: 'BTS',
+        name: 'BitShares',
+        chainId: '4018d7844c78f6a6c41c6a552b898022310fc5dec06da467ee7905a8dad512c8',
+        nodeList: [
 
-    {
-        url: "ws://127.0.0.1:8090",
-        location: "Locally hosted"
-    },
-    {
-        url: "wss://bitshares.openledger.info/ws",
-        location: "Nuremberg",
-        region: "Western Europe",
-        country: "Germany",
-        operator: "Witness: openledger-dc",
-        contact: "telegram:mtopenledger"
-    },
-    {
-        url: "wss://openledger.hk/ws",
-        region: "Southeastern Asia",
-        country: "Singapore",
-        operator: "Witness: openledger-dc",
-        contact: "telegram:mtopenledger"
-    },
-    {
-        url: "wss://na.openledger.info/ws",
-        location: "Quebec",
-        region: "Northern America",
-        country: "Canada",
-        operator: "Witness: openledger-dc",
-        contact: "telegram:mtopenledger"
-    },
-    {
-        url: "wss://bitshares.nu/ws",
-        location: "Stockholm",
-        region: "Northern Europe",
-        country: "Sweden"
-    },
-    {
-        url: "wss://bit.btsabc.org/ws",
-        region: "Eastern Asia",
-        country: "China",
-        location: "Hong Kong",
-        operator: "Witness: abc123",
-        contact: "QQ:58291;email:58291@qq.com"
-    },
-    {
-        url: "wss://node.btscharts.com/ws",
-        region: "Eastern Asia",
-        country: "China",
-        location: "Beijing",
-        operator: "leo2017",
-        contact: "wechat:wx8855221;email:8855221@qq.com"
-    },
-    {
-        url: "wss://japan.bitshares.apasia.tech/ws",
-        country: "Japan",
-        region: "Southeastern Asia",
-        operator: "APAsia",
-        contact: "telegram:murda_ra"
-    },
-    {
-        url: "wss://bitshares.crypto.fans/ws",
-        region: "Western Europe",
-        country: "Germany",
-        location: "Munich",
-        operator: "Witness: sc-ol",
-        contact: "telegram:startail"
-    },
-    {
-        url: "wss://ws.gdex.top",
-        region: "Eastern Asia",
-        country: "China",
-        location: "Shanghai",
-        operator: "Witness: gdex-witness",
-        contact: "telegram:BrianZhang"
-    },
-    {
-        url: "wss://dex.rnglab.org",
-        location: "Netherlands",
-        operator: "Witness: rnglab"
-    },
-    {
-        url: "wss://la.dexnode.net/ws",
-        region: "Northern America",
-        country: "U.S.A.",
-        location: "Los Angeles",
-        operator: "Witness: Sahkan",
-        contact: "telegram:Sahkan_bitshares"
-    },
-    {
-        url: "wss://dexnode.net/ws",
-        region: "Northern America",
-        country: "U.S.A.",
-        location: "Dallas",
-        operator: "Witness: Sahkan",
-        contact: "telegram:Sahkan_bitshares"
-    },
-    {
-        url: "wss://kc-us-dex.xeldal.com/ws",
-        region: "North America",
-        country: "U.S.A.",
-        location: "Kansas City",
-        operator: "Witness: xeldal",
-        contact: "telegram:xeldal"
-    },
-    {
-        url: "wss://btsza.co.za:8091/ws",
-        location: "Cape Town, South Africa"
-    },
-    {
-        url: "wss://api.bts.blckchnd.com",
-        region: "Western Europe",
-        country: "Germany",
-        location: "Falkenstein",
-        operator: "Witness: blckchnd",
-        contact: "email:admin@blckchnd.com;telegram:ruslansalikhov;github:blckchnd"
-    },
-    {
-        url: "wss://api-ru.bts.blckchnd.com",
-        region: "Eastern Europe",
-        country: "Russia",
-        location: "Moscow",
-        operator: "Witness: blckchnd",
-        contact: "email:admin@blckchnd.com;telegram:ruslansalikhov;github:blckchnd"
-    },
-    {
-        url: "wss://node.market.rudex.org",
-        region: "Western Europe",
-        country: "Germany",
-        location: "Falkenstein",
-        operator: "Witness: blckchnd",
-        contact: "email:admin@blckchnd.com;telegram:ruslansalikhov;github:blckchnd"
-    },
-    {
-        url: "wss://api.bitsharesdex.com",
-        region: "Northern America",
-        country: "U.S.A.",
-        location: "Kansas City",
-        operator: "Witness: delegate.ihashfury",
-        contact: "telegram:ihashfury"
-    },
-    {
-        url: "wss://api.fr.bitsharesdex.com",
-        region: "Western Europe",
-        country: "France",
-        location: "Paris",
-        operator: "Witness: delegate.ihashfury",
-        contact: "telegram:ihashfury"
-    },
-    {
-        url: "wss://blockzms.xyz/ws ",
-        region: "North America",
-        country: "U.S.A.",
-        location: "New Jersey",
-        operator: "Witness: delegate-zhaomu",
-        contact: "telegram:lzmlam;wechat:lzmlam"
-    },
-    {
-        url: "wss://eu.nodes.bitshares.ws",
-        region: "Western Europe",
-        country: "Germany",
-        operator: "Infrastructure Worker",
-        contact: "email:info@blockchainprojectsbv.com"
-    },
-    {
-        url: "wss://us.nodes.bitshares.ws",
-        region: "North America",
-        country: "U.S.A.",
-        operator: "Infrastructure Worker",
-        contact: "email:info@blockchainprojectsbv.com"
-    },
-    {
-        url: "wss://sg.nodes.bitshares.ws",
-        region: "Southeastern Asia",
-        country: "Singapore",
-        operator: "Infrastructure Worker",
-        contact: "email:info@blockchainprojectsbv.com"
-    },
-    {
-        url: "wss://ws.winex.pro",
-        region: "Southeastern Asia",
-        location: "Singapore",
-        operator: "Witness: winex.witness",
-        contact: "telegram:zmaxin"
-    },
-    {
-        url: "wss://api.bts.mobi/ws",
-        region: "Northern America",
-        country: "U.S.A.",
-        location: "Virginia",
-        operator: "Witness: in.abit",
-        contact: "telegram:abitmore"
-    },
-    {
-        url: "wss://api.btsxchng.com",
-        location: "Global (Asia Pacific (Singapore) / US East (N. Virginia) / EU (London))",
-        operator: "Witness: elmato"
-    },
-    {
-        url: "wss://api.bts.network/",
-        region: "North America",
-        country: "U.S.A.",
-        location: "Virginia",
-        operator: "Witness: fox",
-        contact: "telegram:ryanRfox"
-    },
-    {
-        url: "wss://btsws.roelandp.nl/ws",
-        region: "Northern Europe",
-        country: "Finland",
-        location: "Helsinki",
-        operator: "Witness: roelandp",
-        contact: "telegram:roelandp"
-    },
-    {
-        url: "wss://api.bitshares.bhuz.info/ws",
-        region: "Northern America",
-        country: "Canada",
-        operator: "Witness: bhuz",
-        contact: "telegram:bhuzor"
-    },
-    {
-        url: "wss://bts-api.lafona.net/ws",
-        region: "Northern America",
-        country: "Canada",
-        location: "Montreal",
-        operator: "Witness: delegate-1.lafona",
-        contact: "telegram:lafona"
-    },
-    {
-        url: "wss://kimziv.com/ws",
-        region: "North America",
-        country: "U.S.A.",
-        location: "New Jersey",
-        operator: "Witness: witness.yao",
-        contact: "telegram:imyao"
-    },
-    {
-        url: "wss://api.btsgo.net/ws",
-        region: "Asia",
-        location: "Singapore",
-        operator: "Witness: xn-delegate",
-        contact: "wechat:Necklace"
-    },
-    {
-        url: "wss://bts.proxyhosts.info/wss",
-        location: "Germany",
-        operator: "Witness: verbaltech2"
-    },
-    {
-        url: "wss://bts.open.icowallet.net/ws",
-        region: "Eastern Asia",
-        country: "China",
-        location: "Hangzhou",
-        operator: "Witness: magicwallet.witness",
-        contact: "telegram:plus_wave"
-    },
-    {
-        url: "wss://crazybit.online",
-        region: "Asia",
-        country: "China",
-        location: "Shenzhen",
-        operator: "Witness: crazybit",
-        contact: "telegram:crazybits;wechat:JamesCai"
-    },
-    {
-        url: "wss://freedom.bts123.cc:15138/",
-        region: "South China",
-        country: "China",
-        location: "Changsha",
-        operator: "Witness: delegate.freedom",
-        contact: "telegram:eggplant"
-    },
-    {
-        url: "wss://bitshares.bts123.cc:15138/",
-        region: "North China",
-        country: "China",
-        location: "Hangzhou",
-        operator: "Witness: delegate.freedom",
-        contact: "telegram:eggplant"
-    },
-    {
-        url: "wss://api.bts.ai",
-        region: "Eastern Asia",
-        country: "China",
-        location: "Beijing",
-        operator: "Witness: witness.hiblockchain",
-        contact: "telegram:vianull;wechat:strugglingl"
-    },
-    {
-        url: "wss://ws.hellobts.com",
-        region: "Eastern Asia",
-        country: "Japan",
-        location: "Tokyo",
-        operator: "Witness: xman",
-        contact: "wechat:hidpos;email:hellobts@qq.com"
-    },
-    {
-        url: "wss://bitshares.cyberit.io",
-        region: "Eastern Asia",
-        country: "China",
-        location: "Hong Kong",
-        operator: "Witness: witness.still",
-        contact: "telegram:gordoor;wechat:overyard"
-    },
-    {
-        url: "wss://bts-seoul.clockwork.gr",
-        region: "Southeastern Asia",
-        country: "Korea",
-        location: "Seoul",
-        operator: "Witness: clockwork",
-        contact: "telegram:clockworkgr"
-    },
-    {
-        url: "wss://bts.to0l.cn:4443/ws",
-        region: "Eastern Asia",
-        country: "China",
-        location: "Shandong",
-        operator: "Witness: liuye",
-        contact: "email:work@liuye.tech"
-    },
-    {
-        url: "wss://btsfullnode.bangzi.info/ws",
-        region: "Western Europe",
-        country: "Germany",
-        location: "Munich",
-        operator: "Witness: Bangzi",
-        contact: "telegram:Bangzi"
-    },
-    {
-        url: "wss://api.dex.trading/",
-        region: "Western Europe",
-        country: "France",
-        location: "Paris",
-        operator: "Witness: zapata42-witness",
-        contact: "telegram:Zapata_42"
-    },
-    {
-        url: "wss://node.bitshares.eu",
-        location: "Nuremberg",
-        region: "Western Europe",
-        country: "Germany",
-        operator: "ChainSquad GmbH (xeroc)",
-        contact: "info@chainsquad.com"
+            {
+                url: "ws://127.0.0.1:8090",
+                location: "Locally hosted"
+            },
+            {
+                url: "wss://bitshares.openledger.info/ws",
+                location: "Nuremberg",
+                region: "Western Europe",
+                country: "Germany",
+                operator: "Witness: openledger-dc",
+                contact: "telegram:mtopenledger"
+            },
+            {
+                url: "wss://openledger.hk/ws",
+                region: "Southeastern Asia",
+                country: "Singapore",
+                operator: "Witness: openledger-dc",
+                contact: "telegram:mtopenledger"
+            },
+            {
+                url: "wss://na.openledger.info/ws",
+                location: "Quebec",
+                region: "Northern America",
+                country: "Canada",
+                operator: "Witness: openledger-dc",
+                contact: "telegram:mtopenledger"
+            },
+            {
+                url: "wss://bitshares.nu/ws",
+                location: "Stockholm",
+                region: "Northern Europe",
+                country: "Sweden"
+            },
+            {
+                url: "wss://bit.btsabc.org/ws",
+                region: "Eastern Asia",
+                country: "China",
+                location: "Hong Kong",
+                operator: "Witness: abc123",
+                contact: "QQ:58291;email:58291@qq.com"
+            },
+            {
+                url: "wss://node.btscharts.com/ws",
+                region: "Eastern Asia",
+                country: "China",
+                location: "Beijing",
+                operator: "leo2017",
+                contact: "wechat:wx8855221;email:8855221@qq.com"
+            },
+            {
+                url: "wss://japan.bitshares.apasia.tech/ws",
+                country: "Japan",
+                region: "Southeastern Asia",
+                operator: "APAsia",
+                contact: "telegram:murda_ra"
+            },
+            {
+                url: "wss://bitshares.crypto.fans/ws",
+                region: "Western Europe",
+                country: "Germany",
+                location: "Munich",
+                operator: "Witness: sc-ol",
+                contact: "telegram:startail"
+            },
+            {
+                url: "wss://ws.gdex.top",
+                region: "Eastern Asia",
+                country: "China",
+                location: "Shanghai",
+                operator: "Witness: gdex-witness",
+                contact: "telegram:BrianZhang"
+            },
+            {
+                url: "wss://dex.rnglab.org",
+                location: "Netherlands",
+                operator: "Witness: rnglab"
+            },
+            {
+                url: "wss://la.dexnode.net/ws",
+                region: "Northern America",
+                country: "U.S.A.",
+                location: "Los Angeles",
+                operator: "Witness: Sahkan",
+                contact: "telegram:Sahkan_bitshares"
+            },
+            {
+                url: "wss://dexnode.net/ws",
+                region: "Northern America",
+                country: "U.S.A.",
+                location: "Dallas",
+                operator: "Witness: Sahkan",
+                contact: "telegram:Sahkan_bitshares"
+            },
+            {
+                url: "wss://kc-us-dex.xeldal.com/ws",
+                region: "North America",
+                country: "U.S.A.",
+                location: "Kansas City",
+                operator: "Witness: xeldal",
+                contact: "telegram:xeldal"
+            },
+            {
+                url: "wss://btsza.co.za:8091/ws",
+                location: "Cape Town, South Africa"
+            },
+            {
+                url: "wss://api.bts.blckchnd.com",
+                region: "Western Europe",
+                country: "Germany",
+                location: "Falkenstein",
+                operator: "Witness: blckchnd",
+                contact: "email:admin@blckchnd.com;telegram:ruslansalikhov;github:blckchnd"
+            },
+            {
+                url: "wss://api-ru.bts.blckchnd.com",
+                region: "Eastern Europe",
+                country: "Russia",
+                location: "Moscow",
+                operator: "Witness: blckchnd",
+                contact: "email:admin@blckchnd.com;telegram:ruslansalikhov;github:blckchnd"
+            },
+            {
+                url: "wss://node.market.rudex.org",
+                region: "Western Europe",
+                country: "Germany",
+                location: "Falkenstein",
+                operator: "Witness: blckchnd",
+                contact: "email:admin@blckchnd.com;telegram:ruslansalikhov;github:blckchnd"
+            },
+            {
+                url: "wss://api.bitsharesdex.com",
+                region: "Northern America",
+                country: "U.S.A.",
+                location: "Kansas City",
+                operator: "Witness: delegate.ihashfury",
+                contact: "telegram:ihashfury"
+            },
+            {
+                url: "wss://api.fr.bitsharesdex.com",
+                region: "Western Europe",
+                country: "France",
+                location: "Paris",
+                operator: "Witness: delegate.ihashfury",
+                contact: "telegram:ihashfury"
+            },
+            {
+                url: "wss://blockzms.xyz/ws ",
+                region: "North America",
+                country: "U.S.A.",
+                location: "New Jersey",
+                operator: "Witness: delegate-zhaomu",
+                contact: "telegram:lzmlam;wechat:lzmlam"
+            },
+            {
+                url: "wss://eu.nodes.bitshares.ws",
+                region: "Western Europe",
+                country: "Germany",
+                operator: "Infrastructure Worker",
+                contact: "email:info@blockchainprojectsbv.com"
+            },
+            {
+                url: "wss://us.nodes.bitshares.ws",
+                region: "North America",
+                country: "U.S.A.",
+                operator: "Infrastructure Worker",
+                contact: "email:info@blockchainprojectsbv.com"
+            },
+            {
+                url: "wss://sg.nodes.bitshares.ws",
+                region: "Southeastern Asia",
+                country: "Singapore",
+                operator: "Infrastructure Worker",
+                contact: "email:info@blockchainprojectsbv.com"
+            },
+            {
+                url: "wss://ws.winex.pro",
+                region: "Southeastern Asia",
+                location: "Singapore",
+                operator: "Witness: winex.witness",
+                contact: "telegram:zmaxin"
+            },
+            {
+                url: "wss://api.bts.mobi/ws",
+                region: "Northern America",
+                country: "U.S.A.",
+                location: "Virginia",
+                operator: "Witness: in.abit",
+                contact: "telegram:abitmore"
+            },
+            {
+                url: "wss://api.btsxchng.com",
+                location: "Global (Asia Pacific (Singapore) / US East (N. Virginia) / EU (London))",
+                operator: "Witness: elmato"
+            },
+            {
+                url: "wss://api.bts.network/",
+                region: "North America",
+                country: "U.S.A.",
+                location: "Virginia",
+                operator: "Witness: fox",
+                contact: "telegram:ryanRfox"
+            },
+            {
+                url: "wss://btsws.roelandp.nl/ws",
+                region: "Northern Europe",
+                country: "Finland",
+                location: "Helsinki",
+                operator: "Witness: roelandp",
+                contact: "telegram:roelandp"
+            },
+            {
+                url: "wss://api.bitshares.bhuz.info/ws",
+                region: "Northern America",
+                country: "Canada",
+                operator: "Witness: bhuz",
+                contact: "telegram:bhuzor"
+            },
+            {
+                url: "wss://bts-api.lafona.net/ws",
+                region: "Northern America",
+                country: "Canada",
+                location: "Montreal",
+                operator: "Witness: delegate-1.lafona",
+                contact: "telegram:lafona"
+            },
+            {
+                url: "wss://kimziv.com/ws",
+                region: "North America",
+                country: "U.S.A.",
+                location: "New Jersey",
+                operator: "Witness: witness.yao",
+                contact: "telegram:imyao"
+            },
+            {
+                url: "wss://api.btsgo.net/ws",
+                region: "Asia",
+                location: "Singapore",
+                operator: "Witness: xn-delegate",
+                contact: "wechat:Necklace"
+            },
+            {
+                url: "wss://bts.proxyhosts.info/wss",
+                location: "Germany",
+                operator: "Witness: verbaltech2"
+            },
+            {
+                url: "wss://bts.open.icowallet.net/ws",
+                region: "Eastern Asia",
+                country: "China",
+                location: "Hangzhou",
+                operator: "Witness: magicwallet.witness",
+                contact: "telegram:plus_wave"
+            },
+            {
+                url: "wss://crazybit.online",
+                region: "Asia",
+                country: "China",
+                location: "Shenzhen",
+                operator: "Witness: crazybit",
+                contact: "telegram:crazybits;wechat:JamesCai"
+            },
+            {
+                url: "wss://freedom.bts123.cc:15138/",
+                region: "South China",
+                country: "China",
+                location: "Changsha",
+                operator: "Witness: delegate.freedom",
+                contact: "telegram:eggplant"
+            },
+            {
+                url: "wss://bitshares.bts123.cc:15138/",
+                region: "North China",
+                country: "China",
+                location: "Hangzhou",
+                operator: "Witness: delegate.freedom",
+                contact: "telegram:eggplant"
+            },
+            {
+                url: "wss://api.bts.ai",
+                region: "Eastern Asia",
+                country: "China",
+                location: "Beijing",
+                operator: "Witness: witness.hiblockchain",
+                contact: "telegram:vianull;wechat:strugglingl"
+            },
+            {
+                url: "wss://ws.hellobts.com",
+                region: "Eastern Asia",
+                country: "Japan",
+                location: "Tokyo",
+                operator: "Witness: xman",
+                contact: "wechat:hidpos;email:hellobts@qq.com"
+            },
+            {
+                url: "wss://bitshares.cyberit.io",
+                region: "Eastern Asia",
+                country: "China",
+                location: "Hong Kong",
+                operator: "Witness: witness.still",
+                contact: "telegram:gordoor;wechat:overyard"
+            },
+            {
+                url: "wss://bts-seoul.clockwork.gr",
+                region: "Southeastern Asia",
+                country: "Korea",
+                location: "Seoul",
+                operator: "Witness: clockwork",
+                contact: "telegram:clockworkgr"
+            },
+            {
+                url: "wss://bts.to0l.cn:4443/ws",
+                region: "Eastern Asia",
+                country: "China",
+                location: "Shandong",
+                operator: "Witness: liuye",
+                contact: "email:work@liuye.tech"
+            },
+            {
+                url: "wss://btsfullnode.bangzi.info/ws",
+                region: "Western Europe",
+                country: "Germany",
+                location: "Munich",
+                operator: "Witness: Bangzi",
+                contact: "telegram:Bangzi"
+            },
+            {
+                url: "wss://api.dex.trading/",
+                region: "Western Europe",
+                country: "France",
+                location: "Paris",
+                operator: "Witness: zapata42-witness",
+                contact: "telegram:Zapata_42"
+            },
+            {
+                url: "wss://node.bitshares.eu",
+                location: "Nuremberg",
+                region: "Western Europe",
+                country: "Germany",
+                operator: "ChainSquad GmbH (xeroc)",
+                contact: "info@chainsquad.com"
+            }
+        ]
+    },
+    STEEM: {
+        short: 'STEEM',
+        name: 'Steem',
+        chainId: '0',
+        nodeList: [
+            {
+                url: "api.steemit.com",
+                location: "Unknown",
+                region: "Unknown",
+                country: "Unknown",
+                operator: "Steemit Inc.",
+                contact: "https://steem.com"
+            }
+        ]
     }
-];
+};
\ No newline at end of file
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
new file mode 100644
index 00000000..2e080b35
--- /dev/null
+++ b/src/lib/blockchains/BitShares.js
@@ -0,0 +1,45 @@
+import BlockchainAPI from "./BlockchainAPI";
+import { Apis } from "bitsharesjs-ws";
+
+export default class BitShares extends BlockchainAPI {
+
+    _onCloseWrapper(onClose) {
+        this._isConnected = false;
+        if (onClose) onClose();
+    }
+
+    connect(nodeToConnect, onClose = null) {
+        return new Promise((resolve, reject) => {
+            if (this._isConnected) {
+                Apis.close().then(() => {
+                    this._isConnected = false;
+                    Apis.instance(
+                        nodeToConnect,
+                        true,
+                        10000,
+                        {enableCrypto: false, enableOrders: false},
+                        this._onCloseWrapper.bind(this, onClose)
+                    ).init_promise.then(() => {
+                        this._connectionEstablished(resolve, nodeToConnect);
+                    }).catch((err) => {
+                        this._isConnected = false;
+                        reject(err);
+                    });
+                });
+            } else {
+                Apis.instance(
+                    nodeToConnect,
+                    true,
+                    10000,
+                    { enableCrypto: false, enableOrders: false },
+                    this._onCloseWrapper.bind(this, onClose)
+                ).init_promise.then(() => {
+                    this._connectionEstablished(resolve, nodeToConnect);
+                }).catch((err) => {
+                    this._isConnected = false;
+                    reject(err);
+                });
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
new file mode 100644
index 00000000..cbbd6aad
--- /dev/null
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -0,0 +1,25 @@
+export default class BlockchainAPI {
+
+    constructor(config) {
+        this._config = config;
+        this._isConnected = false;
+    }
+
+    isConnected() {
+        return this._isConnected;
+    }
+
+    connect(nodeToConnect, onClose, onError) {
+        return new Promise(() => {});
+    }
+
+    _connectionEstablished(resolveCallback, node) {
+        this._isConnected = true;
+        console.log("connected to ", node)
+        resolveCallback();
+    }
+
+    getNodes() {
+        return this._config.nodeList;
+    }
+}
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
new file mode 100644
index 00000000..294494e6
--- /dev/null
+++ b/src/lib/blockchains/Steem.js
@@ -0,0 +1,51 @@
+import steem from "steem";
+
+export default class Steem extends BlockchainAPI {
+
+    _onCloseWrapper(onClose) {
+        this._isConnected = false;
+        if (onClose) onClose();
+    }
+
+    isConnected() {
+        return this._isConnected;
+    }
+
+    connect(nodeToConnect, onClose = null) {
+        return new Promise((resolve, reject) => {
+            if (this._isConnected) {
+                Apis.close().then(() => {
+                    this._isConnected = false;
+                    Apis.instance(
+                        nodeToConnect,
+                        true,
+                        10000,
+                        {enableCrypto: false, enableOrders: false},
+                        this._onCloseWrapper.bind(this, onClose)
+                    ).init_promise.then(() => {
+                        this._isConnected = true;
+                        resolve();
+                    }).catch((err) => {
+                        this._isConnected = false;
+                        reject(err);
+                    });
+                });
+            } else {
+                Apis.instance(
+                    nodeToConnect,
+                    true,
+                    10000,
+                    { enableCrypto: false, enableOrders: false },
+                    this._onCloseWrapper.bind(this, onClose)
+                ).init_promise.then(() => {
+                    this._isConnected = true;
+                    resolve();
+                }).catch((err) => {
+                    this._isConnected = false;
+                    reject(err);
+                });
+            }
+
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/lib/blockchains/blockchainFactory.js b/src/lib/blockchains/blockchainFactory.js
new file mode 100644
index 00000000..0282cc33
--- /dev/null
+++ b/src/lib/blockchains/blockchainFactory.js
@@ -0,0 +1,14 @@
+import { blockchains } from "../../config/config.js";
+
+let apiCache = {}
+
+import BitShares from "./BitShares"
+
+export default function getBlockchainAPI(chain) {
+    if (chain == "BTS") {
+        if (!apiCache.BTS) {
+            apiCache.BTS = new BitShares(blockchains[chain]);
+        }
+        return apiCache.BTS;
+    }
+}
\ No newline at end of file

From 4baa24c3146108d60e5b2e97d15018d20520c29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Mon, 31 Dec 2018 11:23:19 +0100
Subject: [PATCH 02/41] - refactor create.vue to use blockchain api - add
 getAccount(accountname) and getPublicKey(privateKey) to blockchain api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/create.vue            | 75 ++++++++++++----------------
 src/lib/blockchains/BitShares.js     | 37 +++++++++++++-
 src/lib/blockchains/BlockchainAPI.js | 11 +++-
 3 files changed, 78 insertions(+), 45 deletions(-)

diff --git a/src/components/create.vue b/src/components/create.vue
index 8dc172a5..384e8bbf 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -180,11 +180,11 @@
 </template>
 
 <script>
-import { PrivateKey } from "bitsharesjs";
-import { Apis } from "bitsharesjs-ws";
-import { chainList } from "../config/config.js";
+import { blockchains } from "../config/config.js";
 import RendererLogger from "../lib/RendererLogger";
 
+import getBlockchain from "../lib/blockchains/blockchainFactory"
+
 const logger = new RendererLogger();
 
 export default {
@@ -205,7 +205,7 @@ export default {
       includeOwner: 0,
       errorMsg: "",
       selectedChain: 0,
-      chainList: chainList
+      chainList: Object.values(blockchains)
     };
   },
   methods: {
@@ -243,17 +243,14 @@ export default {
         this.$refs.errorModal.show();
         return;
       }
+
+      let blockchain = getBlockchain(this.selectedChain);
+
       try {
-        apkey = PrivateKey.fromWif(this.activepk)
-          .toPublicKey()
-          .toString(this.selectedChain);
-        mpkey = PrivateKey.fromWif(this.memopk)
-          .toPublicKey()
-          .toString(this.selectedChain);
+        apkey = blockchain.getPublicKey(this.activepk);
+        mpkey = blockchain.getPublicKey(this.memopk);
         if (this.includeOwner == 1) {
-          opkey = PrivateKey.fromWif(this.ownerpk)
-            .toPublicKey()
-            .toString(this.selectedChain);
+          opkey =blockchain.getPublicKey(this.ownerpk);
         }
       } catch (e) {
         this.errorMsg = this.$t("invalid_key_error");
@@ -261,37 +258,29 @@ export default {
         return;
       }
       this.$refs.loaderAnimModal.show();
-      let verified = await Apis.instance(
-        this.$store.state.SettingsStore.settings.selected_node,
-        true
-      ).init_promise.then(() => {
-        return Apis.instance()
-          .db_api()
-          .exec("get_full_accounts", [[this.accountname], false])
-          .then(res => {
-            // TODO: Better verification
-            if (
-              res[0][1].account.active.key_auths[0][0] == apkey &&
-              (res[0][1].account.owner.key_auths[0][0] == opkey ||
-                this.includeOwner == 0) &&
-              res[0][1].account.options.memo_key == mpkey
-            ) {
-              this.$refs.loaderAnimModal.hide();
-              return res[0][1].account.id;
-            } else {
-              this.$refs.loaderAnimModal.hide();
-              this.$refs.errorModal.show();
-              this.errorMsg = this.$t("unverified_account_error");
-              return null;
-            }
-          });
+
+      console.log(this.selectedChain);
+      blockchain.getAccount(this.accountname).then((account) => {
+        if (
+          account.active.key_auths[0][0] == apkey &&
+          (account.owner.key_auths[0][0] == opkey || this.includeOwner == 0) &&
+          account.options.memo_key == mpkey
+        ) {
+          this.$refs.loaderAnimModal.hide();
+          this.accountID = account.id;
+          this.step = 3;
+        } else {
+          this.$refs.loaderAnimModal.hide();
+          this.$refs.errorModal.show();
+          this.errorMsg = this.$t("unverified_account_error");
+          this.accountID = "";
+        }
+      }).catch((err) => {
+          this.$refs.loaderAnimModal.hide();
+          this.$refs.errorModal.show();
+          this.errorMsg = this.$t("unverified_account_error");
+          this.accountID = "";
       });
-      if (verified != null) {
-        this.accountID = verified;
-        this.step = 3;
-      } else {
-        return;
-      }
     },
     verifyAndCreate: async function() {
       if (this.password != this.confirmpassword || this.password == "") {
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 2e080b35..15e55ca7 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -1,5 +1,7 @@
 import BlockchainAPI from "./BlockchainAPI";
+
 import { Apis } from "bitsharesjs-ws";
+import { PrivateKey } from "bitsharesjs";
 
 export default class BitShares extends BlockchainAPI {
 
@@ -8,8 +10,11 @@ export default class BitShares extends BlockchainAPI {
         if (onClose) onClose();
     }
 
-    connect(nodeToConnect, onClose = null) {
+    connect(nodeToConnect = null, onClose = null) {
         return new Promise((resolve, reject) => {
+            if (nodeToConnect == null) {
+                nodeToConnect = this.getNodes()[1].url;
+            }
             if (this._isConnected) {
                 Apis.close().then(() => {
                     this._isConnected = false;
@@ -42,4 +47,34 @@ export default class BitShares extends BlockchainAPI {
             }
         });
     }
+
+    _ensureAPI() {
+        if (!this._isConnected) {
+            return this.connect();
+        }
+        return new Promise(resolve => {
+            resolve();
+        });
+    }
+
+    getAccount(accountname) {
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(()=>{
+                Apis.instance().db_api()
+                    .exec("get_full_accounts", [[accountname], false])
+                    .then(res => {
+                        resolve(res[0][1].account);
+                    })
+                    .catch((err) => {
+                        reject(err);
+                    });
+            });
+        });
+    }
+
+    getPublicKey(privateKey) {
+        return PrivateKey.fromWif(privateKey)
+            .toPublicKey()
+            .toString("BTS");
+    }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index cbbd6aad..637a4318 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -10,7 +10,7 @@ export default class BlockchainAPI {
     }
 
     connect(nodeToConnect, onClose, onError) {
-        return new Promise(() => {});
+        return new Promise((resolve) => resolve());
     }
 
     _connectionEstablished(resolveCallback, node) {
@@ -22,4 +22,13 @@ export default class BlockchainAPI {
     getNodes() {
         return this._config.nodeList;
     }
+
+    getAccount() {
+        throw "Needs implementation"
+    }
+
+    verifyPrivateKey(key) {
+        throw "Needs implementation"
+    }
+
 }

From da03043585077852539aefbc188fbfc1fd5a3f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 1 Jan 2019 20:40:37 +0100
Subject: [PATCH 03/41] - getAccount returns common format across dpos chains -
 fill in steem details
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 package-lock.json                        | 142 ++++++++++++++++++++---
 src/components/create.vue                |   6 +-
 src/lib/blockchains/BitShares.js         |   4 +-
 src/lib/blockchains/BlockchainAPI.js     |   8 +-
 src/lib/blockchains/Steem.js             |  56 +++------
 src/lib/blockchains/blockchainFactory.js |   6 +
 6 files changed, 159 insertions(+), 63 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88b93de4..195ff61c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,6 +172,19 @@
         }
       }
     },
+    "@steemit/libcrypto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@steemit/libcrypto/-/libcrypto-1.0.1.tgz",
+      "integrity": "sha512-g2y4OrELuPGLLu3GjVaPbVvY/K+4oPGOrv9ec013o/ZB76R9UQ1ufYD9RM5tKxHXpFhzj2k0JgoKYWkdVheFVA=="
+    },
+    "@steemit/rpc-auth": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@steemit/rpc-auth/-/rpc-auth-1.1.1.tgz",
+      "integrity": "sha512-Eb8BW3O1y4+/+Dbf+LqGVmgXYqyfHxP9mBlmzkpjXiIepTpxoK90NIGrneqcnEGq0TR2nSt4BVv9Ur9c+hxoig==",
+      "requires": {
+        "@steemit/libcrypto": "^1.0.1"
+      }
+    },
     "@types/node": {
       "version": "7.0.69",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
@@ -1804,6 +1817,19 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
     },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "browserslist": {
       "version": "3.2.8",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
@@ -1876,6 +1902,11 @@
       "dev": true,
       "optional": true
     },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+    },
     "buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -2578,11 +2609,39 @@
         "sha.js": "^2.4.8"
       }
     },
+    "cross-env": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
+      "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+      "requires": {
+        "cross-spawn": "^6.0.5",
+        "is-windows": "^1.0.0"
+      }
+    },
+    "cross-fetch": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-1.1.1.tgz",
+      "integrity": "sha512-+VJE04+UfxxmBfcnmAu/lKor53RUCx/1ilOti4p+JgrnLQ4AZZIRoe2OEd76VaHyWQmQxqKnV+TaqjHC4r0HWw==",
+      "requires": {
+        "node-fetch": "1.7.3",
+        "whatwg-fetch": "2.0.3"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+          "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+          "requires": {
+            "encoding": "^0.1.11",
+            "is-stream": "^1.0.1"
+          }
+        }
+      }
+    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
       "requires": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -2918,6 +2977,11 @@
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
       "dev": true
     },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
+    },
     "detective-less": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.1.tgz",
@@ -3441,7 +3505,8 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "jsonfile": {
           "version": "4.0.0",
@@ -3494,6 +3559,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^4.0.0"
@@ -5114,6 +5180,15 @@
       "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
       "dev": true
     },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "exact-version": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/exact-version/-/exact-version-1.0.2.tgz",
@@ -6117,8 +6192,7 @@
     "ieee754": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-      "dev": true
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
     },
     "ignore": {
       "version": "4.0.6",
@@ -6142,8 +6216,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz",
       "integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "imurmurhash": {
       "version": "0.1.4",
@@ -6429,8 +6502,7 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
     "is-wsl": {
       "version": "1.1.0",
@@ -6455,8 +6527,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
@@ -7503,8 +7574,7 @@
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "node-abi": {
       "version": "2.5.0",
@@ -8230,8 +8300,7 @@
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
     "path-parse": {
       "version": "1.0.6",
@@ -9485,7 +9554,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
       "requires": {
         "shebang-regex": "^1.0.0"
       }
@@ -9493,8 +9561,7 @@
     "shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
     "sigmund": {
       "version": "1.0.1",
@@ -9797,6 +9864,41 @@
         }
       }
     },
+    "steem": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/steem/-/steem-0.7.3.tgz",
+      "integrity": "sha512-C9bpBjANIU8/gnE01JfkMt4W44I1f1KTr3v22woi7rcDOthET2d3H3dZkDfNlnEYby4RqGuNTdMQ3cEEkWdRkQ==",
+      "requires": {
+        "@steemit/rpc-auth": "^1.1.0",
+        "bigi": "^1.4.2",
+        "bluebird": "^3.4.6",
+        "browserify-aes": "^1.0.6",
+        "bs58": "^4.0.0",
+        "buffer": "^5.0.6",
+        "bytebuffer": "^5.0.1",
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "cross-env": "^5.0.0",
+        "cross-fetch": "^1.1.1",
+        "debug": "^2.6.8",
+        "detect-node": "^2.0.3",
+        "ecurve": "^1.0.5",
+        "lodash": "^4.16.4",
+        "secure-random": "^1.1.1",
+        "ws": "^3.3.2"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4"
+          }
+        }
+      }
+    },
     "stream-buffers": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
@@ -11023,6 +11125,11 @@
       "dev": true,
       "optional": true
     },
+    "whatwg-fetch": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+    },
     "whatwg-url-compat": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz",
@@ -11042,7 +11149,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
diff --git a/src/components/create.vue b/src/components/create.vue
index 384e8bbf..33d9a7b6 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -262,9 +262,9 @@ export default {
       console.log(this.selectedChain);
       blockchain.getAccount(this.accountname).then((account) => {
         if (
-          account.active.key_auths[0][0] == apkey &&
-          (account.owner.key_auths[0][0] == opkey || this.includeOwner == 0) &&
-          account.options.memo_key == mpkey
+          account.active.public_key == apkey &&
+          (account.owner.public_key == opkey || this.includeOwner == 0) &&
+          account.memo.public_key == mpkey
         ) {
           this.$refs.loaderAnimModal.hide();
           this.accountID = account.id;
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 15e55ca7..85ad5ef0 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -1,5 +1,4 @@
 import BlockchainAPI from "./BlockchainAPI";
-
 import { Apis } from "bitsharesjs-ws";
 import { PrivateKey } from "bitsharesjs";
 
@@ -63,6 +62,9 @@ export default class BitShares extends BlockchainAPI {
                 Apis.instance().db_api()
                     .exec("get_full_accounts", [[accountname], false])
                     .then(res => {
+                        res[0][1].account.active.public_key = res[0][1].account.active.key_auths[0][0];
+                        res[0][1].account.owner.public_key = res[0][1].account.owner.key_auths[0][0];
+                        res[0][1].account.memo.public_key = res[0][1].account.options.memo_key;
                         resolve(res[0][1].account);
                     })
                     .catch((err) => {
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index 637a4318..dd7b7f5f 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -10,7 +10,7 @@ export default class BlockchainAPI {
     }
 
     connect(nodeToConnect, onClose, onError) {
-        return new Promise((resolve) => resolve());
+        throw "Needs implementation";
     }
 
     _connectionEstablished(resolveCallback, node) {
@@ -24,11 +24,11 @@ export default class BlockchainAPI {
     }
 
     getAccount() {
-        throw "Needs implementation"
+        throw "Needs implementation";
     }
 
-    verifyPrivateKey(key) {
-        throw "Needs implementation"
+    getPublicKey(privateKey) {
+        throw "Needs implementation";
     }
 
 }
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index 294494e6..14ac0567 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -1,51 +1,33 @@
+import BlockchainAPI from "./BlockchainAPI";
 import steem from "steem";
 
 export default class Steem extends BlockchainAPI {
 
-    _onCloseWrapper(onClose) {
-        this._isConnected = false;
-        if (onClose) onClose();
-    }
-
     isConnected() {
         return this._isConnected;
     }
 
     connect(nodeToConnect, onClose = null) {
         return new Promise((resolve, reject) => {
-            if (this._isConnected) {
-                Apis.close().then(() => {
-                    this._isConnected = false;
-                    Apis.instance(
-                        nodeToConnect,
-                        true,
-                        10000,
-                        {enableCrypto: false, enableOrders: false},
-                        this._onCloseWrapper.bind(this, onClose)
-                    ).init_promise.then(() => {
-                        this._isConnected = true;
-                        resolve();
-                    }).catch((err) => {
-                        this._isConnected = false;
-                        reject(err);
-                    });
-                });
-            } else {
-                Apis.instance(
-                    nodeToConnect,
-                    true,
-                    10000,
-                    { enableCrypto: false, enableOrders: false },
-                    this._onCloseWrapper.bind(this, onClose)
-                ).init_promise.then(() => {
-                    this._isConnected = true;
-                    resolve();
-                }).catch((err) => {
-                    this._isConnected = false;
-                    reject(err);
-                });
-            }
+            // steem library handles connection internally, just set node
+            //steem.api.setOptions({ url: nodeToConnect });
+            resolve();
+        });
+    }
 
+    getAccount(accountname) {
+        return new Promise((resolve, reject) => {
+            steem.api.getAccounts([accountname], function(err, result) {
+                console.log(err, result);
+                result[0].active.public_key = result[0].active.key_auths[0][0];
+                result[0].owner.public_key = result[0].owner.key_auths[0][0];
+                result[0].memo = {public_key: result[0].memo_key};
+                resolve(result[0]);
+            });
         });
     }
+
+    getPublicKey(privateKey) {
+        return steem.auth.wifToPublic(privateKey);
+    }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/blockchainFactory.js b/src/lib/blockchains/blockchainFactory.js
index 0282cc33..ad5d9a02 100644
--- a/src/lib/blockchains/blockchainFactory.js
+++ b/src/lib/blockchains/blockchainFactory.js
@@ -3,6 +3,7 @@ import { blockchains } from "../../config/config.js";
 let apiCache = {}
 
 import BitShares from "./BitShares"
+import Steem from "./Steem"
 
 export default function getBlockchainAPI(chain) {
     if (chain == "BTS") {
@@ -10,5 +11,10 @@ export default function getBlockchainAPI(chain) {
             apiCache.BTS = new BitShares(blockchains[chain]);
         }
         return apiCache.BTS;
+    } else if (chain == "STEEM") {
+        if (!apiCache.STEEM) {
+            apiCache.STEEM = new Steem(blockchains[chain]);
+        }
+        return apiCache.STEEM;
     }
 }
\ No newline at end of file

From d2805df05499864f8a8fa36ac1c53de049ff37ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 1 Jan 2019 22:33:27 +0100
Subject: [PATCH 04/41] refactor balances and add it to api implement
 getBalances for steem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/balances.vue          | 59 ++++++----------------------
 src/components/create.vue            |  1 -
 src/lib/blockchains/BitShares.js     | 46 ++++++++++++++++++++--
 src/lib/blockchains/BlockchainAPI.js |  6 ++-
 src/lib/blockchains/Steem.js         | 25 ++++++++++++
 5 files changed, 85 insertions(+), 52 deletions(-)

diff --git a/src/components/balances.vue b/src/components/balances.vue
index d10c7185..d30872c8 100644
--- a/src/components/balances.vue
+++ b/src/components/balances.vue
@@ -2,7 +2,7 @@
     <div class="balances mt-3">
         <p class="mb-1 font-weight-bold small">{{ $t('balances_lbl') }}</p>
         <table class="table small table-striped table-sm">
-            <tbody>
+            <tbody v-if="balances != null">
                 <tr
                     v-for="balance in balances"
                     :key="balance.id"
@@ -10,67 +10,32 @@
                     <td class="text-left"><span class="small">{{ balance.prefix }}</span>{{ balance.asset_name }}</td>
                     <td class="text-right">{{ balance.balance }}</td>
                 </tr>
+                <tr v-if="balances.length == 0">
+                    <td class="text-left"><span class="small" />No balances</td>
+                    <td class="text-right">-</td>
+                </tr>
             </tbody>
         </table>
     </div>
 </template>
 <script>
-    import { Apis } from "bitsharesjs-ws";
+    import getBlockchain from "../lib/blockchains/blockchainFactory"
 
     export default {
         name: "Balances",
         i18nOptions: { namespaces: "common" },
         data() {
             return {
-                rawbalances: [],
-                balances: []
+                balances: null
             };
         },
         mounted() {},
         methods: {
-            getBalances: async function() {
-                let result = await Apis.instance()
-                    .db_api()
-                    .exec("get_full_accounts", [
-                        [this.$store.state.WalletStore.wallet.accountID],
-                        false
-                    ])
-                    .then(res => {
-                        this.rawbalances = res[0][1].balances;
-                        let neededassets = [];
-                        for (var i = 0; i < res[0][1].balances.length; i++) {
-                            neededassets.push(res[0][1].balances[i].asset_type);
-                        }
-                        return Apis.instance()
-                            .db_api()
-                            .exec("get_objects", [neededassets]);
-                    });
-                this.balances = [];
-                for (var i = 0; i < this.rawbalances.length; i++) {
-                    if (result[i].issuer == "1.2.0") {
-                        this.balances[i] = {
-                            asset_type: this.rawbalances[i].asset_type,
-                            asset_name: result[i].symbol,
-                            balance: this.rawbalances[i].balance,
-                            owner: result[i].issuer,
-                            prefix: "BIT"
-                        };
-                    } else {
-                        this.balances[i] = {
-                            asset_type: this.rawbalances[i].asset_type,
-                            asset_name: result[i].symbol,
-                            rawbalance: this.rawbalances[i].balance,
-                            balance: this.formatMoney(
-                                this.rawbalances[i].balance /
-                                    Math.pow(10, result[i].precision),
-                                result[i].precision
-                            ),
-                            owner: result[i].issuer,
-                            prefix: ""
-                        };
-                    }
-                }
-                return;
+            getBalances: function() {
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                blockchain.getBalances(this.$store.state.WalletStore.wallet.accountName).then((balances) => {
+                    this.balances = balances;
+                });
             },
             formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
                 var c = isNaN(decimals) ? 2 : Math.abs(decimals),
diff --git a/src/components/create.vue b/src/components/create.vue
index 33d9a7b6..5de9ca37 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -259,7 +259,6 @@ export default {
       }
       this.$refs.loaderAnimModal.show();
 
-      console.log(this.selectedChain);
       blockchain.getAccount(this.accountname).then((account) => {
         if (
           account.active.public_key == apkey &&
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 85ad5ef0..2856b330 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -56,15 +56,16 @@ export default class BitShares extends BlockchainAPI {
         });
     }
 
-    getAccount(accountname) {
+    getAccount(accountName) {
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(()=>{
                 Apis.instance().db_api()
-                    .exec("get_full_accounts", [[accountname], false])
+                    .exec("get_full_accounts", [[accountName], false])
                     .then(res => {
                         res[0][1].account.active.public_key = res[0][1].account.active.key_auths[0][0];
                         res[0][1].account.owner.public_key = res[0][1].account.owner.key_auths[0][0];
-                        res[0][1].account.memo.public_key = res[0][1].account.options.memo_key;
+                        res[0][1].account.memo = {public_key: res[0][1].account.options.memo_key};
+                        res[0][1].account.balances = res[0][1].balances;
                         resolve(res[0][1].account);
                     })
                     .catch((err) => {
@@ -74,6 +75,45 @@ export default class BitShares extends BlockchainAPI {
         });
     }
 
+    getBalances(accountName) {
+        return new Promise((resolve, reject) => {
+            this.getAccount(accountName).then((account) => {
+                let neededAssets = [];
+                for (let i = 0; i < account.balances.length; i++) {
+                    neededAssets.push(account.balances[i].asset_type);
+                }
+                Apis.instance().db_api().exec("get_objects", [neededAssets]).then((assets) => {
+                    let balances = [];
+                    for (let i = 0; i < account.balances.length; i++) {
+                        if (assets[i].issuer == "1.2.0") {
+                            balances[i] = {
+                                asset_type: account.balances[i].asset_type,
+                                asset_name: assets[i].symbol,
+                                balance: account.balances[i].balance,
+                                owner: assets[i].issuer,
+                                prefix: "BIT"
+                            };
+                        } else {
+                            balances[i] = {
+                                asset_type: account.balances[i].asset_type,
+                                asset_name: assets[i].symbol,
+                                rawbalance: assets[i].balance,
+                                balance: this.formatMoney(
+                                    assets[i].balance /
+                                    Math.pow(10, assets[i].precision),
+                                    assets[i].precision
+                                ),
+                                owner: assets[i].issuer,
+                                prefix: ""
+                            };
+                        }
+                    }
+                    resolve(balances);
+                });
+            });
+        });
+    }
+
     getPublicKey(privateKey) {
         return PrivateKey.fromWif(privateKey)
             .toPublicKey()
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index dd7b7f5f..09415caf 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -23,10 +23,14 @@ export default class BlockchainAPI {
         return this._config.nodeList;
     }
 
-    getAccount() {
+    getAccount(accountName) {
         throw "Needs implementation";
     }
 
+    getBalances(accountName) {
+        throw "Needs implmenetation";
+    }
+
     getPublicKey(privateKey) {
         throw "Needs implementation";
     }
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index 14ac0567..6b9e6d37 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -3,6 +3,8 @@ import steem from "steem";
 
 export default class Steem extends BlockchainAPI {
 
+    // https://github.com/steemit/steem-js/tree/master/doc#broadcast-api
+
     isConnected() {
         return this._isConnected;
     }
@@ -30,4 +32,27 @@ export default class Steem extends BlockchainAPI {
     getPublicKey(privateKey) {
         return steem.auth.wifToPublic(privateKey);
     }
+
+    getBalances(accountName) {
+        return new Promise((resolve, reject) => {
+            this.getAccount(accountName).then((account) => {
+                let balances = [];
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "STEEM",
+                    balance: parseFloat(account.balance),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "SDB",
+                    balance: parseFloat(account.savings_sbd_balance),
+                    owner: "-",
+                    prefix: ""
+                });
+                resolve(balances);
+            });
+        });
+    }
 }
\ No newline at end of file

From 19c25ae4fed3f8638f63a5936f771932cba02107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 1 Jan 2019 22:47:23 +0100
Subject: [PATCH 05/41] use real chain for node select ignore settingsstore for
 now
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/node-select.vue   | 4 ++--
 src/lib/blockchains/BitShares.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index 3d9ef4d0..1a262b03 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -38,8 +38,8 @@ export default {
   i18nOptions: { namespaces: "common" },
   data() {
     return {
-      blockchain: getBlockchain("BTS"),
-      nodes: getBlockchain("BTS").getNodes(),
+      blockchain: getBlockchain(this.$store.state.WalletStore.wallet.chain),
+      nodes: getBlockchain(this.$store.state.WalletStore.wallet.chain).getNodes(),
       isConnected: false,
       api: null,
       selectedNode: this.$store.state.SettingsStore.settings.selected_node
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 2856b330..54ad9288 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -11,9 +11,9 @@ export default class BitShares extends BlockchainAPI {
 
     connect(nodeToConnect = null, onClose = null) {
         return new Promise((resolve, reject) => {
-            if (nodeToConnect == null) {
-                nodeToConnect = this.getNodes()[1].url;
-            }
+            //if (nodeToConnect == null) {
+            nodeToConnect = this.getNodes()[1].url;
+            //}
             if (this._isConnected) {
                 Apis.close().then(() => {
                     this._isConnected = false;

From 9d30cc6befbcc65f335a4c9b09d562db2b9120a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Sun, 6 Jan 2019 12:00:52 +0100
Subject: [PATCH 06/41] remove unused imports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/beetframe.vue    | 2 --
 src/components/header-small.vue | 1 +
 src/components/lang-select.vue  | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/beetframe.vue b/src/components/beetframe.vue
index a0ea6d40..7d0fca3b 100644
--- a/src/components/beetframe.vue
+++ b/src/components/beetframe.vue
@@ -13,8 +13,6 @@
 </template>
 <script>
 
-import { EventBus } from '../lib/event-bus.js';
-
 import {
     ipcRenderer,
 } from 'electron';
diff --git a/src/components/header-small.vue b/src/components/header-small.vue
index fbca18af..7a5d72e6 100644
--- a/src/components/header-small.vue
+++ b/src/components/header-small.vue
@@ -18,6 +18,7 @@
 
 <script>
     import LangSelect from "./lang-select";
+
     export default {
         name: "HeaderSmall",
         i18nOptions: { namespaces: "common" },
diff --git a/src/components/lang-select.vue b/src/components/lang-select.vue
index 82382245..a6d2097e 100644
--- a/src/components/lang-select.vue
+++ b/src/components/lang-select.vue
@@ -30,8 +30,6 @@
     import { locales } from "../config/i18n.js";
     import Multiselect from 'vue-multiselect'
     import i18next from 'i18next';
-    
-
 
     export default {
         name: "LangSelect",

From e000eb64b365b41e6ace57934e188d1fda409936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Sun, 6 Jan 2019 12:03:26 +0100
Subject: [PATCH 07/41] - getBlockchain now looks in store if chain is null -
 add getOperation and implmenet for BitShares (vote)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/Operations.js                    | 42 +++-----------------
 src/lib/blockchains/BitShares.js         | 49 ++++++++++++++++++++++--
 src/lib/blockchains/BlockchainAPI.js     |  4 ++
 src/lib/blockchains/blockchainFactory.js |  7 +++-
 4 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/src/lib/Operations.js b/src/lib/Operations.js
index 580f3fc9..6f390c8c 100644
--- a/src/lib/Operations.js
+++ b/src/lib/Operations.js
@@ -1,45 +1,13 @@
-import {
-    Apis
-} from "bitsharesjs-ws";
+import getBlockchain from "../lib/blockchains/blockchainFactory";
 
 export default class operations {
 
     static async generate(data, account_id) {
-        let op_type;
-        let op_data;
-        let api = Apis.instance();
-        switch (data.action) {
-            case 'vote':
-                {
-                    op_type = 'account_update';
-                    let accounts = await api.db_api()
-                        .exec("get_objects", [
-                            [account_id]
-                        ]);
-                    let updateObject = {
-                        account: account_id
-                    };
-
-                    let account = accounts[0];
-
-                    let new_options = account.options;
-                    new_options.votes.push(data.vote_id)
-                    new_options.votes = new_options.votes.sort((a, b) => {
-                        let a_split = a.split(":");
-                        let b_split = b.split(":");
-                        return (
-                            parseInt(a_split[1], 10) - parseInt(b_split[1], 10)
-                        );
-                    });
-                    updateObject.new_options = new_options;
-                    op_data = updateObject;
-
-                    break;
-                }
-        }
+        const blockchain = getBlockchain();
+        let operation = await blockchain.getOperation(data, account_id);
         return {
-            op_type: op_type,
-            op_data: op_data
+            op_type: operation.type,
+            op_data: operation.data
         };
     }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 54ad9288..5a1ae660 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -1,6 +1,6 @@
 import BlockchainAPI from "./BlockchainAPI";
-import { Apis } from "bitsharesjs-ws";
-import { PrivateKey } from "bitsharesjs";
+import {Apis} from "bitsharesjs-ws";
+import {PrivateKey} from "bitsharesjs";
 
 export default class BitShares extends BlockchainAPI {
 
@@ -35,7 +35,7 @@ export default class BitShares extends BlockchainAPI {
                     nodeToConnect,
                     true,
                     10000,
-                    { enableCrypto: false, enableOrders: false },
+                    {enableCrypto: false, enableOrders: false},
                     this._onCloseWrapper.bind(this, onClose)
                 ).init_promise.then(() => {
                     this._connectionEstablished(resolve, nodeToConnect);
@@ -58,7 +58,7 @@ export default class BitShares extends BlockchainAPI {
 
     getAccount(accountName) {
         return new Promise((resolve, reject) => {
-            this._ensureAPI().then(()=>{
+            this._ensureAPI().then(() => {
                 Apis.instance().db_api()
                     .exec("get_full_accounts", [[accountName], false])
                     .then(res => {
@@ -119,4 +119,45 @@ export default class BitShares extends BlockchainAPI {
             .toPublicKey()
             .toString("BTS");
     }
+
+    getOperation(data, account_id) {
+        return new Promise((resolve, reject) => {
+            let operation = {
+                type: null,
+                data: null
+            };
+            let api = Apis.instance();
+            switch (data.action) {
+                case 'vote': {
+                    operation.type = 'account_update';
+                    api.db_api().exec(
+                        "get_objects",
+                        [[account_id]]
+                    ).then((accounts) => {
+                        let updateObject = {
+                            account: account_id
+                        };
+
+                        let account = accounts[0];
+
+                        let new_options = account.options;
+                        new_options.votes.push(data.vote_id);
+                        new_options.votes = new_options.votes.sort((a, b) => {
+                            let a_split = a.split(":");
+                            let b_split = b.split(":");
+                            return (
+                                parseInt(a_split[1], 10) - parseInt(b_split[1], 10)
+                            );
+                        });
+                        updateObject.new_options = new_options;
+                        operation.data = updateObject;
+                        resolve(resolve);
+                    }).catch(err => {
+                        reject(err);
+                    });
+
+                }
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index 09415caf..b173443d 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -35,4 +35,8 @@ export default class BlockchainAPI {
         throw "Needs implementation";
     }
 
+    getOperation(data, account_id) {
+        throw "Needs implementation";
+    }
+
 }
diff --git a/src/lib/blockchains/blockchainFactory.js b/src/lib/blockchains/blockchainFactory.js
index ad5d9a02..230e113b 100644
--- a/src/lib/blockchains/blockchainFactory.js
+++ b/src/lib/blockchains/blockchainFactory.js
@@ -4,8 +4,13 @@ let apiCache = {}
 
 import BitShares from "./BitShares"
 import Steem from "./Steem"
+import store from "../../store";
 
-export default function getBlockchainAPI(chain) {
+export default function getBlockchainAPI(chain = null) {
+    if (chain == null) {
+        // ask store
+        chain = store.state.WalletStore.wallet.chain
+    }
     if (chain == "BTS") {
         if (!apiCache.BTS) {
             apiCache.BTS = new BitShares(blockchains[chain]);

From fa017a39156413ede0d644dfbf077fb02923c236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Sun, 6 Jan 2019 22:27:58 +0100
Subject: [PATCH 08/41] start integrating blockchain api in popups add
 mapOperationData(incoming)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue        | 307 ++++++++++++++-----------------
 src/lib/blockchains/BitShares.js |  71 +++++++
 2 files changed, 211 insertions(+), 167 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index 7310e5fc..ce7dc614 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -1,6 +1,6 @@
 <template>
-    <div>
-        <b-modal
+<div>
+    <b-modal
             id="linkRequest"
             ref="linkReqModal"
             centered
@@ -9,13 +9,13 @@
             hide-header-close
             hide-footer
             :title="$t('link_request')"
-        >
-            {{ this.genericmsg }}:
-            <br>
-            <br>        
-        </b-modal>
-        
-        <b-modal
+    >
+        {{ this.genericmsg }}:
+        <br>
+        <br>
+    </b-modal>
+
+    <b-modal
             id="accountRequest"
             ref="accountReqModal"
             centered
@@ -24,25 +24,27 @@
             hide-header-close
             hide-footer
             :title="$t('operations:account_id.title')"
-        >
-            {{ $t('operations:account_id.request',{origin: this.incoming.origin }) }}
-            <br>
-            <br>
-            {{ $t('operations:account_id.request_cta') }}
-            <b-btn
+    >
+        {{ $t('operations:account_id.request',{origin: this.incoming.origin }) }}
+        <br>
+        <br>
+        {{ $t('operations:account_id.request_cta') }}
+        <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="allowAccess"
-            >{{ $t('operations:account_id.accept_btn') }}</b-btn>
-            <b-btn
+        >{{ $t('operations:account_id.accept_btn') }}
+        </b-btn>
+        <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="denyAccess"
-            >{{ $t('operations:account_id.reject_btn') }}</b-btn>
-        </b-modal>
-        <b-modal
+        >{{ $t('operations:account_id.reject_btn') }}
+        </b-btn>
+    </b-modal>
+    <b-modal
             id="transactionRequest"
             ref="transactionReqModal"
             centered
@@ -51,34 +53,36 @@
             hide-header-close
             hide-footer
             :title="$t('operations:rawsig.title')"
-        >
-            {{ $t('operations:rawsig.request',{origin: this.incoming.origin }) }}
-            <br>
-            <br>
-            <pre class="text-left custom-content"><code>
+    >
+        {{ $t('operations:rawsig.request',{origin: this.incoming.origin }) }}
+        <br>
+        <br>
+        <pre class="text-left custom-content"><code>
 {
-  op_type: {{ this.incoming.op_type }},
-  op_data: {{ this.incoming.op_data }}
+op_type: {{ this.incoming.op_type }},
+op_data: {{ this.incoming.op_data }}
 }
-            </code></pre>
-            
-            {{ $t('operations:rawsig.request_cta') }}
-            <b-btn
+        </code></pre>
+
+        {{ $t('operations:rawsig.request_cta') }}
+        <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="acceptTx"
-            >
-                {{ $t('operations:rawsig.accept_btn') }}</b-btn>
-            <b-btn
+        >
+            {{ $t('operations:rawsig.accept_btn') }}
+        </b-btn>
+        <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="rejectTx"
-            >
-                {{ $t('operations:rawsig.reject_btn') }}</b-btn>
-        </b-modal>
-        <b-modal
+        >
+            {{ $t('operations:rawsig.reject_btn') }}
+        </b-btn>
+    </b-modal>
+    <b-modal
             id="genericRequest"
             ref="genericReqModal"
             centered
@@ -87,27 +91,29 @@
             hide-header-close
             hide-footer
             :title="this.generictitle "
-        >
-            {{ this.genericmsg }}:
-            <br>
-            <br>
-            <pre class="text-left custom-content"><code>
+    >
+        {{ this.genericmsg }}:
+        <br>
+        <br>
+        <pre class="text-left custom-content"><code>
 {{ this.specifics }}
-            </code></pre>
-            <b-btn
+        </code></pre>
+        <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="acceptGeneric"
-            >{{ this.genericaccept }}</b-btn>
-            <b-btn
+        >{{ this.genericaccept }}
+        </b-btn>
+        <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="rejectGeneric"
-            >{{ this.genericreject }}</b-btn>
-        </b-modal>
-        <b-modal
+        >{{ this.genericreject }}
+        </b-btn>
+    </b-modal>
+    <b-modal
             id="loaderAnim"
             ref="loaderAnimModal"
             centered
@@ -116,50 +122,69 @@
             hide-header
             hide-header-close
             hide-footer
-        >
-            <div class="lds-roller"><div /><div /><div /><div /><div /><div /><div /><div /></div>
-        </b-modal>
-        <div class="alerts">
-            <b-alert variant="info" v-bind:key="alert.id" v-for="alert in alerts" show fade dismissible v-on:dismissed="hideAlert(alert.id)">{{alert.msg}}</b-alert>            
+    >
+        <div class="lds-roller">
+            <div/>
+            <div/>
+            <div/>
+            <div/>
+            <div/>
+            <div/>
+            <div/>
+            <div/>
         </div>
+    </b-modal>
+    <div class="alerts">
+        <b-alert variant="info" v-bind:key="alert.id" v-for="alert in alerts" show fade dismissible
+                 v-on:dismissed="hideAlert(alert.id)">{{alert.msg}}
+        </b-alert>
     </div>
+</div>
 </template>
 <style>
-    .alerts {
-        position:absolute;
-        left:5%;
-        right:5%;
-        top:3rem;
-        width:90%;
-    }
+.alerts {
+    position: absolute;
+    left: 5%;
+    right: 5%;
+    top: 3rem;
+    width: 90%;
+}
 </style>
 <script>
-import {
-    v4 as uuidv4
-} from "uuid";
-import { EventBus } from '../lib/event-bus.js';
-import Operations from "../lib/Operations";
-import { Apis } from "bitsharesjs-ws";
+    import {
+        v4 as uuidv4
+    } from "uuid";
+    import {EventBus} from '../lib/event-bus.js';
+    import Operations from "../lib/Operations";
+    import {Apis} from "bitsharesjs-ws";
     import {
         PrivateKey,
         TransactionBuilder
     } from "bitsharesjs";
 
+    import getBlockchain from "../lib/blockchains/blockchainFactory"
+
     export default {
         name: "Popups",
-        i18nOptions: { namespaces: ["common", "operations"] },
+        i18nOptions: {namespaces: ["common", "operations"]},
         data() {
             return {
                 genericmsg: '',
                 alerts: [],
                 api: null,
-                incoming: {},                
-                specifics: ""
+                incoming: {},
+                specifics: "",
+                blockchain: getBlockchain(this.$store.state.WalletStore.wallet.chain)
             };
-        },  
+        },
+        watch: {
+            $route(to, from) {
+                this.alerts = [];
+            }
+        },
         created() {
             EventBus.$on('popup', what => {
-                switch(what) {
+                switch (what) {
                     case 'load-start':
                         this.$refs.loaderAnimModal.show();
                         break;
@@ -169,47 +194,42 @@ import { Apis } from "bitsharesjs-ws";
                 }
             });
         },
-        watch:{
-            $route (to, from){
-                this.alerts = [];
-            }
-        },      
         methods: {
-            link: async function() {
+            link: async function () {
                 await this.$refs.linkReqModal.show();
             },
-            showAlert: function(request) { 
+            showAlert: function (request) {
                 let alert;
-                let alertmsg; 
-                switch(request.type) {
+                let alertmsg;
+                switch (request.type) {
                     case 'link':
-                        alertmsg=this.$t('link_alert',request);
-                        alert={msg:alertmsg, id: uuidv4()};
-                        
+                        alertmsg = this.$t('link_alert', request);
+                        alert = {msg: alertmsg, id: uuidv4()};
+
                         this.$store.dispatch("WalletStore/notifyUser", {
                             notify: "request", message: alertmsg
-                        });                        
+                        });
                         break;
                     default:
-                        alertmsg=this.$t('access_alert',request.payload);
-                        
+                        alertmsg = this.$t('access_alert', request.payload);
+
                         this.$store.dispatch("WalletStore/notifyUser", {
                             notify: "request", message: alertmsg
-                        });                        
-                        alert={msg:alertmsg, id: uuidv4()};
+                        });
+                        alert = {msg: alertmsg, id: uuidv4()};
                         break;
                 }
                 //let alert={msg:msg, id: uuidv4()};
                 this.alerts.push(alert);
             },
-            hideAlert: function(id) {
-                let index = this.alerts.findIndex(function(o){
+            hideAlert: function (id) {
+                let index = this.alerts.findIndex(function (o) {
                     return o.id === id;
                 })
                 if (index !== -1) this.alerts.splice(index, 1);
             },
-            requestAccess: function(request) {
-                
+            requestAccess: function (request) {
+
                 this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request", message: "request"
                 });
@@ -221,81 +241,34 @@ import { Apis } from "bitsharesjs-ws";
                     this.incoming.reject = rej;
                 });
             },
-            requestVote: async function(request) {
+            requestVote: async function (request) {
                 this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request", message: "request"
                 });
-                this.incoming = {};
                 this.incoming = request;
-
                 this.incoming.action = "vote";
-                let entity_id = this.incoming.params.id.split(".");
-                if (entity_id[0] != "1") {
-                    return Promise.reject();
-                }
-                if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
-                    return Promise.reject();
-                }
 
-                let entity = "";
-                let objdata = await Apis.instance()
-                    .db_api()
-                    .exec("get_objects", [[this.incoming.params.id]]);
+                let mappedData = await this.blockchain.mapOperationData(this.incoming);
+                this.specifics = mappedData.specifics;
+                this.incoming.vote_id = mappedData.vote_id;
 
-                let objextradata;
-                switch (entity_id[1]) {
-                case "5":
-                    entity = "committee member";
-                    objextradata = await Apis.instance()
-                        .db_api()
-                        .exec("get_objects", [[objdata[0].committee_member_account]]);
-                    this.specifics =
-                        "Commitee member: " +
-                        objextradata[0].name +
-                        "\nCommittee Member ID: " +
-                        this.incoming.params.id;
-                    this.incoming.vote_id = objdata[0].vote_id;
-                    break;
-                case "6":
-                    entity = "witness";
-                    objextradata = await Apis.instance()
-                        .db_api()
-                        .exec("get_objects", [[objdata[0].witness_account]]);
-                    this.specifics =
-                        "Witness: " +
-                        objextradata[0].name +
-                        "\nWitness ID: " +
-                        this.incoming.params.id;
-                    this.incoming.vote_id = objdata[0].vote_id;
-                    break;
-                case "14":
-                    entity = "worker proposal";
-                    objextradata = await Apis.instance()
-                        .db_api()
-                        .exec("get_objects", [[objdata[0].worker_account]]);
-                    this.specifics =
-                        "Proposal: " +
-                        objdata[0].name +
-                        "\nProposal ID: " +
-                        this.incoming.params.id +
-                        "\nDaily Pay: " +
-                        this.formatMoney(objdata[0].daily_pay / Math.pow(10, 5), 5) +
-                        "BTS\nWorker: " +
-                        objextradata[0].name;
-                    this.incoming.vote_id = objdata[0].vote_for;
-                    break;
-                }
-                this.genericmsg = this.$t('operations:vote.request', {origin: this.incoming.origin, entity: entity });
-                this.generictitle=this.$t('operations:vote.title');
-                this.genericaccept=this.$t('operations:vote.accept_btn');
-                this.genericreject=this.$t('operations:vote.reject_btn');
+                this.genericmsg = this.$t(
+                    'operations:vote.request',
+                    {
+                        origin: this.incoming.origin,
+                        entity: mappedData.entity
+                    }
+                );
+                this.generictitle = this.$t('operations:vote.title');
+                this.genericaccept = this.$t('operations:vote.accept_btn');
+                this.genericreject = this.$t('operations:vote.reject_btn');
                 this.$refs.genericReqModal.show();
                 return new Promise((res, rej) => {
                     this.incoming.acceptgen = res;
                     this.incoming.rejectgen = rej;
                 });
             },
-            requestTx: function(request) {
+            requestTx: function (request) {
                 this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request", message: "request"
                 });
@@ -307,18 +280,18 @@ import { Apis } from "bitsharesjs-ws";
                     this.incoming.rejecttx = rej;
                 });
             },
-            allowAccess: function() {
+            allowAccess: function () {
                 this.$refs.accountReqModal.hide();
                 this.incoming.accept({
                     account: this.$store.state.WalletStore.wallet.accountName,
                     id: this.$store.state.WalletStore.wallet.accountID
                 });
             },
-            denyAccess: function() {
+            denyAccess: function () {
                 this.$refs.accountReqModal.hide();
                 this.incoming.reject({});
             },
-            acceptTx: async function() {
+            acceptTx: async function () {
                 let tr = new TransactionBuilder();
                 Apis.instance().init_promise.then(() => {
                     tr.add_type_operation(
@@ -332,17 +305,17 @@ import { Apis } from "bitsharesjs-ws";
                         );
                         tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
                         let id = await tr.broadcast();
-                        this.incoming.accepttx({ id: id });
+                        this.incoming.accepttx({id: id});
                         this.$refs.transactionReqModal.hide();
                         this.$refs.loaderAnimModal.hide();
                     });
                 });
             },
-            rejectTx: function() {
+            rejectTx: function () {
                 this.$refs.transactionReqModal.hide();
                 this.incoming.rejecttx({});
             },
-            acceptGeneric: async function() {
+            acceptGeneric: async function () {
                 let tr = new TransactionBuilder();
                 let operation = await Operations.generate(
                     this.incoming,
@@ -362,11 +335,11 @@ import { Apis } from "bitsharesjs-ws";
                     this.$refs.loaderAnimModal.hide();
                 });
             },
-            rejectGeneric: function() {
+            rejectGeneric: function () {
                 this.$refs.genericReqModal.hide();
                 this.incoming.rejectgen({});
             },
-            formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
+            formatMoney: function (n, decimals, decimal_sep, thousands_sep) {
                 var c = isNaN(decimals) ? 2 : Math.abs(decimals),
                     d = decimal_sep || ".",
                     t = typeof thousands_sep === "undefined" ? "," : thousands_sep,
@@ -379,9 +352,9 @@ import { Apis } from "bitsharesjs-ws";
                     i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
                     (c
                         ? d +
-                            Math.abs(n - i)
-                                .toFixed(c)
-                                .slice(2)
+                        Math.abs(n - i)
+                            .toFixed(c)
+                            .slice(2)
                         : "")
                 );
             }
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 5a1ae660..17c5d250 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -120,6 +120,77 @@ export default class BitShares extends BlockchainAPI {
             .toString("BTS");
     }
 
+    mapOperationData(incoming) {
+        return new Promise((resolve,reject) => {
+            if (incoming.action == "vote") {
+                let entity_id = incoming.params.id.split(".");
+                if (entity_id[0] != "1") {
+                    reject("ID format unknown");
+                }
+                if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
+                    reject("Given object does not support voting");
+                }
+                Apis.instance().db_api().exec(
+                    "get_objects", [[this.incoming.params.id]]
+                ).then(objdata => {
+                    switch (entity_id[1]) {
+                        case "5":
+                            Apis.instance().db_api().exec(
+                                "get_objects", [[objdata[0].committee_member_account]]
+                            ).then(objextradata => {
+                                resolve({
+                                    entity: "committee member",
+                                    description:
+                                        "Commitee member: " +
+                                        objextradata[0].name +
+                                        "\nCommittee Member ID: " +
+                                        this.incoming.params.id,
+                                    vote_id: objdata[0].vote_id
+                                });
+                            });
+                            break;
+                        case "6":
+                            Apis.instance().db_api().exec(
+                                "get_objects", [[objdata[0].witness_account]]
+                            ).then(objextradata => {
+                                resolve({
+                                    entity: "witness",
+                                    description:
+                                        "Witness: " +
+                                        objextradata[0].name +
+                                        "\nWitness ID: " +
+                                        this.incoming.params.id,
+                                    vote_id: objdata[0].vote_id
+                                });
+                            });
+                            break;
+                        case "14":
+                            Apis.instance().db_api().exec(
+                                "get_objects", [[objdata[0].worker_account]]
+                            ).then(objextradata => {
+                                let dailyPay = objdata[0].daily_pay / Math.pow(10, 5);
+                                resolve({
+                                    entity: "worker proposal",
+                                    description:
+                                        "Proposal: " +
+                                        objdata[0].name +
+                                        "\nProposal ID: " +
+                                        this.incoming.params.id +
+                                        "\nDaily Pay: " +
+                                        dailyPay +
+                                        "BTS\nWorker Account: " +
+                                        objextradata[0].name,
+                                    vote_id: objdata[0].vote_for
+                                });
+                            });
+                            break;
+                    }
+                });
+            }
+        });
+
+    }
+
     getOperation(data, account_id) {
         return new Promise((resolve, reject) => {
             let operation = {

From f4917fa88ec5c487d8e6ca8603bac81f37f1baac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Mon, 7 Jan 2019 22:31:52 +0100
Subject: [PATCH 09/41] add sign and broadcast, clean up popups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue            | 224 ++++++++++-----------
 src/lib/blockchains/BitShares.js     | 288 +++++++++++++++------------
 src/lib/blockchains/BlockchainAPI.js |   8 +
 3 files changed, 283 insertions(+), 237 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index ce7dc614..162b4cf4 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -1,6 +1,6 @@
 <template>
-<div>
-    <b-modal
+    <div>
+        <b-modal
             id="linkRequest"
             ref="linkReqModal"
             centered
@@ -9,13 +9,13 @@
             hide-header-close
             hide-footer
             :title="$t('link_request')"
-    >
-        {{ this.genericmsg }}:
-        <br>
-        <br>
-    </b-modal>
+        >
+            {{ genericmsg }}:
+            <br>
+            <br>
+        </b-modal>
 
-    <b-modal
+        <b-modal
             id="accountRequest"
             ref="accountReqModal"
             centered
@@ -24,27 +24,29 @@
             hide-header-close
             hide-footer
             :title="$t('operations:account_id.title')"
-    >
-        {{ $t('operations:account_id.request',{origin: this.incoming.origin }) }}
-        <br>
-        <br>
-        {{ $t('operations:account_id.request_cta') }}
-        <b-btn
+        >
+            {{ $t('operations:account_id.request',{origin: incoming.origin }) }}
+            <br>
+            <br>
+            {{ $t('operations:account_id.request_cta') }}
+            <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="allowAccess"
-        >{{ $t('operations:account_id.accept_btn') }}
-        </b-btn>
-        <b-btn
+            >
+                {{ $t('operations:account_id.accept_btn') }}
+            </b-btn>
+            <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="denyAccess"
-        >{{ $t('operations:account_id.reject_btn') }}
-        </b-btn>
-    </b-modal>
-    <b-modal
+            >
+                {{ $t('operations:account_id.reject_btn') }}
+            </b-btn>
+        </b-modal>
+        <b-modal
             id="transactionRequest"
             ref="transactionReqModal"
             centered
@@ -53,36 +55,37 @@
             hide-header-close
             hide-footer
             :title="$t('operations:rawsig.title')"
-    >
-        {{ $t('operations:rawsig.request',{origin: this.incoming.origin }) }}
-        <br>
-        <br>
-        <pre class="text-left custom-content"><code>
-{
-op_type: {{ this.incoming.op_type }},
-op_data: {{ this.incoming.op_data }}
-}
-        </code></pre>
-
-        {{ $t('operations:rawsig.request_cta') }}
-        <b-btn
+        >
+            {{ $t('operations:rawsig.request',{origin: incoming.origin }) }}
+            <br>
+            <br>
+            <pre class="text-left custom-content">
+                <code>
+    {
+    op_type: {{ incoming.op_type }},
+    op_data: {{ incoming.op_data }}
+    }
+                </code>
+            </pre>
+            {{ $t('operations:rawsig.request_cta') }}
+            <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="acceptTx"
-        >
-            {{ $t('operations:rawsig.accept_btn') }}
-        </b-btn>
-        <b-btn
+            >
+                {{ $t('operations:rawsig.accept_btn') }}
+            </b-btn>
+            <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="rejectTx"
-        >
-            {{ $t('operations:rawsig.reject_btn') }}
-        </b-btn>
-    </b-modal>
-    <b-modal
+            >
+                {{ $t('operations:rawsig.reject_btn') }}
+            </b-btn>
+        </b-modal>
+        <b-modal
             id="genericRequest"
             ref="genericReqModal"
             centered
@@ -90,30 +93,34 @@ op_data: {{ this.incoming.op_data }}
             no-close-on-backdrop
             hide-header-close
             hide-footer
-            :title="this.generictitle "
-    >
-        {{ this.genericmsg }}:
-        <br>
-        <br>
-        <pre class="text-left custom-content"><code>
-{{ this.specifics }}
-        </code></pre>
-        <b-btn
+            :title="generictitle "
+        >
+            {{ genericmsg }}:
+            <br>
+            <br>
+            <pre class="text-left custom-content">
+                <code>
+    {{ specifics }}
+                </code>
+            </pre>
+            <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="acceptGeneric"
-        >{{ this.genericaccept }}
-        </b-btn>
-        <b-btn
+            >
+                {{ genericaccept }}
+            </b-btn>
+            <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="rejectGeneric"
-        >{{ this.genericreject }}
-        </b-btn>
-    </b-modal>
-    <b-modal
+            >
+                {{ genericreject }}
+            </b-btn>
+        </b-modal>
+        <b-modal
             id="loaderAnim"
             ref="loaderAnimModal"
             centered
@@ -122,24 +129,32 @@ op_data: {{ this.incoming.op_data }}
             hide-header
             hide-header-close
             hide-footer
-    >
-        <div class="lds-roller">
-            <div/>
-            <div/>
-            <div/>
-            <div/>
-            <div/>
-            <div/>
-            <div/>
-            <div/>
+        >
+            <div class="lds-roller">
+                <div />
+                <div />
+                <div />
+                <div />
+                <div />
+                <div />
+                <div />
+                <div />
+            </div>
+        </b-modal>
+        <div class="alerts">
+            <b-alert
+                v-for="alert in alerts"
+                :key="alert.id"
+                variant="info"
+                show
+                fade
+                dismissible
+                @dismissed="hideAlert(alert.id)"
+            >
+                {{ alert.msg }}
+            </b-alert>
         </div>
-    </b-modal>
-    <div class="alerts">
-        <b-alert variant="info" v-bind:key="alert.id" v-for="alert in alerts" show fade dismissible
-                 v-on:dismissed="hideAlert(alert.id)">{{alert.msg}}
-        </b-alert>
     </div>
-</div>
 </template>
 <style>
 .alerts {
@@ -156,11 +171,6 @@ op_data: {{ this.incoming.op_data }}
     } from "uuid";
     import {EventBus} from '../lib/event-bus.js';
     import Operations from "../lib/Operations";
-    import {Apis} from "bitsharesjs-ws";
-    import {
-        PrivateKey,
-        TransactionBuilder
-    } from "bitsharesjs";
 
     import getBlockchain from "../lib/blockchains/blockchainFactory"
 
@@ -292,48 +302,38 @@ op_data: {{ this.incoming.op_data }}
                 this.incoming.reject({});
             },
             acceptTx: async function () {
-                let tr = new TransactionBuilder();
-                Apis.instance().init_promise.then(() => {
-                    tr.add_type_operation(
-                        this.incoming.params.op_type,
-                        this.incoming.params.op_data
-                    );
-                    tr.set_required_fees().then(async () => {
-                        this.$refs.loaderAnimModal.show();
-                        let pKey = PrivateKey.fromWif(
-                            this.$store.state.WalletStore.wallet.keys.active
-                        );
-                        tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
-                        let id = await tr.broadcast();
-                        this.incoming.accepttx({id: id});
-                        this.$refs.transactionReqModal.hide();
-                        this.$refs.loaderAnimModal.hide();
-                    });
-                });
+                this.$refs.loaderAnimModal.show();
+                let transaction = await this.blockchain.sign(
+                    this.incoming.params,
+                    this.$store.state.WalletStore.wallet.keys.active
+                );
+                let id = await this.blockchain.broadcast(
+                    transaction
+                );
+                this.incoming.accepttx({id: id});
+                this.$refs.transactionReqModal.hide();
+                this.$refs.loaderAnimModal.hide();
             },
             rejectTx: function () {
                 this.$refs.transactionReqModal.hide();
                 this.incoming.rejecttx({});
             },
             acceptGeneric: async function () {
-                let tr = new TransactionBuilder();
                 let operation = await Operations.generate(
                     this.incoming,
                     this.$store.state.WalletStore.wallet.accountID
                 );
-
-                tr.add_type_operation(operation.op_type, operation.op_data);
-                tr.set_required_fees().then(async () => {
-                    this.$refs.loaderAnimModal.show();
-                    let pKey = PrivateKey.fromWif(
-                        this.$store.state.WalletStore.wallet.keys.active
-                    );
-                    tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
-                    let resp = await tr.broadcast();
-                    this.incoming.acceptgen(resp);
-                    this.$refs.genericReqModal.hide();
-                    this.$refs.loaderAnimModal.hide();
-                });
+                this.$refs.loaderAnimModal.show();
+                let transaction = await this.blockchain.sign(
+                    operation,
+                    this.$store.state.WalletStore.wallet.keys.active
+                );
+                let id = await this.blockchain.broadcast(
+                    transaction
+                );
+                this.incoming.acceptgen(id);
+                this.$refs.genericReqModal.hide();
+                this.$refs.loaderAnimModal.hide();
             },
             rejectGeneric: function () {
                 this.$refs.genericReqModal.hide();
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 17c5d250..626b0b35 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -1,6 +1,10 @@
 import BlockchainAPI from "./BlockchainAPI";
 import {Apis} from "bitsharesjs-ws";
 import {PrivateKey} from "bitsharesjs";
+import {
+    PrivateKey,
+    TransactionBuilder
+} from "bitsharesjs";
 
 export default class BitShares extends BlockchainAPI {
 
@@ -77,38 +81,40 @@ export default class BitShares extends BlockchainAPI {
 
     getBalances(accountName) {
         return new Promise((resolve, reject) => {
-            this.getAccount(accountName).then((account) => {
-                let neededAssets = [];
-                for (let i = 0; i < account.balances.length; i++) {
-                    neededAssets.push(account.balances[i].asset_type);
-                }
-                Apis.instance().db_api().exec("get_objects", [neededAssets]).then((assets) => {
-                    let balances = [];
+            this._ensureAPI().then(() => {
+                this.getAccount(accountName).then((account) => {
+                    let neededAssets = [];
                     for (let i = 0; i < account.balances.length; i++) {
-                        if (assets[i].issuer == "1.2.0") {
-                            balances[i] = {
-                                asset_type: account.balances[i].asset_type,
-                                asset_name: assets[i].symbol,
-                                balance: account.balances[i].balance,
-                                owner: assets[i].issuer,
-                                prefix: "BIT"
-                            };
-                        } else {
-                            balances[i] = {
-                                asset_type: account.balances[i].asset_type,
-                                asset_name: assets[i].symbol,
-                                rawbalance: assets[i].balance,
-                                balance: this.formatMoney(
-                                    assets[i].balance /
-                                    Math.pow(10, assets[i].precision),
-                                    assets[i].precision
-                                ),
-                                owner: assets[i].issuer,
-                                prefix: ""
-                            };
-                        }
+                        neededAssets.push(account.balances[i].asset_type);
                     }
-                    resolve(balances);
+                    Apis.instance().db_api().exec("get_objects", [neededAssets]).then((assets) => {
+                        let balances = [];
+                        for (let i = 0; i < account.balances.length; i++) {
+                            if (assets[i].issuer == "1.2.0") {
+                                balances[i] = {
+                                    asset_type: account.balances[i].asset_type,
+                                    asset_name: assets[i].symbol,
+                                    balance: account.balances[i].balance,
+                                    owner: assets[i].issuer,
+                                    prefix: "BIT"
+                                };
+                            } else {
+                                balances[i] = {
+                                    asset_type: account.balances[i].asset_type,
+                                    asset_name: assets[i].symbol,
+                                    rawbalance: assets[i].balance,
+                                    balance: this.formatMoney(
+                                        assets[i].balance /
+                                        Math.pow(10, assets[i].precision),
+                                        assets[i].precision
+                                    ),
+                                    owner: assets[i].issuer,
+                                    prefix: ""
+                                };
+                            }
+                        }
+                        resolve(balances);
+                    });
                 });
             });
         });
@@ -122,113 +128,145 @@ export default class BitShares extends BlockchainAPI {
 
     mapOperationData(incoming) {
         return new Promise((resolve,reject) => {
-            if (incoming.action == "vote") {
-                let entity_id = incoming.params.id.split(".");
-                if (entity_id[0] != "1") {
-                    reject("ID format unknown");
-                }
-                if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
-                    reject("Given object does not support voting");
-                }
-                Apis.instance().db_api().exec(
-                    "get_objects", [[this.incoming.params.id]]
-                ).then(objdata => {
-                    switch (entity_id[1]) {
-                        case "5":
-                            Apis.instance().db_api().exec(
-                                "get_objects", [[objdata[0].committee_member_account]]
-                            ).then(objextradata => {
-                                resolve({
-                                    entity: "committee member",
-                                    description:
-                                        "Commitee member: " +
-                                        objextradata[0].name +
-                                        "\nCommittee Member ID: " +
-                                        this.incoming.params.id,
-                                    vote_id: objdata[0].vote_id
-                                });
-                            });
-                            break;
-                        case "6":
-                            Apis.instance().db_api().exec(
-                                "get_objects", [[objdata[0].witness_account]]
-                            ).then(objextradata => {
-                                resolve({
-                                    entity: "witness",
-                                    description:
-                                        "Witness: " +
-                                        objextradata[0].name +
-                                        "\nWitness ID: " +
-                                        this.incoming.params.id,
-                                    vote_id: objdata[0].vote_id
-                                });
-                            });
-                            break;
-                        case "14":
-                            Apis.instance().db_api().exec(
-                                "get_objects", [[objdata[0].worker_account]]
-                            ).then(objextradata => {
-                                let dailyPay = objdata[0].daily_pay / Math.pow(10, 5);
-                                resolve({
-                                    entity: "worker proposal",
-                                    description:
-                                        "Proposal: " +
-                                        objdata[0].name +
-                                        "\nProposal ID: " +
-                                        this.incoming.params.id +
-                                        "\nDaily Pay: " +
-                                        dailyPay +
-                                        "BTS\nWorker Account: " +
-                                        objextradata[0].name,
-                                    vote_id: objdata[0].vote_for
-                                });
-                            });
-                            break;
+            this._ensureAPI().then(() => {
+                if (incoming.action == "vote") {
+                    let entity_id = incoming.params.id.split(".");
+                    if (entity_id[0] != "1") {
+                        reject("ID format unknown");
                     }
-                });
-            }
+                    if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
+                        reject("Given object does not support voting");
+                    }
+                    Apis.instance().db_api().exec(
+                        "get_objects", [[this.incoming.params.id]]
+                    ).then(objdata => {
+                        switch (entity_id[1]) {
+                            case "5":
+                                Apis.instance().db_api().exec(
+                                    "get_objects", [[objdata[0].committee_member_account]]
+                                ).then(objextradata => {
+                                    resolve({
+                                        entity: "committee member",
+                                        description:
+                                            "Commitee member: " +
+                                            objextradata[0].name +
+                                            "\nCommittee Member ID: " +
+                                            this.incoming.params.id,
+                                        vote_id: objdata[0].vote_id
+                                    });
+                                }).catch(err => reject(err));
+                                break;
+                            case "6":
+                                Apis.instance().db_api().exec(
+                                    "get_objects", [[objdata[0].witness_account]]
+                                ).then(objextradata => {
+                                    resolve({
+                                        entity: "witness",
+                                        description:
+                                            "Witness: " +
+                                            objextradata[0].name +
+                                            "\nWitness ID: " +
+                                            this.incoming.params.id,
+                                        vote_id: objdata[0].vote_id
+                                    });
+                                }).catch(err => reject(err));
+                                break;
+                            case "14":
+                                Apis.instance().db_api().exec(
+                                    "get_objects", [[objdata[0].worker_account]]
+                                ).then(objextradata => {
+                                    let dailyPay = objdata[0].daily_pay / Math.pow(10, 5);
+                                    resolve({
+                                        entity: "worker proposal",
+                                        description:
+                                            "Proposal: " +
+                                            objdata[0].name +
+                                            "\nProposal ID: " +
+                                            this.incoming.params.id +
+                                            "\nDaily Pay: " +
+                                            dailyPay +
+                                            "BTS\nWorker Account: " +
+                                            objextradata[0].name,
+                                        vote_id: objdata[0].vote_for
+                                    });
+                                }).catch(err => reject(err));
+                                break;
+                        }
+                    }).catch(err => reject(err));
+                }
+            });
         });
+    }
 
+    sign(operation, key) {
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                let tr = new TransactionBuilder();
+                Apis.instance().init_promise.then(() => {
+                    tr.add_type_operation(
+                        incoming.op_type,
+                        incoming.op_data
+                    );
+                    tr.set_required_fees().then(() => {
+                        let privateKey = PrivateKey.fromWif(key);
+                        tr.add_signer(privateKey, privateKey.toPublicKey().toPublicKeyString());
+                        resolve(tr);
+                    }).catch(err => reject(err));
+                }).catch(err => reject(err));
+            });
+        });
+    }
+
+    broadcast(transaction) {
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                transaction.broadcast().then(id => {
+                    resolve(id);
+                }).catch(err => reject(err));
+            }).catch(err => reject(err));
+        });
     }
 
     getOperation(data, account_id) {
         return new Promise((resolve, reject) => {
-            let operation = {
-                type: null,
-                data: null
-            };
-            let api = Apis.instance();
-            switch (data.action) {
-                case 'vote': {
-                    operation.type = 'account_update';
-                    api.db_api().exec(
-                        "get_objects",
-                        [[account_id]]
-                    ).then((accounts) => {
-                        let updateObject = {
-                            account: account_id
-                        };
+            this._ensureAPI().then(() => {
+                let operation = {
+                    type: null,
+                    data: null
+                };
+                let api = Apis.instance();
+                switch (data.action) {
+                    case 'vote': {
+                        operation.type = 'account_update';
+                        api.db_api().exec(
+                            "get_objects",
+                            [[account_id]]
+                        ).then((accounts) => {
+                            let updateObject = {
+                                account: account_id
+                            };
 
-                        let account = accounts[0];
+                            let account = accounts[0];
 
-                        let new_options = account.options;
-                        new_options.votes.push(data.vote_id);
-                        new_options.votes = new_options.votes.sort((a, b) => {
-                            let a_split = a.split(":");
-                            let b_split = b.split(":");
-                            return (
-                                parseInt(a_split[1], 10) - parseInt(b_split[1], 10)
-                            );
+                            let new_options = account.options;
+                            new_options.votes.push(data.vote_id);
+                            new_options.votes = new_options.votes.sort((a, b) => {
+                                let a_split = a.split(":");
+                                let b_split = b.split(":");
+                                return (
+                                    parseInt(a_split[1], 10) - parseInt(b_split[1], 10)
+                                );
+                            });
+                            updateObject.new_options = new_options;
+                            operation.data = updateObject;
+                            resolve(resolve);
+                        }).catch(err => {
+                            reject(err);
                         });
-                        updateObject.new_options = new_options;
-                        operation.data = updateObject;
-                        resolve(resolve);
-                    }).catch(err => {
-                        reject(err);
-                    });
 
+                    }
                 }
-            }
+            });
         });
     }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index b173443d..04b44323 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -39,4 +39,12 @@ export default class BlockchainAPI {
         throw "Needs implementation";
     }
 
+    sign(incoming, key) {
+        throw "Needs implementation";
+    }
+
+    broadcast(transaction) {
+        throw "Needs implementation";
+    }
+
 }

From b16fb10579e8304f7de47d732f812b82fa8a932d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Mon, 7 Jan 2019 22:47:11 +0100
Subject: [PATCH 10/41] remove duplicate import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/blockchains/BitShares.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 626b0b35..f05cda72 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -1,6 +1,5 @@
 import BlockchainAPI from "./BlockchainAPI";
 import {Apis} from "bitsharesjs-ws";
-import {PrivateKey} from "bitsharesjs";
 import {
     PrivateKey,
     TransactionBuilder

From f8de3028ee97a8cea57239db890cd9891680389e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Thu, 10 Jan 2019 22:02:47 +0100
Subject: [PATCH 11/41] sync lock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 package-lock.json | 177 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 154 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f87da0eb..7aeb8199 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -188,6 +188,19 @@
         }
       }
     },
+    "@steemit/libcrypto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@steemit/libcrypto/-/libcrypto-1.0.1.tgz",
+      "integrity": "sha512-g2y4OrELuPGLLu3GjVaPbVvY/K+4oPGOrv9ec013o/ZB76R9UQ1ufYD9RM5tKxHXpFhzj2k0JgoKYWkdVheFVA=="
+    },
+    "@steemit/rpc-auth": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@steemit/rpc-auth/-/rpc-auth-1.1.1.tgz",
+      "integrity": "sha512-Eb8BW3O1y4+/+Dbf+LqGVmgXYqyfHxP9mBlmzkpjXiIepTpxoK90NIGrneqcnEGq0TR2nSt4BVv9Ur9c+hxoig==",
+      "requires": {
+        "@steemit/libcrypto": "^1.0.1"
+      }
+    },
     "@types/events": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
@@ -462,7 +475,8 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz",
           "integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1577,8 +1591,7 @@
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -1678,8 +1691,7 @@
     "bluebird": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
-      "dev": true
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
     },
     "bluebird-lst": {
       "version": "1.0.6",
@@ -1760,6 +1772,19 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
     },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "browserslist": {
       "version": "3.2.8",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
@@ -1835,6 +1860,11 @@
       "dev": true,
       "optional": true
     },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+    },
     "buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -2503,11 +2533,39 @@
         "sha.js": "^2.4.8"
       }
     },
+    "cross-env": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
+      "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+      "requires": {
+        "cross-spawn": "^6.0.5",
+        "is-windows": "^1.0.0"
+      }
+    },
+    "cross-fetch": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-1.1.1.tgz",
+      "integrity": "sha512-+VJE04+UfxxmBfcnmAu/lKor53RUCx/1ilOti4p+JgrnLQ4AZZIRoe2OEd76VaHyWQmQxqKnV+TaqjHC4r0HWw==",
+      "requires": {
+        "node-fetch": "1.7.3",
+        "whatwg-fetch": "2.0.3"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+          "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+          "requires": {
+            "encoding": "^0.1.11",
+            "is-stream": "^1.0.1"
+          }
+        }
+      }
+    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
       "requires": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -2824,6 +2882,11 @@
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
       "dev": true
     },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
+    },
     "detective-less": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz",
@@ -3480,7 +3543,8 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "jsonfile": {
           "version": "4.0.0",
@@ -3533,6 +3597,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^4.0.0"
@@ -5127,6 +5192,15 @@
       "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
       "dev": true
     },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "exact-version": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/exact-version/-/exact-version-1.0.2.tgz",
@@ -6097,8 +6171,7 @@
     "ieee754": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-      "dev": true
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
     },
     "ignore": {
       "version": "4.0.6",
@@ -6132,7 +6205,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz",
       "integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "imurmurhash": {
       "version": "0.1.4",
@@ -6369,7 +6443,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
       "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-relative-path": {
       "version": "1.0.2",
@@ -6403,8 +6478,7 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
     "is-wsl": {
       "version": "1.1.0",
@@ -7524,8 +7598,7 @@
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "node-abi": {
       "version": "2.5.1",
@@ -8172,8 +8245,7 @@
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
     "path-parse": {
       "version": "1.0.6",
@@ -9051,6 +9123,11 @@
         "signal-exit": "^3.0.2"
       }
     },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -9325,7 +9402,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "requires": {
             "amdefine": ">=0.0.4"
@@ -9361,7 +9438,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
       "requires": {
         "shebang-regex": "^1.0.0"
       }
@@ -9369,8 +9445,7 @@
     "shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
     "sigmund": {
       "version": "1.0.1",
@@ -9593,7 +9668,7 @@
       "dependencies": {
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -9607,7 +9682,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -9615,6 +9690,52 @@
         }
       }
     },
+    "steem": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/steem/-/steem-0.7.4.tgz",
+      "integrity": "sha512-VJ7Q7a5pa2jFDNvjQx1bSadOnmsxA8cbdMHYgAbfzCKoIwk/rTfZDN2TY02YvIgAS8zTkGrGwyIOPsizJVIQZg==",
+      "requires": {
+        "@steemit/rpc-auth": "^1.1.1",
+        "bigi": "^1.4.2",
+        "bluebird": "^3.4.6",
+        "browserify-aes": "^1.0.6",
+        "bs58": "^4.0.0",
+        "buffer": "^5.0.6",
+        "bytebuffer": "^5.0.1",
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "cross-env": "^5.0.0",
+        "cross-fetch": "^1.1.1",
+        "debug": "^2.6.8",
+        "detect-node": "^2.0.3",
+        "ecurve": "^1.0.5",
+        "lodash": "^4.16.4",
+        "retry": "^0.12.0",
+        "secure-random": "^1.1.1",
+        "ws": "^3.3.2"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4"
+          }
+        },
+        "ws": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+          "requires": {
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
+          }
+        }
+      }
+    },
     "stream-buffers": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
@@ -10477,6 +10598,11 @@
       "dev": true,
       "optional": true
     },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
+    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
@@ -10786,6 +10912,11 @@
       "dev": true,
       "optional": true
     },
+    "whatwg-fetch": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+    },
     "whatwg-url-compat": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz",

From af60dc492100e155470b0f18b7aa222e974bbfc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Thu, 10 Jan 2019 23:08:44 +0100
Subject: [PATCH 12/41] =?UTF-8?q?Signed-off-by:=20Stefan=20Schie=C3=9Fl=20?=
 =?UTF-8?q?<stefan.schiessl@blockchainprojectsbv.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7aeb8199..e08f24ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -475,8 +475,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz",
           "integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

From 7040f47e8493501ccc1f7b807b1a93f43a75d942 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Fri, 25 Jan 2019 14:26:50 +0100
Subject: [PATCH 13/41] enhance node select establish basic connectivity

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 package.json                       |  7 ++++---
 src/components/create.vue          | 31 +++++++++++++++++++++---------
 src/components/node-select.vue     | 10 +++++++---
 src/config/config.js               | 31 +++++++++++++-----------------
 src/lib/blockchains/BitShares.js   | 15 ++++++---------
 src/lib/blockchains/Steem.js       |  5 ++---
 src/store/modules/SettingsStore.js |  5 ++---
 7 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 224d384d..bc3a6a01 100644
--- a/package.json
+++ b/package.json
@@ -59,17 +59,18 @@
     "bitsharesjs": "^1.8.3",
     "bootstrap-vue": "^2.0.0-rc.11",
     "chalk": "^2.4.2",
-    "crypto-js": "^3.1.9-1",
+    "create-hash": "^1.2.0",
     "dexie": "^2.0.4",
     "electron-compile": "^6.4.4",
     "electron-devtools-installer": "^2.2.4",
     "elliptic": "^6.4.1",
     "i18next": "^13.1.0",
     "i18next-node-fs-backend": "^2.1.1",
+    "jshashes": "^1.0.7",
     "node-sass": "^4.11.0",
     "otpauth": "^3.2.2",
     "readline": "^1.3.0",
-    "steem": "^0.7.3",
+    "steem": "^0.7.4",
     "typeface-rajdhani": "0.0.54",
     "typeface-roboto": "0.0.54",
     "uuid": "^3.3.2",
@@ -85,7 +86,7 @@
     "babel-preset-react": "^6.24.1",
     "electron-forge": "^5.2.3",
     "electron-forge-maker-nsis": "^20.37.0",
-    "electron-prebuilt-compile": "4.0.0",
+    "electron-prebuilt-compile": "2.0.7",
     "eslint": "^5.12.0",
     "eslint-plugin-vue": "^5.1.0",
     "hoek": ">=4.2.1"
diff --git a/src/components/create.vue b/src/components/create.vue
index 5de9ca37..723da4b3 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -73,7 +73,7 @@
             <input
                 id="inputActive"
                 v-model="activepk"
-                type="text"
+                type="password"
                 class="form-control mb-3 small"
                 :placeholder="$t('active_authority_placeholder')"
                 required=""
@@ -83,7 +83,7 @@
             <input
                 id="inputMemo"
                 v-model="memopk"
-                type="text"
+                type="password"
                 class="form-control mb-3 small"
                 :placeholder="$t('memo_authority_placeholder')"
                 required=""
@@ -101,7 +101,7 @@
                 <input
                     id="inputOwner"
                     v-model="ownerpk"
-                    type="text"
+                    type="password"
                     class="form-control mb-3 small"
                     :placeholder="$t('owner_authority_placeholder')"
                     required=""
@@ -253,6 +253,7 @@ export default {
           opkey =blockchain.getPublicKey(this.ownerpk);
         }
       } catch (e) {
+        console.log(e);
         this.errorMsg = this.$t("invalid_key_error");
         this.$refs.errorModal.show();
         return;
@@ -260,11 +261,21 @@ export default {
       this.$refs.loaderAnimModal.show();
 
       blockchain.getAccount(this.accountname).then((account) => {
-        if (
-          account.active.public_key == apkey &&
-          (account.owner.public_key == opkey || this.includeOwner == 0) &&
-          account.memo.public_key == mpkey
-        ) {
+          console.log(account);
+        let active_check = false;
+        account.active.public_keys.forEach((key) => {
+          if (key[0] == apkey) {
+            active_check = true;
+          }
+        });
+        let owner_check = !this.includeOwner;
+        account.owner.public_keys.forEach((key) => {
+          if (key[0] == opkey) {
+              owner_check = true;
+          }
+        });
+        let memo_check = account.memo.public_key == mpkey;
+        if (active_check && owner_check && memo_check) {
           this.$refs.loaderAnimModal.hide();
           this.accountID = account.id;
           this.step = 3;
@@ -305,7 +316,9 @@ export default {
             }
           }
         });
-        this.$router.replace("/dashboard");
+        setTimeout(() => {
+            this.$router.replace("/dashboard");
+        }, 50);
       }
     }
   }
diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index 1a262b03..e2c1a490 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -38,11 +38,11 @@ export default {
   i18nOptions: { namespaces: "common" },
   data() {
     return {
-      blockchain: getBlockchain(this.$store.state.WalletStore.wallet.chain),
-      nodes: getBlockchain(this.$store.state.WalletStore.wallet.chain).getNodes(),
+      blockchain: null,
+      nodes: [],
       isConnected: false,
       api: null,
-      selectedNode: this.$store.state.SettingsStore.settings.selected_node
+      selectedNode: ""
     };
   },
   watch: {
@@ -50,12 +50,16 @@ export default {
       this.blockchain.connect(this.selectedNode).then(() => {
         this._updateConnectionStatus();
         this.$store.dispatch("SettingsStore/setNode", {
+          chain: this.$store.state.WalletStore.wallet.chain,
           node: this.selectedNode
         });
       });
     }
   },
   mounted() {
+    this.selectedNode = this.$store.state.SettingsStore.settings.selected_node[this.$store.state.WalletStore.wallet.chain];
+    this.blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+    this.nodes = this.blockchain.getNodes();
     this.blockchain.connect(this.selectedNode).then(() => {
       this._updateConnectionStatus();
       this.$emit("first-connect");
diff --git a/src/config/config.js b/src/config/config.js
index aa6e0c97..31c6a2e8 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -8,10 +8,20 @@ export const blockchains = {
         name: 'BitShares',
         chainId: '4018d7844c78f6a6c41c6a552b898022310fc5dec06da467ee7905a8dad512c8',
         nodeList: [
-
             {
-                url: "ws://127.0.0.1:8090",
-                location: "Locally hosted"
+                url: "wss://eu.nodes.bitshares.ws",
+                region: "Western Europe",
+                country: "Germany",
+                operator: "Infrastructure Worker",
+                contact: "email:info@blockchainprojectsbv.com"
+            },
+            {
+                url: "wss://bts-seoul.clockwork.gr",
+                region: "Southeastern Asia",
+                country: "Korea",
+                location: "Seoul",
+                operator: "Witness: clockwork",
+                contact: "telegram:clockworkgr"
             },
             {
                 url: "wss://bitshares.openledger.info/ws",
@@ -162,13 +172,6 @@ export const blockchains = {
                 operator: "Witness: delegate-zhaomu",
                 contact: "telegram:lzmlam;wechat:lzmlam"
             },
-            {
-                url: "wss://eu.nodes.bitshares.ws",
-                region: "Western Europe",
-                country: "Germany",
-                operator: "Infrastructure Worker",
-                contact: "email:info@blockchainprojectsbv.com"
-            },
             {
                 url: "wss://us.nodes.bitshares.ws",
                 region: "North America",
@@ -310,14 +313,6 @@ export const blockchains = {
                 operator: "Witness: witness.still",
                 contact: "telegram:gordoor;wechat:overyard"
             },
-            {
-                url: "wss://bts-seoul.clockwork.gr",
-                region: "Southeastern Asia",
-                country: "Korea",
-                location: "Seoul",
-                operator: "Witness: clockwork",
-                contact: "telegram:clockworkgr"
-            },
             {
                 url: "wss://bts.to0l.cn:4443/ws",
                 region: "Eastern Asia",
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index f05cda72..e116f8d0 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -14,9 +14,9 @@ export default class BitShares extends BlockchainAPI {
 
     connect(nodeToConnect = null, onClose = null) {
         return new Promise((resolve, reject) => {
-            //if (nodeToConnect == null) {
-            nodeToConnect = this.getNodes()[1].url;
-            //}
+            if (nodeToConnect == null) {
+                nodeToConnect = this.getNodes()[0].url;
+            }
             if (this._isConnected) {
                 Apis.close().then(() => {
                     this._isConnected = false;
@@ -65,8 +65,8 @@ export default class BitShares extends BlockchainAPI {
                 Apis.instance().db_api()
                     .exec("get_full_accounts", [[accountName], false])
                     .then(res => {
-                        res[0][1].account.active.public_key = res[0][1].account.active.key_auths[0][0];
-                        res[0][1].account.owner.public_key = res[0][1].account.owner.key_auths[0][0];
+                        res[0][1].account.active.public_keys = res[0][1].account.active.key_auths;
+                        res[0][1].account.owner.public_keys = res[0][1].account.owner.key_auths;
                         res[0][1].account.memo = {public_key: res[0][1].account.options.memo_key};
                         res[0][1].account.balances = res[0][1].balances;
                         resolve(res[0][1].account);
@@ -102,11 +102,8 @@ export default class BitShares extends BlockchainAPI {
                                     asset_type: account.balances[i].asset_type,
                                     asset_name: assets[i].symbol,
                                     rawbalance: assets[i].balance,
-                                    balance: this.formatMoney(
-                                        assets[i].balance /
+                                    balance: assets[i].balance /
                                         Math.pow(10, assets[i].precision),
-                                        assets[i].precision
-                                    ),
                                     owner: assets[i].issuer,
                                     prefix: ""
                                 };
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index 6b9e6d37..86f3e573 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -20,9 +20,8 @@ export default class Steem extends BlockchainAPI {
     getAccount(accountname) {
         return new Promise((resolve, reject) => {
             steem.api.getAccounts([accountname], function(err, result) {
-                console.log(err, result);
-                result[0].active.public_key = result[0].active.key_auths[0][0];
-                result[0].owner.public_key = result[0].owner.key_auths[0][0];
+                result[0].active.public_keys = result[0].active.key_auths;
+                result[0].owner.public_keys = result[0].owner.key_auths;
                 result[0].memo = {public_key: result[0].memo_key};
                 resolve(result[0]);
             });
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index 91d8c05c..80c61d47 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -4,7 +4,6 @@ import {
 } from '../../config/i18n.js'
 const LOAD_SETTINGS = 'LOAD_SETTINGS';
 
-
 const mutations = {
     [LOAD_SETTINGS](state, settings) {
         Vue.set(state, 'settings', settings);
@@ -43,7 +42,7 @@ const actions = {
                 } else {
                     settings = initialState.settings;
                 }
-                settings.selected_node = payload.node;
+                settings.selected_node[payload.chain] = payload.node;
                 localStorage.setItem("settings", JSON.stringify(settings));
                 commit(LOAD_SETTINGS, settings);
                 resolve();
@@ -80,7 +79,7 @@ const getters = {};
 const initialState = {
     'settings': {
         'locale': defaultLocale,
-        'selected_node': 'wss://bts-seoul.clockwork.gr'
+        'selected_node': {}
     }
 };
 

From 0bcbd28c4b4db216c7bce06db22f5a2d72c2587a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Fri, 25 Jan 2019 20:45:18 +0100
Subject: [PATCH 14/41] add error warning and show frame
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.js b/src/index.js
index f87fa1b2..c03d2491 100644
--- a/src/index.js
+++ b/src/index.js
@@ -33,7 +33,7 @@ const createWindow = async () => {
     maximizable: false,
     maxHeight: 660,
     useContentSize: true, 
-    frame:false,
+    frame: true,
     transparent: true,
     webPreferences: {
       nodeIntegration: true,

From f9f8bee9c8435276ba0984fcb6dc71ca8d78f7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Fri, 25 Jan 2019 22:27:55 +0100
Subject: [PATCH 15/41] add connectioninprogress and more fixes for steem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/create.vue            |  2 +-
 src/lib/blockchains/BitShares.js     | 18 ++++++++++++++++--
 src/lib/blockchains/BlockchainAPI.js |  2 ++
 src/lib/blockchains/Steem.js         | 16 +++++++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/components/create.vue b/src/components/create.vue
index 723da4b3..bb3233b9 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -253,7 +253,7 @@ export default {
           opkey =blockchain.getPublicKey(this.ownerpk);
         }
       } catch (e) {
-        console.log(e);
+        console.error(e);
         this.errorMsg = this.$t("invalid_key_error");
         this.$refs.errorModal.show();
         return;
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index e116f8d0..f3bc8ddf 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -17,6 +17,18 @@ export default class BitShares extends BlockchainAPI {
             if (nodeToConnect == null) {
                 nodeToConnect = this.getNodes()[0].url;
             }
+            if (this._isConnectingInProgress) {
+                // there should be a promise queue for pending connects, this is the lazy way
+                setTimeout(() => {
+                    if (this._isConnected) {
+                        resolve();
+                    } else {
+                        reject("multiple connects, did not resolve in time");
+                    }
+                }, 250);
+                return;
+            }
+            this._isConnectingInProgress = true;
             if (this._isConnected) {
                 Apis.close().then(() => {
                     this._isConnected = false;
@@ -30,6 +42,7 @@ export default class BitShares extends BlockchainAPI {
                         this._connectionEstablished(resolve, nodeToConnect);
                     }).catch((err) => {
                         this._isConnected = false;
+                        this._isConnectingInProgress = false;
                         reject(err);
                     });
                 });
@@ -44,6 +57,7 @@ export default class BitShares extends BlockchainAPI {
                     this._connectionEstablished(resolve, nodeToConnect);
                 }).catch((err) => {
                     this._isConnected = false;
+                    this._isConnectingInProgress = false;
                     reject(err);
                 });
             }
@@ -101,8 +115,8 @@ export default class BitShares extends BlockchainAPI {
                                 balances[i] = {
                                     asset_type: account.balances[i].asset_type,
                                     asset_name: assets[i].symbol,
-                                    rawbalance: assets[i].balance,
-                                    balance: assets[i].balance /
+                                    rawbalance: account.balances[i].balance,
+                                    balance: account.balances[i].balance /
                                         Math.pow(10, assets[i].precision),
                                     owner: assets[i].issuer,
                                     prefix: ""
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index 04b44323..d2e73fb4 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -3,6 +3,7 @@ export default class BlockchainAPI {
     constructor(config) {
         this._config = config;
         this._isConnected = false;
+        this._isConnectingInProgress = false;
     }
 
     isConnected() {
@@ -15,6 +16,7 @@ export default class BlockchainAPI {
 
     _connectionEstablished(resolveCallback, node) {
         this._isConnected = true;
+        this._isConnectingInProgress = false;
         console.log("connected to ", node)
         resolveCallback();
     }
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index 86f3e573..c1d3b7df 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -43,10 +43,24 @@ export default class Steem extends BlockchainAPI {
                     owner: "-",
                     prefix: ""
                 });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "VESTS",
+                    balance: parseFloat(account.vesting_shares),
+                    owner: "-",
+                    prefix: ""
+                });
                 balances.push({
                     asset_type: "UIA",
                     asset_name: "SDB",
-                    balance: parseFloat(account.savings_sbd_balance),
+                    balance: parseFloat(account.sbd_balance),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "SP",
+                    balance: parseFloat(account.reward_vesting_steem),
                     owner: "-",
                     prefix: ""
                 });

From c14ac58b7aba3dc4ed2e006fc9cdcee7d8484579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Fri, 25 Jan 2019 22:40:49 +0100
Subject: [PATCH 16/41] sync package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 package-lock.json | 88 +++++++++++++++++++++++++++++++++++++----------
 package.json      |  2 --
 2 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e08f24ec..9bde8c74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -82,9 +82,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz",
-      "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz",
+      "integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==",
       "dev": true
     },
     "@octokit/rest": {
@@ -169,7 +169,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -4227,16 +4227,16 @@
       }
     },
     "electron-prebuilt-compile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-4.0.0.tgz",
-      "integrity": "sha512-mIQSctVTH6zq0P5oBb5XI+aT6grCIXIF3ntIxx45HNoAQggMUmA9Gf1dUquila3gSHzMN6pcN7ClpEPXPvFm+w==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-2.0.7.tgz",
+      "integrity": "sha512-3vr0WBj5ix5pBjtdDwlwujVu8ddi7pyah12FD5A0ovtqhChpdZ/35gwKkaeWjT0vA2h0M8aDHOBMeeCG5iJrpA==",
       "dev": true,
       "requires": {
         "babel-plugin-array-includes": "^2.0.3",
         "babel-plugin-transform-async-to-generator": "^6.24.1",
         "babel-preset-es2016-node5": "^1.1.2",
         "babel-preset-react": "^6.24.1",
-        "electron": "4.0.0",
+        "electron": "2.0.7",
         "electron-compile": "*",
         "electron-compilers": "*",
         "yargs": "^6.6.0"
@@ -4249,16 +4249,62 @@
           "dev": true
         },
         "electron": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.0.tgz",
-          "integrity": "sha512-3XPG/3IXlvnT1oe1K6zEushoD0SKbP8xwdrL10EWGe6k2iOV4hSHqJ8vWnR8yZ7VbSXmBRfomEFDNAo/q/cwKw==",
+          "version": "2.0.7",
+          "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.7.tgz",
+          "integrity": "sha512-MRrDE6mrp+ZrIBpZM27pxbO2yEDKYfkmc6Ll79BtedMNEZsY4+oblupeDJL6RM6meUIp82KMo63W7fP65Tb89Q==",
           "dev": true,
           "requires": {
             "@types/node": "^8.0.24",
-            "electron-download": "^4.1.0",
+            "electron-download": "^3.0.1",
             "extract-zip": "^1.0.3"
           }
         },
+        "electron-download": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz",
+          "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=",
+          "dev": true,
+          "requires": {
+            "debug": "^2.2.0",
+            "fs-extra": "^0.30.0",
+            "home-path": "^1.0.1",
+            "minimist": "^1.2.0",
+            "nugget": "^2.0.0",
+            "path-exists": "^2.1.0",
+            "rc": "^1.1.2",
+            "semver": "^5.3.0",
+            "sumchecker": "^1.2.0"
+          }
+        },
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "sumchecker": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz",
+          "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
+          "dev": true,
+          "requires": {
+            "debug": "^2.2.0",
+            "es6-promise": "^4.0.5"
+          }
+        },
         "yargs": {
           "version": "6.6.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
@@ -5873,9 +5919,9 @@
       }
     },
     "graphql-tag": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz",
-      "integrity": "sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
+      "integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==",
       "dev": true
     },
     "handlebars": {
@@ -6023,6 +6069,12 @@
         "os-tmpdir": "^1.0.1"
       }
     },
+    "home-path": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
+      "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==",
+      "dev": true
+    },
     "homedir-polyfill": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
@@ -10558,9 +10610,9 @@
       "integrity": "sha512-sOFA1FXgP0gOgBYlS6irwq6hHYA370KE3dPlgYEJHL3PJd5X8gQE0RmL79ONif6fL5JZuGDj+rtOrFeOqz5IZQ=="
     },
     "typescript": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-      "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+      "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
       "dev": true
     },
     "uglify-js": {
diff --git a/package.json b/package.json
index bc3a6a01..41d4f6c0 100644
--- a/package.json
+++ b/package.json
@@ -59,14 +59,12 @@
     "bitsharesjs": "^1.8.3",
     "bootstrap-vue": "^2.0.0-rc.11",
     "chalk": "^2.4.2",
-    "create-hash": "^1.2.0",
     "dexie": "^2.0.4",
     "electron-compile": "^6.4.4",
     "electron-devtools-installer": "^2.2.4",
     "elliptic": "^6.4.1",
     "i18next": "^13.1.0",
     "i18next-node-fs-backend": "^2.1.1",
-    "jshashes": "^1.0.7",
     "node-sass": "^4.11.0",
     "otpauth": "^3.2.2",
     "readline": "^1.3.0",

From b2d69587768982a9692f92b7d3af977aa4367e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Sun, 27 Jan 2019 07:28:35 +0100
Subject: [PATCH 17/41] fix a json error in response add console log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/BeetServer.js            | 1 +
 src/lib/BeetWS.js                | 6 +++---
 src/lib/blockchains/BitShares.js | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 3e91ce1f..1082a8cf 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -90,6 +90,7 @@ export default class BeetServer {
             server.respondAuth(data.client, status);
         });
         server.on('api', async (data) => {
+            console.log("event type api", data);
             store.dispatch('OriginStore/newRequest', {
                 apphash: data.payload.apphash,
                 next_hash: data.payload.next_hash
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index fe2eeef5..97e3b414 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -56,7 +56,7 @@ export default class BeetWS extends EventEmitter {
     this.isAlive = true;
   }
   _handleMessage(client, data) {
-
+    console.log("_handleMessage", client, data);
     if (data.type == 'version') {
       client.send('{ "type": "version", "error": false, "result": { "version": ' + JSON.stringify(version) + '}}');
     } else {
@@ -83,10 +83,10 @@ export default class BeetWS extends EventEmitter {
                   "payload": msg
                 });
               } catch (e) {
-                client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code": 3, message": "Could not decrypt message"}}');
+                client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code": 3, "message": "Could not decrypt message"}}');
               }
             } else {
-              client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":2,"message": "Unexpected request id. Please relink"}}');
+              client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":2,"message": "Unexpected request hash. Please relink"}}');
             }
           } else {
             client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":1, "message": "Beet could not understand your request"}}');
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index f3bc8ddf..b83b0aaa 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -137,6 +137,7 @@ export default class BitShares extends BlockchainAPI {
     }
 
     mapOperationData(incoming) {
+        console.log("mapOperationData", incoming);
         return new Promise((resolve,reject) => {
             this._ensureAPI().then(() => {
                 if (incoming.action == "vote") {
@@ -209,6 +210,7 @@ export default class BitShares extends BlockchainAPI {
     }
 
     sign(operation, key) {
+        console.log("sign", operation, key);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
                 let tr = new TransactionBuilder();
@@ -228,6 +230,7 @@ export default class BitShares extends BlockchainAPI {
     }
 
     broadcast(transaction) {
+        console.log("broadcast", transaction);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
                 transaction.broadcast().then(id => {
@@ -238,6 +241,7 @@ export default class BitShares extends BlockchainAPI {
     }
 
     getOperation(data, account_id) {
+        console.log("getOperation", data, account_id);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
                 let operation = {

From 74a980c213611a9e5b96d4dbf05a0ddab0cfde8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Sun, 27 Jan 2019 22:00:23 +0100
Subject: [PATCH 18/41] sync lock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 package-lock.json | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a87c9891..2a0d6cda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -721,7 +721,7 @@
       "dependencies": {
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -994,7 +994,7 @@
     },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
       "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
       "dev": true
     },
@@ -2103,7 +2103,7 @@
       "dependencies": {
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -3510,8 +3510,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "jsonfile": {
           "version": "4.0.0",
@@ -3564,7 +3563,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^4.0.0"
@@ -6135,7 +6133,7 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
@@ -6488,8 +6486,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isstream": {
       "version": "0.1.2",
@@ -7878,7 +7875,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -8332,7 +8329,7 @@
       "dependencies": {
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -10135,7 +10132,7 @@
         },
         "onetime": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
           "dev": true
         },
@@ -10852,7 +10849,7 @@
       "dependencies": {
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -10909,7 +10906,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }

From fbddb1693ffb84f0d5e968e09ed9730b07eaa008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Mon, 28 Jan 2019 22:10:54 +0100
Subject: [PATCH 19/41] more logs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/BeetAPI.js | 1 +
 src/lib/BeetWS.js  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index f7db1a00..e0f35873 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -87,6 +87,7 @@ export default class BeetAPI {
         }
     }
     static async [Actions.VOTE_FOR](request, vue) {
+        console.log("BeetAPI.voteFor", request);
         try {
             let response = await vue.requestVote(request.payload);
             return {
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index 97e3b414..f13ee2c6 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -67,6 +67,7 @@ export default class BeetWS extends EventEmitter {
             if (hash == client.next_hash) {
               client.otp.counter = data.id;
               var key = client.otp.generate();
+              console.log("otp key generated", key, client.otp.counter);
               try {
                 var msg = JSON.parse(CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8));
 
@@ -170,6 +171,7 @@ export default class BeetWS extends EventEmitter {
           counter: 0,
           secret: OTPAuth.Secret.fromHex(result.app.secret)
         });
+        console.log("init otp", 0, otp.secret);
         this._clients[client].otp = otp;
         this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.app.account_id + '"}}');
       } else {

From 600ead3421c1d0cf94e0ac68e8c71fb3487961d0 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 29 Jan 2019 11:50:20 +0100
Subject: [PATCH 20/41] rearrange node-select, what is initiated when, and
 handle default node

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/node-select.vue | 39 ++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index e2c1a490..fd062726 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -38,31 +38,42 @@ export default {
   i18nOptions: { namespaces: "common" },
   data() {
     return {
-      blockchain: null,
+      blockchain: getBlockchain(this.$store.state.WalletStore.wallet.chain),
+      selectedNode: this.$store.state.SettingsStore.settings.selected_node[this.$store.state.WalletStore.wallet.chain],
       nodes: [],
       isConnected: false,
-      api: null,
-      selectedNode: ""
+      api: null
     };
   },
   watch: {
-    selectedNode: function() {
-      this.blockchain.connect(this.selectedNode).then(() => {
-        this._updateConnectionStatus();
-        this.$store.dispatch("SettingsStore/setNode", {
-          chain: this.$store.state.WalletStore.wallet.chain,
-          node: this.selectedNode
-        });
-      });
+    selectedNode: function(newVal, oldVal) {
+      if (!!oldVal && oldVal !== newVal) {
+          // this means user has actively changed the value
+          this.blockchain.connect(this.selectedNode).then(() => {
+              this._updateConnectionStatus();
+              this.$store.dispatch("SettingsStore/setNode", {
+                  chain: this.$store.state.WalletStore.wallet.chain,
+                  node: this.selectedNode
+              });
+          }).catch((err) => {
+              logger.error(err);
+          });
+      } else {
+          // do nothing, as the value displayed is the already connected default node
+      }
+
     }
   },
   mounted() {
-    this.selectedNode = this.$store.state.SettingsStore.settings.selected_node[this.$store.state.WalletStore.wallet.chain];
-    this.blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
     this.nodes = this.blockchain.getNodes();
-    this.blockchain.connect(this.selectedNode).then(() => {
+    this.blockchain.connect(this.selectedNode).then((connectedNode) => {
+      if (!this.selectedNode) {
+        this.selectedNode = connectedNode;
+      }
       this._updateConnectionStatus();
       this.$emit("first-connect");
+    }).catch((err) => {
+        logger.error(err);
     });
   },
   methods: {

From a3ff981e47cd956a68867bb26fcef0cc0ff91442 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 29 Jan 2019 11:50:40 +0100
Subject: [PATCH 21/41] use current instante of blockchain when popup shows

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index 2ddf032e..db78d973 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -174,8 +174,7 @@
                 alerts: [],
                 api: null,
                 incoming: {},
-                specifics: "",
-                blockchain: getBlockchain(this.$store.state.WalletStore.wallet.chain)
+                specifics: ""
             };
         },
         watch: {
@@ -253,9 +252,9 @@
                 });
                 this.incoming = request;
                 this.incoming.action = "vote";
-
-                let mappedData = await this.blockchain.mapOperationData(this.incoming);
-                this.specifics = mappedData.specifics;
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                let mappedData = await blockchain.mapOperationData(this.incoming);
+                this.specifics = mappedData.description;
                 this.incoming.vote_id = mappedData.vote_id;
 
                 this.genericmsg = this.$t(
@@ -299,11 +298,12 @@
             },
             acceptTx: async function () {
                 this.$refs.loaderAnimModal.show();
-                let transaction = await this.blockchain.sign(
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                let transaction = await blockchain.sign(
                     this.incoming.params,
                     this.$store.state.WalletStore.wallet.keys.active
                 );
-                let id = await this.blockchain.broadcast(
+                let id = await blockchain.broadcast(
                     transaction
                 );
                 this.incoming.accepttx({id: id});
@@ -315,16 +315,17 @@
                 this.incoming.rejecttx({});
             },
             acceptGeneric: async function () {
-                let operation = await Operations.generate(
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                let operation = await blockchain.getOperation(
                     this.incoming,
                     this.$store.state.WalletStore.wallet.accountID
                 );
                 this.$refs.loaderAnimModal.show();
-                let transaction = await this.blockchain.sign(
+                let transaction = await blockchain.sign(
                     operation,
                     this.$store.state.WalletStore.wallet.keys.active
                 );
-                let id = await this.blockchain.broadcast(
+                let id = await blockchain.broadcast(
                     transaction
                 );
                 this.incoming.acceptgen(id);

From 0fc5194e35553ce97dfea1e2cd5317000150acf1 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 29 Jan 2019 11:51:49 +0100
Subject: [PATCH 22/41] streamline error handling

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/BeetAPI.js                   |  34 ++-
 src/lib/BeetDB.js                    |   8 +-
 src/lib/BeetServer.js                |  70 ++++--
 src/lib/BeetWS.js                    | 343 ++++++++++++++-------------
 src/lib/blockchains/BlockchainAPI.js |   2 +-
 src/store/modules/SettingsStore.js   |   8 +-
 6 files changed, 259 insertions(+), 206 deletions(-)

diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index e0f35873..8e6e6e3f 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -9,7 +9,15 @@ var popupQ = new Queue();
 export default class BeetAPI {
 
     static async handler(request, vueInst) {
-        if (!Object.keys(Actions).map(key => Actions[key]).includes(request.type)) return;
+        if (!Object.keys(Actions).map(key => Actions[key]).includes(request.type)) {
+            return {
+                id: request.id,
+                result: {
+                    isError: true,
+                    error: 'Request type not supported.'
+                }
+            }
+        }
         let result;
         if (popupQ.isEmpty()) {
             let qresolve;
@@ -21,7 +29,6 @@ export default class BeetAPI {
                 resolve: qresolve
             });
             if (store.state.WalletStore.isUnlocked == false) {
-
                 vueInst.$refs.popupComp.showAlert(request);
             }
             await store.state.WalletStore.unlocked.promise;
@@ -87,15 +94,21 @@ export default class BeetAPI {
         }
     }
     static async [Actions.VOTE_FOR](request, vue) {
-        console.log("BeetAPI.voteFor", request);
         try {
+            console.log("BeetAPI.voteFor", request);
             let response = await vue.requestVote(request.payload);
             return {
                 id: request.id,
                 result: response
             };
-        } catch (e) {
-            return e;
+        } catch (err) {
+            return {
+                id: request.id,
+                result: {
+                    isError: true,
+                    error: "User rejected"
+                }
+            };
         }
     }
     static async [Actions.REQUEST_SIGNATURE](request, vue) {
@@ -105,9 +118,14 @@ export default class BeetAPI {
                 id: request.id,
                 result: response
             };
-        } catch (e) {
-
-            return e;
+        } catch (err) {
+            return {
+                id: request.id,
+                result: {
+                    isError: true,
+                    error: "User rejected"
+                }
+            };
         }
     }
 }
\ No newline at end of file
diff --git a/src/lib/BeetDB.js b/src/lib/BeetDB.js
index 28f6995e..b6977838 100644
--- a/src/lib/BeetDB.js
+++ b/src/lib/BeetDB.js
@@ -2,10 +2,10 @@ import Dexie from 'dexie';
 const BeetDB = new Dexie('BeetDB');
 
 BeetDB.version(1).stores({
-    apps: `++id,appName, origin, &apphash, account_id, chain, secret,next_hash`,
-    settings: `++id,setting, value`,
-    wallets_public: `&id,name,chain,accounts`,
-    wallets_encrypted: `&id,data`
+    apps: `++id, appName, origin, &apphash, account_id, chain, secret, next_hash`,
+    settings: `++id, setting, value`,
+    wallets_public: `&id, name, chain, accounts`,
+    wallets_encrypted: `&id, data`
 });
 
 export default BeetDB;
\ No newline at end of file
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 1082a8cf..881942b9 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -12,32 +12,51 @@ const logger = new RendererLogger();
 let vueInst = null;
 
 const linkHandler = async (req) => {
-    let userResponse;
     try {
-        userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
-        let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
-        //let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
-        let secret =req.key.derive(ec.keyFromPublic(req.payload.pubkey, 'hex').getPublic());
-        store.dispatch('OriginStore/addApp', {
-            appName: req.appName,
-            apphash: apphash,
-            origin: req.origin,
-            account_id: userResponse.identity.id,
-            chain: req.payload.chain,
-            secret: secret.toString(16),
-            next_hash: req.payload.next_hash
-        });
-        let response = Object.assign(req, {
-            isLinked: true,
-            apphash: apphash,
-            chain: req.payload.chain,
-            next_hash: req.payload.next_hash,
-            account_id: userResponse.identity.id,
-            secret: secret.toString(16)
-        });
-        return response;
-    } catch (e) {
-        logger.log(e);
+        let userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
+        if (!!userResponse.response && !userResponse.response.isLinked) {
+            console.log("User rejected request, id=" + req.id);
+            return {
+                id: req.id,
+                result: {
+                    isError: true,
+                    error: 'User rejected request'
+                }
+            };;
+        } else {
+            let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
+            //let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
+            console.log("linkHandler key=", req.key);
+            let secret = req.key.derive(ec.keyFromPublic(req.payload.pubkey, 'hex').getPublic());
+            let app = await store.dispatch('OriginStore/addApp', {
+                appName: req.appName,
+                apphash: apphash,
+                origin: req.origin,
+                account_id: userResponse.identity.id,
+                chain: req.payload.chain,
+                secret: secret.toString(16),
+                next_hash: req.payload.next_hash
+            });
+            console.log("app added, id=" + app.id);
+            let response = Object.assign(req, {
+                isLinked: true,
+                apphash: apphash,
+                chain: req.payload.chain,
+                next_hash: req.payload.next_hash,
+                account_id: userResponse.identity.id,
+                secret: secret.toString(16)
+            });
+            return response;
+        }
+    } catch (err) {
+        console.error(err);
+        return {
+            id: req.id,
+            result: {
+                isError: true,
+                error: 'Error occurred: ' + err
+            }
+        };
     }
 };
 
@@ -47,6 +66,7 @@ const authHandler = async (req) => {
     if (req.payload.apphash != null & req.payload.apphash != undefined) {
         let apps = store.state.OriginStore.apps;
         const app = apps.find(x => x.apphash === req.payload.apphash);
+        console.log(app);
         if (!app) {
             return Object.assign(req.payload, {
                 authenticate: false,
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index f13ee2c6..3cb08b44 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -1,200 +1,209 @@
 import EventEmitter from "events";
 import {
-  version
+    version
 } from "../config/config";
 import WebSocket from "ws";
 import {
-  v4 as uuidv4
+    v4 as uuidv4
 } from "uuid"
+
 const OTPAuth = require("otpauth");
 import CryptoJS from 'crypto-js';
 import crypto from 'crypto';
 //import eccrypto from 'eccrypto';
 import Https from 'https';
 import Fs from 'fs';
-import { ec as EC } from "elliptic"; 
+import {ec as EC} from "elliptic";
+
 var ec = new EC('curve25519');
 /*
 import RendererLogger from "./RendererLogger";
 const logger = new RendererLogger();
 */
 export default class BeetWS extends EventEmitter {
-  constructor(port, timeout) {
-    super() // required
-    var self = this;
-    const httpsServer = Https.createServer({
-      key: Fs.readFileSync(__dirname + '/ssl/beet.key'),
-      cert: Fs.readFileSync(__dirname + '/ssl/beet.cert')
-    });
-    const server = new WebSocket.Server({
-      server: httpsServer
-    });
-    httpsServer.listen(port);
-    this._clients = [];
-    this._monitor = setInterval(function () {
-      for (var clientid in self._clients) {
+    constructor(port, timeout) {
+        super() // required
+        var self = this;
+        const httpsServer = Https.createServer({
+            key: Fs.readFileSync(__dirname + '/ssl/beet.key'),
+            cert: Fs.readFileSync(__dirname + '/ssl/beet.cert')
+        });
+        const server = new WebSocket.Server({
+            server: httpsServer
+        });
+        httpsServer.listen(port);
+        this._clients = [];
+        this._monitor = setInterval(function () {
+            for (var clientid in self._clients) {
+
+                let client = self._clients[clientid];
+                if (client.isAlive === false || client.readyState != 1) {
+                    self.emit("disconnected", client.id);
+                    delete (self._clients[client.id]);
+                    return client.terminate();
+                } else {
+                    client.isAlive = false;
+                    client.ping(self.noop);
+                }
+            }
+        }, timeout);
+        server.on("connection", (client) => {
+            self._handleConnection(client);
+        });
+    }
+
+    noop() {
+
+    }
+
+    _heartbeat() {
+        this.isAlive = true;
+    }
 
-        let client = self._clients[clientid];
-        if (client.isAlive === false || client.readyState != 1) {
-          self.emit("disconnected", client.id);
-          delete(self._clients[client.id]);
-          return client.terminate();
+    _handleMessage(client, data) {
+        console.log("_handleMessage", client, data);
+        if (data.type == 'version') {
+            client.send('{ "type": "version", "error": false, "result": { "version": ' + JSON.stringify(version) + '}}');
         } else {
-          client.isAlive = false;
-          client.ping(self.noop);
+            if (client.isAuthenticated) {
+                if (client.isLinked) {
+                    if (data.type == 'api') {
+                        let hash = CryptoJS.SHA256('' + data.id).toString();
+                        if (hash == client.next_hash) {
+                            client.otp.counter = data.id;
+                            var key = client.otp.generate();
+                            console.log("otp key generated", key, client.otp.counter);
+                            try {
+                                var msg = JSON.parse(CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8));
+
+                                msg.origin = client.origin;
+                                msg.appName = client.appName;
+                                msg.apphash = client.apphash;
+                                msg.chain = client.chain;
+                                msg.account_id = client.account_id;
+                                client.next_hash = msg.next_hash;
+                                this.emit('api', {
+                                    "client": client.id,
+                                    "id": data.id,
+                                    "type": msg.method,
+                                    "payload": msg
+                                });
+                            } catch (e) {
+                                client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code": 3, "message": "Could not decrypt message"}}');
+                            }
+                        } else {
+                            client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":2,"message": "Unexpected request hash. Please relink"}}');
+                        }
+                    } else {
+                        client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":1, "message": "Beet could not understand your request"}}');
+                    }
+                } else {
+                    if (data.type == 'link') {
+                        let linkobj = {
+                            "id": data.id,
+                            "client": client.id,
+                            "payload": data.payload,
+                            "chain": data.payload.chain,
+                            "origin": client.origin,
+                            "appName": client.appName,
+                            "browser": client.browser,
+                            "key": client.keypair,
+                            "type": 'link'
+                        };
+                        this.emit('link', linkobj);
+                    } else {
+                        client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":4, "message": "This app is not yet linked"}}');
+                    }
+                }
+            } else {
+                if (data.type == 'authenticate') {
+                    this.emit('authenticate', {
+                        "id": data.id,
+                        "client": client.id,
+                        "payload": data.payload
+                    });
+                } else {
+                    client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":5, "message": "Must authenticate first"}}');
+                }
+            }
+        }
+    }
+
+    async respondLink(client, result) {
+        if (result.isLinked == true) {
+            this._clients[client].isLinked = true;
+            this._clients[client].apphash = result.apphash;
+            this._clients[client].account_id = result.account_id;
+            this._clients[client].chain = result.chain;
+            this._clients[client].next_hash = result.next_hash;
+            let otp = new OTPAuth.HOTP({
+                issuer: "Beet",
+                label: "BeetAuth",
+                algorithm: "SHA1",
+                digits: 32,
+                counter: 0,
+                secret: OTPAuth.Secret.fromHex(result.secret)
+            });
+            console.log("otp instantiated", result.secret);
+            this._clients[client].otp = otp;
+            this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.account_id + '"}}');
+        } else {
+            this._clients[client].send('{ "id": "' + result.id + '", "error": true, "payload": { "code":6, "message": "Could not link to Beet"}}');
         }
-      }
-    }, timeout);
-    server.on("connection", (client) => {
-      self._handleConnection(client);
-    });
-  }
-  noop() {
+    }
 
-  }
-  _heartbeat() {
-    this.isAlive = true;
-  }
-  _handleMessage(client, data) {
-    console.log("_handleMessage", client, data);
-    if (data.type == 'version') {
-      client.send('{ "type": "version", "error": false, "result": { "version": ' + JSON.stringify(version) + '}}');
-    } else {
-      if (client.isAuthenticated) {
-        if (client.isLinked) {
-          if (data.type == 'api') {
-            let hash = CryptoJS.SHA256('' + data.id).toString();
-            if (hash == client.next_hash) {
-              client.otp.counter = data.id;
-              var key = client.otp.generate();
-              console.log("otp key generated", key, client.otp.counter);
-              try {
-                var msg = JSON.parse(CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8));
+    respondAPI(client, response) {
+        this._clients[client].otp.counter = response.id;
+        var key = this._clients[client].otp.generate();
+        var payload = CryptoJS.AES.encrypt(JSON.stringify(response.result), key).toString();
+        this._clients[client].send('{"id": ' + response.id + ', "error": ' + !!response.result.isError + ' , "encrypted": true, "payload": "' + payload + '"}');
+    }
 
-                msg.origin = client.origin;
-                msg.appName = client.appName;
-                msg.apphash = client.apphash;
-                msg.chain = client.chain;
-                msg.account_id = client.account_id;
-                client.next_hash = msg.next_hash;
-                this.emit('api', {
-                  "client": client.id,
-                  "id": data.id,
-                  "type": msg.method,
-                  "payload": msg
+    respondAuth(client, result) {
+        if (result.authenticate) {
+            this._clients[client].isAuthenticated = true;
+            this._clients[client].origin = result.origin;
+            this._clients[client].appName = result.appName;
+            this._clients[client].browser = result.browser;
+            if (result.link) {
+                this._clients[client].isLinked = true;
+                this._clients[client].apphash = result.apphash;
+                this._clients[client].chain = result.app.chain;
+                this._clients[client].account_id = result.app.account_id;
+                this._clients[client].next_hash = result.app.next_hash;
+                let otp = new OTPAuth.HOTP({
+                    issuer: "Beet",
+                    label: "BeetAuth",
+                    algorithm: "SHA1",
+                    digits: 32,
+                    counter: 0,
+                    secret: OTPAuth.Secret.fromHex(result.app.secret)
                 });
-              } catch (e) {
-                client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code": 3, "message": "Could not decrypt message"}}');
-              }
+                console.log("otp instantiated", result.app, result.app.secret.toString());
+                this._clients[client].otp = otp;
+                this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.app.account_id + '"}}');
             } else {
-              client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":2,"message": "Unexpected request hash. Please relink"}}');
+                let keypair = ec.genKeyPair();
+                this._clients[client].keypair = keypair;
+                let pubkey = keypair.getPublic().encode('hex');
+                this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": false, "pub_key": "' + pubkey + '"}}');
             }
-          } else {
-            client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":1, "message": "Beet could not understand your request"}}');
-          }
         } else {
-          if (data.type == 'link') {
-            let linkobj = {
-              "id": data.id,
-              "client": client.id,
-              "payload": data.payload,
-              "chain": data.payload.chain,
-              "origin": client.origin,
-              "appName": client.appName,
-              "browser": client.browser,
-              "key": client.keypair,
-              "type": 'link'
-            };
-            this.emit('link', linkobj);
-          } else {
-            client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":4, "message": "This app is not yet linked"}}');
-          }
+            this._clients[client].send('{"id": ' + result.id + ', "error": true, "payload": { "code":7, "message": "Could not authenticate"}}');
         }
-      } else {
-        if (data.type == 'authenticate') {
-          this.emit('authenticate', {
-            "id": data.id,
-            "client": client.id,
-            "payload": data.payload
-          });
-        } else {
-          client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":5, "message": "Must authenticate first"}}');
-        }
-      }
-    }
-  }
-  async respondLink(client, result) {
-    if (result.isLinked == true) {
-      this._clients[client].isLinked = true;
-      this._clients[client].apphash = result.apphash;
-      this._clients[client].account_id = result.account_id;
-      this._clients[client].chain = result.chain;
-      this._clients[client].next_hash = result.next_hash;
-      let otp = new OTPAuth.HOTP({
-        issuer: "Beet",
-        label: "BeetAuth",
-        algorithm: "SHA1",
-        digits: 32,
-        counter: 0,
-        secret: OTPAuth.Secret.fromHex(result.secret)
-      });
-      this._clients[client].otp = otp;
-      this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.account_id + '"}}');
-    } else {
-      this._clients[client].send('{ "id": "' + result.id + '", "error": true, "payload": { "code":6, "message": "Could not link to Beet"}}');
     }
-  }
-  respondAPI(client, response) {
-    this._clients[client].otp.counter = response.id;
-    var key = this._clients[client].otp.generate();
 
-    var payload = CryptoJS.AES.encrypt(JSON.stringify(response.result), key).toString();
-    this._clients[client].send('{"id": ' + response.id + ', "error": false , "encrypted": true, "payload": "' + payload + '"}');
-  }
-  respondAuth(client, result) {
-    if (result.authenticate) {
-      this._clients[client].isAuthenticated = true;
-      this._clients[client].origin = result.origin;
-      this._clients[client].appName = result.appName;
-      this._clients[client].browser = result.browser;
-      if (result.link) {
-        this._clients[client].isLinked = true;
-        this._clients[client].apphash = result.apphash;
-        this._clients[client].chain = result.app.chain;
-        this._clients[client].account_id = result.app.account_id;
-        this._clients[client].next_hash = result.app.next_hash;
-        let otp = new OTPAuth.HOTP({
-          issuer: "Beet",
-          label: "BeetAuth",
-          algorithm: "SHA1",
-          digits: 32,
-          counter: 0,
-          secret: OTPAuth.Secret.fromHex(result.app.secret)
+    _handleConnection(client) {
+        client.id = uuidv4();
+        client.isAlive = true;
+        client.isAuthenticated = false;
+        let self = this;
+        client.on("pong", this._heartbeat);
+        this._clients[client.id] = client;
+        this.emit("connected", client.id);
+        client.on("message", function (msg) {
+            let message = JSON.parse(msg);
+            self._handleMessage(client, message);
         });
-        console.log("init otp", 0, otp.secret);
-        this._clients[client].otp = otp;
-        this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.app.account_id + '"}}');
-      } else {
-        let keypair= ec.genKeyPair();
-        this._clients[client].keypair = keypair;
-        let pubkey = keypair.getPublic().encode('hex');
-        this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": false, "pub_key": "' + pubkey + '"}}');
-      }
-    } else {
-      this._clients[client].send('{"id": ' + result.id + ', "error": true, "payload": { "code":7, "message": "Could not authenticate"}}');
     }
-  }
-  _handleConnection(client) {
-    client.id = uuidv4();
-    client.isAlive = true;
-    client.isAuthenticated = false;
-    let self = this;
-    client.on("pong", this._heartbeat);
-    this._clients[client.id] = client;
-    this.emit("connected", client.id);
-    client.on("message", function (msg) {
-      let message = JSON.parse(msg);
-      self._handleMessage(client, message);
-    });
-  }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index d2e73fb4..c0fb1590 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -18,7 +18,7 @@ export default class BlockchainAPI {
         this._isConnected = true;
         this._isConnectingInProgress = false;
         console.log("connected to ", node)
-        resolveCallback();
+        resolveCallback(node);
     }
 
     getNodes() {
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index 80c61d47..9260f389 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -35,6 +35,7 @@ const actions = {
         commit
     }, payload) {
         return new Promise((resolve, reject) => {
+            console.log("SettingsStore.setNode", payload);
             try {
                 let settings = localStorage.getItem("settings");
                 if (settings && settings.length > 0) {
@@ -42,12 +43,17 @@ const actions = {
                 } else {
                     settings = initialState.settings;
                 }
+                // backwards compatibility
+                if (typeof settings.selected_node === "string")
+                {
+                    settings.selected_node = {}
+                }
                 settings.selected_node[payload.chain] = payload.node;
                 localStorage.setItem("settings", JSON.stringify(settings));
                 commit(LOAD_SETTINGS, settings);
                 resolve();
             } catch (e) {
-                reject();
+                reject(e);
             }
         });
     },

From fdc555ab267c850bdba96fdd53c63923103220ce Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 29 Jan 2019 11:52:11 +0100
Subject: [PATCH 23/41] OriginStore override if apphash already present

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/store/modules/OriginStore.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/OriginStore.js b/src/store/modules/OriginStore.js
index a372cd84..fc12024e 100644
--- a/src/store/modules/OriginStore.js
+++ b/src/store/modules/OriginStore.js
@@ -49,12 +49,27 @@ const actions = {
         commit
     }, payload) {
         return new Promise((resolve, reject) => {
-            BeetDB.apps.add(payload).then((id) => {
-                payload.id = id;
-                commit(ADD_APP, payload);
-                resolve();
-            }).catch(() => {
-                reject();
+            let db = BeetDB.apps;
+            db.where("apphash").equals(payload.apphash).toArray().then((res) => {
+                if (res.length == 0) {
+                    db.add(payload).then((id) => {
+                        payload.id = id;
+                        commit(ADD_APP, payload);
+                        console.log("app added", payload);
+                        resolve(payload);
+                    }).catch((err) => {
+                        reject(err);
+                    });
+                } else {
+                    console.log("app retrieved", res[0]);
+                    db.update(res[0].id, payload).then(()=>{
+                        resolve(payload);
+                    }).catch((err) => {
+                        reject(err);
+                    });
+                }
+            }).catch((err) => {
+                reject(err);
             });
         });
     }

From a4446b0db4492657949e715a79152e1c3d91aaaa Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 29 Jan 2019 11:52:24 +0100
Subject: [PATCH 24/41] fix tx signing and broadcasting

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/blockchains/BitShares.js | 35 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index b83b0aaa..b88f9dac 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -17,11 +17,12 @@ export default class BitShares extends BlockchainAPI {
             if (nodeToConnect == null) {
                 nodeToConnect = this.getNodes()[0].url;
             }
+            console.log("attempting to connect to ", nodeToConnect);
             if (this._isConnectingInProgress) {
                 // there should be a promise queue for pending connects, this is the lazy way
                 setTimeout(() => {
                     if (this._isConnected) {
-                        resolve();
+                        resolve(nodeToConnect);
                     } else {
                         reject("multiple connects, did not resolve in time");
                     }
@@ -138,7 +139,7 @@ export default class BitShares extends BlockchainAPI {
 
     mapOperationData(incoming) {
         console.log("mapOperationData", incoming);
-        return new Promise((resolve,reject) => {
+        return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
                 if (incoming.action == "vote") {
                     let entity_id = incoming.params.id.split(".");
@@ -149,7 +150,7 @@ export default class BitShares extends BlockchainAPI {
                         reject("Given object does not support voting");
                     }
                     Apis.instance().db_api().exec(
-                        "get_objects", [[this.incoming.params.id]]
+                        "get_objects", [[incoming.params.id]]
                     ).then(objdata => {
                         switch (entity_id[1]) {
                             case "5":
@@ -162,7 +163,7 @@ export default class BitShares extends BlockchainAPI {
                                             "Commitee member: " +
                                             objextradata[0].name +
                                             "\nCommittee Member ID: " +
-                                            this.incoming.params.id,
+                                            incoming.params.id,
                                         vote_id: objdata[0].vote_id
                                     });
                                 }).catch(err => reject(err));
@@ -177,7 +178,7 @@ export default class BitShares extends BlockchainAPI {
                                             "Witness: " +
                                             objextradata[0].name +
                                             "\nWitness ID: " +
-                                            this.incoming.params.id,
+                                            incoming.params.id,
                                         vote_id: objdata[0].vote_id
                                     });
                                 }).catch(err => reject(err));
@@ -193,7 +194,7 @@ export default class BitShares extends BlockchainAPI {
                                             "Proposal: " +
                                             objdata[0].name +
                                             "\nProposal ID: " +
-                                            this.incoming.params.id +
+                                            incoming.params.id +
                                             "\nDaily Pay: " +
                                             dailyPay +
                                             "BTS\nWorker Account: " +
@@ -214,18 +215,16 @@ export default class BitShares extends BlockchainAPI {
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
                 let tr = new TransactionBuilder();
-                Apis.instance().init_promise.then(() => {
-                    tr.add_type_operation(
-                        incoming.op_type,
-                        incoming.op_data
-                    );
-                    tr.set_required_fees().then(() => {
-                        let privateKey = PrivateKey.fromWif(key);
-                        tr.add_signer(privateKey, privateKey.toPublicKey().toPublicKeyString());
-                        resolve(tr);
-                    }).catch(err => reject(err));
+                tr.add_type_operation(
+                    operation.type,
+                    operation.data
+                );
+                tr.set_required_fees().then(() => {
+                    let privateKey = PrivateKey.fromWif(key);
+                    tr.add_signer(privateKey, privateKey.toPublicKey().toPublicKeyString());
+                    resolve(tr);
                 }).catch(err => reject(err));
-            });
+            }).catch(err => reject(err));;
         });
     }
 
@@ -273,7 +272,7 @@ export default class BitShares extends BlockchainAPI {
                             });
                             updateObject.new_options = new_options;
                             operation.data = updateObject;
-                            resolve(resolve);
+                            resolve(operation);
                         }).catch(err => {
                             reject(err);
                         });

From 3fe1c305e01bd531bd410b8f8c4f582461ee16bb Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 29 Jan 2019 14:54:28 +0100
Subject: [PATCH 25/41] enable voting for beet

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue        |  5 +-
 src/lib/BeetServer.js            | 10 ++--
 src/lib/blockchains/BitShares.js |  3 +-
 src/lib/blockchains/Steem.js     | 78 ++++++++++++++++++++++++++++++++
 src/store/modules/OriginStore.js | 16 ++++++-
 5 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index db78d973..2734fbd3 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -318,7 +318,10 @@
                 let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
                 let operation = await blockchain.getOperation(
                     this.incoming,
-                    this.$store.state.WalletStore.wallet.accountID
+                    {
+                        id: this.$store.state.WalletStore.wallet.accountID,
+                        name: this.$store.state.WalletStore.wallet.accountName
+                    }
                 );
                 this.$refs.loaderAnimModal.show();
                 let transaction = await blockchain.sign(
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 881942b9..35d94632 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -5,7 +5,7 @@ import store from '../store/index.js';
 //import eccrypto from 'eccrypto';
 import { ec as EC } from "elliptic"; 
 var ec = new EC('curve25519');
-import RendererLogger from "./RendererLogger"; 
+import RendererLogger from "./RendererLogger";
 
 const logger = new RendererLogger();
 
@@ -60,13 +60,12 @@ const linkHandler = async (req) => {
     }
 };
 
-const authHandler = async (req) => {
-
-    // TODO: Check against blacklist;    
+const authHandler = function (req) {
+    // TODO: Check against blacklist;
     if (req.payload.apphash != null & req.payload.apphash != undefined) {
         let apps = store.state.OriginStore.apps;
         const app = apps.find(x => x.apphash === req.payload.apphash);
-        console.log(app);
+        console.log("authHandler", app);
         if (!app) {
             return Object.assign(req.payload, {
                 authenticate: false,
@@ -105,6 +104,7 @@ export default class BeetServer {
             server.respondLink(data.client, status);
         });
         server.on('authenticate', async (data) => {
+            console.log("event type api", data);
             let status = await authHandler(data);
             status.id = data.id;
             server.respondAuth(data.client, status);
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index b88f9dac..08c654d7 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -239,7 +239,8 @@ export default class BitShares extends BlockchainAPI {
         });
     }
 
-    getOperation(data, account_id) {
+    getOperation(data, account) {
+        let account_id = account.id;
         console.log("getOperation", data, account_id);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index c1d3b7df..e58087d4 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -1,5 +1,6 @@
 import BlockchainAPI from "./BlockchainAPI";
 import steem from "steem";
+import {PrivateKey, TransactionBuilder} from "bitsharesjs";
 
 export default class Steem extends BlockchainAPI {
 
@@ -68,4 +69,81 @@ export default class Steem extends BlockchainAPI {
             });
         });
     }
+
+    _ensureAPI() {
+        // nothing to do for steem yet
+        return new Promise(resolve => {
+            resolve();
+        });
+    }
+
+    sign(operation, key) {
+        console.log("sign", operation, key);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                // this is a hack until I know how to sign offline
+                operation.wif = key;
+                resolve(operation);
+            }).catch(err => reject(err));;
+        });
+    }
+
+    broadcast(transaction) {
+        console.log("broadcast", transaction);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                steem.broadcast.vote(
+                    transaction.wif,
+                    transaction.data.username,
+                    transaction.data.author,
+                    transaction.data.permlink,
+                    transaction.data.weight,
+                    (err, result) => {
+                     console.log(err);
+                     resolve(result);
+                    }
+                );
+            }).catch(err => reject(err));
+        });
+    }
+
+    getOperation(data, account) {
+        console.log("getOperation", data, account);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                switch (data.action) {
+                    case 'vote': {
+                        resolve({
+                            type: "vote",
+                            data: {
+                                username: account.name,
+                                author: data.params.author,
+                                permlink: data.params.permlink,
+                                weight: data.params.weight
+                            }
+                        })
+                    }
+                }
+            });
+        });
+    }
+
+    mapOperationData(incoming) {
+        console.log("mapOperationData", incoming);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                if (incoming.action == "vote") {
+                    resolve({
+                        entity: "Post",
+                        description:
+                            "Author: " + incoming.params.author +
+                            "\nPost: " + incoming.params.permlink +
+                            "\nWeight: " + incoming.params.weight,
+                        vote: incoming.params
+                    });
+                }
+            });
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/src/store/modules/OriginStore.js b/src/store/modules/OriginStore.js
index fc12024e..198ace90 100644
--- a/src/store/modules/OriginStore.js
+++ b/src/store/modules/OriginStore.js
@@ -2,6 +2,7 @@ import Vue from 'vue/dist/vue.js';
 import BeetDB from '../../lib/BeetDB.js';
 const LOAD_APPS = 'LOAD_APPS';
 const ADD_APP = 'ADD_APP';
+const UPDATE_APP = 'UPDATE_APP';
 const NEW_REQUEST = 'NEW_REQUEST';
 
 const mutations = {
@@ -9,8 +10,18 @@ const mutations = {
         Vue.set(state, 'apps', apps);
     },
     [ADD_APP](state, app) {
+        console.log("OriginStore.add_app");
         state.apps.push(app);
     },
+    [UPDATE_APP](state, app) {
+        console.log("OriginStore.update_app");
+        state.apps.forEach(function(item, i) {
+            if (item.apphash == app.apphash) {
+                console.log("OriginStore.update_app replace", state.apps[i], app);
+                state.apps[i] = app;
+            }
+        });
+    },
     [NEW_REQUEST]() {
 
     }
@@ -62,7 +73,10 @@ const actions = {
                     });
                 } else {
                     console.log("app retrieved", res[0]);
-                    db.update(res[0].id, payload).then(()=>{
+                    db.update(res[0].id, payload).then((id)=>{
+                        payload.id = id;
+                        console.log("app updated", payload);
+                        commit(UPDATE_APP, payload);
                         resolve(payload);
                     }).catch((err) => {
                         reject(err);

From 2cf6058df9dfebc92b408987ea8285a4351a4ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 29 Jan 2019 22:45:27 +0100
Subject: [PATCH 26/41] requestSignature for steem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue    |  4 +--
 src/lib/BeetAPI.js           |  1 +
 src/lib/Operations.js        |  4 +--
 src/lib/blockchains/Steem.js | 62 ++++++++++++++++++++++++++++--------
 4 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index 2734fbd3..adb62171 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -62,8 +62,8 @@
             <pre class="text-left custom-content">
                 <code>
     {
-    op_type: {{ incoming.op_type }},
-    op_data: {{ incoming.op_data }}
+    type: {{ incoming.params.type }},
+    data: {{ incoming.params.data }}
     }
                 </code>
             </pre>
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 8e6e6e3f..01ef814e 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -113,6 +113,7 @@ export default class BeetAPI {
     }
     static async [Actions.REQUEST_SIGNATURE](request, vue) {
         try {
+            console.log("BeetAPI.requestSignature", request);
             let response = await vue.requestTx(request.payload);
             return {
                 id: request.id,
diff --git a/src/lib/Operations.js b/src/lib/Operations.js
index 6f390c8c..8a082e74 100644
--- a/src/lib/Operations.js
+++ b/src/lib/Operations.js
@@ -6,8 +6,8 @@ export default class operations {
         const blockchain = getBlockchain();
         let operation = await blockchain.getOperation(data, account_id);
         return {
-            op_type: operation.type,
-            op_data: operation.data
+            type: operation.type,
+            data: operation.data
         };
     }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index e58087d4..7c26fd50 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -1,6 +1,5 @@
 import BlockchainAPI from "./BlockchainAPI";
 import steem from "steem";
-import {PrivateKey, TransactionBuilder} from "bitsharesjs";
 
 export default class Steem extends BlockchainAPI {
 
@@ -78,36 +77,71 @@ export default class Steem extends BlockchainAPI {
     }
 
     sign(operation, key) {
+        let steeem = steem;
         console.log("sign", operation, key);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
-                // this is a hack until I know how to sign offline
-                operation.wif = key;
-                resolve(operation);
+                switch (operation.type) {
+                    case 'vote': {
+                        // do actual transaction building
+                        operation.wif = key;
+                        resolve(operation);
+                        break;
+                    }
+                    default:
+                        operation.wif = key;
+                        resolve(operation);
+                }
+
             }).catch(err => reject(err));;
         });
     }
 
     broadcast(transaction) {
+        let steeem = steem;
         console.log("broadcast", transaction);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
-                steem.broadcast.vote(
-                    transaction.wif,
-                    transaction.data.username,
-                    transaction.data.author,
-                    transaction.data.permlink,
-                    transaction.data.weight,
-                    (err, result) => {
-                     console.log(err);
-                     resolve(result);
+                switch (transaction.action) {
+                    case 'vote': {
+                        steem.broadcast.vote(
+                            transaction.wif,
+                            transaction.data.username,
+                            transaction.data.author,
+                            transaction.data.permlink,
+                            transaction.data.weight,
+                            (err, result) => {
+                                console.log("vote result", err, result);
+                                resolve(result);
+                            }
+                        );
+                        break;
                     }
-                );
+                    case "customJSON": {
+                        steem.broadcast.customJson(
+                            transaction.wif,
+                            transaction.requiredAuths,
+                            transaction.requiredPostingAuths,
+                            transaction.id,
+                            transaction.json,
+                            (err, result) => {
+                                console.log("customJson result", err, result);
+                                resolve(result);
+                            }
+                         );
+                        break;
+                    }
+                    default: {
+                        reject("not broadcast")
+                    }
+                }
+
             }).catch(err => reject(err));
         });
     }
 
     getOperation(data, account) {
+        let steeem = steem;
         console.log("getOperation", data, account);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {

From 6a24f4576a0e2176df53959c6031c91a2d560a2a Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Wed, 30 Jan 2019 14:51:26 +0100
Subject: [PATCH 27/41] add injected call

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue    |  10 ++--
 src/lib/Actions.js           |   1 +
 src/lib/BeetAPI.js           |  19 +++++++
 src/lib/blockchains/Steem.js | 104 ++++++++++++++++++++++-------------
 4 files changed, 91 insertions(+), 43 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index adb62171..d7daae23 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -59,11 +59,10 @@
             {{ $t('operations:rawsig.request',{origin: incoming.origin }) }}
             <br>
             <br>
-            <pre class="text-left custom-content">
+            <pre v-if="!!incoming.params" class="text-left custom-content">
                 <code>
     {
-    type: {{ incoming.params.type }},
-    data: {{ incoming.params.data }}
+    {{ incoming.params }}
     }
                 </code>
             </pre>
@@ -273,12 +272,11 @@
                     this.incoming.rejectgen = rej;
                 });
             },
-            requestTx: function (request) {
+            requestTx: function (payload) {
                 this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request", message: "request"
                 });
-                this.incoming = {};
-                this.incoming = request;
+                this.incoming = payload;
                 this.$refs.transactionReqModal.show();
                 return new Promise((res, rej) => {
                     this.incoming.accepttx = res;
diff --git a/src/lib/Actions.js b/src/lib/Actions.js
index a1936619..0c901569 100644
--- a/src/lib/Actions.js
+++ b/src/lib/Actions.js
@@ -1,4 +1,5 @@
 export const GET_ACCOUNT = 'getAccount';
 export const REQUEST_SIGNATURE = 'requestSignature';
+export const INJECTED_CALL = 'injectedCall';
 export const REQUEST_LINK = 'link';
 export const VOTE_FOR = 'voteFor';
\ No newline at end of file
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 01ef814e..b5e3e349 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -129,4 +129,23 @@ export default class BeetAPI {
             };
         }
     }
+    static async [Actions.INJECTED_CALL](request, vue) {
+        try {
+            console.log("BeetAPI.injectedCall", request);
+            let response = await vue.requestTx(request.payload);
+            return {
+                id: request.id,
+                result: response
+            };
+        } catch (err) {
+            return {
+                id: request.id,
+                result: {
+                    isError: true,
+                    error: "User rejected"
+                }
+            };
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index 7c26fd50..dac0d30b 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -77,20 +77,30 @@ export default class Steem extends BlockchainAPI {
     }
 
     sign(operation, key) {
-        let steeem = steem;
         console.log("sign", operation, key);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
-                switch (operation.type) {
-                    case 'vote': {
-                        // do actual transaction building
-                        operation.wif = key;
-                        resolve(operation);
-                        break;
+                if (!!operation.type) {
+                    switch (operation.type) {
+                        case 'vote': {
+                            // do actual transaction building
+                            operation.wif = key;
+                            resolve(operation);
+                            break;
+                        }
+                        default:
+                            operation.wif = key;
+                            resolve(operation);
                     }
-                    default:
-                        operation.wif = key;
+                } else {
+                    if (typeof operation == "object"
+                        && operation.length > 2
+                        && operation[1] == "inject_wif") {
+                        operation[1] = key;
                         resolve(operation);
+                    } else {
+                        reject("Unknown sign request");
+                    }
                 }
 
             }).catch(err => reject(err));;
@@ -98,42 +108,62 @@ export default class Steem extends BlockchainAPI {
     }
 
     broadcast(transaction) {
-        let steeem = steem;
         console.log("broadcast", transaction);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
-                switch (transaction.action) {
-                    case 'vote': {
-                        steem.broadcast.vote(
-                            transaction.wif,
-                            transaction.data.username,
-                            transaction.data.author,
-                            transaction.data.permlink,
-                            transaction.data.weight,
-                            (err, result) => {
-                                console.log("vote result", err, result);
-                                resolve(result);
-                            }
-                        );
-                        break;
+                if (!!transaction.type) {
+                    switch (transaction.type) {
+                        case 'vote': {
+                            steem.broadcast.vote(
+                                transaction.wif,
+                                transaction.data.username,
+                                transaction.data.author,
+                                transaction.data.permlink,
+                                transaction.data.weight,
+                                (err, result) => {
+                                    console.log("vote result", err, result);
+                                    resolve(result);
+                                }
+                            );
+                            break;
+                        }
+                        case "customJSON": {
+                            steem.broadcast.customJson(
+                                transaction.wif, //transaction.wif,
+                                transaction.data.requiredAuths,
+                                transaction.data.requiredPostingAuths,
+                                transaction.data.id,
+                                transaction.data.json,
+                                (err, result) => {
+                                    console.log("customJson result", err, result);
+                                    resolve(result);
+                                }
+                            );
+                            break;
+                        }
+                        default: {
+                            reject("not broadcast")
+                        }
                     }
-                    case "customJSON": {
-                        steem.broadcast.customJson(
-                            transaction.wif,
-                            transaction.requiredAuths,
-                            transaction.requiredPostingAuths,
-                            transaction.id,
-                            transaction.json,
+                } else {
+                    if (typeof transaction == "object"
+                        && transaction.length > 3
+                        && typeof transaction[0] == "string") {
+                        let operationName = transaction.shift();
+                        steem.broadcast[operationName](
+                            ...transaction,
                             (err, result) => {
-                                console.log("customJson result", err, result);
+                                console.log("injectedCall result", err, result);
+                                if (!!err) {
+                                    reject(err);
+                                }
                                 resolve(result);
                             }
-                         );
-                        break;
-                    }
-                    default: {
-                        reject("not broadcast")
+                        );
+                    } else {
+                        reject("Unknown broadcast request");
                     }
+
                 }
 
             }).catch(err => reject(err));

From 321d04fb6a18dec3384db292a796cb511d43e5eb Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Thu, 31 Jan 2019 17:00:30 +0100
Subject: [PATCH 28/41] add sign message

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue            | 15 ++++++++++++--
 src/lib/Actions.js                   |  3 ++-
 src/lib/BeetAPI.js                   | 19 +++++++++++++++++-
 src/lib/blockchains/BitShares.js     | 30 +++++++++++++++++++++++++++-
 src/lib/blockchains/BlockchainAPI.js |  4 ++++
 src/lib/blockchains/Steem.js         |  7 +++++++
 6 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index d7daae23..7dd445ca 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -233,7 +233,6 @@
                 if (index !== -1) this.alerts.splice(index, 1);
             },
             requestAccess: function (request) {
-
                 this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request", message: "request"
                 });
@@ -283,10 +282,22 @@
                     this.incoming.rejecttx = rej;
                 });
             },
+            signMessage: function (payload) {
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                return new Promise((resolve, rej) => {
+                    blockchain.signMessage(
+                        this.$store.state.WalletStore.wallet.keys.active,
+                        this.$store.state.WalletStore.wallet.accountName,
+                        payload.params
+                    ).then((res) => {
+                        resolve(res);
+                    });
+                });
+            },
             allowAccess: function () {
                 this.$refs.accountReqModal.hide();
                 this.incoming.accept({
-                    account: this.$store.state.WalletStore.wallet.accountName,
+                    name: this.$store.state.WalletStore.wallet.accountName,
                     id: this.$store.state.WalletStore.wallet.accountID
                 });
             },
diff --git a/src/lib/Actions.js b/src/lib/Actions.js
index 0c901569..4a0fe417 100644
--- a/src/lib/Actions.js
+++ b/src/lib/Actions.js
@@ -2,4 +2,5 @@ export const GET_ACCOUNT = 'getAccount';
 export const REQUEST_SIGNATURE = 'requestSignature';
 export const INJECTED_CALL = 'injectedCall';
 export const REQUEST_LINK = 'link';
-export const VOTE_FOR = 'voteFor';
\ No newline at end of file
+export const VOTE_FOR = 'voteFor';
+export const SIGN_MESSAGE = 'signMessage';
\ No newline at end of file
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index b5e3e349..239ab04a 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -147,5 +147,22 @@ export default class BeetAPI {
             };
         }
     }
-
+    static async [Actions.SIGN_MESSAGE](request, vue) {
+        try {
+            console.log("BeetAPI.signMessage", request);
+            let response = await vue.signMessage(request.payload);
+            return {
+                id: request.id,
+                result: response
+            };
+        } catch (err) {
+            return {
+                id: request.id,
+                result: {
+                    isError: true,
+                    error: "User rejected"
+                }
+            };
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 08c654d7..dad4f0ce 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -2,7 +2,8 @@ import BlockchainAPI from "./BlockchainAPI";
 import {Apis} from "bitsharesjs-ws";
 import {
     PrivateKey,
-    TransactionBuilder
+    TransactionBuilder,
+    Signature
 } from "bitsharesjs";
 
 export default class BitShares extends BlockchainAPI {
@@ -283,4 +284,31 @@ export default class BitShares extends BlockchainAPI {
             });
         });
     }
+
+    signMessage(key, accountName, randomString) {
+        return new Promise((resolve,reject) => {
+            // do as a list, to preserve order
+            let message = JSON.stringify([
+                "from",
+                accountName,
+                this.getPublicKey(key),
+                "time",
+                new Date().toUTCString(),
+                "text",
+                randomString
+            ]);
+            try {
+                let signature = Signature.signBuffer(
+                    message,
+                    PrivateKey.fromWif(key)
+                );
+                resolve({
+                    message: message,
+                    signature: signature.toHex()
+                });
+            } catch (err) {
+                reject(err);
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index c0fb1590..49593c78 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -49,4 +49,8 @@ export default class BlockchainAPI {
         throw "Needs implementation";
     }
 
+    signMessage(key, message) {
+        throw "Needs implementation";
+    }
+
 }
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index dac0d30b..502470b8 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -1,5 +1,6 @@
 import BlockchainAPI from "./BlockchainAPI";
 import steem from "steem";
+import {Signature} from "bitsharesjs";
 
 export default class Steem extends BlockchainAPI {
 
@@ -210,4 +211,10 @@ export default class Steem extends BlockchainAPI {
         });
     }
 
+    signMessage(key, randomString) {
+        return new Promise((resolve,reject) => {
+            reject("not implemented yet");
+        });
+    }
+
 }
\ No newline at end of file

From d2c79d697557060a47f3fd0a567e3b8e9364b11e Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Fri, 1 Feb 2019 16:55:41 +0100
Subject: [PATCH 29/41] add verifymessage

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue            | 24 +++++++--
 src/lib/Actions.js                   |  3 +-
 src/lib/BeetAPI.js                   | 20 +++++++
 src/lib/blockchains/BitShares.js     | 79 +++++++++++++++++++++++++++-
 src/lib/blockchains/BlockchainAPI.js |  4 ++
 5 files changed, 124 insertions(+), 6 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index 7dd445ca..eff03e38 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -284,13 +284,31 @@
             },
             signMessage: function (payload) {
                 let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
-                return new Promise((resolve, rej) => {
+                return new Promise((resolve, reject) => {
                     blockchain.signMessage(
                         this.$store.state.WalletStore.wallet.keys.active,
                         this.$store.state.WalletStore.wallet.accountName,
                         payload.params
-                    ).then((res) => {
-                        resolve(res);
+                    ).then((signedMessage) => {
+                        blockchain.verifyMessage(signedMessage).then(res => {
+                            resolve(signedMessage);
+                        }).catch(err => {
+                            reject(err);
+                        });
+                    }).catch(err => {
+                        reject(err);
+                    });
+                });
+            },
+            verifyMessage: function (payload) {
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                return new Promise((resolve, reject) => {
+                    blockchain.verifyMessage(
+                        payload.params
+                    ).then((result) => {
+                        resolve(result);
+                    }).catch(err => {
+                        reject(err);
                     });
                 });
             },
diff --git a/src/lib/Actions.js b/src/lib/Actions.js
index 4a0fe417..01d31932 100644
--- a/src/lib/Actions.js
+++ b/src/lib/Actions.js
@@ -3,4 +3,5 @@ export const REQUEST_SIGNATURE = 'requestSignature';
 export const INJECTED_CALL = 'injectedCall';
 export const REQUEST_LINK = 'link';
 export const VOTE_FOR = 'voteFor';
-export const SIGN_MESSAGE = 'signMessage';
\ No newline at end of file
+export const SIGN_MESSAGE = 'signMessage';
+export const VERIFY_MESSAGE = 'verifyMessage';
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 239ab04a..92564638 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -165,4 +165,24 @@ export default class BeetAPI {
             };
         }
     }
+    static async [Actions.VERIFY_MESSAGE](request, vue) {
+        try {
+            console.log("BeetAPI.verifyMessage", request);
+            let response = await vue.verifyMessage(request.payload);
+            return {
+                id: request.id,
+                result: response
+            };
+        } catch (err) {
+            return {
+                id: request.id,
+                result: {
+                    isError: true,
+                    error: "User rejected"
+                }
+            };
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index dad4f0ce..82919306 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -2,8 +2,10 @@ import BlockchainAPI from "./BlockchainAPI";
 import {Apis} from "bitsharesjs-ws";
 import {
     PrivateKey,
+    PublicKey,
     TransactionBuilder,
-    Signature
+    Signature,
+    ChainStore
 } from "bitsharesjs";
 
 export default class BitShares extends BlockchainAPI {
@@ -303,7 +305,7 @@ export default class BitShares extends BlockchainAPI {
                     PrivateKey.fromWif(key)
                 );
                 resolve({
-                    message: message,
+                    payload: message,
                     signature: signature.toHex()
                 });
             } catch (err) {
@@ -311,4 +313,77 @@ export default class BitShares extends BlockchainAPI {
             }
         });
     }
+
+    _verifyAccountAndKey(accountName, publicKey, permission = null) {
+        return new Promise((resolve, reject) => {
+            this.getAccount(accountName).then(account => {
+                account.active.public_keys.forEach((key) => {
+                    if (key[0] == publicKey) {
+                        resolve({
+                            account: account,
+                            permission: "active",
+                            weight: key[1]
+                        });
+                        return;
+                    }
+                });
+                account.owner.public_keys.forEach((key) => {
+                    if (key[0] == publicKey) {
+                        resolve({
+                            account: account,
+                            permission: "owner",
+                            weight: key[1]
+                        });
+                        return;
+                    }
+                });
+                if (account.memo.public_key == publicKey) {
+                    resolve({
+                        account: account,
+                        permission: "memo",
+                        weight: 1
+                    });
+                    return;
+                }
+            }).catch((err) => {
+                reject(err)
+            });
+        });
+    }
+
+    verifyMessage(signedMessage) {
+        return new Promise((resolve, reject) => {
+            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
+                signedMessage.signed = signedMessage.payload;
+                signedMessage.payload = JSON.parse(signedMessage.payload);
+            }
+
+            // validate account and key
+            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
+                found => {
+                    if (found.account == null) {
+                        reject("invalid user");
+                    }
+                    // verify message signed
+                    let verified = false;
+                    try {
+                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
+                            signedMessage.signed,
+                            PublicKey.fromPublicKeyString(signedMessage.payload[2])
+                        );
+                    } catch (err) {
+                        // wrap message that could be raised from Signature
+                        reject("Error verifying signature");
+                    }
+                    if (!verified) {
+                        reject("Invalid signature");
+                    }
+                    return resolve(signedMessage);
+                }
+            ).catch(err => {
+                reject(err);
+            });
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index 49593c78..0aa01562 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -53,4 +53,8 @@ export default class BlockchainAPI {
         throw "Needs implementation";
     }
 
+    verifyMessage(message) {
+        throw "Needs implementation";
+    }
+
 }

From a271e25a5d6956f246b0666f0f96ca0d3b4b3a89 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Mon, 4 Feb 2019 15:01:56 +0100
Subject: [PATCH 30/41] missing reject in verifyMessage

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/blockchains/BitShares.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 82919306..3e85420d 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -345,6 +345,7 @@ export default class BitShares extends BlockchainAPI {
                     });
                     return;
                 }
+                reject("Key and account do not match!")
             }).catch((err) => {
                 reject(err)
             });

From 22c1734a98606a54e72d16f60d06ebbd0aecaa09 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Mon, 4 Feb 2019 15:27:21 +0100
Subject: [PATCH 31/41] sync lock

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 package-lock.json | 10 ++++------
 package.json      |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a0d6cda..2920993f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "beet",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -6183,8 +6183,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz",
       "integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "imurmurhash": {
       "version": "0.1.4",
@@ -6424,8 +6423,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
       "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-relative-path": {
       "version": "1.0.2",
@@ -8842,7 +8840,7 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
diff --git a/package.json b/package.json
index cb981cc2..ea6fda4e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "beet",
   "productName": "beet",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "Beet is a stand-alone key-manager and signing app for BitShares.",
   "main": "src/index.js",
   "scripts": {

From 7d262a29332b2e6af6c236249036fa7cdb616d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?=
 <stefan.schiessl@blockchainprojectsbv.com>
Date: Mon, 4 Feb 2019 22:39:09 +0100
Subject: [PATCH 32/41] add injectedCall for BitShares
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Schießl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/blockchains/BitShares.js | 34 ++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 3e85420d..c7fdf7d3 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -217,16 +217,30 @@ export default class BitShares extends BlockchainAPI {
         console.log("sign", operation, key);
         return new Promise((resolve, reject) => {
             this._ensureAPI().then(() => {
-                let tr = new TransactionBuilder();
-                tr.add_type_operation(
-                    operation.type,
-                    operation.data
-                );
-                tr.set_required_fees().then(() => {
-                    let privateKey = PrivateKey.fromWif(key);
-                    tr.add_signer(privateKey, privateKey.toPublicKey().toPublicKeyString());
-                    resolve(tr);
-                }).catch(err => reject(err));
+                if (!!operation.type) {
+                    let tr = new TransactionBuilder();
+                    tr.add_type_operation(
+                        operation.type,
+                        operation.data
+                    );
+                    tr.set_required_fees().then(() => {
+                        let privateKey = PrivateKey.fromWif(key);
+                        tr.add_signer(privateKey, privateKey.toPublicKey().toPublicKeyString());
+                        resolve(tr);
+                    }).catch(err => reject(err));
+                } else {
+                    if (typeof operation == "object"
+                        && operation.length > 2
+                        && operation[0] == "signAndBroadcast") {
+                        let tr = new TransactionBuilder();
+                        tr.tr_buffer = operation.tr_buffer;
+                        let privateKey = PrivateKey.fromWif(key);
+                        tr.add_signer(privateKey, privateKey.toPublicKey().toPublicKeyString());
+                        resolve(tr);
+                    } else {
+                        reject("Unknown sign request");
+                    }
+                }
             }).catch(err => reject(err));;
         });
     }

From 6027b13acdcd5b97b44e28ca75875405058b4872 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 5 Feb 2019 08:22:56 +0100
Subject: [PATCH 33/41] use indicated chain to verify

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue            |  8 +++-
 src/lib/blockchains/BitShares.js     | 38 ---------------
 src/lib/blockchains/BlockchainAPI.js | 38 +++++++++++++++
 src/lib/blockchains/Steem.js         | 69 ++++++++++++++++++++++++++--
 4 files changed, 111 insertions(+), 42 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index eff03e38..4754ff35 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -301,7 +301,13 @@
                 });
             },
             verifyMessage: function (payload) {
-                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                console.log("verify", payload);
+                let blockchain = null;
+                if (payload.params.payload[2].substring(0,3) == "BTS") {
+                    blockchain = getBlockchain("BTS");
+                } else {
+                    blockchain = getBlockchain("STEEM");
+                }
                 return new Promise((resolve, reject) => {
                     blockchain.verifyMessage(
                         payload.params
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index c7fdf7d3..4aeee766 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -328,44 +328,6 @@ export default class BitShares extends BlockchainAPI {
         });
     }
 
-    _verifyAccountAndKey(accountName, publicKey, permission = null) {
-        return new Promise((resolve, reject) => {
-            this.getAccount(accountName).then(account => {
-                account.active.public_keys.forEach((key) => {
-                    if (key[0] == publicKey) {
-                        resolve({
-                            account: account,
-                            permission: "active",
-                            weight: key[1]
-                        });
-                        return;
-                    }
-                });
-                account.owner.public_keys.forEach((key) => {
-                    if (key[0] == publicKey) {
-                        resolve({
-                            account: account,
-                            permission: "owner",
-                            weight: key[1]
-                        });
-                        return;
-                    }
-                });
-                if (account.memo.public_key == publicKey) {
-                    resolve({
-                        account: account,
-                        permission: "memo",
-                        weight: 1
-                    });
-                    return;
-                }
-                reject("Key and account do not match!")
-            }).catch((err) => {
-                reject(err)
-            });
-        });
-    }
-
     verifyMessage(signedMessage) {
         return new Promise((resolve, reject) => {
             if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index 0aa01562..d026464d 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -57,4 +57,42 @@ export default class BlockchainAPI {
         throw "Needs implementation";
     }
 
+    _verifyAccountAndKey(accountName, publicKey, permission = null) {
+        return new Promise((resolve, reject) => {
+            this.getAccount(accountName).then(account => {
+                account.active.public_keys.forEach((key) => {
+                    if (key[0] == publicKey) {
+                        resolve({
+                            account: account,
+                            permission: "active",
+                            weight: key[1]
+                        });
+                        return;
+                    }
+                });
+                account.owner.public_keys.forEach((key) => {
+                    if (key[0] == publicKey) {
+                        resolve({
+                            account: account,
+                            permission: "owner",
+                            weight: key[1]
+                        });
+                        return;
+                    }
+                });
+                if (account.memo.public_key == publicKey) {
+                    resolve({
+                        account: account,
+                        permission: "memo",
+                        weight: 1
+                    });
+                    return;
+                }
+                reject("Key and account do not match!")
+            }).catch((err) => {
+                reject(err)
+            });
+        });
+    }
+
 }
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index 502470b8..13e5a977 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -1,6 +1,9 @@
 import BlockchainAPI from "./BlockchainAPI";
 import steem from "steem";
-import {Signature} from "bitsharesjs";
+import Signature from "steem/lib/auth/ecc/src/signature";
+import KeyPrivate from "steem/lib/auth/ecc/src/key_private";
+import PublicKey from "steem/lib/auth/ecc/src/key_public";
+
 
 export default class Steem extends BlockchainAPI {
 
@@ -21,6 +24,10 @@ export default class Steem extends BlockchainAPI {
     getAccount(accountname) {
         return new Promise((resolve, reject) => {
             steem.api.getAccounts([accountname], function(err, result) {
+                if (result.length == 0) {
+                    reject("Account " + accountname + " not found!");
+                    return;
+                }
                 result[0].active.public_keys = result[0].active.key_auths;
                 result[0].owner.public_keys = result[0].owner.key_auths;
                 result[0].memo = {public_key: result[0].memo_key};
@@ -211,9 +218,65 @@ export default class Steem extends BlockchainAPI {
         });
     }
 
-    signMessage(key, randomString) {
+    signMessage(key, accountName, randomString) {
         return new Promise((resolve,reject) => {
-            reject("not implemented yet");
+            // do as a list, to preserve order
+            let message = JSON.stringify([
+                "from",
+                accountName,
+                this.getPublicKey(key),
+                "time",
+                new Date().toUTCString(),
+                "text",
+                randomString
+            ]);
+            try {
+                let signature = Signature.signBuffer(
+                    message,
+                    KeyPrivate.fromWif(key)
+                );
+                resolve({
+                    payload: message,
+                    signature: signature.toHex()
+                });
+            } catch (err) {
+                reject(err);
+            }
+        });
+    }
+
+    verifyMessage(signedMessage) {
+        return new Promise((resolve, reject) => {
+            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
+                signedMessage.signed = signedMessage.payload;
+                signedMessage.payload = JSON.parse(signedMessage.payload);
+            }
+
+            // validate account and key
+            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
+                found => {
+                    if (found.account == null) {
+                        reject("invalid user");
+                    }
+                    // verify message signed
+                    let verified = false;
+                    try {
+                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
+                            signedMessage.signed,
+                            PublicKey.fromStringOrThrow(signedMessage.payload[2])
+                        );
+                    } catch (err) {
+                        // wrap message that could be raised from Signature
+                        reject("Error verifying signature");
+                    }
+                    if (!verified) {
+                        reject("Invalid signature");
+                    }
+                    return resolve(signedMessage);
+                }
+            ).catch(err => {
+                reject(err);
+            });
         });
     }
 

From 8a1af5d6a69cc600264432baaa27f27f6f06e161 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 5 Feb 2019 09:59:46 +0100
Subject: [PATCH 34/41] add whaleshares and smokenetwork

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 package-lock.json                        | 114 +++++++++
 package.json                             |   2 +
 src/components/popups.vue                |   7 +-
 src/lib/blockchains/SmokeNetwork.js      | 283 ++++++++++++++++++++++
 src/lib/blockchains/WhaleShares.js       | 285 +++++++++++++++++++++++
 src/lib/blockchains/blockchainFactory.js |  14 +-
 6 files changed, 698 insertions(+), 7 deletions(-)
 create mode 100644 src/lib/blockchains/SmokeNetwork.js
 create mode 100644 src/lib/blockchains/WhaleShares.js

diff --git a/package-lock.json b/package-lock.json
index 2920993f..2494ea48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -138,6 +138,51 @@
         }
       }
     },
+    "@smokenetwork/smoke-js": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@smokenetwork/smoke-js/-/smoke-js-0.1.2.tgz",
+      "integrity": "sha512-ptej72ArP54mMo+8YFLFPp3W7ZF2f6zheMhxLHldy2MckruOUo73M8dY02pkvqOf0eS58TsTRt4inK0yc0OP1Q==",
+      "requires": {
+        "bigi": "^1.4.2",
+        "bluebird": "^3.4.6",
+        "browserify-aes": "^1.0.6",
+        "bs58": "^4.0.0",
+        "buffer": "^5.0.6",
+        "bytebuffer": "^5.0.1",
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "cross-env": "^5.0.0",
+        "debug": "^2.6.9",
+        "detect-node": "^2.0.3",
+        "ecurve": "^1.0.5",
+        "fetch-ponyfill": "^4.1.0",
+        "lodash": "^4.17.11",
+        "postinstall-build": "^5.0.3",
+        "secure-random": "^1.1.1",
+        "ws": "^3.0.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4"
+          }
+        },
+        "ws": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+          "requires": {
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
+          }
+        }
+      }
+    },
     "@steemit/libcrypto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@steemit/libcrypto/-/libcrypto-1.0.1.tgz",
@@ -182,6 +227,51 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.10.2.tgz",
       "integrity": "sha512-RO4ig5taKmcrU4Rex8ojG1gpwFkjddzug9iPQSDvbewHN9vDpcFewevkaOK+KT+w1LeZnxbgOyfXwV4pxsQ4GQ=="
     },
+    "@whaleshares/wlsjs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@whaleshares/wlsjs/-/wlsjs-0.1.1.tgz",
+      "integrity": "sha512-6BbM/EngUvvghVMLw+lY0z/7CQMYUsbhd0xhUe1JB+zA/dFG19ZAhx8rQPwkwR1DZgw3sxb1RrolkOtCfXiN8A==",
+      "requires": {
+        "bigi": "^1.4.2",
+        "bluebird": "^3.4.6",
+        "browserify-aes": "^1.0.6",
+        "bs58": "^4.0.0",
+        "buffer": "^5.0.6",
+        "bytebuffer": "^5.0.1",
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "cross-env": "^5.0.0",
+        "debug": "^2.6.8",
+        "detect-node": "^2.0.3",
+        "ecurve": "^1.0.5",
+        "fetch-ponyfill": "^4.1.0",
+        "lodash": "^4.16.4",
+        "postinstall-build": "^5.0.1",
+        "secure-random": "^1.1.1",
+        "ws": "^3.0.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4"
+          }
+        },
+        "ws": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+          "requires": {
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
+          }
+        }
+      }
+    },
     "abab": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
@@ -5275,6 +5365,25 @@
         "pend": "~1.2.0"
       }
     },
+    "fetch-ponyfill": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz",
+      "integrity": "sha1-rjzl9zLGReq4fkroeTQUcJsjmJM=",
+      "requires": {
+        "node-fetch": "~1.7.1"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+          "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+          "requires": {
+            "encoding": "^0.1.11",
+            "is-stream": "^1.0.1"
+          }
+        }
+      }
+    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -8625,6 +8734,11 @@
         "uniqs": "^2.0.0"
       }
     },
+    "postinstall-build": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/postinstall-build/-/postinstall-build-5.0.3.tgz",
+      "integrity": "sha512-vPvPe8TKgp4FLgY3+DfxCE5PIfoXBK2lyLfNCxsRbDsV6vS4oU5RG/IWxrblMn6heagbnMED3MemUQllQ2bQUg=="
+    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
diff --git a/package.json b/package.json
index ea6fda4e..e657b707 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,8 @@
   },
   "dependencies": {
     "@panter/vue-i18next": "^0.15.0",
+    "@smokenetwork/smoke-js": "^0.1.2",
+    "@whaleshares/wlsjs": "^0.1.1",
     "bitsharesjs": "^1.8.3",
     "bootstrap-vue": "^2.0.0-rc.11",
     "chalk": "^2.4.2",
diff --git a/src/components/popups.vue b/src/components/popups.vue
index 4754ff35..f9396ad3 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -302,12 +302,7 @@
             },
             verifyMessage: function (payload) {
                 console.log("verify", payload);
-                let blockchain = null;
-                if (payload.params.payload[2].substring(0,3) == "BTS") {
-                    blockchain = getBlockchain("BTS");
-                } else {
-                    blockchain = getBlockchain("STEEM");
-                }
+                let blockchain = getBlockchain(payload.params.payload[2].substring(0,3));
                 return new Promise((resolve, reject) => {
                     blockchain.verifyMessage(
                         payload.params
diff --git a/src/lib/blockchains/SmokeNetwork.js b/src/lib/blockchains/SmokeNetwork.js
new file mode 100644
index 00000000..51b281ee
--- /dev/null
+++ b/src/lib/blockchains/SmokeNetwork.js
@@ -0,0 +1,283 @@
+import BlockchainAPI from "./BlockchainAPI";
+import smokejs from "@smokenetwork/smoke-js";
+import Signature from "@smokenetwork/smoke-js/lib/auth/ecc/src/signature";
+import KeyPrivate from "@smokenetwork/smoke-js/lib/auth/ecc/src/key_private";
+import PublicKey from "@smokenetwork/smoke-js/lib/auth/ecc/src/key_public";
+
+
+export default class Steem extends BlockchainAPI {
+
+    // https://github.com/steemit/steem-js/tree/master/doc#broadcast-api
+
+    isConnected() {
+        return this._isConnected;
+    }
+
+    connect(nodeToConnect, onClose = null) {
+        return new Promise((resolve, reject) => {
+            // steem library handles connection internally, just set node
+            //smokejs.api.setOptions({ url: nodeToConnect });
+            resolve();
+        });
+    }
+
+    getAccount(accountname) {
+        return new Promise((resolve, reject) => {
+            smokejs.api.getAccounts([accountname], function(err, result) {
+                if (result.length == 0) {
+                    reject("Account " + accountname + " not found!");
+                    return;
+                }
+                result[0].active.public_keys = result[0].active.key_auths;
+                result[0].owner.public_keys = result[0].owner.key_auths;
+                result[0].memo = {public_key: result[0].memo_key};
+                resolve(result[0]);
+            });
+        });
+    }
+
+    getPublicKey(privateKey) {
+        return smokejs.auth.wifToPublic(privateKey);
+    }
+
+    getBalances(accountName) {
+        return new Promise((resolve, reject) => {
+            this.getAccount(accountName).then((account) => {
+                let balances = [];
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "STEEM",
+                    balance: parseFloat(account.balance),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "VESTS",
+                    balance: parseFloat(account.vesting_shares),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "SDB",
+                    balance: parseFloat(account.sbd_balance),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "SP",
+                    balance: parseFloat(account.reward_vesting_steem),
+                    owner: "-",
+                    prefix: ""
+                });
+                resolve(balances);
+            });
+        });
+    }
+
+    _ensureAPI() {
+        // nothing to do for steem yet
+        return new Promise(resolve => {
+            resolve();
+        });
+    }
+
+    sign(operation, key) {
+        console.log("sign", operation, key);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                if (!!operation.type) {
+                    switch (operation.type) {
+                        case 'vote': {
+                            // do actual transaction building
+                            operation.wif = key;
+                            resolve(operation);
+                            break;
+                        }
+                        default:
+                            operation.wif = key;
+                            resolve(operation);
+                    }
+                } else {
+                    if (typeof operation == "object"
+                        && operation.length > 2
+                        && operation[1] == "inject_wif") {
+                        operation[1] = key;
+                        resolve(operation);
+                    } else {
+                        reject("Unknown sign request");
+                    }
+                }
+
+            }).catch(err => reject(err));;
+        });
+    }
+
+    broadcast(transaction) {
+        console.log("broadcast", transaction);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                if (!!transaction.type) {
+                    switch (transaction.type) {
+                        case 'vote': {
+                            smokejs.broadcast.vote(
+                                transaction.wif,
+                                transaction.data.username,
+                                transaction.data.author,
+                                transaction.data.permlink,
+                                transaction.data.weight,
+                                (err, result) => {
+                                    console.log("vote result", err, result);
+                                    resolve(result);
+                                }
+                            );
+                            break;
+                        }
+                        case "customJSON": {
+                            smokejs.broadcast.customJson(
+                                transaction.wif, //transaction.wif,
+                                transaction.data.requiredAuths,
+                                transaction.data.requiredPostingAuths,
+                                transaction.data.id,
+                                transaction.data.json,
+                                (err, result) => {
+                                    console.log("customJson result", err, result);
+                                    resolve(result);
+                                }
+                            );
+                            break;
+                        }
+                        default: {
+                            reject("not broadcast")
+                        }
+                    }
+                } else {
+                    if (typeof transaction == "object"
+                        && transaction.length > 3
+                        && typeof transaction[0] == "string") {
+                        let operationName = transaction.shift();
+                        smokejs.broadcast[operationName](
+                            ...transaction,
+                            (err, result) => {
+                                console.log("injectedCall result", err, result);
+                                if (!!err) {
+                                    reject(err);
+                                }
+                                resolve(result);
+                            }
+                        );
+                    } else {
+                        reject("Unknown broadcast request");
+                    }
+
+                }
+
+            }).catch(err => reject(err));
+        });
+    }
+
+    getOperation(data, account) {
+        let steeem = steem;
+        console.log("getOperation", data, account);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                switch (data.action) {
+                    case 'vote': {
+                        resolve({
+                            type: "vote",
+                            data: {
+                                username: account.name,
+                                author: data.params.author,
+                                permlink: data.params.permlink,
+                                weight: data.params.weight
+                            }
+                        })
+                    }
+                }
+            });
+        });
+    }
+
+    mapOperationData(incoming) {
+        console.log("mapOperationData", incoming);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                if (incoming.action == "vote") {
+                    resolve({
+                        entity: "Post",
+                        description:
+                            "Author: " + incoming.params.author +
+                            "\nPost: " + incoming.params.permlink +
+                            "\nWeight: " + incoming.params.weight,
+                        vote: incoming.params
+                    });
+                }
+            });
+        });
+    }
+
+    signMessage(key, accountName, randomString) {
+        return new Promise((resolve,reject) => {
+            // do as a list, to preserve order
+            let message = JSON.stringify([
+                "from",
+                accountName,
+                this.getPublicKey(key),
+                "time",
+                new Date().toUTCString(),
+                "text",
+                randomString
+            ]);
+            try {
+                let signature = Signature.signBuffer(
+                    message,
+                    KeyPrivate.fromWif(key)
+                );
+                resolve({
+                    payload: message,
+                    signature: signature.toHex()
+                });
+            } catch (err) {
+                reject(err);
+            }
+        });
+    }
+
+    verifyMessage(signedMessage) {
+        return new Promise((resolve, reject) => {
+            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
+                signedMessage.signed = signedMessage.payload;
+                signedMessage.payload = JSON.parse(signedMessage.payload);
+            }
+
+            // validate account and key
+            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
+                found => {
+                    if (found.account == null) {
+                        reject("invalid user");
+                    }
+                    // verify message signed
+                    let verified = false;
+                    try {
+                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
+                            signedMessage.signed,
+                            PublicKey.fromStringOrThrow(signedMessage.payload[2])
+                        );
+                    } catch (err) {
+                        // wrap message that could be raised from Signature
+                        reject("Error verifying signature");
+                    }
+                    if (!verified) {
+                        reject("Invalid signature");
+                    }
+                    return resolve(signedMessage);
+                }
+            ).catch(err => {
+                reject(err);
+            });
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/src/lib/blockchains/WhaleShares.js b/src/lib/blockchains/WhaleShares.js
new file mode 100644
index 00000000..f39d34e3
--- /dev/null
+++ b/src/lib/blockchains/WhaleShares.js
@@ -0,0 +1,285 @@
+import BlockchainAPI from "./BlockchainAPI";
+import wlsjs from "@whaleshares/wlsjs";
+import Signature from "@whaleshares/wlsjs/lib/auth/ecc/src/signature";
+import KeyPrivate from "@whaleshares/wlsjs/lib/auth/ecc/src/key_private";
+import PublicKey from "@whaleshares/wlsjs/lib/auth/ecc/src/key_public";
+
+
+export default class WhaleShares extends BlockchainAPI {
+
+    isConnected() {
+        return this._isConnected;
+    }
+
+    connect(nodeToConnect, onClose = null) {
+        return new Promise((resolve, reject) => {
+            // steem library handles connection internally, just set node
+            //wlsjs.api.setOptions({ url: nodeToConnect });
+            resolve();
+        });
+    }
+
+    getAccount(accountname) {
+        return new Promise((resolve, reject) => {
+            wlsjs.api.getAccounts([accountname], function(err, result) {
+                if (result.length == 0) {
+                    reject("Account " + accountname + " not found!");
+                    return;
+                }
+                result[0].active.public_keys = result[0].active.key_auths;
+                result[0].owner.public_keys = result[0].owner.key_auths;
+                result[0].memo = {public_key: result[0].memo_key};
+                resolve(result[0]);
+            }).then(err => {
+                console.log(err);
+            }).catch(err => {
+                console.log("c", err);
+            });
+        });
+    }
+
+    getPublicKey(privateKey) {
+        return wlsjs.auth.wifToPublic(privateKey);
+    }
+
+    getBalances(accountName) {
+        return new Promise((resolve, reject) => {
+            this.getAccount(accountName).then((account) => {
+                let balances = [];
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "STEEM",
+                    balance: parseFloat(account.balance),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "VESTS",
+                    balance: parseFloat(account.vesting_shares),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "SDB",
+                    balance: parseFloat(account.sbd_balance),
+                    owner: "-",
+                    prefix: ""
+                });
+                balances.push({
+                    asset_type: "UIA",
+                    asset_name: "SP",
+                    balance: parseFloat(account.reward_vesting_steem),
+                    owner: "-",
+                    prefix: ""
+                });
+                resolve(balances);
+            });
+        });
+    }
+
+    _ensureAPI() {
+        // nothing to do for steem yet
+        return new Promise(resolve => {
+            resolve();
+        });
+    }
+
+    sign(operation, key) {
+        console.log("sign", operation, key);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                if (!!operation.type) {
+                    switch (operation.type) {
+                        case 'vote': {
+                            // do actual transaction building
+                            operation.wif = key;
+                            resolve(operation);
+                            break;
+                        }
+                        default:
+                            operation.wif = key;
+                            resolve(operation);
+                    }
+                } else {
+                    if (typeof operation == "object"
+                        && operation.length > 2
+                        && operation[1] == "inject_wif") {
+                        operation[1] = key;
+                        resolve(operation);
+                    } else {
+                        reject("Unknown sign request");
+                    }
+                }
+
+            }).catch(err => reject(err));;
+        });
+    }
+
+    broadcast(transaction) {
+        console.log("broadcast", transaction);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                if (!!transaction.type) {
+                    switch (transaction.type) {
+                        case 'vote': {
+                            wlsjs.broadcast.vote(
+                                transaction.wif,
+                                transaction.data.username,
+                                transaction.data.author,
+                                transaction.data.permlink,
+                                transaction.data.weight,
+                                (err, result) => {
+                                    console.log("vote result", err, result);
+                                    resolve(result);
+                                }
+                            );
+                            break;
+                        }
+                        case "customJSON": {
+                            wlsjs.broadcast.customJson(
+                                transaction.wif, //transaction.wif,
+                                transaction.data.requiredAuths,
+                                transaction.data.requiredPostingAuths,
+                                transaction.data.id,
+                                transaction.data.json,
+                                (err, result) => {
+                                    console.log("customJson result", err, result);
+                                    resolve(result);
+                                }
+                            );
+                            break;
+                        }
+                        default: {
+                            reject("not broadcast")
+                        }
+                    }
+                } else {
+                    if (typeof transaction == "object"
+                        && transaction.length > 3
+                        && typeof transaction[0] == "string") {
+                        let operationName = transaction.shift();
+                        wlsjs.broadcast[operationName](
+                            ...transaction,
+                            (err, result) => {
+                                console.log("injectedCall result", err, result);
+                                if (!!err) {
+                                    reject(err);
+                                }
+                                resolve(result);
+                            }
+                        );
+                    } else {
+                        reject("Unknown broadcast request");
+                    }
+
+                }
+
+            }).catch(err => reject(err));
+        });
+    }
+
+    getOperation(data, account) {
+        let steeem = steem;
+        console.log("getOperation", data, account);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                switch (data.action) {
+                    case 'vote': {
+                        resolve({
+                            type: "vote",
+                            data: {
+                                username: account.name,
+                                author: data.params.author,
+                                permlink: data.params.permlink,
+                                weight: data.params.weight
+                            }
+                        })
+                    }
+                }
+            });
+        });
+    }
+
+    mapOperationData(incoming) {
+        console.log("mapOperationData", incoming);
+        return new Promise((resolve, reject) => {
+            this._ensureAPI().then(() => {
+                if (incoming.action == "vote") {
+                    resolve({
+                        entity: "Post",
+                        description:
+                            "Author: " + incoming.params.author +
+                            "\nPost: " + incoming.params.permlink +
+                            "\nWeight: " + incoming.params.weight,
+                        vote: incoming.params
+                    });
+                }
+            });
+        });
+    }
+
+    signMessage(key, accountName, randomString) {
+        return new Promise((resolve,reject) => {
+            // do as a list, to preserve order
+            let message = JSON.stringify([
+                "from",
+                accountName,
+                this.getPublicKey(key),
+                "time",
+                new Date().toUTCString(),
+                "text",
+                randomString
+            ]);
+            try {
+                let signature = Signature.signBuffer(
+                    message,
+                    KeyPrivate.fromWif(key)
+                );
+                resolve({
+                    payload: message,
+                    signature: signature.toHex()
+                });
+            } catch (err) {
+                reject(err);
+            }
+        });
+    }
+
+    verifyMessage(signedMessage) {
+        return new Promise((resolve, reject) => {
+            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
+                signedMessage.signed = signedMessage.payload;
+                signedMessage.payload = JSON.parse(signedMessage.payload);
+            }
+
+            // validate account and key
+            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
+                found => {
+                    if (found.account == null) {
+                        reject("invalid user");
+                    }
+                    // verify message signed
+                    let verified = false;
+                    try {
+                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
+                            signedMessage.signed,
+                            PublicKey.fromStringOrThrow(signedMessage.payload[2])
+                        );
+                    } catch (err) {
+                        // wrap message that could be raised from Signature
+                        reject("Error verifying signature");
+                    }
+                    if (!verified) {
+                        reject("Invalid signature");
+                    }
+                    return resolve(signedMessage);
+                }
+            ).catch(err => {
+                reject(err);
+            });
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/src/lib/blockchains/blockchainFactory.js b/src/lib/blockchains/blockchainFactory.js
index 230e113b..ca4e8da0 100644
--- a/src/lib/blockchains/blockchainFactory.js
+++ b/src/lib/blockchains/blockchainFactory.js
@@ -5,6 +5,8 @@ let apiCache = {}
 import BitShares from "./BitShares"
 import Steem from "./Steem"
 import store from "../../store";
+import WhaleShares from "./WhaleShares";
+import SmokeNetwork from "./SmokeNetwork";
 
 export default function getBlockchainAPI(chain = null) {
     if (chain == null) {
@@ -16,10 +18,20 @@ export default function getBlockchainAPI(chain = null) {
             apiCache.BTS = new BitShares(blockchains[chain]);
         }
         return apiCache.BTS;
-    } else if (chain == "STEEM") {
+    } else if (chain == "STEEM" || chain == "STM") {
         if (!apiCache.STEEM) {
             apiCache.STEEM = new Steem(blockchains[chain]);
         }
         return apiCache.STEEM;
+    } else if (chain == "WLS") {
+        if (!apiCache.WLS) {
+            apiCache.WLS = new WhaleShares(blockchains[chain]);
+        }
+        return apiCache.WLS;
+    } else if (chain == "SMOKE" || chain == "SMK") {
+        if (!apiCache.SMOKE) {
+            apiCache.SMOKE = new SmokeNetwork(blockchains[chain]);
+        }
+        return apiCache.SMOKE;
     }
 }
\ No newline at end of file

From f297d7d7a0462e14b1235b4df60b5d7f807ea8bb Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 5 Feb 2019 10:04:32 +0100
Subject: [PATCH 35/41] forgot config

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/config/config.js | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/config/config.js b/src/config/config.js
index 31c6a2e8..b02d1cd5 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -361,5 +361,43 @@ export const blockchains = {
                 contact: "https://steem.com"
             }
         ]
+    },
+    WLS: {
+        short: 'WLS',
+        name: 'WhaleShares',
+        chainId: '0',
+        nodeList: [
+            {
+                url: "whaleshares.io/ws",
+                location: "Unknown",
+                region: "Unknown",
+                country: "Unknown",
+                operator: "Beyond Bitcoin",
+                contact: "Discord Channel"
+            }
+        ]
+    },
+    SMOKE: {
+        short: 'SMOKE',
+        name: 'Smoke',
+        chainID: '1ce08345e61cd3bf91673a47fc507e7ed01550dab841fd9cdb0ab66ef576aaf0',
+        nodeList: [
+            {
+                url: 'rpc.smoke.io',
+                location: 'Unknown',
+                region: 'Unkown',
+                country: 'Unkown',
+                operator: 'Smoke Holdings Ltd',
+                contact: 'hello@smoke.network',
+            },
+            {
+                url: 'pubrpc.smoke.io',
+                location: 'Unknown',
+                region: 'Unkown',
+                country: 'Unkown',
+                operator: 'Smoke Holdings Ltd',
+                contact: 'hello@smoke.network',
+            },
+        ]
     }
 };
\ No newline at end of file

From c6c0c0c799f46b85d8c58791f3a104bd2125cfd9 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 5 Feb 2019 11:32:20 +0100
Subject: [PATCH 36/41] add working whaleshares node

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/create.vue          | 3 ++-
 src/config/config.js               | 2 +-
 src/lib/blockchains/WhaleShares.js | 8 ++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/create.vue b/src/components/create.vue
index bb3233b9..1c34a687 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -261,7 +261,7 @@ export default {
       this.$refs.loaderAnimModal.show();
 
       blockchain.getAccount(this.accountname).then((account) => {
-          console.log(account);
+        console.log(account);
         let active_check = false;
         account.active.public_keys.forEach((key) => {
           if (key[0] == apkey) {
@@ -286,6 +286,7 @@ export default {
           this.accountID = "";
         }
       }).catch((err) => {
+          console.log(err);
           this.$refs.loaderAnimModal.hide();
           this.$refs.errorModal.show();
           this.errorMsg = this.$t("unverified_account_error");
diff --git a/src/config/config.js b/src/config/config.js
index b02d1cd5..37c48d1d 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -368,7 +368,7 @@ export const blockchains = {
         chainId: '0',
         nodeList: [
             {
-                url: "whaleshares.io/ws",
+                url: "https://wls.kennybll.com/",
                 location: "Unknown",
                 region: "Unknown",
                 country: "Unknown",
diff --git a/src/lib/blockchains/WhaleShares.js b/src/lib/blockchains/WhaleShares.js
index f39d34e3..a0ee30e0 100644
--- a/src/lib/blockchains/WhaleShares.js
+++ b/src/lib/blockchains/WhaleShares.js
@@ -13,14 +13,14 @@ export default class WhaleShares extends BlockchainAPI {
 
     connect(nodeToConnect, onClose = null) {
         return new Promise((resolve, reject) => {
-            // steem library handles connection internally, just set node
-            //wlsjs.api.setOptions({ url: nodeToConnect });
+            wlsjs.api.setOptions({ url: "https://wls.kennybll.com/" });
             resolve();
         });
     }
 
     getAccount(accountname) {
         return new Promise((resolve, reject) => {
+            wlsjs.api.setOptions({ url: "https://wls.kennybll.com/" });
             wlsjs.api.getAccounts([accountname], function(err, result) {
                 if (result.length == 0) {
                     reject("Account " + accountname + " not found!");
@@ -30,10 +30,6 @@ export default class WhaleShares extends BlockchainAPI {
                 result[0].owner.public_keys = result[0].owner.key_auths;
                 result[0].memo = {public_key: result[0].memo_key};
                 resolve(result[0]);
-            }).then(err => {
-                console.log(err);
-            }).catch(err => {
-                console.log("c", err);
             });
         });
     }

From fa7ff60dbbb5037cbf8131c6412e9ca0ae545ddf Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 5 Feb 2019 13:34:29 +0100
Subject: [PATCH 37/41] fix settimeout; readd import;

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/beetframe.vue | 2 +-
 src/components/create.vue    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/beetframe.vue b/src/components/beetframe.vue
index 7d0fca3b..f8384f9d 100644
--- a/src/components/beetframe.vue
+++ b/src/components/beetframe.vue
@@ -12,7 +12,7 @@
     </div>
 </template>
 <script>
-
+import { EventBus } from '../lib/event-bus.js';
 import {
     ipcRenderer,
 } from 'electron';
diff --git a/src/components/create.vue b/src/components/create.vue
index 1c34a687..f05e3cac 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -316,10 +316,9 @@ export default {
               memo: this.memopk
             }
           }
-        });
-        setTimeout(() => {
+        }).then(() => {
             this.$router.replace("/dashboard");
-        }, 50);
+        });
       }
     }
   }

From 36c8b5d15928df1895d23309922c4cebb043e63f Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 5 Feb 2019 15:29:58 +0100
Subject: [PATCH 38/41] signMessage -> requestSignedMessage

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue           | 55 ++++++++++++++---------------
 src/lib/BeetAPI.js                  |  2 +-
 src/lib/blockchains/BitShares.js    |  3 +-
 src/translations/operations/en.json |  2 +-
 4 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index f9396ad3..1911b2e3 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -282,28 +282,13 @@
                     this.incoming.rejecttx = rej;
                 });
             },
-            signMessage: function (payload) {
-                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
-                return new Promise((resolve, reject) => {
-                    blockchain.signMessage(
-                        this.$store.state.WalletStore.wallet.keys.active,
-                        this.$store.state.WalletStore.wallet.accountName,
-                        payload.params
-                    ).then((signedMessage) => {
-                        blockchain.verifyMessage(signedMessage).then(res => {
-                            resolve(signedMessage);
-                        }).catch(err => {
-                            reject(err);
-                        });
-                    }).catch(err => {
-                        reject(err);
-                    });
-                });
+            requestSignedMessage: function (payload) {
+                return this.requestTx(payload);
             },
             verifyMessage: function (payload) {
                 console.log("verify", payload);
-                let blockchain = getBlockchain(payload.params.payload[2].substring(0,3));
                 return new Promise((resolve, reject) => {
+                    let blockchain = getBlockchain(payload.params.payload[2].substring(0,3));
                     blockchain.verifyMessage(
                         payload.params
                     ).then((result) => {
@@ -325,17 +310,29 @@
                 this.incoming.reject({});
             },
             acceptTx: async function () {
-                this.$refs.loaderAnimModal.show();
-                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
-                let transaction = await blockchain.sign(
-                    this.incoming.params,
-                    this.$store.state.WalletStore.wallet.keys.active
-                );
-                let id = await blockchain.broadcast(
-                    transaction
-                );
-                this.incoming.accepttx({id: id});
+                // doesnt disappear and don't know why atm
+                //this.$refs.loaderAnimModal.show();
                 this.$refs.transactionReqModal.hide();
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
+                console.log(this.incoming);
+                if (this.incoming.method == "signMessage") {
+                    let signedMessage = await blockchain.signMessage(
+                        this.$store.state.WalletStore.wallet.keys.active,
+                        this.$store.state.WalletStore.wallet.accountName,
+                        this.incoming.params
+                    );
+                    this.incoming.accepttx(signedMessage);
+                } else {
+                    let transaction = await blockchain.sign(
+                        this.incoming.params,
+                        this.$store.state.WalletStore.wallet.keys.active
+                    );
+                    let id = await blockchain.broadcast(
+                        transaction
+                    );
+                    this.incoming.accepttx({id: id});
+                }
+                console.log("hiding loader now");
                 this.$refs.loaderAnimModal.hide();
             },
             rejectTx: function () {
@@ -343,6 +340,7 @@
                 this.incoming.rejecttx({});
             },
             acceptGeneric: async function () {
+                this.$refs.loaderAnimModal.show();
                 let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
                 let operation = await blockchain.getOperation(
                     this.incoming,
@@ -351,7 +349,6 @@
                         name: this.$store.state.WalletStore.wallet.accountName
                     }
                 );
-                this.$refs.loaderAnimModal.show();
                 let transaction = await blockchain.sign(
                     operation,
                     this.$store.state.WalletStore.wallet.keys.active
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 92564638..7208da5c 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -150,7 +150,7 @@ export default class BeetAPI {
     static async [Actions.SIGN_MESSAGE](request, vue) {
         try {
             console.log("BeetAPI.signMessage", request);
-            let response = await vue.signMessage(request.payload);
+            let response = await vue.requestSignedMessage(request.payload);
             return {
                 id: request.id,
                 result: response
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 4aeee766..65e9a796 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -319,7 +319,8 @@ export default class BitShares extends BlockchainAPI {
                     PrivateKey.fromWif(key)
                 );
                 resolve({
-                    payload: message,
+                    signed: message,
+                    payload: JSON.parse(message),
                     signature: signature.toHex()
                 });
             } catch (err) {
diff --git a/src/translations/operations/en.json b/src/translations/operations/en.json
index 86ae8098..f9cec089 100644
--- a/src/translations/operations/en.json
+++ b/src/translations/operations/en.json
@@ -10,7 +10,7 @@
         "title": "Transaction Request",
         "request": "The page/app {{- origin}} has submitted the following transaction.",
         "request_cta": "Do you want to execute it?",
-        "accept_btn": "Sign &amp; Broadcast",
+        "accept_btn": "Sign & Broadcast",
         "reject_btn": "Ignore"
     },
     "vote": {

From 338a88a384f1e4546a0c7f8c631590f3a964abf0 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Tue, 5 Feb 2019 15:58:25 +0100
Subject: [PATCH 39/41] implement requestSignedMessage via generic

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/components/popups.vue           | 90 ++++++++++++++++++-----------
 src/translations/operations/en.json |  7 +++
 2 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/src/components/popups.vue b/src/components/popups.vue
index 1911b2e3..2980dc15 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -46,6 +46,7 @@
                 {{ $t('operations:account_id.reject_btn') }}
             </b-btn>
         </b-modal>
+
         <b-modal
             id="transactionRequest"
             ref="transactionReqModal"
@@ -84,6 +85,7 @@
                 {{ $t('operations:rawsig.reject_btn') }}
             </b-btn>
         </b-modal>
+
         <b-modal
             id="genericRequest"
             ref="genericReqModal"
@@ -92,7 +94,7 @@
             no-close-on-backdrop
             hide-header-close
             hide-footer
-            :title="generictitle "
+            :title="generictitle"
         >
             {{ genericmsg }}:
             <br>
@@ -108,7 +110,7 @@
                 block
                 @click="acceptGeneric"
             >
-                {{ genericaccept }}
+                {{ genericaccept || $t('operations:rawsig.accept_btn') }}
             </b-btn>
             <b-btn
                 class="mt-1"
@@ -116,7 +118,7 @@
                 block
                 @click="rejectGeneric"
             >
-                {{ genericreject }}
+                {{ genericreject || $t('operations:rawsig.reject_btn') }}
             </b-btn>
         </b-modal>
         <b-modal
@@ -283,7 +285,27 @@
                 });
             },
             requestSignedMessage: function (payload) {
-                return this.requestTx(payload);
+                this.$store.dispatch("WalletStore/notifyUser", {
+                    notify: "request", message: "request"
+                });
+                this.incoming = payload;
+
+                this.specifics = payload.params;
+
+                this.genericmsg = this.$t(
+                    'operations:message.request',
+                    {
+                        origin: this.incoming.origin
+                    }
+                );
+                this.generictitle = this.$t('operations:message.title');
+                this.genericaccept = this.$t('operations:message.accept_btn');
+                this.genericreject = this.$t('operations:message.reject_btn');
+                this.$refs.genericReqModal.show();
+                return new Promise((res, rej) => {
+                    this.incoming.acceptgen = res;
+                    this.incoming.rejectgen = rej;
+                });
             },
             verifyMessage: function (payload) {
                 console.log("verify", payload);
@@ -310,53 +332,51 @@
                 this.incoming.reject({});
             },
             acceptTx: async function () {
-                // doesnt disappear and don't know why atm
-                //this.$refs.loaderAnimModal.show();
+                this.$refs.loaderAnimModal.show();
                 this.$refs.transactionReqModal.hide();
                 let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
-                console.log(this.incoming);
+                let transaction = await blockchain.sign(
+                    this.incoming.params,
+                    this.$store.state.WalletStore.wallet.keys.active
+                );
+                let id = await blockchain.broadcast(
+                    transaction
+                );
+                this.incoming.accepttx({id: id});
+                this.$refs.loaderAnimModal.hide();
+            },
+            rejectTx: function () {
+                this.$refs.transactionReqModal.hide();
+                this.incoming.rejecttx({});
+            },
+            acceptGeneric: async function () {
+                // doesnt disappear afterwards, huh?
+                //this.$refs.loaderAnimModal.show();
+                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
                 if (this.incoming.method == "signMessage") {
                     let signedMessage = await blockchain.signMessage(
                         this.$store.state.WalletStore.wallet.keys.active,
                         this.$store.state.WalletStore.wallet.accountName,
                         this.incoming.params
                     );
-                    this.incoming.accepttx(signedMessage);
+                    this.incoming.acceptgen(signedMessage);
                 } else {
+                    let operation = await blockchain.getOperation(
+                        this.incoming,
+                        {
+                            id: this.$store.state.WalletStore.wallet.accountID,
+                            name: this.$store.state.WalletStore.wallet.accountName
+                        }
+                    );
                     let transaction = await blockchain.sign(
-                        this.incoming.params,
+                        operation,
                         this.$store.state.WalletStore.wallet.keys.active
                     );
                     let id = await blockchain.broadcast(
                         transaction
                     );
-                    this.incoming.accepttx({id: id});
+                    this.incoming.acceptgen(id);
                 }
-                console.log("hiding loader now");
-                this.$refs.loaderAnimModal.hide();
-            },
-            rejectTx: function () {
-                this.$refs.transactionReqModal.hide();
-                this.incoming.rejecttx({});
-            },
-            acceptGeneric: async function () {
-                this.$refs.loaderAnimModal.show();
-                let blockchain = getBlockchain(this.$store.state.WalletStore.wallet.chain);
-                let operation = await blockchain.getOperation(
-                    this.incoming,
-                    {
-                        id: this.$store.state.WalletStore.wallet.accountID,
-                        name: this.$store.state.WalletStore.wallet.accountName
-                    }
-                );
-                let transaction = await blockchain.sign(
-                    operation,
-                    this.$store.state.WalletStore.wallet.keys.active
-                );
-                let id = await blockchain.broadcast(
-                    transaction
-                );
-                this.incoming.acceptgen(id);
                 this.$refs.genericReqModal.hide();
                 this.$refs.loaderAnimModal.hide();
             },
diff --git a/src/translations/operations/en.json b/src/translations/operations/en.json
index f9cec089..ec232c86 100644
--- a/src/translations/operations/en.json
+++ b/src/translations/operations/en.json
@@ -19,5 +19,12 @@
         "request_cta": "",
         "accept_btn": "Approve",
         "reject_btn": "Ignore"
+    },
+    "message": {
+        "title": "Sign Message Request",
+        "request": "The page/app {{- origin}} wants you to sign the following text",
+        "request_cta": "",
+        "accept_btn": "Approve",
+        "reject_btn": "Ignore"
     }
 }
\ No newline at end of file

From 1a69f4b0cbef6a75f3b3e7ef3bf995d064d35396 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Wed, 6 Feb 2019 10:26:22 +0100
Subject: [PATCH 40/41] add more log output for developping faciliate sign and
 verify message: introduce _signString and _verifyString

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 src/lib/BeetAPI.js                   |  7 +++
 src/lib/blockchains/BitShares.js     | 70 +++++-----------------------
 src/lib/blockchains/BlockchainAPI.js | 62 +++++++++++++++++++++++-
 src/lib/blockchains/SmokeNetwork.js  | 70 +++++-----------------------
 src/lib/blockchains/Steem.js         | 70 +++++-----------------------
 src/lib/blockchains/WhaleShares.js   | 70 +++++-----------------------
 6 files changed, 111 insertions(+), 238 deletions(-)

diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 7208da5c..b1234685 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -75,6 +75,7 @@ export default class BeetAPI {
                 result: response
             };
         } catch (e) {
+            console.error("BeetAPI.getAccount", e);
             return e;
         }
     }
@@ -85,6 +86,7 @@ export default class BeetAPI {
                 identity: response
             });
         } catch (e) {
+            console.error("BeetAPI.link", e);
             return {
                 id: request.id,
                 response: {
@@ -102,6 +104,7 @@ export default class BeetAPI {
                 result: response
             };
         } catch (err) {
+            console.error("BeetAPI.voteFor", err);
             return {
                 id: request.id,
                 result: {
@@ -120,6 +123,7 @@ export default class BeetAPI {
                 result: response
             };
         } catch (err) {
+            console.error("BeetAPI.requestSignature", err);
             return {
                 id: request.id,
                 result: {
@@ -138,6 +142,7 @@ export default class BeetAPI {
                 result: response
             };
         } catch (err) {
+            console.error("BeetAPI.injectedCall", err);
             return {
                 id: request.id,
                 result: {
@@ -156,6 +161,7 @@ export default class BeetAPI {
                 result: response
             };
         } catch (err) {
+            console.error("BeetAPI.signMessage", err);
             return {
                 id: request.id,
                 result: {
@@ -174,6 +180,7 @@ export default class BeetAPI {
                 result: response
             };
         } catch (err) {
+            console.error("BeetAPI.verifyMessage", err);
             return {
                 id: request.id,
                 result: {
diff --git a/src/lib/blockchains/BitShares.js b/src/lib/blockchains/BitShares.js
index 65e9a796..7e8fe509 100644
--- a/src/lib/blockchains/BitShares.js
+++ b/src/lib/blockchains/BitShares.js
@@ -301,67 +301,19 @@ export default class BitShares extends BlockchainAPI {
         });
     }
 
-    signMessage(key, accountName, randomString) {
-        return new Promise((resolve,reject) => {
-            // do as a list, to preserve order
-            let message = JSON.stringify([
-                "from",
-                accountName,
-                this.getPublicKey(key),
-                "time",
-                new Date().toUTCString(),
-                "text",
-                randomString
-            ]);
-            try {
-                let signature = Signature.signBuffer(
-                    message,
-                    PrivateKey.fromWif(key)
-                );
-                resolve({
-                    signed: message,
-                    payload: JSON.parse(message),
-                    signature: signature.toHex()
-                });
-            } catch (err) {
-                reject(err);
-            }
-        });
+    _signString(key, string) {
+        let signature = Signature.signBuffer(
+            string,
+            PrivateKey.fromWif(key)
+        );
+        return signature.toHex();
     }
 
-    verifyMessage(signedMessage) {
-        return new Promise((resolve, reject) => {
-            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
-                signedMessage.signed = signedMessage.payload;
-                signedMessage.payload = JSON.parse(signedMessage.payload);
-            }
-
-            // validate account and key
-            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
-                found => {
-                    if (found.account == null) {
-                        reject("invalid user");
-                    }
-                    // verify message signed
-                    let verified = false;
-                    try {
-                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
-                            signedMessage.signed,
-                            PublicKey.fromPublicKeyString(signedMessage.payload[2])
-                        );
-                    } catch (err) {
-                        // wrap message that could be raised from Signature
-                        reject("Error verifying signature");
-                    }
-                    if (!verified) {
-                        reject("Invalid signature");
-                    }
-                    return resolve(signedMessage);
-                }
-            ).catch(err => {
-                reject(err);
-            });
-        });
+    _verifyString(signature, publicKey, string) {
+        return Signature.fromHex(signature).verifyBuffer(
+            string,
+            PublicKey.fromPublicKeyString(publicKey)
+        );
     }
 
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/BlockchainAPI.js b/src/lib/blockchains/BlockchainAPI.js
index d026464d..87a783c0 100644
--- a/src/lib/blockchains/BlockchainAPI.js
+++ b/src/lib/blockchains/BlockchainAPI.js
@@ -49,11 +49,69 @@ export default class BlockchainAPI {
         throw "Needs implementation";
     }
 
-    signMessage(key, message) {
+    _signString(key, string) {
         throw "Needs implementation";
     }
 
-    verifyMessage(message) {
+    signMessage(key, accountName, randomString) {
+        return new Promise((resolve,reject) => {
+            // do as a list, to preserve order
+            let message = JSON.stringify([
+                "from",
+                accountName,
+                this.getPublicKey(key),
+                "time",
+                new Date().toUTCString(),
+                "text",
+                randomString
+            ]);
+            try {
+
+                resolve({
+                    signed: message,
+                    payload: JSON.parse(message),
+                    signature: this._signString(key, message)
+                });
+            } catch (err) {
+                reject(err);
+            }
+        });
+    }
+
+
+    verifyMessage(signedMessage) {
+        return new Promise((resolve, reject) => {
+            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
+                signedMessage.signed = signedMessage.payload;
+                signedMessage.payload = JSON.parse(signedMessage.payload);
+            }
+
+            // validate account and key
+            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
+                found => {
+                    if (found.account == null) {
+                        reject("invalid user");
+                    }
+                    // verify message signed
+                    let verified = false;
+                    try {
+                        verified = this._verifyString(signedMessage.signature, signedMessage.payload[2], signedMessage.signed);
+                    } catch (err) {
+                        // wrap message that could be raised from Signature
+                        reject("Error verifying signature");
+                    }
+                    if (!verified) {
+                        reject("Invalid signature");
+                    }
+                    return resolve(signedMessage);
+                }
+            ).catch(err => {
+                reject(err);
+            });
+        });
+    }
+
+    _verifyString(signature, publicKey, string) {
         throw "Needs implementation";
     }
 
diff --git a/src/lib/blockchains/SmokeNetwork.js b/src/lib/blockchains/SmokeNetwork.js
index 51b281ee..4bcb8187 100644
--- a/src/lib/blockchains/SmokeNetwork.js
+++ b/src/lib/blockchains/SmokeNetwork.js
@@ -4,7 +4,6 @@ import Signature from "@smokenetwork/smoke-js/lib/auth/ecc/src/signature";
 import KeyPrivate from "@smokenetwork/smoke-js/lib/auth/ecc/src/key_private";
 import PublicKey from "@smokenetwork/smoke-js/lib/auth/ecc/src/key_public";
 
-
 export default class Steem extends BlockchainAPI {
 
     // https://github.com/steemit/steem-js/tree/master/doc#broadcast-api
@@ -218,66 +217,19 @@ export default class Steem extends BlockchainAPI {
         });
     }
 
-    signMessage(key, accountName, randomString) {
-        return new Promise((resolve,reject) => {
-            // do as a list, to preserve order
-            let message = JSON.stringify([
-                "from",
-                accountName,
-                this.getPublicKey(key),
-                "time",
-                new Date().toUTCString(),
-                "text",
-                randomString
-            ]);
-            try {
-                let signature = Signature.signBuffer(
-                    message,
-                    KeyPrivate.fromWif(key)
-                );
-                resolve({
-                    payload: message,
-                    signature: signature.toHex()
-                });
-            } catch (err) {
-                reject(err);
-            }
-        });
+    _signString(key, string) {
+        let signature = Signature.signBuffer(
+            string,
+            KeyPrivate.fromWif(key)
+        );
+        return signature.toHex();
     }
 
-    verifyMessage(signedMessage) {
-        return new Promise((resolve, reject) => {
-            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
-                signedMessage.signed = signedMessage.payload;
-                signedMessage.payload = JSON.parse(signedMessage.payload);
-            }
-
-            // validate account and key
-            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
-                found => {
-                    if (found.account == null) {
-                        reject("invalid user");
-                    }
-                    // verify message signed
-                    let verified = false;
-                    try {
-                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
-                            signedMessage.signed,
-                            PublicKey.fromStringOrThrow(signedMessage.payload[2])
-                        );
-                    } catch (err) {
-                        // wrap message that could be raised from Signature
-                        reject("Error verifying signature");
-                    }
-                    if (!verified) {
-                        reject("Invalid signature");
-                    }
-                    return resolve(signedMessage);
-                }
-            ).catch(err => {
-                reject(err);
-            });
-        });
+    _verifyString(signature, publicKey, string) {
+        return Signature.fromHex(signature).verifyBuffer(
+            string,
+            PublicKey.fromStringOrThrow(publicKey)
+        );
     }
 
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/Steem.js b/src/lib/blockchains/Steem.js
index 13e5a977..08500558 100644
--- a/src/lib/blockchains/Steem.js
+++ b/src/lib/blockchains/Steem.js
@@ -4,7 +4,6 @@ import Signature from "steem/lib/auth/ecc/src/signature";
 import KeyPrivate from "steem/lib/auth/ecc/src/key_private";
 import PublicKey from "steem/lib/auth/ecc/src/key_public";
 
-
 export default class Steem extends BlockchainAPI {
 
     // https://github.com/steemit/steem-js/tree/master/doc#broadcast-api
@@ -218,66 +217,19 @@ export default class Steem extends BlockchainAPI {
         });
     }
 
-    signMessage(key, accountName, randomString) {
-        return new Promise((resolve,reject) => {
-            // do as a list, to preserve order
-            let message = JSON.stringify([
-                "from",
-                accountName,
-                this.getPublicKey(key),
-                "time",
-                new Date().toUTCString(),
-                "text",
-                randomString
-            ]);
-            try {
-                let signature = Signature.signBuffer(
-                    message,
-                    KeyPrivate.fromWif(key)
-                );
-                resolve({
-                    payload: message,
-                    signature: signature.toHex()
-                });
-            } catch (err) {
-                reject(err);
-            }
-        });
+    _signString(key, string) {
+        let signature = Signature.signBuffer(
+            string,
+            KeyPrivate.fromWif(key)
+        );
+        return signature.toHex();
     }
 
-    verifyMessage(signedMessage) {
-        return new Promise((resolve, reject) => {
-            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
-                signedMessage.signed = signedMessage.payload;
-                signedMessage.payload = JSON.parse(signedMessage.payload);
-            }
-
-            // validate account and key
-            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
-                found => {
-                    if (found.account == null) {
-                        reject("invalid user");
-                    }
-                    // verify message signed
-                    let verified = false;
-                    try {
-                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
-                            signedMessage.signed,
-                            PublicKey.fromStringOrThrow(signedMessage.payload[2])
-                        );
-                    } catch (err) {
-                        // wrap message that could be raised from Signature
-                        reject("Error verifying signature");
-                    }
-                    if (!verified) {
-                        reject("Invalid signature");
-                    }
-                    return resolve(signedMessage);
-                }
-            ).catch(err => {
-                reject(err);
-            });
-        });
+    _verifyString(signature, publicKey, string) {
+        return Signature.fromHex(signature).verifyBuffer(
+            string,
+            PublicKey.fromStringOrThrow(publicKey)
+        );
     }
 
 }
\ No newline at end of file
diff --git a/src/lib/blockchains/WhaleShares.js b/src/lib/blockchains/WhaleShares.js
index a0ee30e0..6999c552 100644
--- a/src/lib/blockchains/WhaleShares.js
+++ b/src/lib/blockchains/WhaleShares.js
@@ -4,7 +4,6 @@ import Signature from "@whaleshares/wlsjs/lib/auth/ecc/src/signature";
 import KeyPrivate from "@whaleshares/wlsjs/lib/auth/ecc/src/key_private";
 import PublicKey from "@whaleshares/wlsjs/lib/auth/ecc/src/key_public";
 
-
 export default class WhaleShares extends BlockchainAPI {
 
     isConnected() {
@@ -216,66 +215,19 @@ export default class WhaleShares extends BlockchainAPI {
         });
     }
 
-    signMessage(key, accountName, randomString) {
-        return new Promise((resolve,reject) => {
-            // do as a list, to preserve order
-            let message = JSON.stringify([
-                "from",
-                accountName,
-                this.getPublicKey(key),
-                "time",
-                new Date().toUTCString(),
-                "text",
-                randomString
-            ]);
-            try {
-                let signature = Signature.signBuffer(
-                    message,
-                    KeyPrivate.fromWif(key)
-                );
-                resolve({
-                    payload: message,
-                    signature: signature.toHex()
-                });
-            } catch (err) {
-                reject(err);
-            }
-        });
+    _signString(key, string) {
+        let signature = Signature.signBuffer(
+            string,
+            KeyPrivate.fromWif(key)
+        );
+        return signature.toHex();
     }
 
-    verifyMessage(signedMessage) {
-        return new Promise((resolve, reject) => {
-            if (typeof signedMessage.payload === "string" || signedMessage.payload instanceof String) {
-                signedMessage.signed = signedMessage.payload;
-                signedMessage.payload = JSON.parse(signedMessage.payload);
-            }
-
-            // validate account and key
-            this._verifyAccountAndKey(signedMessage.payload[1], signedMessage.payload[2]).then(
-                found => {
-                    if (found.account == null) {
-                        reject("invalid user");
-                    }
-                    // verify message signed
-                    let verified = false;
-                    try {
-                        verified = Signature.fromHex(signedMessage.signature).verifyBuffer(
-                            signedMessage.signed,
-                            PublicKey.fromStringOrThrow(signedMessage.payload[2])
-                        );
-                    } catch (err) {
-                        // wrap message that could be raised from Signature
-                        reject("Error verifying signature");
-                    }
-                    if (!verified) {
-                        reject("Invalid signature");
-                    }
-                    return resolve(signedMessage);
-                }
-            ).catch(err => {
-                reject(err);
-            });
-        });
+    _verifyString(signature, publicKey, string) {
+        return Signature.fromHex(signature).verifyBuffer(
+            string,
+            PublicKey.fromStringOrThrow(publicKey)
+        );
     }
 
 }
\ No newline at end of file

From f9e9203e2bf111b37bd8db103b98210d57fb4ec6 Mon Sep 17 00:00:00 2001
From: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
Date: Wed, 6 Feb 2019 12:59:06 +0100
Subject: [PATCH 41/41] update version

Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2494ea48..d12f8379 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "beet",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e657b707..faf28d8a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "beet",
   "productName": "beet",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Beet is a stand-alone key-manager and signing app for BitShares.",
   "main": "src/index.js",
   "scripts": {