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

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

@@ -33,16 +33,19 @@ import { maxClockSkew, tryDecodeResponse } from '../utils/cosmos.js';
 import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
 
 /**
+ * @import {HostOf} from '@agoric/async-flow';
  * @import {AmountArg, IcaAccount, ChainAddress, CosmosValidatorAddress, ICQConnection, StakingAccountActions, DenomAmount, OrchestrationAccountI, DenomArg} from '../types.js';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  * @import {Coin} from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
  * @import {Delegation} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
  * @import {Remote} from '@agoric/internal';
+ * @import {InvitationMakers} from '@agoric/smart-wallet/src/types.js';
  * @import {TimerService} from '@agoric/time';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
  * @import {ResponseQuery} from '@agoric/cosmic-proto/tendermint/abci/types.js';
  * @import {JsonSafe} from '@agoric/cosmic-proto';
+ * @import {Matcher} from '@endo/patterns';
  */
 
 const trace = makeTracer('ComosOrchestrationAccountHolder');
@@ -81,7 +84,7 @@ export const IcaAccountHolderI = M.interface('IcaAccountHolder', {
   undelegate: M.call(M.arrayOf(DelegationShape)).returns(VowShape),
 });
 
-/** @type {{ [name: string]: [description: string, valueShape: Pattern] }} */
+/** @type {{ [name: string]: [description: string, valueShape: Matcher] }} */
 const PUBLIC_TOPICS = {
   account: ['Staking Account holder status', M.any()],
 };
