@agoric/orchestration 0.1.1-dev-217005a.0 → 0.1.1-dev-b196804.0

package/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./src/types.js";
-export * from "./src/service.js";
+export * from "./src/exos/cosmos-interchain-service.js";
 export * from "./src/typeGuards.js";
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -3,5 +3,5 @@
 /// <reference types="@agoric/zoe/exported" />
 
 export * from './src/types.js';
-export * from './src/service.js';
+export * from './src/exos/cosmos-interchain-service.js';
 export * from './src/typeGuards.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-217005a.0+217005a",
+  "version": "0.1.1-dev-b196804.0+b196804",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -33,19 +33,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-217005a.0+217005a",
-    "@agoric/cosmic-proto": "0.4.1-dev-217005a.0+217005a",
-    "@agoric/ertp": "0.16.3-dev-217005a.0+217005a",
-    "@agoric/internal": "0.3.3-dev-217005a.0+217005a",
-    "@agoric/network": "0.1.1-dev-217005a.0+217005a",
-    "@agoric/notifier": "0.6.3-dev-217005a.0+217005a",
-    "@agoric/store": "0.9.3-dev-217005a.0+217005a",
-    "@agoric/time": "0.3.3-dev-217005a.0+217005a",
-    "@agoric/vat-data": "0.5.3-dev-217005a.0+217005a",
-    "@agoric/vats": "0.15.2-dev-217005a.0+217005a",
-    "@agoric/vow": "0.1.1-dev-217005a.0+217005a",
-    "@agoric/zoe": "0.26.3-dev-217005a.0+217005a",
-    "@agoric/zone": "0.2.3-dev-217005a.0+217005a",
+    "@agoric/async-flow": "0.1.1-dev-b196804.0+b196804",
+    "@agoric/cosmic-proto": "0.4.1-dev-b196804.0+b196804",
+    "@agoric/ertp": "0.16.3-dev-b196804.0+b196804",
+    "@agoric/internal": "0.3.3-dev-b196804.0+b196804",
+    "@agoric/network": "0.1.1-dev-b196804.0+b196804",
+    "@agoric/notifier": "0.6.3-dev-b196804.0+b196804",
+    "@agoric/store": "0.9.3-dev-b196804.0+b196804",
+    "@agoric/time": "0.3.3-dev-b196804.0+b196804",
+    "@agoric/vat-data": "0.5.3-dev-b196804.0+b196804",
+    "@agoric/vats": "0.15.2-dev-b196804.0+b196804",
+    "@agoric/vow": "0.1.1-dev-b196804.0+b196804",
+    "@agoric/zoe": "0.26.3-dev-b196804.0+b196804",
+    "@agoric/zone": "0.2.3-dev-b196804.0+b196804",
     "@endo/base64": "^1.0.5",
     "@endo/errors": "^1.2.2",
     "@endo/far": "^1.1.2",
@@ -53,6 +53,7 @@
     "@endo/patterns": "^1.4.0"
   },
   "devDependencies": {
+    "@agoric/swingset-liveslots": "0.10.3-dev-b196804.0+b196804",
     "@chain-registry/client": "^1.47.4",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
@@ -90,5 +91,5 @@
   "typeCoverage": {
     "atLeast": 97.1
   },
-  "gitHead": "217005a921dcac6928c999e6bfe06330a5947ac5"
+  "gitHead": "b196804c28fe5ed5f742c0e23a4d223b7fc0a164"
 }

package/src/examples/sendAnywhere.contract.d.ts

@@ -1,7 +1,7 @@
 export const SingleAmountRecord: import("@endo/patterns").Matcher;
