From ca271832f6f6acead84636adf5fecaf9e983b3b6 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Wed, 6 Nov 2019 19:08:24 +0100
Subject: [PATCH 01/20] Make debug view usable again by replacing auto update
 with button

---
 views/debug_view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/debug_view.html b/views/debug_view.html
index 43b7f4b..f4a26aa 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -44,6 +44,7 @@ <h2>
                 {{ instance_id }}
             </a>
         </h2>
+        <button class="btn btn-primary" v-on:click="updateStateDump()">Update state dump</button>
 
         <ul class="list-group collapse" v-bind:id="sanitizeName(instance_id)">
             <li class="list-group-item">
@@ -262,7 +263,6 @@ <h3>
                 }
 
                 app.reduxActions[instance_id].push(signal.action)
-                app.updateStateDump(instance_id)
             })
 
             refresh()

From 1659a28877751753f0542099a9e4b190791fe2c5 Mon Sep 17 00:00:00 2001
From: David Meister <thedavidmeister@gmail.com>
Date: Thu, 14 Nov 2019 16:01:19 +1100
Subject: [PATCH 02/20] bump holonix version

---
 config.nix  |  4 ++--
 default.nix | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.nix b/config.nix
index e364cf8..0f20fee 100644
--- a/config.nix
+++ b/config.nix
@@ -12,14 +12,14 @@
 
    # can be any github ref
    # branch, tag, commit, etc.
-   ref = "v0.0.39";
+   ref = "v0.0.47";
 
    # the sha of what is downloaded from the above ref
    # note: even if you change the above ref it will not be redownloaded until
    #       the sha here changes (the sha is the cache key for downloads)
    # note: to get a new sha, get nix to try and download a bad sha
    #       it will complain and tell you the right sha
-   sha256 = "1c8jk9cmpayjy7bndymx5c7wshwgd7a2xqda4lvp2y7ds72i8jhz";
+   sha256 = "0fyal8y02abp71y0l3szcbc9d0r89ph5yk3d6maw28as78mw7v23";
 
    # the github owner of the holonix repo
    owner = "holochain";
diff --git a/default.nix b/default.nix
index 89be631..89d678f 100644
--- a/default.nix
+++ b/default.nix
@@ -33,10 +33,10 @@ with holonix.pkgs;
   name = "dev-shell";
 
   shellHook = holonix.pkgs.lib.concatStrings [''
-  ln -sf `command -v holochain` holochain-${target-os}
-  ln -sf `command -v hc` hc-${target-os}
-  npm install
-  export PATH="$PATH:$( npm bin )"
+  ln -sf ${holonix.holochain.holochain}/bin/holochain holochain-${target-os}
+  ln -sf ${holonix.holochain.hc}/bin/hc hc-${target-os}
+  ${holonix.pkgs.nodejs}/bin/npm install
+  export PATH="$PATH:$( ${holonix.pkgs.nodejs}/bin/npm bin )"
   ''
   holonix.shell.shellHook
   ];
@@ -45,10 +45,10 @@ with holonix.pkgs;
 
   buildInputs = [
    holonix.pkgs.unzip
-   newer-pkgs.electron_6
+   holonix.pkgs.electron_6
 
    (holonix.pkgs.writeShellScriptBin "holoscape" ''
-   electron .
+   ${holonix.pkgs.electron_6}/bin/electron .
    '')
 
    (holonix.pkgs.writeShellScriptBin "holoscape-flush" ''

From c661ccf197775c277b5721831d8c27a77528aba1 Mon Sep 17 00:00:00 2001
From: David Meister <thedavidmeister@gmail.com>
Date: Thu, 14 Nov 2019 20:47:48 +1100
Subject: [PATCH 03/20] fixes for flushing in mac

---
 README.md    | 15 ++++++---------
 default.nix  | 13 +++++--------
 package.json |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 8e67ecf..a18b951 100644
--- a/README.md
+++ b/README.md
@@ -37,19 +37,16 @@ Holoscape needs both binaries ouf the [holochain-rust](https://github.com/holoch
 
 Depending on the OS, it expects to find either `hc-linux` and `holochain-linux` or `hc-darwin` and `holochain-darwin` in the application directory (the root of the repository during development).
 
-For development you can either build those yourself or get them through Holonix like this:
+For development you can either build those yourself or get them through nix-shell like this:
 
 ``` shell
-$ nix-shell https://holochain.love
-$ cp `which holochain` holochain-linux
-$ cp `which hc` hc-linux
+$ nix-shell https://github.com/holochain/holoscape/archive/develop.tar.gz --run holoscape
 ```
-(or `holochain-darwin` for macOS - Windows is currently not support but will follow soon)
 
-Don't forget to install all node dependencies:
-``` shell
-npm install
-```
+To flush all holoscape data with the nix shell:
+
+```shell
+$ nix-shell https://github.com/holochain/holoscape/archive/develop.tar.gz --run holoscape-flush
 
 ## Run for development
 ```
diff --git a/default.nix b/default.nix
index 89d678f..dbfbd7e 100644
--- a/default.nix
+++ b/default.nix
@@ -18,13 +18,8 @@ let
  ) { config = config; };
  # END HOLONIX IMPORT BOILERPLATE
 
- # hopefully this won't be needed someday when holonix updates
- newer-pkgs = import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz";
-  sha256 = "0mhqhq21y5vrr1f30qd2bvydv4bbbslvyzclhw0kdxmkgg3z4c92";
- }) { };
-
  target-os = if holonix.pkgs.stdenv.isDarwin then "darwin" else "linux";
+ config-uri = if holonix.pkgs.stdenv.isDarwin then "Library/Application\\ Support" else ".config";
 
 in
 with holonix.pkgs;
@@ -40,6 +35,7 @@ with holonix.pkgs;
   ''
   holonix.shell.shellHook
   ];
+  HOLOSCAPE_CONFIG_URI = config-uri;
 
   DEV="true";
 
@@ -52,8 +48,9 @@ with holonix.pkgs;
    '')
 
    (holonix.pkgs.writeShellScriptBin "holoscape-flush" ''
-   rm -rf $HOME/.config/holoscape
-   rm -rf $HOME/.config/Holoscape-default
+   set -euxo pipefail
+   rm -rf $HOME/${config-uri}/holoscape
+   rm -rf $HOME/${config-uri}/Holoscape-default
    rm -rf ./Holoscape-linux-x64
    rm -rf ./Holoscape-darwin-x64
    rm -rf ./node_modules
diff --git a/package.json b/package.json
index 7494c78..46b4bdb 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "start:dev": "DEV=true electron .",
     "build-mac": "electron-packager . Holoscape --platform=darwin --overwrite --icon=./images/HoloScape-hdpi.icns",
     "build-linux": "electron-packager . Holoscape --platform=linux --overwrite --icon=./images/HoloScape-hdpi.png",
-    "delete:app-support": "rm -rf '/Users/philipbeadle/Library/Application Support/holoscape' && rm -rf '/Users/philipbeadle/Library/Application Support/Holoscape-default'"
+    "delete:app-support": "rm -rf '$HOME/Library/Application Support/holoscape' && rm -rf '$HOME/Library/Application Support/Holoscape-default'"
   },
   "author": "Holochain Core Dev Team <devcore@holochain.org>",
   "license": "GPLv3",

From fdbdf787460961cb48054c91e8ad4c5cba1b5e26 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Sat, 16 Nov 2019 19:30:56 +0100
Subject: [PATCH 04/20] Several improvements of debug that make it actually
 usable

---
 package.json          |  3 +-
 views/debug_view.html | 95 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 7494c78..89f1fb0 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,8 @@
     "request": "^2.88.0",
     "temp": "^0.9.0",
     "toml": "^3.0.0",
