@agoric/orchestration 0.1.1-dev-f908f89.0 → 0.1.1-dev-a035bbe.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-f908f89.0+f908f89",
+  "version": "0.1.1-dev-a035bbe.0+a035bbe",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -32,19 +32,20 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-f908f89.0+f908f89",
-    "@agoric/cosmic-proto": "0.4.1-dev-f908f89.0+f908f89",
-    "@agoric/ertp": "0.16.3-dev-f908f89.0+f908f89",
-    "@agoric/internal": "0.3.3-dev-f908f89.0+f908f89",
-    "@agoric/network": "0.1.1-dev-f908f89.0+f908f89",
-    "@agoric/notifier": "0.6.3-dev-f908f89.0+f908f89",
-    "@agoric/store": "0.9.3-dev-f908f89.0+f908f89",
-    "@agoric/time": "0.3.3-dev-f908f89.0+f908f89",
-    "@agoric/vat-data": "0.5.3-dev-f908f89.0+f908f89",
-    "@agoric/vats": "0.15.2-dev-f908f89.0+f908f89",
-    "@agoric/vow": "0.1.1-dev-f908f89.0+f908f89",
-    "@agoric/zoe": "0.26.3-dev-f908f89.0+f908f89",
-    "@agoric/zone": "0.2.3-dev-f908f89.0+f908f89",
+    "@agoric/assert": "0.6.1-dev-a035bbe.0+a035bbe",
+    "@agoric/async-flow": "0.1.1-dev-a035bbe.0+a035bbe",
+    "@agoric/cosmic-proto": "0.4.1-dev-a035bbe.0+a035bbe",
+    "@agoric/ertp": "0.16.3-dev-a035bbe.0+a035bbe",
+    "@agoric/internal": "0.3.3-dev-a035bbe.0+a035bbe",
+    "@agoric/network": "0.1.1-dev-a035bbe.0+a035bbe",
+    "@agoric/notifier": "0.6.3-dev-a035bbe.0+a035bbe",
+    "@agoric/store": "0.9.3-dev-a035bbe.0+a035bbe",
+    "@agoric/time": "0.3.3-dev-a035bbe.0+a035bbe",
+    "@agoric/vat-data": "0.5.3-dev-a035bbe.0+a035bbe",
+    "@agoric/vats": "0.15.2-dev-a035bbe.0+a035bbe",
+    "@agoric/vow": "0.1.1-dev-a035bbe.0+a035bbe",
+    "@agoric/zoe": "0.26.3-dev-a035bbe.0+a035bbe",
+    "@agoric/zone": "0.2.3-dev-a035bbe.0+a035bbe",
     "@endo/base64": "^1.0.5",
     "@endo/far": "^1.1.2",
     "@endo/marshal": "^1.5.0",
@@ -87,5 +88,5 @@
   "typeCoverage": {
     "atLeast": 97.1
   },
-  "gitHead": "f908f89186162df83b540f6aeb1f4c665c3a56b4"
+  "gitHead": "a035bbe9d3a46247ed2199e4ca707103a9e04bfd"
 }

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