@@ -158,7 +161,6 @@ export const prepareCosmosOrchestrationAccountKit = (
     (chainAddress, bondDenom, io) => {
       const { storageNode, ...rest } = io;
       // must be the fully synchronous maker because the kit is held in durable state
-      // @ts-expect-error XXX Patterns
       const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
       // TODO determine what goes in vstorage https://github.com/Agoric/agoric-sdk/issues/9066
       void E(topicKit.recorder).write('');
@@ -309,12 +311,18 @@ export const prepareCosmosOrchestrationAccountKit = (
         },
       },
       holder: {
+        /** @type {HostOf<OrchestrationAccountI['asContinuingOffer']>} */
         asContinuingOffer() {
           // getPublicTopics resolves promptly (same run), so we don't need a watcher
           // eslint-disable-next-line no-restricted-syntax
           return asVow(async () => {
             await null;
-            const { holder, invitationMakers } = this.facets;
+            const { holder, invitationMakers: im } = this.facets;
+            // XXX cast to a type that has string index signature
+            const invitationMakers = /** @type {InvitationMakers} */ (
+              /** @type {unknown} */ (im)
+            );
+
             return harden({
               // getPublicTopics returns a vow, for membrane compatibility.
               // it's safe to unwrap to a promise and get the result as we
@@ -325,6 +333,7 @@ export const prepareCosmosOrchestrationAccountKit = (
             });
           });
         },
+        /** @type {HostOf<OrchestrationAccountI['getPublicTopics']>} */
         getPublicTopics() {
           // getStoragePath resolves promptly (same run), so we don't need a watcher
           // eslint-disable-next-line no-restricted-syntax
@@ -341,18 +350,11 @@ export const prepareCosmosOrchestrationAccountKit = (
           });
         },
 
-        // TODO move this beneath the Orchestration abstraction,
-        // to the OrchestrationAccount provided by makeAccount()
-        /** @returns {ChainAddress} */
+        /** @type {HostOf<OrchestrationAccountI['getAddress']>} */
         getAddress() {
           return this.state.chainAddress;
         },
-        /**
-         * _Assumes users has already sent funds to their ICA, until #9193
-         *
-         * @param {CosmosValidatorAddress} validator
-         * @param {AmountArg} amount
-         */
+        /** @type {HostOf<StakingAccountActions['delegate']>} */
         delegate(validator, amount) {
           return asVow(() => {
             trace('delegate', validator, amount);
@@ -371,17 +373,12 @@ export const prepareCosmosOrchestrationAccountKit = (
             return watch(results, this.facets.returnVoidWatcher);
           });
         },
+        /** @type {HostOf<OrchestrationAccountI['getBalances']>} */
         getBalances() {
           // TODO https://github.com/Agoric/agoric-sdk/issues/9610
           return asVow(() => Fail`not yet implemented`);
         },
-        /**
-         * _Assumes users has already sent funds to their ICA, until #9193
-         *
-         * @param {CosmosValidatorAddress} srcValidator
-         * @param {CosmosValidatorAddress} dstValidator
-         * @param {AmountArg} amount
-         */
+        /** @type {HostOf<StakingAccountActions['redelegate']>} */
         redelegate(srcValidator, dstValidator, amount) {
           return asVow(() => {
             trace('redelegate', srcValidator, dstValidator, amount);
@@ -406,10 +403,7 @@ export const prepareCosmosOrchestrationAccountKit = (
             );
           });
         },
-        /**
-         * @param {CosmosValidatorAddress} validator
-         * @returns {Vow<DenomAmount[]>}
-         */
+        /** @type {HostOf<StakingAccountActions['withdrawReward']>} */
         withdrawReward(validator) {
           return asVow(() => {
             trace('withdrawReward', validator);
@@ -425,10 +419,7 @@ export const prepareCosmosOrchestrationAccountKit = (
             return watch(results, this.facets.withdrawRewardWatcher);
           });
         },
-        /**
-         * @param {DenomArg} denom
-         * @returns {Vow<DenomAmount>}
-         */
+        /** @type {HostOf<OrchestrationAccountI['getBalance']>} */
         getBalance(denom) {
           return asVow(() => {
             const { chainAddress, icqConnection } = this.state;
@@ -450,26 +441,30 @@ export const prepareCosmosOrchestrationAccountKit = (
           });
         },
 
+        /** @type {HostOf<OrchestrationAccountI['send']>} */
         send(toAccount, amount) {
           console.log('send got', toAccount, amount);
           return asVow(() => Fail`not yet implemented`);
         },
 
+        /** @type {HostOf<OrchestrationAccountI['transfer']>} */
         transfer(amount, msg) {
           console.log('transferSteps got', amount, msg);
           return asVow(() => Fail`not yet implemented`);
         },
 
+        /** @type {HostOf<OrchestrationAccountI['transferSteps']>} */
         transferSteps(amount, msg) {
           console.log('transferSteps got', amount, msg);
           return asVow(() => Fail`not yet implemented`);
         },
 
+        /** @type {HostOf<StakingAccountActions['withdrawRewards']>} */
         withdrawRewards() {
           return asVow(() => Fail`Not Implemented. Try using withdrawReward.`);
         },
 
-        /** @param {Omit<Delegation, 'delegatorAddress'>[]} delegations */
+        /** @type {HostOf<StakingAccountActions['undelegate']>} */
         undelegate(delegations) {
           return asVow(() => {
             trace('undelegate', delegations);

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

@@ -22,51 +22,35 @@ export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowe
                 denom: string;
             }>>;
         }>>;
-        /** @returns {Vow<PromiseToVow<OrchestrationAccount<ChainInfo>>>} */
-        makeAccount(): Vow<PromiseToVow<OrchestrationAccount<ChainInfo>>>;
+        /** @returns {Vow<LocalOrchestrationAccountKit['holder']>} */
+        makeAccount(): Vow<LocalOrchestrationAccountKit["holder"]>;
     };
     makeAccountWatcher: {
         /**
          * @param {[LocalChainAccount, ChainAddress['value']]} results
          */
         onFulfilled([account, address]: [LocalChainAccount, ChainAddress["value"]]): Vow<import("@endo/exo").Guarded<{
-            asContinuingOffer(): Vow<{
-                publicSubscribers: {
-                    account: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
-                        storagePath: string;
-                    };
-                };
-                invitationMakers: import("@endo/exo").Guarded<{
-                    Delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<Record<unknown, unknown>>, undefined>>;
-                    Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<import("@agoric/time").TimestampRecord>, undefined>>;
-                    CloseAccount(): never;
-                }>;
-                holder: import("@endo/exo").Guarded<any>;
-            }>;
-            getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount>;
-            getBalances(): Vow<never>;
-            getPublicTopics(): Vow<{
-                account: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
-                    storagePath: string;
-                };
-            }>;
+            asContinuingOffer(): Vow<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & import("../utils/zoe-tools.js").ResolvedContinuingOfferResult : import("@agoric/async-flow").HostInterface<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>>;
+            getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount>>;
+            getBalances(): Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
+            getPublicTopics(): Vow<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> : import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
             delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<Record<unknown, unknown>>;
             undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<void | import("@agoric/time").TimestampRecord>;
-            deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>;
-            withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">>>;
+            deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount> extends import("@endo/pass-style").Passable ? import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount> : import("@agoric/async-flow").HostInterface<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>>;
+            withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">> extends import("@endo/pass-style").Passable ? globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">> : import("@agoric/async-flow").HostInterface<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">>>>;
             executeTx(messages: {
                 '@type': string;
             }[]): Vow<import("@agoric/cosmic-proto").JsonSafe<{
                 '@type': string;
-            }>[]>;
+            }>[] extends import("@endo/pass-style").Passable ? import("@agoric/cosmic-proto").JsonSafe<{
+                '@type': string;
+            }>[] : import("@agoric/async-flow").HostInterface<import("@agoric/cosmic-proto").JsonSafe<{
+                '@type': string;
+            }>[]>>;
             getAddress(): ChainAddress;
             send(toAccount: any, amount: any): Vow<never>;
             transfer(amount: import("../orchestration-api.js").AmountArg, destination: ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Vow<void>;
-            transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void>;
+            transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
         }>>;
     };
     makeChildNodeWatcher: {
@@ -81,43 +65,27 @@ export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowe
             account: LocalChainAccount;
             address: ChainAddress["value"];
         }): import("@endo/exo").Guarded<{
-            asContinuingOffer(): Vow<{
-                publicSubscribers: {
-                    account: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
-                        storagePath: string;
-                    };
-                };
-                invitationMakers: import("@endo/exo").Guarded<{
-                    Delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<Record<unknown, unknown>>, undefined>>;
-                    Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<import("@agoric/time").TimestampRecord>, undefined>>;
-                    CloseAccount(): never;
-                }>;
-                holder: import("@endo/exo").Guarded<any>;
-            }>;
-            getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount>;
-            getBalances(): Vow<never>;
-            getPublicTopics(): Vow<{
-                account: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("./local-orchestration-account.js").LocalChainAccountNotification>;
-                    storagePath: string;
-                };
-            }>;
+            asContinuingOffer(): Vow<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & import("../utils/zoe-tools.js").ResolvedContinuingOfferResult : import("@agoric/async-flow").HostInterface<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>>;
+            getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount>>;
+            getBalances(): Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
+            getPublicTopics(): Vow<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> : import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
             delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<Record<unknown, unknown>>;
             undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Vow<void | import("@agoric/time").TimestampRecord>;
-            deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>;
-            withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">>>;
+            deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount> extends import("@endo/pass-style").Passable ? import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount> : import("@agoric/async-flow").HostInterface<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>>;
+            withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">> extends import("@endo/pass-style").Passable ? globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">> : import("@agoric/async-flow").HostInterface<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">>>>;
             executeTx(messages: {
                 '@type': string;
             }[]): Vow<import("@agoric/cosmic-proto").JsonSafe<{
                 '@type': string;
-            }>[]>;
+            }>[] extends import("@endo/pass-style").Passable ? import("@agoric/cosmic-proto").JsonSafe<{
+                '@type': string;
+            }>[] : import("@agoric/async-flow").HostInterface<import("@agoric/cosmic-proto").JsonSafe<{
+                '@type': string;
+            }>[]>>;
             getAddress(): ChainAddress;
             send(toAccount: any, amount: any): Vow<never>;
             transfer(amount: import("../orchestration-api.js").AmountArg, destination: ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Vow<void>;
-            transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void>;
+            transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
         }>;
     };
 }>>["public"];
