From 97f888e50781af605b7ba6bdcc39206ffcfe9a01 Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Tue, 23 Jul 2024 08:25:52 +0000
Subject: [PATCH] fix(orchestration): chainHub accepts zone

---
 .../src/examples/stake-bld.contract.js        |   6 +-
 .../src/examples/stake-ica.contract.js        |   6 +-
 packages/orchestration/src/exos/chain-hub.js  |   8 +-
 .../src/proposals/start-stakeAtom.js          |   9 +-
 .../src/proposals/start-stakeOsmo.js          |   9 +-
 .../orchestration/src/utils/start-helper.js   |   4 +-
 .../snapshots/send-anywhere.test.ts.md        |   8 ++
 .../snapshots/send-anywhere.test.ts.snap      | Bin 1102 -> 1215 bytes
 .../snapshots/staking-combinations.test.ts.md |  73 ++++++++++++++
 .../staking-combinations.test.ts.snap         | Bin 1664 -> 2471 bytes
 .../snapshots/unbond.contract.test.ts.md      |  91 ++++++++++++++++++
 .../snapshots/unbond.contract.test.ts.snap    | Bin 981 -> 1887 bytes
 .../orchestration/test/exos/chain-hub.test.ts |   4 +-
 .../orchestration/test/staking-ops.test.ts    |  28 ++++--
 packages/orchestration/test/supports.ts       |   6 +-
 15 files changed, 228 insertions(+), 24 deletions(-)

diff --git a/packages/orchestration/src/examples/stake-bld.contract.js b/packages/orchestration/src/examples/stake-bld.contract.js
index 82454422525..f51136e2629 100644
--- a/packages/orchestration/src/examples/stake-bld.contract.js
+++ b/packages/orchestration/src/examples/stake-bld.contract.js
@@ -43,7 +43,11 @@ export const start = async (zcf, privateArgs, baggage) => {
   );
   const vowTools = prepareVowTools(zone.subZone('vows'));
 
-  const chainHub = makeChainHub(privateArgs.agoricNames, vowTools);
+  const chainHub = makeChainHub(
+    zone.subZone('chainHub'),
+    privateArgs.agoricNames,
+    vowTools,
+  );
   const zoeTools = makeZoeTools(zcf, vowTools);
 
   const { localchain, timerService } = privateArgs;
diff --git a/packages/orchestration/src/examples/stake-ica.contract.js b/packages/orchestration/src/examples/stake-ica.contract.js
index d6b89145368..11dde1662b2 100644
--- a/packages/orchestration/src/examples/stake-ica.contract.js
+++ b/packages/orchestration/src/examples/stake-ica.contract.js
@@ -84,7 +84,11 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const vowTools = prepareVowTools(zone.subZone('vows'));
 
