ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-20 15:08:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lf/versioning-marks-dist' into dist

Browse Source
This commit is contained in:
Fang 2021-09-28 17:13:33 +04:00
commit 400d2e4f44
No known key found for this signature in database
GPG Key ID: EB035760C1BBA972
66 changed files with 195 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/arvo/lib/hood/kiln.hoon
View File

@ -415,8 +415,8 @@
++ emil |=((list card:agent:gall) vats(kiln (^emil +<))) ++ emil |=((list card:agent:gall) vats(kiln (^emil +<)))
++ give ++ give
|% |%
++ snap [%give %fact ~[/kiln/vats] %kiln-vats-snap !>(ark)] ++ snap [%give %fact ~[/kiln/vats] %kiln-vats-snap-0 !>(ark)]
++ diff |=(d=^diff [%give %fact ~[/kiln/vats] %kiln-vats-diff !>(d)]) ++ diff |=(d=^diff [%give %fact ~[/kiln/vats] %kiln-vats-diff-0 !>(d)])
-- --
++ pass ++ pass
|% |%
@ -1241,7 +1241,7 @@
[%vats ~] abet [%vats ~] abet
:: ::
[%ark ~] [%ark ~]
abet(moz :_(moz [%give %fact ~ %kiln-vats-snap !>(ark)])) abet(moz :_(moz [%give %fact ~ %kiln-vats-snap-0 !>(ark)]))
== ==
:: ::
++ take-agent ++ take-agent

1
pkg/arvo/mar/glob-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../base-dev/mar/glob-0.hoon

1
pkg/arvo/mar/glob.hoon
View File

@ -1 +0,0 @@
../../base-dev/mar/glob.hoon

0
pkg/arvo/mar/kiln/vats-diff.hoon → pkg/arvo/mar/kiln/vats-diff-0.hoon
View File

0
pkg/garden/mar/glob.hoon → pkg/base-dev/mar/glob-0.hoon
View File

0
pkg/bitcoin/desk.docket → pkg/bitcoin/desk.docket-0
View File

1
pkg/bitcoin/mar/docket-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../garden-dev/mar/docket-0.hoon

1
pkg/bitcoin/mar/docket.hoon
View File

@ -1 +0,0 @@
../../garden-dev/mar/docket.hoon

1
pkg/bitcoin/mar/glob-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../base-dev/mar/glob-0.hoon

1
pkg/bitcoin/mar/glob.hoon
View File

@ -1 +0,0 @@
../../base-dev/mar/glob.hoon

1
pkg/bitcoin/sur/hark-store.hoon Symbolic link
View File

@ -0,0 +1 @@
../../garden-dev/sur/hark-store.hoon

0
pkg/garden-dev/mar/docket.hoon → pkg/garden-dev/mar/docket-0.hoon
View File

34
pkg/garden/app/docket.hoon
View File

