@agoric/orchestration 0.1.1-dev-8a8fed3.0 → 0.1.1-dev-bf791ed.0

package/package.json

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

package/src/examples/auto-stake-it.contract.d.ts

@@ -4,15 +4,15 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
     publicFacet: import("@endo/exo").Guarded<{
         makeAccountsInvitation(): Promise<Invitation<import("@agoric/vow").Vow<import("@agoric/vow").Vow<{
             publicSubscribers: {
-                [k: string]: ResolvedPublicTopic<unknown>;
+                [k: string]: import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>;
             };
             invitationMakers: import("@endo/exo").Guarded<{
                 MakeInvitation<IA extends unknown[]>(chainName: string, action: string, invitationArgs: IA): Promise<Invitation<unknown, IA>>;
             }>;
         }>>, {
             chainName: string;
-            validator: CosmosValidatorAddress;
-            localDenom: Denom;
+            validator: import("@agoric/orchestration").CosmosValidatorAddress;
+            localDenom: import("@agoric/orchestration").Denom;
         }>>;
     }>;
     creatorFacet: import("@endo/exo").Guarded<{
@@ -34,9 +34,6 @@ export type OrchestrationPowers = {
     agoricNames: Remote<NameHub>;
 };
 export type AutoStakeItSF = typeof start;
-import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
-import type { CosmosValidatorAddress } from '@agoric/orchestration';
-import type { Denom } from '@agoric/orchestration';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
 import type { Remote } from '@agoric/vow';
 import type { CosmosInterchainService } from '@agoric/orchestration';

package/src/examples/auto-stake-it.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-stake-it.contract.d.ts","sourceRoot":"","sources":["auto-stake-it.contract.js"],"names":[],"mappings":"AA0LA;gBAhDiB,UAAU;;;;;;;;;;;uBA5FX,MAAM;uBACN,sBAAsB;wBACrB,KAAK;;;;;;;;;;;;;GA0I2B;kCA/JpC;IACZ,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC1D,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;4BA2JU,OAAO,KAAK;yCA/KY,2CAA2C;4CAMsE,uBAAuB;2BAAvB,uBAAuB;gCALjJ,gCAAgC;4BAEpC,aAAa;6CAGiH,uBAAuB;kCAP/I,cAAc;6BAGnB,cAAc"}
+{"version":3,"file":"auto-stake-it.contract.d.ts","sourceRoot":"","sources":["auto-stake-it.contract.js"],"names":[],"mappings":"AAuFA;gBAhDiB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDsB;kCAjEpC;IACZ,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC1D,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;4BA6DU,OAAO,KAAK;gCA5EG,gCAAgC;4BAEpC,aAAa;6CAEI,uBAAuB;kCALlC,cAAc;6BAEnB,cAAc"}

package/src/examples/auto-stake-it.contract.js

@@ -2,25 +2,20 @@ import {
   EmptyProposalShape,
   InvitationShape,
 } from '@agoric/zoe/src/typeGuards.js';
-import { Fail } from '@endo/errors';
 import { M } from '@endo/patterns';
-import { withOrchestration } from '../utils/start-helper.js';
 import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
-import { prepareStakingTap } from './auto-stake-it-tap-kit.js';
 import { preparePortfolioHolder } from '../exos/portfolio-holder-kit.js';
+import { withOrchestration } from '../utils/start-helper.js';
+import { prepareStakingTap } from './auto-stake-it-tap-kit.js';
+import * as flows from './auto-stake-it.flows.js';
 
 /**
  * @import {TimerService} from '@agoric/time';
- * @import {ResolvedPublicTopic} from '@agoric/zoe/src/contractSupport/topics.js';
  * @import {LocalChain} from '@agoric/vats/src/localchain.js';
  * @import {NameHub} from '@agoric/vats';
  * @import {Remote} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
- * @import {GuestInterface} from '@agoric/async-flow';
- * @import {CosmosValidatorAddress, Orchestrator, CosmosInterchainService, Denom, OrchestrationAccount, StakingAccountActions, OrchestrationFlow} from '@agoric/orchestration';
- * @import {MakeStakingTap} from './auto-stake-it-tap-kit.js';
- * @import {MakePortfolioHolder} from '../exos/portfolio-holder-kit.js';
- * @import {ChainHub} from '../exos/chain-hub.js';
+ * @import {CosmosInterchainService} from '@agoric/orchestration';
  * @import {OrchestrationTools} from '../utils/start-helper.js';
  */
 
@@ -34,100 +29,6 @@ import { preparePortfolioHolder } from '../exos/portfolio-holder-kit.js';
  * }} OrchestrationPowers
  */
 