-  const chainHub = makeChainHub(agoricNames, vowTools);
+  const chainHub = makeChainHub(
+    zone.subZone('chainHub'),
+    agoricNames,
+    vowTools,
+  );
 
   const makeCosmosOrchestrationAccount = prepareCosmosOrchestrationAccount(
     zone,
diff --git a/packages/orchestration/src/exos/chain-hub.js b/packages/orchestration/src/exos/chain-hub.js
index 903fb370c48..e9f52972e4b 100644
--- a/packages/orchestration/src/exos/chain-hub.js
+++ b/packages/orchestration/src/exos/chain-hub.js
@@ -4,12 +4,12 @@ import { M } from '@endo/patterns';
 import { BrandShape } from '@agoric/ertp/src/typeGuards.js';
 
 import { VowShape } from '@agoric/vow';
-import { makeHeapZone } from '@agoric/zone';
 import { CosmosChainInfoShape, IBCConnectionInfoShape } from '../typeGuards.js';
 
 /**
  * @import {NameHub} from '@agoric/vats';
  * @import {Vow, VowTools} from '@agoric/vow';
+ * @import {Zone} from '@agoric/zone';
  * @import {CosmosAssetInfo, CosmosChainInfo, IBCConnectionInfo} from '../cosmos-api.js';
  * @import {ChainInfo, KnownChains} from '../chain-info.js';
  * @import {Denom} from '../orchestration-api.js';
@@ -171,18 +171,18 @@ const ChainHubI = M.interface('ChainHub', {
 });
 
 /**
- * Make a new ChainHub in the zone (or in the heap if no zone is provided).
+ * Make a new ChainHub in the zone.
  *
  * The resulting object is an Exo singleton. It has no precious state. It's only
  * state is a cache of queries to agoricNames and whatever info was provided in
  * registration calls. When you need a newer version you can simply make a hub
  * hub and repeat the registrations.
  *
+ * @param {Zone} zone
  * @param {Remote<NameHub>} agoricNames
  * @param {VowTools} vowTools
  */
-export const makeChainHub = (agoricNames, vowTools) => {
-  const zone = makeHeapZone();
+export const makeChainHub = (zone, agoricNames, vowTools) => {
   /** @type {MapStore<string, CosmosChainInfo>} */
   const chainInfos = zone.mapStore('chainInfos', {
     keyShape: M.string(),
diff --git a/packages/orchestration/src/proposals/start-stakeAtom.js b/packages/orchestration/src/proposals/start-stakeAtom.js
index c759790a8d4..f6a245bfc08 100644
--- a/packages/orchestration/src/proposals/start-stakeAtom.js
+++ b/packages/orchestration/src/proposals/start-stakeAtom.js
@@ -46,8 +46,13 @@ export const startStakeAtom = async ({
   const storageNode = await makeStorageNodeChild(chainStorage, VSTORAGE_PATH);
   const marshaller = await E(board).getPublishingMarshaller();
 
-  const vt = prepareVowTools(makeHeapZone());
-  const chainHub = makeChainHub(await agoricNames, vt);
+  const zone = makeHeapZone();
+  const vt = prepareVowTools(zone.subZone('vows'));
+  const chainHub = makeChainHub(
+    zone.subZone('chainHub'),
+    await agoricNames,
+    vt,
+  );
 
   const [_, cosmoshub, connectionInfo] = await vt.when(
     chainHub.getChainsAndConnection('agoric', 'cosmoshub'),
diff --git a/packages/orchestration/src/proposals/start-stakeOsmo.js b/packages/orchestration/src/proposals/start-stakeOsmo.js
index 0f020a62a89..77bd2d562c8 100644
--- a/packages/orchestration/src/proposals/start-stakeOsmo.js
+++ b/packages/orchestration/src/proposals/start-stakeOsmo.js
@@ -51,8 +51,13 @@ export const startStakeOsmo = async ({
   const storageNode = await makeStorageNodeChild(chainStorage, VSTORAGE_PATH);
   const marshaller = await E(board).getPublishingMarshaller();
 
-  const vt = prepareVowTools(makeHeapZone());
-  const chainHub = makeChainHub(await agoricNames, vt);
+  const zone = makeHeapZone();
+  const vt = prepareVowTools(zone.subZone('vows'));
+  const chainHub = makeChainHub(
+    zone.subZone('chainHub'),
+    await agoricNames,
+    vt,
+  );
 
   const [_, osmosis, connectionInfo] = await vt.when(
     chainHub.getChainsAndConnection('agoric', 'osmosis'),
diff --git a/packages/orchestration/src/utils/start-helper.js b/packages/orchestration/src/utils/start-helper.js
index e3b2cd7aa9d..7c37457ffa7 100644
--- a/packages/orchestration/src/utils/start-helper.js
+++ b/packages/orchestration/src/utils/start-helper.js
@@ -61,6 +61,8 @@ export const provideOrchestration = (
       asyncFlow: zone.subZone('asyncFlow'),
       /** system names for orchestration implementation */
       orchestration: zone.subZone('orchestration'),
+      /** system names for chainHub */
+      chainHub: zone.subZone('chainHub'),
       /** system names for vows */
       vows: zone.subZone('vows'),
       /** contract-provided names, and subzones */
@@ -72,7 +74,7 @@ export const provideOrchestration = (
 
   const vowTools = prepareVowTools(zones.vows);
 
-  const chainHub = makeChainHub(agoricNames, vowTools);
+  const chainHub = makeChainHub(zones.chainHub, agoricNames, vowTools);
 
   const zoeTools = makeZoeTools(zcf, vowTools);
 
diff --git a/packages/orchestration/test/examples/snapshots/send-anywhere.test.ts.md b/packages/orchestration/test/examples/snapshots/send-anywhere.test.ts.md
index 11710ddf60d..5f4dbdca9a3 100644
--- a/packages/orchestration/test/examples/snapshots/send-anywhere.test.ts.md
+++ b/packages/orchestration/test/examples/snapshots/send-anywhere.test.ts.md
@@ -24,6 +24,14 @@ Generated by [AVA](https://avajs.dev).
         flowForOutcomeVow: {},
         unwrapMap: 'Alleged: weakMapStore',
       },
+      chainHub: {
+        ChainHub_kindHandle: 'Alleged: kind',
+        ChainHub_singleton: 'Alleged: ChainHub',
+        brandDenom: {},
+        chainInfos: {},
+        connectionInfos: {},
+        denom: {},
+      },
       contract: {
         'ChainHub Admin_kindHandle': 'Alleged: kind',
         'ChainHub Admin_singleton': 'Alleged: ChainHub Admin',
diff --git a/packages/orchestration/test/examples/snapshots/send-anywhere.test.ts.snap b/packages/orchestration/test/examples/snapshots/send-anywhere.test.ts.snap
index bbf9e53542d64bc4c6152de2241123e5fe71373e..bab47226e8b51cb8fa66f49fa275be951a16c45b 100644
GIT binary patch
literal 1215
zcmV;w1VH;iRzV<BZeeh9Xm4~Nb~6eC0L(XiOohf<e()qwFZ+7jE}`}G0pQ%q`)qL!
z@e2zAARmhe00000000A>SIci3MI8Rd_O92D^`l8>(gv{L1cwSvNQg_C;wEa+gghGc
zgvPrQdz<x)wL8X?Q+q*F>H&!hLU16We*ogpL&Xs!!~t<C2jBn|LP$ucC!`{Tyw2LY
zv&72AC(GYs=J%Qzf4bjtg>~THK4j97E^D`FyG`57@j31J9U=YOhqg^6y<T~eMIOTs
zF^JIwum<3L0N((31mIr)^8|Q>05e3d6Mds~gISW0@z+|d24aHbL8_P`nOTwr(dy)x
zOMQ>FT-Mm^w_L~XG_E-E%>#$qE0o(V3u)$(>#{bpUu_IA#baiRS;DiKcLHIBkaYrt
zaDn<axz%*VAb>uOK!(+!4qxfF0_0%~5nOuIk^xf5Ob}CeR)_i0qtX#PfZvF~xwpi?
zA7-(9D+9cn0lvxrW)`@d1@2^lhgqPO12%F%KL>o610Lj*tY+d_HAwz(4){9<ysQCT
z4Y;EL_cY*ZO_A!VRR2i>e${~Ibl`>#9O}T2x*{v7vceM`!(w7L58TTGzvY4F4S*TI
zEd%(-P%P@IMee=<d}#px7{F@<g+7<)oRU)Yg(bV|@TIVRX`5zVk^2sByG#lm63&j*
zai-!kd(j#0(h)rE4i=kz9td~&z@xq1iTXF@a6ajf2;<z?AVF5gXic=YrSMqVZ7gg{
zDp{H+DufIQlew53O<|u~uhTa3_UHlg{DAdAgjFB2n$&Uo9ve|Uk5cwsF=z^Jqc1Jd
zW!DnbD)fV0uG3!l%iMTt14a+lX)j1Y&~dt&pyi_zA#H-rjD?Bv)W^Ez=yCI1B&cG`
zqujp4xabDhpHVD0q*nR97$u`roM2T;a6W3y3E_nZL9<7mCWxk%G~CUo`BM*<BA+r`
zai*HMZN}}!W;5;j^-z~sxHgs@QG%>oE*^h|n;?c_e_>hpUEw!2qRhsUWr;qQjTPaZ
z>@JFVzPKhV>K<cxic9f);1^`KNiAxpp6auct%%goEN-!`kSyKu6+(EV5QU((uhK3H
zpt}*sa9Y-m5bmg_A4HH+k6H&z9)Tu?KgT<J(-U3CXM0pyo%CfocTEgdxnv%vu78TM
z%mwT2O2_q2AT>spqPFCD^d`xM->TK>7z;1VoN~X$QEe)kpNbk&(ZW=;sNVXSUy8u*
zMdh|HPc=D{csig2=q2Dv3AkHQ%w`g6{!jvbR%x?|7X}Hs>FM&Mn{=OXdsY5#BR#u%
zae2q1+}~&3@GN28X{OX^SzFBSyYjUCm@r5jc?)B`$_=Ad24pfpCyU4+*_ASIwG6yh
zR<dj+vYb&LP&CC8u0qIXk@^%Fx5c2#xD1}vnQzO$_v#iZ#}xWe#E85U^wo?BESSKa
z34CHIKGlSe+7k2OAA{gQl={Gps}ps6YAlWsgIMmHk;CyF!H&*9gJ^%4z+WbCp#sPX
z@I^%ltCk2Wr-tPYuadCWQ->8-PYEkVRJ(HE$d2vN!H(EwH1(X#EAlB1k~ovOw8h-F
d7sHe{j{YV$=)PoL!<W>P{{b7NPT@-r007%iSZV+O

literal 1102
zcmV-U1hM-;RzV<BZeeh9Xm4~Nb~6eC0GJd?YvQ72nA!`cUKrOP(NdI4MXvUfKQ)b#
zbv50g2Oo<F00000000A>SI=)7MHqc!ukH1(*d_^0S_=$^f)JESa6(8`l42#$k|;?N
zaR4;lo!E=VGuG@F6AqPnrV<h-5C=s51O#d?9Jz7mU%-zWCyr2+1IX*FvpY+oY<ybn
z_uiZNzVFR^>u(P_TsnRK-VxKD=B(SH-7f7i&lhy)_oVjk9l0*m^u6khEDD(Xh)oKs
z0M-HA2k;Ys-vB%TuuOn?l5ddwX6Ga3XhLR>^?Dto3X%t@VV-0bNERg5AkW+!Dca$z
zwKeK+&+oO~@$`p%Pq^z;xSWNs>I&zq%iK3wlbE3~zs($}T&B)JoFn8_0)*ir^$&&9
z=5ic_?nXkkBZXGf(Lv;gNTe#2(__9?RC`hc;m47%^|2iLlR8yi$N;Zo0G<K9&j5dB
zfa_V{ZWefu1^&tcO$)eT0UgVzT_#>To8-T;fNw0|7Yn$W13t(BU*-&2-lP>D<bWS@
zKqC*(JaCi;e$4~V6@WJjz+S<SsF)I#UjPmZz{3LY*o4;;O)eV^T3&Gno>&P>owmPA
z2Hp2WmoqIz2)Hz3$B~B4!m2mfr6)z&9W>h`5fJZ)v7*D_xvUmbxRO*zq;YvBkN}&G
zza_gnS}K-y8_PSIYL+I8IYM5uPt3hAJuoBTyhXcA?bAL}et_DHpc*q&n|get*c38|
zLJqhbx24(~X-5v&UZPvYQLxL~bQr!_oNaB)X#X}H1|<j_moxKR>rqdvk2+IFq;{M^
zKf`fxq@nZF4ij!`tDScJM#xJnT%Xa7Awgk3vroUBsvx!@e{D_r1L?OmqsZ2Z<H(WF
zt#!%IcbCRAU%Dk7%1@EJz@>gA&<m>DrVe#eTm90>R%GgIn%it3HA}br93kID8c}p6
z?04ya1))cgknMGxT`BqWSo|A_l!w&mGkqMaV)8of>@6h+p3nBFc6#aCba_vXH-u(N
zQ0`x#EsMdrceKa-b5QN+q{yu(MGr|fe5%!IvsgGqEMw@zqd9XVWv&*1my5<IDx4`&
zP0Y2MMd0ls@Ocq<WQxrt)@+u5=Sv2xmKc8|=qfFpbT#iY;cn>vZRoQbt82T83jctq
z$(d&ABB#acINQu0aeYx=Bm@#y&+?3KV#BNrqn<eVd>Pp!d%pyHQ38H8t86E#oH3_6
zP4Rs(N5~(M{*;(-<#@n^4nEv6wKA|+HnvbarO_{zPlU+zz*qZa;Qcc2bs6~G)F~x&
zOiL_<pPs?APJQvk*@-?rJtN0}K`#G9a<M;^?D!tCN$y$&c)bFs3h=N3{9Q59Dksvi
z%(VFAN)NrBI;}YSjI?4v)0JaS_gqECyK;xo)aPu;pr7$!5JxgjJB)wQ3`^cR{;SoZ
U2b!stuc^}i0be%%;ExRe0N^JUu>b%7

diff --git a/packages/orchestration/test/examples/snapshots/staking-combinations.test.ts.md b/packages/orchestration/test/examples/snapshots/staking-combinations.test.ts.md
index 926a50924a3..afcd6ed2fd1 100644
--- a/packages/orchestration/test/examples/snapshots/staking-combinations.test.ts.md
+++ b/packages/orchestration/test/examples/snapshots/staking-combinations.test.ts.md
@@ -24,6 +24,79 @@ Generated by [AVA](https://avajs.dev).
         flowForOutcomeVow: {},
         unwrapMap: 'Alleged: weakMapStore',
       },
+      chainHub: {
+        ChainHub_kindHandle: 'Alleged: kind',
+        ChainHub_singleton: 'Alleged: ChainHub',
+        brandDenom: {
+          'Alleged: BLD brand': 'ubld',
+        },
+        chainInfos: {
+          agoric: {
+            chainId: 'agoric-3',
+            icqEnabled: false,
+            stakingTokens: [
+              {
+                denom: 'ubld',
+              },
+            ],
+          },
+          cosmoshub: {
+            chainId: 'cosmoshub-4',
+            icqEnabled: false,
+            stakingTokens: [
+              {
+                denom: 'uatom',
+              },
+            ],
+          },
+        },
+        connectionInfos: {
+          'agoric-3_cosmoshub-4': {
+            client_id: '07-tendermint-6',
+            counterparty: {
+              client_id: '07-tendermint-927',
+              connection_id: 'connection-649',
+            },
+            id: 'connection-8',
+            state: 3,
+            transferChannel: {
+              channelId: 'channel-5',
+              counterPartyChannelId: 'channel-405',
+              counterPartyPortId: 'transfer',
+              ordering: 0,
+              portId: 'transfer',
+              state: 3,
+              version: 'ics20-1',
+            },
+          },
+          'cosmoshub-4_osmosis-1': {
+            client_id: '07-tendermint-259',
+            counterparty: {
+              client_id: '07-tendermint-1',
+              connection_id: 'connection-1',
+            },
+            id: 'connection-257',
+            state: 3,
+            transferChannel: {
+              channelId: 'channel-141',
+              counterPartyChannelId: 'channel-0',
+              counterPartyPortId: 'transfer',
+              ordering: 0,
+              portId: 'transfer',
+              state: 3,
+              version: 'ics20-1',
+            },
+          },
+        },
+        denom: {
+          ubld: {
+            baseDenom: 'ubld',
+            baseName: 'agoric',
+            brand: Object @Alleged: BLD brand {},
+            chainName: 'agoric',
+          },
+        },
+      },
       contract: {
         'ChainHub Admin_kindHandle': 'Alleged: kind',
         'ChainHub Admin_singleton': 'Alleged: ChainHub Admin',
diff --git a/packages/orchestration/test/examples/snapshots/staking-combinations.test.ts.snap b/packages/orchestration/test/examples/snapshots/staking-combinations.test.ts.snap
index 7a30cfbebf4804c81abe39ccf4371186c0a8e28e..406237967cd19ffb5aa5ec256a4d339d32f20cb7 100644
GIT binary patch
literal 2471
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

literal 1664
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
K9V8hm9{>P+O%Bum

diff --git a/packages/orchestration/test/examples/snapshots/unbond.contract.test.ts.md b/packages/orchestration/test/examples/snapshots/unbond.contract.test.ts.md
index 1a7163c5994..2a64227520d 100644
--- a/packages/orchestration/test/examples/snapshots/unbond.contract.test.ts.md
+++ b/packages/orchestration/test/examples/snapshots/unbond.contract.test.ts.md
@@ -24,6 +24,97 @@ Generated by [AVA](https://avajs.dev).
         flowForOutcomeVow: {},
         unwrapMap: 'Alleged: weakMapStore',
       },
+      chainHub: {
+        ChainHub_kindHandle: 'Alleged: kind',
+        ChainHub_singleton: 'Alleged: ChainHub',
+        brandDenom: {},
+        chainInfos: {
+          agoric: {
+            chainId: 'agoric-3',
+            icqEnabled: false,
+            stakingTokens: [
+              {
+                denom: 'ubld',
+              },
+            ],
+          },
+          osmosis: {
+            chainId: 'osmosis-1',
+            icqEnabled: true,
+            stakingTokens: [
+              {
+                denom: 'uosmo',
+              },
+            ],
+          },
+          stride: {
+            chainId: 'stride-1',
+            icqEnabled: false,
+            stakingTokens: [
+              {
+                denom: 'ustrd',
+              },
+            ],
+          },
+        },
+        connectionInfos: {
+          'agoric-3_osmosis-1': {
+            client_id: '07-tendermint-1',
+            counterparty: {
+              client_id: '07-tendermint-2109',
+              connection_id: 'connection-1649',
+            },
+            id: 'connection-1',
+            state: 3,
+            transferChannel: {
+              channelId: 'channel-1',
+              counterPartyChannelId: 'channel-320',
+              counterPartyPortId: 'transfer',
+              ordering: 0,
+              portId: 'transfer',
+              state: 3,
+              version: 'ics20-1',
+            },
+          },
+          'agoric-3_stride-1': {
+            client_id: '07-tendermint-74',
+            counterparty: {
+              client_id: '07-tendermint-129',
+              connection_id: 'connection-118',
+            },
+            id: 'connection-68',
+            state: 3,
+            transferChannel: {
+              channelId: 'channel-59',
+              counterPartyChannelId: 'channel-148',
+              counterPartyPortId: 'transfer',
+              ordering: 0,
+              portId: 'transfer',
+              state: 3,
+              version: 'ics20-1',
+            },
+          },
+          'osmosis-1_stride-1': {
+            client_id: '07-tendermint-2119',
+            counterparty: {
+              client_id: '07-tendermint-1',
+              connection_id: 'connection-2',
+            },
+            id: 'connection-1657',
+            state: 3,
+            transferChannel: {
+              channelId: 'channel-326',
+              counterPartyChannelId: 'channel-5',
+              counterPartyPortId: 'transfer',
+              ordering: 0,
+              portId: 'transfer',
+              state: 3,
+              version: 'ics20-1',
+            },
+          },
+        },
+        denom: {},
+      },
       contract: {
         orchestration: {
           unbondAndTransfer: {
diff --git a/packages/orchestration/test/examples/snapshots/unbond.contract.test.ts.snap b/packages/orchestration/test/examples/snapshots/unbond.contract.test.ts.snap
index fbf713b176456c4563af10a276dffac5d86a43b3..9bf82ebc441f6257cf784eaba05cfb98d3c92f83 100644
GIT binary patch
literal 1887
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
Z+ilurO}ZhN+w_0)`44KK^j``Z001*Ms_p;)

literal 981
zcmV;`11kJMRzV<BZeeh9Xm4~Nb~6eC0OXY|3xpJ0eoiE0;smk+t}l{Fh9^vupcbv-
zX3)%FuOEvD00000000A>Ry~g!MHqf&y<V?<aqdp%BV2OgmI5hC0SyS00?Bt^T|~k~
zcli(z5{zfZ_Tu%7H8UHN0;H5k2#JagiHM31ktz~DfR2ue1}G2(LMWo3ph8|}ee2mo
z^4?av`#kS6@4R0#U-Y`MWJ7)T9ygJRIoF0N6KO%mdLWIydoK*Bp>H*Qub_tMLwr)(
z1+Wj`V*oz@_zl2+0JaFQLA-V19dzI0%n&kvU0YiNX@YnltJok;i&Q|W>*Sf&5=FZ)
z53VNNIMRdQjmW$+j6}FkMHusp)@;Wy@AL3tFvTp5jYH0)3b|Us@H8PW5Fmr=RNoP-
z6U#{oeVBuMCWTRynH2dphcu;P1FnstCXynBALd~9ww&l`oKEdHz;g}|I>0v$@P`AO
zuK>3zz;_kk?+VazftOw2mTSe%S&W@e+)rKLGZ%Q^0{_@_&!*R3tO6ISz$aDUmnyL1
z0dIT2=N|CA2mIt&67|B04?W;t4|u5tBsGiPEF^cuO3YR}97Up?g}7{9pSH|(B>FKo
zQe=cPbL&N>rPJDtrd~!;l=Wb{lZe#tx|k?B9xqj53kv6o3WaT)oeLDmcBNmI{Uak4
zFYCtEk)ei{*~Mu>?$?fsx;1N*M6lOspR1d6$dyi6Kjv8Lb5@5&aiaK)@@JmXi{+#v
z)j?vI9Pt~4Y}J$0%PVx8{n?zmHsN%5g^tq@q!m|5^?m=z&AFic)Ob2&ScfuRddh6(
zZ3{VU%}sN()J5OYd45mok<`IK-p`=Tm`sET_GP@>AY0J9a9J`MKSA;Y6ZKrGw>O}X
z=uk$(()D)c*cDlNH`|ANBn>aO{B*GA%An4s)^E}gPoY~m$d9`0nw0UZHb2TCD`U!r
z+&ltj<+a#GSCt$^n%|^`4a%qK><u}&Bn(%A#`*+l*-Y2HZlYK(Vd~Gub+xS&y+bP5
z+v@7-9Lq+zYfb(|v}&IV&V3(v;9KWG&8Ag;_JLo0AgEi^M&YD+w+{5`z}I!)FPpwn
zaNv~&@M^=NohlqiBu()LjokQ2L|2NiEy8Px3f-HI*d~Z$MY@*uXr#06XXmjk)aIjx
zw*)+GR21?u_K&HzolCoWnV&~ogj}7ZnWHW{<T{DXNz1k%P#Aw(b9<Yc<-zKs<3?L<
zM?P`BYye-`Irkrz^TpGjE`9&tG41mB{q5}L7j$XAPy0NeJ;POy-i`kUm+Ql}G7A6z
DirnX*

diff --git a/packages/orchestration/test/exos/chain-hub.test.ts b/packages/orchestration/test/exos/chain-hub.test.ts
index 98e865c3527..fed1602a9ab 100644
--- a/packages/orchestration/test/exos/chain-hub.test.ts
+++ b/packages/orchestration/test/exos/chain-hub.test.ts
@@ -42,9 +42,9 @@ const connection = {
 // fresh state for each test
 const setup = () => {
   const zone = provideDurableZone('root');
-  const vt = prepareSwingsetVowTools(zone);
+  const vt = prepareSwingsetVowTools(zone.subZone('vows'));
   const { nameHub, nameAdmin } = makeNameHubKit();
-  const chainHub = makeChainHub(nameHub, vt);
+  const chainHub = makeChainHub(zone.subZone('chainHub'), nameHub, vt);
 
   return { chainHub, nameAdmin, vt };
 };
diff --git a/packages/orchestration/test/staking-ops.test.ts b/packages/orchestration/test/staking-ops.test.ts
index 4b9dc90ff53..9e2f5c79e3c 100644
--- a/packages/orchestration/test/staking-ops.test.ts
+++ b/packages/orchestration/test/staking-ops.test.ts
@@ -229,6 +229,13 @@ const makeScenario = () => {
     eventLoopIteration,
   });
   const { nameHub: agoricNames } = makeNameHubKit();
+
+  const chainHub = makeChainHub(
+    zone.subZone('chainHub'),
+    agoricNames,
+    vowTools,
+  );
+
   return {
     baggage,
     zone,
@@ -238,6 +245,7 @@ const makeScenario = () => {
     timer,
     icqConnection,
     vowTools,
+    chainHub,
     ...mockZCF(),
     agoricNames,
   };
@@ -247,16 +255,16 @@ test('makeAccount() writes to storage', async t => {
   const s = makeScenario();
   const { account, timer } = s;
   const {
-    agoricNames,
     makeRecorderKit,
     storageNode,
     zcf,
     icqConnection,
     vowTools,
+    chainHub,
     zone,
   } = s;
   const make = prepareCosmosOrchestrationAccountKit(zone, {
-    chainHub: makeChainHub(agoricNames, vowTools),
+    chainHub,
     makeRecorderKit,
     timerService: timer,
     vowTools,
@@ -295,16 +303,16 @@ test('withdrawRewards() on StakingAccountHolder formats message correctly', asyn
   const s = makeScenario();
   const { account, calls, timer } = s;
   const {
-    agoricNames,
     makeRecorderKit,
     storageNode,
     zcf,
     icqConnection,
     vowTools,
+    chainHub,
     zone,
   } = s;
   const make = prepareCosmosOrchestrationAccountKit(zone, {
-    chainHub: makeChainHub(agoricNames, vowTools),
+    chainHub,
     makeRecorderKit,
     timerService: timer,
     vowTools,
@@ -339,17 +347,17 @@ test(`delegate; redelegate using invitationMakers`, async t => {
   const s = makeScenario();
   const { account, calls, timer } = s;
   const {
-    agoricNames,
     makeRecorderKit,
     storageNode,
     zcf,
     zoe,
     icqConnection,
     vowTools,
+    chainHub,
     zone,
   } = s;
   const makeAccountKit = prepareCosmosOrchestrationAccountKit(zone, {
-    chainHub: makeChainHub(agoricNames, vowTools),
+    chainHub,
     makeRecorderKit,
     timerService: timer,
     vowTools,
@@ -429,17 +437,17 @@ test(`withdraw rewards using invitationMakers`, async t => {
   const s = makeScenario();
   const { account, calls, timer } = s;
   const {
-    agoricNames,
     makeRecorderKit,
     storageNode,
     zcf,
     zoe,
     icqConnection,
     vowTools,
+    chainHub,
     zone,
   } = s;
   const makeAccountKit = prepareCosmosOrchestrationAccountKit(zone, {
-    chainHub: makeChainHub(agoricNames, vowTools),
+    chainHub,
     makeRecorderKit,
     timerService: timer,
     vowTools,
@@ -477,17 +485,17 @@ test(`undelegate waits for unbonding period`, async t => {
   const s = makeScenario();
   const { account, calls, timer } = s;
   const {
-    agoricNames,
     makeRecorderKit,
     storageNode,
     zcf,
     zoe,
     icqConnection,
     vowTools,
+    chainHub,
     zone,
   } = s;
   const makeAccountKit = prepareCosmosOrchestrationAccountKit(zone, {
-    chainHub: makeChainHub(agoricNames, vowTools),
+    chainHub,
     makeRecorderKit,
     timerService: timer,
     vowTools,
diff --git a/packages/orchestration/test/supports.ts b/packages/orchestration/test/supports.ts
index 21603240711..691eada4312 100644
--- a/packages/orchestration/test/supports.ts
+++ b/packages/orchestration/test/supports.ts
@@ -164,7 +164,11 @@ export const commonSetup = async (t: ExecutionContext<any>) => {
     await eventLoopIteration();
   };
 
-  const chainHub = makeChainHub(agoricNames, vowTools);
+  const chainHub = makeChainHub(
+    rootZone.subZone('chainHub'),
+    agoricNames,
+    vowTools,
+  );
 
   /**
    * Register BLD if it's not already registered.