@agoric/orchestration 0.1.1-dev-0b1501a.0 → 0.1.1-dev-e3b41dc.0

package/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./types.js";
+export * from "./src/types-index.js";
 export * from "./src/exos/cosmos-interchain-service.js";
 export * from "./src/exos/chain-hub-admin.js";
 export * from "./src/typeGuards.js";

package/index.js

@@ -3,7 +3,7 @@
 /// <reference types="@agoric/zoe/exported" />
 
 // eslint-disable-next-line import/export
-export * from './types.js'; // no named exports
+export * from './src/types-index.js'; // no named exports
 export * from './src/exos/cosmos-interchain-service.js';
 export * from './src/exos/chain-hub-admin.js';
 export * from './src/typeGuards.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-0b1501a.0+0b1501a",
+  "version": "0.1.1-dev-e3b41dc.0+e3b41dc",
   "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-0b1501a.0+0b1501a",
-    "@agoric/cosmic-proto": "0.4.1-dev-0b1501a.0+0b1501a",
-    "@agoric/ertp": "0.16.3-dev-0b1501a.0+0b1501a",
-    "@agoric/internal": "0.3.3-dev-0b1501a.0+0b1501a",
-    "@agoric/network": "0.1.1-dev-0b1501a.0+0b1501a",
-    "@agoric/notifier": "0.6.3-dev-0b1501a.0+0b1501a",
-    "@agoric/store": "0.9.3-dev-0b1501a.0+0b1501a",
-    "@agoric/time": "0.3.3-dev-0b1501a.0+0b1501a",
-    "@agoric/vat-data": "0.5.3-dev-0b1501a.0+0b1501a",
-    "@agoric/vats": "0.15.2-dev-0b1501a.0+0b1501a",
-    "@agoric/vow": "0.1.1-dev-0b1501a.0+0b1501a",
-    "@agoric/zoe": "0.26.3-dev-0b1501a.0+0b1501a",
-    "@agoric/zone": "0.2.3-dev-0b1501a.0+0b1501a",
+    "@agoric/async-flow": "0.1.1-dev-e3b41dc.0+e3b41dc",
+    "@agoric/cosmic-proto": "0.4.1-dev-e3b41dc.0+e3b41dc",
+    "@agoric/ertp": "0.16.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/internal": "0.3.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/network": "0.1.1-dev-e3b41dc.0+e3b41dc",
+    "@agoric/notifier": "0.6.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/store": "0.9.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/time": "0.3.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/vat-data": "0.5.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/vats": "0.15.2-dev-e3b41dc.0+e3b41dc",
+    "@agoric/vow": "0.1.1-dev-e3b41dc.0+e3b41dc",
+    "@agoric/zoe": "0.26.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/zone": "0.2.3-dev-e3b41dc.0+e3b41dc",
     "@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-0b1501a.0+0b1501a",
+    "@agoric/swingset-liveslots": "0.10.3-dev-e3b41dc.0+e3b41dc",
     "@chain-registry/client": "^1.47.4",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
@@ -94,5 +94,5 @@
   "typeCoverage": {
     "atLeast": 97.6
   },
-  "gitHead": "0b1501ace92d3f53ba37e1c83f508f61c14fcd7d"
+  "gitHead": "e3b41dc204ce335217bf18ed4889aba18734d8f6"
 }

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

@@ -1,13 +1,28 @@
 /**
+ * @import {Vow} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
  * @import {OrchestrationPowers, OrchestrationTools} from '../utils/start-helper.js';
  */
 export const SingleNatAmountRecord: import("@endo/patterns").Matcher;
