@agoric/orchestration 0.1.1-dev-0006934.0 → 0.1.1-dev-12ce494.0

package/src/examples/swapExample.contract.js

@@ -1,13 +1,11 @@
 import { StorageNodeShape } from '@agoric/internal';
 import { TimerServiceShape } from '@agoric/time';
-import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
-import { deeplyFulfilled } from '@endo/marshal';
-import { M, objectMap } from '@endo/patterns';
+import { M } from '@endo/patterns';
 import { orcUtils } from '../utils/orc.js';
 import { withOrchestration } from '../utils/start-helper.js';
 
 /**
- * @import {Orchestrator, IcaAccount, CosmosValidatorAddress} from '../types.js'
+ * @import {Orchestrator, CosmosValidatorAddress} from '../types.js'
  * @import {TimerService} from '@agoric/time';
  * @import {LocalChain} from '@agoric/vats/src/localchain.js';
  * @import {Remote} from '@agoric/internal';
@@ -20,13 +18,13 @@ import { withOrchestration } from '../utils/start-helper.js';
 /**
  * @param {Orchestrator} orch
  * @param {object} ctx
- * @param {ZCF} ctx.zcf
+ * @param {OrchestrationTools['zoeTools']['localTransfer']} ctx.localTransfer
  * @param {ZCFSeat} seat
  * @param {object} offerArgs
  * @param {Amount<'nat'>} offerArgs.staked
  * @param {CosmosValidatorAddress} offerArgs.validator
  */
