@agoric/orchestration 0.2.0-upgrade-20-dev-ef71cfd.0 → 0.2.0-upgrade-19-devnet-dev-5428c4d.0

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

@@ -1,15 +1,25 @@
 export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: OrchestrationPowers & {
     marshaller: Marshaller;
-    chainInfo?: Record<string, CosmosChainInfo>;
+    chainInfo?: Record<string, Readonly<{
+        bech32Prefix?: string;
+        chainId: string;
+        connections?: Record<string, import("@agoric/orchestration").IBCConnectionInfo>;
+        icqEnabled?: boolean;
+        pfmEnabled?: boolean;
+        stakingTokens?: Readonly<Array<{
+            denom: string;
+        }>>;
+        icaEnabled?: boolean;
+    }>>;
     assetInfo?: [Denom, DenomDetail & {
         brandKey?: string;
     }][];
 }, baggage: import("@agoric/vat-data").Baggage) => Promise<{
     publicFacet: import("@endo/exo").Guarded<{
-        makeOrchAccountInvitation(): Promise<globalThis.Invitation<import("@agoric/vow").Vow<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>, {
+        makeOrchAccountInvitation(): Promise<Invitation<import("@agoric/vow").Vow<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>, {
             chainName: string;
         }>>;
-        makePortfolioAccountInvitation(): Promise<globalThis.Invitation<import("@agoric/vow").Vow<import("@agoric/vow").Vow<{
+        makePortfolioAccountInvitation(): Promise<Invitation<import("@agoric/vow").Vow<import("@agoric/vow").Vow<{
             publicSubscribers: {
                 [k: string]: import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>;
             };
@@ -22,9 +32,7 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
     }>;
 }>;
 export type BasicFlowsSF = typeof start;
-import type { ZCF } from '@agoric/zoe';
 import type { OrchestrationPowers } from '../utils/start-helper.js';
-import type { CosmosChainInfo } from '@agoric/orchestration';
 import type { Denom } from '@agoric/orchestration';
 import type { DenomDetail } from '@agoric/orchestration';
 //# 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":"AAyEA;gBApDiB,UAAU;gBACV,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;;;;;;;;;;;;;;;;;GAkDgB;2BAGjE,OAAO,KAAK;yBA9DJ,aAAa;yCACuB,0BAA0B;qCAF9B,uBAAuB;2BAAvB,uBAAuB;iCAAvB,uBAAuB"}
+{"version":3,"file":"basic-flows.contract.d.ts","sourceRoot":"","sources":["basic-flows.contract.js"],"names":[],"mappings":"AAwEA;gBApDiB,UAAU;;;;;;;;;;;;gBAEV,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;;;;;;;;;;;;;;;;;GAkDgB;2BAGjE,OAAO,KAAK;yCA7DgC,0BAA0B;2BAD9B,uBAAuB;iCAAvB,uBAAuB"}

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

@@ -12,7 +12,6 @@ import * as flows from './basic-flows.flows.js';
 /**
  * @import {Zone} from '@agoric/zone';
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
- * @import {ZCF} from '@agoric/zoe';
  * @import {OrchestrationPowers, OrchestrationTools} from '../utils/start-helper.js';
  */
 

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

@@ -12,34 +12,54 @@ export function contract(zcf: ZCF, privateArgs: OrchestrationPowers & {
     chainInfo?: Record<string, CosmosChainInfo>;
     marshaller: Marshaller;
     storageNode: Remote<StorageNode>;
-}, zone: Zone, { chainHub, orchestrate, vowTools, zoeTools }: OrchestrationTools): Promise<{
+}, zone: Zone, { chainHub, orchestrateAll, vowTools, zoeTools }: OrchestrationTools): Promise<{
     publicFacet: import("@endo/exo").Guarded<{
-        makeSendInvitation(): Promise<globalThis.Invitation<Vow<undefined>, {
+        makeSendInvitation(): Promise<Invitation<Vow<void>, {
             chainName: string;
             destAddr: string;
         }>>;
     }>;
     creatorFacet: import("@endo/exo").Guarded<{
-        registerChain(chainName: string, chainInfo: import("@agoric/orchestration").ChainInfo, ibcConnectionInfo?: import("@agoric/orchestration").IBCConnectionInfo): Promise<void>;
+        registerChain(chainName: string, chainInfo: CosmosChainInfo, connectionInfo: import("@agoric/orchestration").IBCConnectionInfo): Promise<void>;
         registerAsset(denom: Denom, detail: DenomDetail): Promise<void>;
     }>;
 }>;
-export const start: (zcf: globalThis.ZCF<Record<string, unknown>>, privateArgs: OrchestrationPowers & {
+export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: OrchestrationPowers & {
     assetInfo?: [Denom, DenomDetail & {
         brandKey?: string;
     }][];
-    chainInfo?: Record<string, CosmosChainInfo>;
+    chainInfo?: Record<string, Readonly<{
+        bech32Prefix?: string;
+        chainId: string;
+        connections?: Record<string, import("@agoric/orchestration").IBCConnectionInfo>;
+        icqEnabled?: boolean;
+        pfmEnabled?: boolean;
+        stakingTokens?: Readonly<Array<{
+            denom: string;
+        }>>;
+        icaEnabled?: boolean;
+    }>>;
     marshaller: Marshaller;
     storageNode: Remote<StorageNode>;
 }, baggage: import("@agoric/vat-data").Baggage) => Promise<{
     publicFacet: import("@endo/exo").Guarded<{
-        makeSendInvitation(): Promise<globalThis.Invitation<Vow<undefined>, {
+        makeSendInvitation(): Promise<Invitation<Vow<void>, {
             chainName: string;
             destAddr: string;
         }>>;
     }>;
     creatorFacet: import("@endo/exo").Guarded<{
-        registerChain(chainName: string, chainInfo: import("@agoric/orchestration").ChainInfo, ibcConnectionInfo?: import("@agoric/orchestration").IBCConnectionInfo): Promise<void>;
+        registerChain(chainName: string, chainInfo: Readonly<{
+            bech32Prefix?: string;
+            chainId: string;
+            connections?: Record<string, import("@agoric/orchestration").IBCConnectionInfo>;
+            icqEnabled?: boolean;
+            pfmEnabled?: boolean;
+            stakingTokens?: Readonly<Array<{
+                denom: string;
+            }>>;
+            icaEnabled?: boolean;
+        }>, connectionInfo: import("@agoric/orchestration").IBCConnectionInfo): Promise<void>;
         registerAsset(denom: Denom, detail: DenomDetail): Promise<void>;
     }>;
 }>;

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":"AAaA;;;;;GAKG;AAEH,qEAKE;AAoBK,8BAVI,GAAG,eACH,mBAAmB,GAAG;IAC5B,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,QACO,IAAI,iDACJ,kBAAkB;;;;;;;;;;;GAkF5B;AAGD;gBA3FiB,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;gBAC9C,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,UAAU;iBACT,OAAO,WAAW,CAAC;;;;;;;;;;;;GAwF0C;yCAhHrB,0BAA0B;2BAC9B,uBAAuB;iCAAvB,uBAAuB;qCAAvB,uBAAuB;4BAH/C,aAAa;0BACpB,cAAc;wCACqB,0BAA0B;yBAFtD,aAAa"}
+{"version":3,"file":"send-anywhere.contract.d.ts","sourceRoot":"","sources":["send-anywhere.contract.js"],"names":[],"mappings":"AAUA;;;;;GAKG;AAEH,qEAKE;AAgBK,8BAVI,GAAG,eACH,mBAAmB,GAAG;IAC5B,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,QACO,IAAI,oDACJ,kBAAkB;;;;;;;;;;;GA6D5B;AAGD;gBAtEiB,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;;;;;;;;;;;;gBAE9C,UAAU;iBACT,OAAO,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;GAmE0C;yCAvFrB,0BAA0B;2BAC9B,uBAAuB;iCAAvB,uBAAuB;qCAAvB,uBAAuB;4BAH/C,aAAa;0BACpB,cAAc;wCACqB,0BAA0B;yBAFtD,aAAa"}

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

@@ -5,10 +5,7 @@ import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
 import { AnyNatAmountShape } from '../typeGuards.js';
 import { withOrchestration } from '../utils/start-helper.js';
 import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
-import {
-  makeNobleAccount as makeNobleAccountFlow,
-  sendIt,
-} from './send-anywhere.flows.js';
+import * as flows from './send-anywhere.flows.js';
 import * as sharedFlows from './shared.flows.js';
 
 /**
@@ -27,10 +24,6 @@ export const SingleNatAmountRecord = M.and(
 harden(SingleNatAmountRecord);
 
 /**
- * Send assets currently in an ERTP purse to an account on another chain. This
- * currently supports IBC and CCTP transfers. It could eventually support other
- * protocols, like Axelar GMP or IBC Eureka.
- *
  * Orchestration contract to be wrapped by withOrchestration for Zoe
  *
  * @param {ZCF} zcf
@@ -47,7 +40,7 @@ export const contract = async (
   zcf,
   privateArgs,
   zone,
-  { chainHub, orchestrate, vowTools, zoeTools },
+  { chainHub, orchestrateAll, vowTools, zoeTools },
 ) => {
   const creatorFacet = prepareChainHubAdmin(zone, chainHub);
 
@@ -56,47 +49,26 @@ export const contract = async (
   /** @type {(msg: string) => Vow<void>} */
   const log = msg => vowTools.watch(E(logNode).setValue(msg));
 
-  const makeLocalAccount = orchestrate(
-    'makeLocalAccount',
-    {},
-    sharedFlows.makeLocalAccount,
-  );
-  const makeNobleAccount = orchestrate(
-    'makeNobleAccountFlow',
-    {},
-    makeNobleAccountFlow,
-  );
-
-  const { brands } = zcf.getTerms();
-
+  const { makeLocalAccount } = orchestrateAll(sharedFlows, {});
   /**
-   * Set up a shared local account for use in async-flow functions. Typically,
+   * 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 UNTIL
+   * @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(),
   );
-  // UNTIL https://github.com/Agoric/agoric-sdk/issues/9822.
-  /** @type {any} nobleAccountP */
-  const nobleAccountP = zone.makeOnce('nobleAccount', () => makeNobleAccount());
+
   // orchestrate uses the names on orchestrationFns to do a "prepare" of the associated behavior
-  const sendAnywhere = orchestrate(
-    'sendAnywhere',
-    {
-      log,
-      chainHub,
-      sharedLocalAccountP,
-      nobleAccountP,
-      USDC: brands.USDC,
-      zoeTools,
-    },
-    sendIt,
-  );
+  const orchFns = orchestrateAll(flows, {
+    log,
+    sharedLocalAccountP,
+    zoeTools,
+  });
 
   const publicFacet = zone.exo(
     'Send PF',
@@ -106,7 +78,7 @@ export const contract = async (
     {
       makeSendInvitation() {
         return zcf.makeInvitation(
-          sendAnywhere,
+          orchFns.sendIt,
           'send',
           undefined,
           M.splitRecord({ give: SingleNatAmountRecord }),