+export function contract(zcf: ZCF, privateArgs: OrchestrationPowers & {
+    marshaller: Marshaller;
+}, zone: Zone, { chainHub, orchestrateAll, vowTools, zoeTools }: OrchestrationTools): Promise<{
+    publicFacet: import("@endo/exo").Guarded<{
+        makeSendInvitation(): Promise<Invitation<Vow<void>, {
+            chainName: string;
+            destAddr: string;
+        }>>;
+    }>;
+    creatorFacet: import("@endo/exo").Guarded<{
+        registerChain(chainName: string, chainInfo: import("../cosmos-api.js").CosmosChainInfo, connectionInfo: import("../cosmos-api.js").IBCConnectionInfo): Promise<void>;
+        registerAsset(denom: import("../orchestration-api.js").Denom, detail: import("../types.js").DenomDetail): Promise<void>;
+    }>;
+}>;
 export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: OrchestrationPowers & {
     marshaller: Marshaller;
 }, baggage: import("@agoric/vat-data").Baggage) => Promise<{
     publicFacet: import("@endo/exo").Guarded<{
-        makeSendInvitation(): Promise<Invitation<import("@agoric/vow").Vow<void>, {
+        makeSendInvitation(): Promise<Invitation<Vow<void>, {
             chainName: string;
             destAddr: string;
         }>>;
@@ -25,4 +40,7 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
     }>;
 }>;
 import type { OrchestrationPowers } from '../utils/start-helper.js';
+import type { Zone } from '@agoric/zone';
+import type { OrchestrationTools } from '../utils/start-helper.js';
+import type { Vow } from '@agoric/vow';
 //# sourceMappingURL=send-anywhere.contract.d.ts.map

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":"AAQA;;;GAGG;AAEH,qEAKE;AAqDF;gBA7CiB,UAAU;;;;;;;;;;;;;;;;;;;GA6CsB;yCA7DS,0BAA0B"}
+{"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"}

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

@@ -1,12 +1,15 @@
 import { makeSharedStateRecord } from '@agoric/async-flow';
+
 import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
+import { E } from '@endo/far';
 import { M } from '@endo/patterns';
-import { withOrchestration } from '../utils/start-helper.js';
-import * as flows from './send-anywhere.flows.js';
 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 {Vow} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
  * @import {OrchestrationPowers, OrchestrationTools} from '../utils/start-helper.js';
  */
@@ -29,11 +32,11 @@ harden(SingleNatAmountRecord);
  * @param {Zone} zone
  * @param {OrchestrationTools} tools
  */
-const contract = async (
+export const contract = async (
   zcf,
   privateArgs,
   zone,
-  { chainHub, orchestrateAll, zoeTools },
+  { chainHub, orchestrateAll, vowTools, zoeTools },
 ) => {
   const contractState = makeSharedStateRecord(
     /** @type {{ account: OrchestrationAccount<any> | undefined }} */ {
@@ -43,9 +46,15 @@ const contract = async (
 
   const creatorFacet = prepareChainHubAdmin(zone, chainHub);
 
+  // UNTIL https://github.com/Agoric/agoric-sdk/issues/9066
+  const logNode = E(privateArgs.storageNode).makeChildNode('log');
+  /** @type {(msg: string) => Vow<void>} */
+  const log = msg => vowTools.watch(E(logNode).setValue(msg));
+
   // orchestrate uses the names on orchestrationFns to do a "prepare" of the associated behavior
   const orchFns = orchestrateAll(flows, {
     contractState,
+    log,
     zoeTools,
   });
 
@@ -68,6 +77,7 @@ const contract = async (
 
   return { publicFacet, creatorFacet };
 };
+harden(contract);
 
 export const start = withOrchestration(contract);
 harden(start);

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

@@ -1,8 +1,9 @@
-export function sendIt(orch: Orchestrator, { contractState, zoeTools: { localTransfer, withdrawToSeat } }: {
+export function sendIt(orch: Orchestrator, { contractState, log, zoeTools: { localTransfer, withdrawToSeat } }: {
     contractState: {
         localAccount?: OrchestrationAccountI & LocalAccountMethods;
     };
     zoeTools: GuestInterface<ZoeTools>;
+    log: GuestOf<(msg: string) => Vow<void>>;
 }, seat: ZCFSeat, offerArgs: {
     chainName: string;
     destAddr: string;
@@ -12,4 +13,6 @@ import type { OrchestrationAccountI } from '../types.js';
 import type { LocalAccountMethods } from '../types.js';
 import type { ZoeTools } from '../utils/zoe-tools.js';
 import type { GuestInterface } from '@agoric/async-flow';
+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":"AAwBO,6BAPI,YAAY,kEAEpB;IAA4E,aAAa,EAAjF;QAAE,YAAY,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IAChC,QAAQ,EAAtC,eAAe,QAAQ,CAAC;CAChC,QAAQ,OAAO,aACP;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,iBAiDjD;kCAhE6F,aAAa;2CAAb,aAAa;yCAAb,aAAa;8BADhF,uBAAuB;oCADjB,oBAAoB"}
+{"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"}

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

@@ -3,7 +3,8 @@ import { makeError, q } from '@endo/errors';
 import { M, mustMatch } from '@endo/patterns';
 
 /**
- * @import {GuestInterface} from '@agoric/async-flow';
+ * @import {GuestInterface, GuestOf} from '@agoric/async-flow';
+ * @import {Vow} from '@agoric/vow';
  * @import {ZoeTools} from '../utils/zoe-tools.js';
  * @import {Orchestrator, LocalAccountMethods, OrchestrationAccountI, OrchestrationFlow} from '../types.js';
  */
@@ -19,12 +20,13 @@ const { entries } = Object;
  * @param {object} ctx
  * @param {{ localAccount?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
  * @param {GuestInterface<ZoeTools>} ctx.zoeTools
+ * @param {GuestOf<(msg: string) => Vow<void>>} ctx.log
  * @param {ZCFSeat} seat
  * @param {{ chainName: string; destAddr: string }} offerArgs
  */
 export const sendIt = async (
   orch,
-  { contractState, zoeTools: { localTransfer, withdrawToSeat } },
+  { contractState, log, zoeTools: { localTransfer, withdrawToSeat } },
   seat,
   offerArgs,
 ) => {
@@ -33,25 +35,30 @@ export const sendIt = async (
   // NOTE the proposal shape ensures that the `give` is a single asset
   const { give } = seat.getProposal();
   const [[_kw, amt]] = entries(give);
+  void log(`sending {${amt.value}} from ${chainName} to ${destAddr}`);
   const agoric = await orch.getChain('agoric');
   const assets = await agoric.getVBankAssetInfo();
+  void log(`got info for denoms: ${assets.map(a => a.denom).join(', ')}`);
   const { denom } = NonNullish(
     assets.find(a => a.brand === amt.brand),
     `${amt.brand} not registered in vbank`,
   );
-  const chain = await orch.getChain(chainName);
 
+  // FIXME racy
   if (!contractState.localAccount) {
-    const agoricChain = await orch.getChain('agoric');
-    contractState.localAccount = await agoricChain.makeAccount();
+    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);
 
+  void log(`completed transfer to localAccount`);
+
   try {
     await contractState.localAccount.transfer(
       {
@@ -61,13 +68,16 @@ export const sendIt = async (
       },
       { denom, value: amt.value },
     );
+    void log(`completed transfer to ${destAddr}`);
   } catch (e) {
     await withdrawToSeat(contractState.localAccount, seat, give);
     const errorMsg = `IBC Transfer failed ${q(e)}`;
+    void log(`ERROR: ${errorMsg}`);
     seat.exit(errorMsg);
     throw makeError(errorMsg);
   }
 
   seat.exit();
+  void log(`transfer complete, seat exited`);
 };
 harden(sendIt);

package/src/types-index.d.ts

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

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

@@ -19,7 +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: import("@agoric/vow/src/tools.js").VowTools;
+    vowTools: import("@agoric/vow").VowTools;
     asyncFlowTools: {
         prepareAsyncFlowKit: (zone: Zone, tag: string, guestAsyncFunc: import("@agoric/async-flow").GuestAsyncFunc, options?: {
             startEager?: boolean;

package/types.d.ts

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