@@ -133,9 +101,7 @@ export type MakeLocalChainFacade = ReturnType<typeof prepareLocalChainFacade>;
 import type { Zone } from '@agoric/base-zone';
 import type { IBCConnectionInfo } from '../types.js';
 import type { Vow } from '@agoric/vow';
-import type { ChainInfo } from '../types.js';
-import type { OrchestrationAccount } from '../types.js';
-import type { PromiseToVow } from '../types.js';
+import type { LocalOrchestrationAccountKit } from './local-orchestration-account.js';
 import type { LocalChainAccount } from '@agoric/vats/src/localchain.js';
 import type { ChainAddress } from '../types.js';
 import type { Remote } from '@agoric/internal';

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":"AAkIO,8CAHI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;QAtDzB,oEAAoE;uBAAtD,IAAI,aAAa,qBAAqB,SAAS,CAAC,CAAC,CAAC;;;QAchE;;WAEG;wCADQ,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWrD;;;;;;WAMG;+BALQ,OAAO,WAAW,CAAC,wBACnB;YACV,OAAW,EAAE,iBAAiB,CAAC;YAC/B,OAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;SAChC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA4BX;qCAjHY;IACZ,gCAAoC,EAAE,gCAAgC,CAAC;IACvE,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;CACpB;mCA6GU,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BA/HjC,mBAAmB;uCAOwE,aAAa;yBAH/F,aAAa;+BAGqE,aAAa;0CAAb,aAAa;kCAAb,aAAa;uCAJ/E,gCAAgC;kCAIkC,aAAa;4BALtG,kBAAkB;sDAIQ,kCAAkC;6CAD3C,gCAAgC;kCAJ3C,cAAc;gCAEG,gCAAgC;8BAChD,aAAa"}
+{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AAiIO,8CAHI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;QArDzB,6DAA6D;uBAA/C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC;;;QAazD;;WAEG;wCADQ,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;QAWrD;;;;;;WAMG;+BALQ,OAAO,WAAW,CAAC,wBACnB;YACV,OAAW,EAAE,iBAAiB,CAAC;YAC/B,OAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;SAChC;;;;;;;;;;;;;;;;;;;;;;;;cA4BX;qCA9GY;IACZ,gCAAoC,EAAE,gCAAgC,CAAC;IACvE,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;CACpB;mCA0GU,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BA5HjC,mBAAmB;uCAO0D,aAAa;yBAHjF,aAAa;kDAEoC,kCAAkC;uCAHnE,gCAAgC;kCAIoB,aAAa;4BALxF,kBAAkB;sDAIsC,kCAAkC;6CADzE,gCAAgC;kCAJ3C,cAAc;gCAEG,gCAAgC;8BAChD,aAAa"}

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

@@ -1,5 +1,7 @@
 /** @file ChainAccount exo */
 import { E } from '@endo/far';
+// eslint-disable-next-line no-restricted-syntax -- just the import
+import { heapVowE } from '@agoric/vow/vat.js';
 import { M } from '@endo/patterns';
 import { pickFacet } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
@@ -13,8 +15,8 @@ import { ChainFacadeI } from '../typeGuards.js';
  * @import {LocalChain, LocalChainAccount} from '@agoric/vats/src/localchain.js';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {CosmosInterchainService} from './cosmos-interchain-service.js';
- * @import {MakeLocalOrchestrationAccountKit} from './local-orchestration-account.js';
- * @import {ChainAddress, ChainInfo, CosmosChainInfo, IBCConnectionInfo, OrchestrationAccount, PromiseToVow} from '../types.js';
+ * @import {LocalOrchestrationAccountKit, MakeLocalOrchestrationAccountKit} from './local-orchestration-account.js';
+ * @import {ChainAddress, ChainInfo, CosmosChainInfo, IBCConnectionInfo, OrchestrationAccount} from '../types.js';
  */
 
 /**
@@ -70,17 +72,14 @@ const prepareLocalChainFacadeKit = (
           return watch(this.state.localChainInfo);
         },
 
-        // FIXME parameterize on the remoteChainInfo to make()
-        // That used to work but got lost in the migration to Exo
-        /** @returns {Vow<PromiseToVow<OrchestrationAccount<ChainInfo>>>} */
+        /** @returns {Vow<LocalOrchestrationAccountKit['holder']>} */
         makeAccount() {
           const lcaP = E(localchain).makeAccount();
-          // TODO #9449 fix types
-          // @ts-expect-error Type 'Vow<Voidless>' is not assignable to type 'Vow<OrchestrationAccountI>'.
           return watch(
-            // TODO #9449 fix types
-            // @ts-expect-error Property 'getAddress' does not exist on type 'EMethods<Required<Guarded<{ getAddress()...
-            allVows([lcaP, E(lcaP).getAddress()]),
+            // XXX makeAccount returns a Promise for an exo but reserves being able to return a vow
+            // so we use heapVowE to shorten the promise path
+            // eslint-disable-next-line no-restricted-syntax -- will run in one turn
+            allVows([lcaP, heapVowE(lcaP).getAddress()]),
             this.facets.makeAccountWatcher,
           );
         },

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

@@ -88,43 +88,20 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
         onFulfilled(natAmount: Amount<"nat">, denom: DenomAmount["denom"]): DenomAmount;
     };
     holder: {
-        asContinuingOffer(): Vow<{
-            publicSubscribers: {
-                account: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<LocalChainAccountNotification>;
-                    storagePath: string;
-                };
-            };
-            invitationMakers: import("@endo/exo").Guarded<{
-                /**
-                 * @param {string} validatorAddress
-                 * @param {Amount<'nat'>} ertpAmount
-                 */
-                Delegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<Record<unknown, unknown>>, undefined>>;
-                /**
-                 * @param {string} validatorAddress
-                 * @param {Amount<'nat'>} ertpAmount
-                 */
-                Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<TimestampRecord>, undefined>>;
-                CloseAccount(): never;
-            }>;
-            holder: import("@endo/exo").Guarded<any>;
-        }>;
+        /** @type {HostOf<OrchestrationAccountI['asContinuingOffer']>} */
+        asContinuingOffer(): Vow<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & import("../utils/zoe-tools.js").ResolvedContinuingOfferResult : import("@agoric/async-flow").HostInterface<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>>;
         /**
          * TODO: balance lookups for non-vbank assets
          *
-         * @type {PromiseToVow<OrchestrationAccount<any>['getBalance']>}
+         * @type {HostOf<OrchestrationAccountI['getBalance']>}
          */