@ -133,9 +133,7 @@
~| [%glob-unavailable requested=hash have=have] ~| [%glob-unavailable requested=hash have=have]
?> =(hash have) ?> =(hash have)
:_ state :_ state
:~ [%give %fact ~[path] %glob !>(`glob`glob.chad.charge)] (fact-init-kick:io (glob:cg:cc glob.chad.charge))
[%give %kick ~[path] ~]
==
== ==
[cards this] [cards this]
:: ::
@ -163,8 +161,7 @@
:: ::
[%x %charges ~] [%x %charges ~]
:- ~ :- ~ :- ~ :- ~
:- %charge-update %- charge-update:cg:cc
!> ^- charge-update
:- %initial :- %initial
%- ~(gas by *(map desk charge)) %- ~(gas by *(map desk charge))
%+ turn ~(tap by charges) %+ turn ~(tap by charges)
@ -190,7 +187,7 @@
%kick [(~(watch-our pass /kiln) %hood /kiln/vats)^~ state] %kick [(~(watch-our pass /kiln) %hood /kiln/vats)^~ state]
:: ::
%fact %fact
?. ?=(%kiln-vats-diff p.cage.sign) `state ?. ?=(%kiln-vats-diff-0 p.cage.sign) `state
=+ !<(=diff:hood q.cage.sign) =+ !<(=diff:hood q.cage.sign)
=* cha ~(. ch desk.diff) =* cha ~(. ch desk.diff)
?+ -.diff `state ?+ -.diff `state
@ -355,6 +352,15 @@
++ def ~(. (default-agent state %|) bowl) ++ def ~(. (default-agent state %|) bowl)
:: ::
++ hash-glob sham ++ hash-glob sham
++ cg
|%
++ glob |=(g=^glob glob-0+!>(g))
++ docket |=(d=^docket docket-0+!>(docket))
++ charge-update |=(u=^charge-update charge-update+!>(u))
++ kiln-uninstall |=(=desk kiln-uninstall+!>(desk))
++ kiln-install
|=([here=desk her=ship there=desk] kiln-install+!>([here her there]))
--
:: ::
++ handle-http-request ++ handle-http-request
|= [eyre-id=@ta inbound-request:eyre] |= [eyre-id=@ta inbound-request:eyre]
@ -502,7 +508,7 @@
=- [%pass /write/[desk] %arvo %c %info -]~ =- [%pass /write/[desk] %arvo %c %info -]~
%+ foal:space:userlib %+ foal:space:userlib
/(scot %p our.bowl)/[desk]/(scot %da now.bowl)/desk/docket /(scot %p our.bowl)/[desk]/(scot %da now.bowl)/desk/docket
=- [%docket !>(`docket`-)] %- docket:cg
docket.charge(glob-reference.href [(hash-glob glob) %ames our.bowl]) docket.charge(glob-reference.href [(hash-glob glob) %ames our.bowl])
== ==
:: ::
@ -603,13 +609,14 @@
== ==
++ add-fact ++ add-fact
=/ =charge (~(got by charges) desk) =/ =charge (~(got by charges) desk)
(fact:io charge-update+!>([%add-charge desk (get-light-charge charge)]) /charges ~) =- (fact:io - /charges ~)
++ del-fact (fact:io charge-update+!>([%del-charge desk]) /charges ~) (charge-update:cg %add-charge desk (get-light-charge charge))
++ del-fact (fact:io (charge-update:cg %del-charge desk) /charges ~)
++ install ++ install
|= [=ship remote=^desk] |= [=ship remote=^desk]
(poke-our:(pass /install) %hood kiln-install+!>([desk ship remote])) (poke-our:(pass /install) %hood (kiln-install:cg desk ship remote))
++ uninstall ++ uninstall
(poke-our:(pass /uninstall) %hood kiln-uninstall+!>(desk)) (poke-our:(pass /uninstall) %hood (kiln-uninstall:cg desk))
++ new-docket ++ new-docket
|= d=^docket |= d=^docket
%+ ~(put by charges) desk %+ ~(put by charges) desk
@ -640,8 +647,9 @@
:~ (watch-our:(pass (glob-wire ref)) %spider /thread-result/[tid]) :~ (watch-our:(pass (glob-wire ref)) %spider /thread-result/[tid])
(poke-our:(pass (glob-wire ref)) %spider cage) (poke-our:(pass (glob-wire ref)) %spider cage)
== ==
++ docket-exists .^(? %cu (scry:io desk /desk/docket)) ++ docket-loc `path`/desk/docket-0
++ docket .^(^docket %cx (scry:io desk /desk/docket)) ++ docket-exists .^(? %cu (scry:io desk docket-loc))
++ docket .^(^docket %cx (scry:io desk docket-loc))
-- --
-- --

24
pkg/garden/app/treaty.hoon
View File

@ -99,10 +99,10 @@
=/ =ship (slav %p i.t.path) =/ =ship (slav %p i.t.path)
=* desk i.t.t.path =* desk i.t.t.path
?: =(our.bowl ship) ?: =(our.bowl ship)
:_(this (fact-init:io treaty+!>((~(got by sovereign) desk)))^~) :_(this (fact-init:io (treaty:cg:cc (~(got by sovereign) desk)))^~)
?^ treat=(~(get by treaties) [ship desk]) ?^ treat=(~(get by treaties) [ship desk])
:_ this :_ this
(fact-init:io treaty+!>(u.treat))^~ (fact-init:io (treaty:cg:cc u.treat))^~
?> =(our.bowl src.bowl) ?> =(our.bowl src.bowl)
=. direct (~(put in direct) [ship desk]) =. direct (~(put in direct) [ship desk])
:_(this (drop ~(safe-watch tr:cc [ship desk]))) :_(this (drop ~(safe-watch tr:cc [ship desk])))
@ -134,13 +134,12 @@
%+ skim ~(tap by treaties) %+ skim ~(tap by treaties)
|= [ref=[^ship desk] =treaty] |= [ref=[^ship desk] =treaty]
(~(has in alliance) ref) (~(has in alliance) ref)
``(treaty-update:cg:ca %ini allied) ``(treaty-update:cg:ca:cc %ini allied)
:: ::
[%x %treaty @ @ ~] [%x %treaty @ @ ~]
=/ =ship (slav %p i.t.t.path) =/ =ship (slav %p i.t.t.path)
=* desk i.t.t.t.path =* desk i.t.t.t.path
=/ =treaty (~(got by treaties) [ship desk]) ``(treaty:cg:cc (~(got by treaties) [ship desk]))
``treaty+!>(treaty)
== ==
:: ::
++ on-agent ++ on-agent
@ -226,7 +225,6 @@
[%sovereign @ ~] [%sovereign @ ~]
=* desk i.t.wire =* desk i.t.wire
(take-sovereign desk) (take-sovereign desk)
== ==
:: ::
++ take-sovereign ++ take-sovereign
@ -303,9 +301,9 @@
++ wire /sovereign/[desk] ++ wire /sovereign/[desk]
++ pass ~(. ^pass wire) ++ pass ~(. ^pass wire)
++ path /treaty/(scot %p our.bowl)/[desk] ++ path /treaty/(scot %p our.bowl)/[desk]
++ get-docket .^(docket:docket %cx (scry:io desk /desk/docket)) ++ get-docket .^(docket:docket %cx (scry:io desk /desk/docket-0))
++ warp ++ warp
(warp-our:pass desk `[%next %x da+now.bowl /desk/docket]) (warp-our:pass desk `[%next %x da+now.bowl /desk/docket-0])
++ kick ++ kick
(kick:io path ~) (kick:io path ~)
++ give ++ give
@ -315,13 +313,3 @@
(poke-our:pass %hood kiln-permission+!>([desk / &])) (poke-our:pass %hood kiln-permission+!>([desk / &]))
-- --
-- --

