From 0a555981cc65f27c13a7dba445c87d935f7caf08 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@tlon.io>
Date: Tue, 29 Nov 2022 13:25:15 +1000
Subject: [PATCH] landscape: optionally disable memory mitigations in OTA

---
 pkg/landscape/app/group-store.hoon |  6 +++---
 pkg/landscape/lib/gladio.hoon      | 29 +++++++++++++++++------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkg/landscape/app/group-store.hoon b/pkg/landscape/app/group-store.hoon
index e57f27a6a8..bc6e5bae8c 100644
--- a/pkg/landscape/app/group-store.hoon
+++ b/pkg/landscape/app/group-store.hoon
@@ -228,9 +228,9 @@
 ++  poke-export
   ^-  (quip card _state)
   :_  state
-  =;  =(fyrd:khan cage)
-    [%pass /export %arvo %k %fard fyrd]~
-  [q.byk.bol %keep noun+!>(~(export gladio bol))]
+  =;  =cage
+    [%pass /export %agent [our.bol %hood] %poke cage]~
+  drum-put+!>([/groups/jam ~(export gladio bol)])
 ::
 ++  poke-migrate
   ^-  (quip card _state)
diff --git a/pkg/landscape/lib/gladio.hoon b/pkg/landscape/lib/gladio.hoon
index 67bf9ab73d..29b738667e 100644
--- a/pkg/landscape/lib/gladio.hoon
+++ b/pkg/landscape/lib/gladio.hoon
@@ -6,6 +6,9 @@
 /-  *group
 |_  =bowl:gall
 +$  card  card:agent:gall
+::  if false, indicates that OTA should be done in one go, in order to
+::  allow for testing on partial testnets
+++  split-ota   &
 ++  import-club
   |=  [=^groups =associations:met =network:gra]
   %-  ~(gas by *imports:club:i)
@@ -74,10 +77,8 @@
 ++  associations-raw
   .^(* (scry %metadata-store /export/noun))
 ++  export
-  ~>  %bout.[1 %export-jam]
   %-  jam
   ^-  *
-  ~>  %bout.[1 %export-scry]
   :~  [%group-store groups-raw]
       [%metadata-store associations-raw]
   ==
@@ -143,16 +144,20 @@
           heap-flags=(flag-importer %graph-validator-link)
           diary-flags=(flag-importer %graph-validator-publish)
       ==
-  :_  ships
-  %+  welp  (migrate-ship our.bowl)
-  :*  (poke-our %groups group-import+!>(imports))
-      (poke-our %chat import-flags+!>(chat-flags))
-      (poke-our %heap import-flags+!>(heap-flags))
-      (poke-our %diary import-flags+!>(diary-flags))
-      (poke-our %chat club-imports+!>(clubs))
-      ?~  dms  ~
-      (poke-our %chat dm-imports+!>(p.u.dms))^~
-  ==
+  =/  setup=(list card)
+    %+  welp  (migrate-ship our.bowl)
+    :*  (poke-our %groups group-import+!>(imports))
+        (poke-our %chat import-flags+!>(chat-flags))
+        (poke-our %heap import-flags+!>(heap-flags))
+        (poke-our %diary import-flags+!>(diary-flags))
+        (poke-our %chat club-imports+!>(clubs))
+        ?~  dms  ~
+        (poke-our %chat dm-imports+!>(p.u.dms))^~
+    ==
+  ?.  split-ota
+    :_  ~
+    (welp setup (zing (turn ~(tap in (~(del in ships) our.bowl)) migrate-ship)))
+  [setup ships]
 ::
 ++  migrate-ship
   |=  her=ship