@agoric/orchestration 0.1.1-dev-c9ce088.0 → 0.1.1-dev-813e54c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-c9ce088.0+c9ce088",
+  "version": "0.1.1-dev-813e54c.0+813e54c",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -33,19 +33,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-c9ce088.0+c9ce088",
-    "@agoric/cosmic-proto": "0.4.1-dev-c9ce088.0+c9ce088",
-    "@agoric/ertp": "0.16.3-dev-c9ce088.0+c9ce088",
-    "@agoric/internal": "0.3.3-dev-c9ce088.0+c9ce088",
-    "@agoric/network": "0.1.1-dev-c9ce088.0+c9ce088",
-    "@agoric/notifier": "0.6.3-dev-c9ce088.0+c9ce088",
-    "@agoric/store": "0.9.3-dev-c9ce088.0+c9ce088",
-    "@agoric/time": "0.3.3-dev-c9ce088.0+c9ce088",
-    "@agoric/vat-data": "0.5.3-dev-c9ce088.0+c9ce088",
-    "@agoric/vats": "0.15.2-dev-c9ce088.0+c9ce088",
-    "@agoric/vow": "0.1.1-dev-c9ce088.0+c9ce088",
-    "@agoric/zoe": "0.26.3-dev-c9ce088.0+c9ce088",
-    "@agoric/zone": "0.2.3-dev-c9ce088.0+c9ce088",
+    "@agoric/async-flow": "0.1.1-dev-813e54c.0+813e54c",
+    "@agoric/cosmic-proto": "0.4.1-dev-813e54c.0+813e54c",
+    "@agoric/ertp": "0.16.3-dev-813e54c.0+813e54c",
+    "@agoric/internal": "0.3.3-dev-813e54c.0+813e54c",
+    "@agoric/network": "0.1.1-dev-813e54c.0+813e54c",
+    "@agoric/notifier": "0.6.3-dev-813e54c.0+813e54c",
+    "@agoric/store": "0.9.3-dev-813e54c.0+813e54c",
+    "@agoric/time": "0.3.3-dev-813e54c.0+813e54c",
+    "@agoric/vat-data": "0.5.3-dev-813e54c.0+813e54c",
+    "@agoric/vats": "0.15.2-dev-813e54c.0+813e54c",
+    "@agoric/vow": "0.1.1-dev-813e54c.0+813e54c",
+    "@agoric/zoe": "0.26.3-dev-813e54c.0+813e54c",
+    "@agoric/zone": "0.2.3-dev-813e54c.0+813e54c",
     "@endo/base64": "^1.0.7",
     "@endo/errors": "^1.2.5",
     "@endo/far": "^1.1.5",
@@ -54,7 +54,7 @@
     "@noble/hashes": "^1.5.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-c9ce088.0+c9ce088",
+    "@agoric/swingset-liveslots": "0.10.3-dev-813e54c.0+813e54c",
     "@chain-registry/client": "^1.47.4",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
@@ -94,5 +94,5 @@
   "typeCoverage": {
     "atLeast": 97.3
   },
-  "gitHead": "c9ce08800ded20a0dc4039b64f470cafbbd96277"
+  "gitHead": "813e54cca3ee175be6251ecc55336c2ef6f8a26b"
 }

package/src/examples/send-anywhere.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send-anywhere.contract.d.ts","sourceRoot":"","sources":["send-anywhere.contract.js"],"names":[],"mappings":"AAUA;;;;GAIG;AAEH,qEAKE;AAaK,8BAPI,GAAG,eACH,mBAAmB,GAAG;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,QACO,IAAI,oDACJ,kBAAkB;;;;;;;;;;;GA8C5B;AAGD;gBApDiB,UAAU;;;;;;;;;;;;;;;;;;;GAoDsB;yCApES,0BAA0B;0BAD7D,cAAc;wCACqB,0BAA0B;yBAF9D,aAAa"}
+{"version":3,"file":"send-anywhere.contract.d.ts","sourceRoot":"","sources":["send-anywhere.contract.js"],"names":[],"mappings":"AASA;;;;GAIG;AAEH,qEAKE;AAaK,8BAPI,GAAG,eACH,mBAAmB,GAAG;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,QACO,IAAI,oDACJ,kBAAkB;;;;;;;;;;;GAsD5B;AAGD;gBA5DiB,UAAU;;;;;;;;;;;;;;;;;;;GA4DsB;yCA5ES,0BAA0B;0BAD7D,cAAc;wCACqB,0BAA0B;yBAF9D,aAAa"}

package/src/examples/send-anywhere.contract.js