0
pkg/garden/desk.docket → pkg/garden/desk.docket-0
View File

1
pkg/garden/mar/docket-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../garden-dev/mar/docket-0.hoon

1
pkg/garden/mar/docket.hoon
View File

@ -1 +0,0 @@
../../garden-dev/mar/docket.hoon

1
pkg/garden/mar/glob-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../base-dev/mar/glob-0.hoon

0
pkg/garden/mar/treaty.hoon → pkg/garden/mar/treaty-0.hoon
View File

4
pkg/landscape/app/chat-cli.hoon
View File

@ -169,7 +169,7 @@
:: ::
%fact %fact
?+ p.cage.sign ~|([dap.bowl %bad-sub-mark wire p.cage.sign] !!) ?+ p.cage.sign ~|([dap.bowl %bad-sub-mark wire p.cage.sign] !!)
%graph-update-2 %graph-update-3
%- on-graph-update:tc %- on-graph-update:tc
!<(update:graph q.cage.sign) !<(update:graph q.cage.sign)
== ==
@ -763,7 +763,7 @@
::TODO move creation into lib? ::TODO move creation into lib?
%^ act %out-message %^ act %out-message
%graph-push-hook %graph-push-hook
:- %graph-update-2 :- %graph-update-3
!> ^- update:graph !> ^- update:graph
:- now.bowl :- now.bowl
:+ %add-nodes audience :+ %add-nodes audience

2
pkg/landscape/app/chat-hook.hoon
View File

@ -154,7 +154,7 @@
++ poke-graph-store ++ poke-graph-store
|= =update:graph-store |= =update:graph-store
^- card ^- card
(poke-our %graph-store %graph-update-2 !>(update)) (poke-our %graph-store %graph-update-3 !>(update))
:: ::
++ nobody ++ nobody
^- @p ^- @p

2
pkg/landscape/app/dm-hook.hoon
View File

@ -134,7 +134,7 @@
== ==
[cards this] [cards this]
:: ::
%graph-update-2 %graph-update-3
=+ !<(=update:store vase) =+ !<(=update:store vase)
?+ -.q.update !! ?+ -.q.update !!
%add-nodes %add-nodes

4
pkg/landscape/app/graph-pull-hook.hoon
View File

@ -9,7 +9,7 @@
update:store update:store
%graph-update %graph-update
%graph-push-hook %graph-push-hook
2 2 3 3
%.n %.n
== ==
-- --
@ -41,7 +41,7 @@
%- (slog leaf+"nacked {<resource>}" tang) %- (slog leaf+"nacked {<resource>}" tang)
:_ this :_ this
?. (~(has in get-keys:gra) resource) ~ ?. (~(has in get-keys:gra) resource) ~
=- [%pass /pull-nack %agent [our.bowl %graph-store] %poke %graph-update-2 -]~ =- [%pass /pull-nack %agent [our.bowl %graph-store] %poke %graph-update-3 -]~
!> ^- update:store !> ^- update:store
[now.bowl [%archive-graph resource]] [now.bowl [%archive-graph resource]]
:: ::

2
pkg/landscape/app/graph-push-hook.hoon
View File

@ -12,7 +12,7 @@
update:store update:store
%graph-update %graph-update
%graph-pull-hook %graph-pull-hook
2 2 3 3
== ==
:: ::
+$ agent (push-hook:push-hook config) +$ agent (push-hook:push-hook config)

