@agoric/orchestration 0.1.1-dev-4696a6a.0 → 0.1.1-dev-8718c07.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-4696a6a.0+4696a6a",
+  "version": "0.1.1-dev-8718c07.0+8718c07",
   "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-4696a6a.0+4696a6a",
-    "@agoric/cosmic-proto": "0.4.1-dev-4696a6a.0+4696a6a",
-    "@agoric/ertp": "0.16.3-dev-4696a6a.0+4696a6a",
-    "@agoric/internal": "0.3.3-dev-4696a6a.0+4696a6a",
-    "@agoric/network": "0.1.1-dev-4696a6a.0+4696a6a",
-    "@agoric/notifier": "0.6.3-dev-4696a6a.0+4696a6a",
-    "@agoric/store": "0.9.3-dev-4696a6a.0+4696a6a",
-    "@agoric/time": "0.3.3-dev-4696a6a.0+4696a6a",
-    "@agoric/vat-data": "0.5.3-dev-4696a6a.0+4696a6a",
-    "@agoric/vats": "0.15.2-dev-4696a6a.0+4696a6a",
-    "@agoric/vow": "0.1.1-dev-4696a6a.0+4696a6a",
-    "@agoric/zoe": "0.26.3-dev-4696a6a.0+4696a6a",
-    "@agoric/zone": "0.2.3-dev-4696a6a.0+4696a6a",
+    "@agoric/async-flow": "0.1.1-dev-8718c07.0+8718c07",
+    "@agoric/cosmic-proto": "0.4.1-dev-8718c07.0+8718c07",
+    "@agoric/ertp": "0.16.3-dev-8718c07.0+8718c07",
+    "@agoric/internal": "0.3.3-dev-8718c07.0+8718c07",
+    "@agoric/network": "0.1.1-dev-8718c07.0+8718c07",
+    "@agoric/notifier": "0.6.3-dev-8718c07.0+8718c07",
+    "@agoric/store": "0.9.3-dev-8718c07.0+8718c07",
+    "@agoric/time": "0.3.3-dev-8718c07.0+8718c07",
+    "@agoric/vat-data": "0.5.3-dev-8718c07.0+8718c07",
+    "@agoric/vats": "0.15.2-dev-8718c07.0+8718c07",
+    "@agoric/vow": "0.1.1-dev-8718c07.0+8718c07",
+    "@agoric/zoe": "0.26.3-dev-8718c07.0+8718c07",
+    "@agoric/zone": "0.2.3-dev-8718c07.0+8718c07",
     "@endo/base64": "^1.0.5",
     "@endo/errors": "^1.2.2",
     "@endo/far": "^1.1.2",
@@ -54,7 +54,7 @@
     "@noble/hashes": "github:paulmillr/noble-hashes#ae060da"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-4696a6a.0+4696a6a",
+    "@agoric/swingset-liveslots": "0.10.3-dev-8718c07.0+8718c07",
     "@chain-registry/client": "^1.47.4",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
@@ -94,5 +94,5 @@
   "typeCoverage": {
     "atLeast": 98.05
   },
-  "gitHead": "4696a6ae369291fb492340d1444f3d205de49ece"
+  "gitHead": "8718c0748521ceeb0f7bab04bbe8fe5d1bc643b0"
 }

package/src/exos/cosmos-interchain-service.d.ts

@@ -4,35 +4,38 @@ export function prepareCosmosInterchainService(zone: Zone, vowTools: VowTools):
      * @param {IBCConnectionID} hostConnectionId the counterparty
      *   connection_id
      * @param {IBCConnectionID} controllerConnectionId self connection_id
+     * @param {ICAChannelAddressOpts} [opts] optional to configure the
+     *   channel address, such as version and ordering
      * @returns {Vow<IcaAccount>}
      */
-    makeAccount(chainId: string, hostConnectionId: IBCConnectionID, controllerConnectionId: IBCConnectionID): Vow<IcaAccount>;
+    makeAccount(chainId: string, hostConnectionId: IBCConnectionID, controllerConnectionId: IBCConnectionID, opts?: ICAChannelAddressOpts | undefined): Vow<IcaAccount>;
     /**
      * @param {IBCConnectionID} controllerConnectionId
+     * @param {string} [version]
      * @returns {Vow<ICQConnection> | ICQConnection}
      */
-    provideICQConnection(controllerConnectionId: IBCConnectionID): Vow<ICQConnection> | ICQConnection;
+    provideICQConnection(controllerConnectionId: IBCConnectionID, version?: string | undefined): Vow<ICQConnection> | ICQConnection;
 }>;
 export type OrchestrationPowers = {
     portAllocator: Remote<PortAllocator>;
+    /**
+     * reserve a state key for future use. can hold
+     * an additional power or a record of powers
+     */
+    reserved: undefined;
 };
-/**
- * PowerStore is used so additional powers can be added on upgrade. See
- * [#7337](https://github.com/Agoric/agoric-sdk/issues/7337) for tracking on Exo
- * state migrations.
- */
-export type PowerStore = MapStore<keyof OrchestrationPowers, OrchestrationPowers[keyof OrchestrationPowers]>;
-export type ICQConnectionStore = MapStore<IBCConnectionID, ICQConnectionKit>;
+export type ICQConnectionStore = MapStore<string, ICQConnectionKit>;
 export type ConnectionKit = ChainAccountKit | ICQConnectionKit;
 export type OrchestrationState = {
-    powers: PowerStore;
     icqConnections: ICQConnectionStore;
-};
+    sharedICQPort: Remote<Port> | undefined;
+} & OrchestrationPowers;
 export type MakeCosmosInterchainService = ReturnType<typeof prepareCosmosInterchainService>;
 export type CosmosInterchainService = ReturnType<MakeCosmosInterchainService>;
 import type { Zone } from '@agoric/base-zone';
 import type { VowTools } from '@agoric/vow';
 import type { IBCConnectionID } from '@agoric/vats';
+import type { ICAChannelAddressOpts } from '../utils/address.js';
 import type { IcaAccount } from '../types.js';
 import type { Vow } from '@agoric/vow';
 import type { ICQConnection } from '../types.js';
@@ -40,4 +43,5 @@ import type { PortAllocator } from '@agoric/network';
 import type { Remote } from '@agoric/internal';
 import type { ICQConnectionKit } from '../types.js';
 import type { ChainAccountKit } from '../types.js';
+import type { Port } from '@agoric/network';
 //# sourceMappingURL=cosmos-interchain-service.d.ts.map