@@ -1,5 +1,3 @@
-import { makeSharedStateRecord } from '@agoric/async-flow';
-
 import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
 import { E } from '@endo/far';
 import { M } from '@endo/patterns';
@@ -7,6 +5,7 @@ import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
 import { AnyNatAmountShape } from '../typeGuards.js';
 import { withOrchestration } from '../utils/start-helper.js';
 import * as flows from './send-anywhere.flows.js';
+import * as sharedFlows from './shared.flows.js';
 
 /**
  * @import {Vow} from '@agoric/vow';
@@ -38,12 +37,6 @@ export const contract = async (
   zone,
   { chainHub, orchestrateAll, vowTools, zoeTools },
 ) => {
-  const contractState = makeSharedStateRecord(
-    /** @type {{ account: OrchestrationAccount<any> | undefined }} */ {
-      localAccount: undefined,
-    },
-  );
-
   const creatorFacet = prepareChainHubAdmin(zone, chainHub);
 
   // UNTIL https://github.com/Agoric/agoric-sdk/issues/9066
@@ -51,10 +44,24 @@ export const contract = async (
   /** @type {(msg: string) => Vow<void>} */
   const log = msg => vowTools.watch(E(logNode).setValue(msg));
 
+  const { makeLocalAccount } = orchestrateAll(sharedFlows, {});
+  /**
+   * Setup a shared local account for use in async-flow functions. Typically,
+   * exo initState functions need to resolve synchronously, but `makeOnce`
+   * allows us to provide a Promise. When using this inside a flow, we must
+   * await it to ensure the account is available for use.
+   *
+   * @type {any} sharedLocalAccountP expects a Promise but this is a vow
+   *   https://github.com/Agoric/agoric-sdk/issues/9822
+   */
+  const sharedLocalAccountP = zone.makeOnce('localAccount', () =>
+    makeLocalAccount(),
+  );
+
   // orchestrate uses the names on orchestrationFns to do a "prepare" of the associated behavior
   const orchFns = orchestrateAll(flows, {
-    contractState,
     log,
+    sharedLocalAccountP,
     zoeTools,
   });
 

package/src/examples/send-anywhere.flows.d.ts

@@ -1,7 +1,5 @@
-export function sendIt(orch: Orchestrator, { contractState, log, zoeTools: { localTransfer, withdrawToSeat } }: {
-    contractState: {
-        localAccount?: OrchestrationAccountI & LocalAccountMethods;
-    };
+export function sendIt(orch: Orchestrator, { sharedLocalAccountP, log, zoeTools: { localTransfer, withdrawToSeat } }: {
+    sharedLocalAccountP: Promise<GuestInterface<LocalOrchestrationAccountKit["holder"]>>;
     zoeTools: GuestInterface<ZoeTools>;
     log: GuestOf<(msg: string) => Vow<void>>;
 }, seat: ZCFSeat, offerArgs: {
@@ -9,10 +7,9 @@ export function sendIt(orch: Orchestrator, { contractState, log, zoeTools: { loc
     destAddr: string;
 }): Promise<void>;
 import type { Orchestrator } from '../types.js';
-import type { OrchestrationAccountI } from '../types.js';
-import type { LocalAccountMethods } from '../types.js';
-import type { ZoeTools } from '../utils/zoe-tools.js';
+import type { LocalOrchestrationAccountKit } from '../exos/local-orchestration-account.js';
 import type { GuestInterface } from '@agoric/async-flow';
+import type { ZoeTools } from '../utils/zoe-tools.js';
 import type { Vow } from '@agoric/vow';
 import type { GuestOf } from '@agoric/async-flow';
 //# sourceMappingURL=send-anywhere.flows.d.ts.map

package/src/examples/send-anywhere.flows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send-anywhere.flows.d.ts","sourceRoot":"","sources":["send-anywhere.flows.js"],"names":[],"mappings":"AA0BO,6BARI,YAAY,uEAEpB;IAA4E,aAAa,EAAjF;QAAE,YAAY,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IAChC,QAAQ,EAAtC,eAAe,QAAQ,CAAC;IACiB,GAAG,EAA5C,QAAQ,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC;CAC3C,QAAQ,OAAO,aACP;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,iBAyDjD;kCAzE6F,aAAa;2CAAb,aAAa;yCAAb,aAAa;8BADhF,uBAAuB;oCAFR,oBAAoB;yBACxC,aAAa;6BADO,oBAAoB"}
+{"version":3,"file":"send-anywhere.flows.d.ts","sourceRoot":"","sources":["send-anywhere.flows.js"],"names":[],"mappings":"AA2BO,6BARI,YAAY,6EAEpB;IAA6E,mBAAmB,EAAxF,OAAO,CAAC,eAAe,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjC,QAAQ,EAAtC,eAAe,QAAQ,CAAC;IACiB,GAAG,EAA5C,QAAQ,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC;CAC3C,QAAQ,OAAO,aACP;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,iBAyDjD;kCAzEsE,aAAa;kDAFrC,wCAAwC;oCAF7C,oBAAoB;8BAGnC,uBAAuB;yBAF5B,aAAa;6BADO,oBAAoB"}

package/src/examples/send-anywhere.flows.js

@@ -5,8 +5,9 @@ import { M, mustMatch } from '@endo/patterns';
 /**
  * @import {GuestInterface, GuestOf} from '@agoric/async-flow';
  * @import {Vow} from '@agoric/vow';
+ * @import {LocalOrchestrationAccountKit} from '../exos/local-orchestration-account.js';
  * @import {ZoeTools} from '../utils/zoe-tools.js';
- * @import {Orchestrator, LocalAccountMethods, OrchestrationAccountI, OrchestrationFlow} from '../types.js';
+ * @import {Orchestrator, OrchestrationFlow, LocalAccountMethods} from '../types.js';
  */
 
 const { entries } = Object;
@@ -18,7 +19,7 @@ const { entries } = Object;
  * @satisfies {OrchestrationFlow}
  * @param {Orchestrator} orch
  * @param {object} ctx
- * @param {{ localAccount?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
+ * @param {Promise<GuestInterface<LocalOrchestrationAccountKit['holder']>>} ctx.sharedLocalAccountP
  * @param {GuestInterface<ZoeTools>} ctx.zoeTools
  * @param {GuestOf<(msg: string) => Vow<void>>} ctx.log
  * @param {ZCFSeat} seat
@@ -26,7 +27,7 @@ const { entries } = Object;
  */
 export const sendIt = async (
   orch,
-  { contractState, log, zoeTools: { localTransfer, withdrawToSeat } },
+  { sharedLocalAccountP, log, zoeTools: { localTransfer, withdrawToSeat } },
   seat,
   offerArgs,
 ) => {
@@ -44,23 +45,23 @@ export const sendIt = async (
     `${amt.brand} not registered in vbank`,
   );
 
-  // FIXME racy
-  if (!contractState.localAccount) {
-    contractState.localAccount = await agoric.makeAccount();
-  }
-
   const chain = await orch.getChain(chainName);
   const info = await chain.getChainInfo();
   const { chainId } = info;
   assert(typeof chainId === 'string', 'bad chainId');
   void log(`got info for chain: ${chainName} ${chainId}`);
 
-  await localTransfer(seat, contractState.localAccount, give);
+  /**
+   * @type {any} XXX methods returning vows
+   *   https://github.com/Agoric/agoric-sdk/issues/9822
+   */
+  const sharedLocalAccount = await sharedLocalAccountP;
+  await localTransfer(seat, sharedLocalAccount, give);
 
   void log(`completed transfer to localAccount`);
 
   try {
-    await contractState.localAccount.transfer(
+    await sharedLocalAccount.transfer(
       {
         value: destAddr,
         encoding: 'bech32',
@@ -70,7 +71,7 @@ export const sendIt = async (
     );
     void log(`completed transfer to ${destAddr}`);
   } catch (e) {
-    await withdrawToSeat(contractState.localAccount, seat, give);
+    await withdrawToSeat(sharedLocalAccount, seat, give);
     const errorMsg = `IBC Transfer failed ${q(e)}`;
     void log(`ERROR: ${errorMsg}`);
     seat.exit(errorMsg);

package/src/examples/shared.flows.d.ts

@@ -0,0 +1,4 @@
+export function makeLocalAccount(orch: Orchestrator): Promise<LocalAccountMethods>;
+import type { Orchestrator } from '../types.js';
+import type { LocalAccountMethods } from '../types.js';
+//# sourceMappingURL=shared.flows.d.ts.map

package/src/examples/shared.flows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.flows.d.ts","sourceRoot":"","sources":["shared.flows.js"],"names":[],"mappings":"AAgBO,uCAHI,YAAY,GACV,OAAO,CAAC,mBAAmB,CAAC,CAKxC;kCAXsE,aAAa;yCAAb,aAAa"}

package/src/examples/shared.flows.js

@@ -0,0 +1,21 @@
+/**
+ * @file Flows shared by multiple examples
+ *
+ *   A module with flows can be used be reused across multiple contracts. They are
+ *   bound to a particular contract's context via orchestrateAll. See
+ *   ./send-anywhere.contract.js for example usage.
+ */
+/**
+ * @import {Orchestrator, OrchestrationFlow, LocalAccountMethods} from '../types.js';
+ */
+
+/**
+ * @satisfies {OrchestrationFlow}
+ * @param {Orchestrator} orch
+ * @returns {Promise<LocalAccountMethods>}
+ */
+export const makeLocalAccount = async orch => {
+  const agoricChain = await orch.getChain('agoric');
+  return agoricChain.makeAccount();
+};
+harden(makeLocalAccount);

package/src/examples/stake-bld.contract.d.ts

@@ -17,8 +17,8 @@ export function start(zcf: ZCF, privateArgs: {
             getPublicTopics(): import("@agoric/vow").Vow<import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
             delegate(validatorAddress: string, ertpAmount: Amount<"nat">): import("@agoric/vow").Vow<Record<unknown, unknown>>;
             undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): import("@agoric/vow").Vow<void | import("@agoric/time").TimestampRecord>;
-            deposit(payment: globalThis.ERef<globalThis.Payment<"nat">>, optAmountShape?: globalThis.Pattern): import("@agoric/vow").Vow<import("@agoric/ertp/src/types.js").NatAmount | import("@agoric/vow").Vow<import("@agoric/ertp/src/types.js").NatAmount>>;
-            withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): import("@agoric/vow").Vow<globalThis.Payment<"nat"> | import("@agoric/vow").Vow<globalThis.Payment<"nat">>>;
+            deposit(payment: globalThis.Payment<"nat">): import("@agoric/vow").Vow<void>;
+            withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): import("@agoric/vow").Vow<globalThis.Payment<"nat">>;
             executeTx(messages: {
                 '@type': string;
             }[]): import("@agoric/vow").Vow<{
@@ -34,7 +34,7 @@ export function start(zcf: ZCF, privateArgs: {
                 resolver: import("@agoric/vow").VowResolver<any>;
                 match: import("@agoric/vow").Vow<any>;
             }>>;
-            monitorTransfers(tap: import("@agoric/vats/src/bridge-target.js").TargetApp): import("@agoric/vow").Vow<import("@agoric/vow").Vow<import("@agoric/vats/src/bridge-target.js").TargetRegistration> | import("@agoric/async-flow").HostInterface<import("@agoric/vats/src/bridge-target.js").TargetRegistration>>;
+            monitorTransfers(tap: import("@agoric/vats/src/bridge-target.js").TargetApp): import("@agoric/vow").Vow<import("@agoric/async-flow").HostInterface<import("@agoric/vats/src/bridge-target.js").TargetRegistration>>;
         }>>;
         /**
          * Invitation to make an account, without any funds

package/src/examples/stake-bld.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stake-bld.contract.d.ts","sourceRoot":"","sources":["stake-bld.contract.js"],"names":[],"mappings":"AAoCO,2BAVI,GAAG,eACH;IACN,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;CAC5B,WACO,OAAO,kBAAkB,EAAE,OAAO;;QAsEvC;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0BH;;WAEG;;;GAaR;6BAlIyB,cAAc;4BACf,kBAAkB;gCAEd,gCAAgC;kCAD9B,cAAc"}
+{"version":3,"file":"stake-bld.contract.d.ts","sourceRoot":"","sources":["stake-bld.contract.js"],"names":[],"mappings":"AAoCO,2BAVI,GAAG,eACH;IACN,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;CAC5B,WACO,OAAO,kBAAkB,EAAE,OAAO;;QAsEvC;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4BH;;WAEG;;;GAaR;6BApIyB,cAAc;4BACf,kBAAkB;gCAEd,gCAAgC;kCAD9B,cAAc"}

package/src/examples/stake-bld.contract.js

@@ -111,6 +111,8 @@ export const start = async (zcf, privateArgs, baggage) => {
             const { give } = seat.getProposal();
             trace('makeStakeBldInvitation', give);
             const { holder } = await makeLocalAccountKit();
+            /** @type {Record<string, Payment<'nat'>>} */
+            // @ts-expect-error XXX PaymentPKeywordRecord throught deeplyFulfilled will be a PaymnentKeywordRecord
             const { In } = await deeplyFulfilled(
               withdrawFromSeat(zcf, seat, give),
             );

package/src/examples/staking-combinations.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staking-combinations.contract.d.ts","sourceRoot":"","sources":["staking-combinations.contract.js"],"names":[],"mappings":"AA8JA;gBAzHiB,UAAU;;;;;;;;;;;;;;;;;;GAyHsB;yCA1IS,0BAA0B"}
+{"version":3,"file":"staking-combinations.contract.d.ts","sourceRoot":"","sources":["staking-combinations.contract.js"],"names":[],"mappings":"AAkKA;gBA7HiB,UAAU;;;;;;;;;;;;;;;;;;GA6HsB;yCA9IS,0BAA0B"}

package/src/examples/staking-combinations.contract.js

@@ -5,7 +5,6 @@
  *   The primary offer result is a power for invitation makers that can perform
  *   actions with an ICA account.
  */
-import { makeSharedStateRecord } from '@agoric/async-flow';
 import { AmountShape } from '@agoric/ertp';
 import { M } from '@endo/patterns';
 import { prepareCombineInvitationMakers } from '../exos/combine-invitation-makers.js';
@@ -13,6 +12,7 @@ import { CosmosOrchestrationInvitationMakersI } from '../exos/cosmos-orchestrati
 import { ChainAddressShape, DelegationShape } from '../typeGuards.js';
 import { withOrchestration } from '../utils/start-helper.js';
 import * as flows from './staking-combinations.flows.js';
+import * as sharedFlows from './shared.flows.js';
 import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
 
 /**
@@ -46,16 +46,6 @@ const contract = async (
   zone,
   { orchestrateAll, zoeTools, chainHub },
 ) => {
-  const contractState = makeSharedStateRecord(
-    /**
-     * @type {{
-     *   account: (OrchestrationAccount<any> & LocalAccountMethods) | undefined;
-     * }}
-     */ {
-      localAccount: undefined,
-    },
-  );
-
   const StakingCombinationsInvitationMakersI = M.interface(
     'StakingCombinationsInvitationMakersI',
     {
@@ -128,8 +118,22 @@ const contract = async (
     StakingCombinationsInvitationMakersI,
   );
 
+  const { makeLocalAccount } = orchestrateAll(sharedFlows, {});
+  /**
+   * Setup a shared local account for use in async-flow functions. Typically,
+   * exo initState functions need to resolve synchronously, but `makeOnce`
+   * allows us to provide a Promise. When using this inside a flow, we must
+   * await it to ensure the account is available for use.
+   *
+   * @type {any} sharedLocalAccountP expects a Promise but this is a vow
+   *   https://github.com/Agoric/agoric-sdk/issues/9822
+   */
+  const sharedLocalAccountP = zone.makeOnce('localAccount', () =>
+    makeLocalAccount(),
+  );
+
   const orchFns = orchestrateAll(flows, {
-    contractState,
+    sharedLocalAccountP,
     makeCombineInvitationMakers,
     makeExtraInvitationMaker,
     flows,

package/src/examples/staking-combinations.flows.d.ts

@@ -4,10 +4,8 @@ export function makeAccount(orch: Orchestrator, ctx: {
 }, _seat: ZCFSeat, { chainName }: {
     chainName: string;
 }): Promise<ResolvedContinuingOfferResult>;
-export function depositAndDelegate(orch: Orchestrator, { contractState, zoeTools }: {
-    contractState: {
-        localAccount?: OrchestrationAccountI & LocalAccountMethods;
-    };
+export function depositAndDelegate(orch: Orchestrator, { sharedLocalAccountP, zoeTools }: {
+    sharedLocalAccountP: Promise<GuestInterface<LocalOrchestrationAccountKit["holder"]>>;
     zoeTools: GuestInterface<ZoeTools>;
 }, account: GuestInterface<CosmosOrchestrationAccount>, seat: ZCFSeat, validator: CosmosValidatorAddress): Promise<void>;
 export function undelegateAndTransfer(orch: Orchestrator, ctx: object, account: GuestInterface<CosmosOrchestrationAccount>, { delegations, destination }: {
@@ -21,10 +19,9 @@ import type { Orchestrator } from '../types.js';
 import type { MakeCombineInvitationMakers } from '../exos/combine-invitation-makers.js';
 import type { InvitationMakers } from '@agoric/smart-wallet/src/types.js';
 import type { ResolvedContinuingOfferResult } from '../utils/zoe-tools.js';
-import type { OrchestrationAccountI } from '../types.js';
-import type { LocalAccountMethods } from '../types.js';
-import type { ZoeTools } from '../utils/zoe-tools.js';
+import type { LocalOrchestrationAccountKit } from '../exos/local-orchestration-account.js';
 import type { GuestInterface } from '@agoric/async-flow';
+import type { ZoeTools } from '../utils/zoe-tools.js';
 import type { CosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
 import type { CosmosValidatorAddress } from '../types.js';
 import type { AmountArg } from '../types.js';

package/src/examples/staking-combinations.flows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staking-combinations.flows.d.ts","sourceRoot":"","sources":["staking-combinations.flows.js"],"names":[],"mappings":"AA2BO,kCATI,YAAY,OACZ;IACN,2BAA2B,EAAE,2BAA2B,CAAC;IACzD,wBAAwB,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,gBAAgB,CAAC;CAC9D,SACO,OAAO,iBACP;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACnB,OAAO,CAAC,6BAA6B,CAAC,CAiBlD;AAcM,yCATI,YAAY,+BAEpB;IAA4E,aAAa,EAAjF;QAAE,YAAY,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IAChC,QAAQ,EAAtC,eAAe,QAAQ,CAAC;CAChC,WAAQ,eAAe,0BAA0B,CAAC,QAC1C,OAAO,aACP,sBAAsB,GACpB,OAAO,CAAC,IAAI,CAAC,CA8BzB;AAcM,4CATI,YAAY,OACZ,MAAM,WACN,eAAe,0BAA0B,CAAC,gCAC1C;IACN,WAAW,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,sBAAsB,CAAA;KAAE,EAAE,CAAC;IACxE,WAAW,EAAE,YAAY,CAAC;CAC3B,GACS,OAAO,CAAC,IAAI,CAAC,CAYzB;kCA1G8I,aAAa;iDAE9G,sCAAsC;sCAD1B,mCAAmC;mDAGnC,uBAAuB;2CAJ8D,aAAa;yCAAb,aAAa;8BAIlG,uBAAuB;oCALhD,oBAAoB;gDAIR,yCAAyC;4CAHyD,aAAa;+BAAb,aAAa;kCAAb,aAAa"}
+{"version":3,"file":"staking-combinations.flows.d.ts","sourceRoot":"","sources":["staking-combinations.flows.js"],"names":[],"mappings":"AA4BO,kCATI,YAAY,OACZ;IACN,2BAA2B,EAAE,2BAA2B,CAAC;IACzD,wBAAwB,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,gBAAgB,CAAC;CAC9D,SACO,OAAO,iBACP;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACnB,OAAO,CAAC,6BAA6B,CAAC,CAiBlD;AAcM,yCATI,YAAY,qCAEpB;IAA6E,mBAAmB,EAAxF,OAAO,CAAC,eAAe,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjC,QAAQ,EAAtC,eAAe,QAAQ,CAAC;CAChC,WAAQ,eAAe,0BAA0B,CAAC,QAC1C,OAAO,aACP,sBAAsB,GACpB,OAAO,CAAC,IAAI,CAAC,CAgCzB;AAcM,4CATI,YAAY,OACZ,MAAM,WACN,eAAe,0BAA0B,CAAC,gCAC1C;IACN,WAAW,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,sBAAsB,CAAA;KAAE,EAAE,CAAC;IACxE,WAAW,EAAE,YAAY,CAAC;CAC3B,GACS,OAAO,CAAC,IAAI,CAAC,CAYzB;kCA7G8I,aAAa;iDAG9G,sCAAsC;sCAF1B,mCAAmC;mDAInC,uBAAuB;kDAHlC,wCAAwC;oCAHtD,oBAAoB;8BAMK,uBAAuB;gDADpC,yCAAyC;4CAJyD,aAAa;+BAAb,aAAa;kCAAb,aAAa"}

package/src/examples/staking-combinations.flows.js

@@ -2,6 +2,7 @@
  * @import {GuestInterface} from '@agoric/async-flow';
  * @import {Orchestrator, OrchestrationFlow, AmountArg, CosmosValidatorAddress, ChainAddress, LocalAccountMethods, OrchestrationAccountI} from '../types.js'
  * @import {ContinuingOfferResult, InvitationMakers} from '@agoric/smart-wallet/src/types.js';
+ * @import {LocalOrchestrationAccountKit} from '../exos/local-orchestration-account.js';
  * @import {MakeCombineInvitationMakers} from '../exos/combine-invitation-makers.js';
  * @import {CosmosOrchestrationAccount} from '../exos/cosmos-orchestration-account.js';
  * @import {ResolvedContinuingOfferResult, ZoeTools} from '../utils/zoe-tools.js';
@@ -47,7 +48,7 @@ harden(makeAccount);
  * @satisfies {OrchestrationFlow}
  * @param {Orchestrator} orch
  * @param {object} ctx
- * @param {{ localAccount?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
+ * @param {Promise<GuestInterface<LocalOrchestrationAccountKit['holder']>>} ctx.sharedLocalAccountP
  * @param {GuestInterface<ZoeTools>} ctx.zoeTools
  * @param {GuestInterface<CosmosOrchestrationAccount>} account
  * @param {ZCFSeat} seat
@@ -56,7 +57,7 @@ harden(makeAccount);
  */
 export const depositAndDelegate = async (
   orch,
-  { contractState, zoeTools },
+  { sharedLocalAccountP, zoeTools },
   account,
   seat,
   validator,
@@ -64,18 +65,20 @@ export const depositAndDelegate = async (
   await null;
   trace('depositAndDelegate', account, seat, validator);
   mustMatch(validator, ChainAddressShape);
-  if (!contractState.localAccount) {
-    const agoricChain = await orch.getChain('agoric');
-    contractState.localAccount = await agoricChain.makeAccount();
-  }
+
   const { give } = seat.getProposal();
-  await zoeTools.localTransfer(seat, contractState.localAccount, give);
+  /**
+   * @type {any} XXX methods returning vows
+   *   https://github.com/Agoric/agoric-sdk/issues/9822
+   */
+  const sharedLocalAccount = await sharedLocalAccountP;
+  await zoeTools.localTransfer(seat, sharedLocalAccount, give);
 
   const address = account.getAddress();
   try {
-    await contractState.localAccount.transfer(address, give.Stake);
+    await sharedLocalAccount.transfer(address, give.Stake);
   } catch (cause) {
-    await zoeTools.withdrawToSeat(contractState.localAccount, seat, give);
+    await zoeTools.withdrawToSeat(sharedLocalAccount, seat, give);
     const errMsg = makeError(`ibc transfer failed ${q(cause)}`);
     seat.exit(errMsg);
     throw errMsg;

package/src/exos/chain-hub.js

@@ -205,7 +205,7 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
     valueShape: M.string(),
   });
 
-  const lookupChainInfo = vowTools.retriable(
+  const lookupChainInfo = vowTools.retryable(
     zone,
     'lookupChainInfo',
     /** @param {string} chainName */
@@ -227,7 +227,7 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
     },
   );
 
-  const lookupConnectionInfo = vowTools.retriable(
+  const lookupConnectionInfo = vowTools.retryable(
     zone,
     'lookupConnectionInfo',
     /**
@@ -258,7 +258,7 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
   );
 
   /* eslint-disable no-use-before-define -- chainHub defined below */
-  const lookupChainsAndConnection = vowTools.retriable(
+  const lookupChainsAndConnection = vowTools.retryable(
     zone,
     'lookupChainsAndConnection',
     /**

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

@@ -171,10 +171,10 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
          * updater will get a special notification that the account is being
          * transferred.
          */
-        /** @type {HostOf<LocalChainAccount['deposit']>} */
-        deposit(payment: globalThis.ERef<globalThis.Payment<"nat">>, optAmountShape?: globalThis.Pattern): Vow<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">>>;
+        /** @type {HostOf<LocalAccountMethods['deposit']>} */
+        deposit(payment: globalThis.Payment<"nat">): Vow<void>;
+        /** @type {HostOf<LocalAccountMethods['withdraw']>} */
+        withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): Vow<globalThis.Payment<"nat">>;
         /** @type {HostOf<LocalChainAccount['executeTx']>} */
         executeTx(messages: {
             '@type': string;
@@ -214,8 +214,8 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
             resolver: import("@agoric/vow").VowResolver<any>;
             match: Vow<any>;
         }>>;
-        /** @type {HostOf<LocalChainAccount['monitorTransfers']>} */
-        monitorTransfers(tap: import("@agoric/vats/src/bridge-target.js").TargetApp): Vow<Vow<import("@agoric/vats/src/bridge-target.js").TargetRegistration> | import("@agoric/async-flow").HostInterface<import("@agoric/vats/src/bridge-target.js").TargetRegistration>>;
+        /** @type {HostOf<LocalAccountMethods['monitorTransfers']>} */
+        monitorTransfers(tap: import("@agoric/vats/src/bridge-target.js").TargetApp): Vow<import("@agoric/async-flow").HostInterface<import("@agoric/vats/src/bridge-target.js").TargetRegistration>>;
     };
 }>;
 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":"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"}
+{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"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"}

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

@@ -28,7 +28,7 @@ import { coerceCoin, coerceDenomAmount } from '../utils/amounts.js';
 /**
  * @import {HostOf} from '@agoric/async-flow';
  * @import {LocalChain, LocalChainAccount} from '@agoric/vats/src/localchain.js';
- * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountI} from '@agoric/orchestration';
+ * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountI, LocalAccountMethods} from '@agoric/orchestration';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'.
  * @import {Zone} from '@agoric/zone';
  * @import {Remote} from '@agoric/internal';
@@ -613,14 +613,14 @@ export const prepareLocalOrchestrationAccountKit = (
          * updater will get a special notification that the account is being
          * transferred.
          */
-        /** @type {HostOf<LocalChainAccount['deposit']>} */
+        /** @type {HostOf<LocalAccountMethods['deposit']>} */
         deposit(payment) {
           return watch(
             E(this.state.account).deposit(payment),
             this.facets.returnVoidWatcher,
           );
         },
-        /** @type {HostOf<LocalChainAccount['withdraw']>} */
+        /** @type {HostOf<LocalAccountMethods['withdraw']>} */
         withdraw(amount) {
           return watch(E(this.state.account).withdraw(amount));
         },
@@ -733,7 +733,7 @@ export const prepareLocalOrchestrationAccountKit = (
         matchFirstPacket(patternV) {
           return watch(E(this.state.packetTools).matchFirstPacket(patternV));
         },
-        /** @type {HostOf<LocalChainAccount['monitorTransfers']>} */
+        /** @type {HostOf<LocalAccountMethods['monitorTransfers']>} */
         monitorTransfers(tap) {
           return watch(E(this.state.packetTools).monitorTransfers(tap));
         },

package/src/proposals/start-stakeBld.d.ts

@@ -17,8 +17,8 @@ export function startStakeBld({ consume: { agoricNames: agoricNamesP, board, cha
                         getPublicTopics(): import("@agoric/vow").Vow<import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
                         delegate(validatorAddress: string, ertpAmount: Amount<"nat">): import("@agoric/vow").Vow<Record<unknown, unknown>>;
                         undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): import("@agoric/vow").Vow<void | import("@agoric/time").TimestampRecord>;
-                        deposit(payment: globalThis.ERef<globalThis.Payment<"nat">>, optAmountShape?: globalThis.Pattern): import("@agoric/vow").Vow<import("@agoric/ertp/src/types.js").NatAmount | import("@agoric/vow").Vow<import("@agoric/ertp/src/types.js").NatAmount>>;
-                        withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): import("@agoric/vow").Vow<globalThis.Payment<"nat"> | import("@agoric/vow").Vow<globalThis.Payment<"nat">>>;
+                        deposit(payment: globalThis.Payment<"nat">): import("@agoric/vow").Vow<void>;
+                        withdraw(amount: import("@agoric/ertp/src/types.js").NatAmount): import("@agoric/vow").Vow<globalThis.Payment<"nat">>;
                         executeTx(messages: {
                             '@type': string;
                         }[]): import("@agoric/vow").Vow<{
@@ -34,7 +34,7 @@ export function startStakeBld({ consume: { agoricNames: agoricNamesP, board, cha
                             resolver: import("@agoric/vow").VowResolver<any>;
                             match: import("@agoric/vow").Vow<any>;
                         }>>;
-                        monitorTransfers(tap: import("@agoric/vats/src/bridge-target.js").TargetApp): import("@agoric/vow").Vow<import("@agoric/vow").Vow<import("@agoric/vats/src/bridge-target.js").TargetRegistration> | import("@agoric/async-flow").HostInterface<import("@agoric/vats/src/bridge-target.js").TargetRegistration>>;
+                        monitorTransfers(tap: import("@agoric/vats/src/bridge-target.js").TargetApp): import("@agoric/vow").Vow<import("@agoric/async-flow").HostInterface<import("@agoric/vats/src/bridge-target.js").TargetRegistration>>;
                     }>>;
                     makeAccountInvitationMaker(): Promise<Invitation<import("@agoric/vow").Vow<import("@agoric/async-flow").HostInterface<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>>, undefined>>;
                 }>;

package/src/utils/zoe-tools.js

@@ -80,7 +80,7 @@ export const makeZoeTools = (zcf, { when, allVows, allSettled, asVow }) => {
       //     const { zcfSeat: tempSeat, userSeat: userSeatP } =
       //       zcf.makeEmptySeatKit();
       //     const uSeat = await userSeatP;
-      //     // TODO how do I store in the place for this retriable?
+      //     // TODO how do I store in the place for this retryable?
       //     atomicTransfer(zcf, srcSeat, tempSeat, amounts);
       //     tempSeat.exit();
       //     return uSeat;