@agoric/orchestration 0.2.0-upgrade-17-dev-ec448b0.0 → 0.2.0-upgrade-18-dev-b9b8db4.0

package/src/typeGuards.js

@@ -73,9 +73,6 @@ export const IBCConnectionInfoShape = M.splitRecord({
   counterparty: {
     client_id: M.string(),
     connection_id: IBCConnectionIDShape,
-    prefix: {
-      key_prefix: M.string(),
-    },
   },
   transferChannel: IBCChannelInfoShape,
 });
@@ -108,7 +105,6 @@ export const CosmosChainInfoShape = M.splitRecord(
 export const ChainInfoShape = M.splitRecord({
   chainId: M.string(),
 });
-export const LocalChainAccountShape = M.remotable('LocalChainAccount');
 export const DenomShape = M.string();
 
 /** @type {TypedPattern<DenomInfo<any, any>>} */
@@ -137,10 +133,13 @@ export const AmountArgShape = M.or(AnyNatAmountShape, DenomAmountShape);
  *   amount: AmountArg;
  * }>}
  */
-export const DelegationShape = harden({
-  validator: ChainAddressShape,
-  amount: AmountArgShape,
-});
+export const DelegationShape = M.splitRecord(
+  {
+    validator: ChainAddressShape,
+    amount: AmountArgShape,
+  },
+  { delegator: ChainAddressShape },
+);
 
 /** Approximately @see RequestQuery */
 export const ICQMsgShape = M.splitRecord(
@@ -160,8 +159,11 @@ export const chainFacadeMethods = harden({
 /**
  * for google/protobuf/timestamp.proto, not to be confused with TimestampShape
  * from `@agoric/time`
+ *
+ * `seconds` is a big integer but since it goes through JSON it is encoded as
+ * string
  */
-export const TimestampProtoShape = { seconds: M.nat(), nanos: M.number() };
+export const TimestampProtoShape = { seconds: M.string(), nanos: M.number() };
 
 /**
  * see {@link TxBody} for more details
@@ -177,3 +179,13 @@ export const TxBodyOptsShape = M.splitRecord(
     nonCriticalExtensionOptions: M.arrayOf(M.any()),
   },
 );
+
+/**
+ * Ensures at least one {@link AmountKeywordRecord} entry is present and only
+ * permits Nat (fungible) amounts.
+ */
+export const AnyNatAmountsRecord = M.and(
+  M.recordOf(M.string(), AnyNatAmountShape),
+  M.not(harden({})),
+);
+harden(AnyNatAmountsRecord);

package/src/types-index.d.ts

@@ -0,0 +1 @@
+export type * from './types.js';

package/src/types-index.js

@@ -0,0 +1 @@
+export {};

package/src/types.d.ts

@@ -2,12 +2,22 @@
 export type * from './chain-info.js';
 export type * from './cosmos-api.js';
 export type * from './ethereum-api.js';
+export type * from './exos/chain-hub.js';
+export type * from './exos/combine-invitation-makers.js';
+export type * from './exos/cosmos-interchain-service.js';
+export type * from './exos/exo-interfaces.js';
 export type * from './exos/ica-account-kit.js';
-export type * from './exos/local-chain-facade.js';
 export type * from './exos/icq-connection-kit.js';
-export type * from './exos/exo-interfaces.js';
+export type * from './exos/local-chain-facade.js';
+export type * from './exos/portfolio-holder-kit.js';
 export type * from './orchestration-api.js';
-export type * from './exos/cosmos-interchain-service.js';
-export type * from './exos/chain-hub.js';
 export type * from './vat-orchestration.js';
+/**
+ * ({@link ZCF})-like tools for use in {@link OrchestrationFlow}s.
+ */
+export interface ZcfTools {
+    assertUniqueKeyword: ZCF['assertUniqueKeyword'];
+    atomicRearrange: ZCF['atomicRearrange'];
+    makeInvitation: ZCF['makeInvitation'];
+}
 //# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAEhG,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,mBAAmB,CAAC;AACvC,mBAAmB,2BAA2B,CAAC;AAC/C,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,0BAA0B,CAAC;AAC9C,mBAAmB,wBAAwB,CAAC;AAC5C,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,wBAAwB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAEhG,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,mBAAmB,CAAC;AACvC,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,0BAA0B,CAAC;AAC9C,mBAAmB,2BAA2B,CAAC;AAC/C,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,gCAAgC,CAAC;AACpD,mBAAmB,wBAAwB,CAAC;AAC5C,mBAAmB,wBAAwB,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,mBAAmB,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAChD,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACxC,cAAc,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;CACvC"}

package/src/types.ts

@@ -3,11 +3,22 @@
 export type * from './chain-info.js';
 export type * from './cosmos-api.js';
 export type * from './ethereum-api.js';
+export type * from './exos/chain-hub.js';
+export type * from './exos/combine-invitation-makers.js';
+export type * from './exos/cosmos-interchain-service.js';
+export type * from './exos/exo-interfaces.js';
 export type * from './exos/ica-account-kit.js';
-export type * from './exos/local-chain-facade.js';
 export type * from './exos/icq-connection-kit.js';
-export type * from './exos/exo-interfaces.js';
+export type * from './exos/local-chain-facade.js';
+export type * from './exos/portfolio-holder-kit.js';
 export type * from './orchestration-api.js';
-export type * from './exos/cosmos-interchain-service.js';
-export type * from './exos/chain-hub.js';
 export type * from './vat-orchestration.js';
+
+/**
+ * ({@link ZCF})-like tools for use in {@link OrchestrationFlow}s.
+ */
+export interface ZcfTools {
+  assertUniqueKeyword: ZCF['assertUniqueKeyword'];
+  atomicRearrange: ZCF['atomicRearrange'];
+  makeInvitation: ZCF['makeInvitation'];
+}

package/src/utils/cosmos.d.ts

@@ -1,6 +1,7 @@
 /**
- * @import {DenomAmount} from '../types.js';
+ * @import {CosmosDelegationResponse, CosmosValidatorAddress, DenomAmount} from '../types.js';
  * @import {Coin} from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js'
+ * @import {DelegationResponse} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
  */
 /** maximum clock skew, in seconds, for unbonding time reported from other chain */
 export const maxClockSkew: bigint;
@@ -12,10 +13,48 @@ export function tryDecodeResponse<T>(ackStr: string, fromProtoMsg: (p: {
  * Transform a cosmos-sdk {@link Coin} object into a {@link DenomAmount}
  *
  * @type {(c: { denom: string; amount: string }) => DenomAmount}
+ * @see {@link toTruncatedDenomAmount} for DecCoin
  */
 export const toDenomAmount: (c: {
     denom: string;
     amount: string;
 }) => DenomAmount;
+/**
+ * Transform a cosmos-sdk {@link DecCoin} object into a {@link DenomAmount}, by
+ * truncating the fractional portion.
+ *
+ * @type {(c: { denom: string; amount: string }) => DenomAmount}
+ */
+export const toTruncatedDenomAmount: (c: {
+    denom: string;
+    amount: string;
+}) => DenomAmount;
+/**
+ * Transform a cosmos-sdk `{validatorAddress}` object into an Orchestration
+ * {@link CosmosValidatorAddress}
+ *
+ * @type {(
+ *   r: { validatorAddress: string },
+ *   chainId: string,
+ * ) => CosmosValidatorAddress}
+ */
+export const toCosmosValidatorAddress: (r: {
+    validatorAddress: string;
+}, chainId: string) => CosmosValidatorAddress;
+/**
+ * Transform a cosmos-sdk {@link DelegationResponse} object into an Orchestration
+ * {@link CosmosDelegationResponse}
+ *
+ * @type {(
+ *   chainInfo: { chainId: string },
+ *   r: DelegationResponse,
+ * ) => CosmosDelegationResponse}
+ */
+export const toCosmosDelegationResponse: (chainInfo: {
+    chainId: string;
+}, r: DelegationResponse) => CosmosDelegationResponse;
 import type { DenomAmount } from '../types.js';
+import type { CosmosValidatorAddress } from '../types.js';
+import type { DelegationResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
+import type { CosmosDelegationResponse } from '../types.js';
 //# sourceMappingURL=cosmos.d.ts.map

package/src/utils/cosmos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["cosmos.js"],"names":[],"mappings":"AAIA;;;GAGG;AAEH,mFAAmF;AACnF,kCAAsC;AAO/B,kCAJM,CAAC,UACH,MAAM,gBACN,CAAC,CAAC,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,KAAK,CAAC,KAY1D;AAED;;;;GAIG;AACH,4BAFU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,WAAW,CAEiB;iCA7BlD,aAAa"}
+{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["cosmos.js"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,mFAAmF;AACnF,kCAAsC;AAO/B,kCAJM,CAAC,UACH,MAAM,gBACN,CAAC,CAAC,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,KAAK,CAAC,KAY1D;AAED;;;;;GAKG;AACH,4BAHU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,WAAW,CAGiB;AAEhF;;;;;GAKG;AACH,qCAFU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,WAAW,CAK5D;AAEH;;;;;;;;GAQG;AACH,uCALU,CACL,CAAC,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAA;CAAE,EAC/B,OAAO,EAAE,MAAM,KACZ,sBAAsB,CAM3B;AAEH;;;;;;;;GAQG;AACH,yCALU,CACL,SAAS,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAC9B,CAAC,EAAE,kBAAkB,KAClB,wBAAwB,CAU7B;iCA5E6E,aAAa;4CAAb,aAAa;wCAExD,wDAAwD;8CAFb,aAAa"}

package/src/utils/cosmos.js

@@ -3,8 +3,9 @@ import { decodeBase64 } from '@endo/base64';
 import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
 
 /**
- * @import {DenomAmount} from '../types.js';
+ * @import {CosmosDelegationResponse, CosmosValidatorAddress, DenomAmount} from '../types.js';
  * @import {Coin} from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js'
+ * @import {DelegationResponse} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
  */
 
 /** maximum clock skew, in seconds, for unbonding time reported from other chain */
@@ -31,5 +32,51 @@ export const tryDecodeResponse = (ackStr, fromProtoMsg) => {
  * Transform a cosmos-sdk {@link Coin} object into a {@link DenomAmount}
  *
  * @type {(c: { denom: string; amount: string }) => DenomAmount}
+ * @see {@link toTruncatedDenomAmount} for DecCoin
  */
 export const toDenomAmount = c => ({ denom: c.denom, value: BigInt(c.amount) });
+
+/**
+ * Transform a cosmos-sdk {@link DecCoin} object into a {@link DenomAmount}, by
+ * truncating the fractional portion.
+ *
+ * @type {(c: { denom: string; amount: string }) => DenomAmount}
+ */
+export const toTruncatedDenomAmount = c => ({
+  denom: c.denom,
+  value: BigInt(c.amount.split('.')[0]),
+});
+
+/**
+ * Transform a cosmos-sdk `{validatorAddress}` object into an Orchestration
+ * {@link CosmosValidatorAddress}
+ *
+ * @type {(
+ *   r: { validatorAddress: string },
+ *   chainId: string,
+ * ) => CosmosValidatorAddress}
+ */
+export const toCosmosValidatorAddress = (r, chainId) => ({
+  encoding: 'bech32',
+  value: /** @type {CosmosValidatorAddress['value']} */ (r.validatorAddress),
+  chainId,
+});
+
+/**
+ * Transform a cosmos-sdk {@link DelegationResponse} object into an Orchestration
+ * {@link CosmosDelegationResponse}
+ *
+ * @type {(
+ *   chainInfo: { chainId: string },
+ *   r: DelegationResponse,
+ * ) => CosmosDelegationResponse}
+ */
+export const toCosmosDelegationResponse = ({ chainId }, r) => ({
+  delegator: {
+    chainId,
+    encoding: 'bech32',
+    value: r.delegation.delegatorAddress,
+  },
+  validator: toCosmosValidatorAddress(r.delegation, chainId),
+  amount: toDenomAmount(r.balance),
+});

package/src/utils/orchestrationAccount.js

@@ -25,7 +25,7 @@ export const orchestrationAccountMethods = {
   sendAll: M.call(ChainAddressShape, M.arrayOf(AmountArgShape)).returns(
     VowShape,
   ),
-  transfer: M.call(AmountArgShape, ChainAddressShape)
+  transfer: M.call(ChainAddressShape, AmountArgShape)
     .optional(IBCTransferOptionsShape)
     .returns(VowShape),
   transferSteps: M.call(AmountArgShape, M.any()).returns(VowShape),

package/src/utils/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["registry.js"],"names":[],"mappings":"AAwFO,2CAFI,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,SAAS,CAAC;;;;;;;;;GA4CzD;yCAxHqC,wBAAwB;uCACT,kBAAkB"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["registry.js"],"names":[],"mappings":"AAqFO,2CAFI,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,SAAS,CAAC;;;;;;;;;GA4CzD;yCArHqC,wBAAwB;uCACT,kBAAkB"}

package/src/utils/registry.js

@@ -61,9 +61,6 @@ function toConnectionEntry(ibcInfo, name, chainInfo) {
     counterparty: {
       client_id: to.client_id,
       connection_id: /** @type {IBCConnectionID} */ (to.connection_id),
-      prefix: {
-        key_prefix: 'FIXME',
-      },
     },
     state: IBCConnectionState.STATE_OPEN, // XXX presumably
     transferChannel: {

package/src/utils/start-helper.d.ts

@@ -19,15 +19,7 @@ export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: O
         getAsset(denom: import("../orchestration-api.js").Denom): DenomDetail | undefined;
         getDenom(brand: Brand): import("../orchestration-api.js").Denom | undefined;
     }>;
-    vowTools: {
-        when: <T, TResult1 = import("@agoric/vow").EUnwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("@agoric/vow").EUnwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
-        watch: <T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]>(specimenP: import("@agoric/vow").EVow<T>, watcher?: import("@agoric/vow").Watcher<T, TResult1, TResult2, C> | undefined, ...watcherArgs: C) => import("@agoric/vow").Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>;
-        makeVowKit: <T>() => import("@agoric/vow").VowKit<T>;
-        allVows: (maybeVows: import("@agoric/vow").EVow<unknown>[]) => import("@agoric/vow").Vow<any[]>;
-        asVow: <T extends unknown>(fn: (...args: any[]) => import("@agoric/vow").Vow<Awaited<T>> | Awaited<T> | import("@agoric/vow").PromiseVow<T>) => import("@agoric/vow").Vow<Awaited<T>>;
-        asPromise: import("@agoric/vow").AsPromiseFunction;
-        retriable: <F extends (...args: any[]) => Promise<any>>(fnZone: Zone, name: string, fn: F) => F extends (...args: infer Args) => Promise<infer R> ? (...args: Args) => import("@agoric/vow").Vow<R> : never;
-    };
+    vowTools: import("@agoric/vow").VowTools;
     asyncFlowTools: {
         prepareAsyncFlowKit: (zone: Zone, tag: string, guestAsyncFunc: import("@agoric/async-flow").GuestAsyncFunc, options?: {
             startEager?: boolean;
@@ -61,8 +53,10 @@ export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: O
         allWokenP: Promise<void>;
         prepareEndowment: (zone: Zone, tag: string, e: unknown) => any;
     };
+    zcfTools: import("@agoric/async-flow").HostInterface<import("../types.js").ZcfTools>;
     zoeTools: {
-        localTransfer: (srcSeat: ZCFSeat, localAccount: import("../cosmos-api.js").LocalAccountMethods, give: AmountKeywordRecord) => import("@agoric/vow").Vow<void>;
+        localTransfer: (srcSeat: ZCFSeat, localAccount: import("../cosmos-api.js").LocalAccountMethods, amounts: AmountKeywordRecord) => import("@agoric/vow").Vow<void>;
+        withdrawToSeat: (localAccount: import("../cosmos-api.js").LocalAccountMethods, destSeat: ZCFSeat, amounts: AmountKeywordRecord) => import("@agoric/vow").Vow<void>;
     };
     zone: Zone;
     orchestrate: <HC, GF extends import("../orchestration-api.js").OrchestrationFlow<import("@agoric/async-flow").GuestInterface<HC>>>(durableName: string, hostCtx: HC, guestFn: GF) => HostForGuest<GF>;

package/src/utils/start-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AA6CO,0CANI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;+BAqGR,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;wCAnEH,GAAG;;+BAjDT,GAAG,+EAOa,GAAG,yCAAyC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuItE;AA8BM,kCAdgC,EAAE,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,EAGhC,EAAE,SAFM,mBAAmB,GAAG;IACnC,UAAc,EAAE,UAAU,CAAC;CACvB,EACQ,CAAC,cACH,CACV,GAAO,EAAE,GAAG,CAAC,EAAE,CAAC,EAChB,WAAe,EAAE,EAAE,EACnB,IAAQ,EAAE,IAAI,EACd,KAAS,EAAE,kBAAkB,KACtB,OAAO,CAAC,CAAC,CAAC,GACL,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAYzE;kCAxLU;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;iCA8IU,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BA5JzC,kBAAkB;0BAGrB,cAAc;gCALR,gCAAgC;4BAIpC,aAAa;6CAEI,2BAA2B;kCAL1B,cAAc;6BAE/B,cAAc"}
+{"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AA8CO,0CANI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;+BAqGR,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BhB;AA8BM,kCAdgC,EAAE,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,EAGhC,EAAE,SAFM,mBAAmB,GAAG;IAC/B,UAAU,EAAE,UAAU,CAAC;CACvB,EACQ,CAAC,cACH,CACN,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACZ,WAAW,EAAE,EAAE,EACf,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,kBAAkB,KACtB,OAAO,CAAC,CAAC,CAAC,GACL,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAYzE;kCA1LU;IACR,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,oBAAoB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACtD,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,YAAY,CAAC,CAAC;IACnC,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;iCAgJU,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BA9JzC,kBAAkB;0BAGrB,cAAc;gCALR,gCAAgC;4BAIpC,aAAa;6CAEI,2BAA2B;kCAL1B,cAAc;6BAE/B,cAAc"}

package/src/utils/start-helper.js

@@ -10,6 +10,7 @@ import { prepareOrchestrator } from '../exos/orchestrator.js';
 import { prepareRemoteChainFacade } from '../exos/remote-chain-facade.js';
 import { makeOrchestrationFacade } from '../facade.js';
 import { makeZoeTools } from './zoe-tools.js';
+import { makeZcfTools } from './zcf-tools.js';
 
 /**
  * @import {LocalChain} from '@agoric/vats/src/localchain.js';
@@ -61,10 +62,10 @@ export const provideOrchestration = (
       asyncFlow: zone.subZone('asyncFlow'),
       /** system names for orchestration implementation */
       orchestration: zone.subZone('orchestration'),
+      /** system names for chainHub */
+      chainHub: zone.subZone('chainHub'),
       /** system names for vows */
       vows: zone.subZone('vows'),
-      /** system names for zoe */
-      zoe: zone.subZone('zoe'),
       /** contract-provided names, and subzones */
       contract: zone.subZone('contract'),
     };
@@ -74,14 +75,24 @@ export const provideOrchestration = (
 
   const vowTools = prepareVowTools(zones.vows);
 
-  const chainHub = makeChainHub(agoricNames, vowTools);
+  const chainHub = makeChainHub(zones.chainHub, agoricNames, vowTools);
 
-  const zoeTools = makeZoeTools(zones.zoe, { zcf, vowTools });
+  const zoeTools = makeZoeTools(zcf, vowTools);
+
+  const zcfTools = makeZcfTools(zcf, vowTools);
 
   const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
   const makeLocalOrchestrationAccountKit = prepareLocalOrchestrationAccountKit(
     zones.orchestration,
-    { makeRecorderKit, zcf, timerService, vowTools, chainHub, localchain },
+    {
+      makeRecorderKit,
+      zcf,
+      timerService,
+      vowTools,
+      chainHub,
+      localchain,
+      zoeTools,
+    },
   );
 
   const asyncFlowTools = prepareAsyncFlowTools(zones.asyncFlow, {
@@ -118,21 +129,11 @@ export const provideOrchestration = (
     vowTools,
   });
 
-  const chainByName = zones.orchestration.mapStore('chainName');
-
   const makeOrchestrator = prepareOrchestrator(zones.orchestration, {
-    asyncFlowTools,
     chainHub,
-    localchain: remotePowers.localchain,
-    chainByName,
-    makeRecorderKit,
     makeLocalChainFacade,
     makeRemoteChainFacade,
-    storageNode: remotePowers.storageNode,
-    orchestrationService: remotePowers.orchestrationService,
-    timerService,
     vowTools,
-    zcf,
   });
 
   /**
@@ -158,12 +159,14 @@ export const provideOrchestration = (
   const defaultOrchestrateKit = makeOrchestrateKit(
     zones.contract.subZone('orchestration'),
   );
+
   return {
     ...defaultOrchestrateKit,
     makeOrchestrateKit,
     chainHub,
     vowTools,
     asyncFlowTools,
+    zcfTools,
     zoeTools,
     zone: zones.contract,
   };

package/src/utils/zcf-tools.d.ts

@@ -0,0 +1,5 @@
+export function makeZcfTools(zcf: ZCF, vowTools: VowTools): HostInterface<ZcfTools>;
+import type { VowTools } from '@agoric/vow';
+import type { ZcfTools } from '../types.js';
+import type { HostInterface } from '@agoric/async-flow';
+//# sourceMappingURL=zcf-tools.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"zcf-tools.d.ts","sourceRoot":"","sources":["zcf-tools.js"],"names":[],"mappings":"AAeO,kCAJI,GAAG,YACH,QAAQ,GACN,cAAc,QAAQ,CAAC,CAqBhC;8BAhCuB,aAAa;8BACb,aAAa;mCAFR,oBAAoB"}

package/src/utils/zcf-tools.js

@@ -0,0 +1,35 @@
+/**
+ * @import {HostInterface} from '@agoric/async-flow';
+ * @import {VowTools} from '@agoric/vow';
+ * @import {ZcfTools} from '../types.js';
+ */
+
+import { M, mustMatch } from '@endo/patterns';
+
+const HandlerShape = M.remotable('OfferHandler');
+
+/**
+ * @param {ZCF} zcf
+ * @param {VowTools} vowTools
+ * @returns {HostInterface<ZcfTools>}
+ */
+export const makeZcfTools = (zcf, vowTools) =>
+  harden({
+    makeInvitation(offerHandler, description, customDetails, proposalShape) {
+      mustMatch(offerHandler, HandlerShape);
+      return vowTools.watch(
+        zcf.makeInvitation(
+          offerHandler,
+          description,
+          customDetails,
+          proposalShape,
+        ),
+      );
+    },
+    atomicRearrange(transfers) {
+      zcf.atomicRearrange(transfers);
+    },
+    assertUniqueKeyword(keyword) {
+      zcf.assertUniqueKeyword(keyword);
+    },
+  });

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

@@ -1,19 +1,16 @@
-export function makeZoeTools(zone: Zone, { zcf, vowTools }: {
-    zcf: ZCF;
-    vowTools: VowTools;
-}): {
-    localTransfer: (srcSeat: ZCFSeat, localAccount: LocalAccountMethods, give: AmountKeywordRecord) => Vow<void>;
+export function makeZoeTools(zcf: ZCF, { when, allVows, allSettled, asVow }: VowTools): {
+    localTransfer: (srcSeat: ZCFSeat, localAccount: LocalAccountMethods, amounts: AmountKeywordRecord) => import("@agoric/vow").Vow<void>;
+    withdrawToSeat: (localAccount: LocalAccountMethods, destSeat: ZCFSeat, amounts: AmountKeywordRecord) => import("@agoric/vow").Vow<void>;
 };
 export type ResolvedContinuingOfferResult = {
     invitationMakers: InvitationMakers;
     publicSubscribers: Record<string, ResolvedPublicTopic<any>>;
 };
-export type LocalTransfer = (srcSeat: ZCFSeat, localAccount: LocalAccountMethods, give: AmountKeywordRecord) => Promise<void>;
+export type LocalTransfer = (srcSeat: ZCFSeat, localAccount: LocalAccountMethods, amounts: AmountKeywordRecord) => Promise<void>;
+export type WithdrawToSeat = (localAccount: LocalAccountMethods, destSeat: ZCFSeat, amounts: AmountKeywordRecord) => Promise<void>;
 export type ZoeTools = ReturnType<typeof makeZoeTools>;
-import type { Zone } from '@agoric/zone';
 import type { VowTools } from '@agoric/vow';
 import type { LocalAccountMethods } from '../types.js';
-import type { Vow } from '@agoric/vow';
 import type { InvitationMakers } from '@agoric/smart-wallet/src/types.js';
 import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
 //# sourceMappingURL=zoe-tools.d.ts.map

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

@@ -1 +1 @@
-{"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;;EAiD1C;4CAnEY;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;uBAuDP,UAAU,CAAC,OAAO,YAAY,CAAC;0BA1EtB,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":"AA4DO,kCAHI,GAAG,wCACH,QAAQ;;;EA6HlB;4CAvJY;IACR,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC;CAC7D;4BAMS,CACR,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,mBAAmB,KACzB,OAAO,CAAC,IAAI,CAAC;6BAIR,CACR,YAAY,EAAE,mBAAmB,EACjC,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,mBAAmB,KACzB,OAAO,CAAC,IAAI,CAAC;uBAoIP,UAAU,CAAC,OAAO,YAAY,CAAC;8BA9JlB,aAAa;yCACF,aAAa;sCAHhB,mCAAmC;yCAChC,2CAA2C"}