diff --git a/pkg/landscape/app/group-store.hoon b/pkg/landscape/app/group-store.hoon index 444c46cd8..e4c16ac71 100644 --- a/pkg/landscape/app/group-store.hoon +++ b/pkg/landscape/app/group-store.hoon @@ -66,7 +66,7 @@ =* state - :: %- agent:dbug -%+ verb | +%+ verb & ^- agent:gall =< |_ =bowl:gall @@ -87,8 +87,13 @@ :: %2 %_ $ - old [%3 groups ~] - cards :_(cards [%pass / %agent [our dap]:bowl %poke noun+!>(%migrate)]) + old [%3 groups.old ~] + cards + %- welp + :_ cards + :~ [%pass / %agent [our dap]:bowl %poke noun+!>(%migrate)] + [%pass / %agent [our %hood]:bowl %poke %kiln-install !>([%new-groups ~zod %groups])] + == == :: %1 @@ -175,6 +180,8 @@ ++ on-agent |= [=wire =sign:agent:gall] ^- (quip card _this) + ?: ?=([%gladio ~] wire) + (on-agent:def wire sign) ?: ?=([%gladio @ ~] wire) =^ cards state (take-migrate:gc sign) @@ -222,12 +229,12 @@ ^- card [%pass /gladio/(scot %p ship) %agent [ship %groups] %watch /init] =/ cards (welp cards-1 cards-2) - ~& cards [cards state(wait wait)] :: ++ take-migrate |= =sign:agent:gall ^- (quip card _state) + ~& migrating/src.bol ?: ?=(%poke-ack -.sign) `state :_ state(wait (~(del in wait) src.bol)) diff --git a/pkg/landscape/lib/gladio.hoon b/pkg/landscape/lib/gladio.hoon index 4a70607d6..a6d59a85e 100644 --- a/pkg/landscape/lib/gladio.hoon +++ b/pkg/landscape/lib/gladio.hoon @@ -48,13 +48,14 @@ (turn ~(tap in ~(key by graphs.network)) head) ++ poke-our |= [=dude:gall =cage] - [%pass /gladio/[dude] %agent [our.bowl dude] %poke cage] + [%pass /gladio %agent [our.bowl dude] %poke cage] ++ migrate-start ^- (quip card (set ship)) =+ network =+ groups =+ associations =/ ships (peers network) + ~& ships/ships =/ dms (~(get by graphs:network) [our.bowl %dm-inbox]) =/ import (import-for-mark our.bowl groups associations network) =/ chats=imports:graph:i @@ -109,7 +110,7 @@ =+ groups =+ network =+ associations - =/ import (import-for-mark our.bowl groups associations network) + =/ import (import-for-mark her groups associations network) =/ chats=imports:graph:i (import %graph-validator-chat) =/ diarys=imports:graph:i