27
pkg/landscape/app/graph-store.hoon
View File

@ -16,6 +16,7 @@
+$ state-5 [%5 network:store] +$ state-5 [%5 network:store]
++ orm orm:store ++ orm orm:store
++ orm-log orm-log:store ++ orm-log orm-log:store
++ mar %graph-update-3
-- --
:: ::
=| state-5 =| state-5
@ -100,7 +101,7 @@
++ give ++ give
|= =action:store |= =action:store
^- (list card) ^- (list card)
[%give %fact ~ [%graph-update-2 !>(`update:store`[now.bowl action])]]~ [%give %fact ~ [mar !>(`update:store`[now.bowl action])]]~
-- --
:: ::
++ on-poke ++ on-poke
@ -111,7 +112,7 @@
?> (team:title our.bowl src.bowl) ?> (team:title our.bowl src.bowl)
=^ cards state =^ cards state
?+ mark (on-poke:def mark vase) ?+ mark (on-poke:def mark vase)
%graph-update-2 (graph-update !<(update:store vase)) %graph-update-3 (graph-update !<(update:store vase))
%import (poke-import q.vase) %import (poke-import q.vase)
== ==
[cards this] [cards this]
@ -570,7 +571,7 @@
++ give ++ give
|= [paths=(list path) update=action:store] |= [paths=(list path) update=action:store]
^- (list card) ^- (list card)
[%give %fact paths [%graph-update-2 !>(`update:store`[now.bowl update])]]~ [%give %fact paths [mar !>(`update:store`[now.bowl update])]]~
-- --
:: ::
++ validate-graph ++ validate-graph
@ -619,11 +620,11 @@
[%x %export ~] ``noun+!>(state) [%x %export ~] ``noun+!>(state)
:: ::
[%x %keys ~] [%x %keys ~]
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!>(`update:store`[now.bowl [%keys ~(key by graphs)]]) !>(`update:store`[now.bowl [%keys ~(key by graphs)]])
:: ::
[%x %tag-queries *] [%x %tag-queries *]
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!> ^- update:store !> ^- update:store
:- now.bowl :- now.bowl
?+ t.t.path (on-peek:def path) ?+ t.t.path (on-peek:def path)
@ -639,7 +640,7 @@
?~ marked-graph [~ ~] ?~ marked-graph [~ ~]
=* graph p.u.marked-graph =* graph p.u.marked-graph
=* mark q.u.marked-graph =* mark q.u.marked-graph
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!>(`update:store`[now.bowl [%add-graph [ship term] graph mark %.y]]) !>(`update:store`[now.bowl [%add-graph [ship term] graph mark %.y]])
:: ::
[%x %update-log @ @ *] [%x %update-log @ @ *]
@ -679,7 +680,7 @@
=* mark q.u.marked-graph =* mark q.u.marked-graph
?+ t.t.t.t.path (on-peek:def path) ?+ t.t.t.t.path (on-peek:def path)
~ ~
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!>(`update:store`[now.bowl [%add-graph [ship term] graph mark %.y]]) !>(`update:store`[now.bowl [%add-graph [ship term] graph mark %.y]])
:: ::
[%mark ~] [%mark ~]
@ -688,7 +689,7 @@
[%subset ?(%lone %kith) @ @ ~] [%subset ?(%lone %kith) @ @ ~]
=/ start=(unit atom) (rush i.t.t.t.t.t.t.path dem:ag) =/ start=(unit atom) (rush i.t.t.t.t.t.t.path dem:ag)
=/ end=(unit atom) (rush i.t.t.t.t.t.t.t.path dem:ag) =/ end=(unit atom) (rush i.t.t.t.t.t.t.t.path dem:ag)
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!> ^- update:store !> ^- update:store
:^ now.bowl %add-nodes [ship term] :^ now.bowl %add-nodes [ship term]
%- ~(gas by *(map index:store node:store)) %- ~(gas by *(map index:store node:store))
@ -715,7 +716,7 @@
(turn t.t.pax (cury slav %ud)) (turn t.t.pax (cury slav %ud))
=/ node (get-node graph index) =/ node (get-node graph index)
?~ node [~ ~] ?~ node [~ ~]
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!> ^- update:store !> ^- update:store
:^ now.bowl %add-nodes [ship term] :^ now.bowl %add-nodes [ship term]
%- ~(gas by *(map index:store node:store)) %- ~(gas by *(map index:store node:store))
@ -739,7 +740,7 @@
?: ?=(%empty -.children.u.node) ?: ?=(%empty -.children.u.node)
~ ~
p.children.u.node p.children.u.node
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!> ^- update:store !> ^- update:store
:^ now.bowl %add-nodes [ship term] :^ now.bowl %add-nodes [ship term]
%- ~(gas by *(map index:store node:store)) %- ~(gas by *(map index:store node:store))
@ -763,7 +764,7 @@
?: ?=(%empty -.children.u.node) ?: ?=(%empty -.children.u.node)
~ ~
p.children.u.node p.children.u.node
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!> ^- update:store !> ^- update:store
:^ now.bowl %add-nodes [ship term] :^ now.bowl %add-nodes [ship term]
%- ~(gas by *(map index:store node:store)) %- ~(gas by *(map index:store node:store))
@ -825,7 +826,7 @@
|= [=node:store =index:store =(map index:store node:store)] |= [=node:store =index:store =(map index:store node:store)]
^- (unit (unit cage)) ^- (unit (unit cage))
?: ?=(%empty -.children.node) ?: ?=(%empty -.children.node)
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!>(`update:store`[now.bowl [%add-nodes [ship term] map]]) !>(`update:store`[now.bowl [%add-nodes [ship term] map]])
=/ item=[k=atom v=node:store] =/ item=[k=atom v=node:store]
(need (ram:orm p.children.node)) (need (ram:orm p.children.node))
@ -858,7 +859,7 @@
=/ start=(unit atom) (rush i.t.t.t.t.t.path dem:ag) =/ start=(unit atom) (rush i.t.t.t.t.t.path dem:ag)
?: ?=(~ count) ?: ?=(~ count)
[~ ~] [~ ~]
:- ~ :- ~ :- %graph-update-2 :- ~ :- ~ :- mar
!> ^- update:store !> ^- update:store
:^ now.bowl %add-nodes [ship term] :^ now.bowl %add-nodes [ship term]
=* a u.count =* a u.count