-export function start(zcf: ZCF, privateArgs: OrchestrationPowers & {
+export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: OrchestrationPowers & {
     marshaller: Marshaller;
-}, baggage: Baggage): Promise<{
+}, baggage: import("@agoric/vat-data").Baggage) => Promise<{
     publicFacet: import("@endo/exo").Guarded<{
         makeSendInvitation(): Promise<Invitation<unknown, never>>;
     }>;
@@ -10,22 +10,27 @@ export function start(zcf: ZCF, privateArgs: OrchestrationPowers & {
          * @param {CosmosChainInfo} chainInfo
          * @param {IBCConnectionInfo} connectionInfo
          */
-        addChain(chainInfo: CosmosChainInfo, connectionInfo: IBCConnectionInfo): Promise<string>;
+        addChain(chainInfo: Readonly<{
+            chainId: string;
+            connections?: Record<string, IBCConnectionInfo>;
+            icqEnabled?: boolean;
+            stakingTokens?: Readonly<Array<{
+                denom: string;
+            }>>;
+        }>, connectionInfo: IBCConnectionInfo): Promise<string>;
     }>;
 }>;
 export type OrchestrationPowers = {
     localchain: Remote<LocalChain>;
-    orchestrationService: Remote<OrchestrationService>;
+    orchestrationService: Remote<CosmosInterchainService>;
     storageNode: Remote<StorageNode>;
     timerService: Remote<TimerService>;
     agoricNames: Remote<NameHub>;
 };
-import type { Baggage } from '@agoric/vat-data';
-import type { CosmosChainInfo } from '../cosmos-api';
 import type { IBCConnectionInfo } from '../cosmos-api';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
 import type { Remote } from '@agoric/vow';
-import type { OrchestrationService } from '../service.js';
+import type { CosmosInterchainService } from '../exos/cosmos-interchain-service.js';
 import type { TimerService } from '@agoric/time';
 import type { NameHub } from '@agoric/vats';
 //# sourceMappingURL=sendAnywhere.contract.d.ts.map

package/src/examples/sendAnywhere.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendAnywhere.contract.d.ts","sourceRoot":"","sources":["sendAnywhere.contract.js"],"names":[],"mappings":"AAmFA,kEAKE;AASK,2BANI,GAAG,eACH,mBAAmB,GAAG;IAChC,UAAc,EAAE,UAAU,CAAC;CACxB,WACO,OAAO;;;;;QAsDZ;;;WAGG;4BAFQ,eAAe,kBACf,iBAAiB;;GAqBjC;kCAlJY;IACZ,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,oBAAoB,CAAC,CAAC;IACvD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;6BAlBsB,kBAAkB;qCAKS,eAAe;uCAAf,eAAe;gCAHvC,gCAAgC;4BAEpC,aAAa;0CAEC,eAAe;kCALvB,cAAc;6BAEnB,cAAc"}
+{"version":3,"file":"sendAnywhere.contract.d.ts","sourceRoot":"","sources":["sendAnywhere.contract.js"],"names":[],"mappings":"AAoFA,kEAKE;AAwFF;gBAjFiB,UAAU;;;;;;QAwDrB;;;WAGG;;;;;;;;4BADQ,iBAAiB;;GAuBe;kCAtJpC;IACZ,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC1D,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;uCAdiD,eAAe;gCAJvC,gCAAgC;4BAEpC,aAAa;6CAGI,sCAAsC;kCANjD,cAAc;6BAEnB,cAAc"}

package/src/examples/sendAnywhere.contract.js

@@ -1,32 +1,33 @@
+import { makeStateRecord } from '@agoric/async-flow';
+import { AmountShape } from '@agoric/ertp';
+import { heapVowE } from '@agoric/vow/vat.js';
 import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
 import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
-import { M, mustMatch } from '@endo/patterns';
 import { E } from '@endo/far';
-import { heapVowE } from '@agoric/vow/vat.js';
-import { makeStateRecord } from '@agoric/async-flow';
-import { AmountShape } from '@agoric/ertp';
-import { CosmosChainInfoShape } from '../typeGuards.js';
-import { provideOrchestration } from '../utils/start-helper.js';
+import { M, mustMatch } from '@endo/patterns';
 import { makeResumableAgoricNamesHack } from '../exos/agoric-names-tools.js';
+import { CosmosChainInfoShape } from '../typeGuards.js';
+import { withOrchestration } from '../utils/start-helper.js';
 
 const { entries } = Object;
 
 /**
- * @import {Baggage} from '@agoric/vat-data';
  * @import {TimerService} from '@agoric/time';
  * @import {LocalChain} from '@agoric/vats/src/localchain.js';
  * @import {NameHub} from '@agoric/vats';
  * @import {Remote} from '@agoric/vow';
+ * @import {Zone} from '@agoric/zone';
  * @import {CosmosChainInfo, IBCConnectionInfo} from '../cosmos-api';
- * @import {OrchestrationService} from '../service.js';
+ * @import {CosmosInterchainService} from '../exos/cosmos-interchain-service.js';
  * @import {Orchestrator} from '../types.js'
+ * @import {OrchestrationTools} from '../utils/start-helper.js';
  * @import {OrchestrationAccount} from '../orchestration-api.js'
  */
 
 /**
  * @typedef {{
  *   localchain: Remote<LocalChain>;
- *   orchestrationService: Remote<OrchestrationService>;
+ *   orchestrationService: Remote<CosmosInterchainService>;
  *   storageNode: Remote<StorageNode>;
  *   timerService: Remote<TimerService>;
  *   agoricNames: Remote<NameHub>;
@@ -89,19 +90,21 @@ export const SingleAmountRecord = M.and(
 );
 
 /**
+ * Orchestration contract to be wrapped by withOrchestration for Zoe
+ *
  * @param {ZCF} zcf
  * @param {OrchestrationPowers & {
  *   marshaller: Marshaller;
  * }} privateArgs
- * @param {Baggage} baggage
+ * @param {Zone} zone
+ * @param {OrchestrationTools} tools
  */
-export const start = async (zcf, privateArgs, baggage) => {
-  const { chainHub, orchestrate, vowTools, zone } = provideOrchestration(
-    zcf,
-    baggage,
-    privateArgs,
-    privateArgs.marshaller,
-  );
+const contract = async (
+  zcf,
+  privateArgs,
+  zone,
+  { chainHub, orchestrate, vowTools },
+) => {
   const agoricNamesTools = makeResumableAgoricNamesHack(zone, {
     agoricNames: privateArgs.agoricNames,
     vowTools,
@@ -171,3 +174,5 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   return { publicFacet, creatorFacet };
 };
+
+export const start = withOrchestration(contract);

package/src/examples/stakeBld.contract.js

@@ -47,7 +47,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     zcf,
     privateArgs.timerService,
     vowTools,
-    makeChainHub(privateArgs.agoricNames),
+    makeChainHub(privateArgs.agoricNames, vowTools),
   );
 
   // ----------------

package/src/examples/stakeIca.contract.d.ts

@@ -2,18 +2,18 @@
  * @import {Baggage} from '@agoric/vat-data';
  * @import {IBCConnectionID} from '@agoric/vats';
  * @import {TimerService} from '@agoric/time';
- * @import {ICQConnection, OrchestrationService} from '../types.js';
+ * @import {ICQConnection, CosmosInterchainService} from '../types.js';
  */
 /** @type {ContractMeta<typeof start>} */
 export const meta: ContractMeta<typeof start>;
 export const privateArgsShape: {
-    orchestration: globalThis.Pattern;
+    cosmosInterchainService: globalThis.Pattern;
     storageNode: globalThis.Pattern;
     marshaller: globalThis.Pattern;
     timer: globalThis.Pattern;
 } | undefined;
 export function start(zcf: ZCF<StakeIcaTerms>, privateArgs: {
-    orchestration: OrchestrationService;
+    cosmosInterchainService: CosmosInterchainService;
     storageNode: StorageNode;
     marshaller: Marshaller;
     timer: TimerService;
@@ -85,7 +85,7 @@ export type StakeIcaTerms = {
     icqEnabled: boolean;
 };
 export type StakeIcaSF = typeof start;
-import type { OrchestrationService } from '../types.js';
+import type { CosmosInterchainService } from '../types.js';
 import type { TimerService } from '@agoric/time';
 import type { Baggage } from '@agoric/vat-data';
 import type { IBCConnectionID } from '@agoric/vats';

package/src/examples/stakeIca.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stakeIca.contract.d.ts","sourceRoot":"","sources":["stakeIca.contract.js"],"names":[],"mappings":"AAeA;;;;;GAKG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAelC;AACH;;;;;cAAsD;AAsB/C,2BATI,GAAG,CAAC,aAAa,CAAC,eAClB;IACV,aAAiB,EAAE,oBAAoB,CAAC;IACxC,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;IAC3B,KAAS,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFjB;4BAnGY;IACZ,OAAW,EAAE,MAAM,CAAC;IACpB,gBAAoB,EAAE,eAAe,CAAC;IACtC,sBAA0B,EAAE,eAAe,CAAC;IAC5C,SAAa,EAAE,MAAM,CAAC;IACtB,UAAc,EAAE,OAAO,CAAC;CACrB;yBA+FU,OAAO,KAAK;0CA3H4B,aAAa;kCADpC,cAAc;6BAFnB,kBAAkB;qCACV,cAAc"}
+{"version":3,"file":"stakeIca.contract.d.ts","sourceRoot":"","sources":["stakeIca.contract.js"],"names":[],"mappings":"AAeA;;;;;GAKG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAelC;AACH;;;;;cAAsD;AAsB/C,2BATI,GAAG,CAAC,aAAa,CAAC,eAClB;IACV,uBAA2B,EAAE,uBAAuB,CAAC;IACrD,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;IAC3B,KAAS,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuFjB;4BAxGY;IACZ,OAAW,EAAE,MAAM,CAAC;IACpB,gBAAoB,EAAE,eAAe,CAAC;IACtC,sBAA0B,EAAE,eAAe,CAAC;IAC5C,SAAa,EAAE,MAAM,CAAC;IACtB,UAAc,EAAE,OAAO,CAAC;CACrB;yBAoGU,OAAO,KAAK;6CAhI+B,aAAa;kCADvC,cAAc;6BAFnB,kBAAkB;qCACV,cAAc"}

package/src/examples/stakeIca.contract.js

@@ -17,7 +17,7 @@ const trace = makeTracer('StakeIca');
  * @import {Baggage} from '@agoric/vat-data';
  * @import {IBCConnectionID} from '@agoric/vats';
  * @import {TimerService} from '@agoric/time';
- * @import {ICQConnection, OrchestrationService} from '../types.js';
+ * @import {ICQConnection, CosmosInterchainService} from '../types.js';
  */
 
 /** @type {ContractMeta<typeof start>} */
@@ -30,7 +30,7 @@ export const meta = harden({
     icqEnabled: M.boolean(),
   },
   privateArgsShape: {
-    orchestration: M.remotable('orchestration'),
+    cosmosInterchainService: M.remotable('cosmosInterchainService'),
     storageNode: StorageNodeShape,
     marshaller: M.remotable('marshaller'),
     timer: TimerServiceShape,
@@ -51,7 +51,7 @@ export const privateArgsShape = meta.privateArgsShape;
 /**
  * @param {ZCF<StakeIcaTerms>} zcf
  * @param {{
- *   orchestration: OrchestrationService;
+ *   cosmosInterchainService: CosmosInterchainService;
  *   storageNode: StorageNode;
  *   marshaller: Marshaller;
  *   timer: TimerService;
@@ -66,7 +66,12 @@ export const start = async (zcf, privateArgs, baggage) => {
     bondDenom,
     icqEnabled,
   } = zcf.getTerms();
-  const { orchestration, marshaller, storageNode, timer } = privateArgs;
+  const {
+    cosmosInterchainService: orchestration,
+    marshaller,
+    storageNode,
+    timer,
+  } = privateArgs;
 
   const zone = makeDurableZone(baggage);
 

package/src/examples/swapExample.contract.d.ts

@@ -4,21 +4,16 @@ export function makeNatAmountShape(brand: Brand, min?: bigint | undefined): {
     brand: globalThis.Brand;
     value: import("@endo/patterns").Matcher;
 };
-export function start(zcf: ZCF, privateArgs: {
+export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: {
     agoricNames: Remote<NameHub>;
     localchain: Remote<LocalChain>;
-    orchestrationService: Remote<OrchestrationService>;
+    orchestrationService: Remote<CosmosInterchainService>;
     storageNode: Remote<StorageNode>;
     timerService: Remote<TimerService>;
     marshaller: Marshaller;
-}, baggage: Baggage): Promise<{
-    publicFacet: {
-        makeSwapAndStakeInvitation: () => Promise<Invitation<unknown, {
-            staked: Amount<"nat">;
-            validator: CosmosValidatorAddress;
-        }>>;
-    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-        makeSwapAndStakeInvitation: () => Promise<Invitation<unknown, {
+}, baggage: import("@agoric/vat-data").Baggage) => Promise<{
+    publicFacet: import("@endo/exo").Guarded<{
+        makeSwapAndStakeInvitation(): Promise<Invitation<unknown, {
             staked: Amount<"nat">;
             validator: CosmosValidatorAddress;
         }>>;
@@ -27,8 +22,7 @@ export function start(zcf: ZCF, privateArgs: {
 import type { NameHub } from '@agoric/vats';
 import type { Remote } from '@agoric/internal';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
-import type { OrchestrationService } from '../service.js';
+import type { CosmosInterchainService } from '../exos/cosmos-interchain-service.js';
 import type { TimerService } from '@agoric/time';
-import type { Baggage } from '@agoric/vat-data';
 import type { CosmosValidatorAddress } from '../types.js';
 //# sourceMappingURL=swapExample.contract.d.ts.map

package/src/examples/swapExample.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swapExample.contract.d.ts","sourceRoot":"","sources":["swapExample.contract.js"],"names":[],"mappings":"AAoEA,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAWnC;AASK,0CAHI,KAAK;;;EAIsC;AAc/C,2BAXI,GAAG,eACH;IACV,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;IACjC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,oBAAoB,CAAC,CAAC;IACvD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,UAAc,EAAE,UAAU,CAAC;CACxB,WACO,OAAO;;;oBA+BD,MAAM,CAAC,KAAK,CAAC;uBAAa,sBAAsB;;;;oBAAhD,MAAM,CAAC,KAAK,CAAC;uBAAa,sBAAsB;;;GAsBhE;6BA1IyB,cAAc;4BAHf,kBAAkB;gCADd,gCAAgC;0CAEtB,eAAe;kCAHvB,cAAc;6BAInB,kBAAkB;4CALuB,aAAa"}
+{"version":3,"file":"swapExample.contract.d.ts","sourceRoot":"","sources":["swapExample.contract.js"],"names":[],"mappings":"AAoEA,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAWnC;AASK,0CAHI,KAAK;;;EAIsC;AA+CtD;iBAxCkB,OAAO,OAAO,CAAC;gBAChB,OAAO,UAAU,CAAC;0BACR,OAAO,uBAAuB,CAAC;iBACxC,OAAO,WAAW,CAAC;kBAClB,OAAO,YAAY,CAAC;gBACtB,UAAU;;;;oBAYV,MAAM,CAAC,KAAK,CAAC;uBAAa,sBAAsB;;;GAuBhB;6BA1HvB,cAAc;4BAFf,kBAAkB;gCADd,gCAAgC;6CAEnB,sCAAsC;kCAHjD,cAAc;4CADsB,aAAa"}

package/src/examples/swapExample.contract.js

@@ -1,20 +1,20 @@
 import { StorageNodeShape } from '@agoric/internal';
 import { TimerServiceShape } from '@agoric/time';
 import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
-import { Far } from '@endo/far';
 import { deeplyFulfilled } from '@endo/marshal';
 import { M, objectMap } from '@endo/patterns';
 import { orcUtils } from '../utils/orc.js';
-import { provideOrchestration } from '../utils/start-helper.js';
+import { withOrchestration } from '../utils/start-helper.js';
 
 /**
  * @import {Orchestrator, IcaAccount, CosmosValidatorAddress} from '../types.js'
  * @import {TimerService} from '@agoric/time';
  * @import {LocalChain} from '@agoric/vats/src/localchain.js';
  * @import {Remote} from '@agoric/internal';
- * @import {OrchestrationService} from '../service.js';
- * @import {Baggage} from '@agoric/vat-data'
+ * @import {CosmosInterchainService} from '../exos/cosmos-interchain-service.js';
  * @import {NameHub} from '@agoric/vats';
+ * @import {Zone} from '@agoric/zone';
+ * @import {OrchestrationTools} from '../utils/start-helper.js';
  */
 
 /**
@@ -90,40 +90,21 @@ export const makeNatAmountShape = (brand, min) =>
   harden({ brand, value: min ? M.gte(min) : M.nat() });
 
 /**
+ * Orchestration contract to be wrapped by withOrchestration for Zoe
+ *
  * @param {ZCF} zcf
  * @param {{
  *   agoricNames: Remote<NameHub>;
  *   localchain: Remote<LocalChain>;
- *   orchestrationService: Remote<OrchestrationService>;
+ *   orchestrationService: Remote<CosmosInterchainService>;
  *   storageNode: Remote<StorageNode>;
  *   timerService: Remote<TimerService>;
  *   marshaller: Marshaller;
  * }} privateArgs
- * @param {Baggage} baggage
+ * @param {Zone} zone
+ * @param {OrchestrationTools} tools
  */
-export const start = async (zcf, privateArgs, baggage) => {
-  const {
-    agoricNames,
-    localchain,
-    orchestrationService,
-    storageNode,
-    timerService,
-    marshaller,
-  } = privateArgs;
-
-  const { orchestrate } = provideOrchestration(
-    zcf,
-    baggage,
-    {
-      agoricNames,
-      localchain,
-      orchestrationService,
-      storageNode,
-      timerService,
-    },
-    marshaller,
-  );
-
+const contract = async (zcf, privateArgs, zone, { orchestrate }) => {
   const { brands } = zcf.getTerms();
 
   /** deprecated historical example */
@@ -135,21 +116,22 @@ export const start = async (zcf, privateArgs, baggage) => {
    */
   const swapAndStakeHandler = orchestrate('LSTTia', { zcf }, stackAndSwapFn);
 
-  const makeSwapAndStakeInvitation = () =>
-    zcf.makeInvitation(
-      swapAndStakeHandler,
-      'Swap for TIA and stake',
-      undefined,
-      harden({
-        give: { Stable: makeNatAmountShape(brands.Stable, 1n) },
-        want: {}, // XXX ChainAccount Ownable?
-        exit: M.any(),
-      }),
-    );
-
-  const publicFacet = Far('SwapAndStake Public Facet', {
-    makeSwapAndStakeInvitation,
+  const publicFacet = zone.exo('publicFacet', undefined, {
+    makeSwapAndStakeInvitation() {
+      return zcf.makeInvitation(
+        swapAndStakeHandler,
+        'Swap for TIA and stake',
+        undefined,
+        harden({
+          give: { Stable: makeNatAmountShape(brands.Stable, 1n) },
+          want: {}, // XXX ChainAccount Ownable?
+          exit: M.any(),
+        }),
+      );
+    },
   });
 
   return harden({ publicFacet });
 };
+
+export const start = withOrchestration(contract);

package/src/examples/unbondExample.contract.d.ts

@@ -1,21 +1,19 @@
-export function start(zcf: ZCF, privateArgs: {
+export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: {
     agoricNames: Remote<NameHub>;
     localchain: Remote<LocalChain>;
-    orchestrationService: Remote<OrchestrationService>;
+    orchestrationService: Remote<CosmosInterchainService>;
     storageNode: Remote<StorageNode>;
     marshaller: Marshaller;
     timerService: Remote<TimerService>;
-}, baggage: Baggage): Promise<{
-    publicFacet: {
-        makeUnbondAndLiquidStakeInvitation: () => Promise<Invitation<unknown, never>>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-        makeUnbondAndLiquidStakeInvitation: () => Promise<Invitation<unknown, never>>;
+}, baggage: Baggage) => Promise<{
+    publicFacet: import("@endo/exo").Guarded<{
+        makeUnbondAndLiquidStakeInvitation(): Promise<Invitation<unknown, never>>;
     }>;
 }>;
 import type { NameHub } from '@agoric/vats';
 import type { Remote } from '@agoric/internal';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
-import type { OrchestrationService } from '../service.js';
+import type { CosmosInterchainService } from '../exos/cosmos-interchain-service.js';
 import type { TimerService } from '@agoric/time';
 import type { Baggage } from '@agoric/vat-data';
 //# sourceMappingURL=unbondExample.contract.d.ts.map

package/src/examples/unbondExample.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unbondExample.contract.d.ts","sourceRoot":"","sources":["unbondExample.contract.js"],"names":[],"mappings":"AAwDO,2BAXI,GAAG,eACH;IACV,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;IACjC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,oBAAoB,CAAC,CAAC;IACvD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,UAAc,EAAE,UAAU,CAAC;IAC3B,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;CACpC,WACO,OAAO;;;;;;GAkDjB;6BA/FyB,cAAc;4BACf,kBAAkB;gCAFd,gCAAgC;0CAGtB,eAAe;kCALvB,cAAc;6BACnB,kBAAkB"}
+{"version":3,"file":"unbondExample.contract.d.ts","sourceRoot":"","sources":["unbondExample.contract.js"],"names":[],"mappings":"AAuFA;iBArCkB,OAAO,OAAO,CAAC;gBAChB,OAAO,UAAU,CAAC;0BACR,OAAO,uBAAuB,CAAC;iBACxC,OAAO,WAAW,CAAC;gBACpB,UAAU;kBACR,OAAO,YAAY,CAAC;;;;;GAgCU;6BA/EvB,cAAc;4BACf,kBAAkB;gCAFd,gCAAgC;6CAInB,sCAAsC;kCANjD,cAAc;6BACnB,kBAAkB"}

package/src/examples/unbondExample.contract.js

@@ -1,6 +1,5 @@
-import { Far } from '@endo/far';
 import { M } from '@endo/patterns';
-import { provideOrchestration } from '../utils/start-helper.js';
+import { withOrchestration } from '../utils/start-helper.js';
 
 /**
  * @import {Orchestrator, IcaAccount, CosmosValidatorAddress} from '../types.js'
@@ -9,7 +8,9 @@ import { provideOrchestration } from '../utils/start-helper.js';
  * @import {LocalChain} from '@agoric/vats/src/localchain.js';
  * @import {NameHub} from '@agoric/vats';
  * @import {Remote} from '@agoric/internal';
- * @import {OrchestrationService} from '../service.js';
+ * @import {Zone} from '@agoric/zone';
+ * @import {CosmosInterchainService} from '../exos/cosmos-interchain-service.js';
+ * @import {OrchestrationTools} from '../utils/start-helper.js';
  */
 
 /**
@@ -43,40 +44,21 @@ const unbondAndLiquidStakeFn = async (orch, { zcf }, _seat, _offerArgs) => {
 };
 
 /**
+ * Orchestration contract to be wrapped by withOrchestration for Zoe
+ *
  * @param {ZCF} zcf
  * @param {{
  *   agoricNames: Remote<NameHub>;
  *   localchain: Remote<LocalChain>;
- *   orchestrationService: Remote<OrchestrationService>;
+ *   orchestrationService: Remote<CosmosInterchainService>;
  *   storageNode: Remote<StorageNode>;
  *   marshaller: Marshaller;
  *   timerService: Remote<TimerService>;
  * }} privateArgs
- * @param {Baggage} baggage
+ * @param {Zone} zone
+ * @param {OrchestrationTools} tools
  */
-export const start = async (zcf, privateArgs, baggage) => {
-  const {
-    agoricNames,
-    localchain,
-    orchestrationService,
-    storageNode,
-    marshaller,
-    timerService,
-  } = privateArgs;
-
-  const { orchestrate } = provideOrchestration(
-    zcf,
-    baggage,
-    {
-      agoricNames,
-      localchain,
-      orchestrationService,
-      storageNode,
-      timerService,
-    },
-    marshaller,
-  );
-
+const contract = async (zcf, privateArgs, zone, { orchestrate }) => {
   /** @type {OfferHandler} */
   const unbondAndLiquidStake = orchestrate(
     'LSTTia',
@@ -84,22 +66,23 @@ export const start = async (zcf, privateArgs, baggage) => {
     unbondAndLiquidStakeFn,
   );
 
-  const makeUnbondAndLiquidStakeInvitation = () =>
-    zcf.makeInvitation(
-      unbondAndLiquidStake,
-      'Unbond and liquid stake',
-      undefined,
-      harden({
-        // Nothing to give; the funds come from undelegating
-        give: {},
-        want: {}, // XXX ChainAccount Ownable?
-        exit: M.any(),
-      }),
-    );
-
-  const publicFacet = Far('SwapAndStake Public Facet', {
-    makeUnbondAndLiquidStakeInvitation,
+  const publicFacet = zone.exo('publicFacet', undefined, {
+    makeUnbondAndLiquidStakeInvitation() {
+      return zcf.makeInvitation(
+        unbondAndLiquidStake,
+        'Unbond and liquid stake',
+        undefined,
+        harden({
+          // Nothing to give; the funds come from undelegating
+          give: {},
+          want: {}, // XXX ChainAccount Ownable?
+          exit: M.any(),
+        }),
+      );
+    },
   });
 
   return harden({ publicFacet });
 };
+
+export const start = withOrchestration(contract);

package/src/exos/chain-hub.d.ts

@@ -1,6 +1,6 @@
 /**
  * @import {NameHub} from '@agoric/vats';
- * @import {Vow} from '@agoric/vow';
+ * @import {Vow, VowTools} from '@agoric/vow';
  * @import {CosmosChainInfo, IBCConnectionInfo} from '../cosmos-api.js';
  * @import {ChainInfo, KnownChains} from '../chain-info.js';
  * @import {Remote} from '@agoric/internal';
@@ -17,7 +17,7 @@ export const CHAIN_KEY: "chain";
 /** namehub for connection info */
 export const CONNECTIONS_KEY: "chainConnection";
 export function connectionKey(chainId1: string, chainId2: string): string;
-export function makeChainHub(agoricNames: Remote<NameHub>, zone?: Zone | undefined): import("@endo/exo").Guarded<{
+export function makeChainHub(agoricNames: Remote<NameHub>, vowTools: VowTools): import("@endo/exo").Guarded<{
     /**
      * Register a new chain. The name will override a name in well known chain
      * names.
@@ -68,7 +68,7 @@ export type ActualChainInfo<K extends string> = K extends keyof KnownChains ? Om
 export type ChainHub = ReturnType<typeof makeChainHub>;
 import type { NameHub } from '@agoric/vats';
 import type { Remote } from '@agoric/internal';
-import type { Zone } from '@agoric/zone';
+import type { VowTools } from '@agoric/vow';
 import type { CosmosChainInfo } from '../cosmos-api.js';
 import type { Vow } from '@agoric/vow';
 import type { IBCConnectionInfo } from '../cosmos-api.js';

package/src/exos/chain-hub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain-hub.d.ts","sourceRoot":"","sources":["chain-hub.js"],"names":[],"mappings":"AAcA;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH,wCAAwC;AACxC,gCAAiC;AACjC,kCAAkC;AAClC,gDAAiD;AAqB1C,wCAHI,MAAM,YACN,MAAM,UAUhB;AAoCM,0CAHI,OAAO,OAAO,CAAC;IAgBtB;;;;;;;;;;;OAWG;wBAFQ,MAAM,aACN,eAAe;IAK1B;;;;OAIG;iBAHmB,CAAC,SAAV,MAAQ,aACV,CAAC,GACC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;IAoBpC;;;;OAIG;iCAHQ,MAAM,YACN,MAAM,kBACN,iBAAiB;IAO5B;;;;OAIG;8BAHQ,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,UAC5B,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAC1B,IAAI,iBAAiB,CAAC;IAqBnC;;;;;;;;OAQG;2BAPmB,EAAE,SAAX,MAAQ,EACC,EAAE,SAAX,MAAQ,cACV,EAAE,cACF,EAAE,GACA,IACZ,CAAK,eAAe,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC9D;GAsBP;4BA5LqB,CAAC,SAAV,MAAQ,IACR,CAAC,SAAS,MAAM,WAAW,GACjC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,GACnC,SAAS;uBA0LF,UAAU,CAAC,OAAO,YAAY,CAAC;6BAtMnB,cAAc;4BAIf,kBAAkB;0BACpB,cAAc;qCAHgB,kBAAkB;yBADjD,aAAa;uCACkB,kBAAkB;iCAC9B,kBAAkB;+BAAlB,kBAAkB"}
+{"version":3,"file":"chain-hub.d.ts","sourceRoot":"","sources":["chain-hub.js"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH,wCAAwC;AACxC,gCAAiC;AACjC,kCAAkC;AAClC,gDAAiD;AAqB1C,wCAHI,MAAM,YACN,MAAM,UAUhB;AAoCM,0CAHI,OAAO,OAAO,CAAC,YACf,QAAQ;IAmGf;;;;;;;;;;;OAWG;wBAFQ,MAAM,aACN,eAAe;IAK1B;;;;OAIG;iBAHmB,CAAC,SAAV,MAAQ,aACV,CAAC,GACC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;IAYpC;;;;OAIG;iCAHQ,MAAM,YACN,MAAM,kBACN,iBAAiB;IAO5B;;;;OAIG;8BAHQ,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,UAC5B,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAC1B,IAAI,iBAAiB,CAAC;IAanC;;;;;;;;OAQG;2BAPmB,EAAE,SAAX,MAAQ,EACC,EAAE,SAAX,MAAQ,cACV,EAAE,cACF,EAAE,GACA,IACZ,CAAK,eAAe,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC9D;GASP;4BAnPqB,CAAC,SAAV,MAAQ,IACR,CAAC,SAAS,MAAM,WAAW,GACjC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,GACnC,SAAS;uBAiPF,UAAU,CAAC,OAAO,YAAY,CAAC;6BA7PnB,cAAc;4BAIf,kBAAkB;8BAHX,aAAa;qCACQ,kBAAkB;yBADvC,aAAa;uCACQ,kBAAkB;iCAC9B,kBAAkB;+BAAlB,kBAAkB"}