@agoric/orchestration 0.1.1-dev-7f12e80.0 → 0.1.1-dev-bef1be9.0

package/package.json

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

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

@@ -1 +1 @@
-{"version":3,"file":"sendAnywhere.flows.d.ts","sourceRoot":"","sources":["sendAnywhere.flows.js"],"names":[],"mappings":"AAuBO,6BAPI,YAAY,oCAEpB;IAA4E,aAAa,EAAjF;QAAE,YAAY,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IACtB,aAAa,EAArD,QAAQ,QAAQ,CAAC,eAAe,CAAC,CAAC;CAC1C,QAAQ,OAAO,aACP;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,iBAwCjD;kCAvD6F,aAAa;2CAAb,aAAa;yCAAb,aAAa;8BADhF,uBAAuB;6BADxB,oBAAoB"}
+{"version":3,"file":"sendAnywhere.flows.d.ts","sourceRoot":"","sources":["sendAnywhere.flows.js"],"names":[],"mappings":"AAuBO,6BAPI,YAAY,oCAEpB;IAA4E,aAAa,EAAjF;QAAE,YAAY,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IACtB,aAAa,EAArD,QAAQ,QAAQ,CAAC,eAAe,CAAC,CAAC;CAC1C,QAAQ,OAAO,aACP;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,iBAyCjD;kCAxD6F,aAAa;2CAAb,aAAa;yCAAb,aAAa;8BADhF,uBAAuB;6BADxB,oBAAoB"}

package/src/examples/sendAnywhere.flows.js

@@ -59,5 +59,6 @@ export const sendIt = async (
       chainId,
     },
   );
+  seat.exit();
 };
 harden(sendIt);

package/src/examples/stakeBld.contract.js

@@ -65,7 +65,7 @@ export const start = async (zcf, privateArgs, baggage) => {
       address: harden({
         value: address,
         encoding: 'bech32',
-        chainId: 'local',
+        chainId: 'agoriclocal',
       }),
       storageNode: privateArgs.storageNode,
     });

package/src/examples/stakeIca.contract.d.ts