-        getBalance(denom: import("@agoric/orchestration").DenomArg): Vow<DenomAmount>;
-        getBalances(): Vow<never>;
-        getPublicTopics(): Vow<{
-            account: {
-                description: string;
-                subscriber: globalThis.Subscriber<LocalChainAccountNotification>;
-                storagePath: string;
-            };
-        }>;
+        getBalance(denom: import("@agoric/orchestration").DenomArg): Vow<DenomAmount extends import("@endo/pass-style").Passable ? DenomAmount : import("@agoric/async-flow").HostInterface<DenomAmount>>;
+        /** @type {HostOf<OrchestrationAccountI['getBalances']>} */
+        getBalances(): Vow<DenomAmount[] extends import("@endo/pass-style").Passable ? DenomAmount[] : import("@agoric/async-flow").HostInterface<DenomAmount[]>>;
+        /**
+         * @type {HostOf<OrchestrationAccountI['getPublicTopics']>}
+         */
+        getPublicTopics(): Vow<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> : import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
         /**
          * @param {string} validatorAddress
          * @param {Amount<'nat'>} ertpAmount
@@ -141,17 +118,21 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
          * updater will get a special notification that the account is being
          * transferred.
          */
-        /** @type {PromiseToVow<LocalChainAccount['deposit']>} */
-        deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>;
-        /** @type {PromiseToVow<LocalChainAccount['withdraw']>} */
-        withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">>>;
-        /** @type {PromiseToVow<LocalChainAccount['executeTx']>} */
+        /** @type {HostOf<LocalChainAccount['deposit']>} */
+        deposit(payment: globalThis.Payment<"nat">, optAmountShape?: globalThis.Pattern): Vow<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount> extends import("@endo/pass-style").Passable ? import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount> : import("@agoric/async-flow").HostInterface<import("@agoric/ertp/src/types.js").NatAmount | Vow<import("@agoric/ertp/src/types.js").NatAmount>>>;
+        /** @type {HostOf<LocalChainAccount['withdraw']>} */
+        withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">> extends import("@endo/pass-style").Passable ? globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">> : import("@agoric/async-flow").HostInterface<globalThis.Payment<"nat"> | Vow<globalThis.Payment<"nat">>>>;
+        /** @type {HostOf<LocalChainAccount['executeTx']>} */
         executeTx(messages: {
             '@type': string;
         }[]): Vow<JsonSafe<{
             '@type': string;
-        }>[]>;
-        /** @type {OrchestrationAccount<any>['getAddress']} */
+        }>[] extends import("@endo/pass-style").Passable ? JsonSafe<{
+            '@type': string;
+        }>[] : import("@agoric/async-flow").HostInterface<JsonSafe<{
+            '@type': string;
+        }>[]>>;
+        /** @type {OrchestrationAccountI['getAddress']} */
         getAddress(): ChainAddress;
         send(toAccount: any, amount: any): Vow<never>;
         /**
@@ -164,8 +145,8 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
          * @returns {Vow<void>}
          */
         transfer(amount: AmountArg, destination: ChainAddress, opts?: IBCMsgTransferOptions | undefined): Vow<void>;