2
pkg/landscape/app/hark-graph-hook.hoon
View File

@ -228,7 +228,7 @@
~[watch-graph:ha] ~[watch-graph:ha]
:: ::
%fact %fact
?. ?=(%graph-update-2 p.cage.sign) ?. ?=(%graph-update-3 p.cage.sign)
(on-agent:def wire sign) (on-agent:def wire sign)
=^ cards state =^ cards state
(graph-update !<(update:graph-store q.cage.sign)) (graph-update !<(update:graph-store q.cage.sign))

0
pkg/landscape/desk.docket → pkg/landscape/desk.docket-0
View File

2
pkg/landscape/gen/dm-hook/dm.hoon
View File

@ -13,7 +13,7 @@
contents.post contents contents.post contents
== ==
:: ::
:- %graph-update-2 :- %graph-update-3
^- update ^- update
:- now :- now
:+ %add-nodes [our %dm-inbox] :+ %add-nodes [our %dm-inbox]

2
pkg/landscape/gen/graph-store/add-graph.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[=resource mark=(unit mark) overwrite=? ~] ~] [[=resource mark=(unit mark) overwrite=? ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%add-graph resource (gas:orm ~ ~) mark overwrite]] [now [%add-graph resource (gas:orm ~ ~) mark overwrite]]

2
pkg/landscape/gen/graph-store/add-post.hoon
View File

@ -12,7 +12,7 @@
contents.post contents contents.post contents
== ==
:: ::
:- %graph-update-2 :- %graph-update-3
^- update ^- update
:- now :- now
:+ %add-nodes [our name] :+ %add-nodes [our name]

2
pkg/landscape/gen/graph-store/add-signatures.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[[=resource =index] =signatures ~] ~] [[[=resource =index] =signatures ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%add-signatures [resource index] signatures]] [now [%add-signatures [resource index] signatures]]

2
pkg/landscape/gen/graph-store/add-tag.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[=term =uid ~] ~] [[=term =uid ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%add-tag term uid]] [now [%add-tag term uid]]

2
pkg/landscape/gen/graph-store/archive-graph.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[=resource ~] ~] [[=resource ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%archive-graph resource]] [now [%archive-graph resource]]

2
pkg/landscape/gen/graph-store/export-graph.hoon
View File