-const stackAndSwapFn = async (orch, { zcf }, seat, offerArgs) => {
+const stackAndSwapFn = async (orch, { localTransfer }, seat, offerArgs) => {
   const { give } = seat.getProposal();
 
   const omni = await orch.getChain('omniflixhub');
@@ -40,13 +38,9 @@ const stackAndSwapFn = async (orch, { zcf }, seat, offerArgs) => {
   const omniAddress = omniAccount.getAddress();
 
   // deposit funds from user seat to LocalChainAccount
-  const payments = await withdrawFromSeat(zcf, seat, give);
-  await deeplyFulfilled(
-    objectMap(payments, payment =>
-      // @ts-expect-error payment is ERef<Payment> which happens to work but isn't officially supported
-      localAccount.deposit(payment),
-    ),
-  );
+  // TODO localTransfer type returns vow but in the guest context it should be a promise
+  // @ts-expect-error XXX localAccount type
+  await localTransfer(seat, localAccount, give);
   seat.exit();
 
   // build swap instructions with orcUtils library
@@ -104,7 +98,7 @@ export const makeNatAmountShape = (brand, min) =>
  * @param {Zone} zone
  * @param {OrchestrationTools} tools
  */
-const contract = async (zcf, privateArgs, zone, { orchestrate }) => {
+const contract = async (zcf, privateArgs, zone, { orchestrate, zoeTools }) => {
   const { brands } = zcf.getTerms();
 
   /** deprecated historical example */
@@ -114,7 +108,11 @@ const contract = async (zcf, privateArgs, zone, { orchestrate }) => {
    *   { staked: Amount<'nat'>; validator: CosmosValidatorAddress }
    * >}
    */
-  const swapAndStakeHandler = orchestrate('LSTTia', { zcf }, stackAndSwapFn);
+  const swapAndStakeHandler = orchestrate(
+    'LSTTia',
+    { zcf, localTransfer: zoeTools.localTransfer },
+    stackAndSwapFn,
+  );
 
   const publicFacet = zone.exo('publicFacet', undefined, {
     makeSwapAndStakeInvitation() {

package/src/exos/cosmos-orchestration-account.d.ts

@@ -14,8 +14,6 @@
  */
 /** @see {OrchestrationAccountI} */
 export const IcaAccountHolderI: import("@endo/patterns").InterfaceGuard<{
-    asContinuingOffer: import("@endo/patterns").MethodGuard;
-    getPublicTopics: import("@endo/patterns").MethodGuard;
     delegate: import("@endo/patterns").MethodGuard;
     redelegate: import("@endo/patterns").MethodGuard;
     withdrawReward: import("@endo/patterns").MethodGuard;
@@ -27,8 +25,10 @@ export const IcaAccountHolderI: import("@endo/patterns").InterfaceGuard<{
     send: import("@endo/patterns").MethodGuard;
     transfer: import("@endo/patterns").MethodGuard;
     transferSteps: import("@endo/patterns").MethodGuard;
+    asContinuingOffer: import("@endo/patterns").MethodGuard;
+    getPublicTopics: import("@endo/patterns").MethodGuard;
 }>;
-export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit: MakeRecorderKit, { watch, asVow }: VowTools, zcf: ZCF): (chainAddress: ChainAddress, bondDenom: string, io: {
+export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit: MakeRecorderKit, { watch, asVow, when }: VowTools, zcf: ZCF): (chainAddress: ChainAddress, bondDenom: string, io: {
     account: IcaAccount;
     storageNode: Remote<StorageNode>;
     icqConnection: ICQConnection | undefined;
@@ -93,12 +93,12 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit
         TransferAccount(): never;
     };
     holder: {
-        asContinuingOffer(): {
+        asContinuingOffer(): Vow<{
             publicSubscribers: {
                 account: {
                     description: string;
                     subscriber: globalThis.Subscriber<ComosOrchestrationAccountNotification>;
-                    storagePath: Promise<string>;
+                    storagePath: string;
                 };
             };
             invitationMakers: import("@endo/exo").Guarded<{
@@ -126,14 +126,14 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit
                 TransferAccount(): never;
             }>;
             holder: import("@endo/exo").Guarded<any>;
-        };
-        getPublicTopics(): {
+        }>;
+        getPublicTopics(): Vow<{
             account: {
                 description: string;
                 subscriber: globalThis.Subscriber<ComosOrchestrationAccountNotification>;
-                storagePath: Promise<string>;
+                storagePath: string;
             };
-        };
+        }>;
         /** @returns {ChainAddress} */
         getAddress(): ChainAddress;
         /**

package/src/exos/cosmos-orchestration-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"AAoDA;;;GAGG;AAEH;;;;;;;;;GASG;AAEH,mCAAmC;AACnC;;;;;;;;;;;;;;GAmBG;AAgBI,2DALI,IAAI,mBACJ,eAAe,oBACf,QAAQ,OACR,GAAG;aAwDC,UAAU;iBACV,OAAO,WAAW,CAAC;mBACnB,aAAa,GAAG,SAAS;WACzB,OAAO,YAAY,CAAC;;;QAe3B,wDAAwD;;;QAWxD;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAiBjB;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;WAEG;4BADQ,MAAM;;IAgBnB;;;OAGG;;QAED,uDAAuD;4BAA3C,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;QAO5C,6BAA6B;4BAAjB,MAAM;;;QAYlB;;;WAGG;4BAFQ,sBAAsB,UACtB,SAAS;QAUpB;;;;WAIG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QAYpB,gDAAgD;kCAApC,sBAAsB;QASlC,kEAAkE;gCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;QAYlD;;;;WAIG;;;;;;;;;;;;;gBApDH;;;mBAGG;oCAFQ,sBAAsB,UACtB,SAAS;gBAUpB;;;;mBAIG;yCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;gBAYpB,gDAAgD;0CAApC,sBAAsB;gBASlC,kEAAkE;wCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;gBAYlD;;;;mBAIG;;;;;;;;;;;;QA2BH,8BAA8B;sBAAhB,YAAY;QAI1B;;;;;WAKG;4BAFQ,sBAAsB,UACtB,SAAS;;QAwBpB;;;;;;WAMG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QA0BpB;;;WAGG;kCAFQ,sBAAsB,GACpB,IAAI,WAAW,EAAE,CAAC;QAiB/B;;;WAGG;0BAFQ,QAAQ,GACN,IAAI,WAAW,CAAC;;;;;QA0C7B,kEAAkE;gCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;GA6BzD;AAmBM,wDAVI,IAAI,mBACJ,eAAe,YACf,QAAQ,OACR,GAAG,GACD,CACZ,GAAO,IAAI,EAAE,UAAU,CACvB,UAAgB,CAAC,OAAO,oCAAoC,CAAC,CACxD,KACE,6BAA6B,CAAC,QAAQ,CAAC,CAe9C;;kBAxda,YAAY;;oBAIb;IACZ,QAAY,EAAE,YAAY,qCAAqC,CAAC,CAAC;IACjE,OAAW,EAAE,UAAU,CAAC;IACxB,YAAgB,EAAE,YAAY,CAAC;IAC/B,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7C,SAAa,EAAE,MAAM,CAAC;IACtB,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;CAC7B;4CAgbS,UAAU,CACtB,UAAc,CAAC,OAAO,oCAAoC,CAAC,CACxD;yCA4BU,6BAA6B,CAAC,QAAQ,CAAC;0BApe9B,cAAc;qCANU,6CAA6C;8BAK5D,aAAa;kCANqH,aAAa;gCAAb,aAAa;4BAItJ,kBAAkB;mCAJuH,aAAa;kCAKhJ,cAAc;+BALqH,aAAa;0BAExJ,kDAAkD;mCAMzC,+CAA+C;8BACpD,sBAAsB;iCATiH,aAAa;yBAM/I,aAAa;4CANqH,aAAa;gCAGlJ,wDAAwD;8BAH6E,aAAa;iCAChI,6CAA6C"}
+{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"AAmDA;;;GAGG;AAEH;;;;;;;;;GASG;AAEH,mCAAmC;AACnC;;;;;;;;;;;;;;GAaG;AAgBI,2DALI,IAAI,mBACJ,eAAe,0BACf,QAAQ,OACR,GAAG;aAwDC,UAAU;iBACV,OAAO,WAAW,CAAC;mBACnB,aAAa,GAAG,SAAS;WACzB,OAAO,YAAY,CAAC;;;QAe3B,wDAAwD;;;QAWxD;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAiBjB;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;WAEG;4BADQ,MAAM;;IAgBnB;;;OAGG;;QAED,uDAAuD;4BAA3C,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;QAO5C,6BAA6B;4BAAjB,MAAM;;;QAYlB;;;WAGG;4BAFQ,sBAAsB,UACtB,SAAS;QAUpB;;;;WAIG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QAYpB,gDAAgD;kCAApC,sBAAsB;QASlC,kEAAkE;gCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;QAYlD;;;;WAIG;;;;;;;;;;;;;gBApDH;;;mBAGG;oCAFQ,sBAAsB,UACtB,SAAS;gBAUpB;;;;mBAIG;yCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;gBAYpB,gDAAgD;0CAApC,sBAAsB;gBASlC,kEAAkE;wCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;gBAYlD;;;;mBAIG;;;;;;;;;;;;QAwCH,8BAA8B;sBAAhB,YAAY;QAI1B;;;;;WAKG;4BAFQ,sBAAsB,UACtB,SAAS;;QAwBpB;;;;;;WAMG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QA0BpB;;;WAGG;kCAFQ,sBAAsB,GACpB,IAAI,WAAW,EAAE,CAAC;QAiB/B;;;WAGG;0BAFQ,QAAQ,GACN,IAAI,WAAW,CAAC;;;;;QA0C7B,kEAAkE;gCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;GA6BzD;AAmBM,wDAVI,IAAI,mBACJ,eAAe,YACf,QAAQ,OACR,GAAG,GACD,CACZ,GAAO,IAAI,EAAE,UAAU,CACvB,UAAgB,CAAC,OAAO,oCAAoC,CAAC,CACxD,KACE,6BAA6B,CAAC,QAAQ,CAAC,CAe9C;;kBA/da,YAAY;;oBAIb;IACZ,QAAY,EAAE,YAAY,qCAAqC,CAAC,CAAC;IACjE,OAAW,EAAE,UAAU,CAAC;IACxB,YAAgB,EAAE,YAAY,CAAC;IAC/B,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7C,SAAa,EAAE,MAAM,CAAC;IACtB,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;CAC7B;4CAubS,UAAU,CACtB,UAAc,CAAC,OAAO,oCAAoC,CAAC,CACxD;yCA4BU,6BAA6B,CAAC,QAAQ,CAAC;0BA3e9B,cAAc;qCANU,6CAA6C;8BAK5D,aAAa;kCANqH,aAAa;gCAAb,aAAa;4BAItJ,kBAAkB;mCAJuH,aAAa;kCAKhJ,cAAc;+BALqH,aAAa;0BAExJ,kDAAkD;mCAMzC,+CAA+C;8BACpD,sBAAsB;iCATiH,aAAa;yBAM/I,aAAa;4CANqH,aAAa;gCAGlJ,wDAAwD;8BAH6E,aAAa;iCAChI,6CAA6C"}

package/src/exos/cosmos-orchestration-account.js

@@ -22,7 +22,6 @@ import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { M } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
-import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
 import {
   AmountArgShape,
   ChainAddressShape,
@@ -69,12 +68,6 @@ const { Vow$ } = NetworkShape; // TODO #9611
 /** @see {OrchestrationAccountI} */
 export const IcaAccountHolderI = M.interface('IcaAccountHolder', {
   ...orchestrationAccountMethods,
-  asContinuingOffer: M.call().returns({
-    publicSubscribers: M.any(),
-    invitationMakers: M.any(),
-    holder: M.any(),
-  }),
-  getPublicTopics: M.call().returns(TopicsRecordShape),
   delegate: M.call(ChainAddressShape, AmountArgShape).returns(VowShape),
   redelegate: M.call(
     ChainAddressShape,
@@ -105,11 +98,11 @@ const toDenomAmount = c => ({ denom: c.denom, value: BigInt(c.amount) });
 export const prepareCosmosOrchestrationAccountKit = (
   zone,
   makeRecorderKit,
-  { watch, asVow },
+  { watch, asVow, when },
   zcf,
 ) => {
   const makeCosmosOrchestrationAccountKit = zone.exoClassKit(
-    'Staking Account Holder',
+    'Cosmos Orchestration Account Holder',
     {
       helper: M.interface('helper', {
         owned: M.call().returns(M.remotable()),
@@ -317,21 +310,34 @@ export const prepareCosmosOrchestrationAccountKit = (
       },
       holder: {
         asContinuingOffer() {
-          const { holder, invitationMakers } = this.facets;
-          return harden({
-            publicSubscribers: holder.getPublicTopics(),
-            invitationMakers,
-            holder,
+          // getPublicTopics resolves promptly (same run), so we don't need a watcher
+          // eslint-disable-next-line no-restricted-syntax
+          return asVow(async () => {
+            await null;
+            const { holder, invitationMakers } = this.facets;
+            return harden({
+              // getPublicTopics returns a vow, for membrane compatibility.
+              // it's safe to unwrap to a promise and get the result as we
+              // expect this complete in the same run
+              publicSubscribers: await when(holder.getPublicTopics()),
+              invitationMakers,
+              holder,
+            });
           });
         },
         getPublicTopics() {
-          const { topicKit } = this.state;
-          return harden({
-            account: {
-              description: PUBLIC_TOPICS.account[0],
-              subscriber: topicKit.subscriber,
-              storagePath: topicKit.recorder.getStoragePath(),
-            },
+          // getStoragePath resolves promptly (same run), so we don't need a watcher
+          // eslint-disable-next-line no-restricted-syntax
+          return asVow(async () => {
+            await null;
+            const { topicKit } = this.state;
+            return harden({
+              account: {
+                description: PUBLIC_TOPICS.account[0],
+                subscriber: topicKit.subscriber,
+                storagePath: await topicKit.recorder.getStoragePath(),
+              },
+            });
           });
         },
 

package/src/exos/local-chain-facade.d.ts

@@ -29,16 +29,82 @@ export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowe
         /**
          * @param {[LocalChainAccount, ChainAddress['value']]} results
          */
-        onFulfilled([account, address]: [LocalChainAccount, ChainAddress["value"]]): import("@endo/exo").Guarded<{
+        onFulfilled([account, address]: [LocalChainAccount, ChainAddress["value"]]): Vow<import("@endo/exo").Guarded<{
+            asContinuingOffer(): Vow<{
+                publicSubscribers: {
+                    account: {
+                        description: string;
+                        subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
+                        storagePath: string;
+                    };
+                };
+                invitationMakers: import("@endo/exo").Guarded<{
+                    Delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<Record<unknown, unknown>>, undefined>>;
+                    Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<import("@agoric/time").TimestampRecord>, undefined>>;
+                    CloseAccount(): never;
+                }>;
+                holder: import("@endo/exo").Guarded<any>;
+            }>;
             getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount>;
             getBalances(): Vow<never>;
-            getPublicTopics(): {
+            getPublicTopics(): Vow<{
                 account: {
                     description: string;
                     subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
-                    storagePath: Promise<string>;
+                    storagePath: string;
                 };
-            };
+            }>;
+            delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<Record<unknown, unknown>>;
+            undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<void | import("@agoric/time").TimestampRecord>;
+            deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>;
+            withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">>>;
+            executeTx(messages: {
+                '@type': string;
+            }[]): Vow<import("@agoric/cosmic-proto").JsonSafe<{
+                '@type': string;
+            }>[]>;
+            getAddress(): ChainAddress;
+            send(toAccount: any, amount: any): Vow<never>;
+            transfer(amount: import("../orchestration-api.js").AmountArg, destination: ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Vow<void>;
+            transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void>;
+        }>>;
+    };
+    makeChildNodeWatcher: {
+        /**
+         * @param {Remote<StorageNode>} childNode
+         * @param {{
+         *   account: LocalChainAccount;
+         *   address: ChainAddress['value'];
+         * }} ctx
+         */
+        onFulfilled(childNode: Remote<StorageNode>, { account, address }: {
+            account: LocalChainAccount;
+            address: ChainAddress["value"];
+        }): import("@endo/exo").Guarded<{
+            asContinuingOffer(): Vow<{
+                publicSubscribers: {
+                    account: {
+                        description: string;
+                        subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
+                        storagePath: string;
+                    };
+                };
+                invitationMakers: import("@endo/exo").Guarded<{
+                    Delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<Record<unknown, unknown>>, undefined>>;
+                    Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<import("@agoric/time").TimestampRecord>, undefined>>;
+                    CloseAccount(): never;
+                }>;
+                holder: import("@endo/exo").Guarded<any>;
+            }>;
+            getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount>;
+            getBalances(): Vow<never>;
+            getPublicTopics(): Vow<{
+                account: {
+                    description: string;
+                    subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
+                    storagePath: string;
+                };
+            }>;
             delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<Record<unknown, unknown>>;
             undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<void | import("@agoric/time").TimestampRecord>;
             deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>;
@@ -72,9 +138,9 @@ import type { OrchestrationAccount } from '../types.js';
 import type { PromiseToVow } from '../types.js';
 import type { LocalChainAccount } from '@agoric/vats/src/localchain.js';
 import type { ChainAddress } from '../types.js';
+import type { Remote } from '@agoric/internal';
 import type { MakeLocalOrchestrationAccountKit } from './local-orchestration-account.js';
 import type { CosmosInterchainService } from './cosmos-interchain-service.js';
-import type { Remote } from '@agoric/internal';
 import type { TimerService } from '@agoric/time';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
 import type { VowTools } from '@agoric/vow';

package/src/exos/local-chain-facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA0GO,8CAHI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;QAtCzB,oEAAoE;uBAAtD,IAAI,aAAa,qBAAqB,SAAS,CAAC,CAAC,CAAC;;;QAchE;;WAEG;wCADQ,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;cA4B5D;qCA1FY;IACZ,gCAAoC,EAAE,gCAAgC,CAAC;IACvE,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;CACpB;mCAsFU,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BAxGjC,mBAAmB;uCAOwE,aAAa;yBAH/F,aAAa;+BAGqE,aAAa;0CAAb,aAAa;kCAAb,aAAa;uCAJ/E,gCAAgC;kCAIkC,aAAa;sDAD5E,kCAAkC;6CAD3C,gCAAgC;4BAHjD,kBAAkB;kCADZ,cAAc;gCAEG,gCAAgC;8BAChD,aAAa"}
+{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AAkIO,8CAHI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;QAtDzB,oEAAoE;uBAAtD,IAAI,aAAa,qBAAqB,SAAS,CAAC,CAAC,CAAC;;;QAchE;;WAEG;wCADQ,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWrD;;;;;;WAMG;+BALQ,OAAO,WAAW,CAAC,wBACnB;YACV,OAAW,EAAE,iBAAiB,CAAC;YAC/B,OAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;SAChC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA4BX;qCAjHY;IACZ,gCAAoC,EAAE,gCAAgC,CAAC;IACvE,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;CACpB;mCA6GU,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BA/HjC,mBAAmB;uCAOwE,aAAa;yBAH/F,aAAa;+BAGqE,aAAa;0CAAb,aAAa;kCAAb,aAAa;uCAJ/E,gCAAgC;kCAIkC,aAAa;4BALtG,kBAAkB;sDAIQ,kCAAkC;6CAD3C,gCAAgC;kCAJ3C,cAAc;gCAEG,gCAAgC;8BAChD,aAAa"}

package/src/exos/local-chain-facade.js

@@ -2,6 +2,7 @@
 import { E } from '@endo/far';
 import { M } from '@endo/patterns';
 import { pickFacet } from '@agoric/vat-data';
+import { VowShape } from '@agoric/vow';
 
 import { ChainFacadeI } from '../typeGuards.js';
 
@@ -36,6 +37,8 @@ const prepareLocalChainFacadeKit = (
   {
     makeLocalOrchestrationAccountKit,
     localchain,
+    // TODO vstorage design https://github.com/Agoric/agoric-sdk/issues/9066
+    // consider making an `accounts` childNode
     storageNode,
     vowTools: { allVows, watch },
   },
@@ -44,9 +47,14 @@ const prepareLocalChainFacadeKit = (
     'LocalChainFacade',
     {
       public: ChainFacadeI,
-      makeAccountWatcher: M.interface('undelegateWatcher', {
+      makeAccountWatcher: M.interface('makeAccountWatcher', {
         onFulfilled: M.call([M.remotable('LCA Account'), M.string()])
           .optional(M.arrayOf(M.undefined())) // empty context
+          .returns(VowShape),
+      }),
+      makeChildNodeWatcher: M.interface('makeChildNodeWatcher', {
+        onFulfilled: M.call(M.remotable())
+          .optional({ account: M.remotable(), address: M.string() }) // empty context
           .returns(M.remotable()),
       }),
     },
@@ -82,6 +90,22 @@ const prepareLocalChainFacadeKit = (
          * @param {[LocalChainAccount, ChainAddress['value']]} results
          */
         onFulfilled([account, address]) {
+          return watch(
+            E(storageNode).makeChildNode(address),
+            this.facets.makeChildNodeWatcher,
+            { account, address },
+          );
+        },
+      },
+      makeChildNodeWatcher: {
+        /**
+         * @param {Remote<StorageNode>} childNode
+         * @param {{
+         *   account: LocalChainAccount;
+         *   address: ChainAddress['value'];
+         * }} ctx
+         */
+        onFulfilled(childNode, { account, address }) {
           const { localChainInfo } = this.state;
           const { holder } = makeLocalOrchestrationAccountKit({
             account,
@@ -91,7 +115,7 @@ const prepareLocalChainFacadeKit = (
               chainId: localChainInfo.chainId,
             }),
             // FIXME storage path https://github.com/Agoric/agoric-sdk/issues/9066
-            storageNode,
+            storageNode: childNode,
           });
           return holder;
         },

package/src/exos/local-orchestration-account.d.ts

@@ -1,4 +1,4 @@
-export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit: MakeRecorderKit, zcf: ZCF, timerService: Remote<TimerService>, { watch, allVows, asVow }: VowTools, chainHub: ChainHub): (args_0: {
+export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit: MakeRecorderKit, zcf: ZCF, timerService: Remote<TimerService>, { watch, allVows, asVow, when }: VowTools, chainHub: ChainHub): (args_0: {
     account: LocalChainAccount;
     address: ChainAddress;
     storageNode: Remote<StorageNode>;
@@ -88,6 +88,29 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
         onFulfilled(natAmount: Amount<"nat">, denom: DenomAmount["denom"]): DenomAmount;
     };
     holder: {
+        asContinuingOffer(): Vow<{
+            publicSubscribers: {
+                account: {
+                    description: string;
+                    subscriber: globalThis.Subscriber<LocalChainAccountNotification>;
+                    storagePath: string;
+                };
+            };
+            invitationMakers: import("@endo/exo").Guarded<{
+                /**
+                 * @param {string} validatorAddress
+                 * @param {Amount<'nat'>} ertpAmount
+                 */
+                Delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<Record<unknown, unknown>>, undefined>>;
+                /**
+                 * @param {string} validatorAddress
+                 * @param {Amount<'nat'>} ertpAmount
+                 */
+                Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<TimestampRecord>, undefined>>;
+                CloseAccount(): never;
+            }>;
+            holder: import("@endo/exo").Guarded<any>;
+        }>;
         /**
          * TODO: balance lookups for non-vbank assets
          *
@@ -95,13 +118,13 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
          */
         getBalance(denom: import("@agoric/orchestration").DenomArg): Vow<DenomAmount>;
         getBalances(): Vow<never>;
-        getPublicTopics(): {
+        getPublicTopics(): Vow<{
             account: {
                 description: string;
                 subscriber: globalThis.Subscriber<LocalChainAccountNotification>;
-                storagePath: Promise<string>;
+                storagePath: string;
             };
-        };
+        }>;
         /**
          * @param {string} validatorAddress
          * @param {Amount<'nat'>} ertpAmount

package/src/exos/local-orchestration-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"AA0EO,0DAPI,IAAI,mBACJ,eAAe,OACf,GAAG,gBACH,OAAO,YAAY,CAAC,6BACpB,QAAQ,YACR,QAAQ;aA6DJ,iBAAiB;aACjB,YAAY;iBACZ,OAAO,WAAW,CAAC;;;QAY1B;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAYxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;;QAiBxB;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;WAGG;6DADQ,YAAY;;;QAUvB;;;;;;;;;;WAUG;6DATQ,CACV;YAAM,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;SAAE,EAC7D,MAAU,CACP,iCACO;YACV,WAAe,EAAE,YAAY,CAAC;YAC9B,IAAQ,EAAE,qBAAqB,CAAC;YAChC,MAAU,EAAE,WAAW,CAAC;SACrB;;;;IA4BN;;;OAGG;;QAED;;WAEG;6BADQ,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;IAQvC;;;OAGG;;QAED;;WAEG;6BADQ,OAAO;;IAMpB;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;;QAOxB;;;;WAIG;;;;;;;;;;QA8BH;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAqBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;QAoBxC;;;;WAIG;QACH,yDAAyD;;QAOzD,0DAA0D;;QAI1D,2DAA2D;;;;;;QAI3D,sDAAsD;;;QAWtD;;;;;;;;WAQG;yBAPQ,SAAS,eAET,YAAY,6CAIV,IAAI,IAAI,CAAC;QA8BtB,uEAAuE;;;GAW9E;;aAxZa,MAAM;;oBAIP;IACZ,QAAY,EAAE,YAAY,6BAA6B,CAAC,CAAC;IACzD,OAAW,EAAE,iBAAiB,CAAC;IAC/B,OAAW,EAAE,YAAY,CAAC;CACvB;+CAiZU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BAzanC,cAAc;qCADU,6CAA6C;kCAGhC,cAAc;4BADjD,kBAAkB;8BAEC,aAAa;8BAE9B,gBAAgB;uCARP,gCAAgC;kCAC4E,uBAAuB;yBAK3H,aAAa;qCADG,cAAc;+BAEpC,sBAAsB;8BAAtB,sBAAsB;+BANoF,uBAAuB;uCAAvB,uBAAuB;2CAAvB,uBAAuB;iCAAvB,uBAAuB;+BAAvB,uBAAuB;iCACxH,6CAA6C"}
+{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"AAwEO,0DAPI,IAAI,mBACJ,eAAe,OACf,GAAG,gBACH,OAAO,YAAY,CAAC,mCACpB,QAAQ,YACR,QAAQ;aA6DJ,iBAAiB;aACjB,YAAY;iBACZ,OAAO,WAAW,CAAC;;;QAc1B;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAYxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;;QAiBxB;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;WAGG;6DADQ,YAAY;;;QAUvB;;;;;;;;;;WAUG;6DATQ,CACV;YAAM,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;SAAE,EAC7D,MAAU,CACP,iCACO;YACV,WAAe,EAAE,YAAY,CAAC;YAC9B,IAAQ,EAAE,qBAAqB,CAAC;YAChC,MAAU,EAAE,WAAW,CAAC;SACrB;;;;IA4BN;;;OAGG;;QAED;;WAEG;6BADQ,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;IAQvC;;;OAGG;;QAED;;WAEG;6BADQ,OAAO;;IAMpB;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;;;;;;;;;;;gBAvIxB;;;mBAGG;2CAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;gBAYxB;;;mBAGG;6CAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;;;QA8IxB;;;;WAIG;;;;;;;;;;QAmCH;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAqBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;QAoBxC;;;;WAIG;QACH,yDAAyD;;QAOzD,0DAA0D;;QAI1D,2DAA2D;;;;;;QAI3D,sDAAsD;;;QAWtD;;;;;;;;WAQG;yBAPQ,SAAS,eAET,YAAY,6CAIV,IAAI,IAAI,CAAC;QA8BtB,uEAAuE;;;GAW9E;;aA9aa,MAAM;;oBAIP;IACZ,QAAY,EAAE,YAAY,6BAA6B,CAAC,CAAC;IACzD,OAAW,EAAE,iBAAiB,CAAC;IAC/B,OAAW,EAAE,YAAY,CAAC;CACvB;+CAuaU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BA/bnC,cAAc;qCADU,6CAA6C;kCAGhC,cAAc;4BADjD,kBAAkB;8BAEC,aAAa;8BAE9B,gBAAgB;uCARP,gCAAgC;kCAC4E,uBAAuB;yBAK3H,aAAa;qCADG,cAAc;+BAEpC,sBAAsB;8BAAtB,sBAAsB;+BANoF,uBAAuB;uCAAvB,uBAAuB;2CAAvB,uBAAuB;iCAAvB,uBAAuB;+BAAvB,uBAAuB;iCACxH,6CAA6C"}

package/src/exos/local-orchestration-account.js

@@ -5,7 +5,6 @@ import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { M } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
-import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
 import { E } from '@endo/far';
 import {
   ChainAddressShape,
@@ -51,7 +50,6 @@ const { Vow$ } = NetworkShape; // TODO #9611
 
 const HolderI = M.interface('holder', {
   ...orchestrationAccountMethods,
-  getPublicTopics: M.call().returns(TopicsRecordShape),
   delegate: M.call(M.string(), AmountShape).returns(VowShape),
   undelegate: M.call(M.string(), AmountShape).returns(VowShape),
   deposit: M.call(PaymentShape).returns(VowShape),
@@ -77,7 +75,7 @@ export const prepareLocalOrchestrationAccountKit = (
   makeRecorderKit,
   zcf,
   timerService,
-  { watch, allVows, asVow },
+  { watch, allVows, asVow, when },
   chainHub,
 ) => {
   const timestampHelper = makeTimestampHelper(timerService);
@@ -140,6 +138,8 @@ export const prepareLocalOrchestrationAccountKit = (
       // must be the fully synchronous maker because the kit is held in durable state
       // @ts-expect-error XXX Patterns
       const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
+      // TODO determine what goes in vstorage https://github.com/Agoric/agoric-sdk/issues/9066
+      void E(topicKit.recorder).write('');
 
       return { account, address, topicKit };
     },
@@ -287,6 +287,22 @@ export const prepareLocalOrchestrationAccountKit = (
         },
       },
       holder: {
+        asContinuingOffer() {
+          // getPublicTopics resolves promptly (same run), so we don't need a watcher
+          // eslint-disable-next-line no-restricted-syntax
+          return asVow(async () => {
+            await null;
+            const { holder, invitationMakers } = this.facets;
+            return harden({
+              // getPublicTopics returns a vow, for membrane compatibility.
+              // it's safe to unwrap to a promise and get the result as we
+              // expect this complete in the same run
+              publicSubscribers: await when(holder.getPublicTopics()),
+              invitationMakers,
+              holder,
+            });
+          });
+        },
         /**
          * TODO: balance lookups for non-vbank assets
          *
@@ -312,13 +328,18 @@ export const prepareLocalOrchestrationAccountKit = (
         },
 
         getPublicTopics() {
-          const { topicKit } = this.state;
-          return harden({
-            account: {
-              description: PUBLIC_TOPICS.account[0],
-              subscriber: topicKit.subscriber,
-              storagePath: topicKit.recorder.getStoragePath(),
-            },
+          // getStoragePath resolves promptly (same run), so we don't need a watcher
+          // eslint-disable-next-line no-restricted-syntax
+          return asVow(async () => {
+            await null;
+            const { topicKit } = this.state;
+            return harden({
+              account: {
+                description: PUBLIC_TOPICS.account[0],
+                subscriber: topicKit.subscriber,
+                storagePath: await topicKit.recorder.getStoragePath(),
+              },
+            });
           });
         },
         /**

package/src/exos/orchestrator.d.ts

@@ -71,6 +71,11 @@ export function prepareOrchestratorKit(zone: Zone, { chainHub, localchain, makeL
         asAmount: () => never;
     };
 }>;
+/**
+ * Host side of the Orchestrator interface. (Methods return vows instead of
+ * promises as the interface within the guest function.)
+ */
+export type HostOrchestrator = ReturnType<ReturnType<typeof prepareOrchestratorKit>>["orchestrator"];
 import type { Zone } from '@agoric/base-zone';
 import type { AsyncFlowTools } from '@agoric/async-flow';
 import type { ChainHub } from './chain-hub.js';

package/src/exos/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AAmCA,0BAA0B;AAC1B;;;;;GAKG;AAkBI,6CAfI,IAAI,+FACJ;IACV,cAAkB,EAAE,cAAc,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;IACvB,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,eAAmB,EAAE,eAAe,CAAC;IACrC,oBAAwB,EAAE,oBAAoB,CAAC;IAC/C,qBAAyB,EAAE,qBAAqB,CAAC;IACjD,oBAAwB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC1D,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,QAAY,EAAE,QAAQ,CAAC;IACvB,GAAO,EAAE,GAAG,CAAC;CACV;IAmCE,2DAA2D;;QAEzD,yCAAyC;;;;;;;;;;;;;IAK3C;;;OAGG;;QAED;;;;;WAKG;;;;;;;;;;;;;;QAMH,qDAAqD;;;;;;;;;;;;;GAwB1D;0BA5HoB,mBAAmB;oCAET,oBAAoB;8BAD1B,gBAAgB;gCAId,gCAAgC;4BAEpC,kBAAkB;qCADI,6CAA6C;0CAKrD,yBAAyB;2CACxB,0BAA0B;6CAHxB,gCAAgC;kCAL3C,cAAc;8BADb,aAAa;+BAU4E,aAAa;uCAAb,aAAa;yBAVtG,aAAa;0CAU4E,aAAa;kCAAb,aAAa;2BAAb,aAAa"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AAmCA,0BAA0B;AAC1B;;;;;GAKG;AAkBI,6CAfI,IAAI,+FACJ;IACV,cAAkB,EAAE,cAAc,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;IACvB,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,eAAmB,EAAE,eAAe,CAAC;IACrC,oBAAwB,EAAE,oBAAoB,CAAC;IAC/C,qBAAyB,EAAE,qBAAqB,CAAC;IACjD,oBAAwB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC1D,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,QAAY,EAAE,QAAQ,CAAC;IACvB,GAAO,EAAE,GAAG,CAAC;CACV;IAmCE,2DAA2D;;QAEzD,yCAAyC;;;;;;;;;;;;;IAK3C;;;OAGG;;QAED;;;;;WAKG;;;;;;;;;;;;;;QAMH,qDAAqD;;;;;;;;;;;;;GAwB1D;;;;;+BAMU,UAAU,CACtB,UAAc,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BApIG,mBAAmB;oCAET,oBAAoB;8BAD1B,gBAAgB;gCAId,gCAAgC;4BAEpC,kBAAkB;qCADI,6CAA6C;0CAKrD,yBAAyB;2CACxB,0BAA0B;6CAHxB,gCAAgC;kCAL3C,cAAc;8BADb,aAAa;+BAU4E,aAAa;uCAAb,aAAa;yBAVtG,aAAa;0CAU4E,aAAa;kCAAb,aAAa;2BAAb,aAAa"}

package/src/exos/orchestrator.js

@@ -139,3 +139,11 @@ export const prepareOrchestratorKit = (
     },
   );
 harden(prepareOrchestratorKit);
+/**
+ * Host side of the Orchestrator interface. (Methods return vows instead of
+ * promises as the interface within the guest function.)
+ *
+ * @typedef {ReturnType<
+ *   ReturnType<typeof prepareOrchestratorKit>
+ * >['orchestrator']} HostOrchestrator
+ */