-        /** @type {PromiseToVow<OrchestrationAccount<any>['transferSteps']>} */
-        transferSteps(amount: AmountArg, msg: import("@agoric/orchestration").TransferMsg): Vow<void>;
+        /** @type {HostOf<OrchestrationAccountI['transferSteps']>} */
+        transferSteps(amount: AmountArg, msg: import("@agoric/orchestration").TransferMsg): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
     };
 }>;
 export type LocalChainAccountNotification = {

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

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

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

@@ -19,14 +19,17 @@ import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
 import { makeTimestampHelper } from '../utils/time.js';
 
 /**
+ * @import {HostOf} from '@agoric/async-flow';
  * @import {LocalChainAccount} from '@agoric/vats/src/localchain.js';
- * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, OrchestrationAccount, ChainInfo, IBCConnectionInfo, PromiseToVow} from '@agoric/orchestration';
+ * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, OrchestrationAccount, ChainInfo, IBCConnectionInfo, OrchestrationAccountI} from '@agoric/orchestration';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'.
  * @import {Zone} from '@agoric/zone';
  * @import {Remote} from '@agoric/internal';
+ * @import {InvitationMakers} from '@agoric/smart-wallet/src/types.js';
  * @import {TimerService, TimerBrand, TimestampRecord} from '@agoric/time';
  * @import {PromiseVow, Vow, VowTools} from '@agoric/vow';
  * @import {TypedJson, JsonSafe} from '@agoric/cosmic-proto';
+ * @import {Matcher} from '@endo/patterns';
  * @import {ChainHub} from './chain-hub.js';
  */
 
@@ -57,7 +60,7 @@ const HolderI = M.interface('holder', {
   executeTx: M.call(M.arrayOf(M.record())).returns(Vow$(M.record())),
 });
 
-/** @type {{ [name: string]: [description: string, valueShape: Pattern] }} */
+/** @type {{ [name: string]: [description: string, valueShape: Matcher] }} */
 const PUBLIC_TOPICS = {
   account: ['Account holder status', M.any()],
 };
@@ -136,7 +139,6 @@ export const prepareLocalOrchestrationAccountKit = (
      */
     ({ account, address, storageNode }) => {
       // must be the fully synchronous maker because the kit is held in durable state
-      // @ts-expect-error XXX Patterns
       const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
       // TODO determine what goes in vstorage https://github.com/Agoric/agoric-sdk/issues/9066
       void E(topicKit.recorder).write('');
@@ -287,12 +289,18 @@ export const prepareLocalOrchestrationAccountKit = (
         },
       },
       holder: {
+        /** @type {HostOf<OrchestrationAccountI['asContinuingOffer']>} */
         asContinuingOffer() {
           // getPublicTopics resolves promptly (same run), so we don't need a watcher
           // eslint-disable-next-line no-restricted-syntax
           return asVow(async () => {
             await null;
-            const { holder, invitationMakers } = this.facets;
+            const { holder, invitationMakers: im } = this.facets;
+            // XXX cast to a type that has string index signature
+            const invitationMakers = /** @type {InvitationMakers} */ (
+              /** @type {unknown} */ (im)
+            );
+
             return harden({
               // getPublicTopics returns a vow, for membrane compatibility.
               // it's safe to unwrap to a promise and get the result as we
@@ -306,7 +314,7 @@ export const prepareLocalOrchestrationAccountKit = (
         /**
          * TODO: balance lookups for non-vbank assets
          *
-         * @type {PromiseToVow<OrchestrationAccount<any>['getBalance']>}
+         * @type {HostOf<OrchestrationAccountI['getBalance']>}
          */
         getBalance(denomArg) {
           // FIXME look up real values
@@ -322,11 +330,15 @@ export const prepareLocalOrchestrationAccountKit = (
             denom,
           );
         },
+        /** @type {HostOf<OrchestrationAccountI['getBalances']>} */
         getBalances() {
           // TODO https://github.com/Agoric/agoric-sdk/issues/9610
           return asVow(() => Fail`not yet implemented`);
         },
 
+        /**
+         * @type {HostOf<OrchestrationAccountI['getPublicTopics']>}
+         */
         getPublicTopics() {
           // getStoragePath resolves promptly (same run), so we don't need a watcher
           // eslint-disable-next-line no-restricted-syntax
@@ -342,6 +354,7 @@ export const prepareLocalOrchestrationAccountKit = (
             });
           });
         },
+        // FIXME take ChainAddress to match OrchestrationAccountI
         /**
          * @param {string} validatorAddress
          * @param {Amount<'nat'>} ertpAmount
@@ -365,6 +378,7 @@ export const prepareLocalOrchestrationAccountKit = (
             this.facets.extractFirstResultWatcher,
           );
         },
+        // FIXME take ChainAddress to match OrchestrationAccountI
         /**
          * @param {string} validatorAddress
          * @param {Amount<'nat'>} ertpAmount
@@ -393,22 +407,22 @@ export const prepareLocalOrchestrationAccountKit = (
          * updater will get a special notification that the account is being
          * transferred.
          */
-        /** @type {PromiseToVow<LocalChainAccount['deposit']>} */
+        /** @type {HostOf<LocalChainAccount['deposit']>} */
         deposit(payment) {
           return watch(
             E(this.state.account).deposit(payment),
             this.facets.returnVoidWatcher,
           );
         },
-        /** @type {PromiseToVow<LocalChainAccount['withdraw']>} */
+        /** @type {HostOf<LocalChainAccount['withdraw']>} */
         withdraw(amount) {
           return watch(E(this.state.account).withdraw(amount));
         },
-        /** @type {PromiseToVow<LocalChainAccount['executeTx']>} */
+        /** @type {HostOf<LocalChainAccount['executeTx']>} */
         executeTx(messages) {
           return watch(E(this.state.account).executeTx(messages));
         },
-        /** @type {OrchestrationAccount<any>['getAddress']} */
+        /** @type {OrchestrationAccountI['getAddress']} */
         getAddress() {
           return this.state.address;
         },
@@ -456,7 +470,7 @@ export const prepareLocalOrchestrationAccountKit = (
             return watch(transferV, this.facets.returnVoidWatcher);
           });
         },
-        /** @type {PromiseToVow<OrchestrationAccount<any>['transferSteps']>} */
+        /** @type {HostOf<OrchestrationAccountI['transferSteps']>} */
         transferSteps(amount, msg) {
           return asVow(() => {
             console.log('transferSteps got', amount, msg);