@@ -1,19 +1,22 @@
 /**
  * @import {Baggage} from '@agoric/vat-data';
- * @import {IBCConnectionID} from '@agoric/vats';
+ * @import {Remote} from '@agoric/internal';
+ * @import {IBCConnectionID, NameHub} from '@agoric/vats';
  * @import {TimerService} from '@agoric/time';
  * @import {ResolvedContinuingOfferResult} from '../utils/zoe-tools.js';
- * @import {ICQConnection, CosmosInterchainService} from '../types.js';
+ * @import {ICQConnection, CosmosInterchainService, ChainHub} from '../types.js';
  */
 /** @type {ContractMeta<typeof start>} */
 export const meta: ContractMeta<typeof start>;
 export const privateArgsShape: {
+    agoricNames: globalThis.Pattern;
     cosmosInterchainService: globalThis.Pattern;
     storageNode: globalThis.Pattern;
     marshaller: globalThis.Pattern;
     timer: globalThis.Pattern;
 } | undefined;
 export function start(zcf: ZCF<StakeIcaTerms>, privateArgs: {
+    agoricNames: Remote<NameHub>;
     cosmosInterchainService: CosmosInterchainService;
     storageNode: StorageNode;
     marshaller: Marshaller;
@@ -47,6 +50,8 @@ export type StakeIcaTerms = {
     icqEnabled: boolean;
 };
 export type StakeIcaSF = typeof start;
+import type { NameHub } from '@agoric/vats';
+import type { Remote } from '@agoric/internal';
 import type { CosmosInterchainService } from '../types.js';
 import type { TimerService } from '@agoric/time';
 import type { Baggage } from '@agoric/vat-data';

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

@@ -1 +1 @@
-{"version":3,"file":"stakeIca.contract.d.ts","sourceRoot":"","sources":["stakeIca.contract.js"],"names":[],"mappings":"AAeA;;;;;;GAMG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAelC;AAEH;;;;;cAAsD;AAuB/C,2BATI,GAAG,CAAC,aAAa,CAAC,eAClB;IACV,uBAA2B,EAAE,uBAAuB,CAAC;IACrD,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;IAC3B,KAAS,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;GA4FjB;4BA7GY;IACZ,OAAW,EAAE,MAAM,CAAC;IACpB,gBAAoB,EAAE,eAAe,CAAC;IACtC,sBAA0B,EAAE,eAAe,CAAC;IAC5C,SAAa,EAAE,MAAM,CAAC;IACtB,UAAc,EAAE,OAAO,CAAC;CACrB;yBA0GU,OAAO,KAAK;6CAxI+B,aAAa;kCAFvC,cAAc;6BAFnB,kBAAkB;mDAGI,uBAAuB;qCAFrC,cAAc"}
+{"version":3,"file":"stakeIca.contract.d.ts","sourceRoot":"","sources":["stakeIca.contract.js"],"names":[],"mappings":"AAgBA;;;;;;;GAOG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAgBlC;AAEH;;;;;;cAAsD;AAwB/C,2BAVI,GAAG,CAAC,aAAa,CAAC,eAClB;IACV,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;IACjC,uBAA2B,EAAE,uBAAuB,CAAC;IACrD,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;IAC3B,KAAS,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;GAmGjB;4BArHY;IACZ,OAAW,EAAE,MAAM,CAAC;IACpB,gBAAoB,EAAE,eAAe,CAAC;IACtC,sBAA0B,EAAE,eAAe,CAAC;IAC5C,SAAa,EAAE,MAAM,CAAC;IACtB,UAAc,EAAE,OAAO,CAAC;CACrB;yBAkHU,OAAO,KAAK;6BApJiB,cAAc;4BADhC,kBAAkB;6CAIwB,aAAa;kCAFjD,cAAc;6BAHnB,kBAAkB;mDAII,uBAAuB;qCAF5B,cAAc"}

package/src/examples/stakeIca.contract.js

@@ -11,14 +11,16 @@ import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
 import { makeDurableZone } from '@agoric/zone/durable.js';
 import { M } from '@endo/patterns';
 import { prepareCosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
+import { makeChainHub } from '../exos/chain-hub.js';
 
 const trace = makeTracer('StakeIca');
 /**
  * @import {Baggage} from '@agoric/vat-data';
- * @import {IBCConnectionID} from '@agoric/vats';
+ * @import {Remote} from '@agoric/internal';
+ * @import {IBCConnectionID, NameHub} from '@agoric/vats';
  * @import {TimerService} from '@agoric/time';
  * @import {ResolvedContinuingOfferResult} from '../utils/zoe-tools.js';
- * @import {ICQConnection, CosmosInterchainService} from '../types.js';
+ * @import {ICQConnection, CosmosInterchainService, ChainHub} from '../types.js';
  */
 
 /** @type {ContractMeta<typeof start>} */
@@ -31,6 +33,7 @@ export const meta = harden({
     icqEnabled: M.boolean(),
   },
   privateArgsShape: {
+    agoricNames: M.remotable('agoricNames NameHub'),
     cosmosInterchainService: M.remotable('cosmosInterchainService'),
     storageNode: StorageNodeShape,
     marshaller: M.remotable('marshaller'),
@@ -54,6 +57,7 @@ harden(privateArgsShape);
 /**
  * @param {ZCF<StakeIcaTerms>} zcf
  * @param {{
+ *   agoricNames: Remote<NameHub>;
  *   cosmosInterchainService: CosmosInterchainService;
  *   storageNode: StorageNode;
  *   marshaller: Marshaller;
@@ -70,6 +74,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     icqEnabled,
   } = zcf.getTerms();
   const {
+    agoricNames,
     cosmosInterchainService: orchestration,
     marshaller,
     storageNode,
@@ -86,11 +91,17 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const vowTools = prepareVowTools(zone.subZone('vows'));
 
+  const chainHub = makeChainHub(agoricNames, vowTools);
+
   const makeCosmosOrchestrationAccount = prepareCosmosOrchestrationAccount(
     zone,
-    makeRecorderKit,
-    vowTools,
-    zcf,
+    {
+      chainHub,
+      makeRecorderKit,
+      timerService: timer,
+      vowTools,
+      zcf,
+    },
   );
 
   async function makeAccountKit() {

package/src/exos/README.md

@@ -120,6 +120,7 @@ classDiagram
       redelegate()
       send()
       sendAll()
+      transfer()
       undelegate()
       withdrawReward()
     }

package/src/exos/cosmos-orchestration-account.d.ts

@@ -29,7 +29,13 @@ export const IcaAccountHolderI: import("@endo/patterns").InterfaceGuard<{
     asContinuingOffer: import("@endo/patterns").MethodGuard;
     getPublicTopics: import("@endo/patterns").MethodGuard;
 }>;
-export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit: MakeRecorderKit, { watch, asVow, when }: VowTools, zcf: ZCF): (chainAddress: ChainAddress, bondDenom: string, io: {
+export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, makeRecorderKit, timerService, vowTools: { watch, asVow, when, allVows }, zcf, }: {
+    chainHub: ChainHub;
+    makeRecorderKit: MakeRecorderKit;
+    timerService: Remote<TimerService>;
+    vowTools: VowTools;
+    zcf: ZCF;
+}): (chainAddress: ChainAddress, bondDenom: string, io: {
     account: IcaAccount;
     storageNode: Remote<StorageNode>;
     icqConnection: ICQConnection | undefined;
@@ -69,6 +75,26 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit
         /** @param {string} result */
         onFulfilled(result: string): DenomAmount[];
     };
+    transferWatcher: {
+        /**
+         * @param {[
+         *   { transferChannel: IBCConnectionInfo['transferChannel'] },
+         *   bigint,
+         * ]} results
+         * @param {{
+         *   destination: ChainAddress;
+         *   opts?: IBCMsgTransferOptions;
+         *   token: Coin;
+         * }} ctx
+         */
+        onFulfilled([{ transferChannel }, timeoutTimestamp]: [{
+            transferChannel: IBCConnectionInfo["transferChannel"];
+        }, bigint], { opts, token, destination }: {
+            destination: ChainAddress;
+            opts?: IBCMsgTransferOptions;
+            token: Coin;
+        }): Vow<undefined>;
+    };
     invitationMakers: {
         /**
          * @param {CosmosValidatorAddress} validator
@@ -100,6 +126,11 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit
          * transferred.
          */
         TransferAccount(): never;
+        Transfer(): Promise<Invitation<Vow<void>, {
+            amount: AmountArg;
+            destination: ChainAddress;
+            opts: IBCMsgTransferOptions;
+        }>>;
     };
     holder: {
         /** @type {HostOf<OrchestrationAccountI['asContinuingOffer']>} */
@@ -117,13 +148,13 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit
         /** @type {HostOf<StakingAccountActions['withdrawReward']>} */
         withdrawReward(validator: CosmosValidatorAddress): Vow<DenomAmount[] extends import("@endo/pass-style").Passable ? DenomAmount[] : import("@agoric/async-flow").HostInterface<DenomAmount[]>>;
         /** @type {HostOf<OrchestrationAccountI['getBalance']>} */
-        getBalance(denom: DenomArg): Vow<DenomAmount extends import("@endo/pass-style").Passable ? DenomAmount : import("@agoric/async-flow").HostInterface<DenomAmount>>;
+        getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<DenomAmount extends import("@endo/pass-style").Passable ? DenomAmount : import("@agoric/async-flow").HostInterface<DenomAmount>>;
         /** @type {HostOf<OrchestrationAccountI['send']>} */
         send(toAccount: ChainAddress, amounts: AmountArg): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
         /** @type {HostOf<OrchestrationAccountI['sendAll']>} */
         sendAll(toAccount: ChainAddress, amounts: AmountArg[]): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
         /** @type {HostOf<OrchestrationAccountI['transfer']>} */
-        transfer(amount: AmountArg, destination: ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
+        transfer(amount: AmountArg, destination: ChainAddress, opts?: IBCMsgTransferOptions | undefined): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
         /** @type {HostOf<OrchestrationAccountI['transferSteps']>} */
         transferSteps(amount: AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
         /** @type {HostOf<StakingAccountActions['withdrawRewards']>} */
@@ -132,7 +163,13 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, makeRecorderKit
         undelegate(delegations: Omit<Delegation, "delegatorAddress">[]): Vow<void extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & void : import("@agoric/async-flow").HostInterface<void>>;
     };
 }>;
-export function prepareCosmosOrchestrationAccount(zone: Zone, makeRecorderKit: MakeRecorderKit, vowTools: VowTools, zcf: ZCF): (...args: Parameters<ReturnType<typeof prepareCosmosOrchestrationAccountKit>>) => CosmosOrchestrationAccountKit["holder"];
+export function prepareCosmosOrchestrationAccount(zone: Zone, { chainHub, makeRecorderKit, timerService, vowTools, zcf }: {
+    chainHub: ChainHub;
+    makeRecorderKit: MakeRecorderKit;
+    timerService: Remote<TimerService>;
+    vowTools: VowTools;
+    zcf: ZCF;
+}): (...args: Parameters<ReturnType<typeof prepareCosmosOrchestrationAccountKit>>) => CosmosOrchestrationAccountKit["holder"];
 export type ComosOrchestrationAccountNotification = {
     chainAddress: ChainAddress;
 };
@@ -147,21 +184,23 @@ export type State = {
 export type CosmosOrchestrationAccountKit = ReturnType<ReturnType<typeof prepareCosmosOrchestrationAccountKit>>;
 export type CosmosOrchestrationAccount = CosmosOrchestrationAccountKit["holder"];
 import type { Zone } from '@agoric/zone';
+import type { ChainHub } from '../types.js';
 import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { TimerService } from '@agoric/time';
+import type { Remote } from '@agoric/internal';
 import type { VowTools } from '@agoric/vow';
 import type { ChainAddress } from '../types.js';
 import type { IcaAccount } from '../types.js';
-import type { Remote } from '@agoric/internal';
 import type { ICQConnection } from '../types.js';
-import type { TimerService } from '@agoric/time';
 import type { AmountArg } from '../types.js';
 import type { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
 import type { ResponseQuery } from '@agoric/cosmic-proto/tendermint/abci/types.js';
 import type { JsonSafe } from '@agoric/cosmic-proto';
 import type { DenomAmount } from '../types.js';
 import type { Vow } from '@agoric/vow';
+import type { IBCConnectionInfo } from '../types.js';
+import type { IBCMsgTransferOptions } from '../types.js';
 import type { CosmosValidatorAddress } from '../types.js';
 import type { Delegation } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
-import type { DenomArg } from '../types.js';
 import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 //# sourceMappingURL=cosmos-orchestration-account.d.ts.map

package/src/exos/cosmos-orchestration-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"AAsDA;;;GAGG;AAEH;;;;;;;;;GASG;AAEH,mCAAmC;AACnC;;;;;;;;;;;;;;;GAaG;AAgBI,2DALI,IAAI,mBACJ,eAAe,0BACf,QAAQ,OACR,GAAG;aA0DC,UAAU;iBACV,OAAO,WAAW,CAAC;mBACnB,aAAa,GAAG,SAAS;WACzB,OAAO,YAAY,CAAC;;;QAc3B,wDAAwD;;;QAWxD;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAejB;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;WAEG;4BADQ,MAAM;;IAgBnB;;;OAGG;;QAED,uDAAuD;4BAA3C,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;QAO5C,6BAA6B;4BAAjB,MAAM;;;QAYlB;;;WAGG;4BAFQ,sBAAsB,UACtB,SAAS;QAUpB;;;;WAIG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QAYpB,gDAAgD;kCAApC,sBAAsB;QASlC,kEAAkE;gCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;;uBAgB9B,YAAY;oBAAU,SAAS;;;uBAa/B,YAAY;qBAAW,SAAS,EAAE;;QAStD;;;;WAIG;;;;QAMH,iEAAiE;;QAsBjE,+DAA+D;;QAiB/D,0DAA0D;;QAI1D,wDAAwD;;QAsBxD,2DAA2D;;QAK3D,0DAA0D;;QAyB1D,8DAA8D;;QAgB9D,0DAA0D;;QAsB1D,oDAAoD;;QAqBpD,uDAAuD;;QAqBvD,wDAAwD;;QAMxD,6DAA6D;;QAM7D,+DAA+D;;QAK/D,0DAA0D;;;GA6BjE;AAmBM,wDAVI,IAAI,mBACJ,eAAe,YACf,QAAQ,OACR,GAAG,GACD,CACZ,GAAO,IAAI,EAAE,UAAU,CACvB,UAAgB,CAAC,OAAO,oCAAoC,CAAC,CACxD,KACE,6BAA6B,CAAC,QAAQ,CAAC,CAe9C;;kBAxhBa,YAAY;;oBAIb;IACZ,QAAY,EAAE,YAAY,qCAAqC,CAAC,CAAC;IACjE,OAAW,EAAE,UAAU,CAAC;IACxB,YAAgB,EAAE,YAAY,CAAC;IAC/B,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7C,SAAa,EAAE,MAAM,CAAC;IACtB,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;CAC7B;4CAgfS,UAAU,CACtB,UAAc,CAAC,OAAO,oCAAoC,CAAC,CACxD;yCA4BU,6BAA6B,CAAC,QAAQ,CAAC;0BAriB9B,cAAc;qCAPU,6CAA6C;8BAM5D,aAAa;kCAPqH,aAAa;gCAAb,aAAa;4BAItJ,kBAAkB;mCAJuH,aAAa;kCAMhJ,cAAc;+BANqH,aAAa;0BAExJ,kDAAkD;mCAOzC,+CAA+C;8BACpD,sBAAsB;iCAViH,aAAa;yBAO/I,aAAa;4CAPqH,aAAa;gCAGlJ,wDAAwD;8BAH6E,aAAa;iCAChI,6CAA6C"}
+{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"AAyDA;;;GAGG;AAEH;;;;;;;;;GASG;AAEH,mCAAmC;AACnC;;;;;;;;;;;;;;;GAaG;AAmBI,2DARI,IAAI,gGAEZ;IAAyB,QAAQ,EAAzB,QAAQ;IACgB,eAAe,EAAvC,eAAe;IACc,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACI,GAAG,EAAf,GAAG;CACb;aA2Ec,UAAU;iBACV,OAAO,WAAW,CAAC;mBACnB,aAAa,GAAG,SAAS;WACzB,OAAO,YAAY,CAAC;;;QAc3B,wDAAwD;;;QAWxD;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAejB;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;WAEG;4BADQ,MAAM;;IAgBnB;;;OAGG;;QAED,uDAAuD;4BAA3C,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;QAO5C,6BAA6B;4BAAjB,MAAM;;;QAYlB;;;;;;;;;;WAUG;6DATQ,CACV;YAAM,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;SAAE,EAC7D,MAAU,CACP,gCACO;YACV,WAAe,EAAE,YAAY,CAAC;YAC9B,IAAQ,CAAC,EAAE,qBAAqB,CAAC;YACjC,KAAS,EAAE,IAAI,CAAC;SACb;;;QA2BJ;;;WAGG;4BAFQ,sBAAsB,UACtB,SAAS;QAUpB;;;;WAIG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QAYpB,gDAAgD;kCAApC,sBAAsB;QASlC,kEAAkE;gCAAtD,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;;;uBAgB9B,YAAY;oBAAU,SAAS;;;uBAa/B,YAAY;qBAAW,SAAS,EAAE;;QAStD;;;;WAIG;;;oBASc,SAAS;yBACJ,YAAY;kBACnB,qBAAqB;;;;QAcpC,iEAAiE;;QAsBjE,+DAA+D;;QAiB/D,0DAA0D;;QAI1D,wDAAwD;;QAsBxD,2DAA2D;;QAK3D,0DAA0D;;QAyB1D,8DAA8D;;QAgB9D,0DAA0D;;QAsB1D,oDAAoD;;QAqBpD,uDAAuD;;QAqBvD,wDAAwD;;QAkCxD,6DAA6D;;QAM7D,+DAA+D;;QAK/D,0DAA0D;;;GA6BjE;AAsBM,wDAbI,IAAI,8DAEZ;IAAyB,QAAQ,EAAzB,QAAQ;IACgB,eAAe,EAAvC,eAAe;IACc,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACI,GAAG,EAAf,GAAG;CACX,GAAU,CACZ,GAAO,IAAI,EAAE,UAAU,CACvB,UAAgB,CAAC,OAAO,oCAAoC,CAAC,CACxD,KACE,6BAA6B,CAAC,QAAQ,CAAC,CAc9C;;kBAloBa,YAAY;;oBAIb;IACZ,QAAY,EAAE,YAAY,qCAAqC,CAAC,CAAC;IACjE,OAAW,EAAE,UAAU,CAAC;IACxB,YAAgB,EAAE,YAAY,CAAC;IAC/B,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7C,SAAa,EAAE,MAAM,CAAC;IACtB,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;CAC7B;4CAwlBS,UAAU,CACtB,UAAc,CAAC,OAAO,oCAAoC,CAAC,CACxD;yCA8BU,6BAA6B,CAAC,QAAQ,CAAC;0BA/oB9B,cAAc;8BARuK,aAAa;qCAC1K,6CAA6C;kCAK7D,cAAc;4BAFpB,kBAAkB;8BAGX,aAAa;kCAP+J,aAAa;gCAAb,aAAa;mCAAb,aAAa;+BAAb,aAAa;0BAElM,kDAAkD;mCAOzC,+CAA+C;8BACpD,sBAAsB;iCAV2J,aAAa;yBAOzL,aAAa;uCAP+J,aAAa;2CAAb,aAAa;4CAAb,aAAa;gCAG5L,wDAAwD;iCAFtC,6CAA6C"}

package/src/exos/cosmos-orchestration-account.js

@@ -16,6 +16,7 @@ import {
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
 import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
 import { MsgSend } from '@agoric/cosmic-proto/cosmos/bank/v1beta1/tx.js';
+import { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
 import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { M } from '@agoric/vat-data';
@@ -28,13 +29,15 @@ import {
   ChainAddressShape,
   DelegationShape,
   DenomAmountShape,
+  IBCTransferOptionsShape,
 } from '../typeGuards.js';
 import { maxClockSkew, tryDecodeResponse } from '../utils/cosmos.js';
 import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
+import { makeTimestampHelper } from '../utils/time.js';
 
 /**
  * @import {HostOf} from '@agoric/async-flow';
- * @import {AmountArg, IcaAccount, ChainAddress, CosmosValidatorAddress, ICQConnection, StakingAccountActions, DenomAmount, OrchestrationAccountI, DenomArg} from '../types.js';
+ * @import {AmountArg, IcaAccount, ChainAddress, CosmosValidatorAddress, ICQConnection, StakingAccountActions, DenomAmount, OrchestrationAccountI, IBCConnectionInfo, IBCMsgTransferOptions, ChainHub} from '../types.js';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  * @import {Coin} from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
  * @import {Delegation} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
@@ -94,16 +97,24 @@ const toDenomAmount = c => ({ denom: c.denom, value: BigInt(c.amount) });
 
 /**
  * @param {Zone} zone
- * @param {MakeRecorderKit} makeRecorderKit
- * @param {VowTools} vowTools
- * @param {ZCF} zcf
+ * @param {object} powers
+ * @param {ChainHub} powers.chainHub
+ * @param {MakeRecorderKit} powers.makeRecorderKit
+ * @param {Remote<TimerService>} powers.timerService
+ * @param {VowTools} powers.vowTools
+ * @param {ZCF} powers.zcf
  */
 export const prepareCosmosOrchestrationAccountKit = (
   zone,
-  makeRecorderKit,
-  { watch, asVow, when },
-  zcf,
+  {
+    chainHub,
+    makeRecorderKit,
+    timerService,
+    vowTools: { watch, asVow, when, allVows },
+    zcf,
+  },
 ) => {
+  const timestampHelper = makeTimestampHelper(timerService);
   const makeCosmosOrchestrationAccountKit = zone.exoClassKit(
     'Cosmos Orchestration Account Holder',
     {
@@ -132,6 +143,18 @@ export const prepareCosmosOrchestrationAccountKit = (
           .optional(M.arrayOf(M.undefined())) // empty context
           .returns(M.arrayOf(DenomAmountShape)),
       }),
+      transferWatcher: M.interface('transferWatcher', {
+        onFulfilled: M.call([M.record(), M.nat()])
+          .optional({
+            destination: ChainAddressShape,
+            opts: M.or(M.undefined(), IBCTransferOptionsShape),
+            token: {
+              denom: M.string(),
+              amount: M.string(),
+            },
+          })
+          .returns(Vow$(M.record())),
+      }),
       holder: IcaAccountHolderI,
       invitationMakers: M.interface('invitationMakers', {
         Delegate: M.call(ChainAddressShape, AmountArgShape).returns(
@@ -148,6 +171,7 @@ export const prepareCosmosOrchestrationAccountKit = (
         TransferAccount: M.call().returns(M.promise()),
         Send: M.call().returns(M.promise()),
         SendAll: M.call().returns(M.promise()),
+        Transfer: M.call().returns(M.promise()),
       }),
     },
     /**
@@ -252,6 +276,42 @@ export const prepareCosmosOrchestrationAccountKit = (
           return harden(coins.map(toDenomAmount));
         },
       },
+      transferWatcher: {
+        /**
+         * @param {[
+         *   { transferChannel: IBCConnectionInfo['transferChannel'] },
+         *   bigint,
+         * ]} results
+         * @param {{
+         *   destination: ChainAddress;
+         *   opts?: IBCMsgTransferOptions;
+         *   token: Coin;
+         * }} ctx
+         */
+        onFulfilled(
+          [{ transferChannel }, timeoutTimestamp],
+          { opts, token, destination },
+        ) {
+          const results = E(this.facets.helper.owned()).executeEncodedTx([
+            Any.toJSON(
+              MsgTransfer.toProtoMsg({
+                sourcePort: transferChannel.portId,
+                sourceChannel: transferChannel.channelId,
+                token,
+                sender: this.state.chainAddress.value,
+                receiver: destination.value,
+                timeoutHeight: opts?.timeoutHeight ?? {
+                  revisionHeight: 0n,
+                  revisionNumber: 0n,
+                },
+                timeoutTimestamp,
+                memo: opts?.memo ?? '',
+              }),
+            ),
+          ]);
+          return watch(results, this.facets.returnVoidWatcher);
+        },
+      },
       invitationMakers: {
         /**
          * @param {CosmosValidatorAddress} validator
@@ -335,6 +395,25 @@ export const prepareCosmosOrchestrationAccountKit = (
         TransferAccount() {
           throw Error('not yet implemented');
         },
+        Transfer() {
+          /**
+           * @type {OfferHandler<
+           *   Vow<void>,
+           *   {
+           *     amount: AmountArg;
+           *     destination: ChainAddress;
+           *     opts: IBCMsgTransferOptions;
+           *   }
+           * >}
+           */
+          const offerHandler = (seat, { amount, destination, opts }) => {
+            seat.exit();
+            return watch(
+              this.facets.holder.transfer(amount, destination, opts),
+            );
+          };
+          return zcf.makeInvitation(offerHandler, 'Transfer');
+        },
       },
       holder: {
         /** @type {HostOf<OrchestrationAccountI['asContinuingOffer']>} */
@@ -513,9 +592,37 @@ export const prepareCosmosOrchestrationAccountKit = (
         },
 
         /** @type {HostOf<OrchestrationAccountI['transfer']>} */
-        transfer(amount, msg) {
-          console.log('transferSteps got', amount, msg);
-          return asVow(() => Fail`not yet implemented`);
+        transfer(amount, destination, opts) {
+          trace('transfer', amount, destination, opts);
+          return asVow(() => {
+            const { helper } = this.facets;
+            const token = helper.amountToCoin(amount);
+
+            const connectionInfoV = watch(
+              chainHub.getConnectionInfo(
+                this.state.chainAddress.chainId,
+                destination.chainId,
+              ),
+            );
+
+            // set a `timeoutTimestamp` if caller does not supply either `timeoutHeight` or `timeoutTimestamp`
+            // TODO #9324 what's a reasonable default? currently 5 minutes
+            const timeoutTimestampVowOrValue =
+              opts?.timeoutTimestamp ??
+              (opts?.timeoutHeight
+                ? 0n
+                : E(timestampHelper).getTimeoutTimestampNS());
+
+            // Resolves when host chain successfully submits, but not when
+            // the receiving chain acknowledges.
+            // See https://github.com/Agoric/agoric-sdk/issues/9784 for a
+            // solution that tracks the acknowledgement on the receiving chain.
+            return watch(
+              allVows([connectionInfoV, timeoutTimestampVowOrValue]),
+              this.facets.transferWatcher,
+              { opts, token, destination },
+            );
+          });
         },
 
         /** @type {HostOf<OrchestrationAccountI['transferSteps']>} */
@@ -568,9 +675,12 @@ export const prepareCosmosOrchestrationAccountKit = (
 
 /**
  * @param {Zone} zone
- * @param {MakeRecorderKit} makeRecorderKit
- * @param {VowTools} vowTools
- * @param {ZCF} zcf
+ * @param {object} powers
+ * @param {ChainHub} powers.chainHub
+ * @param {MakeRecorderKit} powers.makeRecorderKit
+ * @param {Remote<TimerService>} powers.timerService
+ * @param {VowTools} powers.vowTools
+ * @param {ZCF} powers.zcf
  * @returns {(
  *   ...args: Parameters<
  *     ReturnType<typeof prepareCosmosOrchestrationAccountKit>
@@ -579,16 +689,15 @@ export const prepareCosmosOrchestrationAccountKit = (
  */
 export const prepareCosmosOrchestrationAccount = (
   zone,
-  makeRecorderKit,
-  vowTools,
-  zcf,
+  { chainHub, makeRecorderKit, timerService, vowTools, zcf },
 ) => {
-  const makeKit = prepareCosmosOrchestrationAccountKit(
-    zone,
+  const makeKit = prepareCosmosOrchestrationAccountKit(zone, {
+    chainHub,
     makeRecorderKit,
+    timerService,
     vowTools,
     zcf,
-  );
+  });
   return (...args) => makeKit(...args).holder;
 };
 /** @typedef {CosmosOrchestrationAccountKit['holder']} CosmosOrchestrationAccount */

package/src/exos/local-orchestration-account.d.ts

@@ -30,6 +30,11 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
             toAccount: ChainAddress;
             amounts: AmountArg[];
         }>>;
+        Transfer(): Promise<Invitation<Vow<void>, {
+            amount: AmountArg;
+            destination: ChainAddress;
+            opts: IBCMsgTransferOptions;
+        }>>;
     };
     undelegateWatcher: {
         /**
@@ -41,13 +46,6 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
          */
         onFulfilled(response: [JsonSafe<TypedJson<"/cosmos.staking.v1beta1.MsgUndelegateResponse">>]): Vow<undefined>;
     };
-    getChainInfoWatcher: {
-        /**
-         * @param {ChainInfo} agoricChainInfo
-         * @param {ChainAddress} destination
-         */
-        onFulfilled(agoricChainInfo: ChainInfo, destination: ChainAddress): Vow<IBCConnectionInfo>;
-    };
     transferWatcher: {
         /**
          * @param {[
@@ -56,7 +54,7 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
          * ]} results
          * @param {{
          *   destination: ChainAddress;
-         *   opts: IBCMsgTransferOptions;
+         *   opts?: IBCMsgTransferOptions;
          *   amount: DenomAmount;
          * }} ctx
          */
@@ -64,7 +62,7 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, makeRecorderKit:
             transferChannel: IBCConnectionInfo["transferChannel"];
         }, bigint], { opts, amount, destination }: {
             destination: ChainAddress;
-            opts: IBCMsgTransferOptions;
+            opts?: IBCMsgTransferOptions;
             amount: DenomAmount;
         }): import("@agoric/async-flow").HostInterface<Vow<any>>;
     };
@@ -218,11 +216,10 @@ import type { AmountArg } from '@agoric/orchestration';
 import type { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
 import type { Vow } from '@agoric/vow';
 import type { TimestampRecord } from '@agoric/time';
+import type { IBCMsgTransferOptions } from '@agoric/orchestration';
 import type { TypedJson } from '@agoric/cosmic-proto';
 import type { JsonSafe } from '@agoric/cosmic-proto';
-import type { ChainInfo } from '@agoric/orchestration';
 import type { IBCConnectionInfo } from '@agoric/orchestration';
-import type { IBCMsgTransferOptions } from '@agoric/orchestration';
 import type { DenomAmount } from '@agoric/orchestration';
 import type { Pattern } from '@endo/patterns';
 import type { EVow } from '@agoric/vow';

package/src/exos/local-orchestration-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"AAyFO,0DAPI,IAAI,mBACJ,eAAe,OACf,GAAG,gBACH,OAAO,YAAY,CAAC,YACpB,QAAQ,YACR,QAAQ;aAyEJ,iBAAiB;aACjB,YAAY;iBACZ,OAAO,WAAW,CAAC;;;QAc1B;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAejB;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAYxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;uBAmBJ,YAAY;oBAAU,SAAS;;;uBAa/B,YAAY;qBAAW,SAAS,EAAE;;;;QAWtD;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;WAGG;6DADQ,YAAY;;;QAUvB;;;;;;;;;;WAUG;6DATQ,CACV;YAAM,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;SAAE,EAC7D,MAAU,CACP,iCACO;YACV,WAAe,EAAE,YAAY,CAAC;YAC9B,IAAQ,EAAE,qBAAqB,CAAC;YAChC,MAAU,EAAE,WAAW,CAAC;SACrB;;IAqCN;;;OAGG;;QAED;;WAEG;6BADQ,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;;;;IAavC;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;;QAOxB,iEAAiE;;QAsBjE;;;;WAIG;;QAeH,2DAA2D;;QAM3D;;WAEG;;QAiBH;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAsBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;QAoBxC;;;;WAIG;QACH,mDAAmD;;QAOnD,oDAAoD;;QAIpD,qDAAqD;;;;;;;;;;QAIrD,kDAAkD;;QAIlD;;;;WAIG;;QAiBH;;;;WAIG;;QAiBH;;;;;;;;WAQG;yBAPQ,SAAS,eAET,YAAY,6CAIV,IAAI,GAAG,CAAC;QAgCrB,6DAA6D;;QAO7D,wDAAwD;;QAMxD,sDAAsD;;;;;QAItD,4DAA4D;;;;;;;;;;;;;;;;;;;;;;;GAQnE;;aA5iBa,MAAM;;oBAIP;IACZ,QAAY,EAAE,YAAY,6BAA6B,CAAC,CAAC;IACzD,WAAe,EAAE,WAAW,CAAC;IAC7B,OAAW,EAAE,iBAAiB,CAAC;IAC/B,OAAW,EAAE,YAAY,CAAC;CACvB;+CAqiBU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BArkBnC,cAAc;qCADU,6CAA6C;kCAK5C,cAAc;4BAHrC,kBAAkB;8BAIO,aAAa;8BAIpC,gBAAgB;uCAZP,gCAAgC;kCAC+D,uBAAuB;+BAAvB,uBAAuB;0BASnI,kDAAkD;yBAFvB,aAAa;qCADf,cAAc;+BAEZ,sBAAsB;8BAAtB,sBAAsB;+BAR2D,uBAAuB;uCAAvB,uBAAuB;2CAAvB,uBAAuB;iCAAvB,uBAAuB;6BAUvH,gBAAgB;0BAHD,aAAa;iCANhB,6CAA6C;iCAW9D,mBAAmB"}
+{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"AAyFO,0DAPI,IAAI,mBACJ,eAAe,OACf,GAAG,gBACH,OAAO,YAAY,CAAC,YACpB,QAAQ,YACR,QAAQ;aAqEJ,iBAAiB;aACjB,YAAY;iBACZ,OAAO,WAAW,CAAC;;;QAc1B;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAejB;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAYxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;uBAmBJ,YAAY;oBAAU,SAAS;;;uBAa/B,YAAY;qBAAW,SAAS,EAAE;;;oBAcrC,SAAS;yBACJ,YAAY;kBACnB,qBAAqB;;;;QAcpC;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;;;;;;;;WAUG;6DATQ,CACV;YAAM,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;SAAE,EAC7D,MAAU,CACP,iCACO;YACV,WAAe,EAAE,YAAY,CAAC;YAC9B,IAAQ,CAAC,EAAE,qBAAqB,CAAC;YACjC,MAAU,EAAE,WAAW,CAAC;SACrB;;IAqCN;;;OAGG;;QAED;;WAEG;6BADQ,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;;;;IAavC;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;;QAOxB,iEAAiE;;QAsBjE;;;;WAIG;;QAeH,2DAA2D;;QAM3D;;WAEG;;QAiBH;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAsBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;QAoBxC;;;;WAIG;QACH,mDAAmD;;QAOnD,oDAAoD;;QAIpD,qDAAqD;;;;;;;;;;QAIrD,kDAAkD;;QAIlD;;;;WAIG;;QAiBH;;;;WAIG;;QAiBH;;;;;;;;WAQG;yBAPQ,SAAS,eAET,YAAY,6CAIV,IAAI,GAAG,CAAC;QAiCrB,6DAA6D;;QAO7D,wDAAwD;;QAMxD,sDAAsD;;;;;QAItD,4DAA4D;;;;;;;;;;;;;;;;;;;;;;;GAQnE;;aAhjBa,MAAM;;oBAIP;IACZ,QAAY,EAAE,YAAY,6BAA6B,CAAC,CAAC;IACzD,WAAe,EAAE,WAAW,CAAC;IAC7B,OAAW,EAAE,iBAAiB,CAAC;IAC/B,OAAW,EAAE,YAAY,CAAC;CACvB;+CAyiBU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BAzkBnC,cAAc;qCADU,6CAA6C;kCAK5C,cAAc;4BAHrC,kBAAkB;8BAIO,aAAa;8BAIpC,gBAAgB;uCAZP,gCAAgC;kCAC+D,uBAAuB;+BAAvB,uBAAuB;0BASnI,kDAAkD;yBAFvB,aAAa;qCADf,cAAc;2CANqE,uBAAuB;+BAQxG,sBAAsB;8BAAtB,sBAAsB;uCAR2D,uBAAuB;iCAAvB,uBAAuB;6BAUvH,gBAAgB;0BAHD,aAAa;iCANhB,6CAA6C;iCAW9D,mBAAmB"}

package/src/exos/local-orchestration-account.js

@@ -121,11 +121,6 @@ export const prepareLocalOrchestrationAccountKit = (
           .optional(M.arrayOf(M.undefined())) // empty context
           .returns(VowShape),
       }),
-      getChainInfoWatcher: M.interface('getChainInfoWatcher', {
-        onFulfilled: M.call(M.record()) // agoric chain info
-          .optional(ChainAddressShape)
-          .returns(Vow$(M.record())), // connection info
-      }),
       transferWatcher: M.interface('transferWatcher', {
         onFulfilled: M.call([M.record(), M.nat()])
           .optional({
@@ -154,6 +149,7 @@ export const prepareLocalOrchestrationAccountKit = (
         CloseAccount: M.call().returns(M.promise()),
         Send: M.call().returns(M.promise()),
         SendAll: M.call().returns(M.promise()),
+        Transfer: M.call().returns(M.promise()),
       }),
     },
     /**
@@ -248,6 +244,25 @@ export const prepareLocalOrchestrationAccountKit = (
           };
           return zcf.makeInvitation(offerHandler, 'SendAll');
         },
+        Transfer() {
+          /**
+           * @type {OfferHandler<
+           *   Vow<void>,
+           *   {
+           *     amount: AmountArg;
+           *     destination: ChainAddress;
+           *     opts: IBCMsgTransferOptions;
+           *   }
+           * >}
+           */
+          const offerHandler = (seat, { amount, destination, opts }) => {
+            seat.exit();
+            return watch(
+              this.facets.holder.transfer(amount, destination, opts),
+            );
+          };
+          return zcf.makeInvitation(offerHandler, 'Transfer');
+        },
       },
       undelegateWatcher: {
         /**
@@ -268,18 +283,6 @@ export const prepareLocalOrchestrationAccountKit = (
           );
         },
       },
-      getChainInfoWatcher: {
-        /**
-         * @param {ChainInfo} agoricChainInfo
-         * @param {ChainAddress} destination
-         */
-        onFulfilled(agoricChainInfo, destination) {
-          return chainHub.getConnectionInfo(
-            agoricChainInfo.chainId,
-            destination.chainId,
-          );
-        },
-      },
       transferWatcher: {
         /**
          * @param {[
@@ -288,7 +291,7 @@ export const prepareLocalOrchestrationAccountKit = (
          * ]} results
          * @param {{
          *   destination: ChainAddress;
-         *   opts: IBCMsgTransferOptions;
+         *   opts?: IBCMsgTransferOptions;
          *   amount: DenomAmount;
          * }} ctx
          */
@@ -556,9 +559,10 @@ export const prepareLocalOrchestrationAccountKit = (
             if ('brand' in amount) throw Fail`ERTP Amounts not yet supported`;
 
             const connectionInfoV = watch(
-              chainHub.getChainInfo('agoric'),
-              this.facets.getChainInfoWatcher,
-              destination,
+              chainHub.getConnectionInfo(
+                this.state.address.chainId,
+                destination.chainId,
+              ),
             );
 
             // set a `timeoutTimestamp` if caller does not supply either `timeoutHeight` or `timeoutTimestamp`

package/src/exos/packet-tools.js

@@ -109,7 +109,7 @@ export const preparePacketTools = (zone, vowTools) => {
       }),
       utils: M.interface('utils', {
         subscribeToTransfers: M.call().returns(M.promise()),
-        unsubscribeFromTransfers: M.call().returns(M.promise()),
+        unsubscribeFromTransfers: M.call().returns(M.undefined()),
         incrPendingPatterns: M.call().returns(Vow$(M.undefined())),
         decrPendingPatterns: M.call().returns(Vow$(M.undefined())),
       }),

package/src/proposals/start-stakeAtom.d.ts

@@ -1,7 +1,8 @@
-export function startStakeAtom({ consume: { agoricNames, board, chainStorage, chainTimerService, cosmosInterchainService, startUpgradable, }, installation: { consume: { stakeIca }, }, instance: { produce: { stakeAtom: produceInstance }, }, }: BootstrapPowers & {
+export function startStakeAtom({ consume: { agoricNames, board, chainStorage, chainTimerService: timer, cosmosInterchainService, startUpgradable, }, installation: { consume: { stakeIca }, }, instance: { produce: { stakeAtom: produceInstance }, }, }: BootstrapPowers & {
     installation: {
         consume: {
             stakeIca: Installation<(zcf: ZCF<StakeIcaTerms>, privateArgs: {
+                agoricNames: import("@agoric/internal").Remote<import("@agoric/vats").NameHub>;
                 cosmosInterchainService: import("../types.js").CosmosInterchainService;
                 storageNode: StorageNode;
                 marshaller: Marshaller;

package/src/proposals/start-stakeAtom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-stakeAtom.d.ts","sourceRoot":"","sources":["start-stakeAtom.js"],"names":[],"mappings":"AAyBO,mPAVI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;CACH,iBAqDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN;mCAlG4C,+BAA+B"}
+{"version":3,"file":"start-stakeAtom.d.ts","sourceRoot":"","sources":["start-stakeAtom.js"],"names":[],"mappings":"AAyBO,0PAVI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;CACH,iBAwDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN;mCArG4C,+BAA+B"}

package/src/proposals/start-stakeAtom.js

@@ -1,4 +1,4 @@
-import { makeTracer } from '@agoric/internal';
+import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { prepareVowTools } from '@agoric/vow';
 import { makeHeapZone } from '@agoric/zone';
@@ -28,7 +28,7 @@ export const startStakeAtom = async ({
     agoricNames,
     board,
     chainStorage,
-    chainTimerService,
+    chainTimerService: timer,
     cosmosInterchainService,
     startUpgradable,
   },
@@ -64,12 +64,15 @@ export const startStakeAtom = async ({
       bondDenom: cosmoshub.stakingTokens[0].denom,
       icqEnabled: cosmoshub.icqEnabled,
     },
-    privateArgs: {
-      cosmosInterchainService: await cosmosInterchainService,
-      storageNode,
-      marshaller,
-      timer: await chainTimerService,
-    },
+    privateArgs: await deeplyFulfilledObject(
+      harden({
+        agoricNames,
+        cosmosInterchainService,
+        storageNode,
+        marshaller,
+        timer,
+      }),
+    ),
   };
 
   const { instance } = await E(startUpgradable)(startOpts);

package/src/proposals/start-stakeOsmo.d.ts

@@ -1,7 +1,8 @@
-export function startStakeOsmo({ consume: { agoricNames, board, chainStorage, chainTimerService, cosmosInterchainService, startUpgradable, }, installation: { consume: { stakeIca }, }, instance: { produce: { stakeOsmo: produceInstance }, }, }: BootstrapPowers & {
+export function startStakeOsmo({ consume: { agoricNames, board, chainStorage, chainTimerService: timer, cosmosInterchainService, startUpgradable, }, installation: { consume: { stakeIca }, }, instance: { produce: { stakeOsmo: produceInstance }, }, }: BootstrapPowers & {
     installation: {
         consume: {
             stakeIca: Installation<(zcf: ZCF<StakeIcaTerms>, privateArgs: {
+                agoricNames: import("@agoric/internal").Remote<import("@agoric/vats").NameHub>;
                 cosmosInterchainService: import("../types.js").CosmosInterchainService;
                 storageNode: StorageNode;
                 marshaller: Marshaller;

package/src/proposals/start-stakeOsmo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-stakeOsmo.d.ts","sourceRoot":"","sources":["start-stakeOsmo.js"],"names":[],"mappings":"AA8BO,mPAfI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;IACN,QAAY,EAAE;QACd,OAAa,EAAE;YACf,SAAiB,EAAE,GAAG,CAAC;SAChB,CAAC;KACH,CAAC;CACH,iBAqDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN"}
+{"version":3,"file":"start-stakeOsmo.d.ts","sourceRoot":"","sources":["start-stakeOsmo.js"],"names":[],"mappings":"AA8BO,0PAfI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;IACN,QAAY,EAAE;QACd,OAAa,EAAE;YACf,SAAiB,EAAE,GAAG,CAAC;SAChB,CAAC;KACH,CAAC;CACH,iBAwDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN"}

package/src/proposals/start-stakeOsmo.js

@@ -1,4 +1,4 @@
-import { makeTracer } from '@agoric/internal';
+import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { prepareVowTools } from '@agoric/vow';
 import { makeHeapZone } from '@agoric/zone';
@@ -33,7 +33,7 @@ export const startStakeOsmo = async ({
     agoricNames,
     board,
     chainStorage,
-    chainTimerService,
+    chainTimerService: timer,
     cosmosInterchainService,
     startUpgradable,
   },
@@ -69,12 +69,15 @@ export const startStakeOsmo = async ({
       bondDenom: osmosis.stakingTokens[0].denom,
       icqEnabled: osmosis.icqEnabled,
     },
-    privateArgs: {
-      cosmosInterchainService: await cosmosInterchainService,
-      storageNode,
-      marshaller,
-      timer: await chainTimerService,
-    },
+    privateArgs: await deeplyFulfilledObject(
+      harden({
+        agoricNames,
+        cosmosInterchainService,
+        storageNode,
+        marshaller,
+        timer,
+      }),
+    ),
   };
 
   const { instance } = await E(startUpgradable)(startOpts);

package/src/utils/orchestrationAccount.js

@@ -6,6 +6,7 @@ import {
   AmountArgShape,
   ChainAddressShape,
   DenomAmountShape,
+  IBCTransferOptionsShape,
 } from '../typeGuards.js';
 
 /** @import {OrchestrationAccountI} from '../orchestration-api.js'; */
@@ -22,7 +23,7 @@ export const orchestrationAccountMethods = {
     VowShape,
   ),
   transfer: M.call(AmountArgShape, ChainAddressShape)
-    .optional(M.record())
+    .optional(IBCTransferOptionsShape)
     .returns(VowShape),
   transferSteps: M.call(AmountArgShape, M.any()).returns(VowShape),
   asContinuingOffer: M.call().returns(

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,0CALI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;+BAoGR,IAAI;;;;;;;;;;;;;;;;;;;;;;;;wCArEW,GAAG;;+BA/C1B,GAAC,+EAGuB,GAAG,yCAK7B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsIL;AAuBM,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;kCAhLU;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;iCA6IU,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BA3JzC,kBAAkB;0BAGrB,cAAc;gCALR,gCAAgC;4BAIpC,aAAa;6CAEI,sCAAsC;kCALrC,cAAc;6BAE/B,cAAc"}
+{"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AA6CO,0CALI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;+BAwGR,IAAI;;;;;;;;;;;;;;;;;;;;;;;;wCAzEW,GAAG;;+BA/C1B,GAAC,+EAGuB,GAAG,yCAK7B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0IL;AAuBM,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;kCApLU;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;iCAiJU,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BA/JzC,kBAAkB;0BAGrB,cAAc;gCALR,gCAAgC;4BAIpC,aAAa;6CAEI,sCAAsC;kCALrC,cAAc;6BAE/B,cAAc"}

package/src/utils/start-helper.js

@@ -94,9 +94,13 @@ export const provideOrchestration = (
 
   const makeCosmosOrchestrationAccount = prepareCosmosOrchestrationAccount(
     zones.orchestration,
-    makeRecorderKit,
-    vowTools,
-    zcf,
+    {
+      chainHub,
+      makeRecorderKit,
+      timerService,
+      vowTools,
+      zcf,
+    },
   );
 
   const makeRemoteChainFacade = prepareRemoteChainFacade(zones.orchestration, {

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

@@ -1 +1 @@
-{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["time.js"],"names":[],"mappings":"AAaA;;;;GAIG;AACH,2CAFW,OAAO,YAAY,CAAC;IAY3B;;;;;;;;;;OAUG;0EAFU,OAAO,CAAC,MAAM,CAAC;EAiB/B;AAlDD;;;GAGG;AAEH,qCAAsC;AACtC,4CAA6C;AAC7C,mDAAsD;AACtD,iDAAqD;8BA4CvC,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;kCAnDE,cAAc;4BACpD,kBAAkB;wCADoB,cAAc"}
+{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["time.js"],"names":[],"mappings":"AAaA;;;;GAIG;AACH,2CAFW,OAAO,YAAY,CAAC;IAI3B;;;;;;;;;;OAUG;0EAFU,OAAO,CAAC,MAAM,CAAC;EAiB/B;AA1CD;;;GAGG;AAEH,qCAAsC;AACtC,4CAA6C;AAC7C,mDAAsD;AACtD,iDAAqD;8BAoCvC,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;kCA3CE,cAAc;4BACpD,kBAAkB;wCADoB,cAAc"}

package/src/utils/time.js

@@ -17,14 +17,6 @@ export const NANOSECONDS_PER_SECOND = 1_000_000_000n;
  * @param {Remote<TimerService>} timer
  */
 export function makeTimestampHelper(timer) {
-  /** @type {TimerBrand | undefined} */
-  let brandCache;
-  const getBrand = async () => {
-    if (brandCache) return brandCache;
-    brandCache = await E(timer).getTimerBrand();
-    return brandCache;
-  };
-
   return harden({
     /**
      * XXX do this need to be resumable / use Vows?
@@ -43,7 +35,7 @@ export function makeTimestampHelper(timer) {
         relativeTime ||
         TimeMath.coerceRelativeTimeRecord(
           SECONDS_PER_MINUTE * 5n,
-          await getBrand(),
+          currentTime.timerBrand,
         );
       return (
         TimeMath.addAbsRel(currentTime, timeout).absValue *

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;;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;;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"}

package/src/utils/zoe-tools.js

@@ -64,13 +64,15 @@ 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 depositVs = Object.entries(give).map(async ([kw, _amount]) => {
         const pmt = await E(userSeat).getPayout(kw);
         // TODO arrange recovery on upgrade of pmt?
         return localAccount.deposit(pmt);
       });
-      await Promise.all(promises);
+      await vowTools.when(vowTools.allVows(depositVs));
       // TODO remove userSeat from baggage
+      // TODO reject non-vbank issuers
+      // TODO recover failed deposits
     },
   );