@@ -1 +1 @@
-{"version":3,"file":"sendAnywhere.contract.d.ts","sourceRoot":"","sources":["sendAnywhere.contract.js"],"names":[],"mappings":"AAgBA;;;;;;;;GAQG;AAEH;;;;;;;;GAQG;AAEH,kEAKE;AASK,2BANI,GAAG,eACH,mBAAmB,GAAG;IAChC,UAAc,EAAE,UAAU,CAAC;CACxB;;;;;QAsGE;;;WAGG;;;;;;;;;;GAgBR;;;;;8BAjEO,MAAC,KAAK,CAAC;6BAiBb,QAEA,KAAI,CAAC,mBACH,OAAO;6BAuBL,OACF,KAAE,CAAC;;;2BAsBwG,EAAE;;;;;;;oBAAqjG,CAAC;;;uBAA6lB,EAAE;;;;;;;;;;;;;;;;;6BAxJ5uH,kBAAkB;uCACS,eAAe;4BAK3C,aAAa;kCAJK,cAAc;6BAG/B,cAAc"}
+{"version":3,"file":"sendAnywhere.contract.d.ts","sourceRoot":"","sources":["sendAnywhere.contract.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AAEH;;;;;;;;GAQG;AAEH,kEAKE;AASK,2BANI,GAAG,eACH,mBAAmB,GAAG;IAChC,UAAc,EAAE,UAAU,CAAC;CACxB;;;;;QAsFE;;;WAGG;;;;;;;;;;GAgBR;;;;;8BAtCS,MAAA,KAAC,CAAC;6BAuBF,QAAQ,KAAK,CAAC,mBAChB,OAAE;6BAesJ,OAAO,KAAK,CAAC;;;2BAA6rB,EAAE;;;;;;;oBAAqjG,CAAC;;;uBAA6lB,EAAE;;;;;;;;;;;;;;;;;6BAxIv+I,kBAAkB;uCACS,eAAe;4BAK3C,aAAa;kCAJK,cAAc;6BAG/B,cAAc"}

package/src/examples/sendAnywhere.contract.js

@@ -1,15 +1,11 @@
-import { makeDurableZone } from '@agoric/zone/durable.js';
-import { M, mustMatch } from '@endo/patterns';
+import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
 import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
 import { E } from '@endo/far';
-import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
+import { M, mustMatch } from '@endo/patterns';
 
 import { AmountShape } from '@agoric/ertp';
-import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
 import { CosmosChainInfoShape } from '../typeGuards.js';
-import { makeOrchestrationFacade } from '../facade.js';
-import { prepareLocalChainAccountKit } from '../exos/local-chain-account-kit.js';
-import { makeChainHub } from '../utils/chainHub.js';
+import { provideOrchestration } from '../utils/start-helper.js';
 
 const { entries } = Object;
 const { Fail } = assert;
@@ -49,28 +45,12 @@ export const SingleAmountRecord = M.and(
  * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
-  const zone = makeDurableZone(baggage);
-
-  const chainHub = makeChainHub(privateArgs.agoricNames);
-
-  // TODO once durability is settled, provide some helpers to reduce boilerplate
-  const { marshaller, ...orchPowers } = privateArgs;
-  const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
-  const makeLocalChainAccountKit = prepareLocalChainAccountKit(
-    zone,
-    makeRecorderKit,
+  const { chainHub, orchestrate, zone } = provideOrchestration(
     zcf,
-    privateArgs.timerService,
-    chainHub,
+    baggage,
+    privateArgs,
+    privateArgs.marshaller,
   );
-  const { orchestrate } = makeOrchestrationFacade({
-    zcf,
-    zone,
-    chainHub,
-    makeLocalChainAccountKit,
-    makeRecorderKit,
-    ...orchPowers,
-  });
 
   let contractAccount;
 

package/src/examples/swapExample.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swapExample.contract.d.ts","sourceRoot":"","sources":["swapExample.contract.js"],"names":[],"mappings":"AAcA;;;;;;;;GAQG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAWnC;AASK,0CAHI,KAAK;;;EAIsC;AAc/C,2BAXI,GAAG;;;;;8BAyDA,MAAM,KAAK,CAAC;6BAec,QAAQ,KAEhD,CAAC,mBAA6B,OAAO;6BAiB3B,OAAA,KAAC,CAAC;;;2BA2BmC,EAAE;;;;;;;oBAAqjG,CAAC;;;uBAA6lB,EAAE;;;;;;;;;;;;;;;gBA/GrrH,UAAU;;;;oBA+CV,MAAM,CAAC,KAAK,CAAC;;;;;oBAAb,MAAM,CAAC,KAAK,CAAC;;;;GA+D7B;6BAhJyB,cAAc;4BAHf,kBAAkB;gCAHwB,aAAa;kCACjD,cAAc;6BAInB,kBAAkB;4CALuB,aAAa"}
+{"version":3,"file":"swapExample.contract.d.ts","sourceRoot":"","sources":["swapExample.contract.js"],"names":[],"mappings":"AASA;;;;;;;;GAQG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAWnC;AASK,0CAHI,KAAK;;;EAIsC;AAc/C,2BAXI,GAAG;;;;;8BAiEuC,MAC/C,KAAG,CAAC;6BAgBmC,QAAQ,KAClD,CAAC,mBAGgB,OAAO;6BAkB4H,OAAO,KAAK,CAAC;;;2BAA6rB,EAAE;;;;;;;oBAAqjG,CAAC;;;uBAA6lB,EAAE;;;;;;;;;;;;;;;gBAjGv+I,UAAU;;;;oBAiCV,MAAM,CAAC,KAAK,CAAC;;;;;oBAAb,MAAM,CAAC,KAAK,CAAC;;;;GA+D7B;6BAlIyB,cAAc;4BAHf,kBAAkB;gCAHwB,aAAa;kCACjD,cAAc;6BAInB,kBAAkB;4CALuB,aAAa"}

package/src/examples/swapExample.contract.js

@@ -1,16 +1,11 @@
 import { StorageNodeShape } from '@agoric/internal';
 import { TimerServiceShape } from '@agoric/time';
 import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
-import { E, Far } from '@endo/far';
+import { Far } from '@endo/far';
 import { deeplyFulfilled } from '@endo/marshal';
 import { M, objectMap } from '@endo/patterns';
-import { provideAll } from '@agoric/zoe/src/contractSupport';
-import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
-import { makeOrchestrationFacade } from '../facade.js';
 import { orcUtils } from '../utils/orc.js';
-import { makeChainHub } from '../utils/chainHub.js';
-import { prepareLocalChainAccountKit } from '../exos/local-chain-account-kit.js';
+import { provideOrchestration } from '../utils/start-helper.js';
 
 /**
  * @import {Orchestrator, IcaAccount, CosmosValidatorAddress} from '../types.js'
@@ -58,10 +53,6 @@ export const makeNatAmountShape = (brand, min) =>
  * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
-  const { brands } = zcf.getTerms();
-
-  const zone = makeDurableZone(baggage);
-
   const {
     agoricNames,
     localchain,
@@ -71,30 +62,20 @@ export const start = async (zcf, privateArgs, baggage) => {
     marshaller,
   } = privateArgs;
 
-  const chainHub = makeChainHub(agoricNames);
-  const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
-  const makeLocalChainAccountKit = prepareLocalChainAccountKit(
-    zone,
-    makeRecorderKit,
+  const { orchestrate } = provideOrchestration(
     zcf,
-    timerService,
-    chainHub,
+    baggage,
+    {
+      agoricNames,
+      localchain,
+      orchestrationService,
+      storageNode,
+      timerService,
+    },
+    marshaller,
   );
-  const { accountsStorageNode } = await provideAll(baggage, {
-    accountsStorageNode: () => E(storageNode).makeChildNode('accounts'),
-  });
 
-  const { orchestrate } = makeOrchestrationFacade({
-    localchain,
-    orchestrationService,
-    storageNode: accountsStorageNode,
-    timerService,
-    zcf,
-    zone,
-    chainHub,
-    makeLocalChainAccountKit,
-    makeRecorderKit,
-  });
+  const { brands } = zcf.getTerms();
 
   /** deprecated historical example */
   /**

package/src/examples/unbondExample.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unbondExample.contract.d.ts","sourceRoot":"","sources":["unbondExample.contract.js"],"names":[],"mappings":"AA8BO,2BAXI,GAAG;;;;;8BA0E+B,MACzC,KAAC,CAAC;6BAkBoG,QAAQ,KAAK,CAAC,mBAA6B,OAAO;6BAAwjB,OAAO,KAAK,CAAC;;;2BAA6rB,EAAE;;;;;;;oBAAqjG,CAAC;;;uBAA6lB,EAAE;;;;;;;;;;;;;;gBAvFpiK,UAAU;;;;;;;;GAsF1B;6BAlGyB,cAAc;4BACf,kBAAkB;gCALwB,aAAa;kCACjD,cAAc;6BACnB,kBAAkB"}
+{"version":3,"file":"unbondExample.contract.d.ts","sourceRoot":"","sources":["unbondExample.contract.js"],"names":[],"mappings":"AA0BO,2BAXI,GAAG;;;;;8BAoFuL,MAAM,KAAK,CAAC;6BAA6gB,QAAQ,KAAK,CAAC,mBAA6B,OAAO;6BAAwjB,OAAO,KAAK,CAAC;;;2BAA6rB,EAAE;;;;;;;oBAAqjG,CAAC;;;uBAA6lB,EAAE;;;;;;;;;;;;;;gBA9ExpL,UAAU;;;;;;;;GA6E1B;6BAzFyB,cAAc;4BACf,kBAAkB;gCALwB,aAAa;kCACjD,cAAc;6BACnB,kBAAkB"}

package/src/examples/unbondExample.contract.js

@@ -1,10 +1,6 @@
-import { makeDurableZone } from '@agoric/zone/durable.js';
 import { Far } from '@endo/far';
 import { M } from '@endo/patterns';
-import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
-import { makeOrchestrationFacade } from '../facade.js';
-import { makeChainHub } from '../utils/chainHub.js';
-import { prepareLocalChainAccountKit } from '../exos/local-chain-account-kit.js';
+import { provideOrchestration } from '../utils/start-helper.js';
 
 /**
  * @import {Orchestrator, IcaAccount, CosmosValidatorAddress} from '../types.js'
@@ -37,28 +33,19 @@ export const start = async (zcf, privateArgs, baggage) => {
     marshaller,
     timerService,
   } = privateArgs;
-  const zone = makeDurableZone(baggage);
 
-  const chainHub = makeChainHub(agoricNames);
-  const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
-  const makeLocalChainAccountKit = prepareLocalChainAccountKit(
-    zone,
-    makeRecorderKit,
+  const { orchestrate } = provideOrchestration(
     zcf,
-    privateArgs.timerService,
-    chainHub,
+    baggage,
+    {
+      agoricNames,
+      localchain,
+      orchestrationService,
+      storageNode,
+      timerService,
+    },
+    marshaller,
   );
-  const { orchestrate } = makeOrchestrationFacade({
-    localchain,
-    orchestrationService,
-    storageNode,
-    timerService,
-    zcf,
-    zone,
-    chainHub: makeChainHub(agoricNames),
-    makeLocalChainAccountKit,
-    makeRecorderKit,
-  });
 
   /** @type {OfferHandler} */
   const unbondAndLiquidStake = orchestrate(

package/src/facade.d.ts

@@ -1,4 +1,4 @@
-export function makeOrchestrationFacade({ zone, timerService, zcf, storageNode, orchestrationService, localchain, chainHub, makeLocalChainAccountKit, makeRecorderKit, }: {
+export function makeOrchestrationFacade({ zone, timerService, zcf, storageNode, orchestrationService, localchain, chainHub, makeLocalChainAccountKit, makeRecorderKit, asyncFlowTools, }: {
     zone: Zone;
     timerService: Remote<TimerService>;
     zcf: ZCF;
@@ -37,6 +37,38 @@ export function makeOrchestrationFacade({ zone, timerService, zcf, storageNode,
     chainHub: import("./utils/chainHub.js").ChainHub;
     makeLocalChainAccountKit: ReturnType<typeof import("./exos/local-chain-account-kit.js").prepareLocalChainAccountKit>;
     makeRecorderKit: <T_1>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: import("@agoric/zoe/src/contractSupport/recorder.js").TypedMatcher<T_1> | undefined) => RecorderKit<T_1>;
+    asyncFlowTools: {
+        prepareAsyncFlowKit: (zone: Zone, tag: string, guestAsyncFunc: import("../../../node_modules/@agoric/async-flow/src/types.js").GuestAsyncFunc, options?: {
+            startEager?: boolean | undefined;
+        } | undefined) => (activationArgs: any) => import("@endo/exo").GuardedKit<{
+            flow: {
+                getFlowState(): import("../../../node_modules/@agoric/async-flow/src/types.js").FlowState;
+                restart(eager?: boolean | undefined): void;
+                wake(): void;
+                getOutcome(): import("@agoric/vow").Vow<any>;
+                dump(): ([op: "doFulfill", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, fulfillment: import("@endo/pass-style").Passable] | [op: "doReject", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, reason: import("@endo/pass-style").Passable] | [op: "doReturn", callIndex: number, result: import("@endo/pass-style").Passable] | [op: "doThrow", callIndex: number, problem: import("@endo/pass-style").Passable] | [op: "checkCall", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number])[];
+                getOptFatalProblem(): any;
+            };
+            admin: {
+                reset(): void;
+                complete(): void;
+                panic(fatalProblem: any): never;
+            };
+            wakeWatcher: {
+                onFulfilled(_fulfillment: any): void;
+                onRejected(_fulfillment: any): void;
+            };
+        }>;
+        asyncFlow: (zone: Zone, tag: string, guestFunc: import("../../../node_modules/@agoric/async-flow/src/types.js").GuestAsyncFunc, options?: {
+            startEager?: boolean | undefined;
+        } | undefined) => import("../../../node_modules/@agoric/async-flow/src/types.js").HostAsyncFuncWrapper;
+        adminAsyncFlow: import("@endo/exo").Guarded<{
+            getFailures(): import("@endo/patterns").CopyMap<any, import("@endo/pass-style").Passable>;
+            wakeAll(): void;
+            getFlowForOutcomeVow(outcomeVow: any): any;
+        }>;
+        allWokenP: Promise<void>;
+    };
 }): {
     /**
      * @template Context

package/src/facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facade.d.ts","sourceRoot":"","sources":["facade.js"],"names":[],"mappings":"AAgKO;;;SAXG,GAAG;;;;;;;;;;;;;8BA7CZ,MACC,KAAK,CAAC;6BAiBS,QAAQ,KACtB,CAAC,mBAA6B,OAAO;6BA0BnC,OAAM,KACV,CAAC;;;2BA2BA,EAAE;;;;;;;oBAqDu8C,CAAC;;;uBAA6lB,EAAE;;;;;cA7E5hE,OAAO,qBAAqB,EAAE,QAAQ;8BACtB,UAAU,CACxC,cAAoB,mCAAmC,EAAE,2BAA2B,CAC/E;wCAC+B,WAC5B,GAAE,QAER,OAAO,WAAW,EAAE,MAAM,CAAC,WAAW,CACzC,CAAC;;IAmBG;;;;;;;;OAQG;gBAFkC,OAAO,EACrB,IAAI,6BAJhB,MAAM,OAGoB,OAAO,AAD1B,gCACmB,OAAO,WACrB,IAAI,AADgC,KAAK,MAAM,GACzD,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC;EAwCnD;kCAEa,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BA/NjC,cAAc;kCACN,cAAc;4BAIpB,kBAAkB;iCADI,6CAA6C;kCAGe,YAAY"}
+{"version":3,"file":"facade.d.ts","sourceRoot":"","sources":["facade.js"],"names":[],"mappings":"AAmKO;;;SAZG,GAAG;;;;;;;;;;;;;8BAjDQ,MAAM,KAAK,CAAC;6BAoBrB,QAAO,KAAK,CAAC,mBAA6B,OACtD;6BAoBI,OACF,KACD,CAAC;;;2BA4BI,EAAE;;;;;;;oBAiE4nC,CAAC;;;uBAA6lB,EAAE;;;;;cAnFrtD,OAAO,qBAAqB,EAAE,QAAQ;8BACtB,UAAU,CACxC,cAAoB,mCAAmC,EAAE,2BAA2B,CAC/E;wCAD+B,WAAW,GAAE,QAAS,OAAO,WAAW,EAAE,MAAM,CACpF,WACE,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA6BD;;;;;;;;OAQG;gBAFkC,OAAO,EACrB,IAAI,6BAJhB,MAAM,OAGoB,OAAO,AAD1B,gCACmB,OAAO,WACrB,IAAI,AADgC,KAAK,MAAM,GACzD,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC;EAwCnD;kCAEa,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BArOjC,cAAc;kCACN,cAAc;4BAIpB,kBAAkB;iCADI,6CAA6C;kCAGe,YAAY"}

package/src/facade.js

@@ -1,9 +1,11 @@
 /** @file Orchestration service */
 
 import { V as E } from '@agoric/vow/vat.js';
+import { Fail } from '@agoric/assert';
 import { prepareCosmosOrchestrationAccount } from './exos/cosmosOrchestrationAccount.js';
 
 /**
+ * @import {AsyncFlowTools} from '@agoric/async-flow';
  * @import {Zone} from '@agoric/zone';
  * @import {TimerService} from '@agoric/time';
  * @import {IBCConnectionID} from '@agoric/vats';
@@ -156,6 +158,7 @@ const makeRemoteChainFacade = (
  *     typeof import('./exos/local-chain-account-kit.js').prepareLocalChainAccountKit
  *   >;
  *   makeRecorderKit: MakeRecorderKit;
+ *   asyncFlowTools: AsyncFlowTools;
  * }} powers
  */
 export const makeOrchestrationFacade = ({
@@ -168,14 +171,19 @@ export const makeOrchestrationFacade = ({
   chainHub,
   makeLocalChainAccountKit,
   makeRecorderKit,
+  asyncFlowTools,
 }) => {
-  console.log('makeOrchestrationFacade got', {
-    zone,
-    timerService,
-    zcf,
-    storageNode,
-    orchestrationService,
-  });
+  (zone &&
+    timerService &&
+    zcf &&
+    storageNode &&
+    orchestrationService &&
+    // @ts-expect-error type says defined but double check
+    makeLocalChainAccountKit &&
+    // @ts-expect-error type says defined but double check
+    makeRecorderKit &&
+    asyncFlowTools) ||
+    Fail`params missing`;
 
   return {
     /**