@ -4,7 +4,7 @@
|= $: [now=@da eny=@uvJ bec=beak] |= $: [now=@da eny=@uvJ bec=beak]
[[=ship graph=term ~] ~] [[=ship graph=term ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
=/ our (scot %p p.bec) =/ our (scot %p p.bec)
=/ wen (scot %da now) =/ wen (scot %da now)
=/ who (scot %p ship) =/ who (scot %p ship)

2
pkg/landscape/gen/graph-store/import-graph.hoon
View File

@ -4,6 +4,6 @@
|= $: [now=@da eny=@uvJ bec=beak] |= $: [now=@da eny=@uvJ bec=beak]
[[graph=term =path ~] ~] [[graph=term =path ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
=- ~& update=- - =- ~& update=- -
.^(=update:graph-store %cx path) .^(=update:graph-store %cx path)

2
pkg/landscape/gen/graph-store/remove-graph.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[=resource ~] ~] [[=resource ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%remove-graph resource]] [now [%remove-graph resource]]

2
pkg/landscape/gen/graph-store/remove-posts.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[=resource indices=(set index) ~] ~] [[=resource indices=(set index) ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%remove-posts resource indices]] [now [%remove-posts resource indices]]

2
pkg/landscape/gen/graph-store/remove-signatures.hoon
View File

@ -6,6 +6,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[[=resource =index] =signatures ~] ~] [[[=resource =index] =signatures ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%remove-signatures [resource index] signatures]] [now [%remove-signatures [resource index] signatures]]

2
pkg/landscape/gen/graph-store/remove-tag.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[=term =uid ~] ~] [[=term =uid ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%remove-tag term uid]] [now [%remove-tag term uid]]

2
pkg/landscape/gen/graph-store/unarchive-graph.hoon
View File

@ -5,6 +5,6 @@
|= $: [now=@da eny=@uvJ =beak] |= $: [now=@da eny=@uvJ =beak]
[[=resource ~] ~] [[=resource ~] ~]
== ==
:- %graph-update-2 :- %graph-update-3
^- update ^- update
[now [%unarchive-graph resource]] [now [%unarchive-graph resource]]

2
pkg/landscape/gen/tally.hoon
View File

@ -67,7 +67,7 @@
=/ real=(set resource:re) =/ real=(set resource:re)
=/ upd=update:ga =/ upd=update:ga
%+ scry update:ga %+ scry update:ga
[%x %graph-store /keys/graph-update-2] [%x %graph-store /keys/graph-update-3]
?> ?=(%keys -.q.upd) ?> ?=(%keys -.q.upd)
resources.q.upd resources.q.upd
:: count activity per channel :: count activity per channel

2
pkg/landscape/lib/graph.hoon
View File

@ -6,7 +6,7 @@
++ update ++ update
|= =update:store |= =update:store
^- cage ^- cage
[%graph-update-2 !>(update)] [%graph-update-3 !>(update)]
-- --
:: ::
++ scry-for ++ scry-for

1
pkg/landscape/mar/docket-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../garden-dev/mar/docket-0.hoon

1
pkg/landscape/mar/docket.hoon
View File

@ -1 +0,0 @@
../../garden-dev/mar/docket.hoon

1
pkg/landscape/mar/glob-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../base-dev/mar/glob-0.hoon

1
pkg/landscape/mar/glob.hoon
View File

@ -1 +0,0 @@
../../base-dev/mar/glob.hoon

10
pkg/landscape/mar/graph/update-2.hoon
View File

@ -1,19 +1,15 @@
/+ *graph-store /+ *graph-store
=* as-octs as-octs:mimes:html =* as-octs as-octs:mimes:html
:: ::
|_ upd=update |_ =update:two
++ grad %noun ++ grad %noun
++ grow ++ grow
|% |%
++ noun upd ++ noun update
++ json (update:enjs upd)
++ mime [/application/x-urb-graph-update (as-octs (jam upd))]
-- --
:: ::
++ grab ++ grab
|% |%
++ noun update ++ noun update:two
++ json update:dejs
++ mime |=([* =octs] ;;(update (cue q.octs)))
-- --
-- --

19
pkg/landscape/mar/graph/update-3.hoon Normal file
View File

@ -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)))
--
--

69
pkg/landscape/sur/graph-store.hoon
View File

@ -69,9 +69,76 @@
+$ permission-level +$ permission-level
?(%no %self %yes) ?(%no %self %yes)
:: ::
:: %graph-store types version 2
::
++ two
=< [. post-one]
=, post-one
|%
++ orm ((on atom node) gth)
++ orm-log ((on time logged-update) gth)
::
+$ graph ((mop atom node) gth)
+$ marked-graph [p=graph q=(unit mark)]
::
+$ node [=post children=internal-graph]
+$ graphs (map resource marked-graph)
::
+$ tag-queries (jug term resource)
::
+$ update-log ((mop time logged-update) gth)
+$ update-logs (map resource update-log)
::
+$ internal-graph
$~ [%empty ~]
$% [%graph p=graph]
[%empty ~]
==
::
+$ network
$: =graphs
=tag-queries
=update-logs
archive=graphs
validators=(set mark)
==
::
+$ update [p=time q=action]
::
+$ logged-update [p=time q=logged-action]
::
+$ logged-action
$% [%add-graph =resource =graph mark=(unit mark) overwrite=?]
[%add-nodes =resource nodes=(map index node)]
[%remove-nodes =resource indices=(set index)]
[%add-signatures =uid =signatures]
[%remove-signatures =uid =signatures]
==
::
+$ action
$% logged-action
[%remove-graph =resource]
::
[%add-tag =term =resource]
[%remove-tag =term =resource]
::
[%archive-graph =resource]
[%unarchive-graph =resource]
[%run-updates =resource =update-log]
::
:: NOTE: cannot be sent as pokes
::
[%keys =resources]
[%tags tags=(set term)]
[%tag-queries =tag-queries]
==
--
::
:: %graph-store types version 1 :: %graph-store types version 1
:: ::
++ one ++ one
=< [. post-one]
=, post-one
|% |%
++ orm ((on atom node) gth) ++ orm ((on atom node) gth)
++ orm-log ((on time logged-update) gth) ++ orm-log ((on time logged-update) gth)

