diff --git a/pkg/base-dev/mar/glob.hoon b/pkg/base-dev/mar/glob-0.hoon similarity index 100% rename from pkg/base-dev/mar/glob.hoon rename to pkg/base-dev/mar/glob-0.hoon diff --git a/pkg/bitcoin/desk.docket b/pkg/bitcoin/desk.docket-0 similarity index 100% rename from pkg/bitcoin/desk.docket rename to pkg/bitcoin/desk.docket-0 diff --git a/pkg/bitcoin/mar/docket-0.hoon b/pkg/bitcoin/mar/docket-0.hoon new file mode 120000 index 000000000..2bb549dd9 --- /dev/null +++ b/pkg/bitcoin/mar/docket-0.hoon @@ -0,0 +1 @@ +../../garden-dev/mar/docket-0.hoon \ No newline at end of file diff --git a/pkg/bitcoin/mar/docket.hoon b/pkg/bitcoin/mar/docket.hoon deleted file mode 120000 index c642f467c..000000000 --- a/pkg/bitcoin/mar/docket.hoon +++ /dev/null @@ -1 +0,0 @@ -../../garden-dev/mar/docket.hoon \ No newline at end of file diff --git a/pkg/bitcoin/mar/glob-0.hoon b/pkg/bitcoin/mar/glob-0.hoon new file mode 120000 index 000000000..08f82c88f --- /dev/null +++ b/pkg/bitcoin/mar/glob-0.hoon @@ -0,0 +1 @@ +../../base-dev/mar/glob-0.hoon \ No newline at end of file diff --git a/pkg/bitcoin/mar/glob.hoon b/pkg/bitcoin/mar/glob.hoon deleted file mode 120000 index 15b77e5a3..000000000 --- a/pkg/bitcoin/mar/glob.hoon +++ /dev/null @@ -1 +0,0 @@ -../../base-dev/mar/glob.hoon \ No newline at end of file diff --git a/pkg/bitcoin/sur/hark-store.hoon b/pkg/bitcoin/sur/hark-store.hoon new file mode 120000 index 000000000..5d606e793 --- /dev/null +++ b/pkg/bitcoin/sur/hark-store.hoon @@ -0,0 +1 @@ +../../garden-dev/sur/hark-store.hoon \ No newline at end of file diff --git a/pkg/garden-dev/mar/docket.hoon b/pkg/garden-dev/mar/docket-0.hoon similarity index 100% rename from pkg/garden-dev/mar/docket.hoon rename to pkg/garden-dev/mar/docket-0.hoon diff --git a/pkg/garden/app/docket.hoon b/pkg/garden/app/docket.hoon index d7f293bbc..30477be1a 100644 --- a/pkg/garden/app/docket.hoon +++ b/pkg/garden/app/docket.hoon @@ -133,9 +133,7 @@ ~| [%glob-unavailable requested=hash have=have] ?> =(hash have) :_ state - :~ [%give %fact ~[path] %glob !>(`glob`glob.chad.charge)] - [%give %kick ~[path] ~] - == + (fact-init-kick:io (glob:cg:cc glob.chad.charge)) == [cards this] :: @@ -163,8 +161,7 @@ :: [%x %charges ~] :- ~ :- ~ - :- %charge-update - !> ^- charge-update + %- charge-update:cg:cc :- %initial %- ~(gas by *(map desk charge)) %+ turn ~(tap by charges) @@ -391,6 +388,15 @@ ++ def ~(. (default-agent state %|) bowl) :: ++ 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 |= [eyre-id=@ta inbound-request:eyre] @@ -538,7 +544,7 @@ =- [%pass /write/[desk] %arvo %c %info -]~ %+ foal:space:userlib /(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]) == :: @@ -639,13 +645,14 @@ == ++ add-fact =/ =charge (~(got by charges) desk) - (fact:io charge-update+!>([%add-charge desk (get-light-charge charge)]) /charges ~) - ++ del-fact (fact:io charge-update+!>([%del-charge desk]) /charges ~) + =- (fact:io - /charges ~) + (charge-update:cg %add-charge desk (get-light-charge charge)) + ++ del-fact (fact:io (charge-update:cg %del-charge desk) /charges ~) ++ install |= [=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 - (poke-our:(pass /uninstall) %hood kiln-uninstall+!>(desk)) + (poke-our:(pass /uninstall) %hood (kiln-uninstall:cg desk)) ++ new-docket |= d=^docket %+ ~(put by charges) desk @@ -681,8 +688,9 @@ :~ (watch-our:(pass (glob-wire ref)) %spider /thread-result/[tid]) (poke-our:(pass (glob-wire ref)) %spider cage) == - ++ docket-exists .^(? %cu (scry:io desk /desk/docket)) - ++ docket .^(^docket %cx (scry:io desk /desk/docket)) + ++ docket-loc `path`/desk/docket-0 + ++ docket-exists .^(? %cu (scry:io desk docket-loc)) + ++ docket .^(^docket %cx (scry:io desk docket-loc)) -- -- diff --git a/pkg/garden/app/treaty.hoon b/pkg/garden/app/treaty.hoon index d0874da22..7fa47e3d6 100644 --- a/pkg/garden/app/treaty.hoon +++ b/pkg/garden/app/treaty.hoon @@ -99,10 +99,10 @@ =/ =ship (slav %p i.t.path) =* desk i.t.t.path ?: =(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]) :_ this - (fact-init:io treaty+!>(u.treat))^~ + (fact-init:io (treaty:cg:cc u.treat))^~ ?> =(our.bowl src.bowl) =. direct (~(put in direct) [ship desk]) :_(this (drop ~(safe-watch tr:cc [ship desk]))) @@ -134,13 +134,12 @@ %+ skim ~(tap by treaties) |= [ref=[^ship desk] =treaty] (~(has in alliance) ref) - ``(treaty-update:cg:ca %ini allied) + ``(treaty-update:cg:ca:cc %ini allied) :: [%x %treaty @ @ ~] =/ =ship (slav %p i.t.t.path) =* desk i.t.t.t.path - =/ =treaty (~(got by treaties) [ship desk]) - ``treaty+!>(treaty) + ``(treaty:cg:cc (~(got by treaties) [ship desk])) == :: ++ on-agent @@ -226,7 +225,6 @@ [%sovereign @ ~] =* desk i.t.wire (take-sovereign desk) - == :: ++ take-sovereign @@ -303,9 +301,9 @@ ++ wire /sovereign/[desk] ++ pass ~(. ^pass wire) ++ 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-our:pass desk `[%next %x da+now.bowl /desk/docket]) + (warp-our:pass desk `[%next %x da+now.bowl /desk/docket-0]) ++ kick (kick:io path ~) ++ give @@ -315,13 +313,3 @@ (poke-our:pass %hood kiln-permission+!>([desk / &])) -- -- - - - - - - - - - - diff --git a/pkg/garden/desk.docket b/pkg/garden/desk.docket-0 similarity index 100% rename from pkg/garden/desk.docket rename to pkg/garden/desk.docket-0 diff --git a/pkg/garden/mar/docket-0.hoon b/pkg/garden/mar/docket-0.hoon new file mode 120000 index 000000000..2bb549dd9 --- /dev/null +++ b/pkg/garden/mar/docket-0.hoon @@ -0,0 +1 @@ +../../garden-dev/mar/docket-0.hoon \ No newline at end of file diff --git a/pkg/garden/mar/docket.hoon b/pkg/garden/mar/docket.hoon deleted file mode 120000 index c642f467c..000000000 --- a/pkg/garden/mar/docket.hoon +++ /dev/null @@ -1 +0,0 @@ -../../garden-dev/mar/docket.hoon \ No newline at end of file diff --git a/pkg/garden/mar/glob-0.hoon b/pkg/garden/mar/glob-0.hoon new file mode 120000 index 000000000..08f82c88f --- /dev/null +++ b/pkg/garden/mar/glob-0.hoon @@ -0,0 +1 @@ +../../base-dev/mar/glob-0.hoon \ No newline at end of file diff --git a/pkg/garden/mar/glob.hoon b/pkg/garden/mar/glob.hoon deleted file mode 120000 index 15b77e5a3..000000000 --- a/pkg/garden/mar/glob.hoon +++ /dev/null @@ -1 +0,0 @@ -../../base-dev/mar/glob.hoon \ No newline at end of file diff --git a/pkg/garden/mar/treaty.hoon b/pkg/garden/mar/treaty-0.hoon similarity index 100% rename from pkg/garden/mar/treaty.hoon rename to pkg/garden/mar/treaty-0.hoon diff --git a/pkg/landscape/desk.docket b/pkg/landscape/desk.docket-0 similarity index 100% rename from pkg/landscape/desk.docket rename to pkg/landscape/desk.docket-0 diff --git a/pkg/landscape/mar/docket-0.hoon b/pkg/landscape/mar/docket-0.hoon new file mode 120000 index 000000000..2bb549dd9 --- /dev/null +++ b/pkg/landscape/mar/docket-0.hoon @@ -0,0 +1 @@ +../../garden-dev/mar/docket-0.hoon \ No newline at end of file diff --git a/pkg/landscape/mar/docket.hoon b/pkg/landscape/mar/docket.hoon deleted file mode 120000 index c642f467c..000000000 --- a/pkg/landscape/mar/docket.hoon +++ /dev/null @@ -1 +0,0 @@ -../../garden-dev/mar/docket.hoon \ No newline at end of file diff --git a/pkg/landscape/mar/glob-0.hoon b/pkg/landscape/mar/glob-0.hoon new file mode 120000 index 000000000..08f82c88f --- /dev/null +++ b/pkg/landscape/mar/glob-0.hoon @@ -0,0 +1 @@ +../../base-dev/mar/glob-0.hoon \ No newline at end of file diff --git a/pkg/landscape/mar/glob.hoon b/pkg/landscape/mar/glob.hoon deleted file mode 120000 index 15b77e5a3..000000000 --- a/pkg/landscape/mar/glob.hoon +++ /dev/null @@ -1 +0,0 @@ -../../base-dev/mar/glob.hoon \ No newline at end of file diff --git a/pkg/webterm/desk.docket b/pkg/webterm/desk.docket-0 similarity index 100% rename from pkg/webterm/desk.docket rename to pkg/webterm/desk.docket-0 diff --git a/pkg/webterm/mar/docket-0.hoon b/pkg/webterm/mar/docket-0.hoon new file mode 120000 index 000000000..2bb549dd9 --- /dev/null +++ b/pkg/webterm/mar/docket-0.hoon @@ -0,0 +1 @@ +../../garden-dev/mar/docket-0.hoon \ No newline at end of file diff --git a/pkg/webterm/mar/docket.hoon b/pkg/webterm/mar/docket.hoon deleted file mode 120000 index c642f467c..000000000 --- a/pkg/webterm/mar/docket.hoon +++ /dev/null @@ -1 +0,0 @@ -../../garden-dev/mar/docket.hoon \ No newline at end of file diff --git a/pkg/webterm/mar/glob-0.hoon b/pkg/webterm/mar/glob-0.hoon new file mode 120000 index 000000000..08f82c88f --- /dev/null +++ b/pkg/webterm/mar/glob-0.hoon @@ -0,0 +1 @@ +../../base-dev/mar/glob-0.hoon \ No newline at end of file diff --git a/pkg/webterm/mar/glob.hoon b/pkg/webterm/mar/glob.hoon deleted file mode 120000 index 15b77e5a3..000000000 --- a/pkg/webterm/mar/glob.hoon +++ /dev/null @@ -1 +0,0 @@ -../../base-dev/mar/glob.hoon \ No newline at end of file