@agoric/orchestration 0.2.0-upgrade-18-dev-aaebae4.0 → 0.2.0-upgrade-18-dev-bd8fd54.0

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

@@ -11,7 +11,6 @@ import { Fail, q } from '@endo/errors';
 import {
   AmountArgShape,
   AnyNatAmountsRecord,
-  ChainAddressShape,
   DenomAmountShape,
   DenomShape,
   IBCTransferOptionsShape,
@@ -24,11 +23,12 @@ import { makeTimestampHelper } from '../utils/time.js';
 import { preparePacketTools } from './packet-tools.js';
 import { prepareIBCTools } from './ibc-packet.js';
 import { coerceCoin, coerceDenomAmount } from '../utils/amounts.js';
+import { TransferRouteShape } from './chain-hub.js';
 
 /**
  * @import {HostOf} from '@agoric/async-flow';
  * @import {LocalChain, LocalChainAccount} from '@agoric/vats/src/localchain.js';
- * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountI, LocalAccountMethods} from '@agoric/orchestration';
+ * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountCommon, LocalAccountMethods, TransferRoute} from '@agoric/orchestration';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'.
  * @import {Zone} from '@agoric/zone';
  * @import {Remote} from '@agoric/internal';
@@ -43,7 +43,7 @@ import { coerceCoin, coerceDenomAmount } from '../utils/amounts.js';
  * @import {ZoeTools} from '../utils/zoe-tools.js';
  */
 
-const trace = makeTracer('LOA');
+const trace = makeTracer('LocalOrchAccount');
 
 const { Vow$ } = NetworkShape; // TODO #9611
 
@@ -107,7 +107,7 @@ export const prepareLocalOrchestrationAccountKit = (
     zoeTools,
   },
 ) => {
-  const { watch, allVows, asVow, when } = vowTools;
+  const { watch, asVow, when } = vowTools;
   const { makeIBCTransferSender } = prepareIBCTools(
     zone.subZone('ibcTools'),
     vowTools,
@@ -134,11 +134,10 @@ export const prepareLocalOrchestrationAccountKit = (
           .returns(VowShape),
       }),
       transferWatcher: M.interface('transferWatcher', {
-        onFulfilled: M.call([M.record(), M.nat()])
+        onFulfilled: M.call(M.nat())
           .optional({
-            destination: ChainAddressShape,
             opts: M.or(M.undefined(), IBCTransferOptionsShape),
-            amount: DenomAmountShape,
+            route: TransferRouteShape,
           })
           .returns(Vow$(M.record())),
       }),
@@ -345,37 +344,34 @@ export const prepareLocalOrchestrationAccountKit = (
       },
       transferWatcher: {
         /**
-         * @param {[
-         *   { transferChannel: IBCConnectionInfo['transferChannel'] },
-         *   bigint,
-         * ]} results
+         * @param {bigint} timeoutTimestamp
          * @param {{
-         *   destination: ChainAddress;
-         *   opts?: IBCMsgTransferOptions;
-         *   amount: DenomAmount;
+         *   opts?: Omit<IBCMsgTransferOptions, 'forwardOpts'>;
+         *   route: TransferRoute;
          * }} ctx
          */
-        onFulfilled(
-          [{ transferChannel }, timeoutTimestamp],
-          { opts, amount, destination },
-        ) {
+        onFulfilled(timeoutTimestamp, { opts, route }) {
+          const { forwardInfo, ...transferDetails } = route;
+          /** @type {string | undefined} */
+          let memo;
+          if (opts && 'memo' in opts) {
+            memo = opts.memo;
+          }
+          if (forwardInfo) {
+            // forward memo takes precedence
+            memo = JSON.stringify(forwardInfo);
+          }
           const transferMsg = typedJson(
             '/ibc.applications.transfer.v1.MsgTransfer',
             {
-              sourcePort: transferChannel.portId,
-              sourceChannel: transferChannel.channelId,
-              token: {
-                amount: String(amount.value),
-                denom: amount.denom,
-              },
+              ...transferDetails,
               sender: this.state.address.value,
-              receiver: destination.value,
               timeoutHeight: opts?.timeoutHeight ?? {
                 revisionHeight: 0n,
                 revisionNumber: 0n,
               },
               timeoutTimestamp,
-              memo: opts?.memo ?? '',
+              memo: memo ?? '',
             },
           );
 
@@ -395,9 +391,7 @@ export const prepareLocalOrchestrationAccountKit = (
        * first result
        */
       extractFirstResultWatcher: {
-        /**
-         * @param {Record<unknown, unknown>[]} results
-         */
+        /** @param {Record<unknown, unknown>[]} results */
         onFulfilled(results) {
           results.length === 1 ||
             Fail`expected exactly one result; got ${results}`;
@@ -482,7 +476,7 @@ export const prepareLocalOrchestrationAccountKit = (
         },
       },
       holder: {
-        /** @type {HostOf<OrchestrationAccountI['asContinuingOffer']>} */
+        /** @type {HostOf<OrchestrationAccountCommon['asContinuingOffer']>} */
         asContinuingOffer() {
           // @ts-expect-error XXX invitationMakers
           // getPublicTopics resolves promptly (same run), so we don't need a watcher
@@ -504,14 +498,12 @@ export const prepareLocalOrchestrationAccountKit = (
             });
           });
         },
-        /**
-         * @type {HostOf<OrchestrationAccountI['getBalance']>}
-         */
+        /** @type {HostOf<OrchestrationAccountCommon['getBalance']>} */
         getBalance(denomArg) {
           return asVow(() => {
             const [brand, denom] =
               typeof denomArg === 'string'
-                ? [chainHub.getAsset(denomArg)?.brand, denomArg]
+                ? [chainHub.getAsset(denomArg, 'agoric')?.brand, denomArg]
                 : [denomArg, chainHub.getDenom(denomArg)];
 
             if (!denom) {
@@ -537,7 +529,7 @@ export const prepareLocalOrchestrationAccountKit = (
             );
           });
         },
-        /** @type {HostOf<OrchestrationAccountI['getBalances']>} */
+        /** @type {HostOf<OrchestrationAccountCommon['getBalances']>} */
         getBalances() {
           return watch(
             E(localchain).query(
@@ -549,9 +541,7 @@ export const prepareLocalOrchestrationAccountKit = (
           );
         },
 
-        /**
-         * @type {HostOf<OrchestrationAccountI['getPublicTopics']>}
-         */
+        /** @type {HostOf<OrchestrationAccountCommon['getPublicTopics']>} */
         getPublicTopics() {
           // getStoragePath resolves promptly (same run), so we don't need a watcher
           // eslint-disable-next-line no-restricted-syntax
@@ -628,14 +618,14 @@ export const prepareLocalOrchestrationAccountKit = (
         executeTx(messages) {
           return watch(E(this.state.account).executeTx(messages));
         },
-        /** @type {OrchestrationAccountI['getAddress']} */
+        /** @type {OrchestrationAccountCommon['getAddress']} */
         getAddress() {
           return this.state.address;
         },
         /**
          * XXX consider using ERTP to send if it's vbank asset
          *
-         * @type {HostOf<OrchestrationAccountI['send']>}
+         * @type {HostOf<OrchestrationAccountCommon['send']>}
          */
         send(toAccount, amount) {
           return asVow(() => {
@@ -656,7 +646,7 @@ export const prepareLocalOrchestrationAccountKit = (
         /**
          * XXX consider using ERTP to send if it's vbank asset
          *
-         * @type {HostOf<OrchestrationAccountI['sendAll']>}
+         * @type {HostOf<OrchestrationAccountCommon['sendAll']>}
          */
         sendAll(toAccount, amounts) {
           return asVow(() => {
@@ -682,17 +672,25 @@ export const prepareLocalOrchestrationAccountKit = (
          *   timeoutTimestamp are not supplied, a default timeoutTimestamp will
          *   be set for 5 minutes in the future
          * @returns {Vow<any>}
+         * @throws {Error} if route is not determinable, asset is not
+         *   recognized, or the transfer is rejected (insufficient funds,
+         *   timeout)
          */
         transfer(destination, amount, opts) {
           return asVow(() => {
-            trace('Transferring funds from LCA over IBC');
+            trace('Transferring funds over IBC');
+            const denomAmount = coerceDenomAmount(chainHub, amount);
 
-            const connectionInfoV = watch(
-              chainHub.getConnectionInfo(
-                this.state.address.chainId,
-                destination.chainId,
-              ),
+            const { forwardOpts, ...rest } = opts ?? {};
+
+            // throws if route is not determinable
+            const route = chainHub.makeTransferRoute(
+              destination,
+              denomAmount,
+              'agoric',
+              forwardOpts,
             );
+            trace('got transfer route', route);
 
             // set a `timeoutTimestamp` if caller does not supply either `timeoutHeight` or `timeoutTimestamp`
             // TODO #9324 what's a reasonable default? currently 5 minutes
@@ -700,23 +698,22 @@ export const prepareLocalOrchestrationAccountKit = (
               opts?.timeoutTimestamp ??
               (opts?.timeoutHeight
                 ? 0n
-                : E(timestampHelper).getTimeoutTimestampNS());
+                : asVow(() => E(timestampHelper).getTimeoutTimestampNS()));
 
             // don't resolve the vow until the transfer is confirmed on remote
             // and reject vow if the transfer fails for any reason
             const resultV = watch(
-              allVows([connectionInfoV, timeoutTimestampVowOrValue]),
+              timeoutTimestampVowOrValue,
               this.facets.transferWatcher,
               {
-                opts,
-                amount: coerceDenomAmount(chainHub, amount),
-                destination,
+                opts: rest,
+                route,
               },
             );
             return resultV;
           });
         },
-        /** @type {HostOf<OrchestrationAccountI['transferSteps']>} */
+        /** @type {HostOf<OrchestrationAccountCommon['transferSteps']>} */
         transferSteps(amount, msg) {
           return asVow(() => {
             console.log('transferSteps got', amount, msg);

package/src/exos/orchestrator.d.ts

@@ -10,10 +10,8 @@ export function prepareOrchestrator(zone: Zone, powers: {
     makeRemoteChainFacade: MakeRemoteChainFacade;
     vowTools: VowTools;
 }): () => import("@endo/exo").Guarded<{
-    /** @type {HostOf<Orchestrator['getChain']>} */
     getChain(chainName: string): Vow<HostInterface<Chain<any>>>;
-    /** @type {HostOf<Orchestrator['getDenomInfo']>} */
-    getDenomInfo(denom: string): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "celestia" | "cosmoshub" | "dydx" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee", "agoric" | "celestia" | "cosmoshub" | "dydx" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee">>;
+    getDenomInfo(denom: string, srcChainName: "agoric" | "celestia" | "dydx" | "juno" | "neutron" | "noble" | "stride" | "umee" | "cosmoshub" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "celestia" | "dydx" | "juno" | "neutron" | "noble" | "stride" | "umee" | "cosmoshub" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze", "agoric" | "celestia" | "dydx" | "juno" | "neutron" | "noble" | "stride" | "umee" | "cosmoshub" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze">>;
     /** @type {HostOf<Orchestrator['asAmount']>} */
     asAmount: HostOf<Orchestrator["asAmount"]>;
 }>;
@@ -54,9 +52,11 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
          */
         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;
                 }>>;
@@ -87,7 +87,7 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
          */
         onFulfilled([_agoricChainInfo, remoteChainInfo, connectionInfo]: [ChainInfo, ChainInfo, IBCConnectionInfo], name: string): import("@endo/exo").Guarded<{
             getChainInfo(): Vow<any>;
-            makeAccount(): Vow<HostInterface<import("../orchestration-api.js").OrchestrationAccountI> | HostInterface<import("../orchestration-api.js").OrchestrationAccountI & import("../cosmos-api.js").LocalAccountMethods> | HostInterface<import("../orchestration-api.js").OrchestrationAccountI & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries> | HostInterface<import("../orchestration-api.js").OrchestrationAccountI & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries & import("../cosmos-api.js").LocalAccountMethods>>;
+            makeAccount(): Vow<HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").LocalAccountMethods> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries>>;
             query(msgs: {
                 data: string;
                 path: string;
@@ -113,10 +113,8 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
         }>;
     };
     orchestrator: {
-        /** @type {HostOf<Orchestrator['getChain']>} */
         getChain(chainName: string): Vow<HostInterface<Chain<any>>>;
-        /** @type {HostOf<Orchestrator['getDenomInfo']>} */
-        getDenomInfo(denom: string): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "celestia" | "cosmoshub" | "dydx" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee", "agoric" | "celestia" | "cosmoshub" | "dydx" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee">>;
+        getDenomInfo(denom: string, srcChainName: "agoric" | "celestia" | "dydx" | "juno" | "neutron" | "noble" | "stride" | "umee" | "cosmoshub" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "celestia" | "dydx" | "juno" | "neutron" | "noble" | "stride" | "umee" | "cosmoshub" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze", "agoric" | "celestia" | "dydx" | "juno" | "neutron" | "noble" | "stride" | "umee" | "cosmoshub" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze">>;
         /** @type {HostOf<Orchestrator['asAmount']>} */
         asAmount: HostOf<Orchestrator["asAmount"]>;
     };

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;AA2II,0CARI,IAAI,UACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;IA1DI,+CAA+C;;IAsB/C,mDAAmD;;IAqBnD,+CAA+C;cAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;GAoBlD;;;;;+BAMY,UAAU,CAClB,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BA7KG,mBAAmB;8BACE,gBAAgB;0CASrB,yBAAyB;2CACxB,0BAA0B;8BARlC,aAAa;2BASuB,aAAa;mCAVzB,oBAAoB;yBAC5C,aAAa;kCASuB,aAAa;4BAVzB,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;IAwCE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;0HADQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;QASjB,+CAA+C;;QAsB/C,mDAAmD;;QAqBnD,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCArJ2C,gBAAgB;uCAWQ,aAAa;+BAAb,aAAa"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AAiCA,0BAA0B;AAC1B;;;;GAIG;AAiJI,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;0BAnLG,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;IAwCE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;0HADQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0DjB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCA3J2C,gBAAgB;uCAWqB,aAAa;+BAAb,aAAa"}

package/src/exos/orchestrator.js

@@ -25,7 +25,7 @@ import {
  * @import {CosmosInterchainService} from './exo-interfaces.js';
  * @import {MakeLocalChainFacade} from './local-chain-facade.js';
  * @import {MakeRemoteChainFacade} from './remote-chain-facade.js';
- * @import {Chain, ChainInfo, IBCConnectionInfo, Orchestrator} from '../types.js';
+ * @import {Chain, ChainInfo, IBCConnectionInfo, KnownChains, Orchestrator} from '../types.js';
  */
 
 const { Vow$ } = NetworkShape; // TODO #9611
@@ -34,7 +34,7 @@ const trace = makeTracer('Orchestrator');
 /** @see {Orchestrator} */
 export const OrchestratorI = M.interface('Orchestrator', {
   getChain: M.call(M.string()).returns(Vow$(ChainInfoShape)),
-  getDenomInfo: M.call(DenomShape).returns(DenomInfoShape),
+  getDenomInfo: M.call(DenomShape, M.string()).returns(DenomInfoShape),
   asAmount: M.call(DenomAmountShape).returns(AmountShape),
 });
 
@@ -138,8 +138,8 @@ const prepareOrchestratorKit = (
           });
         },
         /** @type {HostOf<Orchestrator['getDenomInfo']>} */
-        getDenomInfo(denom) {
-          const denomDetail = chainHub.getAsset(denom);
+        getDenomInfo(denom, holdingChainName) {
+          const denomDetail = chainHub.getAsset(denom, holdingChainName);
           if (!denomDetail) throw Fail`No denom detail for ${q(denom)}`;
           const { chainName, baseName, baseDenom, brand } = denomDetail;
           chainByName.has(chainName) ||
@@ -148,14 +148,20 @@ const prepareOrchestratorKit = (
           if (maybeChain.pending) {
             throw Fail`wait until getChain(${q(chainName)}) completes before getDenomInfo(${q(denom)})`;
           }
-          const chain = maybeChain.value;
+          const chain =
+            /** @type {HostInterface<Chain<KnownChains[keyof KnownChains]>>} */ (
+              maybeChain.value
+            );
           chainByName.has(baseName) ||
             Fail`use getChain(${q(baseName)}) before getDenomInfo(${q(denom)})`;
           const maybeBase = chainByName.get(baseName);
           if (maybeBase.pending) {
             throw Fail`wait until getChain(${q(baseName)}) completes before getDenomInfo(${q(denom)})`;
           }
-          const base = maybeBase.value;
+          const base =
+            /** @type {HostInterface<Chain<KnownChains[keyof KnownChains]>>} */ (
+              maybeBase.value
+            );
           return harden({ chain, base, brand, baseDenom });
         },
         /** @type {HostOf<Orchestrator['asAmount']>} */

package/src/exos/packet-tools.d.ts

@@ -10,14 +10,9 @@ export function preparePacketTools(zone: import("@agoric/base-zone").Zone, vowTo
      * @param {ERef<TargetApp>} monitor
      */
     monitorTransfers(monitor: ERef<TargetApp>): Promise<import("@endo/exo").Guarded<{
-        /** @type {TargetRegistration['updateTargetApp']} */
         updateTargetApp(targetApp: ERef<TargetApp>): Promise<void>;
-        /** @type {TargetRegistration['revoke']} */
         revoke(): Promise<void>;
     }>>;
-    /**
-     * @type {MatchEvent}
-     */
     matchFirstPacket(pattern: EVow<Pattern>): Vow<{
         resolver: VowResolver<any>;
         match: Vow<any>;
@@ -27,7 +22,7 @@ export function preparePacketTools(zone: import("@agoric/base-zone").Zone, vowTo
      * @param {PacketOptions} [opts]
      * @returns {Vow<any>}
      */
-    sendThenWaitForAck(packetSender: Remote<PacketSender>, opts?: PacketOptions | undefined): Vow<any>;
+    sendThenWaitForAck(packetSender: Remote<PacketSender>, opts?: PacketOptions): Vow<any>;
 }>;
 export type MatchEvent = (pattern: EVow<Pattern>) => Vow<{
     resolver: VowResolver<any>;

package/src/exos/packet-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packet-tools.d.ts","sourceRoot":"","sources":["packet-tools.js"],"names":[],"mappings":"AA2DO,yCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;;;;;;;;IAiFX;;OAEG;8BADQ,IAAI,CAAC,SAAS,CAAC;QAqD1B,oDAAoD;;QAMpD,2CAA2C;;;IAjD3C;;OAEG;8BA/HA,KAAK,OAAO,CAAC,GACX,IAAI;QAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;QAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;IAsIzD;;;;OAIG;qCAHQ,OAAO,YAAY,CAAC,qCAElB,IAAI,GAAG,CAAC;GA4M5B;mCAtVU,KAAK,OAAO,CAAC,KACX,IAAI;IAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;IAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;CAAE,CAAC;;gBAKnD,CACT,IAAI,EAAE,aAAa,KAChB,IAAI;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;;;;;;4BAU5C,IAAI,CAChB,OAAW,eAAe,EAAE,qBAAqB,EACjD,eAAmB,GAAG,kBAAkB,CACrC;0BAqUS,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;8BAjWZ,aAAa;6BAD9C,gBAAgB;+BAGM,mCAAmC;wCAAnC,mCAAmC;0BAFxB,aAAa;iCAAb,aAAa;yBAAb,aAAa;4BAAb,aAAa"}
+{"version":3,"file":"packet-tools.d.ts","sourceRoot":"","sources":["packet-tools.js"],"names":[],"mappings":"AA2DO,yCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;;;;;;;;IAiFX;;OAEG;8BADQ,IAAI,CAAC,SAAS,CAAC;;;;8BAnHvB,KAAK,OAAO,CAAC,GACX,IAAI;QAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;QAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;IAsIzD;;;;OAIG;qCAHQ,OAAO,YAAY,CAAC,SACpB,aAAa,GACX,IAAI,GAAG,CAAC;GAwM5B;mCAlVU,KAAK,OAAO,CAAC,KACX,IAAI;IAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;IAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;CAAE,CAAC;;gBAKnD,CACT,IAAI,EAAE,aAAa,KAChB,IAAI;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;;;;;;4BAU5C,IAAI,CAChB,OAAW,eAAe,EAAE,qBAAqB,EACjD,eAAmB,GAAG,kBAAkB,CACrC;0BAiUS,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;8BA7VZ,aAAa;6BAD9C,gBAAgB;+BAGM,mCAAmC;wCAAnC,mCAAmC;0BAFxB,aAAa;iCAAb,aAAa;yBAAb,aAAa;4BAAb,aAAa"}

package/src/exos/packet-tools.js

@@ -126,7 +126,7 @@ export const preparePacketTools = (zone, vowTools) => {
       const resolverToPattern = zone.detached().mapStore('resolverToPattern');
       return {
         lca,
-        reg: /** @type {Remote<TargetRegistration> | null} */ (null),
+        reg: /** @type {Vow<TargetRegistration> | null} */ (null),
         resolverToPattern,
         upcallQueue: /** @type {any[] | null} */ (null),
         pending: 0,
@@ -327,23 +327,19 @@ export const preparePacketTools = (zone, vowTools) => {
           }
           this.state.pending = 0;
           this.state.upcallQueue = null;
-          // FIXME when it returns undefined this causes an error:
-          // In "unsubscribeFromTransfers" method of (PacketToolsKit utils): result: undefined "[undefined]" - Must be a promise
           return watch(this.facets.utils.unsubscribeFromTransfers());
         },
         subscribeToTransfers() {
           // Subscribe to the transfers for this account.
-          const { lca, reg } = this.state;
-          if (reg) {
-            return when(reg);
+          const { lca, reg: cachedReg } = this.state;
+          if (cachedReg) {
+            return when(cachedReg);
           }
+          // Atomically update the registration.
           const { tap } = this.facets;
-          // XXX racy; fails if subscribeToTransfers is called while this promise is in flight
-          // e.g. 'Target "agoric1fakeLCAAddress" already registered'
-          return when(E(lca).monitorTransfers(tap), r => {
-            this.state.reg = r;
-            return r;
-          });
+          const reg = watch(E(lca).monitorTransfers(tap));
+          this.state.reg = reg;
+          return when(reg);
         },
         unsubscribeFromTransfers() {
           const { reg, monitor } = this.state;

package/src/exos/portfolio-holder-kit.d.ts

@@ -23,7 +23,7 @@ declare function preparePortfolioHolderKit(zone: Zone, { asVow, when }: VowTools
          * @param {IA} [invitationArgs]
          * @returns {Promise<Invitation<unknown, IA>>}
          */
-        Proxying<IA extends unknown[]>(chainName: string, action: string, invitationArgs?: IA | undefined): Promise<Invitation<unknown, IA>>;
+        Proxying<IA extends unknown[]>(chainName: string, action: string, invitationArgs?: IA): Promise<Invitation<unknown, IA>>;
     };
     holder: {
         asContinuingOffer(): import("@agoric/vow").Vow<{
@@ -38,7 +38,7 @@ declare function preparePortfolioHolderKit(zone: Zone, { asVow, when }: VowTools
                  * @param {IA} [invitationArgs]
                  * @returns {Promise<Invitation<unknown, IA>>}
                  */
-                Proxying<IA extends unknown[]>(chainName: string, action: string, invitationArgs?: IA | undefined): Promise<Invitation<unknown, IA>>;
+                Proxying<IA extends unknown[]>(chainName: string, action: string, invitationArgs?: IA): Promise<Invitation<unknown, IA>>;
             }>;
         }>;
         getPublicTopics(): import("@agoric/vow").Vow<{
@@ -53,13 +53,13 @@ declare function preparePortfolioHolderKit(zone: Zone, { asVow, when }: VowTools
         /**
          * @param {string} chainName key where the account is stored
          */
-        getAccount(chainName: string): import("@agoric/vow").Vow<HostInterface<OrchestrationAccountI>>;
+        getAccount(chainName: string): import("@agoric/vow").Vow<HostInterface<OrchestrationAccountCommon>>;
     };
 }>;
 import type { OrchestrationAccount } from '@agoric/orchestration';
 import type { HostInterface } from '@agoric/async-flow';
 import type { MapStore } from '@agoric/store';
 import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
-import type { OrchestrationAccountI } from '@agoric/orchestration';
+import type { OrchestrationAccountCommon } from '@agoric/orchestration';
 export {};
 //# sourceMappingURL=portfolio-holder-kit.d.ts.map

package/src/exos/portfolio-holder-kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portfolio-holder-kit.d.ts","sourceRoot":"","sources":["portfolio-holder-kit.js"],"names":[],"mappings":"AAgOO,6CANI,IAAI,YACJ,QAAQ,GACN,CACZ,GAAO,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,KAC9D,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAKzE;mCAhNY;IACR,QAAQ,EAAE,SAAS,MAAM,EAAE,cAAc,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC;IACrE,YAAY,EAAE,SAAS,MAAM,EAAE,oBAAoB,OAAO,CAAC,CAAC,CAAC;CAC9D;kCA8MU,UAAU,CAAC,OAAO,sBAAsB,CAAC;8BACzC,UAAU,CAAC,mBAAmB,CAAC;0BAvNtB,cAAc;8BAFV,aAAa;AAqBxC;;;;;;GAMG;AACH,iDAHW,IAAI,mBACJ,QAAQ;;QAkDX;;;;;;WAMG;iBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,oCAEJ,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;;;gBAL7C;;;;;;mBAMG;yBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,oCAEJ,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;QA+B7C;;;;WAIG;8BAHQ,MAAM,WACN,cAAc,qBAAqB,GAAG,CAAC,CAAC,eACxC,oBAAoB,OAAO,CAAC;QAgBvC;;WAEG;8BADQ,MAAM;;GAQxB;0CAzI0F,uBAAuB;mCAL1E,oBAAoB;8BACjC,eAAe;yCAEJ,2CAA2C;2CAEU,uBAAuB"}
+{"version":3,"file":"portfolio-holder-kit.d.ts","sourceRoot":"","sources":["portfolio-holder-kit.js"],"names":[],"mappings":"AAgOO,6CANI,IAAI,YACJ,QAAQ,GACN,CACZ,GAAO,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,KAC9D,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAKzE;mCAhNY;IACR,QAAQ,EAAE,SAAS,MAAM,EAAE,cAAc,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC;IACrE,YAAY,EAAE,SAAS,MAAM,EAAE,oBAAoB,OAAO,CAAC,CAAC,CAAC;CAC9D;kCA8MU,UAAU,CAAC,OAAO,sBAAsB,CAAC;8BACzC,UAAU,CAAC,mBAAmB,CAAC;0BAvNtB,cAAc;8BAFV,aAAa;AAqBxC;;;;;;GAMG;AACH,iDAHW,IAAI,mBACJ,QAAQ;;QAkDX;;;;;;WAMG;iBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;;;gBAL7C;;;;;;mBAMG;yBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;QA+B7C;;;;WAIG;8BAHQ,MAAM,WACN,cAAc,qBAAqB,GAAG,CAAC,CAAC,eACxC,oBAAoB,OAAO,CAAC;QAgBvC;;WAEG;8BADQ,MAAM;;GAQxB;0CAzI+F,uBAAuB;mCAL/E,oBAAoB;8BACjC,eAAe;yCAEJ,2CAA2C;gDAEe,uBAAuB"}

package/src/exos/portfolio-holder-kit.js

@@ -13,7 +13,7 @@ const { fromEntries } = Object;
  * @import {VowTools} from '@agoric/vow';
  * @import {ResolvedPublicTopic} from '@agoric/zoe/src/contractSupport/topics.js';
  * @import {Zone} from '@agoric/zone';
- * @import {OrchestrationAccount, OrchestrationAccountI, MakeCombineInvitationMakers} from '@agoric/orchestration';
+ * @import {OrchestrationAccount, OrchestrationAccountCommon, MakeCombineInvitationMakers} from '@agoric/orchestration';
  */
 
 /**

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

@@ -1,20 +1,15 @@
 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;
     }>>;
 }>, connectionInfo: IBCConnectionInfo) => import("@endo/exo").Guarded<{
-    /** @type {HostOf<Chain['getChainInfo']>} */
     getChainInfo(): Vow<any>;
-    /** @type {HostOf<Chain['makeAccount']>} */
-    makeAccount(): Vow<import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountI> | import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountI & import("../cosmos-api.js").LocalAccountMethods> | import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountI & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries> | import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountI & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries & import("../cosmos-api.js").LocalAccountMethods>>;
-    /**
-     * @type {HostOf<
-     *   Chain<CosmosChainInfo & { icqEnabled: true }>['query']
-     * >}
-     */
+    makeAccount(): Vow<import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon> | import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods> | 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 & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries>>;
     query(msgs: {
         data: string;
         path: string;

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":"AAqQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;IA7I1B,4CAA4C;;IAK5C,2CAA2C;;IA0B3C;;;;OAIG;;;;;;;;;;;;;;;;;;;;;;;GA+GV;sCA1OY;IACR,8BAA8B,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACF,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,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;oCA6NU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA7PxB,mBAAmB;uCAS2D,aAAa;yBAJlF,aAAa;uDAGO,mCAAmC;6CAD7C,qBAAqB;4BAHtC,kBAAkB;kCADZ,cAAc;8BAEb,aAAa;qCAIwD,aAAa;mCAAb,aAAa"}
+{"version":3,"file":"remote-chain-facade.d.ts","sourceRoot":"","sources":["remote-chain-facade.js"],"names":[],"mappings":"AAmQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAKjC;sCAxOY;IACR,8BAA8B,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACF,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,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;oCA2NU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA3PxB,mBAAmB;uCAS2D,aAAa;yBAJlF,aAAa;uDAGO,mCAAmC;6CAD7C,qBAAqB;4BAHtC,kBAAkB;kCADZ,cAAc;8BAEb,aAAa;qCAIwD,aAAa;mCAAb,aAAa"}

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

@@ -125,8 +125,6 @@ const prepareRemoteChainFacadeKit = (
         makeAccount() {
           return asVow(() => {
             const { remoteChainInfo, connectionInfo } = this.state;
-            const stakingDenom = remoteChainInfo.stakingTokens?.[0]?.denom;
-            if (!stakingDenom) throw Fail`chain info lacks staking denom`;
 
             // icqConnection is ultimately retrieved from state, but let's
             // create a connection if it doesn't exist

package/src/facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facade.d.ts","sourceRoot":"","sources":["facade.js"],"names":[],"mappings":"AAyCO,sKAZI;IACN,IAAI,EAAE,IAAI,CAAC;IACX,YAAY,EAAE,OAAO,YAAY,CAAC,CAAC;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACtD,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;IACzC,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,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;qBAmCM,EAAE,SAAvB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAE,EAG5B,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;EAgCxD;;;;yBAjIgC,EAAE,SAAtB,iBAAmB,IACnB,EAAE,SAAS,CACnB,GAAG,EAAE,YAAY,EACjB,GAAG,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;kCA4HE,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BAhJjC,cAAc;kCAEN,cAAc;4BAGpB,kBAAkB;6CACD,0BAA0B;qCAHrB,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":"AAyCO,sKAZI;IACN,IAAI,EAAE,IAAI,CAAC;IACX,YAAY,EAAE,OAAO,YAAY,CAAC,CAAC;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACtD,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;IACzC,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,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;qBAmCM,EAAE,SAAvB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAE,EAG5B,GAAG,SAFI;QACZ,CAAK,WAAW,EAAE,MAAM,GAAG,kBAAkB,eAAe,EAAE,CAAC,CAAC,CAAC;KAC7D,YAEM,GAAG,WACH,EAAE,KACA,GAAG,CAAC,IAAI,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAE;EA+BxD;;;;yBAhIgC,EAAE,SAAtB,iBAAmB,IACnB,EAAE,SAAS,CACnB,GAAG,EAAE,YAAY,EACjB,GAAG,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;kCA2HE,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BA/IjC,cAAc;kCAEN,cAAc;4BAGpB,kBAAkB;6CACD,0BAA0B;qCAHrB,6CAA6C;sCACzD,wBAAwB;8BAH3B,aAAa;oCAFsB,oBAAoB;oCAApB,oBAAoB;uCAQuC,YAAY;kCAAZ,YAAY;8BARvE,oBAAoB;yBAEvD,aAAa"}

package/src/facade.js

@@ -119,7 +119,6 @@ export const makeOrchestrationFacade = ({
     const mappedFlows = new Map(
       Object.entries(guestFns).map(([name, guestFn]) => [
         guestFn,
-        // eslint-disable-next-line no-use-before-define
         (...args) => orcFns[name](...args),
       ]),
     );