@agoric/orchestration 0.1.1-dev-ecc38fc.0 → 0.1.1-dev-394a500.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-ecc38fc.0+ecc38fc",
+  "version": "0.1.1-dev-394a500.0+394a500",
   "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-ecc38fc.0+ecc38fc",
-    "@agoric/cosmic-proto": "0.4.1-dev-ecc38fc.0+ecc38fc",
-    "@agoric/ertp": "0.16.3-dev-ecc38fc.0+ecc38fc",
-    "@agoric/internal": "0.3.3-dev-ecc38fc.0+ecc38fc",
-    "@agoric/network": "0.1.1-dev-ecc38fc.0+ecc38fc",
-    "@agoric/notifier": "0.6.3-dev-ecc38fc.0+ecc38fc",
-    "@agoric/store": "0.9.3-dev-ecc38fc.0+ecc38fc",
-    "@agoric/time": "0.3.3-dev-ecc38fc.0+ecc38fc",
-    "@agoric/vat-data": "0.5.3-dev-ecc38fc.0+ecc38fc",
-    "@agoric/vats": "0.15.2-dev-ecc38fc.0+ecc38fc",
-    "@agoric/vow": "0.1.1-dev-ecc38fc.0+ecc38fc",
-    "@agoric/zoe": "0.26.3-dev-ecc38fc.0+ecc38fc",
-    "@agoric/zone": "0.2.3-dev-ecc38fc.0+ecc38fc",
+    "@agoric/async-flow": "0.1.1-dev-394a500.0+394a500",
+    "@agoric/cosmic-proto": "0.4.1-dev-394a500.0+394a500",
+    "@agoric/ertp": "0.16.3-dev-394a500.0+394a500",
+    "@agoric/internal": "0.3.3-dev-394a500.0+394a500",
+    "@agoric/network": "0.1.1-dev-394a500.0+394a500",
+    "@agoric/notifier": "0.6.3-dev-394a500.0+394a500",
+    "@agoric/store": "0.9.3-dev-394a500.0+394a500",
+    "@agoric/time": "0.3.3-dev-394a500.0+394a500",
+    "@agoric/vat-data": "0.5.3-dev-394a500.0+394a500",
+    "@agoric/vats": "0.15.2-dev-394a500.0+394a500",
+    "@agoric/vow": "0.1.1-dev-394a500.0+394a500",
+    "@agoric/zoe": "0.26.3-dev-394a500.0+394a500",
+    "@agoric/zone": "0.2.3-dev-394a500.0+394a500",
     "@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#ae060daa6252f3ff2aa2f84e887de0aab491281d"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-ecc38fc.0+ecc38fc",
+    "@agoric/swingset-liveslots": "0.10.3-dev-394a500.0+394a500",
     "@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": "ecc38fcb4d0499026d6f8a2ac52d652dfe6e7bb9"
+  "gitHead": "394a5004a66d53fb6575fa6b66c44c843e6fc1e1"
 }

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

@@ -1 +1 @@
-{"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"}
+{"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;;;;;;;;;;;;;;;;;;;;;;GA0GjB;4BA5HY;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;yBAyHU,OAAO,KAAK;6BA3JiB,cAAc;4BADhC,kBAAkB;6CAIwB,aAAa;kCAFjD,cAAc;6BAHnB,kBAAkB;mDAII,uBAAuB;qCAF5B,cAAc"}

package/src/examples/stakeIca.contract.js

@@ -115,17 +115,24 @@ export const start = async (zcf, privateArgs, baggage) => {
       ? await E(orchestration).provideICQConnection(controllerConnectionId)
       : undefined;
 
-    const accountAddress = await E(account).getAddress();
-    trace('account address', accountAddress);
+    const [chainAddress, localAddress, remoteAddress] = await Promise.all([
+      E(account).getAddress(),
+      E(account).getLocalAddress(),
+      E(account).getRemoteAddress(),
+    ]);
+    trace('account address', chainAddress);
     const accountNode = await E(accountsStorageNode).makeChildNode(
-      accountAddress.value,
+      chainAddress.value,
+    );
+    const holder = makeCosmosOrchestrationAccount(
+      { chainAddress, bondDenom, localAddress, remoteAddress },
+      {
+        account,
+        storageNode: accountNode,
+        icqConnection,
+        timer,
+      },
     );
-    const holder = makeCosmosOrchestrationAccount(accountAddress, bondDenom, {
-      account,
-      storageNode: accountNode,
-      icqConnection,
-      timer,
-    });
     return holder;
   }
 

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

