@agoric/orchestration 0.1.1-dev-fd6c64a.0 → 0.1.1-dev-69f57d5.0

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

@@ -3,9 +3,10 @@
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
  * @import {CosmosAssetInfo, CosmosChainInfo, ForwardInfo, IBCConnectionInfo, IBCMsgTransferOptions, TransferRoute, GoDuration, Bech32Address} from '../cosmos-api.js';
- * @import {ChainInfo, KnownChains} from '../chain-info.js';
- * @import {AccountId, CosmosChainAddress, ScopedChainId, Denom, DenomAmount, AccountIdArg} from '../orchestration-api.js';
+ * @import {KnownChains} from '../chain-info.js';
+ * @import {AccountId, CosmosChainAddress, ChainInfo, ScopedChainId, Denom, DenomAmount, AccountIdArg} from '../orchestration-api.js';
  * @import {Remote, TypedPattern} from '@agoric/internal';
+ * @import {Pattern} from '@endo/patterns';
  */
 /** receiver address value for ibc transfers that involve PFM */
 export const PFM_RECEIVER: "pfm";
@@ -26,7 +27,9 @@ export function connectionKey(chainId1: string, chainId2: string): string;
 export function normalizeConnectionInfo(primaryChainId: string, counterChainId: string, directed: IBCConnectionInfo): [string, IBCConnectionInfo];
 /** @type {TypedPattern<TransferRoute>} */
 export const TransferRouteShape: TypedPattern<TransferRoute>;