17
pkg/landscape/sur/post.hoon
View File

@ -40,6 +40,23 @@
[%reference =reference] [%reference =reference]
== ==
:: ::
++ post-one
|%
::
+$ content
$% [%text text=cord]
[%mention =ship]
[%url url=cord]
[%code expression=cord output=(list tank)]
[%reference =reference]
==
::
+$ reference
$% [%graph group=resource =uid]
[%group group=resource]
==
--
::
++ post-zero ++ post-zero
|% |%
:: ::

2
pkg/landscape/ted/graph/add-nodes.hoon
View File

@ -32,7 +32,7 @@
=/ hashes (nodes-to-pending-indices nodes.q.update) =/ hashes (nodes-to-pending-indices nodes.q.update)
;< ~ bind:m ;< ~ bind:m
%^ poke-our %graph-push-hook %^ poke-our %graph-push-hook
%graph-update-2 %graph-update-3
!> ^- update:store !> ^- update:store
update update
(pure:m !>(`action:graph-view`[%pending-indices hashes])) (pure:m !>(`action:graph-view`[%pending-indices hashes]))

2
pkg/landscape/ted/graph/create-group-feed.hoon
View File

@ -39,7 +39,7 @@
== ==
;< ~ bind:m ;< ~ bind:m
%+ poke-our %graph-store %+ poke-our %graph-store
:- %graph-update-2 :- %graph-update-3
!> ^- update:graph !> ^- update:graph
[now.bowl %add-graph feed-rid *graph:graph `%graph-validator-post %&] [now.bowl %add-graph feed-rid *graph:graph `%graph-validator-post %&]
;< ~ bind:m ;< ~ bind:m

2
pkg/landscape/ted/graph/create.hoon
View File

@ -54,7 +54,7 @@
=/ =update:graph =/ =update:graph
[now.bowl %add-graph rid.action *graph:graph mark.action overwrite] [now.bowl %add-graph rid.action *graph:graph mark.action overwrite]
;< ~ bind:m ;< ~ bind:m
(poke-our %graph-store graph-update-2+!>(update)) (poke-our %graph-store graph-update-3+!>(update))
;< ~ bind:m ;< ~ bind:m
(poke-our %graph-push-hook %push-hook-action !>([%add rid.action])) (poke-our %graph-push-hook %push-hook-action !>([%add rid.action]))
:: ::

2
pkg/landscape/ted/graph/delete.hoon
View File

@ -36,7 +36,7 @@
^- form:m ^- form:m
;< =bowl:spider bind:m get-bowl:strandio ;< =bowl:spider bind:m get-bowl:strandio
;< ~ bind:m ;< ~ bind:m
(poke-our %graph-store %graph-update-2 !>([now.bowl %remove-graph rid])) (poke-our %graph-store %graph-update-3 !>([now.bowl %remove-graph rid]))
;< ~ bind:m ;< ~ bind:m
(poke-our %graph-push-hook %push-hook-action !>([%remove rid])) (poke-our %graph-push-hook %push-hook-action !>([%remove rid]))
;< ~ bind:m ;< ~ bind:m

2
pkg/landscape/ted/graph/disable-group-feed.hoon
View File

@ -40,7 +40,7 @@
?: ?=([~ ^] feed.config.metadatum) ?: ?=([~ ^] feed.config.metadatum)
;< ~ bind:m ;< ~ bind:m
%+ poke-our %graph-store %+ poke-our %graph-store
:- %graph-update-2 :- %graph-update-3
!> ^- update:graph !> ^- update:graph
[now.bowl [%archive-graph resource.u.u.feed.config.metadatum]] [now.bowl [%archive-graph resource.u.u.feed.config.metadatum]]
(pure:m !>(~)) (pure:m !>(~))

