Merge 4f873320f1 into release/next-js

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1656cbfd472430c463db4e968c1dd4c8894a5219a27cd301a70ad262f5999f1
-size 10610939
+oid sha256:0044b89a371ccdf464100187b0683031729bfbd97969ecb35cbfb3b91c84af54
+size 10675411

pkg/arvo/app/glob.hoon

@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v7.dmf2h.884m6.b2p1b.l1and.uv1lv
+++  hash  0vrjber.rqjl4.19elk.2fmnt.6t82g :: DO NOT MOVE FROM LINE 8
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0

pkg/arvo/app/graph-store.hoon

@@ -10,16 +10,17 @@
       [%1 network:zero:store]
       [%2 network:zero:store]
       [%3 network:one:store]
-      state-4
+      [%4 network:store]
+      state-5
   ==
 ::
-+$  state-4  [%4 network:store]
++$  state-5  [%5 network:store]
 ++  orm      orm:store
 ++  orm-log  orm-log:store
 +$  debug-input  [%validate-graph =resource:store]
 --
 ::
-=|  state-4
+=|  state-5
 =*  state  -
 ::
 %-  agent:dbug
@@ -91,7 +92,21 @@
       |=(a=* *update-log:store)
     ==
   ::
-    %4  [cards this(state old)]
+      %4
+    %_   $
+        update-logs.old
+      %-  ~(gas by *update-logs:store)
+      %+  turn  ~(tap by graphs.old)
+      |=  [=resource:store =graph:store mar=(unit mark)]
+      :-  resource
+      =/  log  (~(got by update-logs.old) resource)
+      ?.  =(~ log)  log
+      =/  =logged-update:store
+        [now.bowl %add-graph resource graph mar %.y]
+      (gas:orm-log ~ [now.bowl logged-update] ~)
+    ==
+  ::
+    %5  [cards this(state old)]
   ==
 ::
 ++  on-watch

pkg/arvo/app/landscape/index.html

@@ -24,6 +24,6 @@
     <div id="portal-root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.eb051d816171fb1d0caf.js"></script>
+    <script src="/~landscape/js/bundle/index.da5d0d53b67c9b44bfe6.js"></script>
   </body>
 </html>

pkg/arvo/lib/graph-store.hoon

@@ -721,9 +721,9 @@
   --
 ++  import
   |=  [arc=* our=ship]
-  ^-  (quip card:agent:gall [%4 network])
+  ^-  (quip card:agent:gall [%5 network])
   |^
-  =/  sty  [%4 (remake-network ;;(tree-network +.arc))]
+  =/  sty  [%5 (remake-network ;;(tree-network +.arc))]
   :_  sty
   %+  turn  ~(tap by graphs.sty)
   |=  [rid=resource =marked-graph]

pkg/arvo/lib/graph.hoon

@@ -76,6 +76,7 @@
 ++  get-graph
   |=  res=resource
   ^-  update:store
+  =-  -(p *time)
   %+  scry-for  update:store
   /graph/(scot %p entity.res)/[name.res]
 ::