package/src/exos/cosmos-interchain-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos-interchain-service.d.ts","sourceRoot":"","sources":["cosmos-interchain-service.js"],"names":[],"mappings":"AAkPO,qDAHI,IAAI,YACJ,QAAQ;IAnDX;;;;;;OAMG;yBALQ,MAAM,oBACN,eAAe,0BAEf,eAAe,GACb,IAAI,UAAU,CAAC;IAiB5B;;;OAGG;iDAFQ,eAAe,GACb,IAAI,aAAa,CAAC,GAAG,aAAa;GA4CtD;;mBAvOa,OAAO,aAAa,CAAC;;;;;;;yBAQtB,QAAQ,CACpB,MAAU,mBAAmB,EAC7B,mBAAuB,CAAC,MAAM,mBAAmB,CAAC,CAC/C;iCAGU,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;4BAE3C,eAAe,GAAG,gBAAgB;iCAYlC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,cAAc,EAAE,kBAAkB,CAAA;CAAE;0CA8M1D,UAAU,CAAC,OAAO,8BAA8B,CAAC;sCACjD,UAAU,CAAC,2BAA2B,CAAC;0BAvP9B,mBAAmB;8BAKV,aAAa;qCAFX,cAAc;gCAG+B,aAAa;yBAD5D,aAAa;mCACkC,aAAa;mCAJ1C,iBAAiB;4BAD1C,kBAAkB;sCAKoC,aAAa;qCAAb,aAAa"}
+{"version":3,"file":"cosmos-interchain-service.d.ts","sourceRoot":"","sources":["cosmos-interchain-service.js"],"names":[],"mappings":"AA6PO,qDAHI,IAAI,YACJ,QAAQ;IAnEX;;;;;;;;OAQG;yBAPQ,MAAM,oBACN,eAAe,0BAEf,eAAe,6CAGb,IAAI,UAAU,CAAC;IAkB5B;;;;OAIG;iDAHQ,eAAe,iCAEb,IAAI,aAAa,CAAC,GAAG,aAAa;GAwDtD;;mBAjPa,OAAO,aAAa,CAAC;;;;;cACrB,SAAS;;iCAIT,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;4BAElC,eAAe,GAAG,gBAAgB;iCAGnC;IACZ,cAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAiB,EAAE,OAAO,IAAI,CAAC,GAAG,SAAS,CAAC;CACzC,GAAG,mBAAmB;0CAuOZ,UAAU,CAAC,OAAO,8BAA8B,CAAC;sCACjD,UAAU,CAAC,2BAA2B,CAAC;0BAlQ9B,mBAAmB;8BAKV,aAAa;qCAFX,cAAc;2CAIR,qBAAqB;gCADkB,aAAa;yBAD5D,aAAa;mCACkC,aAAa;mCAJ1C,iBAAiB;4BAD1C,kBAAkB;sCAKoC,aAAa;qCAAb,aAAa;0BAJ1C,iBAAiB"}

package/src/exos/cosmos-interchain-service.js

@@ -1,12 +1,12 @@
 /** @file Orchestration service */
 
-import { Fail, b } from '@endo/errors';
 import { E } from '@endo/far';
-import { M } from '@endo/patterns';
+import { M, mustMatch } from '@endo/patterns';
 import { Shape as NetworkShape } from '@agoric/network';
 import { prepareChainAccountKit } from './chain-account-kit.js';
 import { prepareICQConnectionKit } from './icq-connection-kit.js';
 import {
+  DEFAULT_ICQ_VERSION,
   makeICAChannelAddress,
   makeICQChannelAddress,
 } from '../utils/address.js';
@@ -19,40 +19,39 @@ import {
  * @import {RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {ICQConnection, IcaAccount, ICQConnectionKit, ChainAccountKit} from '../types.js';
+ * @import {ICAChannelAddressOpts} from '../utils/address.js';
  */
 
 const { Vow$ } = NetworkShape; // TODO #9611
 /**
  * @typedef {object} OrchestrationPowers
  * @property {Remote<PortAllocator>} portAllocator
+ * @property {undefined} reserved reserve a state key for future use. can hold
+ *   an additional power or a record of powers
  */
 
-/**
- * PowerStore is used so additional powers can be added on upgrade. See
- * [#7337](https://github.com/Agoric/agoric-sdk/issues/7337) for tracking on Exo
- * state migrations.
- *
- * @typedef {MapStore<
- *   keyof OrchestrationPowers,
- *   OrchestrationPowers[keyof OrchestrationPowers]
- * >} PowerStore
- */
-
-/** @typedef {MapStore<IBCConnectionID, ICQConnectionKit>} ICQConnectionStore */
+/** @typedef {MapStore<string, ICQConnectionKit>} ICQConnectionStore */
 
 /** @typedef {ChainAccountKit | ICQConnectionKit} ConnectionKit */
 
 /**
- * @template {keyof OrchestrationPowers} K
- * @param {PowerStore} powers
- * @param {K} name
+ * @typedef {{
+ *   icqConnections: ICQConnectionStore;
+ *   sharedICQPort: Remote<Port> | undefined;
+ * } & OrchestrationPowers} OrchestrationState
  */
-const getPower = (powers, name) => {
-  powers.has(name) || Fail`need powers.${b(name)} for this method`;
-  return /** @type {OrchestrationPowers[K]} */ (powers.get(name));
-};
 
-/** @typedef {{ powers: PowerStore; icqConnections: ICQConnectionStore }} OrchestrationState */
+/**
+ * Creates a key for the icqConnections mapStore based on connectionId and
+ * version
+ *
+ * @param {IBCConnectionID} controllerConnectionId
+ * @param {string} [version]
+ * @returns {string}
+ */
+const getICQConnectionKey = (controllerConnectionId, version) => {
+  return `${controllerConnectionId}:${version || DEFAULT_ICQ_VERSION}`;
+};
 
 /**
  * @param {Zone} zone
@@ -62,7 +61,7 @@ const getPower = (powers, name) => {
  */
 const prepareCosmosOrchestrationServiceKit = (
   zone,
-  { watch },
+  { watch, asVow },
   makeChainAccountKit,
   makeICQConnectionKit,
 ) =>
@@ -78,7 +77,7 @@ const prepareCosmosOrchestrationServiceKit = (
         onFulfilled: M.call(M.remotable('Port'))
           .optional({
             remoteConnAddr: M.string(),
-            controllerConnectionId: M.string(),
+            icqLookupKey: M.string(),
           })
           .returns(Vow$(NetworkShape.Connection)),
       }),
@@ -87,31 +86,30 @@ const prepareCosmosOrchestrationServiceKit = (
           .optional(
             M.splitRecord(
               { connectionKit: M.record(), returnFacet: M.string() },
-              { saveICQConnection: M.string() },
+              { icqLookupKey: M.string() },
             ),
           )
           .returns(M.remotable('ConnectionKit Holder facet')),
       }),
       public: M.interface('CosmosInterchainService', {
-        makeAccount: M.call(M.string(), M.string(), M.string()).returns(
-          Vow$(M.remotable('ChainAccountKit')),
-        ),
-        provideICQConnection: M.call(M.string()).returns(
-          Vow$(M.remotable('ICQConnection')),
-        ),
+        makeAccount: M.call(M.string(), M.string(), M.string())
+          .optional(M.record())
+          .returns(Vow$(M.remotable('ChainAccountKit'))),
+        provideICQConnection: M.call(M.string())
+          .optional(M.string())
+          .returns(Vow$(M.remotable('ICQConnection'))),
       }),
     },