2
pkg/landscape/ted/graph/leave.hoon
View File

@ -31,7 +31,7 @@
;< ~ bind:m ;< ~ bind:m
(raw-poke-our %graph-pull-hook %pull-hook-action !>([%remove rid])) (raw-poke-our %graph-pull-hook %pull-hook-action !>([%remove rid]))
;< ~ bind:m ;< ~ bind:m
(raw-poke-our %graph-store %graph-update-2 !>([now [%remove-graph rid]])) (raw-poke-our %graph-store %graph-update-3 !>([now [%remove-graph rid]]))
(pure:m ~) (pure:m ~)
-- --
:: ::

2
pkg/landscape/ted/graph/restore.hoon
View File

@ -17,7 +17,7 @@
;< =bowl:spider bind:m get-bowl:strandio ;< =bowl:spider bind:m get-bowl:strandio
:: unarchive graph and share it :: unarchive graph and share it
;< ~ bind:m ;< ~ bind:m
(poke-our %graph-store %graph-update-2 !>([now.bowl %unarchive-graph rid])) (poke-our %graph-store %graph-update-3 !>([now.bowl %unarchive-graph rid]))
;< ~ bind:m ;< ~ bind:m
(poke-our %graph-push-hook %push-hook-action !>([%add rid])) (poke-our %graph-push-hook %push-hook-action !>([%add rid]))
:: ::

2
pkg/landscape/ted/group/on-leave.hoon
View File

@ -70,7 +70,7 @@
;< ~ bind:m ;< ~ bind:m
%+ raw-poke %+ raw-poke
[our.bowl %graph-store] [our.bowl %graph-store]
:- %graph-update-2 :- %graph-update-3
!> ^- update:gra !> ^- update:gra
[now.bowl [%archive-graph app-resource]] [now.bowl [%archive-graph app-resource]]
;< ~ bind:m ;< ~ bind:m

2
pkg/landscape/ted/ph/migrate/make-graphs.hoon
View File

@ -14,7 +14,7 @@
=/ =post:post [our index wen [%text body]~ ~ ~] =/ =post:post [our index wen [%text body]~ ~ ~]
=/ =node:graph-store [[%& post] %empty ~] =/ =node:graph-store [[%& post] %empty ~]
=/ act=update:graph-store [wen %add-nodes rid (my [index node] ~)] =/ act=update:graph-store [wen %add-nodes rid (my [index node] ~)]
(poke-app our %graph-push-hook %graph-update-2 act) (poke-app our %graph-push-hook %graph-update-3 act)
-- --
:: ::
^- thread:spider ^- thread:spider

2
pkg/landscape/ted/ph/migrate/post-import-graphs.hoon
View File

@ -14,7 +14,7 @@
=/ =post:post [our index wen [%text body]~ ~ ~] =/ =post:post [our index wen [%text body]~ ~ ~]
=/ =node:graph-store [[%& post] %empty ~] =/ =node:graph-store [[%& post] %empty ~]
=/ act=update:graph-store [wen %add-nodes rid (my [index node] ~)] =/ act=update:graph-store [wen %add-nodes rid (my [index node] ~)]
(poke-app our %graph-push-hook %graph-update-2 act) (poke-app our %graph-push-hook %graph-update-3 act)
-- --
:: ::
^- thread:spider ^- thread:spider

2
pkg/npm/api/graph/lib.ts
View File

@ -5,7 +5,7 @@ import { Enc, Path, Patp, PatpNoSig, Poke, Thread } from '../lib/types';
import { Content, GraphChildrenPoke, GraphNode, GraphNodePoke, Post } from './types'; import { Content, GraphChildrenPoke, GraphNode, GraphNodePoke, Post } from './types';
import { patp2dec } from 'urbit-ob'; import { patp2dec } from 'urbit-ob';
export const GRAPH_UPDATE_VERSION = 2; export const GRAPH_UPDATE_VERSION = 3;
export const createBlankNodeWithChildPost = ( export const createBlankNodeWithChildPost = (
ship: PatpNoSig, ship: PatpNoSig,

0
pkg/webterm/desk.docket → pkg/webterm/desk.docket-0
View File

1
pkg/webterm/mar/docket-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../garden-dev/mar/docket-0.hoon

1
pkg/webterm/mar/docket.hoon
View File

@ -1 +0,0 @@
../../garden-dev/mar/docket.hoon

1
pkg/webterm/mar/glob-0.hoon Symbolic link
View File

@ -0,0 +1 @@
../../base-dev/mar/glob-0.hoon

1
pkg/webterm/mar/glob.hoon
View File

@ -1 +0,0 @@
../../base-dev/mar/glob.hoon