-    "vue": "^2.6.10"
+    "vue": "^2.6.10",
+    "vue-chat-scroll": "^1.3.6"
   },
   "build": {
     "appId": "org.holochain.holoscape",
diff --git a/views/debug_view.html b/views/debug_view.html
index f4a26aa..ee876b1 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -22,9 +22,25 @@
         overflow:auto;
         background:#bbb;
       }
+      .action {
+          cursor: pointer;
+      }
       .clickFetch {
           cursor: pointer;
       }
+      .list-group-item label {
+          color: black;
+      }
+      .action.badge-light {
+          color: black;
+      }
+      .zome-call {
+          word-wrap: break-word;
+      }
+      .zome-call .zome-call-container {
+          word-wrap: break-word;
+          overflow: scroll;
+      }
     </style>
   </head>
   <body>
@@ -44,24 +60,28 @@ <h2>
                 {{ instance_id }}
             </a>
         </h2>
-        <button class="btn btn-primary" v-on:click="updateStateDump()">Update state dump</button>
+        <button class="btn btn-primary" v-on:click="updateStateDump(instance_id)">Update state dump</button>
+        <input type="checkbox" v-bind:id="sanitizeName(instance_id)-dump-check" v-model="refreshDump[instance_id]">
+        <label for="sanitizeName(instance_id)-dump-check">Live refresh</label>
+        <input type="checkbox" v-bind:id="sanitizeName(instance_id)-actions-check" v-model="updateActions[instance_id]">
+        <label for="sanitizeName(instance_id)-actions-check">Update actions</label>
+                
 
         <ul class="list-group collapse" v-bind:id="sanitizeName(instance_id)">
             <li class="list-group-item">
                 <h3>Core Actions</h3>
-                <ul class="actions">
+                
+                <ul class="actions" v-chat-scroll>
                     <li class="action" v-for="(action, index) in reduxActions[instance_id]">
                         <div>
                             <a data-toggle="collapse" 
-                                v-bind:href="'#'+sanitizeName(instance_id)+'-action-'+index" 
+                                v-on:click="showAction(action)" 
                                 role="button" aria-expanded="false" 
-                                v-bind:aria-controls="sanitizeName(instance_id)+'-action-'+index"
-                                :class="'bade badge-pill badge-' + actionTypeToBadge(action.action_type)"
+                                :class="'badge badge-pill badge-' + actionTypeToBadge(action.action_type)"
                             >
                                 {{ action.action_type }}
                             </a>
                         </div>
-                        <div v-bind:id="sanitizeName(instance_id)+'-action-'+index" class="collapse">{{ action.data }}</div>
                     </li>
                 </ul>
             </li>
@@ -113,10 +133,30 @@ <h3>
                         Nucleus
                     </a>
                 </h3>
-                <table v-bind:id="sanitizeName(instance_id)+'nucleus'" class="table collapse">
+                <table v-bind:id="sanitizeName(instance_id)+'nucleus'" class="table collapse zome-call-container">
                     <tbody>
-                        <tr><td>Running zome calls:</td><td>{{ dump.running_calls }}</td></tr>
-                        <tr><td>Pending validations:</td><td>{{ dump.pending_validations }}</td></tr>
+                        <tr>
+                            <td>Queued zome calls:</td>
+                            <td><ul>
+                                <li v-for="call in dump.queued_calls" class="zome-call">
+                                {{`${call.zome_name}.${call.fn_name}(${call.parameters})`}}
+                                </li></ul>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Running zome calls:</td>
+                            <td><ul>
+                                <li v-for="call in dump.running_calls" class="zome-call">
+                                {{`${call.zome_name}.${call.fn_name}(${call.parameters})`}}
+                                </li></ul>
+                            </td>
+                        <tr>
+                            <td>Zome call results:</td>
+                            <td><ul>
+                                <li v-for="call in dump.call_results" class="zome-call">
+                                {{`${call[0].zome_name}.${call[0].fn_name}(${call[0].parameters}) => ${JSON.stringify(call[1])}`}}
+                                </li></ul>
+                            </td>
                     </tbody>
                 </table>
             </li>
@@ -142,6 +182,9 @@ <h3>
 
     <script>
         const { ipcRenderer } = require('electron')