-/**
- * @satisfies {OrchestrationFlow}
- * @param {Orchestrator} orch
- * @param {{
- *   makeStakingTap: MakeStakingTap;
- *   makePortfolioHolder: MakePortfolioHolder;
- *   chainHub: GuestInterface<ChainHub>;
- * }} ctx
- * @param {ZCFSeat} seat
- * @param {{
- *   chainName: string;
- *   validator: CosmosValidatorAddress;
- *   localDenom: Denom;
- * }} offerArgs
- */
-const makeAccountsHandler = async (
-  orch,
-  { makeStakingTap, makePortfolioHolder, chainHub },
-  seat,
-  {
-    chainName,
-    validator,
-    // TODO localDenom is user supplied, until #9211
-    localDenom,
-  },
-) => {
-  seat.exit(); // no funds exchanged
-  const [agoric, remoteChain] = await Promise.all([
-    orch.getChain('agoric'),
-    orch.getChain(chainName),
-  ]);
-  const { chainId, stakingTokens } = await remoteChain.getChainInfo();
-  const remoteDenom = stakingTokens[0].denom;
-  remoteDenom ||
-    Fail`${chainId || chainName} does not have stakingTokens in config`;
-  if (chainId !== validator.chainId) {
-    Fail`validator chainId ${validator.chainId} does not match remote chainId ${chainId}`;
-  }
-  const [localAccount, stakingAccount] = await Promise.all([
-    agoric.makeAccount(),
-    /** @type {Promise<OrchestrationAccount<any> & StakingAccountActions>} */ (
-      remoteChain.makeAccount()
-    ),
-  ]);
-
-  const [localChainAddress, remoteChainAddress] = await Promise.all([
-    localAccount.getAddress(),
-    stakingAccount.getAddress(),
-  ]);
-  const agoricChainId = (await agoric.getChainInfo()).chainId;
-  const { transferChannel } = await chainHub.getConnectionInfo(
-    agoricChainId,
-    chainId,
-  );
-  assert(transferChannel.counterPartyChannelId, 'unable to find sourceChannel');
-
-  // Every time the `localAccount` receives `remoteDenom` over IBC, delegate it.
-  const tap = makeStakingTap({
-    localAccount,
-    stakingAccount,
-    validator,
-    localChainAddress,
-    remoteChainAddress,
-    sourceChannel: transferChannel.counterPartyChannelId,
-    remoteDenom,
-    localDenom,
-  });
-  // XXX consider storing appRegistration, so we can .revoke() or .updateTargetApp()
-  // @ts-expect-error tap.receiveUpcall: 'Vow<void> | undefined' not assignable to 'Promise<any>'
-  await localAccount.monitorTransfers(tap);
-
-  const accountEntries = harden(
-    /** @type {[string, OrchestrationAccount<any>][]} */ ([
-      ['agoric', localAccount],
-      [chainName, stakingAccount],
-    ]),
-  );
-  const publicTopicEntries = harden(
-    /** @type {[string, ResolvedPublicTopic<unknown>][]} */ (
-      await Promise.all(
-        accountEntries.map(async ([name, account]) => {
-          const { account: topicRecord } = await account.getPublicTopics();
-          return [name, topicRecord];
-        }),
-      )
-    ),
-  );
-  const portfolioHolder = makePortfolioHolder(
-    accountEntries,
-    publicTopicEntries,
-  );
-  return portfolioHolder.asContinuingOffer();
-};
-
 /**
  * AutoStakeIt allows users to to create an auto-forwarding address that
  * transfers and stakes tokens on a remote chain when received.
@@ -145,7 +46,7 @@ const contract = async (
   zcf,
   _privateArgs,
   zone,
-  { chainHub, orchestrate, vowTools },
+  { chainHub, orchestrateAll, vowTools },
 ) => {
   const makeStakingTap = prepareStakingTap(
     zone.subZone('stakingTap'),
@@ -156,11 +57,11 @@ const contract = async (
     vowTools,
   );
 
-  const makeAccounts = orchestrate(
-    'makeAccounts',
-    { makeStakingTap, makePortfolioHolder, chainHub },
-    makeAccountsHandler,
-  );
+  const { makeAccounts } = orchestrateAll(flows, {
+    makeStakingTap,
+    makePortfolioHolder,
+    chainHub,
+  });
 
   const publicFacet = zone.exo(
     'AutoStakeIt Public Facet',

package/src/examples/auto-stake-it.flows.d.ts

@@ -0,0 +1,25 @@
+export function makeAccounts(orch: Orchestrator, { makeStakingTap, makePortfolioHolder, chainHub }: {
+    makeStakingTap: MakeStakingTap;
+    makePortfolioHolder: MakePortfolioHolder;
+    chainHub: GuestInterface<ChainHub>;
+}, seat: ZCFSeat, { chainName, validator, localDenom, }: {
+    chainName: string;
+    validator: CosmosValidatorAddress;
+    localDenom: Denom;
+}): Promise<import("@agoric/vow").Vow<{
+    publicSubscribers: {
+        [k: string]: ResolvedPublicTopic<unknown>;
+    };
+    invitationMakers: import("@endo/exo").Guarded<{
+        MakeInvitation<IA extends unknown[]>(chainName: string, action: string, invitationArgs: IA): Promise<Invitation<unknown, IA>>;
+    }>;
+}>>;
+import type { Orchestrator } from '@agoric/orchestration';
+import type { MakeStakingTap } from './auto-stake-it-tap-kit.js';
+import type { MakePortfolioHolder } from '../exos/portfolio-holder-kit.js';
+import type { ChainHub } from '../exos/chain-hub.js';
+import type { GuestInterface } from '@agoric/async-flow';
+import type { CosmosValidatorAddress } from '@agoric/orchestration';
+import type { Denom } from '@agoric/orchestration';
+import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
+//# sourceMappingURL=auto-stake-it.flows.d.ts.map

package/src/examples/auto-stake-it.flows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-stake-it.flows.d.ts","sourceRoot":"","sources":["auto-stake-it.flows.js"],"names":[],"mappings":"AA0BO,mCAbI,YAAY,qDACZ;IACV,cAAkB,EAAE,cAAc,CAAC;IACnC,mBAAuB,EAAE,mBAAmB,CAAC;IAC7C,QAAY,EAAE,eAAe,QAAQ,CAAC,CAAC;CACpC,QACO,OAAO,yCACP;IACV,SAAa,EAAE,MAAM,CAAC;IACtB,SAAa,EAAE,sBAAsB,CAAC;IACtC,UAAc,EAAE,KAAK,CAAC;CACnB;;;;;;;IA+EH;kCAlGsJ,uBAAuB;oCAC7I,4BAA4B;yCACvB,iCAAiC;8BAC5C,sBAAsB;oCAJhB,oBAAoB;4CACkG,uBAAuB;2BAAvB,uBAAuB;yCAFxI,2CAA2C"}

package/src/examples/auto-stake-it.flows.js

@@ -0,0 +1,104 @@
+import { Fail } from '@endo/errors';
+
+/**
+ * @import {ResolvedPublicTopic} from '@agoric/zoe/src/contractSupport/topics.js';
+ * @import {GuestInterface} from '@agoric/async-flow';
+ * @import {CosmosValidatorAddress, Orchestrator, CosmosInterchainService, Denom, OrchestrationAccount, StakingAccountActions, OrchestrationFlow} from '@agoric/orchestration';
+ * @import {MakeStakingTap} from './auto-stake-it-tap-kit.js';
+ * @import {MakePortfolioHolder} from '../exos/portfolio-holder-kit.js';
+ * @import {ChainHub} from '../exos/chain-hub.js';
+ */
+
+/**
+ * @satisfies {OrchestrationFlow}
+ * @param {Orchestrator} orch
+ * @param {{
+ *   makeStakingTap: MakeStakingTap;
+ *   makePortfolioHolder: MakePortfolioHolder;
+ *   chainHub: GuestInterface<ChainHub>;
+ * }} ctx
+ * @param {ZCFSeat} seat
+ * @param {{
+ *   chainName: string;
+ *   validator: CosmosValidatorAddress;
+ *   localDenom: Denom;
+ * }} offerArgs
+ */
+export const makeAccounts = async (
+  orch,
+  { makeStakingTap, makePortfolioHolder, chainHub },
+  seat,
+  {
+    chainName,
+    validator,
+    // TODO localDenom is user supplied, until #9211
+    localDenom,
+  },
+) => {
+  seat.exit(); // no funds exchanged
+  const [agoric, remoteChain] = await Promise.all([
+    orch.getChain('agoric'),
+    orch.getChain(chainName),
+  ]);
+  const { chainId, stakingTokens } = await remoteChain.getChainInfo();
+  const remoteDenom = stakingTokens[0].denom;
+  remoteDenom ||
+    Fail`${chainId || chainName} does not have stakingTokens in config`;
+  if (chainId !== validator.chainId) {
+    Fail`validator chainId ${validator.chainId} does not match remote chainId ${chainId}`;
+  }
+  const [localAccount, stakingAccount] = await Promise.all([
+    agoric.makeAccount(),
+    /** @type {Promise<OrchestrationAccount<any> & StakingAccountActions>} */ (
+      remoteChain.makeAccount()
+    ),
+  ]);
+
+  const [localChainAddress, remoteChainAddress] = await Promise.all([
+    localAccount.getAddress(),
+    stakingAccount.getAddress(),
+  ]);
+  const agoricChainId = (await agoric.getChainInfo()).chainId;
+  const { transferChannel } = await chainHub.getConnectionInfo(
+    agoricChainId,
+    chainId,
+  );
+  assert(transferChannel.counterPartyChannelId, 'unable to find sourceChannel');
+
+  // Every time the `localAccount` receives `remoteDenom` over IBC, delegate it.
+  const tap = makeStakingTap({
+    localAccount,
+    stakingAccount,
+    validator,
+    localChainAddress,
+    remoteChainAddress,
+    sourceChannel: transferChannel.counterPartyChannelId,
+    remoteDenom,
+    localDenom,
+  });
+  // XXX consider storing appRegistration, so we can .revoke() or .updateTargetApp()
+  // @ts-expect-error tap.receiveUpcall: 'Vow<void> | undefined' not assignable to 'Promise<any>'
+  await localAccount.monitorTransfers(tap);
+
+  const accountEntries = harden(
+    /** @type {[string, OrchestrationAccount<any>][]} */ ([
+      ['agoric', localAccount],
+      [chainName, stakingAccount],
+    ]),
+  );
+  const publicTopicEntries = harden(
+    /** @type {[string, ResolvedPublicTopic<unknown>][]} */ (
+      await Promise.all(
+        accountEntries.map(async ([name, account]) => {
+          const { account: topicRecord } = await account.getPublicTopics();
+          return [name, topicRecord];
+        }),
+      )
+    ),
+  );
+  const portfolioHolder = makePortfolioHolder(
+    accountEntries,
+    publicTopicEntries,
+  );
+  return portfolioHolder.asContinuingOffer();
+};