-    /** @param {Partial<OrchestrationPowers>} [initialPowers] */
-    initialPowers => {
-      /** @type {PowerStore} */
-      const powers = zone.detached().mapStore('PowerStore');
-      if (initialPowers) {
-        for (const [name, power] of Object.entries(initialPowers)) {
-          powers.init(/** @type {keyof OrchestrationPowers} */ (name), power);
-        }
-      }
+    /** @param {Partial<OrchestrationPowers>} powers */
+    powers => {
+      mustMatch(powers?.portAllocator, M.remotable('PortAllocator'));
       const icqConnections = zone.detached().mapStore('ICQConnections');
-      return /** @type {OrchestrationState} */ ({ powers, icqConnections });
+      return /** @type {OrchestrationState} */ ({
+        icqConnections,
+        sharedICQPort: undefined,
+        reserved: undefined,
+        ...powers,
+      });
     },
     {
       requestICAChannelWatcher: {
@@ -140,19 +138,21 @@ const prepareCosmosOrchestrationServiceKit = (
          * @param {Port} port
          * @param {{
          *   remoteConnAddr: RemoteIbcAddress;
-         *   controllerConnectionId: IBCConnectionID;
+         *   icqLookupKey: string;
          * }} watchContext
          */
-        onFulfilled(port, { remoteConnAddr, controllerConnectionId }) {
+        onFulfilled(port, { remoteConnAddr, icqLookupKey }) {
+          if (!this.state.sharedICQPort) {
+            this.state.sharedICQPort = port;
+          }
           const connectionKit = makeICQConnectionKit(port);
-          /** @param {ICQConnectionKit} kit */
           return watch(
             E(port).connect(remoteConnAddr, connectionKit.connectionHandler),
             this.facets.channelOpenWatcher,
             {
               connectionKit,
               returnFacet: 'connection',
-              saveICQConnection: controllerConnectionId,
+              icqLookupKey,
             },
           );
         },
@@ -168,23 +168,18 @@ const prepareCosmosOrchestrationServiceKit = (
          * @param {{
          *   connectionKit: ConnectionKit;
          *   returnFacet: string;
-         *   saveICQConnection?: IBCConnectionID;
+         *   icqLookupKey?: string;
          * }} watchContext
          */
-        onFulfilled(
-          _connection,
-          { connectionKit, returnFacet, saveICQConnection },
-        ) {
-          if (saveICQConnection) {
+        onFulfilled(_connection, { connectionKit, returnFacet, icqLookupKey }) {
+          if (icqLookupKey) {
             this.state.icqConnections.init(
-              saveICQConnection,
+              icqLookupKey,
               /** @type {ICQConnectionKit} */ (connectionKit),
             );
           }
           return connectionKit[returnFacet];
         },
-        // TODO #9317 if we fail, should we revoke the port (if it was created in this flow)?
-        // onRejected() {}
       },
       public: {
         /**
@@ -192,14 +187,17 @@ const prepareCosmosOrchestrationServiceKit = (
          * @param {IBCConnectionID} hostConnectionId the counterparty
          *   connection_id
          * @param {IBCConnectionID} controllerConnectionId self connection_id
+         * @param {ICAChannelAddressOpts} [opts] optional to configure the
+         *   channel address, such as version and ordering
          * @returns {Vow<IcaAccount>}
          */
-        makeAccount(chainId, hostConnectionId, controllerConnectionId) {
+        makeAccount(chainId, hostConnectionId, controllerConnectionId, opts) {
           const remoteConnAddr = makeICAChannelAddress(
             hostConnectionId,
             controllerConnectionId,
+            opts,
           );
-          const portAllocator = getPower(this.state.powers, 'portAllocator');
+          const { portAllocator } = this.state;
           return watch(
             E(portAllocator).allocateICAControllerPort(),
             this.facets.requestICAChannelWatcher,
@@ -211,29 +209,42 @@ const prepareCosmosOrchestrationServiceKit = (
         },
         /**
          * @param {IBCConnectionID} controllerConnectionId
+         * @param {string} [version]
          * @returns {Vow<ICQConnection> | ICQConnection}
          */
-        provideICQConnection(controllerConnectionId) {
-          if (this.state.icqConnections.has(controllerConnectionId)) {
-            // TODO #9281 do not return synchronously. see https://github.com/Agoric/agoric-sdk/pull/9454#discussion_r1626898694
-            return this.state.icqConnections.get(controllerConnectionId)
-              .connection;
+        provideICQConnection(controllerConnectionId, version) {
+          const icqLookupKey = getICQConnectionKey(
+            controllerConnectionId,
+            version,
+          );
+          if (this.state.icqConnections.has(icqLookupKey)) {
+            return asVow(
+              () => this.state.icqConnections.get(icqLookupKey).connection,
+            );
           }
-          const remoteConnAddr = makeICQChannelAddress(controllerConnectionId);
-          const portAllocator = getPower(this.state.powers, 'portAllocator');
-          return watch(
-            // allocate a new Port for every Connection
-            // TODO #9317 optimize ICQ port allocation
-            E(portAllocator).allocateICQControllerPort(),
-            this.facets.requestICQChannelWatcher,
-            {
-              remoteConnAddr,
-              controllerConnectionId,
-            },
+          const remoteConnAddr = makeICQChannelAddress(
+            controllerConnectionId,
+            version,
           );
+          const { portAllocator, sharedICQPort } = this.state;
+          const portOrPortVow =
+            sharedICQPort || E(portAllocator).allocateICQControllerPort();
+
+          return watch(portOrPortVow, this.facets.requestICQChannelWatcher, {
+            remoteConnAddr,
+            icqLookupKey,
+          });
         },
       },
     },
+    {
+      stateShape: {
+        icqConnections: M.remotable('icqConnections mapStore'),
+        sharedICQPort: M.or(M.remotable('Port'), M.undefined()),
+        portAllocator: M.remotable('PortAllocator'),
+        reserved: M.any(),
+      },
+    },
   );
 
 /**

package/src/exos/orchestrator.d.ts

@@ -5,7 +5,7 @@ export const OrchestratorI: import("@endo/patterns").InterfaceGuard<{
     getBrandInfo: import("@endo/patterns").MethodGuard;
     asAmount: import("@endo/patterns").MethodGuard;
 }>;
-export function prepareOrchestratorKit(zone: Zone, { chainHub, localchain, chainByName, makeLocalChainFacade, makeRemoteChainFacade, vowTools: { watch, asVow }, }: {
+export function prepareOrchestrator(zone: Zone, powers: {
     asyncFlowTools: AsyncFlowTools;
     chainHub: ChainHub;
     localchain: Remote<LocalChain>;
@@ -18,7 +18,7 @@ export function prepareOrchestratorKit(zone: Zone, { chainHub, localchain, chain
     timerService: Remote<TimerService>;
     vowTools: VowTools;
     zcf: ZCF;
-}): () => import("@endo/exo").GuardedKit<{
+}): () => ReturnType<() => import("@endo/exo").GuardedKit<{
     /** Waits for `chainInfo` and returns a LocalChainFacade */
     makeLocalChainFacadeWatcher: {
         /**
@@ -75,7 +75,7 @@ export function prepareOrchestratorKit(zone: Zone, { chainHub, localchain, chain
         /** @type {HostOf<Orchestrator['asAmount']>} */
         asAmount: HostOf<Orchestrator["asAmount"]>;
     };
-}>;
+}>>["orchestrator"];
 /**
  * Host side of the Orchestrator interface. (Methods return vows instead of
  * promises as the interface within the guest function.)
@@ -99,4 +99,93 @@ import type { IBCConnectionInfo } from '../types.js';
 import type { Vow } from '@agoric/vow';
 import type { Orchestrator } from '../types.js';
 import type { HostOf } from '@agoric/async-flow';
+/**
+ * @param {Zone} zone
+ * @param {{
+ *   asyncFlowTools: AsyncFlowTools;
+ *   chainHub: ChainHub;
+ *   localchain: Remote<LocalChain>;
+ *   chainByName: MapStore<string, HostInterface<Chain>>;
+ *   makeRecorderKit: MakeRecorderKit;
+ *   makeLocalChainFacade: MakeLocalChainFacade;
+ *   makeRemoteChainFacade: MakeRemoteChainFacade;
+ *   orchestrationService: Remote<CosmosInterchainService>;
+ *   storageNode: Remote<StorageNode>;
+ *   timerService: Remote<TimerService>;
+ *   vowTools: VowTools;
+ *   zcf: ZCF;
+ * }} powers
+ */
+declare function prepareOrchestratorKit(zone: Zone, { chainHub, localchain, chainByName, makeLocalChainFacade, makeRemoteChainFacade, vowTools: { watch, asVow }, }: {
+    asyncFlowTools: AsyncFlowTools;
+    chainHub: ChainHub;
+    localchain: Remote<LocalChain>;
+    chainByName: MapStore<string, HostInterface<Chain<any>>>;
+    makeRecorderKit: MakeRecorderKit;
+    makeLocalChainFacade: MakeLocalChainFacade;
+    makeRemoteChainFacade: MakeRemoteChainFacade;
+    orchestrationService: Remote<CosmosInterchainService>;
+    storageNode: Remote<StorageNode>;
+    timerService: Remote<TimerService>;
+    vowTools: VowTools;
+    zcf: ZCF;
+}): () => import("@endo/exo").GuardedKit<{
+    /** Waits for `chainInfo` and returns a LocalChainFacade */
+    makeLocalChainFacadeWatcher: {
+        /**
+         * @param {ChainInfo} agoricChainInfo
+         * @param {string} name
+         */
+        onFulfilled(agoricChainInfo: ChainInfo, name: string): import("@endo/exo").Guarded<{
+            getChainInfo(): Vow<Readonly<{
+                chainId: string;
+                connections?: Record<string, IBCConnectionInfo>;
+                icqEnabled?: boolean;
+                stakingTokens?: Readonly<Array<{
+                    denom: string;
+                }>>;
+            }>>;
+            makeAccount(): Vow<import("./local-orchestration-account.js").LocalOrchestrationAccountKit["holder"]>;
+        }>;
+    };
+    /**
+     * Waits for `chainInfo` for `agoric` and a remote chain and returns a
+     * RemoteChainFacade
+     */
+    makeRemoteChainFacadeWatcher: {
+        /**
+         * Waits for `chainInfo` for `agoric` and a remote chain and returns a
+         * RemoteChainFacade
+         *
+         * @param {[ChainInfo, ChainInfo, IBCConnectionInfo]} chainsAndConnection
+         * @param {string} name
+         */
+        onFulfilled([_agoricChainInfo, remoteChainInfo, connectionInfo]: [ChainInfo, ChainInfo, IBCConnectionInfo], name: string): import("@endo/exo").Guarded<{
+            getChainInfo(): Vow<any extends import("@endo/pass-style").Passable ? any : HostInterface<any>>;
+            makeAccount(): Vow<import("../orchestration-api.js").OrchestrationAccount<any> extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & import("../orchestration-api.js").OrchestrationAccount<any> : HostInterface<import("../orchestration-api.js").OrchestrationAccount<any>>>;
+        }>;
+    };
+    orchestrator: {
+        /** @type {HostOf<Orchestrator['getChain']>} */
+        getChain(chainName: string): Vow<Chain<any> extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & Chain<any> : HostInterface<Chain<any>>>;
+        makeLocalAccount(): Vow<import("@endo/exo").Guarded<{
+            getAddress(): string;
+            getBalance(brand: Brand<"nat">): import("@agoric/vow").PromiseVow<Amount<"nat">>;
+            deposit(payment: Payment<"nat">, optAmountShape?: Pattern): import("@agoric/vow").PromiseVow<Amount<"nat">>;
+            withdraw(amount: Amount<"nat">): import("@agoric/vow").PromiseVow<Payment<"nat">>;
+            executeTx<MT extends import("@agoric/cosmic-proto").TypedJson[]>(messages: MT): PromiseVowOfTupleMappedToGenerics<{ [K in keyof MT]: import("@agoric/cosmic-proto").JsonSafe<import("@agoric/cosmic-proto").ResponseTo<MT[K]>>; }>;
+            monitorTransfers(tap: import("@agoric/vats/src/bridge-target.js").TargetApp): import("@agoric/vow").PromiseVow<import("@agoric/vats/src/bridge-target.js").TargetRegistration>;
+        }>>;
+        /** @type {HostOf<Orchestrator['getBrandInfo']>} */
+        getBrandInfo<HoldingChain extends keyof import("../chain-info.js").KnownChains, IssuingChain extends keyof import("../chain-info.js").KnownChains>(denom: import("../orchestration-api.js").Denom): {
+            brand?: globalThis.Brand;
+            chain: Chain<import("../chain-info.js").KnownChains[HoldingChain]>;
+            base: Chain<import("../chain-info.js").KnownChains[IssuingChain]>;
+            baseDenom: import("../orchestration-api.js").Denom;
+        };
+        /** @type {HostOf<Orchestrator['asAmount']>} */
+        asAmount: HostOf<Orchestrator["asAmount"]>;
+    };
+}>;
+export {};
 //# sourceMappingURL=orchestrator.d.ts.map

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;AAmBI,6CAhBI,IAAI,mHACJ;IACV,cAAkB,EAAE,cAAc,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;IACvB,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,WAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,yBAAoB,CAAC,CAAC;IACxD,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;IAkCE,2DAA2D;;QAEzD;;;WAGG;sDADQ,MAAM;;;;;;;;;;;;IAQnB;;;OAGG;;QAED;;;;;;WAMG;0HADQ,MAAM;;;;;;QASjB,+CAA+C;;;;;;;;;;QAqB/C,mDAAmD;;iBA3BG,CAAC;;;;;QAwCvD,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAIhD;;;;;+BAMU,UAAU,CACtB,UAAc,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAzJG,mBAAmB;oCAEc,oBAAoB;8BADjD,gBAAgB;gCAId,gCAAgC;4BAEpC,kBAAkB;2BAMyB,aAAa;mCAXzB,oBAAoB;qCAI7B,6CAA6C;0CAKrD,yBAAyB;2CACxB,0BAA0B;6CAHxB,gCAAgC;kCAL3C,cAAc;8BADb,aAAa;+BAUuB,aAAa;uCAAb,aAAa;yBAVjD,aAAa;kCAUuB,aAAa;4BAXzB,oBAAoB"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AAoCA,0BAA0B;AAC1B;;;;;GAKG;AA4II,0CAhBI,IAAI,UACJ;IACV,cAAkB,EAAE,cAAc,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;IACvB,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,WAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,yBAAoB,CAAC,CAAC;IACxD,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;IAvFE,2DAA2D;;QAEzD;;;WAGG;sDADQ,MAAM;;;;;;;;;;;;IAQnB;;;OAGG;;QAED;;;;;;WAMG;0HADQ,MAAM;;;;;;QASjB,+CAA+C;;;;;;;;;;QAqB/C,mDAAmD;;iBA3BpC,CAAC;;;;;QAwChB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;oBA2BlD;;;;;+BAMY,UAAU,CACtB,UAAc,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAhLG,mBAAmB;oCAEc,oBAAoB;8BADjD,gBAAgB;gCAId,gCAAgC;4BAEpC,kBAAkB;2BAMyB,aAAa;mCAXzB,oBAAoB;qCAI7B,6CAA6C;0CAKrD,yBAAyB;2CACxB,0BAA0B;6CAHxB,gCAAgC;kCAL3C,cAAc;8BADb,aAAa;+BAUuB,aAAa;uCAAb,aAAa;yBAVjD,aAAa;kCAUuB,aAAa;4BAXzB,oBAAoB;AAyB5E;;;;;;;;;;;;;;;;GAgBG;AACH,8CAhBW,IAAI,mHACJ;IACV,cAAkB,EAAE,cAAc,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;IACvB,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,WAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,yBAAoB,CAAC,CAAC;IACxD,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;IAkCE,2DAA2D;;QAEzD;;;WAGG;sDADQ,MAAM;;;;;;;;;;;;IAQnB;;;OAGG;;QAED;;;;;;WAMG;0HADQ,MAAM;;;;;;QASjB,+CAA+C;;;;;;;;;;QAqB/C,mDAAmD;;iBA3BpC,CAAC;;;;;QAwChB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAIhD"}

package/src/exos/orchestrator.js

@@ -1,5 +1,6 @@
 /** @file ChainAccount exo */
 import { AmountShape } from '@agoric/ertp';
+import { pickFacet } from '@agoric/vat-data';
 import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { Fail, q } from '@endo/errors';
@@ -58,7 +59,7 @@ export const OrchestratorI = M.interface('Orchestrator', {
  *   zcf: ZCF;
  * }} powers
  */
-export const prepareOrchestratorKit = (
+const prepareOrchestratorKit = (
   zone,
   {
     chainHub,
@@ -161,6 +162,29 @@ export const prepareOrchestratorKit = (
     },
   );
 harden(prepareOrchestratorKit);
+
+/**
+ * @param {Zone} zone
+ * @param {{
+ *   asyncFlowTools: AsyncFlowTools;
+ *   chainHub: ChainHub;
+ *   localchain: Remote<LocalChain>;
+ *   chainByName: MapStore<string, HostInterface<Chain>>;
+ *   makeRecorderKit: MakeRecorderKit;
+ *   makeLocalChainFacade: MakeLocalChainFacade;
+ *   makeRemoteChainFacade: MakeRemoteChainFacade;
+ *   orchestrationService: Remote<CosmosInterchainService>;
+ *   storageNode: Remote<StorageNode>;
+ *   timerService: Remote<TimerService>;
+ *   vowTools: VowTools;
+ *   zcf: ZCF;
+ * }} powers
+ */
+export const prepareOrchestrator = (zone, powers) => {
+  const makeOrchestratorKit = prepareOrchestratorKit(zone, powers);
+  return pickFacet(makeOrchestratorKit, 'orchestrator');
+};
+
 /**
  * Host side of the Orchestrator interface. (Methods return vows instead of
  * promises as the interface within the guest function.)

package/src/facade.d.ts

@@ -9,11 +9,6 @@ export function makeOrchestrationFacade({ zone, timerService, zcf, storageNode,
     vowTools: VowTools;
     asyncFlowTools: AsyncFlowTools;
 }): {
-    adminAsyncFlow: import("@endo/exo").Guarded<{
-        getFailures(): import("@endo/patterns").CopyMap<any, import("@endo/pass-style").Passable>;
-        wakeAll(): void;
-        getFlowForOutcomeVow(outcomeVow: any): any;
-    }>;
     orchestrate: <HC, GF extends OrchestrationFlow<GuestInterface<HC>>>(durableName: string, hostCtx: HC, guestFn: GF) => HostForGuest<GF>;
     orchestrateAll: <HC, GFM extends {
         [durableName: string]: OrchestrationFlow<GuestInterface<HC>>;

package/src/facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facade.d.ts","sourceRoot":"","sources":["facade.js"],"names":[],"mappings":"AA0CO,sKAZI;IACV,IAAQ,EAAE,IAAI,CAAC;IACf,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,GAAO,EAAE,GAAG,CAAC;IACb,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,oBAAwB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC1D,eAAmB,EAAE,eAAe,CAAC;IACrC,gBAAoB,EAAE,MAAM,gBAAgB,CAAC;IAC7C,QAAY,EAAE,QAAQ,CAAC;IACvB,cAAkB,EAAE,cAAc,CAAC;CAChC;;;;;;kBA4BW,EAAE,EACsC,EAAE,SAA1C,kBAAmB,eAAe,EAAE,CAAC,CAAE,eACzC,MAAM,WAEN,EAAE,WACF,EAAE,KACA,YAAY,CAAC,EAAE,CAAC;qBA2BhB,EAAE,EAGT,GAAG,SAFI;QACZ,CAAK,WAAW,EAAE,MAAM,GAAG,kBAAkB,eAAe,EAAE,CAAC,CAAC,CAAC;KAC7D,YAEM,GAAG,WACH,EAAE,KACA,GAAG,CAAc,IAAT,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAE;EAiBxD;;;;yBA1GgC,EAAE,SAAtB,iBAAmB,IACnB,EAAE,SAAS,CACvB,GAAO,EAAE,YAAY,EACrB,GAAO,EAAE,GAAG,EACZ,GAAO,IAAI,EAAE,MAAM,EAAE,KACd,OAAO,CAAC,MAAM,EAAE,CAAC,GAClB,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,GAClC,KAAK;kCAqGE,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BAzHjC,cAAc;kCAEN,cAAc;4BAGpB,kBAAkB;6CACD,qCAAqC;qCAHhC,6CAA6C;sCACzD,wBAAwB;8BAH3B,aAAa;oCAFsB,oBAAoB;oCAApB,oBAAoB;uCAQuC,YAAY;kCAAZ,YAAY;8BARvE,oBAAoB;yBAEvD,aAAa"}
+{"version":3,"file":"facade.d.ts","sourceRoot":"","sources":["facade.js"],"names":[],"mappings":"AA0CO,sKAZI;IACV,IAAQ,EAAE,IAAI,CAAC;IACf,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,GAAO,EAAE,GAAG,CAAC;IACb,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,oBAAwB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC1D,eAAmB,EAAE,eAAe,CAAC;IACrC,gBAAoB,EAAE,MAAM,gBAAgB,CAAC;IAC7C,QAAY,EAAE,QAAQ,CAAC;IACvB,cAAkB,EAAE,cAAc,CAAC;CAChC;kBA4BW,EAAE,EACsC,EAAE,SAA1C,kBAAmB,eAAe,EAAE,CAAC,CAAE,eACzC,MAAM,WAEN,EAAE,WACF,EAAE,KACA,YAAY,CAAC,EAAE,CAAC;qBAyBhB,EAAE,EAGT,GAAG,SAFI;QACZ,CAAK,WAAW,EAAE,MAAM,GAAG,kBAAkB,eAAe,EAAE,CAAC,CAAC,CAAC;KAC7D,YAEM,GAAG,WACH,EAAE,KACA,GAAG,CAAc,IAAT,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAE;EAgBxD;;;;yBAvGgC,EAAE,SAAtB,iBAAmB,IACnB,EAAE,SAAS,CACvB,GAAO,EAAE,YAAY,EACrB,GAAO,EAAE,GAAG,EACZ,GAAO,IAAI,EAAE,MAAM,EAAE,KACd,OAAO,CAAC,MAAM,EAAE,CAAC,GAClB,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,GAClC,KAAK;kCAkGE,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BAtHjC,cAAc;kCAEN,cAAc;4BAGpB,kBAAkB;6CACD,qCAAqC;qCAHhC,6CAA6C;sCACzD,wBAAwB;8BAH3B,aAAa;oCAFsB,oBAAoB;oCAApB,oBAAoB;uCAQuC,YAAY;kCAAZ,YAAY;8BARvE,oBAAoB;yBAEvD,aAAa"}

package/src/facade.js

@@ -63,7 +63,7 @@ export const makeOrchestrationFacade = ({
     asyncFlowTools,
   });
 
-  const { prepareEndowment, asyncFlow, adminAsyncFlow } = asyncFlowTools;
+  const { prepareEndowment, asyncFlow } = asyncFlowTools;
 
   /**
    * @template HC - host context
@@ -76,21 +76,19 @@ export const makeOrchestrationFacade = ({
    */
   const orchestrate = (durableName, hostCtx, guestFn) => {
     const subZone = zone.subZone(durableName);
-
-    const hostOrc = makeOrchestrator();
-
-    const [wrappedOrc, wrappedCtx] = prepareEndowment(subZone, 'endowments', [
-      hostOrc,
-      hostCtx,
-    ]);
-
+    const [wrappedCtx] = prepareEndowment(subZone, 'endowments', [hostCtx]);
     const hostFn = asyncFlow(subZone, 'asyncFlow', guestFn);
 
     // cast because return could be arbitrary subtype
     const orcFn = /** @type {HostForGuest<GF>} */ (
-      (...args) => hostFn(wrappedOrc, wrappedCtx, ...args)
+      (...args) => {
+        // each invocation gets a new orchestrator
+        const hostOrc = makeOrchestrator();
+        // TODO: why are the types showing the guest types for arguments?
+        // @ts-expect-error XXX fix broken types
+        return hostFn(hostOrc, wrappedCtx, ...args);
+      }
     );
-
     return harden(orcFn);
   };
 
@@ -119,7 +117,6 @@ export const makeOrchestrationFacade = ({
     );
 
   return harden({
-    adminAsyncFlow,
     orchestrate,
     orchestrateAll,
   });

package/src/proposals/orchestration-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestration-proposal.d.ts","sourceRoot":"","sources":["orchestration-proposal.js"],"names":[],"mappings":"AAyBO,mJAVI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,aAAmB,EAAE,aAAa,CAAC;KAC9B,CAAC;IACN,OAAW,EAAE;QACb,gBAAsB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACjC,CAAC;CACH,WACO;IAAE,OAAO,EAAE;QAAE,gBAAgB,EAAE,YAAY,CAAA;KAAE,CAAA;CAAE,iBA6BzD;AAoEM,+FAFI,eAAe,iBAYzB;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;mCAjJ8B,iBAAiB"}
+{"version":3,"file":"orchestration-proposal.d.ts","sourceRoot":"","sources":["orchestration-proposal.js"],"names":[],"mappings":"AAwBO,mJAVI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,aAAmB,EAAE,aAAa,CAAC;KAC9B,CAAC;IACN,OAAW,EAAE;QACb,gBAAsB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACjC,CAAC;CACH,WACO;IAAE,OAAO,EAAE;QAAE,gBAAgB,EAAE,YAAY,CAAA;KAAE,CAAA;CAAE,iBA6BzD;AAoEM,+FAFI,eAAe,iBAYzB;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;mCAhJ8B,iBAAiB"}

package/src/proposals/orchestration-proposal.js

@@ -9,7 +9,6 @@ const trace = makeTracer('CoreEvalOrchestration', true);
 
 /**
  * @import {PortAllocator} from '@agoric/network';
- * @import {CosmosInterchainService} from '../exos/cosmos-interchain-service.js'
  */
 
 /**

package/src/utils/address.d.ts

@@ -1,13 +1,27 @@
-export function makeICAChannelAddress(hostConnectionId: IBCConnectionID, controllerConnectionId: IBCConnectionID, { version, encoding, ordering, txType, }?: {
+export function makeICAChannelAddress(hostConnectionId: IBCConnectionID, controllerConnectionId: IBCConnectionID, { version, encoding, ordering, txType, }?: ICAChannelAddressOpts | undefined): RemoteIbcAddress;
+export const DEFAULT_ICQ_VERSION: "icq-1";
+export function makeICQChannelAddress(controllerConnectionId: IBCConnectionID, version?: string): RemoteIbcAddress;
+export function findAddressField(remoteAddressString: RemoteIbcAddress): ChainAddress["value"] | undefined;
+export type ICAChannelAddressOpts = {
+    /**
+     * message encoding format for the
+     * channel
+     */
     encoding?: string | undefined;
+    /**
+     * channel ordering.
+     * currently only `ordered` is supported for ics27-1
+     */
     ordering?: "ordered" | "unordered" | undefined;
+    /**
+     * default is `sdk_multi_msg`
+     */
     txType?: string | undefined;
+    /**
+     * default is `ics27-1`
+     */
     version?: string | undefined;
-} | undefined): RemoteIbcAddress;
-export function makeICQChannelAddress(controllerConnectionId: IBCConnectionID, { version }?: {
-    version?: string;
-} | undefined): RemoteIbcAddress;
-export function findAddressField(remoteAddressString: RemoteIbcAddress): ChainAddress["value"] | undefined;
+};
 import type { IBCConnectionID } from '@agoric/vats';
 import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
 import type { ChainAddress } from '../types.js';

package/src/utils/address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AAoBO,wDAXI,eAAe,0BACf,eAAe;;;;;gBAQb,gBAAgB,CAuB5B;AAQM,8DAJI,eAAe;cACH,MAAM;gBAChB,gBAAgB,CAQ5B;AAaM,sDAJI,gBAAgB,GAEd,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAW7C;qCA1EiC,cAAc;sCAEb,iCAAiC;kCADrC,aAAa"}
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AAwBO,wDALI,eAAe,0BACf,eAAe,iFAEb,gBAAgB,CAuB5B;AAGD,0CAA2C;AAOpC,8DAJI,eAAe,YACf,MAAM,GACJ,gBAAgB,CAQ5B;AAaM,sDAJI,gBAAgB,GAEd,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAW7C;;;;;;;;;;;;;;;;;;;;;qCAhFiC,cAAc;sCAEb,iCAAiC;kCADrC,aAAa"}

package/src/utils/address.js

@@ -6,16 +6,20 @@ import { Fail } from '@endo/errors';
  * @import {RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
  */
 
+/**
+ * @typedef {object} ICAChannelAddressOpts
+ * @property {string} [encoding='proto3'] message encoding format for the
+ *   channel
+ * @property {'ordered' | 'unordered'} [ordering='ordered'] channel ordering.
+ *   currently only `ordered` is supported for ics27-1
+ * @property {string} [txType='sdk_multi_msg'] default is `sdk_multi_msg`
+ * @property {string} [version='ics27-1'] default is `ics27-1`
+ */
+
 /**
  * @param {IBCConnectionID} hostConnectionId Counterparty Connection ID
  * @param {IBCConnectionID} controllerConnectionId Self Connection ID
- * @param {object} [opts]
- * @param {string} [opts.encoding] - message encoding format for the channel.
- *   default is `proto3`
- * @param {'ordered' | 'unordered'} [opts.ordering] - channel ordering.
- *   currently only `ordered` is supported for ics27-1
- * @param {string} [opts.txType] - default is `sdk_multi_msg`
- * @param {string} [opts.version] - default is `ics27-1`
+ * @param {ICAChannelAddressOpts} [opts]
  * @returns {RemoteIbcAddress}
  */
 export const makeICAChannelAddress = (
@@ -42,14 +46,16 @@ export const makeICAChannelAddress = (
 };
 harden(makeICAChannelAddress);
 
+export const DEFAULT_ICQ_VERSION = 'icq-1';
+
 /**
  * @param {IBCConnectionID} controllerConnectionId
- * @param {{ version?: string }} [opts]
+ * @param {string} version defaults to icq-1
  * @returns {RemoteIbcAddress}
  */
 export const makeICQChannelAddress = (
   controllerConnectionId,
-  { version = 'icq-1' } = {},
+  version = DEFAULT_ICQ_VERSION,
 ) => {
   controllerConnectionId || Fail`controllerConnectionId is required`;
   return `/ibc-hop/${controllerConnectionId}/ibc-port/icqhost/unordered/${version}`;

package/src/utils/start-helper.d.ts

@@ -1,4 +1,10 @@
 export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: OrchestrationPowers, marshaller: Marshaller): {
+    makeOrchestrateKit: (zone: Zone) => {
+        orchestrate: <HC, GF extends import("../orchestration-api.js").OrchestrationFlow<import("@agoric/async-flow").GuestInterface<HC>>>(durableName: string, hostCtx: HC, guestFn: GF) => HostForGuest<GF>;
+        orchestrateAll: <HC, GFM extends {
+            [durableName: string]: import("../orchestration-api.js").OrchestrationFlow<import("@agoric/async-flow").GuestInterface<HC>>;
+        }>(guestFns: GFM, hostCtx: HC) => { [N in keyof GFM]: HostForGuest<GFM[N]>; };
+    };
     chainHub: import("@endo/exo").Guarded<{
         registerChain(name: string, chainInfo: import("../cosmos-api.js").CosmosChainInfo): void;
         getChainInfo<K extends string>(chainName: K): import("@agoric/vow").Vow<ActualChainInfo<K>>;
@@ -21,15 +27,43 @@ export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: O
         asPromise: import("@agoric/vow").AsPromiseFunction;
         retriable: <F extends (...args: any[]) => Promise<any>>(fnZone: Zone, name: string, fn: F) => F extends (...args: infer Args) => Promise<infer R> ? (...args: Args) => import("@agoric/vow").Vow<R> : never;
     };
+    asyncFlowTools: {
+        prepareAsyncFlowKit: (zone: Zone, tag: string, guestAsyncFunc: import("@agoric/async-flow").GuestAsyncFunc, options?: {
+            startEager?: boolean;
+        } | undefined) => (activationArgs: any) => import("@endo/exo").GuardedKit<{
+            flow: {
+                getFlowState(): import("@agoric/async-flow").FlowState;
+                restart(eager?: boolean | undefined): void;
+                wake(): void;
+                getOutcome(): import("@agoric/vow").Vow<any>;
+                dump(): ([op: "doFulfill", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, fulfillment: import("@endo/pass-style").Passable] | [op: "doReject", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, reason: import("@endo/pass-style").Passable] | [op: "doReturn", callIndex: number, result: import("@endo/pass-style").Passable] | [op: "doThrow", callIndex: number, problem: import("@endo/pass-style").Passable] | [op: "checkCall", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number] | [op: "checkSendOnly", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number] | [op: "checkSend", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number])[];
+                getOptFatalProblem(): any;
+            };
+            admin: {
+                reset(): void;
+                complete(): void;
+                panic(fatalProblem: any): never;
+            };
+            wakeWatcher: {
+                onFulfilled(_fulfillment: any): void;
+                onRejected(_fulfillment: any): void;
+            };
+        }>;
+        asyncFlow: <F extends import("@agoric/async-flow").GuestAsyncFunc>(zone: Zone, tag: string, guestFunc: F, options?: {
+            startEager?: boolean;
+        } | undefined) => import("@agoric/async-flow").HostOf<F>;
+        adminAsyncFlow: import("@endo/exo").Guarded<{
+            getFailures(): import("@endo/patterns").CopyMap<any, import("@endo/pass-style").Passable>;
+            wakeAll(): void;
+            getFlowForOutcomeVow(outcomeVow: any): any;
+        }>;
+        allWokenP: Promise<void>;
+        prepareEndowment: (zone: Zone, tag: string, e: unknown) => any;
+    };
     zoeTools: {
         localTransfer: (srcSeat: ZCFSeat, localAccount: import("../cosmos-api.js").LocalAccountMethods, give: AmountKeywordRecord) => import("@agoric/vow").Vow<void>;
     };
     zone: Zone;
-    adminAsyncFlow: import("@endo/exo").Guarded<{
-        getFailures(): import("@endo/patterns").CopyMap<any, import("@endo/pass-style").Passable>;
-        wakeAll(): void;
-        getFlowForOutcomeVow(outcomeVow: any): any;
-    }>;
     orchestrate: <HC, GF extends import("../orchestration-api.js").OrchestrationFlow<import("@agoric/async-flow").GuestInterface<HC>>>(durableName: string, hostCtx: HC, guestFn: GF) => HostForGuest<GF>;
     orchestrateAll: <HC, GFM extends {
         [durableName: string]: import("../orchestration-api.js").OrchestrationFlow<import("@agoric/async-flow").GuestInterface<HC>>;

package/src/utils/start-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AA8CO,0CALI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;;;;;;;;;;;;;;;;;;;wCA+B+B,GAAG;;+BAjDjD,GAAG,+EAIY,GAAG,yCACA,GAAG;;;;;;;;;;;;;;;EAwH1B;AAuBM,kCAdgC,EAAE,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,EAGhC,EAAE,SAFM,mBAAmB,GAAG;IACnC,UAAc,EAAE,UAAU,CAAC;CACvB,EACQ,CAAC,cACH,CACV,GAAO,EAAE,GAAG,CAAC,EAAE,CAAC,EAChB,WAAe,EAAE,EAAE,EACnB,IAAQ,EAAE,IAAI,EACd,KAAS,EAAE,kBAAkB,KACtB,OAAO,CAAC,CAAC,CAAC,GACL,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAYzE;kCA7JU;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;iCA0HU,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BAxIzC,kBAAkB;0BAGrB,cAAc;gCALR,gCAAgC;4BAIpC,aAAa;6CAEI,sCAAsC;kCALrC,cAAc;6BAE/B,cAAc"}
+{"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AA6CO,0CALI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;+BAmGR,IAAI;;;;;;;;;;;;;;;;;;;;;;;;wCApEW,GAAG;;+BA/C1B,GAAC,+EAGuB,GAAG,yCAK7B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqIL;AAuBM,kCAdgC,EAAE,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,EAGhC,EAAE,SAFM,mBAAmB,GAAG;IACnC,UAAc,EAAE,UAAU,CAAC;CACvB,EACQ,CAAC,cACH,CACV,GAAO,EAAE,GAAG,CAAC,EAAE,CAAC,EAChB,WAAe,EAAE,EAAE,EACnB,IAAQ,EAAE,IAAI,EACd,KAAS,EAAE,kBAAkB,KACtB,OAAO,CAAC,CAAC,CAAC,GACL,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAYzE;kCA/KU;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;iCA4IU,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BA1JzC,kBAAkB;0BAGrB,cAAc;gCALR,gCAAgC;4BAIpC,aAAa;6CAEI,sCAAsC;kCALrC,cAAc;6BAE/B,cAAc"}

package/src/utils/start-helper.js

@@ -1,5 +1,4 @@
 import { prepareAsyncFlowTools } from '@agoric/async-flow';
-import { pickFacet } from '@agoric/vat-data';
 import { prepareVowTools } from '@agoric/vow';
 import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
 import { makeDurableZone } from '@agoric/zone/durable.js';
@@ -7,7 +6,7 @@ import { makeChainHub } from '../exos/chain-hub.js';
 import { prepareCosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
 import { prepareLocalChainFacade } from '../exos/local-chain-facade.js';
 import { prepareLocalOrchestrationAccountKit } from '../exos/local-orchestration-account.js';
-import { prepareOrchestratorKit } from '../exos/orchestrator.js';
+import { prepareOrchestrator } from '../exos/orchestrator.js';
 import { prepareRemoteChainFacade } from '../exos/remote-chain-facade.js';
 import { makeOrchestrationFacade } from '../facade.js';
 import { makeZoeTools } from './zoe-tools.js';
@@ -58,12 +57,16 @@ export const provideOrchestration = (
   const zones = (() => {
     const zone = makeDurableZone(baggage);
     return {
+      /** system names for async flow */
       asyncFlow: zone.subZone('asyncFlow'),
-      /** for contract-provided names */
-      contract: zone.subZone('contract'),
+      /** system names for orchestration implementation */
       orchestration: zone.subZone('orchestration'),
+      /** system names for vows */
       vows: zone.subZone('vows'),
+      /** system names for zoe */
       zoe: zone.subZone('zoe'),
+      /** contract-provided names, and subzones */
+      contract: zone.subZone('contract'),
     };
   })();
 
@@ -116,7 +119,7 @@ export const provideOrchestration = (
 
   const chainByName = zones.orchestration.mapStore('chainName');
 
-  const makeOrchestratorKit = prepareOrchestratorKit(zones.orchestration, {
+  const makeOrchestrator = prepareOrchestrator(zones.orchestration, {
     asyncFlowTools,
     chainHub,
     localchain: remotePowers.localchain,
@@ -131,21 +134,35 @@ export const provideOrchestration = (
     zcf,
   });
 
-  const makeOrchestrator = pickFacet(makeOrchestratorKit, 'orchestrator');
-
-  const facade = makeOrchestrationFacade({
-    zcf,
-    zone: zones.orchestration,
-    makeRecorderKit,
-    makeOrchestrator,
-    asyncFlowTools,
-    vowTools,
-    ...remotePowers,
-  });
+  /**
+   * Create orchestrate functions in a specific zone, instead of the default
+   * `contract.orchestration` zone. This is used for modules that add their own
+   * orchestration functions (e.g., a Portfolio with orchestration flows for
+   * continuing offers)
+   *
+   * @param {Zone} zone
+   */
+  const makeOrchestrateKit = zone =>
+    makeOrchestrationFacade({
+      zone,
+      zcf,
+      makeRecorderKit,
+      makeOrchestrator,
+      asyncFlowTools,
+      vowTools,
+      ...remotePowers,
+    });
+
+  // Create orchestrate functions for the default `contract.orchestration` zone
+  const defaultOrchestrateKit = makeOrchestrateKit(
+    zones.contract.subZone('orchestration'),
+  );
   return {
-    ...facade,
+    ...defaultOrchestrateKit,
+    makeOrchestrateKit,
     chainHub,
     vowTools,
+    asyncFlowTools,
     zoeTools,
     zone: zones.contract,
   };

package/src/vat-orchestration.d.ts

@@ -1,14 +1,14 @@
 export function buildRootObject(_vatPowers: any, _args: any, baggage: any): {
     /** @param {Partial<OrchestrationPowers>} [initialPowers] */
     makeCosmosInterchainService(initialPowers?: Partial<OrchestrationPowers> | undefined): import("@endo/exo").Guarded<{
-        makeAccount(chainId: string, hostConnectionId: import("@agoric/vats").IBCConnectionID, controllerConnectionId: import("@agoric/vats").IBCConnectionID): import("@agoric/vow").Vow<import("./cosmos-api.js").IcaAccount>;
-        provideICQConnection(controllerConnectionId: import("@agoric/vats").IBCConnectionID): import("@agoric/vow").Vow<import("./types.js").ICQConnection> | import("./types.js").ICQConnection;
+        makeAccount(chainId: string, hostConnectionId: import("@agoric/vats").IBCConnectionID, controllerConnectionId: import("@agoric/vats").IBCConnectionID, opts?: import("./utils/address.js").ICAChannelAddressOpts | undefined): import("@agoric/vow").Vow<import("./cosmos-api.js").IcaAccount>;
+        provideICQConnection(controllerConnectionId: import("@agoric/vats").IBCConnectionID, version?: string | undefined): import("@agoric/vow").Vow<import("./types.js").ICQConnection> | import("./types.js").ICQConnection;
     }>;
 } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     /** @param {Partial<OrchestrationPowers>} [initialPowers] */
     makeCosmosInterchainService(initialPowers?: Partial<OrchestrationPowers> | undefined): import("@endo/exo").Guarded<{
-        makeAccount(chainId: string, hostConnectionId: import("@agoric/vats").IBCConnectionID, controllerConnectionId: import("@agoric/vats").IBCConnectionID): import("@agoric/vow").Vow<import("./cosmos-api.js").IcaAccount>;
-        provideICQConnection(controllerConnectionId: import("@agoric/vats").IBCConnectionID): import("@agoric/vow").Vow<import("./types.js").ICQConnection> | import("./types.js").ICQConnection;
+        makeAccount(chainId: string, hostConnectionId: import("@agoric/vats").IBCConnectionID, controllerConnectionId: import("@agoric/vats").IBCConnectionID, opts?: import("./utils/address.js").ICAChannelAddressOpts | undefined): import("@agoric/vow").Vow<import("./cosmos-api.js").IcaAccount>;
+        provideICQConnection(controllerConnectionId: import("@agoric/vats").IBCConnectionID, version?: string | undefined): import("@agoric/vow").Vow<import("./types.js").ICQConnection> | import("./types.js").ICQConnection;
     }>;
 }>;
 export type OrchestrationVat = ReturnType<typeof buildRootObject>;