diff --git a/pkg/arvo/app/graph-pull-hook.hoon b/pkg/arvo/app/graph-pull-hook.hoon index 431ac1c1df..cfb1834099 100644 --- a/pkg/arvo/app/graph-pull-hook.hoon +++ b/pkg/arvo/app/graph-pull-hook.hoon @@ -9,6 +9,7 @@ update:store %graph-update %graph-push-hook + 0 0 %.n == -- diff --git a/pkg/arvo/app/graph-push-hook.hoon b/pkg/arvo/app/graph-push-hook.hoon index 0ac5026377..869f578ea1 100644 --- a/pkg/arvo/app/graph-push-hook.hoon +++ b/pkg/arvo/app/graph-push-hook.hoon @@ -12,6 +12,7 @@ update:store %graph-update %graph-pull-hook + 0 0 == :: +$ agent (push-hook:push-hook config) diff --git a/pkg/arvo/app/graph-store.hoon b/pkg/arvo/app/graph-store.hoon index 87f4644803..b717d5ec6f 100644 --- a/pkg/arvo/app/graph-store.hoon +++ b/pkg/arvo/app/graph-store.hoon @@ -207,7 +207,7 @@ ++ give |= =update-0:store ^- (list card) - [%give %fact ~ [%graph-update !>([%0 now.bowl update-0])]]~ + [%give %fact ~ [%graph-update-0 !>([%0 now.bowl update-0])]]~ -- :: ++ on-poke @@ -218,7 +218,7 @@ ?> (team:title our.bowl src.bowl) =^ cards state ?+ mark (on-poke:def mark vase) - %graph-update (graph-update !<(update:store vase)) + %graph-update-0 (graph-update !<(update:store vase)) %noun (debug !<(debug-input vase)) %import (poke-import q.vase) == @@ -646,7 +646,7 @@ [cards state] =* update upd.i.updates =^ crds state - %- graph-update + %- graph-update ^- update:store ?- -.q.update %add-graph update(resource.q resource) @@ -660,7 +660,7 @@ ++ give |= [paths=(list path) update=update-0:store] ^- (list card) - [%give %fact paths [%graph-update !>([%0 now.bowl update])]]~ + [%give %fact paths [%graph-update-0 !>([%0 now.bowl update])]]~ -- :: ++ debug @@ -862,15 +862,15 @@ ``noun+!>(q.u.result) :: [%x %keys ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !>(`update:store`[%0 now.bowl [%keys ~(key by graphs)]]) :: [%x %tags ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !>(`update:store`[%0 now.bowl [%tags ~(key by tag-queries)]]) :: [%x %tag-queries ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !>(`update:store`[%0 now.bowl [%tag-queries tag-queries]]) :: [%x %graph @ @ ~] @@ -879,7 +879,7 @@ =/ result=(unit marked-graph:store) (~(get by graphs) [ship term]) ?~ result [~ ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !> ^- update:store :+ %0 now.bowl @@ -895,7 +895,7 @@ ?~ result ~& no-archived-graph+[ship term] [~ ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !> ^- update:store :+ %0 now.bowl @@ -912,7 +912,7 @@ =/ graph=(unit marked-graph:store) (~(get by graphs) [ship term]) ?~ graph [~ ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !> ^- update:store :+ %0 now.bowl :+ %add-nodes @@ -939,7 +939,7 @@ (turn t.t.t.t.path (cury slav %ud)) =/ node=(unit node:store) (get-node ship term index) ?~ node [~ ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !> ^- update:store :+ %0 now.bowl @@ -959,7 +959,7 @@ =/ graph (get-node-children ship term parent) ?~ graph [~ ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !> ^- update:store :+ %0 now.bowl @@ -990,7 +990,7 @@ =/ children (get-node-children ship term index) ?~ children [~ ~] - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !> ^- update:store :+ %0 now.bowl @@ -1017,7 +1017,7 @@ ?- -.children.u.node %empty [~ ~] %graph - :- ~ :- ~ :- %graph-update + :- ~ :- ~ :- %graph-update-0 !> ^- update:store :+ %0 now.bowl diff --git a/pkg/arvo/gen/graph-store/add-graph.hoon b/pkg/arvo/gen/graph-store/add-graph.hoon index 0192ede89e..e720c2c515 100644 --- a/pkg/arvo/gen/graph-store/add-graph.hoon +++ b/pkg/arvo/gen/graph-store/add-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource mark=(unit mark) overwrite=? ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%add-graph resource (gas:orm ~ ~) mark overwrite]] diff --git a/pkg/arvo/gen/graph-store/add-post.hoon b/pkg/arvo/gen/graph-store/add-post.hoon index 643e073c03..a1de92cfcf 100644 --- a/pkg/arvo/gen/graph-store/add-post.hoon +++ b/pkg/arvo/gen/graph-store/add-post.hoon @@ -12,7 +12,7 @@ contents.post contents == :: -:- %graph-update +:- %graph-update-0 ^- update :+ %0 now :+ %add-nodes [our name] diff --git a/pkg/arvo/gen/graph-store/add-signatures.hoon b/pkg/arvo/gen/graph-store/add-signatures.hoon index 9a536d6d52..6ca316f948 100644 --- a/pkg/arvo/gen/graph-store/add-signatures.hoon +++ b/pkg/arvo/gen/graph-store/add-signatures.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[[=resource =index] =signatures ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%add-signatures [resource index] signatures]] diff --git a/pkg/arvo/gen/graph-store/add-tag.hoon b/pkg/arvo/gen/graph-store/add-tag.hoon index 8c83f1c4eb..882b6f23d1 100644 --- a/pkg/arvo/gen/graph-store/add-tag.hoon +++ b/pkg/arvo/gen/graph-store/add-tag.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=term =resource ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%add-tag term resource]] diff --git a/pkg/arvo/gen/graph-store/archive-graph.hoon b/pkg/arvo/gen/graph-store/archive-graph.hoon index a40a7a5336..3e91b05ef9 100644 --- a/pkg/arvo/gen/graph-store/archive-graph.hoon +++ b/pkg/arvo/gen/graph-store/archive-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%archive-graph resource]] diff --git a/pkg/arvo/gen/graph-store/export-graph.hoon b/pkg/arvo/gen/graph-store/export-graph.hoon index 9a52862d6c..7c2946b09d 100644 --- a/pkg/arvo/gen/graph-store/export-graph.hoon +++ b/pkg/arvo/gen/graph-store/export-graph.hoon @@ -4,7 +4,7 @@ |= $: [now=@da eny=@uvJ bec=beak] [[=ship graph=term ~] ~] == -:- %graph-update +:- %graph-update-0 =/ our (scot %p p.bec) =/ wen (scot %da now) =/ who (scot %p ship) diff --git a/pkg/arvo/gen/graph-store/import-graph.hoon b/pkg/arvo/gen/graph-store/import-graph.hoon index 720c24e613..163c2c5032 100644 --- a/pkg/arvo/gen/graph-store/import-graph.hoon +++ b/pkg/arvo/gen/graph-store/import-graph.hoon @@ -4,6 +4,6 @@ |= $: [now=@da eny=@uvJ bec=beak] [[graph=term =path ~] ~] == -:- %graph-update +:- %graph-update-0 =- ~& update=- - .^(=update:graph-store %cx path) diff --git a/pkg/arvo/gen/graph-store/remove-graph.hoon b/pkg/arvo/gen/graph-store/remove-graph.hoon index e06305981e..fcb5d26c1d 100644 --- a/pkg/arvo/gen/graph-store/remove-graph.hoon +++ b/pkg/arvo/gen/graph-store/remove-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%remove-graph resource]] diff --git a/pkg/arvo/gen/graph-store/remove-nodes.hoon b/pkg/arvo/gen/graph-store/remove-nodes.hoon index 8c5e13603b..29fd38990d 100644 --- a/pkg/arvo/gen/graph-store/remove-nodes.hoon +++ b/pkg/arvo/gen/graph-store/remove-nodes.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource indices=(set index) ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%remove-nodes resource indices]] diff --git a/pkg/arvo/gen/graph-store/remove-signatures.hoon b/pkg/arvo/gen/graph-store/remove-signatures.hoon index b9bd658fa7..901aa78e11 100644 --- a/pkg/arvo/gen/graph-store/remove-signatures.hoon +++ b/pkg/arvo/gen/graph-store/remove-signatures.hoon @@ -6,6 +6,6 @@ |= $: [now=@da eny=@uvJ =beak] [[[=resource =index] =signatures ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%remove-signatures [resource index] signatures]] diff --git a/pkg/arvo/gen/graph-store/remove-tag.hoon b/pkg/arvo/gen/graph-store/remove-tag.hoon index 722d4af5c7..e552da9496 100644 --- a/pkg/arvo/gen/graph-store/remove-tag.hoon +++ b/pkg/arvo/gen/graph-store/remove-tag.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=term =resource ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%remove-tag term resource]] diff --git a/pkg/arvo/gen/graph-store/unarchive-graph.hoon b/pkg/arvo/gen/graph-store/unarchive-graph.hoon index 1d684de6a1..11beab2eb0 100644 --- a/pkg/arvo/gen/graph-store/unarchive-graph.hoon +++ b/pkg/arvo/gen/graph-store/unarchive-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource ~] ~] == -:- %graph-update +:- %graph-update-0 ^- update [%0 now [%unarchive-graph resource]] diff --git a/pkg/arvo/mar/graph/update-0.hoon b/pkg/arvo/mar/graph/update-0.hoon new file mode 100644 index 0000000000..e6766edb51 --- /dev/null +++ b/pkg/arvo/mar/graph/update-0.hoon @@ -0,0 +1,19 @@ +/+ *graph-store +=* as-octs as-octs:mimes:html +:: +|_ upd=update +++ grad %noun +++ grow + |% + ++ noun upd + ++ json (update:enjs upd) + ++ mime [/application/x-urb-graph-update (as-octs (jam upd))] + -- +:: +++ grab + |% + ++ noun update + ++ json update:dejs + ++ mime |=([* =octs] ;;(update (cue q.octs))) + -- +-- diff --git a/pkg/arvo/ted/graph/add-nodes.hoon b/pkg/arvo/ted/graph/add-nodes.hoon index 3041eb61cd..66569958f5 100644 --- a/pkg/arvo/ted/graph/add-nodes.hoon +++ b/pkg/arvo/ted/graph/add-nodes.hoon @@ -33,7 +33,7 @@ =/ hashes (nodes-to-pending-indices nodes.q.update) ;< ~ bind:m %^ poke-our %graph-push-hook - %graph-update + %graph-update-0 !>(update) (pure:m !>(`action:graph-view`[%pending-indices hashes])) :: diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon index e437b08fdf..0daa85e490 100644 --- a/pkg/arvo/ted/graph/create.hoon +++ b/pkg/arvo/ted/graph/create.hoon @@ -54,7 +54,7 @@ =/ =update:graph [%0 now.bowl %add-graph rid.action *graph:graph mark.action overwrite] ;< ~ bind:m - (poke-our %graph-store graph-update+!>(update)) + (poke-our %graph-store graph-update-0+!>(update)) ;< ~ bind:m (poke-our %graph-push-hook %push-hook-action !>([%add rid.action])) :: diff --git a/pkg/arvo/ted/graph/delete.hoon b/pkg/arvo/ted/graph/delete.hoon index f95fd096ef..1c4c8d7acf 100644 --- a/pkg/arvo/ted/graph/delete.hoon +++ b/pkg/arvo/ted/graph/delete.hoon @@ -36,7 +36,7 @@ ^- form:m ;< =bowl:spider bind:m get-bowl:strandio ;< ~ bind:m - (poke-our %graph-store %graph-update !>([%0 now.bowl %remove-graph rid])) + (poke-our %graph-store %graph-update-0 !>([%0 now.bowl %remove-graph rid])) ;< ~ bind:m (poke-our %graph-push-hook %push-hook-action !>([%remove rid])) ;< ~ bind:m diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon index 1ff9a915f4..48911841bc 100644 --- a/pkg/arvo/ted/graph/leave.hoon +++ b/pkg/arvo/ted/graph/leave.hoon @@ -39,7 +39,7 @@ ;< ~ bind:m (poke-our %graph-pull-hook %pull-hook-action !>([%remove rid])) ;< ~ bind:m - (poke-our %graph-store %graph-update !>([%0 now [%remove-graph rid]])) + (poke-our %graph-store %graph-update-0 !>([%0 now [%remove-graph rid]])) (pure:m ~) -- :: diff --git a/pkg/arvo/ted/graph/restore.hoon b/pkg/arvo/ted/graph/restore.hoon index e399deb4da..4a3b9f6ea0 100644 --- a/pkg/arvo/ted/graph/restore.hoon +++ b/pkg/arvo/ted/graph/restore.hoon @@ -17,7 +17,7 @@ ;< =bowl:spider bind:m get-bowl:strandio :: unarchive graph and share it ;< ~ bind:m - (poke-our %graph-store %graph-update !>([%0 now.bowl %unarchive-graph rid])) + (poke-our %graph-store %graph-update-0 !>([%0 now.bowl %unarchive-graph rid])) ;< ~ bind:m (poke-our %graph-push-hook %push-hook-action !>([%add rid])) :: diff --git a/pkg/arvo/ted/group/on-leave.hoon b/pkg/arvo/ted/group/on-leave.hoon index e308b7d6d9..deb5f81b35 100644 --- a/pkg/arvo/ted/group/on-leave.hoon +++ b/pkg/arvo/ted/group/on-leave.hoon @@ -19,7 +19,7 @@ ;< ~ bind:m %+ raw-poke [entity.resource.update %group-push-hook] - :- %group-update + :- %group-update-0 !> ^- update:grp [%remove-members resource.update (silt [our.bowl ~])] :: stop serving or syncing group updates @@ -70,7 +70,7 @@ ;< ~ bind:m %+ raw-poke [our.bowl %graph-store] - :- %graph-update + :- %graph-update-0 !> ^- update:gra [%0 now.bowl [%archive-graph app-resource]] ;< ~ bind:m diff --git a/pkg/arvo/ted/ph/migrate/make-graphs.hoon b/pkg/arvo/ted/ph/migrate/make-graphs.hoon index 0bbfe6dbf2..1121197acf 100644 --- a/pkg/arvo/ted/ph/migrate/make-graphs.hoon +++ b/pkg/arvo/ted/ph/migrate/make-graphs.hoon @@ -14,7 +14,7 @@ =/ =post:post [our index wen [%text body]~ ~ ~] =/ =node:graph-store [post %empty ~] =/ act=update:graph-store [%0 wen %add-nodes rid (my [index node] ~)] - (poke-app our %graph-push-hook %graph-update act) + (poke-app our %graph-push-hook %graph-update-0 act) -- :: ^- thread:spider diff --git a/pkg/arvo/ted/ph/migrate/post-import-graphs.hoon b/pkg/arvo/ted/ph/migrate/post-import-graphs.hoon index eed757263b..561c8be47a 100644 --- a/pkg/arvo/ted/ph/migrate/post-import-graphs.hoon +++ b/pkg/arvo/ted/ph/migrate/post-import-graphs.hoon @@ -14,7 +14,7 @@ =/ =post:post [our index wen [%text body]~ ~ ~] =/ =node:graph-store [post %empty ~] =/ act=update:graph-store [%0 wen %add-nodes rid (my [index node] ~)] - (poke-app our %graph-push-hook %graph-update act) + (poke-app our %graph-push-hook %graph-update-0 act) -- :: ^- thread:spider