+        const VueChatScroll = require('vue-chat-scroll')
+        Vue.use(VueChatScroll)
+        
         let configured = false
 
         ipcRenderer.on('conductor-call-set', () => {
@@ -154,10 +197,23 @@ <h3>
 
             const refresh = () => {
               call('debug/running_instances')().then((instances)=>{
-                  instances.map((instance_id) => app.updateStateDump(instance_id))
+                  instances.map((instance_id) => {
+                      app.updateStateDump(instance_id)
+                      Vue.set(app.updateActions, instance_id, false)
+                      Vue.set(app.refreshDump, instance_id, false)
+                      app.instances.push(instance_id)
+                    })
                 })
             }
 
+            setInterval(() => {
+                for(let instance of app.instances) {
+                    if(app.refreshDump[instance]) {
+                        app.updateStateDump(instance)
+                    }
+                }
+            }, 1500)
+
             const fetch_cas = async (address, instance_id) => {
                 return await call('debug/fetch_cas')({instance_id, address})
             }
@@ -191,10 +247,14 @@ <h3>
             var app = new Vue({
                 el: '#app',
                 data: {
+                  instances: [],  
                   reduxActions: {},  
                   stateDumps: {},
-                  contents:{},
+                  refreshDump: {},
+                  contents: {},
+                  updateActions: {},
                   updateStateDump: (instance_id) => {
+                      console.log(`Update state dump with: ${instance_id}`)
                       call('debug/state_dump')({instance_id})
                         .then((dump) => {
                             console.log("Got state dump: ", dump)
@@ -234,6 +294,9 @@ <h3>
                         .split('$').join('-')
                         .toLowerCase()
                     return name
+                  },
+                  showAction: (action) => {
+                      window.alert(JSON.stringify(action))
                   }
                 }
             })
@@ -253,15 +316,17 @@ <h3>
                     // Ignoring non-trace signals
                     return
                 }
+                if(!app.reduxActions[instance_id]) {
+                    Vue.set(app.reduxActions, instance_id, [])
+                }
+                if(!app.updateActions[instance_id]) {
+                    return
+                }
                 if(!signal.action) {
                     console.log("Got strange trace signal without 'action' property:", params)
                     return
                 }
 
-                if(!app.reduxActions[instance_id]) {
-                    Vue.set(app.reduxActions, instance_id, [])
-                }
-
                 app.reduxActions[instance_id].push(signal.action)
             })
 

From 439991cc818c3cea38025875e55a1f728da53987 Mon Sep 17 00:00:00 2001
From: Eric Harris-Braun <eric@harris-braun.com>
Date: Tue, 19 Nov 2019 18:17:14 +0100
Subject: [PATCH 05/20] update holofuel dna version in examples

---
 example-bundles/holofuel/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example-bundles/holofuel/config.toml b/example-bundles/holofuel/config.toml
index 91a2f69..7ee3939 100644
--- a/example-bundles/holofuel/config.toml
+++ b/example-bundles/holofuel/config.toml
@@ -5,7 +5,7 @@ bridges = []
 name = "holofuel"
 id = "__holofuel"
 dna_hash = "QmcnYu8B54tFnJUv68aB3imPRwLxqJH2DQzjkX9Dvxmsf9"
-uri = "https://holo-host.github.io/holofuel/releases/download/v0.11.1-alpha1/holofuel.dna.json"
+uri = "https://holo-host.github.io/holofuel/releases/download/v0.13.0-alpha1/holofuel.dna.json"
 
 [[UIs]]
 name = "HoloFuel"

From 942563ff93fc449bc683e158c340ba45d69e1670 Mon Sep 17 00:00:00 2001
From: Eric Harris-Braun <eric@harris-braun.com>
Date: Tue, 19 Nov 2019 20:47:52 +0100
Subject: [PATCH 06/20] added hash for holofuel 0.13.0

---
 example-bundles/holofuel/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example-bundles/holofuel/config.toml b/example-bundles/holofuel/config.toml
index 7ee3939..ae4c804 100644
--- a/example-bundles/holofuel/config.toml
+++ b/example-bundles/holofuel/config.toml
@@ -4,7 +4,7 @@ bridges = []
 [[instances]]
 name = "holofuel"
 id = "__holofuel"
-dna_hash = "QmcnYu8B54tFnJUv68aB3imPRwLxqJH2DQzjkX9Dvxmsf9"
+dna_hash = "QmdRUPDZ3xoZDJj2ciCX3Wk6eRPe9z6pnZpiVHK9cu6R6K"
 uri = "https://holo-host.github.io/holofuel/releases/download/v0.13.0-alpha1/holofuel.dna.json"
 
 [[UIs]]

From 29b05eac0123764917cc5977a925abd49f9bea4b Mon Sep 17 00:00:00 2001
From: Willem Olding <willemolding@gmail.com>
Date: Fri, 22 Nov 2019 18:17:06 +1100
Subject: [PATCH 07/20] adds options to set storage backend

---
 views/install_bundle_view.html | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/views/install_bundle_view.html b/views/install_bundle_view.html
index 2605ac3..00ff7bf 100644
--- a/views/install_bundle_view.html
+++ b/views/install_bundle_view.html
@@ -110,10 +110,6 @@ <h3>Please select a bundle file to install</h3>
                     </div>
                 </div>
                 <div v-if="fileError" class="alert alert-danger">{{ fileError }}</div>
-            <h3>Install with admin interface?</h3>
-            <div class="input-group">
-            <input type="checkbox" id="admin-checkbox" v-model="installAsAdmin">
-          </div>
       </li>
       <li v-if="bundle" class="list-group-item">
           <h3>DNAs in this bundle</h3>
@@ -280,6 +276,20 @@ <h4>{{ ui.name }}</h4>
                 </ul>-->
             </li>
       </ul>
+      <div class="list-group-item">
+        <h3>Install with admin interface?</h3>
+        <div class="input-group">
+          <input type="checkbox" id="admin-checkbox" v-model="installAsAdmin">
+        </div>
+        <h3>Select storage implementation:</h3>
+        <div class="input-group">
+           <select id="storage-impl" v-model="storageImpl">
+            <option v-for="storage in storageOpts" v-bind:value="storage">
+                {{storage}}
+            </option>
+          </select> 
+        </div>
+      <div>
       <div class="container" v-if="bundle">
             <div class="row justify-content-center" v-if="success">
                 <div class="col-7">
@@ -339,6 +349,8 @@ <h2 class="alert alert-success">Bundle successfully installed!</h2>
                   tab: 'happ-store',
                   canInstall: false,
                   installAsAdmin: false,
+                  storageOpts: ['lmdb', 'file', 'pickle', 'memory'],
+                  storageImpl: 'lmdb',
                   file: undefined,
                   fileError: undefined,
                   bundle: undefined,
@@ -637,7 +649,10 @@ <h2 class="alert alert-success">Bundle successfully installed!</h2>
 
                 const id = `${instance.name}`
                 console.log('Adding instance', id)
-                await call('admin/instance/add')({id,dna_id,agent_id})
+                const storage = app.storageImpl
+                let instance_add_args = {id,dna_id,agent_id,storage}
+                console.log("Adding instance with ", JSON.stringify(instance_add_args))
+                await call('admin/instance/add')(instance_add_args)
                 console.log('Instance added')
 
                 console.log('Starting instance ', id)

From b17a202b5db0820fe4dad20923e3f957279449af Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Sun, 24 Nov 2019 17:55:48 +0100
Subject: [PATCH 08/20] Color red for action HoldAspect

---
 views/debug_view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/debug_view.html b/views/debug_view.html
index ee876b1..2d3797a 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -276,7 +276,7 @@ <h3>
                           case "ReturnValidationResult": return "secondary"
                           case "Commit": return "success"
                           case "Publish": return "success"
-                          case "Hold": return "danger"
+                          case "HoldAspect": return "danger"
                           case "Query": return "light"
                           case "RespondQuery": return "dark"
                           case "HandleQuery": return "light"

From 37e468f7ff088fe38dd167382f7622222e1f56a2 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Sun, 24 Nov 2019 23:51:33 +0100
Subject: [PATCH 09/20] Show HDK call tracing in debug view

---
 views/debug_view.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/debug_view.html b/views/debug_view.html
index 2d3797a..febafde 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -147,7 +147,9 @@ <h3>
                             <td>Running zome calls:</td>
                             <td><ul>
                                 <li v-for="call in dump.running_calls" class="zome-call">
-                                {{`${call.zome_name}.${call.fn_name}(${call.parameters})`}}
+                                {{`${call[0].zome_name}.${call[0].fn_name}(${call[0].parameters})`}}
+                                <br>
+                                HDK calls: {{call[1]}}
                                 </li></ul>
                             </td>
                         <tr>

From a7657c8f410ef3eed7a03c6dd86c73c602629904 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Sun, 24 Nov 2019 23:51:50 +0100
Subject: [PATCH 10/20] Show DHT holding map and validation queue in debug view

---
 views/debug_view.html | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/views/debug_view.html b/views/debug_view.html
index febafde..e61dd00 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -113,18 +113,27 @@ <h3>
                     </a>
                 </h3>
                 <div class="collapse" v-bind:id="sanitizeName(instance_id)+'-dht'">
+                        <span>Validation queue:</span>
+                        <table class="table">
+                            <tbody>
+                                <tr v-for="validation in dump.queued_holding_workflows">
+                                    <td>{{validation[0].workflow}}</td>
+                                    <td>{{validation[1]}}</td>
+                                    <td>{{validation[0].entry_with_header}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
                         <span>Held entries:</span>
-                        <ul>
-                            <li v-for="address in dump.held_entries">
-                                    <table class="table">
-                                        <tbody>
-                                            <tr><td>Type:</td><td>{{ contents[address] ? contents[address].type : 'fetching...' }}</td></tr>
-                                            <tr><td>Address:</td><td>{{ address }}</td></tr>
-                                        </tbody>
-                                    </table>
-                                    <div class="alert alert-dark" :class="{clickFetch: contents[address]==undefined}" v-on:click="updateContent(address, instance_id)" role="alert">{{ contents[address] ? contents[address].content : 'click to fetch' }}</div>
-                            </li>
-                        </ul>
+                        <table class="table">
+                            <tbody>
+                                <tr v-for="(address, aspects) in dump.held_aspects">
+                                    <td>{{ address }}</td>
+                                    <td>{{ contents[address] ? contents[address].type : 'get type' }}</td>
+                                    <td><div class="alert alert-dark" :class="{clickFetch: contents[address]==undefined}" v-on:click="updateContent(address, instance_id)" role="alert">{{ contents[address] ? contents[address].content : 'get content' }}</div></td>
+                                    <td>{{aspects}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
                 </div>
             </li>
             <li class="list-group-item">

From 38d4db0044d9dd450982625d46b5ca29e0522527 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Mon, 25 Nov 2019 00:44:18 +0100
Subject: [PATCH 11/20] Show entry address in source chain

---
 views/debug_view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/debug_view.html b/views/debug_view.html
index e61dd00..45bdbc7 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -98,7 +98,7 @@ <h5 class="card-title">{{header.entry_type}} - {{header.entry_address}}</h5>
                             <tbody>
                                 <tr><td>Timestamp:</td><td>{{ header.timestamp }}</td></tr>
                                 <tr><td>Sources:</td><td>{{ header.provenances.map((p)=>p[0]).join(", ") }}</td></tr>
-                                <tr><td>Header address:</td><td>{{ header.address }}</td></tr>
+                                <tr><td>Entry address:</td><td>{{ header.entry_address }}</td></tr>
                                 <tr><td>Prev. header:</td><td>{{ header.link }}</td></tr>
                             </tbody>
                         </table>

From 5d02d9421b54215fd66e2e51e58a385794b98dff Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Mon, 25 Nov 2019 00:45:02 +0100
Subject: [PATCH 12/20] Properly render DHT holding map

---
 views/debug_view.html | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/views/debug_view.html b/views/debug_view.html
index 45bdbc7..ae86eb0 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -31,7 +31,7 @@
       .list-group-item label {
           color: black;
       }
-      .action.badge-light {
+      .badge-light, .black {
           color: black;
       }
       .zome-call {
@@ -113,7 +113,7 @@ <h3>
                     </a>
                 </h3>
                 <div class="collapse" v-bind:id="sanitizeName(instance_id)+'-dht'">
-                        <span>Validation queue:</span>
+                        <h4>Validation queue:</h4>
                         <table class="table">
                             <tbody>
                                 <tr v-for="validation in dump.queued_holding_workflows">
@@ -123,17 +123,20 @@ <h3>
                                 </tr>
                             </tbody>
                         </table>
-                        <span>Held entries:</span>
-                        <table class="table">
-                            <tbody>
-                                <tr v-for="(address, aspects) in dump.held_aspects">
-                                    <td>{{ address }}</td>
-                                    <td>{{ contents[address] ? contents[address].type : 'get type' }}</td>
-                                    <td><div class="alert alert-dark" :class="{clickFetch: contents[address]==undefined}" v-on:click="updateContent(address, instance_id)" role="alert">{{ contents[address] ? contents[address].content : 'get content' }}</div></td>
-                                    <td>{{aspects}}</td>
-                                </tr>
-                            </tbody>
-                        </table>
+                        <h4>Held entries:</h4>
+                        <ul class="black">
+                            <li v-for="(aspects, address) in dump.held_aspects">
+                                <ul>
+                                    <li>{{ address }}</li>
+                                    <li><div class="alert alert-dark" :class="{clickFetch: contents[address]==undefined}" v-on:click="updateContent(address, instance_id)" role="alert">{{ contents[address] ? contents[address].type : 'get type' }}</div></li>
+                                    <li><div class="alert alert-dark" :class="{clickFetch: contents[address]==undefined}" v-on:click="updateContent(address, instance_id)" role="alert">{{ contents[address] ? contents[address].content : 'get content' }}</div></li>
+                                </ul>
+                                <td></td>
+                                
+                                
+                                <td>{{aspects}}</td>
+                            </li>
+                        </ul>
                 </div>
             </li>
             <li class="list-group-item">

From 4e70f36746143637eb3cf3b6f3fd993c6b04f867 Mon Sep 17 00:00:00 2001
From: Loren Johnson <loren@hellovenado.com>
Date: Wed, 27 Nov 2019 01:05:44 -0800
Subject: [PATCH 13/20] Initial pass at no binaries messages

---
 conductor.js      |   7 +-
 views/splash.html | 194 +++++++++++++++++++++++++++-------------------
 2 files changed, 120 insertions(+), 81 deletions(-)

diff --git a/conductor.js b/conductor.js
index 1695072..4cbbb12 100644
--- a/conductor.js
+++ b/conductor.js
@@ -66,9 +66,12 @@ module.exports = {
         run = spawn(path.join(__dirname, "./holochain-linux"), ["-c", configPath], {env:{...process.env, RUST_BACKTRACE: 'full'}})
       }
       else {
-          log('error', "unsupported platform: "+process.platform)
-          return
+        log('error', "unsupported platform: "+process.platform)
+        return
       }
+      run.on('error', function (error) {
+        global.holoscape.splash.webContents.send('missing-binaries')
+      })
       run.stdout.on('data', data => {
         log('info', data.toString())
         if (data.toString().indexOf("Listening on http://127.0.0.1:3000") > -1) {
diff --git a/views/splash.html b/views/splash.html
index 05d2234..a509bab 100644
--- a/views/splash.html
+++ b/views/splash.html
@@ -36,7 +36,6 @@
        text-shadow: 0px 0px 3px #00017f;
      }
 
-
      .status {
        position: absolute;
        left: 30px;
@@ -89,6 +88,12 @@
        transform: scale(1.5);
        margin: 20px;
      }
+     .code {
+         background-color: lightgray;
+         font-family: 'Courier New', Courier, monospace;
+         padding: 3px;
+         color: #444;
+     }
      .clearfix {
        overflow: auto;
      }
@@ -106,93 +111,118 @@ <h1 class="header">Holoscape</h1>
       <h3 class="version">v0.0.3-alpha</h3>
       <img class="logo" src="../images/HoloScape-mdpi.png"></img>
       <div class="status">{{status}}</div>
-      <div class="modal fade" id="passphrase-modal" tabindex="-1" role="dialog" aria-labelledby="passphrase-modal" aria-hidden="true">
-        <div class="modal-dialog" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title" id="exampleModalLabel">Unlock keystore...</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div class="modal-body">
-              <div class="form-group">
-                <label for="passphrase">Please enter your passphrase to unlock keystores</label>
-                <input type="password" class="form-control" id="passphrase" aria-describedby="passphrase-help" placeholder="Passphrase">
-                <small id="passphrase-help" class="form-text text-muted"></small>
-              </div>
-            </div>
-            <div class="modal-footer">
-              <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
-              <button id="unlock-button" type="button" class="btn btn-primary">Unlock keystores</button>
+    </div>
+    <div class="modal fade" id="binaries-modal" tabindex="-1" role="dialog" aria-labelledby="binaries-modal" aria-hidden="true">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="exampleModalLabel">Holoscape Error - Missing Binaries</h5>
+          </div>
+          <div class="modal-body">
+            <div class="form-group">
+              <p>Holoscape needs both binaries out of the [holochain-rust](https://github.com/holochain/holochain-rust) repository: <span class='code'>hc</span> and <span class='code'>holochain</span>.</p>
+              <p>Depending on the OS, it expects to find either <span class='code'>hc-linux</span> and <span class='code'>holochain-linux</span> or <span class='code'>hc-darwin</span> and <span>holochain-darwin</span> in the application directory (the root of the repository during development).</p>
+              <p>For development you can either build those yourself or get them through Holonix like this:</p>              
+<pre>  $ nix-shell https://holochain.love
+  $ cp `which holochain` holochain-linux
+  $ cp `which hc` hc-linux</pre>
+              <p>(or <span class='code'>holochain-darwin</span> for macOS - Windows is currently not support but will follow soon)</p>
+              <p>See <a href='https://github.com/holochain/holoscape/blob/master/README.md'>README</a></p>
             </div>
           </div>
+          <div class="modal-footer">
+            <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
+          </div>
         </div>
       </div>
-      <div class="modal fade" id="network-config-modal" tabindex="-1" role="dialog" aria-labelledby="network-config-modal" aria-hidden="true">
-        <div class="modal-dialog" role="document" id="network-config-wrapper">
-          <div class="modal-content" id="network-config-content">
-            <div class="modal-header">
-              <h5 class="modal-title" id="exampleModalLabel">Holochain Network Configuration...</h5>
+    </div>
+    <div class="modal fade" id="passphrase-modal" tabindex="-1" role="dialog" aria-labelledby="passphrase-modal" aria-hidden="true">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="exampleModalLabel">Unlock keystore...</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">
+            <div class="form-group">
+              <label for="passphrase">Please enter your passphrase to unlock keystores</label>
+              <input type="password" class="form-control" id="passphrase" aria-describedby="passphrase-help" placeholder="Passphrase">
+              <small id="passphrase-help" class="form-text text-muted"></small>
             </div>
-            <div class="modal-body">
-              <div class="form-group">
-                <div class="dropdown">
-                  <button class="btn btn-secondary dropdown-toggle" type="button" id="networkType" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    Network Type
-                  </button>
-                  <div class="dropdown-menu" aria-labelledby="networkType">
-                    <a class="dropdown-item" href="#" id="sim1h-type">sim1h</a>
-                    <a class="dropdown-item" href="#" id="sim2h-type">sim2h</a>
-                    <a class="dropdown-item" href="#" id="lib3h-type">lib3h</a>
-                    <a class="dropdown-item" href="#" id="memory-type">memory</a>
-                  </div>
+          </div>
+          <div class="modal-footer">
+            <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
+            <button id="unlock-button" type="button" class="btn btn-primary">Unlock keystores</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="modal fade" id="network-config-modal" tabindex="-1" role="dialog" aria-labelledby="network-config-modal" aria-hidden="true">
+      <div class="modal-dialog" role="document" id="network-config-wrapper">
+        <div class="modal-content" id="network-config-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="exampleModalLabel">Holochain Network Configuration...</h5>
+          </div>
+          <div class="modal-body">
+            <div class="form-group">
+              <div class="dropdown">
+                <button class="btn btn-secondary dropdown-toggle" type="button" id="networkType" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  Network Type
+                </button>
+                <div class="dropdown-menu" aria-labelledby="networkType">
+                  <a class="dropdown-item" href="#" id="sim1h-type">sim1h</a>
+                  <a class="dropdown-item" href="#" id="sim2h-type">sim2h</a>
+                  <a class="dropdown-item" href="#" id="lib3h-type">lib3h</a>
+                  <a class="dropdown-item" href="#" id="memory-type">memory</a>
                 </div>
               </div>
-              <div class="form-group" id="network-config-sim1h" v-if="network_type==='sim1h'">
-                <label for="dynamo-url">Dynamodb URL</label>
-                <input type="input" class="form-control" id="dynamo-url" aria-describedby="dynamo-url-help" placeholder="http://localhost:8000">
-                <small id="dynamo-url-help" class="form-text text-muted"></small>
-              </div>
-              <div class="form-group" id="network-config-sim2h" v-if="network_type==='sim2h'">
-                <label for="sim2h-url">Sim2h Switch-Board URL</label>
-                <input type="input" class="form-control" id="sim2h-url" aria-describedby="sim2h-url-help" placeholder="wss://sim2h.holochain.org:9000" value="wss://sim2h.holochain.org:9000" v-model="sim2h_url">
-                <small id="sim2h-url-help" class="form-text text-muted clearfix" v-if="sim2h_url=='wss://sim2h.holochain.org:9000'">
-                  The default URL wss://sim2h.holochain.org points to a public pre-alpha test instance of the sim2h switch-board.
-                  <p class="disclaimer">
-                    DISCLAIMER:
-                    <ul>
-                      <li>This public instance comes with no guarantee of up-time!</li>
-                      <li>This is for testing only!</li>
-                      <li>Network traffic might be logged and stored for the purpose fo debugging Holochain during this alpha test phase!</li>
-                    </ul>
-                  </p>
-                  <p>You can read more about sim2h <a href="#" v-on:click="openExternal('https://blog.holochain.org/p/30079b6f-7733-40a6-9135-ac5b9d861b96')">here.</a></p>
-                  
-                  <span class="disclaimer-label">Please confirm:</span>
-                  <label for="checkbox">I have understood that this is an early alpha test release and that all entry data might be logged for debugging purposes.</label>
-                  <br>
-                  <input class="disclaimer-checkbox" type="checkbox" id="checkbox" v-model="disclaimer">
-                </small>
-              </div>
-              <div class="form-group" id="network-config-lib3h" v-if="network_type==='lib3h'">
-                <label for="lib3h-network-name">Network Name</label>
-                <input type="input" class="form-control" id="lib3h-network-name" aria-describedby="lib3h-network-name-help" placeholder="holochain-testnet">
-                <small id="lib3h-network-name-help" class="form-text text-muted"></small>
-                <label for="lib3h-bootstrap-url">Bootstrap Url</label>
-                <input type="input" class="form-control" id="lib3h-bootstrap-url" aria-describedby="lib3h-bootstrap-url-help" placeholder="wss://">
-                <small id="lib3h-bootstrap-url-help" class="form-text text-muted">optional url of a boostrap node</small>
-              </div>
-              <div class="form-group" id="network-config-memory" v-if="network_type==='memory'">
-              </div>
-              <div class="modal-footer">
-              <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
-              <button id="set-network-type-button" type="button" class="btn btn-primary" :disabled="!disclaimer && network_type=='sim2h' && sim2h_url=='wss://sim2h.holochain.org:9000'">Set Network Type</button>
             </div>
+            <div class="form-group" id="network-config-sim1h" v-if="network_type==='sim1h'">
+              <label for="dynamo-url">Dynamodb URL</label>
+              <input type="input" class="form-control" id="dynamo-url" aria-describedby="dynamo-url-help" placeholder="http://localhost:8000">
+              <small id="dynamo-url-help" class="form-text text-muted"></small>
+            </div>
+            <div class="form-group" id="network-config-sim2h" v-if="network_type==='sim2h'">
+              <label for="sim2h-url">Sim2h Switch-Board URL</label>
+              <input type="input" class="form-control" id="sim2h-url" aria-describedby="sim2h-url-help" placeholder="wss://sim2h.holochain.org:9000" value="wss://sim2h.holochain.org:9000" v-model="sim2h_url">
+              <small id="sim2h-url-help" class="form-text text-muted clearfix" v-if="sim2h_url=='wss://sim2h.holochain.org:9000'">
+                The default URL wss://sim2h.holochain.org points to a public pre-alpha test instance of the sim2h switch-board.
+                <p class="disclaimer">
+                  DISCLAIMER:
+                  <ul>
+                    <li>This public instance comes with no guarantee of up-time!</li>
+                    <li>This is for testing only!</li>
+                    <li>Network traffic might be logged and stored for the purpose fo debugging Holochain during this alpha test phase!</li>
+                  </ul>
+                </p>
+                <p>You can read more about sim2h <a href="#" v-on:click="openExternal('https://blog.holochain.org/p/30079b6f-7733-40a6-9135-ac5b9d861b96')">here.</a></p>
+                
+                <span class="disclaimer-label">Please confirm:</span>
+                <label for="checkbox">I have understood that this is an early alpha test release and that all entry data might be logged for debugging purposes.</label>
+                <br>
+                <input class="disclaimer-checkbox" type="checkbox" id="checkbox" v-model="disclaimer">
+              </small>
+            </div>
+            <div class="form-group" id="network-config-lib3h" v-if="network_type==='lib3h'">
+              <label for="lib3h-network-name">Network Name</label>
+              <input type="input" class="form-control" id="lib3h-network-name" aria-describedby="lib3h-network-name-help" placeholder="holochain-testnet">
+              <small id="lib3h-network-name-help" class="form-text text-muted"></small>
+              <label for="lib3h-bootstrap-url">Bootstrap Url</label>
+              <input type="input" class="form-control" id="lib3h-bootstrap-url" aria-describedby="lib3h-bootstrap-url-help" placeholder="wss://">
+              <small id="lib3h-bootstrap-url-help" class="form-text text-muted">optional url of a boostrap node</small>
+            </div>
+            <div class="form-group" id="network-config-memory" v-if="network_type==='memory'">
+            </div>
+            <div class="modal-footer">
+            <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
+            <button id="set-network-type-button" type="button" class="btn btn-primary" :disabled="!disclaimer && network_type=='sim2h' && sim2h_url=='wss://sim2h.holochain.org:9000'">Set Network Type</button>
           </div>
         </div>
-      </div>    
-    </div>
+      </div>
+    </div>    
+  </div>
 
       <script>
        const { ipcRenderer, shell } = require('electron')
@@ -215,7 +245,6 @@ <h5 class="modal-title" id="exampleModalLabel">Holochain Network Configuration..
            }
        })
 
-
        ipcRenderer.on('log', (event,store) => {
            let {level, message} = store
            message = convert.toHtml(message)
@@ -231,6 +260,13 @@ <h5 class="modal-title" id="exampleModalLabel">Holochain Network Configuration..
            ipcRenderer.send('quit')
        }
 
+       //-------------------------------------------------------------------
+       // Binaries check
+       ipcRenderer.on('missing-binaries', (event, message) => {
+          $('#splash-window').hide()
+          $('#binaries-modal').modal()
+       })
+
        //-------------------------------------------------------------------
        // Network config management
        ipcRenderer.on('request-network-config', (event, message) => {

From 9e46fca84b5cd2d2fda2448ce88fb6a2cc262a97 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Thu, 28 Nov 2019 15:03:13 +0100
Subject: [PATCH 14/20] Check missing binaries explicitly at start-up and don't
 do anything else if they are missing

---
 conductor.js | 20 +++++++++++++++++---
 main.js      |  5 +++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/conductor.js b/conductor.js
index 4cbbb12..a8e50d6 100644
--- a/conductor.js
+++ b/conductor.js
@@ -69,9 +69,6 @@ module.exports = {
         log('error', "unsupported platform: "+process.platform)
         return
       }
-      run.on('error', function (error) {
-        global.holoscape.splash.webContents.send('missing-binaries')
-      })
       run.stdout.on('data', data => {
         log('info', data.toString())
         if (data.toString().indexOf("Listening on http://127.0.0.1:3000") > -1) {
@@ -88,5 +85,22 @@ module.exports = {
         onExit()
       })
       return run
+  },
+
+  hasBinaries: () => {
+    let holochain, hc
+
+    if (process.platform === "win32") {
+      holochain = "./holochain.exe"
+      hc = "./hc.exe"
+    } else if (process.platform === "darwin") {
+      holochain = "./holochain-darwin"
+      hc = "./hc-darwin"
+    } else if (process.platform === "linux") {
+      holochain = "./holochain-linux"
+      hc = "./hc-linux"
+    }
+
+    return fs.existsSync(path.join(__dirname, holochain)) && fs.existsSync(path.join(__dirname, hc))
   }
 }
diff --git a/main.js b/main.js
index 637868a..60a2a21 100644
--- a/main.js
+++ b/main.js
@@ -51,6 +51,11 @@ mb.on('ready', async () => {
   global.holoscape = new Holoscape()
   await global.holoscape.showSplashScreen()
 
+  if(!conductor.hasBinaries()) {
+    global.holoscape.splash.webContents.send('missing-binaries')
+    return
+  }
+
   if(!conductor.hasConfig()) {
       console.log("No conductor config found. Initializing...")
       await new Promise((resolve)=>setTimeout(resolve, 1000))

From 00ff6bdce508f20c162b412e171e8aac182bffb5 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Thu, 28 Nov 2019 15:04:20 +0100
Subject: [PATCH 15/20] Fix splash by putting everything back into app-div and
 fix links with openExternal()

---
 views/splash.html | 197 +++++++++++++++++++++++-----------------------
 1 file changed, 99 insertions(+), 98 deletions(-)

diff --git a/views/splash.html b/views/splash.html
index a509bab..3a841e9 100644
--- a/views/splash.html
+++ b/views/splash.html
@@ -111,117 +111,118 @@ <h1 class="header">Holoscape</h1>
       <h3 class="version">v0.0.3-alpha</h3>
       <img class="logo" src="../images/HoloScape-mdpi.png"></img>
       <div class="status">{{status}}</div>
-    </div>
-    <div class="modal fade" id="binaries-modal" tabindex="-1" role="dialog" aria-labelledby="binaries-modal" aria-hidden="true">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h5 class="modal-title" id="exampleModalLabel">Holoscape Error - Missing Binaries</h5>
-          </div>
-          <div class="modal-body">
-            <div class="form-group">
-              <p>Holoscape needs both binaries out of the [holochain-rust](https://github.com/holochain/holochain-rust) repository: <span class='code'>hc</span> and <span class='code'>holochain</span>.</p>
-              <p>Depending on the OS, it expects to find either <span class='code'>hc-linux</span> and <span class='code'>holochain-linux</span> or <span class='code'>hc-darwin</span> and <span>holochain-darwin</span> in the application directory (the root of the repository during development).</p>
-              <p>For development you can either build those yourself or get them through Holonix like this:</p>              
-<pre>  $ nix-shell https://holochain.love
-  $ cp `which holochain` holochain-linux
-  $ cp `which hc` hc-linux</pre>
-              <p>(or <span class='code'>holochain-darwin</span> for macOS - Windows is currently not support but will follow soon)</p>
-              <p>See <a href='https://github.com/holochain/holoscape/blob/master/README.md'>README</a></p>
+    
+      <div class="modal fade" id="binaries-modal" tabindex="-1" role="dialog" aria-labelledby="binaries-modal" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title" id="exampleModalLabel">Holoscape Error - Missing Binaries</h5>
+            </div>
+            <div class="modal-body">
+              <div class="form-group">
+                <p>Holoscape needs both binaries out of the <a href="#" v-on:click="openExternal('https://github.com/holochain/holochain-rust')">holochain-rust</a> repository: <span class='code'>hc</span> and <span class='code'>holochain</span>.</p>
+                <p>Depending on the OS, it expects to find either <span class='code'>hc-linux</span> and <span class='code'>holochain-linux</span> or <span class='code'>hc-darwin</span> and <span class='code'>holochain-darwin</span> in the application directory (the root of the repository during development).</p>
+                <p>For development you can either build those yourself or get them through Holonix like this:</p>              
+  <pre>  $ nix-shell https://holochain.love
+    $ cp `which holochain` holochain-linux
+    $ cp `which hc` hc-linux</pre>
+                <p>(or <span class='code'>holochain-darwin</span> for macOS - Windows is currently not support but will follow soon)</p>
+                <p>See <a href="#" v-on:click="openExternal('https://github.com/holochain/holoscape/blob/master/README.md')">README</a></p>
+              </div>
+            </div>
+            <div class="modal-footer">
+              <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
             </div>
-          </div>
-          <div class="modal-footer">
-            <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
           </div>
         </div>
       </div>
-    </div>
-    <div class="modal fade" id="passphrase-modal" tabindex="-1" role="dialog" aria-labelledby="passphrase-modal" aria-hidden="true">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h5 class="modal-title" id="exampleModalLabel">Unlock keystore...</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
-          </div>
-          <div class="modal-body">
-            <div class="form-group">
-              <label for="passphrase">Please enter your passphrase to unlock keystores</label>
-              <input type="password" class="form-control" id="passphrase" aria-describedby="passphrase-help" placeholder="Passphrase">
-              <small id="passphrase-help" class="form-text text-muted"></small>
+      <div class="modal fade" id="passphrase-modal" tabindex="-1" role="dialog" aria-labelledby="passphrase-modal" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title" id="exampleModalLabel">Unlock keystore...</h5>
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+            </div>
+            <div class="modal-body">
+              <div class="form-group">
+                <label for="passphrase">Please enter your passphrase to unlock keystores</label>
+                <input type="password" class="form-control" id="passphrase" aria-describedby="passphrase-help" placeholder="Passphrase">
+                <small id="passphrase-help" class="form-text text-muted"></small>
+              </div>
+            </div>
+            <div class="modal-footer">
+              <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
+              <button id="unlock-button" type="button" class="btn btn-primary">Unlock keystores</button>
             </div>
-          </div>
-          <div class="modal-footer">
-            <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
-            <button id="unlock-button" type="button" class="btn btn-primary">Unlock keystores</button>
           </div>
         </div>
       </div>
-    </div>
-    <div class="modal fade" id="network-config-modal" tabindex="-1" role="dialog" aria-labelledby="network-config-modal" aria-hidden="true">
-      <div class="modal-dialog" role="document" id="network-config-wrapper">
-        <div class="modal-content" id="network-config-content">
-          <div class="modal-header">
-            <h5 class="modal-title" id="exampleModalLabel">Holochain Network Configuration...</h5>
-          </div>
-          <div class="modal-body">
-            <div class="form-group">
-              <div class="dropdown">
-                <button class="btn btn-secondary dropdown-toggle" type="button" id="networkType" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  Network Type
-                </button>
-                <div class="dropdown-menu" aria-labelledby="networkType">
-                  <a class="dropdown-item" href="#" id="sim1h-type">sim1h</a>
-                  <a class="dropdown-item" href="#" id="sim2h-type">sim2h</a>
-                  <a class="dropdown-item" href="#" id="lib3h-type">lib3h</a>
-                  <a class="dropdown-item" href="#" id="memory-type">memory</a>
+      <div class="modal fade" id="network-config-modal" tabindex="-1" role="dialog" aria-labelledby="network-config-modal" aria-hidden="true">
+        <div class="modal-dialog" role="document" id="network-config-wrapper">
+          <div class="modal-content" id="network-config-content">
+            <div class="modal-header">
+              <h5 class="modal-title" id="exampleModalLabel">Holochain Network Configuration...</h5>
+            </div>
+            <div class="modal-body">
+              <div class="form-group">
+                <div class="dropdown">
+                  <button class="btn btn-secondary dropdown-toggle" type="button" id="networkType" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    Network Type
+                  </button>
+                  <div class="dropdown-menu" aria-labelledby="networkType">
+                    <a class="dropdown-item" href="#" id="sim1h-type">sim1h</a>
+                    <a class="dropdown-item" href="#" id="sim2h-type">sim2h</a>
+                    <a class="dropdown-item" href="#" id="lib3h-type">lib3h</a>
+                    <a class="dropdown-item" href="#" id="memory-type">memory</a>
+                  </div>
                 </div>
               </div>
+              <div class="form-group" id="network-config-sim1h" v-if="network_type==='sim1h'">
+                <label for="dynamo-url">Dynamodb URL</label>
+                <input type="input" class="form-control" id="dynamo-url" aria-describedby="dynamo-url-help" placeholder="http://localhost:8000">
+                <small id="dynamo-url-help" class="form-text text-muted"></small>
+              </div>
+              <div class="form-group" id="network-config-sim2h" v-if="network_type==='sim2h'">
+                <label for="sim2h-url">Sim2h Switch-Board URL</label>
+                <input type="input" class="form-control" id="sim2h-url" aria-describedby="sim2h-url-help" placeholder="wss://sim2h.holochain.org:9000" value="wss://sim2h.holochain.org:9000" v-model="sim2h_url">
+                <small id="sim2h-url-help" class="form-text text-muted clearfix" v-if="sim2h_url=='wss://sim2h.holochain.org:9000'">
+                  The default URL wss://sim2h.holochain.org points to a public pre-alpha test instance of the sim2h switch-board.
+                  <p class="disclaimer">
+                    DISCLAIMER:
+                    <ul>
+                      <li>This public instance comes with no guarantee of up-time!</li>
+                      <li>This is for testing only!</li>
+                      <li>Network traffic might be logged and stored for the purpose fo debugging Holochain during this alpha test phase!</li>
+                    </ul>
+                  </p>
+                  <p>You can read more about sim2h <a href="#" v-on:click="openExternal('https://blog.holochain.org/p/30079b6f-7733-40a6-9135-ac5b9d861b96')">here.</a></p>
+                  
+                  <span class="disclaimer-label">Please confirm:</span>
+                  <label for="checkbox">I have understood that this is an early alpha test release and that all entry data might be logged for debugging purposes.</label>
+                  <br>
+                  <input class="disclaimer-checkbox" type="checkbox" id="checkbox" v-model="disclaimer">
+                </small>
+              </div>
+              <div class="form-group" id="network-config-lib3h" v-if="network_type==='lib3h'">
+                <label for="lib3h-network-name">Network Name</label>
+                <input type="input" class="form-control" id="lib3h-network-name" aria-describedby="lib3h-network-name-help" placeholder="holochain-testnet">
+                <small id="lib3h-network-name-help" class="form-text text-muted"></small>
+                <label for="lib3h-bootstrap-url">Bootstrap Url</label>
+                <input type="input" class="form-control" id="lib3h-bootstrap-url" aria-describedby="lib3h-bootstrap-url-help" placeholder="wss://">
+                <small id="lib3h-bootstrap-url-help" class="form-text text-muted">optional url of a boostrap node</small>
+              </div>
+              <div class="form-group" id="network-config-memory" v-if="network_type==='memory'">
+              </div>
+              <div class="modal-footer">
+              <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
+              <button id="set-network-type-button" type="button" class="btn btn-primary" :disabled="!disclaimer && network_type=='sim2h' && sim2h_url=='wss://sim2h.holochain.org:9000'">Set Network Type</button>
             </div>
-            <div class="form-group" id="network-config-sim1h" v-if="network_type==='sim1h'">
-              <label for="dynamo-url">Dynamodb URL</label>
-              <input type="input" class="form-control" id="dynamo-url" aria-describedby="dynamo-url-help" placeholder="http://localhost:8000">
-              <small id="dynamo-url-help" class="form-text text-muted"></small>
-            </div>
-            <div class="form-group" id="network-config-sim2h" v-if="network_type==='sim2h'">
-              <label for="sim2h-url">Sim2h Switch-Board URL</label>
-              <input type="input" class="form-control" id="sim2h-url" aria-describedby="sim2h-url-help" placeholder="wss://sim2h.holochain.org:9000" value="wss://sim2h.holochain.org:9000" v-model="sim2h_url">
-              <small id="sim2h-url-help" class="form-text text-muted clearfix" v-if="sim2h_url=='wss://sim2h.holochain.org:9000'">
-                The default URL wss://sim2h.holochain.org points to a public pre-alpha test instance of the sim2h switch-board.
-                <p class="disclaimer">
-                  DISCLAIMER:
-                  <ul>
-                    <li>This public instance comes with no guarantee of up-time!</li>
-                    <li>This is for testing only!</li>
-                    <li>Network traffic might be logged and stored for the purpose fo debugging Holochain during this alpha test phase!</li>
-                  </ul>
-                </p>
-                <p>You can read more about sim2h <a href="#" v-on:click="openExternal('https://blog.holochain.org/p/30079b6f-7733-40a6-9135-ac5b9d861b96')">here.</a></p>
-                
-                <span class="disclaimer-label">Please confirm:</span>
-                <label for="checkbox">I have understood that this is an early alpha test release and that all entry data might be logged for debugging purposes.</label>
-                <br>
-                <input class="disclaimer-checkbox" type="checkbox" id="checkbox" v-model="disclaimer">
-              </small>
-            </div>
-            <div class="form-group" id="network-config-lib3h" v-if="network_type==='lib3h'">
-              <label for="lib3h-network-name">Network Name</label>
-              <input type="input" class="form-control" id="lib3h-network-name" aria-describedby="lib3h-network-name-help" placeholder="holochain-testnet">
-              <small id="lib3h-network-name-help" class="form-text text-muted"></small>
-              <label for="lib3h-bootstrap-url">Bootstrap Url</label>
-              <input type="input" class="form-control" id="lib3h-bootstrap-url" aria-describedby="lib3h-bootstrap-url-help" placeholder="wss://">
-              <small id="lib3h-bootstrap-url-help" class="form-text text-muted">optional url of a boostrap node</small>
-            </div>
-            <div class="form-group" id="network-config-memory" v-if="network_type==='memory'">
-            </div>
-            <div class="modal-footer">
-            <button id="quit-button" type="button" class="btn btn-secondary quit-button" data-dismiss="modal">Quit</button>
-            <button id="set-network-type-button" type="button" class="btn btn-primary" :disabled="!disclaimer && network_type=='sim2h' && sim2h_url=='wss://sim2h.holochain.org:9000'">Set Network Type</button>
           </div>
         </div>
-      </div>
-    </div>    
+      </div>    
+    </div>
   </div>
 
       <script>

From 5df3b146c94b66f4e11287cb5061ea4afed894b0 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Fri, 29 Nov 2019 21:49:57 +0100
Subject: [PATCH 16/20] Cap number of log messages that are kept in memory /
 displayed in views

---
 holoscape.js             | 3 +++
 views/conductor_log.html | 3 +++
 views/splash.html        | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/holoscape.js b/holoscape.js
index d067f2d..edf6332 100644
--- a/holoscape.js
+++ b/holoscape.js
@@ -300,6 +300,9 @@ class Holoscape {
         if(level == 'error') console.error(message)
         else console.log(message)
         global.holoscape.logMessages.push({level, message})
+        while(global.holoscape.logMessages.length > 100) {
+          global.holoscape.logMessages.shift()
+        }
         if(global.holoscape.logWindow && global.holoscape.logWindow.webContents) {
           global.holoscape.logWindow.webContents.send('log', {level,message})
         }
diff --git a/views/conductor_log.html b/views/conductor_log.html
index 798c42b..f879ffd 100644
--- a/views/conductor_log.html
+++ b/views/conductor_log.html
@@ -41,6 +41,9 @@
         let {level, message} = store
         message = convert.toHtml(message)
         app.logs.push({level, message})
+        while(app.logs.length > 100) {
+            app.logs.shift()
+          }
       });
 
     </script>
diff --git a/views/splash.html b/views/splash.html
index 3a841e9..4e08bd2 100644
--- a/views/splash.html
+++ b/views/splash.html
@@ -247,9 +247,12 @@ <h5 class="modal-title" id="exampleModalLabel">Holochain Network Configuration..
        })
 
        ipcRenderer.on('log', (event,store) => {
-           let {level, message} = store
-           message = convert.toHtml(message)
-           app.logs.push({level, message})
+          let {level, message} = store
+          message = convert.toHtml(message)
+          app.logs.push({level, message})
+          while(app.logs.length > 20) {
+            app.logs.shift()
+          }
        });
 
        ipcRenderer.on('splash-status', (event, message) => {

From c6980f3a74473432a1725514eb110995a8de3821 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Fri, 29 Nov 2019 21:51:01 +0100
Subject: [PATCH 17/20] Deactivate state dump in logs since Holoscape has a
 view for that anyway

---
 initial_conductor_config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/initial_conductor_config.toml b/initial_conductor_config.toml
index 4061adb..10ccd6a 100644
--- a/initial_conductor_config.toml
+++ b/initial_conductor_config.toml
@@ -17,7 +17,7 @@ instances = []
 
 [logger]
 type = "debug"
-state_dump = true
+state_dump = false
 
 {{{networkConfigToml}}}
 

From 83e8570a12ef877467237573765d6b9cc36c9291 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Fri, 29 Nov 2019 23:16:57 +0100
Subject: [PATCH 18/20] Limit number of actions shown in debug view

---
 views/debug_view.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/views/debug_view.html b/views/debug_view.html
index ae86eb0..def8289 100644
--- a/views/debug_view.html
+++ b/views/debug_view.html
@@ -341,7 +341,11 @@ <h3>
                     return
                 }
 
-                app.reduxActions[instance_id].push(signal.action)
+                let actions = app.reduxActions[instance_id]
+                actions.push(signal.action)
+                while(actions.lenght > 100) {
+                    actions.shift()
+                }
             })
 
             refresh()

From 8aeb3e2f595fa380cca36017832ce3f3785a4a83 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Mon, 2 Dec 2019 15:40:59 +0100
Subject: [PATCH 19/20] Properly shutdown on quit

---
 holoscape.js | 8 +++++++-
 main.js      | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/holoscape.js b/holoscape.js
index edf6332..9c062f8 100644
--- a/holoscape.js
+++ b/holoscape.js
@@ -286,7 +286,7 @@ class Holoscape {
         { type: 'separator' },
         { label: 'Install hApp...', click: ()=>this.installBundleWindow.show() },
         { type: 'separator' },
-        { label: 'Quit', click: ()=>{this.shutdownConductor(); this.quitting=true; mb.app.quit()} }
+        { label: 'Quit', click: ()=> this.quit() }
       ])
       mb.tray.setToolTip('HoloScape')
       mb.tray.setContextMenu(contextMenu)
@@ -399,6 +399,12 @@ class Holoscape {
         global.holoscape.checkConductorConnection()
       })
     }
+
+    quit() {
+      this.shutdownConductor()
+      this.quitting=true
+      mb.app.quit()
+    }
   }
 
 const systemTrayIconFull = () => {
diff --git a/main.js b/main.js
index 60a2a21..b2bc4a0 100644
--- a/main.js
+++ b/main.js
@@ -46,6 +46,12 @@ app.on('window-all-closed', e => {
   if(!global.holoscape.quitting) e.preventDefault()
 })
 
+app.on('before-quit', e => {
+  if(!global.holoscape.quitting) {
+    global.holoscape.quit()
+  }
+})
+
 mb.on('ready', async () => {
   mb.tray.setImage(systemTrayIconEmpty())
   global.holoscape = new Holoscape()

From d71f3c886c616b23dacc374a8b5c70bcc1231fd5 Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Mon, 2 Dec 2019 15:51:18 +0100
Subject: [PATCH 20/20] Bump version shown in splash to 0.0.4

---
 views/splash.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/splash.html b/views/splash.html
index 4e08bd2..a1a12d2 100644
--- a/views/splash.html
+++ b/views/splash.html
@@ -108,7 +108,7 @@
         </li>
       </ul>
       <h1 class="header">Holoscape</h1>
-      <h3 class="version">v0.0.3-alpha</h3>
+      <h3 class="version">v0.0.4-alpha</h3>
       <img class="logo" src="../images/HoloScape-mdpi.png"></img>
       <div class="status">{{status}}</div>