-export function makeChainHub(zone: Zone, agoricNames: Remote<NameHub>, vowTools: VowTools): import("@endo/exo").Guarded<{
+export function makeChainHub(zone: Zone, agoricNames: Remote<NameHub>, vowTools: VowTools, { chainInfoValueShape }?: {
+    chainInfoValueShape?: Pattern;
+}): import("@endo/exo").Guarded<{
     /**
      * Register a new chain. The name will override a name in well known chain
      * names.
@@ -37,17 +40,17 @@ export function makeChainHub(zone: Zone, agoricNames: Remote<NameHub>, vowTools:
      * contract `start` the call will happen again naturally.
      *
      * @param {string} name
-     * @param {CosmosChainInfo} chainInfo
+     * @param {ChainInfo} chainInfo
      */
-    registerChain(name: string, chainInfo: CosmosChainInfo): void;
+    registerChain(name: string, chainInfo: ChainInfo): void;
     /**
      * Update chain info by completely replacing existing entry
      *
      * @param {string} chainName - Name of the chain to update
-     * @param {CosmosChainInfo} chainInfo - New chain info
+     * @param {ChainInfo} chainInfo - New chain info
      * @throws {Error} If chain not registered
      */
-    updateChain(chainName: string, chainInfo: CosmosChainInfo): void;
+    updateChain(chainName: string, chainInfo: ChainInfo): void;
     /**
      * @template {string} K
      * @param {K} chainName
@@ -135,7 +138,7 @@ export function makeChainHub(zone: Zone, agoricNames: Remote<NameHub>, vowTools:
      */
     makeChainAddress(partialId: string): CosmosChainAddress;
     /**
-     * Determine the transfer route for a destination and amount given the
+     * Determine the IBC transfer route for a destination and amount given the
      * current holding chain.
      *
      * Does not account for routes with more than 1 intermediary hop - that is,
@@ -183,7 +186,8 @@ import type { Zone } from '@agoric/zone';
 import type { NameHub } from '@agoric/vats';
 import type { Remote } from '@agoric/internal';
 import type { VowTools } from '@agoric/vow';
-import type { CosmosChainInfo } from '../cosmos-api.js';
+import type { Pattern } from '@endo/patterns';
+import type { ChainInfo } from '../orchestration-api.js';
 import type { Vow } from '@agoric/vow';
 import type { Denom } from '../orchestration-api.js';
 import type { AccountId } from '../orchestration-api.js';
@@ -193,5 +197,4 @@ import type { DenomAmount } from '../orchestration-api.js';
 import type { IBCMsgTransferOptions } from '../cosmos-api.js';
 import type { CosmosAssetInfo } from '../cosmos-api.js';
 import type { KnownChains } from '../chain-info.js';
-import type { ChainInfo } from '../chain-info.js';
 //# sourceMappingURL=chain-hub.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"chain-hub.d.ts","sourceRoot":"","sources":["chain-hub.js"],"names":[],"mappings":"AAoBA;;;;;;;;GAQG;AAEH,gEAAgE;AAChE,2BAAkD,KAAK,CAAE;sBAsB/C,CAAC,OAAO,OAAO,EAAE,MAAM,OAAO,OAAO,CAAC;;;;;;AAYhD,oCAAoC;AACpC,gCAAuC;AACvC,8CAA8C;AAC9C,gDAAuD;AACvD,0CAA0C;AAC1C,uCAA8C;AAgBvC,uCAHI,MAAM,UAOd;AAUI,wCAHI,MAAM,YACN,MAAM,UAOhB;AAoCM,wDALI,MAAM,kBACN,MAAM,YACN,iBAAiB,GACf,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAavC;AAwCD,0CAA0C;AAC1C,iCADW,aAAa,aAAa,CAAC,CAUpC;AA2CK,mCAJI,IAAI,eACJ,OAAO,OAAO,CAAC,YACf,QAAQ;IA0If;;;;;;;;;;;OAWG;wBAFQ,MAAM,aACN,eAAe;IAQ1B;;;;;;OAMG;2BAHQ,MAAM,aACN,eAAe;IAgB1B;;;;OAIG;iBAHmB,CAAC,SAAV,MAAQ,aACV,CAAC,GACC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;IAYpC;;;;OAIG;uCAHQ,MAAM,uBACN,MAAM,kBACN,iBAAiB;IAU5B;;;;;;;OAOG;qCAJQ,MAAM,uBACN,MAAM,kBACN,iBAAiB;IAiB5B;;;;OAIG;+BAHQ,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,WAC5B,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAC1B,IAAI,iBAAiB,CAAC;IAmBnC;;;;;;;;OAQG;2BAPmB,EAAE,SAAX,MAAQ,EACC,EAAE,SAAX,MAAQ,eACV,EAAE,eACF,EAAE,GACA,IACZ,CAAK,eAAe,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC9D;IAOJ;;;;;;;OAOG;yBAHQ,KAAK,UAEL,WAAW;IAmBtB;;;;;;;OAOG;uBAJQ,KAAK,UACL,WAAW;IAgCtB;;;;;;OAMG;oBAHQ,KAAK,gBACL,MAAM,GACJ,WAAW,GAAG,SAAS;IASpC;;;;;OAKG;oBAFQ,KAAK,GACH,KAAK,GAAG,SAAS;IAQ9B;;;;OAIG;gCAHQ,MAAM,GACJ,SAAS;IAatB;;;;OAIG;gCAHQ,MAAM,GACJ,kBAAkB;IAwB/B;;;;;;;;;;;;;;;OAeG;mCANQ,YAAY,eACZ,WAAW,gBACX,MAAM,gBACN,qBAAqB,CAAC,aAAa,CAAC,GAClC,aAAa;GAyG7B;AAUM,yCAJI,QAAQ,QACR,MAAM,UACN,eAAe,EAAE,QAe3B;;;;4BAluBqB,CAAC,SAAV,MAAQ,IACR,CAAC,SAAS,MAAM,WAAW,GACjC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,GAC/C,SAAS;;;;;cAMF,MAAM;;;;eACN,KAAK;;;;eACL,MAAM;;;;;;uBAisBN,UAAU,CAAC,OAAO,YAAY,CAAC;uCAxtBuG,kBAAkB;mCAAlB,kBAAkB;kCAG/H,kBAAkB;0BAJlC,cAAc;6BAFX,cAAc;4BAMD,kBAAkB;8BALzB,aAAa;qCAEuG,kBAAkB;yBAFtI,aAAa;2BAIoD,yBAAyB;+BAAzB,yBAAyB;wCAAzB,yBAAyB;kCAAzB,yBAAyB;iCAAzB,yBAAyB;2CAF0B,kBAAkB;qCAAlB,kBAAkB;iCAC7H,kBAAkB;+BAAlB,kBAAkB"}
+{"version":3,"file":"chain-hub.d.ts","sourceRoot":"","sources":["chain-hub.js"],"names":[],"mappings":"AAoBA;;;;;;;;;GASG;AAEH,gEAAgE;AAChE,2BAAkD,KAAK,CAAE;sBAsB/C,CAAC,OAAO,OAAO,EAAE,MAAM,OAAO,OAAO,CAAC;;;;;;AAYhD,oCAAoC;AACpC,gCAAuC;AACvC,8CAA8C;AAC9C,gDAAuD;AACvD,0CAA0C;AAC1C,uCAA8C;AAgBvC,uCAHI,MAAM,UAOd;AAUI,wCAHI,MAAM,YACN,MAAM,UAOhB;AAoCM,wDALI,MAAM,kBACN,MAAM,YACN,iBAAiB,GACf,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAavC;AAwCD,0CAA0C;AAC1C,iCADW,aAAa,aAAa,CAAC,CAUpC;AA+CK,mCARI,IAAI,eACJ,OAAO,OAAO,CAAC,YACf,QAAQ,4BAEhB;IAAuB,mBAAmB,GAAlC,OAAO;CAGjB;IA4JG;;;;;;;;;;;OAWG;wBAFQ,MAAM,aACN,SAAS;IAWpB;;;;;;OAMG;2BAHQ,MAAM,aACN,SAAS;IAqBpB;;;;OAIG;iBAHmB,CAAC,SAAV,MAAQ,aACV,CAAC,GACC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;IAYpC;;;;OAIG;uCAHQ,MAAM,uBACN,MAAM,kBACN,iBAAiB;IAU5B;;;;;;;OAOG;qCAJQ,MAAM,uBACN,MAAM,kBACN,iBAAiB;IAiB5B;;;;OAIG;+BAHQ,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,WAC5B,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAC1B,IAAI,iBAAiB,CAAC;IAmBnC;;;;;;;;OAQG;2BAPmB,EAAE,SAAX,MAAQ,EACC,EAAE,SAAX,MAAQ,eACV,EAAE,eACF,EAAE,GACA,IACZ,CAAK,eAAe,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC9D;IAOJ;;;;;;;OAOG;yBAHQ,KAAK,UAEL,WAAW;IAmBtB;;;;;;;OAOG;uBAJQ,KAAK,UACL,WAAW;IAgCtB;;;;;;OAMG;oBAHQ,KAAK,gBACL,MAAM,GACJ,WAAW,GAAG,SAAS;IASpC;;;;;OAKG;oBAFQ,KAAK,GACH,KAAK,GAAG,SAAS;IAQ9B;;;;OAIG;gCAHQ,MAAM,GACJ,SAAS;IAatB;;;;OAIG;gCAHQ,MAAM,GACJ,kBAAkB;IAsB/B;;;;;;;;;;;;;;;OAeG;mCANQ,YAAY,eACZ,WAAW,gBACX,MAAM,gBACN,qBAAqB,CAAC,aAAa,CAAC,GAClC,aAAa;GA4G7B;AAUM,yCAJI,QAAQ,QACR,MAAM,UACN,eAAe,EAAE,QAe3B;;;;4BAlwBqB,CAAC,SAAV,MAAQ,IACR,CAAC,SAAS,MAAM,WAAW,GACjC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,GAC/C,SAAS;;;;;cAMF,MAAM;;;;eACN,KAAK;;;;eACL,MAAM;;;;;;uBAiuBN,UAAU,CAAC,OAAO,YAAY,CAAC;uCAzvBuG,kBAAkB;mCAAlB,kBAAkB;kCAG/H,kBAAkB;0BAJlC,cAAc;6BAFX,cAAc;4BAMD,kBAAkB;8BALzB,aAAa;6BAMnB,gBAAgB;+BAFkE,yBAAyB;yBAJrG,aAAa;2BAI+D,yBAAyB;+BAAzB,yBAAyB;wCAAzB,yBAAyB;kCAAzB,yBAAyB;iCAAzB,yBAAyB;2CAFe,kBAAkB;qCAAlB,kBAAkB;iCACxI,kBAAkB"}

package/src/exos/chain-hub.js

@@ -7,7 +7,6 @@ import { VowShape } from '@agoric/vow';
 import {
   CosmosChainAddressShape,
   CoinShape,
-  CosmosChainInfoShape,
   DenomAmountShape,
   DenomDetailShape,
   ForwardInfoShape,
@@ -15,6 +14,7 @@ import {
   IBCChannelIDShape,
   IBCConnectionInfoShape,
   AccountArgShape,
+  ChainInfoShape,
 } from '../typeGuards.js';
 import { getBech32Prefix, parseAccountId } from '../utils/address.js';
 
@@ -23,9 +23,10 @@ import { getBech32Prefix, parseAccountId } from '../utils/address.js';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
  * @import {CosmosAssetInfo, CosmosChainInfo, ForwardInfo, IBCConnectionInfo, IBCMsgTransferOptions, TransferRoute, GoDuration, Bech32Address} from '../cosmos-api.js';
- * @import {ChainInfo, KnownChains} from '../chain-info.js';
- * @import {AccountId, CosmosChainAddress, ScopedChainId, Denom, DenomAmount, AccountIdArg} from '../orchestration-api.js';
+ * @import {KnownChains} from '../chain-info.js';
+ * @import {AccountId, CosmosChainAddress, ChainInfo, ScopedChainId, Denom, DenomAmount, AccountIdArg} from '../orchestration-api.js';
  * @import {Remote, TypedPattern} from '@agoric/internal';
+ * @import {Pattern} from '@endo/patterns';
  */
 
 /** receiver address value for ibc transfers that involve PFM */
@@ -203,8 +204,8 @@ export const TransferRouteShape = M.splitRecord(
 );
 
 const ChainHubI = M.interface('ChainHub', {
-  registerChain: M.call(M.string(), CosmosChainInfoShape).returns(),
-  updateChain: M.call(M.string(), CosmosChainInfoShape).returns(),
+  registerChain: M.call(M.string(), ChainInfoShape).returns(),
+  updateChain: M.call(M.string(), ChainInfoShape).returns(),
   getChainInfo: M.call(M.string()).returns(VowShape),
   registerConnection: M.call(
     M.string(),
@@ -234,20 +235,29 @@ const ChainHubI = M.interface('ChainHub', {
 /**
  * Make a new ChainHub in the zone.
  *
- * The resulting object is an Exo singleton. It has no precious state. It's only
+ * The resulting object is an Exo singleton. It has no precious state. Its only
  * state is a cache of queries to agoricNames and whatever info was provided in
  * registration calls. When you need a newer version you can simply make a hub
- * hub and repeat the registrations.
+ * and repeat the registrations.
  *
  * @param {Zone} zone
  * @param {Remote<NameHub>} agoricNames
  * @param {VowTools} vowTools
+ * @param {object} [opts]
+ * @param {Pattern} [opts.chainInfoValueShape] legacy support for contracts
+ *   deployed with `valueShape: CosmosChainInfoShape`. If nothing is supplied,
+ *   defaults to {@link ChainInfoShape}
  */
-export const makeChainHub = (zone, agoricNames, vowTools) => {
-  /** @type {MapStore<string, CosmosChainInfo>} */
+export const makeChainHub = (
+  zone,
+  agoricNames,
+  vowTools,
+  { chainInfoValueShape = /** @type {Pattern} */ (ChainInfoShape) } = {},
+) => {
+  /** @type {MapStore<string, ChainInfo>} */
   const chainInfos = zone.mapStore('chainInfos', {
     keyShape: M.string(),
-    valueShape: CosmosChainInfoShape,
+    valueShape: chainInfoValueShape,
   });
   /** @type {MapStore<string, IBCConnectionInfo>} */
   const connectionInfos = zone.mapStore('connectionInfos', {
@@ -288,7 +298,9 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
       throw makeError(`Chain info not found for bech32Prefix ${q(prefix)}`);
     }
     const chainName = bech32PrefixToChainName.get(prefix);
-    const { chainId } = chainInfos.get(chainName);
+    const { chainId } = /** @type {CosmosChainInfo} */ (
+      chainInfos.get(chainName)
+    );
     return chainId;
   };
 
@@ -356,7 +368,11 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
      * @param {C1} primaryName
      * @param {C2} counterName
      * @returns {Promise<
-     *   [ActualChainInfo<C1>, ActualChainInfo<C2>, IBCConnectionInfo]
+     *   [
+     *     ActualChainInfo<C1>,
+     *     ActualChainInfo<C2>,
+     *     IBCConnectionInfo | undefined,
+     *   ]
      * >}
      */
     // eslint-disable-next-line no-restricted-syntax -- TODO more exact rules for vow best practices
@@ -367,14 +383,22 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
           chainHub.getChainInfo(counterName),
         ]),
       );
-      const connectionInfo = await vowTools.asPromise(
-        chainHub.getConnectionInfo(primary, counter),
+
+      const connectionInfo =
+        primary.namespace === 'cosmos' && counter.namespace === 'cosmos'
+          ? await vowTools.asPromise(
+              chainHub.getConnectionInfo(primary, counter),
+            )
+          : undefined;
+      return (
+        /**
+         * @type {[
+         *   ActualChainInfo<C1>,
+         *   ActualChainInfo<C2>,
+         *   IBCConnectionInfo | undefined,
+         * ]}
+         */ ([primary, counter, connectionInfo])
       );
-      return /** @type {[ActualChainInfo<C1>, ActualChainInfo<C2>, IBCConnectionInfo]} */ ([
-        primary,
-        counter,
-        connectionInfo,
-      ]);
     },
   );
 
@@ -389,19 +413,22 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
      * contract `start` the call will happen again naturally.
      *
      * @param {string} name
-     * @param {CosmosChainInfo} chainInfo
+     * @param {ChainInfo} chainInfo
      */
     registerChain(name, chainInfo) {
       chainInfos.init(name, chainInfo);
-      if (chainInfo.bech32Prefix) {
-        bech32PrefixToChainName.init(chainInfo.bech32Prefix, name);
+      if (/** @type {CosmosChainInfo} */ (chainInfo).bech32Prefix) {
+        bech32PrefixToChainName.init(
+          /** @type {CosmosChainInfo} */ (chainInfo).bech32Prefix,
+          name,
+        );
       }
     },
     /**
      * Update chain info by completely replacing existing entry
      *
      * @param {string} chainName - Name of the chain to update
-     * @param {CosmosChainInfo} chainInfo - New chain info
+     * @param {ChainInfo} chainInfo - New chain info
      * @throws {Error} If chain not registered
      */
     updateChain(chainName, chainInfo) {
@@ -409,12 +436,17 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
         throw makeError(`Chain ${q(chainName)} not registered`);
       }
       const oldInfo = chainInfos.get(chainName);
-      if (oldInfo.bech32Prefix) {
-        bech32PrefixToChainName.delete(oldInfo.bech32Prefix);
+      if (/** @type {CosmosChainInfo} */ (oldInfo).bech32Prefix) {
+        bech32PrefixToChainName.delete(
+          /** @type {CosmosChainInfo} */ (oldInfo).bech32Prefix,
+        );
       }
       chainInfos.set(chainName, chainInfo);
-      if (chainInfo.bech32Prefix) {
-        bech32PrefixToChainName.init(chainInfo.bech32Prefix, chainName);
+      if (/** @type {CosmosChainInfo} */ (chainInfo).bech32Prefix) {
+        bech32PrefixToChainName.init(
+          /** @type {CosmosChainInfo} */ (chainInfo).bech32Prefix,
+          chainName,
+        );
       }
     },
     /**
@@ -629,10 +661,8 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
         encoding: /** @type {const} */ ('bech32'),
       });
     },
-    // TODO document whether this is limited to IBC
-    // Not urgent because it's vat-local
     /**
-     * Determine the transfer route for a destination and amount given the
+     * Determine the IBC transfer route for a destination and amount given the
      * current holding chain.
      *
      * Does not account for routes with more than 1 intermediary hop - that is,
@@ -665,9 +695,12 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
       chainInfos.has(baseName) ||
         Fail`chain info not found for issuing chain: ${q(baseName)}`;
 
-      const { chainId: baseChainId, pfmEnabled } = chainInfos.get(baseName);
+      const { chainId: baseChainId, pfmEnabled } =
+        /** @type {CosmosChainInfo} */ (chainInfos.get(baseName));
 
-      const holdingChainId = chainInfos.get(srcChainName).chainId;
+      const holdingChainId = /** @type {CosmosChainInfo} */ (
+        chainInfos.get(srcChainName)
+      ).chainId;
 
       destination =
         typeof destination === 'string'

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

@@ -1,25 +1,5 @@
-export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowers): (localChainInfo: Readonly<{
-    bech32Prefix?: string;
-    chainId: string;
-    connections?: Record<string, IBCConnectionInfo>;
-    icqEnabled?: boolean;
-    pfmEnabled?: boolean;
-    stakingTokens?: Readonly<Array<{
-        denom: string;
-    }>>;
-    icaEnabled?: boolean;
-}>) => import("@endo/exo").Guarded<{
-    getChainInfo(): Vow<Readonly<{
-        bech32Prefix?: string;
-        chainId: string;
-        connections?: Record<string, IBCConnectionInfo>;
-        icqEnabled?: boolean;
-        pfmEnabled?: boolean;
-        stakingTokens?: Readonly<Array<{
-            denom: string;
-        }>>;
-        icaEnabled?: boolean;
-    }>>;
+export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowers): (localChainInfo: CosmosChainInfo) => import("@endo/exo").Guarded<{
+    getChainInfo(): Vow<CosmosChainInfo>;
     /** @returns {Vow<LocalOrchestrationAccountKit['holder']>} */
     makeAccount(): Vow<LocalOrchestrationAccountKit["holder"]>;
     query(args_0: {
@@ -56,7 +36,7 @@ export type LocalChainFacadePowers = {
 export type MakeLocalChainFacade = ReturnType<typeof prepareLocalChainFacade>;
 export type LocalChainFacade = ReturnType<MakeLocalChainFacade>;
 import type { Zone } from '@agoric/base-zone';
-import type { IBCConnectionInfo } from '../types.js';
+import type { CosmosChainInfo } from '../types.js';
 import type { Vow } from '@agoric/vow';
 import type { LocalOrchestrationAccountKit } from './local-orchestration-account.js';
 import type { AssetInfo } from '@agoric/vats/src/vat-bank.js';

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":"AA8LO,8CAJI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;IAtFzB,6DAA6D;mBAA/C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC;;;;;;;;;;GA4FhE;;;;;;;;;;;uBArKa,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;;qCAO3B;IACR,gCAAgC,EAAE,gCAAgC,CAAC;IACnE,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;CACpB;mCAyJU,UAAU,CAAC,OAAO,uBAAuB,CAAC;+BAC1C,UAAU,CAAC,oBAAoB,CAAC;0BAzLvB,mBAAmB;uCASuE,aAAa;yBAH9F,aAAa;kDAEoC,kCAAkC;+BAJvF,8BAA8B;sDAIuB,kCAAkC;6CADzE,qBAAqB;4BALtC,kBAAkB;6BAGjB,cAAc;kCAJT,cAAc;gCAEgB,gCAAgC;8BAG7D,aAAa"}
+{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA8LO,8CAJI,IAAI,UACJ,sBAAsB;;IAtFzB,6DAA6D;mBAA/C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC;;;;;;;;;;GA4FhE;;;;;;;;;;;uBArKa,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;;qCAO3B;IACR,gCAAgC,EAAE,gCAAgC,CAAC;IACnE,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;CACpB;mCAyJU,UAAU,CAAC,OAAO,uBAAuB,CAAC;+BAC1C,UAAU,CAAC,oBAAoB,CAAC;0BAzLvB,mBAAmB;qCASuE,aAAa;yBAH9F,aAAa;kDAEoC,kCAAkC;+BAJvF,8BAA8B;sDAIuB,kCAAkC;6CADzE,qBAAqB;4BALtC,kBAAkB;6BAGjB,cAAc;kCAJT,cAAc;gCAEgB,gCAAgC;8BAG7D,aAAa"}

package/src/exos/orchestrator.d.ts

@@ -51,17 +51,7 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
          * @param {ActualChainInfo<'agoric'>} agoricChainInfo
          */
         onFulfilled(agoricChainInfo: ActualChainInfo<"agoric">): import("@endo/exo").Guarded<{
-            getChainInfo(): Vow<Readonly<{
-                bech32Prefix?: string;
-                chainId: string;
-                connections?: Record<string, IBCConnectionInfo>;
-                icqEnabled?: boolean;
-                pfmEnabled?: boolean;
-                stakingTokens?: Readonly<Array<{
-                    denom: string;
-                }>>;
-                icaEnabled?: boolean;
-            }>>;
+            getChainInfo(): Vow<import("../cosmos-api.js").CosmosChainInfo>;
             makeAccount(): Vow<import("./local-orchestration-account.js").LocalOrchestrationAccountKit["holder"]>;
             query(args_0: {
                 '@type': string;
@@ -121,7 +111,7 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
     };
 }>;
 import type { ActualChainInfo } from './chain-hub.js';
-import type { IBCConnectionInfo } from '../types.js';
 import type { ChainInfo } from '../types.js';
+import type { IBCConnectionInfo } from '../types.js';
 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":"AAiCA,0BAA0B;AAC1B;;;;GAIG;AAqJI,0CARI,IAAI,UACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;;;IAfI,+CAA+C;cAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;GAoBlD;;;;;+BAMY,UAAU,CAClB,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAvLG,mBAAmB;8BACE,gBAAgB;0CASrB,yBAAyB;2CACxB,0BAA0B;8BARlC,aAAa;2BASoC,aAAa;mCAVtC,oBAAoB;yBAC5C,aAAa;kCASoC,aAAa;4BAVtC,oBAAoB;AAuB5E;;;;;;;;GAQG;AACH,8CARW,IAAI,0FACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;IA4CE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;0HADQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0DjB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCA/J2C,gBAAgB;uCAWqB,aAAa;+BAAb,aAAa"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AA4BA,0BAA0B;AAC1B;;;;GAIG;AAqJI,0CARI,IAAI,UACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;;;IAfI,+CAA+C;cAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;GAoBlD;;;;;+BAMY,UAAU,CAClB,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAvLG,mBAAmB;8BACE,gBAAgB;0CASrB,yBAAyB;2CACxB,0BAA0B;8BARlC,aAAa;2BASoC,aAAa;mCAVtC,oBAAoB;yBAC5C,aAAa;kCASoC,aAAa;4BAVtC,oBAAoB;AAuB5E;;;;;;;;GAQG;AACH,8CARW,IAAI,0FACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;IA4CE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;yEAFQ,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,CAAC,QACzC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0DjB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCA/J2C,gBAAgB;+BAWqB,aAAa;uCAAb,aAAa"}

package/src/exos/orchestrator.js

@@ -5,12 +5,7 @@ import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { Fail, q } from '@endo/errors';
 import { M } from '@endo/patterns';
-import {
-  DenomInfoShape,
-  ChainInfoShape,
-  DenomAmountShape,
-  DenomShape,
-} from '../typeGuards.js';
+import { DenomInfoShape, DenomAmountShape, DenomShape } from '../typeGuards.js';
 
 /**
  * @import {Zone} from '@agoric/base-zone';
@@ -33,7 +28,7 @@ const trace = makeTracer('Orchestrator');
 
 /** @see {Orchestrator} */
 export const OrchestratorI = M.interface('Orchestrator', {
-  getChain: M.call(M.string()).returns(Vow$(ChainInfoShape)),
+  getChain: M.call(M.string()).returns(Vow$(M.remotable('ChainFacade'))),
   getDenomInfo: M.call(DenomShape, M.string()).returns(DenomInfoShape),
   asAmount: M.call(DenomAmountShape).returns(AmountShape),
 });

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

@@ -1,14 +1,4 @@
-export function prepareRemoteChainFacade(zone: Zone, powers: RemoteChainFacadePowers): (remoteChainInfo: Readonly<{
-    bech32Prefix?: string;
-    chainId: string;
-    connections?: Record<string, IBCConnectionInfo>;
-    icqEnabled?: boolean;
-    pfmEnabled?: boolean;
-    stakingTokens?: Readonly<Array<{
-        denom: string;
-    }>>;
-    icaEnabled?: boolean;
-}>, connectionInfo: IBCConnectionInfo) => import("@endo/exo").Guarded<{
+export function prepareRemoteChainFacade(zone: Zone, powers: RemoteChainFacadePowers): (remoteChainInfo: ChainInfo, connectionInfo?: IBCConnectionInfo | undefined) => import("@endo/exo").Guarded<{
     getChainInfo(): Vow<any>;
     makeAccount(): Vow<import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & object> | import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").LocalAccountMethods> | import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & object> | import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries>>;
     query(msgs: {
@@ -42,13 +32,14 @@ export type RemoteChainFacadePowers = {
     vowTools: VowTools;
 };
 export type RemoteChainFacadeState = {
-    remoteChainInfo: CosmosChainInfo;
-    connectionInfo: IBCConnectionInfo;
+    remoteChainInfo: ChainInfo;
+    connectionInfo: IBCConnectionInfo | undefined;
     icqConnection: ICQConnection | undefined;
 };
 export type MakeRemoteChainFacade = ReturnType<typeof prepareRemoteChainFacade>;
 export type RemoteChainFacade = ReturnType<MakeRemoteChainFacade>;
 import type { Zone } from '@agoric/base-zone';
+import type { ChainInfo } from '../types.js';
 import type { IBCConnectionInfo } from '../types.js';
 import type { Vow } from '@agoric/vow';
 import type { prepareCosmosOrchestrationAccount } from './cosmos-orchestration-account.js';
@@ -56,6 +47,5 @@ import type { CosmosInterchainService } from './exo-interfaces.js';
 import type { Remote } from '@agoric/internal';
 import type { TimerService } from '@agoric/time';
 import type { VowTools } from '@agoric/vow';
-import type { CosmosChainInfo } from '../types.js';
 import type { ICQConnection } from '../types.js';
 //# sourceMappingURL=remote-chain-facade.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"remote-chain-facade.d.ts","sourceRoot":"","sources":["remote-chain-facade.js"],"names":[],"mappings":"AAuQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAKjC;sCA5OY;IACR,8BAA8B,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACF,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACR,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,iBAAiB,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCA+NU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA/PxB,mBAAmB;uCASiE,aAAa;yBAJxF,aAAa;uDAGO,mCAAmC;6CAD7C,qBAAqB;4BAHtC,kBAAkB;kCADZ,cAAc;8BAEb,aAAa;qCAI8D,aAAa;mCAAb,aAAa"}
+{"version":3,"file":"remote-chain-facade.d.ts","sourceRoot":"","sources":["remote-chain-facade.js"],"names":[],"mappings":"AAoRO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;GAKjC;sCAzPY;IACR,8BAA8B,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACF,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACR,eAAe,EAAE,SAAS,CAAC;IAC3B,cAAc,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC9C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCA4OU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA5QxB,mBAAmB;+BAS4E,aAAa;uCAAb,aAAa;yBAJnG,aAAa;uDAGO,mCAAmC;6CAD7C,qBAAqB;4BAHtC,kBAAkB;kCADZ,cAAc;8BAEb,aAAa;mCAIyE,aAAa"}

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

@@ -22,7 +22,7 @@ import {
  * @import {LocalIbcAddress, RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
  * @import {CosmosInterchainService} from './exo-interfaces.js';
  * @import {prepareCosmosOrchestrationAccount} from './cosmos-orchestration-account.js';
- * @import {CosmosChainInfo, IBCConnectionInfo, CosmosChainAddress, IcaAccount, Chain, ICQConnection} from '../types.js';
+ * @import {CosmosChainInfo, IBCConnectionInfo, CosmosChainAddress, IcaAccount, Chain, ICQConnection, ChainInfo} from '../types.js';
  */
 
 const trace = makeTracer('RemoteChainFacade');
@@ -41,8 +41,8 @@ const trace = makeTracer('RemoteChainFacade');
 
 /**
  * @typedef {{
- *   remoteChainInfo: CosmosChainInfo;
- *   connectionInfo: IBCConnectionInfo;
+ *   remoteChainInfo: ChainInfo;
+ *   connectionInfo: IBCConnectionInfo | undefined;
  *   icqConnection: ICQConnection | undefined;
  * }} RemoteChainFacadeState
  */
@@ -103,8 +103,8 @@ const prepareRemoteChainFacadeKit = (
       }),
     },
     /**
-     * @param {CosmosChainInfo} remoteChainInfo
-     * @param {IBCConnectionInfo} connectionInfo
+     * @param {ChainInfo} remoteChainInfo
+     * @param {IBCConnectionInfo} [connectionInfo]
      */
     (remoteChainInfo, connectionInfo) => {
       trace('making a RemoteChainFacade');
@@ -126,15 +126,21 @@ const prepareRemoteChainFacadeKit = (
           return asVow(() => {
             const { remoteChainInfo, connectionInfo } = this.state;
 
+            if (remoteChainInfo.namespace !== 'cosmos') {
+              throw Fail`only supported on 'cosmos' chains, not ${remoteChainInfo.namespace}`;
+            }
+            if (!connectionInfo) throw Fail`IBC connection info not found`;
+
             // icqConnection is ultimately retrieved from state, but let's
             // create a connection if it doesn't exist
             const icqConnOrUndefinedV =
-              remoteChainInfo.icqEnabled && !this.state.icqConnection
+              /** @type {CosmosChainInfo} */ (remoteChainInfo)?.icqEnabled &&
+              !this.state.icqConnection
                 ? E(orchestration).provideICQConnection(connectionInfo.id)
                 : undefined;
 
             const makeAccountV = E(orchestration).makeAccount(
-              remoteChainInfo.chainId,
+              /** @type {CosmosChainInfo} */ (remoteChainInfo).chainId,
               connectionInfo.counterparty.connection_id,
               connectionInfo.id,
             );
@@ -155,10 +161,17 @@ const prepareRemoteChainFacadeKit = (
             const {
               remoteChainInfo: { icqEnabled, chainId },
               connectionInfo,
-            } = this.state;
+            } = /**
+             * @type {{
+             *   remoteChainInfo: CosmosChainInfo;
+             *   connectionInfo?: IBCConnectionInfo;
+             * }}
+             */ (this.state);
+
             if (!icqEnabled) {
               throw Fail`Queries not available for chain ${q(chainId)}`;
             }
+            if (!connectionInfo) throw Fail`IBC connection info not found`;
             // if none exists, make one and still send the query in the handler
             if (!this.state.icqConnection) {
               return watch(