@@ -7,11 +7,19 @@
  *   topicKit: RecorderKit<ComosOrchestrationAccountNotification>;
  *   account: IcaAccount;
  *   chainAddress: ChainAddress;
+ *   localAddress: LocalIbcAddress;
+ *   remoteAddress: RemoteIbcAddress;
  *   icqConnection: ICQConnection | undefined;
  *   bondDenom: string;
  *   timer: Remote<TimerService>;
  * }} State
  */
+/**
+ * @typedef {{
+ *   localAddress: LocalIbcAddress;
+ *   remoteAddress: RemoteIbcAddress;
+ * }} CosmosOrchestrationAccountStorageState
+ */
 /** @see {OrchestrationAccountI} */
 export const IcaAccountHolderI: import("@endo/patterns").InterfaceGuard<{
     delegate: import("@endo/patterns").MethodGuard;
@@ -37,7 +45,12 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
     timerService: Remote<TimerService>;
     vowTools: VowTools;
     zcf: ZCF;
-}): (chainAddress: ChainAddress, bondDenom: string, io: {
+}): (args_0: {
+    chainAddress: ChainAddress;
+    bondDenom: string;
+    localAddress: LocalIbcAddress;
+    remoteAddress: RemoteIbcAddress;
+}, io: {
     account: IcaAccount;
     storageNode: Remote<StorageNode>;
     icqConnection: ICQConnection | undefined;
@@ -184,10 +197,16 @@ export type State = {
     topicKit: RecorderKit<ComosOrchestrationAccountNotification>;
     account: IcaAccount;
     chainAddress: ChainAddress;
+    localAddress: LocalIbcAddress;
+    remoteAddress: RemoteIbcAddress;
     icqConnection: ICQConnection | undefined;
     bondDenom: string;
     timer: Remote<TimerService>;
 };
+export type CosmosOrchestrationAccountStorageState = {
+    localAddress: LocalIbcAddress;
+    remoteAddress: RemoteIbcAddress;
+};
 export type CosmosOrchestrationAccountKit = ReturnType<ReturnType<typeof prepareCosmosOrchestrationAccountKit>>;
 export type CosmosOrchestrationAccount = CosmosOrchestrationAccountKit["holder"];
 import type { Zone } from '@agoric/zone';
@@ -197,6 +216,8 @@ 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 { LocalIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
+import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
 import type { IcaAccount } from '../types.js';
 import type { ICQConnection } from '../types.js';
 import type { AmountArg } from '../types.js';

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":"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"}
+{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"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"}

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

@@ -49,6 +49,7 @@ import { makeTimestampHelper } from '../utils/time.js';
  * @import {ResponseQuery} from '@agoric/cosmic-proto/tendermint/abci/types.js';
  * @import {JsonSafe} from '@agoric/cosmic-proto';
  * @import {Matcher} from '@endo/patterns';
+ * @import {LocalIbcAddress, RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
  */
 
 const trace = makeTracer('ComosOrchestrationAccountHolder');
@@ -65,12 +66,21 @@ const { Vow$ } = NetworkShape; // TODO #9611
  *   topicKit: RecorderKit<ComosOrchestrationAccountNotification>;
  *   account: IcaAccount;
  *   chainAddress: ChainAddress;
+ *   localAddress: LocalIbcAddress;
+ *   remoteAddress: RemoteIbcAddress;
  *   icqConnection: ICQConnection | undefined;
  *   bondDenom: string;
  *   timer: Remote<TimerService>;
  * }} State
  */
 
+/**
+ * @typedef {{
+ *   localAddress: LocalIbcAddress;
+ *   remoteAddress: RemoteIbcAddress;
+ * }} CosmosOrchestrationAccountStorageState
+ */
+
 /** @see {OrchestrationAccountI} */
 export const IcaAccountHolderI = M.interface('IcaAccountHolder', {
   ...orchestrationAccountMethods,
@@ -178,8 +188,11 @@ export const prepareCosmosOrchestrationAccountKit = (
       }),
     },
     /**
-     * @param {ChainAddress} chainAddress
-     * @param {string} bondDenom e.g. 'uatom'
+     * @param {object} info
+     * @param {ChainAddress} info.chainAddress
+     * @param {string} info.bondDenom e.g. 'uatom'
+     * @param {LocalIbcAddress} info.localAddress
+     * @param {RemoteIbcAddress} info.remoteAddress
      * @param {object} io
      * @param {IcaAccount} io.account
      * @param {Remote<StorageNode>} io.storageNode
@@ -187,14 +200,29 @@ export const prepareCosmosOrchestrationAccountKit = (
      * @param {Remote<TimerService>} io.timer
      * @returns {State}
      */
-    (chainAddress, bondDenom, io) => {
+    ({ chainAddress, bondDenom, localAddress, remoteAddress }, io) => {
       const { storageNode, ...rest } = io;
       // must be the fully synchronous maker because the kit is held in durable state
       const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
       // TODO determine what goes in vstorage https://github.com/Agoric/agoric-sdk/issues/9066
-      void E(topicKit.recorder).write('');
-
-      return { chainAddress, bondDenom, topicKit, ...rest };
+      // XXX consider parsing local/remoteAddr to portId, channelId, counterpartyPortId, counterpartyChannelId, connectionId, counterpartyConnectionId
+      // FIXME these values will not update if IcaAccount gets new values after reopening.
+      // consider having IcaAccount responsible for the owning the writer. It might choose to share it with COA.
+      void E(topicKit.recorder).write(
+        /** @type {CosmosOrchestrationAccountStorageState} */ ({
+          localAddress,
+          remoteAddress,
+        }),
+      );
+
+      return {
+        chainAddress,
+        bondDenom,
+        localAddress,
+        remoteAddress,
+        topicKit,
+        ...rest,
+      };
     },
     {
       helper: {

package/src/exos/remote-chain-facade.d.ts

@@ -52,12 +52,12 @@ export function prepareRemoteChainFacade(zone: Zone, powers: RemoteChainFacadePo
          */
         onFulfilled(icqConnection: ICQConnection, msgs: JsonSafe<RequestQuery>[]): Vow<JsonSafe<ResponseQuery>[]>;
     };
-    getAddressWatcher: {
+    getAddressesWatcher: {
         /**
-         * @param {ChainAddress} chainAddress
+         * @param {[ChainAddress, LocalIbcAddress, RemoteIbcAddress]} chainAddresses
          * @param {IcaAccount} account
          */
-        onFulfilled(chainAddress: ChainAddress, account: IcaAccount): Vow<import("@endo/exo").Guarded<{
+        onFulfilled([chainAddress, localAddress, remoteAddress]: [ChainAddress, LocalIbcAddress, RemoteIbcAddress], account: IcaAccount): Vow<import("@endo/exo").Guarded<{
             asContinuingOffer(): Vow<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & import("../utils/zoe-tools.js").ResolvedContinuingOfferResult : import("@agoric/async-flow").HostInterface<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>>;
             getPublicTopics(): Vow<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> : import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
             getAddress(): import("@agoric/async-flow").HostInterface<ChainAddress>;
@@ -82,11 +82,15 @@ export function prepareRemoteChainFacade(zone: Zone, powers: RemoteChainFacadePo
          * @param {{
          *   account: IcaAccount;
          *   chainAddress: ChainAddress;
+         *   localAddress: LocalIbcAddress;
+         *   remoteAddress: RemoteIbcAddress;
          * }} ctx
          */
-        onFulfilled(childNode: Remote<StorageNode>, { account, chainAddress }: {
+        onFulfilled(childNode: Remote<StorageNode>, { account, chainAddress, localAddress, remoteAddress }: {
             account: IcaAccount;
             chainAddress: ChainAddress;
+            localAddress: LocalIbcAddress;
+            remoteAddress: RemoteIbcAddress;
         }): import("@endo/exo").Guarded<{
             asContinuingOffer(): Vow<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & import("../utils/zoe-tools.js").ResolvedContinuingOfferResult : import("@agoric/async-flow").HostInterface<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>>;
             getPublicTopics(): Vow<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> extends import("@endo/pass-style").Passable ? import("@endo/pass-style").Passable & Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>> : import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
@@ -130,6 +134,8 @@ import type { ResponseQuery } from '@agoric/cosmic-proto/tendermint/abci/types.j
 import type { IcaAccount } from '../types.js';
 import type { ICQConnection } from '../types.js';
 import type { ChainAddress } from '../types.js';
+import type { LocalIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
+import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
 import type { Remote } from '@agoric/internal';
 import type { prepareCosmosOrchestrationAccount } from './cosmos-orchestration-account.js';
 import type { CosmosInterchainService } from './cosmos-interchain-service.js';

package/src/exos/remote-chain-facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-chain-facade.d.ts","sourceRoot":"","sources":["remote-chain-facade.js"],"names":[],"mappings":"AA0OO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;QA/H1B,4CAA4C;;QAK5C,2CAA2C;;QA4B3C,qCAAqC;;;;QAyBrC;;WAEG;8CADQ,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;QAelD;;;;WAIG;mCAHQ,aAAa,QACb,SAAS,YAAY,CAAC,EAAE,GACtB,IAAI,SAAS,aAAa,CAAC,EAAE,CAAC;;;QAU3C;;;WAGG;kCAFQ,YAAY,WACZ,UAAU;;;;;;;;;;;;;;;;;;;;QAWrB;;;;;;WAMG;+BALQ,OAAO,WAAW,CAAC,6BACnB;YACV,OAAW,EAAE,UAAU,CAAC;YACxB,YAAgB,EAAE,YAAY,CAAC;SAC5B;;;;;;;;;;;;;;;;;;;cA2BX;sCApNY;IACZ,8BAAkC,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACN,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,QAAY,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACZ,eAAmB,EAAE,eAAe,CAAC;IACrC,cAAkB,EAAE,iBAAiB,CAAC;IACtC,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCAuMU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BAvOxB,mBAAmB;uCAQ2D,aAAa;yBAHlF,aAAa;kCAHC,+CAA+C;8BADlE,sBAAsB;mCACH,+CAA+C;gCAMQ,aAAa;mCAAb,aAAa;kCAAb,aAAa;4BAJzF,kBAAkB;uDAGS,mCAAmC;6CAD7C,gCAAgC;kCAH3C,cAAc;8BAEb,aAAa;qCAGwD,aAAa"}
+{"version":3,"file":"remote-chain-facade.d.ts","sourceRoot":"","sources":["remote-chain-facade.js"],"names":[],"mappings":"AAiQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;QAhJ1B,4CAA4C;;QAK5C,2CAA2C;;QA4B3C,qCAAqC;;;;QAyBrC;;WAEG;8CADQ,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;QAmBlD;;;;WAIG;mCAHQ,aAAa,QACb,SAAS,YAAY,CAAC,EAAE,GACtB,IAAI,SAAS,aAAa,CAAC,EAAE,CAAC;;;QAU3C;;;WAGG;iEAFQ,CAAC,YAAY,EAAE,eAAe,EAAE,gBAAgB,CAAC,WACjD,UAAU;;;;;;;;;;;;;;;;;;;;QAWrB;;;;;;;;WAQG;+BAPQ,OAAO,WAAW,CAAC,0DACnB;YACV,OAAW,EAAE,UAAU,CAAC;YACxB,YAAgB,EAAE,YAAY,CAAC;YAC/B,YAAgB,EAAE,eAAe,CAAC;YAClC,aAAiB,EAAE,gBAAgB,CAAC;SACjC;;;;;;;;;;;;;;;;;;;cAsCX;sCA1OY;IACZ,8BAAkC,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACN,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,QAAY,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACZ,eAAmB,EAAE,eAAe,CAAC;IACrC,cAAkB,EAAE,iBAAiB,CAAC;IACtC,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCA6NU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA9PxB,mBAAmB;uCAS2D,aAAa;yBAJlF,aAAa;kCAHC,+CAA+C;8BADlE,sBAAsB;mCACH,+CAA+C;gCAOQ,aAAa;mCAAb,aAAa;kCAAb,aAAa;qCAH9D,iCAAiC;sCAAjC,iCAAiC;4BAF5D,kBAAkB;uDAIS,mCAAmC;6CAD7C,gCAAgC;kCAJ3C,cAAc;8BAEb,aAAa;qCAIwD,aAAa"}

package/src/exos/remote-chain-facade.js

@@ -14,6 +14,7 @@ import { ChainAddressShape, ChainFacadeI, ICQMsgShape } from '../typeGuards.js';
  * @import {TimerService} from '@agoric/time';
  * @import {Remote} from '@agoric/internal';
  * @import {Vow, VowTools} from '@agoric/vow';
+ * @import {LocalIbcAddress, RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
  * @import {CosmosInterchainService} from './cosmos-interchain-service.js';
  * @import {prepareCosmosOrchestrationAccount} from './cosmos-orchestration-account.js';
  * @import {CosmosChainInfo, IBCConnectionInfo, ChainAddress, IcaAccount, Chain, ICQConnection} from '../types.js';
@@ -79,13 +80,18 @@ const prepareRemoteChainFacadeKit = (
           ]).returns(VowShape),
         },
       ),
-      getAddressWatcher: M.interface('getAddressWatcher', {
-        onFulfilled: M.call(ChainAddressShape, M.remotable()).returns(VowShape),
+      getAddressesWatcher: M.interface('getAddressWatcher', {
+        onFulfilled: M.call(
+          [ChainAddressShape, M.string(), M.string()],
+          M.remotable(),
+        ).returns(VowShape),
       }),
       makeChildNodeWatcher: M.interface('makeChildNodeWatcher', {
         onFulfilled: M.call(M.remotable(), {
           account: M.remotable(),
           chainAddress: ChainAddressShape,
+          localAddress: M.string(),
+          remoteAddress: M.string(),
         }).returns(M.remotable()),
       }),
     },
@@ -170,8 +176,12 @@ const prepareRemoteChainFacadeKit = (
             // no need to pass icqConnection in ctx; we can get it from state
           }
           return watch(
-            E(account).getAddress(),
-            this.facets.getAddressWatcher,
+            allVows([
+              E(account).getAddress(),
+              E(account).getLocalAddress(),
+              E(account).getRemoteAddress(),
+            ]),
+            this.facets.getAddressesWatcher,
             account,
           );
         },
@@ -189,16 +199,16 @@ const prepareRemoteChainFacadeKit = (
           return watch(E(icqConnection).query(msgs));
         },
       },
-      getAddressWatcher: {
+      getAddressesWatcher: {
         /**
-         * @param {ChainAddress} chainAddress
+         * @param {[ChainAddress, LocalIbcAddress, RemoteIbcAddress]} chainAddresses
          * @param {IcaAccount} account
          */
-        onFulfilled(chainAddress, account) {
+        onFulfilled([chainAddress, localAddress, remoteAddress], account) {
           return watch(
             E(storageNode).makeChildNode(chainAddress.value),
             this.facets.makeChildNodeWatcher,
-            { account, chainAddress },
+            { account, chainAddress, localAddress, remoteAddress },
           );
         },
       },
@@ -208,20 +218,33 @@ const prepareRemoteChainFacadeKit = (
          * @param {{
          *   account: IcaAccount;
          *   chainAddress: ChainAddress;
+         *   localAddress: LocalIbcAddress;
+         *   remoteAddress: RemoteIbcAddress;
          * }} ctx
          */
-        onFulfilled(childNode, { account, chainAddress }) {
+        onFulfilled(
+          childNode,
+          { account, chainAddress, localAddress, remoteAddress },
+        ) {
           const { remoteChainInfo, icqConnection } = this.state;
           const stakingDenom = remoteChainInfo.stakingTokens?.[0]?.denom;
           if (!stakingDenom) throw Fail`chain info lacks staking denom`;
 
-          return makeCosmosOrchestrationAccount(chainAddress, stakingDenom, {
-            account,
-            // FIXME storage path https://github.com/Agoric/agoric-sdk/issues/9066
-            storageNode: childNode,
-            icqConnection,
-            timer,
-          });
+          return makeCosmosOrchestrationAccount(
+            {
+              chainAddress,
+              bondDenom: stakingDenom,
+              localAddress,
+              remoteAddress,
+            },
+            {
+              account,
+              // FIXME storage path https://github.com/Agoric/agoric-sdk/issues/9066
+              storageNode: childNode,
+              icqConnection,
+              timer,
+            },
+          );
         },
       },
     },