package/src/examples/basic-flows.contract.d.ts

@@ -7,7 +7,7 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
         }>>;
         makePortfolioAccountInvitation(): Promise<Invitation<import("@agoric/vow").Vow<import("@agoric/vow").Vow<{
             publicSubscribers: {
-                [k: string]: ResolvedPublicTopic<unknown>;
+                [k: string]: import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>;
             };
             invitationMakers: import("@endo/exo").Guarded<{
                 MakeInvitation<IA extends unknown[]>(chainName: string, action: string, invitationArgs: IA): Promise<Invitation<unknown, IA>>;
@@ -19,5 +19,4 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
 }>;
 export type BasicFlowsSF = typeof start;
 import type { OrchestrationPowers } from '../utils/start-helper.js';
-import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
 //# sourceMappingURL=basic-flows.contract.d.ts.map

package/src/examples/basic-flows.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic-flows.contract.d.ts","sourceRoot":"","sources":["basic-flows.contract.js"],"names":[],"mappings":"AAqIA;gBAhDiB,UAAU;;;;uBA3DH,MAAM;;;;;;;;;;wBAoBL,MAAM,EAAE;;;GAuFgB;2BAEnC,OAAO,KAAK;yCA1HY,0BAA0B;yCAD1B,2CAA2C"}
+{"version":3,"file":"basic-flows.contract.d.ts","sourceRoot":"","sources":["basic-flows.contract.js"],"names":[],"mappings":"AA8DA;gBA3CiB,UAAU;;;;;;;;;;;;;;;;;GA2CsB;2BAEnC,OAAO,KAAK;yCApDY,0BAA0B"}

package/src/examples/basic-flows.contract.js

@@ -3,83 +3,17 @@
  *   leverage basic functionality of the Orchestration API with async-flow.
  */
 import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
-import { M, mustMatch } from '@endo/patterns';
-import { withOrchestration } from '../utils/start-helper.js';
+import { M } from '@endo/patterns';
 import { preparePortfolioHolder } from '../exos/portfolio-holder-kit.js';
+import { withOrchestration } from '../utils/start-helper.js';
+import * as flows from './basic-flows.flows.js';
 
 /**
  * @import {Zone} from '@agoric/zone';
- * @import {OrchestrationAccount, OrchestrationFlow, Orchestrator} from '@agoric/orchestration';
- * @import {ResolvedPublicTopic} from '@agoric/zoe/src/contractSupport/topics.js';
  * @import {OrchestrationPowers} from '../utils/start-helper.js';
- * @import {MakePortfolioHolder} from '../exos/portfolio-holder-kit.js';
  * @import {OrchestrationTools} from '../utils/start-helper.js';
  */
 
-/**
- * Create an account on a Cosmos chain and return a continuing offer with
- * invitations makers for Delegate, WithdrawRewards, Transfer, etc.
- *
- * @satisfies {OrchestrationFlow}
- * @param {Orchestrator} orch
- * @param {undefined} _ctx
- * @param {ZCFSeat} seat
- * @param {{ chainName: string }} offerArgs
- */
-const makeOrchAccountHandler = async (orch, _ctx, seat, { chainName }) => {
-  seat.exit(); // no funds exchanged
-  mustMatch(chainName, M.string());
-  const remoteChain = await orch.getChain(chainName);
-  const cosmosAccount = await remoteChain.makeAccount();
-  return cosmosAccount.asContinuingOffer();
-};
-
-/**
- * Create accounts on multiple chains and return them in a single continuing
- * offer with invitations makers for Delegate, WithdrawRewards, Transfer, etc.
- * Calls to the underlying invitationMakers are proxied through the
- * `MakeInvitation` invitation maker.
- *
- * @satisfies {OrchestrationFlow}
- * @param {Orchestrator} orch
- * @param {MakePortfolioHolder} makePortfolioHolder
- * @param {ZCFSeat} seat
- * @param {{ chainNames: string[] }} offerArgs
- */
-const makePortfolioAcctHandler = async (
-  orch,
-  makePortfolioHolder,
-  seat,
-  { chainNames },
-) => {
-  seat.exit(); // no funds exchanged
-  mustMatch(chainNames, M.arrayOf(M.string()));
-  const allChains = await Promise.all(chainNames.map(n => orch.getChain(n)));
-  const allAccounts = await Promise.all(allChains.map(c => c.makeAccount()));
-
-  const accountEntries = harden(
-    /** @type {[string, OrchestrationAccount<any>][]} */ (
-      chainNames.map((chainName, index) => [chainName, allAccounts[index]])
-    ),
-  );
-  const publicTopicEntries = harden(
-    /** @type {[string, ResolvedPublicTopic<unknown>][]} */ (
-      await Promise.all(
-        accountEntries.map(async ([name, account]) => {
-          const { account: topicRecord } = await account.getPublicTopics();
-          return [name, topicRecord];
-        }),
-      )
-    ),
-  );
-  const portfolioHolder = makePortfolioHolder(
-    accountEntries,
-    publicTopicEntries,
-  );
-
-  return portfolioHolder.asContinuingOffer();
-};
-
 /**
  * @param {ZCF} zcf
  * @param {OrchestrationPowers & {
@@ -88,23 +22,18 @@ const makePortfolioAcctHandler = async (
  * @param {Zone} zone
  * @param {OrchestrationTools} tools
  */
-const contract = async (zcf, _privateArgs, zone, { orchestrate, vowTools }) => {
+const contract = async (
+  zcf,
+  _privateArgs,
+  zone,
+  { orchestrateAll, vowTools },
+) => {
   const makePortfolioHolder = preparePortfolioHolder(
     zone.subZone('portfolio'),
     vowTools,
   );
 
-  const makeOrchAccount = orchestrate(
-    'makeOrchAccount',
-    undefined,
-    makeOrchAccountHandler,
-  );
-
-  const makePortfolioAccount = orchestrate(
-    'makePortfolioAccount',
-    makePortfolioHolder,
-    makePortfolioAcctHandler,
-  );
+  const orchFns = orchestrateAll(flows, { makePortfolioHolder });
 
   const publicFacet = zone.exo(
     'Basic Flows Public Facet',
@@ -115,13 +44,13 @@ const contract = async (zcf, _privateArgs, zone, { orchestrate, vowTools }) => {
     {
       makeOrchAccountInvitation() {
         return zcf.makeInvitation(
-          makeOrchAccount,
+          orchFns.makeOrchAccount,
           'Make an Orchestration Account',
         );
       },
       makePortfolioAccountInvitation() {
         return zcf.makeInvitation(
-          makePortfolioAccount,
+          orchFns.makePortfolioAccount,
           'Make an Orchestration Account',
         );
       },

package/src/examples/basic-flows.flows.d.ts

@@ -0,0 +1,19 @@
+export function makeOrchAccount(orch: Orchestrator, _ctx: any, seat: ZCFSeat, { chainName }: {
+    chainName: string;
+}): Promise<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>;
+export function makePortfolioAccount(orch: Orchestrator, { makePortfolioHolder }: {
+    makePortfolioHolder: MakePortfolioHolder;
+}, seat: ZCFSeat, { chainNames }: {
+    chainNames: string[];
+}): Promise<import("@agoric/vow").Vow<{
+    publicSubscribers: {
+        [k: string]: ResolvedPublicTopic<unknown>;
+    };
+    invitationMakers: import("@endo/exo").Guarded<{
+        MakeInvitation<IA extends unknown[]>(chainName: string, action: string, invitationArgs: IA): Promise<Invitation<unknown, IA>>;
+    }>;
+}>>;
+import type { Orchestrator } from '@agoric/orchestration';
+import type { MakePortfolioHolder } from '../exos/portfolio-holder-kit.js';
+import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
+//# sourceMappingURL=basic-flows.flows.d.ts.map

package/src/examples/basic-flows.flows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"basic-flows.flows.d.ts","sourceRoot":"","sources":["basic-flows.flows.js"],"names":[],"mappings":"AAyBO,sCALI,YAAY,QACZ,GAAG,QACH,OAAO,iBACP;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,0EAQ/B;AAeM,2CANI,YAAY,2BAEpB;IAAiC,mBAAmB,EAA5C,mBAAmB;CAC3B,QAAQ,OAAO,kBACP;IAAE,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE;;;;;;;IAkClC;kCAtEuE,uBAAuB;yCAGzD,iCAAiC;yCAFjC,2CAA2C"}

package/src/examples/basic-flows.flows.js

@@ -0,0 +1,79 @@
+/**
+ * @file Primarily a testing fixture, but also serves as an example of how to
+ *   leverage basic functionality of the Orchestration API with async-flow.
+ */
+import { M, mustMatch } from '@endo/patterns';
+
+/**
+ * @import {Zone} from '@agoric/zone';
+ * @import {OrchestrationAccount, OrchestrationFlow, Orchestrator} from '@agoric/orchestration';
+ * @import {ResolvedPublicTopic} from '@agoric/zoe/src/contractSupport/topics.js';
+ * @import {OrchestrationPowers} from '../utils/start-helper.js';
+ * @import {MakePortfolioHolder} from '../exos/portfolio-holder-kit.js';
+ * @import {OrchestrationTools} from '../utils/start-helper.js';
+ */
+
+/**
+ * Create an OrchestrationAccount for a specific chain and return a continuing
+ * offer with invitations makers for Delegate, WithdrawRewards, Transfer, etc.
+ *
+ * @satisfies {OrchestrationFlow}
+ * @param {Orchestrator} orch
+ * @param {any} _ctx
+ * @param {ZCFSeat} seat
+ * @param {{ chainName: string }} offerArgs
+ */
+export const makeOrchAccount = async (orch, _ctx, seat, { chainName }) => {
+  seat.exit(); // no funds exchanged
+  mustMatch(chainName, M.string());
+  const remoteChain = await orch.getChain(chainName);
+  const orchAccount = await remoteChain.makeAccount();
+  return orchAccount.asContinuingOffer();
+};
+
+/**
+ * Create accounts on multiple chains and return them in a single continuing
+ * offer with invitations makers for Delegate, WithdrawRewards, Transfer, etc.
+ * Calls to the underlying invitationMakers are proxied through the
+ * `MakeInvitation` invitation maker.
+ *
+ * @satisfies {OrchestrationFlow}
+ * @param {Orchestrator} orch
+ * @param {object} ctx
+ * @param {MakePortfolioHolder} ctx.makePortfolioHolder
+ * @param {ZCFSeat} seat
+ * @param {{ chainNames: string[] }} offerArgs
+ */
+export const makePortfolioAccount = async (
+  orch,
+  { makePortfolioHolder },
+  seat,
+  { chainNames },
+) => {
+  seat.exit(); // no funds exchanged
+  mustMatch(chainNames, M.arrayOf(M.string()));
+  const allChains = await Promise.all(chainNames.map(n => orch.getChain(n)));
+  const allAccounts = await Promise.all(allChains.map(c => c.makeAccount()));
+
+  const accountEntries = harden(
+    /** @type {[string, OrchestrationAccount<any>][]} */ (
+      chainNames.map((chainName, index) => [chainName, allAccounts[index]])
+    ),
+  );
+  const publicTopicEntries = harden(
+    /** @type {[string, ResolvedPublicTopic<unknown>][]} */ (
+      await Promise.all(
+        accountEntries.map(async ([name, account]) => {
+          const { account: topicRecord } = await account.getPublicTopics();
+          return [name, topicRecord];
+        }),
+      )
+    ),
+  );
+  const portfolioHolder = makePortfolioHolder(
+    accountEntries,
+    publicTopicEntries,
+  );
+
+  return portfolioHolder.asContinuingOffer();
+};

package/src/examples/sendAnywhere.contract.js

@@ -54,7 +54,7 @@ const contract = async (
 ) => {
   const contractState = makeStateRecord(
     /** @type {{ account: OrchestrationAccount<any> | undefined }} */ {
-      account: undefined,
+      localAccount: undefined,
     },
   );
 

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

@@ -2,7 +2,7 @@
  * @satisfies {OrchestrationFlow}
  * @param {Orchestrator} orch
  * @param {object} ctx
- * @param {{ account?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
+ * @param {{ localAccount?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
  * @param {GuestOf<ZoeTools['localTransfer']>} ctx.localTransfer
  * @param {(brand: Brand) => Promise<VBankAssetDetail>} ctx.findBrandInVBank
  * @param {ZCFSeat} seat
@@ -10,7 +10,7 @@
  */
 export function sendIt(orch: Orchestrator, { contractState, localTransfer, findBrandInVBank }: {
     contractState: {
-        account?: OrchestrationAccountI & LocalAccountMethods;
+        localAccount?: OrchestrationAccountI & LocalAccountMethods;
     };
     localTransfer: GuestOf<ZoeTools["localTransfer"]>;
     findBrandInVBank: (brand: Brand) => Promise<VBankAssetDetail>;

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

@@ -1 +1 @@
-{"version":3,"file":"sendAnywhere.flows.d.ts","sourceRoot":"","sources":["sendAnywhere.flows.js"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AACH,6BARW,YAAY,sDAEpB;IAAuE,aAAa,EAA5E;QAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IACjB,aAAa,EAArD,QAAQ,QAAQ,CAAC,eAAe,CAAC,CAAC;IACe,gBAAgB,EAAjE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,gBAAgB,CAAC;CACnD,QAAQ,OAAO,aACP;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,iBAmCjD;kCAnD6F,aAAa;2CAAb,aAAa;yCAAb,aAAa;8BADhF,uBAAuB;6BAFxB,oBAAoB;sCACX,mCAAmC"}
+{"version":3,"file":"sendAnywhere.flows.d.ts","sourceRoot":"","sources":["sendAnywhere.flows.js"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AACH,6BARW,YAAY,sDAEpB;IAA4E,aAAa,EAAjF;QAAE,YAAY,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IACtB,aAAa,EAArD,QAAQ,QAAQ,CAAC,eAAe,CAAC,CAAC;IACe,gBAAgB,EAAjE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,gBAAgB,CAAC;CACnD,QAAQ,OAAO,aACP;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,iBAmCjD;kCAnD6F,aAAa;2CAAb,aAAa;yCAAb,aAAa;8BADhF,uBAAuB;6BAFxB,oBAAoB;sCACX,mCAAmC"}

package/src/examples/sendAnywhere.flows.js

@@ -16,7 +16,7 @@ const { entries } = Object;
  * @satisfies {OrchestrationFlow}
  * @param {Orchestrator} orch
  * @param {object} ctx
- * @param {{ account?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
+ * @param {{ localAccount?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
  * @param {GuestOf<ZoeTools['localTransfer']>} ctx.localTransfer
  * @param {(brand: Brand) => Promise<VBankAssetDetail>} ctx.findBrandInVBank
  * @param {ZCFSeat} seat
@@ -36,18 +36,18 @@ export async function sendIt(
   const { denom } = await findBrandInVBank(amt.brand);
   const chain = await orch.getChain(chainName);
 
-  if (!contractState.account) {
+  if (!contractState.localAccount) {
     const agoricChain = await orch.getChain('agoric');
-    contractState.account = await agoricChain.makeAccount();
+    contractState.localAccount = await agoricChain.makeAccount();
   }
 
   const info = await chain.getChainInfo();
   const { chainId } = info;
   assert(typeof chainId === 'string', 'bad chainId');
 
-  await localTransfer(seat, contractState.account, give);
+  await localTransfer(seat, contractState.localAccount, give);
 
-  await contractState.account.transfer(
+  await contractState.localAccount.transfer(
     { denom, value: amt.value },
     {
       value: destAddr,

package/src/utils/zoe-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoe-tools.d.ts","sourceRoot":"","sources":["zoe-tools.js"],"names":[],"mappings":"AAiCO,mCAHI,IAAI,qBACJ;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE;;EA+C1C;4CAjEY;IACZ,gBAAoB,EAAE,gBAAgB,CAAC;IACvC,iBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC;CAC7D;4BAMS,CACZ,OAAW,EAAE,OAAO,EACpB,YAAgB,EAAE,mBAAmB,EACrC,IAAQ,EAAE,mBAAmB,KACtB,OAAO,CAAC,IAAI,CAAC;uBAqDP,UAAU,CAAC,OAAO,YAAY,CAAC;0BAxEtB,cAAc;8BADL,aAAa;yCAGP,aAAa;yBAHnB,aAAa;sCAFV,mCAAmC;yCAChC,2CAA2C"}
+{"version":3,"file":"zoe-tools.d.ts","sourceRoot":"","sources":["zoe-tools.js"],"names":[],"mappings":"AAkCO,mCAHI,IAAI,qBACJ;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE;;EA+C1C;4CAjEY;IACZ,gBAAoB,EAAE,gBAAgB,CAAC;IACvC,iBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC;CAC7D;4BAMS,CACZ,OAAW,EAAE,OAAO,EACpB,YAAgB,EAAE,mBAAmB,EACrC,IAAQ,EAAE,mBAAmB,KACtB,OAAO,CAAC,IAAI,CAAC;uBAqDP,UAAU,CAAC,OAAO,YAAY,CAAC;0BAxEtB,cAAc;8BADL,aAAa;yCAGP,aAAa;yBAHnB,aAAa;sCAFV,mCAAmC;yCAChC,2CAA2C"}

package/src/utils/zoe-tools.js

@@ -1,5 +1,6 @@
 import { Fail } from '@endo/errors';
 import { atomicTransfer } from '@agoric/zoe/src/contractSupport/index.js';
+import { E } from '@endo/far';
 
 /**
  * @import {InvitationMakers} from '@agoric/smart-wallet/src/types.js';
@@ -64,7 +65,7 @@ export const makeZoeTools = (zone, { zcf, vowTools }) => {
       // Now all the `give` are accessible, so we can move them to the localAccount`
 
       const promises = Object.entries(give).map(async ([kw, _amount]) => {
-        const pmt = await userSeat.getPayout(kw);
+        const pmt = await E(userSeat).getPayout(kw);
         // TODO arrange recovery on upgrade of pmt?
         return localAccount.deposit(pmt);
       });