@agoric/orchestration 0.1.1-dev-1ea0d4b.0 → 0.1.1-dev-4e588de.0

package/src/exos/chain-hub.js

@@ -5,7 +5,7 @@ import { BrandShape } from '@agoric/ertp/src/typeGuards.js';
 
 import { VowShape } from '@agoric/vow';
 import {
-  ChainAddressShape,
+  CosmosChainAddressShape,
   CoinShape,
   CosmosChainInfoShape,
   DenomAmountShape,
@@ -14,16 +14,17 @@ import {
   ForwardOptsShape,
   IBCChannelIDShape,
   IBCConnectionInfoShape,
+  AccountArgShape,
 } from '../typeGuards.js';
-import { getBech32Prefix } from '../utils/address.js';
+import { getBech32Prefix, parseAccountId } from '../utils/address.js';
 
 /**
  * @import {NameHub} from '@agoric/vats';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
- * @import {CosmosAssetInfo, CosmosChainInfo, ForwardInfo, IBCConnectionInfo, IBCMsgTransferOptions, TransferRoute, GoDuration} from '../cosmos-api.js';
+ * @import {CosmosAssetInfo, CosmosChainInfo, ForwardInfo, IBCConnectionInfo, IBCMsgTransferOptions, TransferRoute, GoDuration, Bech32Address} from '../cosmos-api.js';
  * @import {ChainInfo, KnownChains} from '../chain-info.js';
- * @import {ChainAddress, Denom, DenomAmount} from '../orchestration-api.js';
+ * @import {AccountId, CosmosChainAddress, ScopedChainId, Denom, DenomAmount, AccountIdArg} from '../orchestration-api.js';
  * @import {Remote, TypedPattern} from '@agoric/internal';
  */
 
@@ -216,8 +217,9 @@ const ChainHubI = M.interface('ChainHub', {
     M.or(DenomDetailShape, M.undefined()),
   ),
   getDenom: M.call(BrandShape).returns(M.or(M.string(), M.undefined())),
-  makeChainAddress: M.call(M.string()).returns(ChainAddressShape),
-  makeTransferRoute: M.call(ChainAddressShape, DenomAmountShape, M.string())
+  makeChainAddress: M.call(M.string()).returns(CosmosChainAddressShape),
+  resolveAccountId: M.call(M.string()).returns(M.string()),
+  makeTransferRoute: M.call(AccountArgShape, DenomAmountShape, M.string())
     .optional(ForwardOptsShape)
     .returns(M.or(M.undefined(), TransferRouteShape)),
 });
@@ -268,6 +270,21 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
    */
   const makeDenomKey = (denom, srcChainName) => `${srcChainName}:${denom}`;
 
+  /**
+   * @param {string} address
+   * @returns {string}
+   */
+  const resolveCosmosChainId = address => {
+    // Infer it from the bech32 prefix
+    const prefix = getBech32Prefix(address);
+    if (!bech32PrefixToChainName.has(prefix)) {
+      throw makeError(`Chain info not found for bech32Prefix ${q(prefix)}`);
+    }
+    const chainName = bech32PrefixToChainName.get(prefix);
+    const { chainId } = chainInfos.get(chainName);
+    return chainId;
+  };
+
   const lookupChainInfo = vowTools.retryable(
     zone,
     'lookupChainInfo',
@@ -490,23 +507,44 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
       return undefined;
     },
     /**
-     * @param {string} address bech32 address
-     * @returns {ChainAddress}
+     * @param {string} partialId CAIP-10 account ID or a Cosmos bech32 address
+     * @returns {AccountId}
+     * @throws {Error} if chain info not found for bech32Prefix
+     */
+    resolveAccountId(partialId) {
+      const parsed = parseAccountId(partialId);
+      if ('namespace' in parsed) {
+        // It is already fully qualified
+        return /** @type {AccountId} */ (partialId);
+      }
+
+      const reference = resolveCosmosChainId(partialId);
+      return `cosmos:${reference}:${partialId}`;
+    },
+    /**
+     * @param {string} partialId CAIP-10 account ID or a Cosmos bech32 address
+     * @returns {CosmosChainAddress}
      * @throws {Error} if chain info not found for bech32Prefix
      */
-    makeChainAddress(address) {
-      const prefix = getBech32Prefix(address);
-      if (!bech32PrefixToChainName.has(prefix)) {
-        throw makeError(`Chain info not found for bech32Prefix ${q(prefix)}`);
+    makeChainAddress(partialId) {
+      const parsed = parseAccountId(partialId);
+
+      if ('namespace' in parsed) {
+        assert.equal(parsed.namespace, 'cosmos');
+        return harden({
+          chainId: parsed.reference,
+          value: parsed.accountAddress,
+        });
       }
-      const chainName = bech32PrefixToChainName.get(prefix);
-      const { chainId } = chainInfos.get(chainName);
+
+      const chainId = resolveCosmosChainId(parsed.accountAddress);
       return harden({
         chainId,
-        value: address,
-        encoding: /** @type {const} */ ('bech32'),
+        value: parsed.accountAddress,
       });
     },
+    // TODO document whether this is limited to IBC
+    // Not urgent because it's vat-local
     /**
      * Determine the transfer route for a destination and amount given the
      * current holding chain.
@@ -516,7 +554,7 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
      *
      * XXX consider accepting AmountArg #10449
      *
-     * @param {ChainAddress} destination
+     * @param {AccountIdArg} destination
      * @param {DenomAmount} denomAmount
      * @param {string} srcChainName
      * @param {IBCMsgTransferOptions['forwardOpts']} [forwardOpts]
@@ -545,6 +583,11 @@ export const makeChainHub = (zone, agoricNames, vowTools) => {
 
       const holdingChainId = chainInfos.get(srcChainName).chainId;
 
+      destination =
+        typeof destination === 'string'
+          ? chainHub.makeChainAddress(destination)
+          : destination;
+
       // asset is transferring to or from the issuing chain, return direct route
       if (baseChainId === destination.chainId || baseName === srcChainName) {
         // TODO use getConnectionInfo once its sync

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

@@ -44,7 +44,7 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
     vowTools: VowTools;
     zcf: ZCF;
 }): (args_0: {
-    chainAddress: ChainAddress;
+    chainAddress: CosmosChainAddress;
     localAddress: LocalIbcAddress;
     remoteAddress: RemoteIbcAddress;
 }, io: {
@@ -155,7 +155,7 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
          *   bigint,
          * ]} results
          * @param {{
-         *   destination: ChainAddress;
+         *   destination: CosmosChainAddress;
          *   opts?: IBCMsgTransferOptions;
          *   token: Coin;
          * }} ctx
@@ -163,7 +163,7 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         onFulfilled([{ transferChannel }, timeoutTimestamp]: [{
             transferChannel: IBCConnectionInfo["transferChannel"];
         }, bigint], { opts, token, destination }: {
-            destination: ChainAddress;
+            destination: CosmosChainAddress;
             opts?: IBCMsgTransferOptions;
             token: Coin;
         }): Vow<undefined>;
@@ -195,11 +195,11 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         DeactivateAccount(): Promise<Invitation<Vow<void>, undefined>>;
         ReactivateAccount(): Promise<Invitation<Vow<void>, undefined>>;
         Send(): Promise<Invitation<Vow<void>, {
-            toAccount: ChainAddress;
+            toAccount: CosmosChainAddress;
             amount: AmountArg;
         }>>;
         SendAll(): Promise<Invitation<Vow<void>, {
-            toAccount: ChainAddress;
+            toAccount: CosmosChainAddress;
             amounts: AmountArg[];
         }>>;
         /**
@@ -210,27 +210,27 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         TransferAccount(): never;
         Transfer(): Promise<Invitation<Vow<void>, {
             amount: AmountArg;
-            destination: ChainAddress;
+            destination: CosmosChainAddress;
             opts?: IBCMsgTransferOptions;
         }>>;
     };
     holder: {
         asContinuingOffer(): Vow<import("@agoric/async-flow").HostInterface<import("../utils/zoe-tools.js").ResolvedContinuingOfferResult>>;
         getPublicTopics(): Vow<import("@agoric/async-flow").HostInterface<Record<string, import("@agoric/zoe/src/contractSupport/topics.js").ResolvedPublicTopic<unknown>>>>;
-        getAddress(): import("@agoric/async-flow").HostInterface<ChainAddress>;
+        getAddress(): import("@agoric/async-flow").HostInterface<CosmosChainAddress>;
         delegate(validator: CosmosValidatorAddress, amount: AmountArg): Vow<void>;
         redelegate(srcValidator: CosmosValidatorAddress, dstValidator: CosmosValidatorAddress, amount: AmountArg): Vow<void>;
         withdrawReward(validator: CosmosValidatorAddress): Vow<import("../orchestration-api.js").DenomAmount[]>;
         getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount>;
         getBalances(): Vow<import("../orchestration-api.js").DenomAmount[]>;
-        send(toAccount: ChainAddress, amount: AmountArg): Vow<void>;
-        sendAll(toAccount: ChainAddress, amounts: AmountArg[]): Vow<void>;
-        transfer(destination: ChainAddress, amount: AmountArg, opts?: IBCMsgTransferOptions | undefined): Vow<void>;
+        send(toAccount: CosmosChainAddress, amount: AmountArg): Vow<void>;
+        sendAll(toAccount: CosmosChainAddress, amounts: AmountArg[]): Vow<void>;
+        transfer(destination: import("../orchestration-api.js").AccountIdArg, amount: AmountArg, opts?: IBCMsgTransferOptions | undefined): Vow<void>;
         transferSteps(amount: AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void>;
         withdrawRewards(): Vow<import("../orchestration-api.js").DenomAmount[]>;
         undelegate(delegations: {
             amount: AmountArg;
-            delegator?: ChainAddress;
+            delegator?: CosmosChainAddress;
             validator: CosmosValidatorAddress;
         }[]): Vow<void>;
         deactivate(): Vow<void>;
@@ -240,12 +240,10 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
             delegator: {
                 chainId: string;
                 value: string;
-                encoding: "bech32" | "ethereum";
             };
             validator: {
                 chainId: string;
                 value: `${string}valoper${string}`;
-                encoding: "bech32";
             };
             amount: {
                 denom: import("../orchestration-api.js").Denom;
@@ -311,14 +309,14 @@ export function prepareCosmosOrchestrationAccount(zone: Zone, { chainHub, makeRe
     zcf: ZCF;
 }): (...args: Parameters<ReturnType<typeof prepareCosmosOrchestrationAccountKit>>) => CosmosOrchestrationAccountKit["holder"];
 export type CosmosOrchestrationAccountNotification = {
-    chainAddress: ChainAddress;
+    chainAddress: CosmosChainAddress;
 };
 /**
  * Internal to the IcaAccountHolder exo
  */
 export type State = {
     account: IcaAccount;
-    chainAddress: ChainAddress;
+    chainAddress: CosmosChainAddress;
     icqConnection: ICQConnection | undefined;
     localAddress: LocalIbcAddress;
     remoteAddress: RemoteIbcAddress;
@@ -337,7 +335,7 @@ import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.j
 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 { CosmosChainAddress } 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';

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":"AA4IA,wCAAwC;AACxC;;;;;;;;;;;;;;;;;;;;;;;;;GASG;AAOH;;;;;;;;;;;GAkBE;AAYK,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;kBAsGc,YAAY;kBACZ,eAAe;mBACf,gBAAgB;;aAEhB,UAAU;;;;;;;WAGV,OAAO,YAAY,CAAC;;;QAkC3B,wDAAwD;;;QAYxD;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QASjB;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;;WAGG;8BAFQ,SAAS,aAAa,CAAC,EAAE,GACvB,wBAAwB;;;QAgBrC;;;WAGG;8BAFQ,SAAS,aAAa,CAAC,EAAE,GACvB,wBAAwB,EAAE;;;QAiBvC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAcpC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAapC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAapC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;;WAGG;8BAFQ,SAAS,aAAa,CAAC,EAAE,GACvB,qBAAqB;;;QAoBlC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAsBpC;;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;YACN,WAAW,EAAE,YAAY,CAAC;YAC1B,IAAI,CAAC,EAAE,qBAAqB,CAAC;YAC7B,KAAK,EAAE,IAAI,CAAC;SACb;;;QA2BJ;;;WAGG;4BAFQ,sBAAsB,UACtB,SAAS;QAUpB;;;;WAIG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QAYpB,gDAAgD;kCAApC,sBAAsB;QAQlC;;;;;WAKG;gCAJQ;YACN,MAAM,EAAE,SAAS,CAAC;YAClB,SAAS,EAAE,sBAAsB,CAAC;SACnC,EAAE;;;;uBAyBc,YAAY;oBAAU,SAAS;;;uBAa/B,YAAY;qBAAW,SAAS,EAAE;;QAStD;;;;WAIG;;;oBASc,SAAS;yBACJ,YAAY;mBAClB,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwa5C;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,CACjB,UAAU,CAAC,OAAO,oCAAoC,CAAC,CACxD,KACE,6BAA6B,CAAC,QAAQ,CAAC,CAc9C;;kBAtiCa,YAAY;;;;;oBAKb;IACR,OAAO,EAAE,UAAU,CAAC;IACpB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACzC,YAAY,EAAE,eAAe,CAAC;IAC9B,aAAa,EAAE,gBAAgB,CAAC;IAChC,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,YAAY,sCAAsC,CAAC,GAAG,SAAS,CAAC;CAC3E;qDAKS;IACR,YAAY,EAAE,eAAe,CAAC;IAC9B,aAAa,EAAE,gBAAgB,CAAC;CACjC;4CAk/BS,UAAU,CAClB,UAAU,CAAC,OAAO,oCAAoC,CAAC,CACxD;yCA8BU,6BAA6B,CAAC,QAAQ,CAAC;0BApjC9B,cAAc;8BARuO,aAAa;qCAC1O,6CAA6C;kCAK7D,cAAc;4BAHpB,kBAAkB;8BAIX,aAAa;kCAP+N,aAAa;qCAYrO,iCAAiC;sCAAjC,iCAAiC;gCAZuL,aAAa;8BAU9P,sBAAsB;mCADjB,+CAA+C;yBAF/C,aAAa;+BAP+N,aAAa;0BAElQ,kDAAkD;8CAFmM,aAAa;2CAAb,aAAa;uCAAb,aAAa;2CAAb,aAAa;4CAAb,aAAa;mCAAb,aAAa;iCAC1O,6CAA6C"}
+{"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

@@ -46,7 +46,7 @@ import { Fail, makeError, q } from '@endo/errors';
 import { E } from '@endo/far';
 import {
   AmountArgShape,
-  ChainAddressShape,
+  CosmosChainAddressShape,
   DelegationShape,
   DenomAmountShape,
   IBCTransferOptionsShape,
@@ -67,7 +67,7 @@ import { makeTimestampHelper } from '../utils/time.js';
 
 /**
  * @import {HostOf} from '@agoric/async-flow';
- * @import {AmountArg, IcaAccount, ChainAddress, CosmosValidatorAddress, ICQConnection, StakingAccountActions, StakingAccountQueries, OrchestrationAccountCommon, CosmosRewardsResponse, IBCConnectionInfo, IBCMsgTransferOptions, ChainHub, CosmosDelegationResponse} from '../types.js';
+ * @import {AmountArg, IcaAccount, CosmosChainAddress, CosmosValidatorAddress, ICQConnection, StakingAccountActions, StakingAccountQueries, OrchestrationAccountCommon, CosmosRewardsResponse, IBCConnectionInfo, IBCMsgTransferOptions, ChainHub, CosmosDelegationResponse} 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 {Remote} from '@agoric/internal';
@@ -88,14 +88,14 @@ const { Vow$ } = NetworkShape; // TODO #9611
 
 /**
  * @typedef {object} CosmosOrchestrationAccountNotification
- * @property {ChainAddress} chainAddress
+ * @property {CosmosChainAddress} chainAddress
  */
 
 /**
  * @private
  * @typedef {{
  *   account: IcaAccount;
- *   chainAddress: ChainAddress;
+ *   chainAddress: CosmosChainAddress;
  *   icqConnection: ICQConnection | undefined;
  *   localAddress: LocalIbcAddress;
  *   remoteAddress: RemoteIbcAddress;
@@ -114,14 +114,14 @@ const { Vow$ } = NetworkShape; // TODO #9611
 
 /** @see {StakingAccountActions} */
 const stakingAccountActionsMethods = {
-  delegate: M.call(ChainAddressShape, AmountArgShape).returns(VowShape),
+  delegate: M.call(CosmosChainAddressShape, AmountArgShape).returns(VowShape),
   redelegate: M.call(
-    ChainAddressShape,
-    ChainAddressShape,
+    CosmosChainAddressShape,
+    CosmosChainAddressShape,
     AmountArgShape,
   ).returns(VowShape),
   undelegate: M.call(M.arrayOf(DelegationShape)).returns(VowShape),
-  withdrawReward: M.call(ChainAddressShape).returns(
+  withdrawReward: M.call(CosmosChainAddressShape).returns(
     Vow$(M.arrayOf(DenomAmountShape)),
   ),
   withdrawRewards: M.call().returns(Vow$(M.arrayOf(DenomAmountShape))),
@@ -129,12 +129,12 @@ const stakingAccountActionsMethods = {
 
 /** @see {StakingAccountQueries} */
 const stakingAccountQueriesMethods = {
-  getDelegation: M.call(ChainAddressShape).returns(VowShape),
+  getDelegation: M.call(CosmosChainAddressShape).returns(VowShape),
   getDelegations: M.call().returns(VowShape),
-  getUnbondingDelegation: M.call(ChainAddressShape).returns(VowShape),
+  getUnbondingDelegation: M.call(CosmosChainAddressShape).returns(VowShape),
   getUnbondingDelegations: M.call().returns(VowShape),
   getRedelegations: M.call().returns(VowShape),
-  getReward: M.call(ChainAddressShape).returns(VowShape),
+  getReward: M.call(CosmosChainAddressShape).returns(VowShape),
   getRewards: M.call().returns(VowShape),
 };
 
@@ -158,13 +158,15 @@ const PUBLIC_TOPICS = {
 export const CosmosOrchestrationInvitationMakersI = M.interface(
   'invitationMakers',
   {
-    Delegate: M.call(ChainAddressShape, AmountArgShape).returns(M.promise()),
+    Delegate: M.call(CosmosChainAddressShape, AmountArgShape).returns(
+      M.promise(),
+    ),
     Redelegate: M.call(
-      ChainAddressShape,
-      ChainAddressShape,
+      CosmosChainAddressShape,
+      CosmosChainAddressShape,
       AmountArgShape,
     ).returns(M.promise()),
-    WithdrawReward: M.call(ChainAddressShape).returns(M.promise()),
+    WithdrawReward: M.call(CosmosChainAddressShape).returns(M.promise()),
     Undelegate: M.call(M.arrayOf(DelegationShape)).returns(M.promise()),
     DeactivateAccount: M.call().returns(M.promise()),
     ReactivateAccount: M.call().returns(M.promise()),
@@ -232,7 +234,7 @@ export const prepareCosmosOrchestrationAccountKit = (
       transferWatcher: M.interface('transferWatcher', {
         onFulfilled: M.call([M.record(), M.nat()])
           .optional({
-            destination: ChainAddressShape,
+            destination: CosmosChainAddressShape,
             opts: M.or(M.undefined(), IBCTransferOptionsShape),
             token: {
               denom: M.string(),
@@ -286,7 +288,7 @@ export const prepareCosmosOrchestrationAccountKit = (
     },
     /**
      * @param {object} info
-     * @param {ChainAddress} info.chainAddress
+     * @param {CosmosChainAddress} info.chainAddress
      * @param {LocalIbcAddress} info.localAddress
      * @param {RemoteIbcAddress} info.remoteAddress
      * @param {object} io
@@ -561,7 +563,7 @@ export const prepareCosmosOrchestrationAccountKit = (
          *   bigint,
          * ]} results
          * @param {{
-         *   destination: ChainAddress;
+         *   destination: CosmosChainAddress;
          *   opts?: IBCMsgTransferOptions;
          *   token: Coin;
          * }} ctx
@@ -655,7 +657,7 @@ export const prepareCosmosOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: ChainAddress; amount: AmountArg }
+           *   { toAccount: CosmosChainAddress; amount: AmountArg }
            * >}
            */
           const offerHandler = (seat, { toAccount, amount }) => {
@@ -668,7 +670,7 @@ export const prepareCosmosOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: ChainAddress; amounts: AmountArg[] }
+           *   { toAccount: CosmosChainAddress; amounts: AmountArg[] }
            * >}
            */
           const offerHandler = (seat, { toAccount, amounts }) => {
@@ -691,7 +693,7 @@ export const prepareCosmosOrchestrationAccountKit = (
            *   Vow<void>,
            *   {
            *     amount: AmountArg;
-           *     destination: ChainAddress;
+           *     destination: CosmosChainAddress;
            *     opts?: IBCMsgTransferOptions;
            *   }
            * >}
@@ -896,6 +898,15 @@ export const prepareCosmosOrchestrationAccountKit = (
         transfer(destination, amount, opts) {
           trace('transfer', destination, amount, opts);
           return asVow(() => {
+            // `destination` arg can be non-Cosmos per the common `.transfer` method signature
+            // but this implementation only supports transferring to another Cosmos chain.
+            // It relies on `makeChainAddress` to throw if `destination` has another namespace.
+            destination =
+              typeof destination === 'string'
+                ? // If `destination` is not actually CAIP-10 then this will throw
+                  chainHub.makeChainAddress(destination)
+                : destination;
+
             const { helper } = this.facets;
             const token = helper.amountToCoin(amount);
 

package/src/exos/ica-account-kit.d.ts

@@ -14,8 +14,8 @@ export function prepareIcaAccountKit(zone: Zone, { watch, asVow }: VowTools): (c
         onFulfilled(ack: string): string;
     };
     account: {
-        /** @returns {ChainAddress} */
-        getAddress(): ChainAddress;
+        /** @returns {CosmosChainAddress} */
+        getAddress(): CosmosChainAddress;
         getLocalAddress(): `/ibc-port/${string}`;
         getRemoteAddress(): `/${string}ibc-port/${string}/ordered/${string}` | `/${string}ibc-port/${string}/unordered/${string}`;
         getPort(): Port;
@@ -71,14 +71,14 @@ export type State = {
     localAddress: LocalIbcAddress | undefined;
     requestedRemoteAddress: string;
     remoteAddress: RemoteIbcAddress | undefined;
-    chainAddress: ChainAddress | undefined;
+    chainAddress: CosmosChainAddress | undefined;
     isInitiatingClose: boolean;
 };
 export type IcaAccountKit = ReturnType<ReturnType<typeof prepareIcaAccountKit>>;
 import type { Zone } from '@agoric/base-zone';
 import type { VowTools } from '@agoric/vow';
 import type { Port } from '@agoric/network';
-import type { ChainAddress } from '../types.js';
+import type { CosmosChainAddress } from '../types.js';
 import type { Vow } from '@agoric/vow';
 import type { AnyJson } from '@agoric/cosmic-proto';
 import type { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';

package/src/exos/ica-account-kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ica-account-kit.d.ts","sourceRoot":"","sources":["ica-account-kit.js"],"names":[],"mappings":"AA8BA;;;;;;;;;GAWG;AA0BI,2CAJI,IAAI,oBACJ,QAAQ;;QAiCX,0BAA0B;yBAAd,MAAM;;;QAMlB,8BAA8B;sBAAhB,YAAY;;;;;QAyB1B;;;;;;;;;WASG;+BALQ,OAAO,EAAE,SACT,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GACtB,IAAI,MAAM,CAAC;;;;;QA0CxB;;;;WAIG;2BAHQ,OAAO,UAAU,CAAC,aAClB,eAAe,cACf,gBAAgB;QAiB3B;;;;;;;;;;;;;;;;WAgBG;6BAHQ,OAAO,UAAU,CAAC,UAClB,OAAO;;GAkBvB;;;;oBAtLU;IACR,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,OAAO,UAAU,CAAC,GAAG,SAAS,CAAC;IAC3C,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;IAC1C,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC5C,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IACvC,iBAAiB,EAAE,OAAO,CAAC;CAC5B;4BA+KU,UAAU,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;0BArN1C,mBAAmB;8BAEF,aAAa;0BADlB,iBAAiB;kCAKT,aAAa;yBAJhB,aAAa;6BAC3B,sBAAsB;4BACvB,8CAA8C;gCAHpC,iBAAiB;4BACZ,aAAa;qCAGD,iCAAiC;sCAAjC,iCAAiC"}
+{"version":3,"file":"ica-account-kit.d.ts","sourceRoot":"","sources":["ica-account-kit.js"],"names":[],"mappings":"AA8BA;;;;;;;;;GAWG;AA0BI,2CAJI,IAAI,oBACJ,QAAQ;;QAiCX,0BAA0B;yBAAd,MAAM;;;QAMlB,oCAAoC;sBAAtB,kBAAkB;;;;;QAyBhC;;;;;;;;;WASG;+BALQ,OAAO,EAAE,SACT,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GACtB,IAAI,MAAM,CAAC;;;;;QA0CxB;;;;WAIG;2BAHQ,OAAO,UAAU,CAAC,aAClB,eAAe,cACf,gBAAgB;QAgB3B;;;;;;;;;;;;;;;;WAgBG;6BAHQ,OAAO,UAAU,CAAC,UAClB,OAAO;;GAkBvB;;;;oBArLU;IACR,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,OAAO,UAAU,CAAC,GAAG,SAAS,CAAC;IAC3C,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;IAC1C,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC5C,YAAY,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAC7C,iBAAiB,EAAE,OAAO,CAAC;CAC5B;4BA8KU,UAAU,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;0BApN1C,mBAAmB;8BAEF,aAAa;0BADlB,iBAAiB;wCAKH,aAAa;yBAJtB,aAAa;6BAC3B,sBAAsB;4BACvB,8CAA8C;gCAHpC,iBAAiB;4BACZ,aAAa;qCAGD,iCAAiC;sCAAjC,iCAAiC"}

package/src/exos/ica-account-kit.js

@@ -5,7 +5,7 @@ import { M } from '@endo/patterns';
 import { NonNullish, makeTracer } from '@agoric/internal';
 import { VowShape } from '@agoric/vow';
 import {
-  ChainAddressShape,
+  CosmosChainAddressShape,
   OutboundConnectionHandlerI,
   Proto3Shape,
   TxBodyOptsShape,
@@ -21,7 +21,7 @@ import { makeTxPacket, parseTxPacket } from '../utils/packet.js';
  * @import {AnyJson} from '@agoric/cosmic-proto';
  * @import {TxBody} from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
  * @import {LocalIbcAddress, RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
- * @import {ChainAddress, IcaAccount} from '../types.js';
+ * @import {CosmosChainAddress, IcaAccount} from '../types.js';
  */
 
 const trace = makeTracer('IcaAccountKit');
@@ -29,7 +29,7 @@ const trace = makeTracer('IcaAccountKit');
 const UNPARSABLE_CHAIN_ADDRESS = 'UNPARSABLE_CHAIN_ADDRESS';
 
 export const IcaAccountI = M.interface('IcaAccount', {
-  getAddress: M.call().returns(ChainAddressShape),
+  getAddress: M.call().returns(CosmosChainAddressShape),
   getLocalAddress: M.call().returns(M.string()),
   getRemoteAddress: M.call().returns(M.string()),
   getPort: M.call().returns(M.remotable('Port')),
@@ -51,7 +51,7 @@ export const IcaAccountI = M.interface('IcaAccount', {
  *   localAddress: LocalIbcAddress | undefined;
  *   requestedRemoteAddress: string;
  *   remoteAddress: RemoteIbcAddress | undefined;
- *   chainAddress: ChainAddress | undefined;
+ *   chainAddress: CosmosChainAddress | undefined;
  *   isInitiatingClose: boolean;
  * }} State
  *   Internal to the IcaAccountKit exo
@@ -101,7 +101,7 @@ export const prepareIcaAccountKit = (zone, { watch, asVow }) =>
         },
       },
       account: {
-        /** @returns {ChainAddress} */
+        /** @returns {CosmosChainAddress} */
         getAddress() {
           return NonNullish(
             this.state.chainAddress,
@@ -191,7 +191,6 @@ export const prepareIcaAccountKit = (zone, { watch, asVow }) =>
           this.state.chainAddress = harden({
             value: address || UNPARSABLE_CHAIN_ADDRESS,
             chainId: this.state.chainId,
-            encoding: 'bech32',
           });
         },
         /**

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

@@ -1 +1 @@
-{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA8LO,8CAJI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;IAtFzB,6DAA6D;mBAA/C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC;;;;;;;;;;GA4FhE;;;;;;;;;;;uBArKa,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;;qCAO3B;IACR,gCAAgC,EAAE,gCAAgC,CAAC;IACnE,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;CACpB;mCAyJU,UAAU,CAAC,OAAO,uBAAuB,CAAC;+BAC1C,UAAU,CAAC,oBAAoB,CAAC;0BAzLvB,mBAAmB;uCASiE,aAAa;yBAHxF,aAAa;kDAEoC,kCAAkC;+BAJvF,8BAA8B;sDAIuB,kCAAkC;6CADzE,qBAAqB;4BALtC,kBAAkB;6BAGjB,cAAc;kCAJT,cAAc;gCAEgB,gCAAgC;8BAG7D,aAAa"}
+{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA6LO,8CAJI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;IArFzB,6DAA6D;mBAA/C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC;;;;;;;;;;GA2FhE;;;;;;;;;;;uBApKa,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;;qCAO3B;IACR,gCAAgC,EAAE,gCAAgC,CAAC;IACnE,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;CACpB;mCAwJU,UAAU,CAAC,OAAO,uBAAuB,CAAC;+BAC1C,UAAU,CAAC,oBAAoB,CAAC;0BAxLvB,mBAAmB;uCASuE,aAAa;yBAH9F,aAAa;kDAEoC,kCAAkC;+BAJvF,8BAA8B;sDAIuB,kCAAkC;6CADzE,qBAAqB;4BALtC,kBAAkB;6BAGjB,cAAc;kCAJT,cAAc;gCAEgB,gCAAgC;8BAG7D,aAAa"}

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

@@ -19,7 +19,7 @@ import { chainFacadeMethods, TypedJsonShape } from '../typeGuards.js';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {CosmosInterchainService} from './exo-interfaces.js';
  * @import {LocalOrchestrationAccountKit, MakeLocalOrchestrationAccountKit} from './local-orchestration-account.js';
- * @import {Chain, ChainAddress, ChainInfo, CosmosChainInfo, IBCConnectionInfo, OrchestrationAccount} from '../types.js';
+ * @import {Chain, CosmosChainAddress, ChainInfo, CosmosChainInfo, IBCConnectionInfo, OrchestrationAccount} from '../types.js';
  */
 
 /**
@@ -142,7 +142,7 @@ const prepareLocalChainFacadeKit = (
       },
       makeAccountWatcher: {
         /**
-         * @param {[LocalChainAccount, ChainAddress['value']]} results
+         * @param {[LocalChainAccount, CosmosChainAddress['value']]} results
          */
         onFulfilled([account, address]) {
           const optionalStorageNode = storageNode
@@ -159,7 +159,7 @@ const prepareLocalChainFacadeKit = (
          * @param {Remote<StorageNode>} childNode
          * @param {{
          *   account: LocalChainAccount;
-         *   address: ChainAddress['value'];
+         *   address: CosmosChainAddress['value'];
          * }} ctx
          */
         onFulfilled(childNode, { account, address }) {
@@ -168,7 +168,6 @@ const prepareLocalChainFacadeKit = (
             account,
             address: harden({
               value: address,
-              encoding: 'bech32',
               chainId: localChainInfo.chainId,
             }),
             // FIXME storage path https://github.com/Agoric/agoric-sdk/issues/9066

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

@@ -8,7 +8,7 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
     zoeTools: ZoeTools;
 }): (args_0: {
     account: LocalChainAccount;
-    address: ChainAddress;
+    address: CosmosChainAddress;
     storageNode?: Remote<globalThis.StorageNode> | undefined;
 }) => import("@endo/exo").GuardedKit<{
     helper: {
@@ -32,16 +32,16 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
         Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<TimestampRecord>, undefined>>;
         CloseAccount(): never;
         Send(): Promise<Invitation<Vow<void>, {
-            toAccount: ChainAddress;
+            toAccount: CosmosChainAddress;
             amount: AmountArg;
         }>>;
         SendAll(): Promise<Invitation<Vow<void>, {
-            toAccount: ChainAddress;
+            toAccount: CosmosChainAddress;
             amounts: AmountArg[];
         }>>;
         Transfer(): Promise<Invitation<Vow<void>, {
             amount: AmountArg;
-            destination: ChainAddress;
+            destination: CosmosChainAddress;
             opts?: IBCMsgTransferOptions;
         }>>;
         Withdraw(): Promise<Invitation<Vow<void>, undefined>>;
@@ -156,11 +156,11 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
         }[]): Vow<{
             '@type': string;
         }[]>;
-        getAddress(): ChainAddress;
-        send(toAccount: ChainAddress, amount: AmountArg): Vow<void>;
-        sendAll(toAccount: ChainAddress, amounts: AmountArg[]): Vow<void>;
+        getAddress(): CosmosChainAddress;
+        send(toAccount: CosmosChainAddress, amount: AmountArg): Vow<void>;
+        sendAll(toAccount: CosmosChainAddress, amounts: AmountArg[]): Vow<void>;
         /**
-         * @param {ChainAddress} destination
+         * @param {AccountIdArg} destination
          * @param {AmountArg} amount an ERTP {@link Amount} or a
          *   {@link DenomAmount}
          * @param {IBCMsgTransferOptions} [opts] if either timeoutHeight or
@@ -171,7 +171,7 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
          *   recognized, or the transfer is rejected (insufficient funds,
          *   timeout)
          */
-        transfer(destination: ChainAddress, amount: AmountArg, opts?: IBCMsgTransferOptions): Vow<any>;
+        transfer(destination: AccountIdArg, amount: AmountArg, opts?: IBCMsgTransferOptions): Vow<any>;
         transferSteps(amount: AmountArg, msg: import("@agoric/orchestration").TransferMsg): Vow<void>;
         sendThenWaitForAck(packetSender: Remote<import("./packet-tools.js").PacketSender>, opts?: import("./packet-tools.js").PacketOptions | undefined): import("@agoric/async-flow").HostInterface<Vow<any>>;
         matchFirstPacket(args_0?: import("@agoric/vow").EVow<globalThis.Pattern>): import("@agoric/async-flow").HostInterface<Vow<{
@@ -191,7 +191,7 @@ export type State = {
     topicKit: RecorderKit<LocalChainAccountNotification> | undefined;
     packetTools: PacketTools;
     account: LocalChainAccount;
-    address: ChainAddress;
+    address: CosmosChainAddress;
 };
 export type MakeLocalOrchestrationAccountKit = ReturnType<typeof prepareLocalOrchestrationAccountKit>;
 export type LocalOrchestrationAccountKit = ReturnType<MakeLocalOrchestrationAccountKit>;
@@ -204,7 +204,7 @@ import type { ChainHub } from './chain-hub.js';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
 import type { ZoeTools } from '../utils/zoe-tools.js';
 import type { LocalChainAccount } from '@agoric/vats/src/localchain.js';
-import type { ChainAddress } from '@agoric/orchestration';
+import type { CosmosChainAddress } from '@agoric/orchestration';
 import type { AmountArg } from '@agoric/orchestration';
 import type { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
 import type { Vow } from '@agoric/vow';
@@ -215,6 +215,7 @@ import type { JsonSafe } from '@agoric/cosmic-proto';
 import type { TransferRoute } from '@agoric/orchestration';
 import type { DenomAmount } from '@agoric/orchestration';
 import type { ResponseTo } from '@agoric/cosmic-proto';
+import type { AccountIdArg } from '@agoric/orchestration';
 import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { PacketTools } from './packet-tools.js';
 //# sourceMappingURL=local-orchestration-account.d.ts.map

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":"AAiGO,0DAVI,IAAI,qFAEZ;IAAgC,eAAe,EAAvC,eAAe;IACH,GAAG,EAAf,GAAG;IAC0B,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACS,QAAQ,EAAzB,QAAQ;IACmB,UAAU,EAArC,OAAO,UAAU,CAAC;IACD,QAAQ,EAAzB,QAAQ;CAClB;aAqFc,iBAAiB;aACjB,YAAY;;;;QAoBnB;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAOjB;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;QAiCxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;uBAmBJ,YAAY;oBAAU,SAAS;;;uBAa/B,YAAY;qBAAW,SAAS,EAAE;;;oBAcrC,SAAS;yBACJ,YAAY;mBAClB,qBAAqB;;;;;QAmCrC;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;;;;WAMG;sCALQ,MAAM,mBACN;YACN,IAAI,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;YAClD,KAAK,EAAE,aAAa,CAAC;SACtB;;IAsCN;;;OAGG;;QAED,kDAAkD;6BAAtC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;;;;IAYxC;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;IAM1B,kDAAkD;;QAEhD;;;WAGG;uBAFQ,SAAS,QACT,OAAO;QAKlB;;;WAGG;2BAFQ,KAAK,QACL,OAAO;;IAOpB;;;OAGG;;QAED;;;;;WAKG;4BAJQ,WACV,UAAc,0CAA0C,CAAC,CACtD,GACS,WAAW;;IAU1B;;;OAGG;;QAED;;;;;;;WAOG;4BANQ,SACV,WACA,UAAgB,8CAA8C,CAAC,CAC1D,CACF,GACS,WAAW,EAAE;;;;;;;QA8F1B;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAmBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;;;;;;;;;;;QAkFxC;;;;;;;;;;;WAWG;8BAVQ,YAAY,UACZ,SAAS,SAET,qBAAqB,GAGnB,IAAI,GAAG,CAAC;;;;;;;;;GAmE5B;;aArrBa,MAAM;;;;;oBAKP;IACR,QAAQ,EAAE,YAAY,6BAA6B,CAAC,GAAG,SAAS,CAAC;IACjE,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,YAAY,CAAC;CACvB;+CA6qBU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BA7sBnC,cAAc;qCADU,6CAA6C;kCAI5C,cAAc;4BAFrC,kBAAkB;8BAGX,aAAa;8BAIlB,gBAAgB;gCAXK,gCAAgC;8BAarD,uBAAuB;uCAbF,gCAAgC;kCACiF,uBAAuB;+BAAvB,uBAAuB;0BAQjK,kDAAkD;yBAFzC,aAAa;qCADG,cAAc;2CALmG,uBAAuB;+BAOtI,sBAAsB;8BAAtB,sBAAsB;mCAPyF,uBAAuB;iCAAvB,uBAAuB;gCAOtI,sBAAsB;iCANzB,6CAA6C;iCAU9D,mBAAmB"}
+{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"AAiGO,0DAVI,IAAI,qFAEZ;IAAgC,eAAe,EAAvC,eAAe;IACH,GAAG,EAAf,GAAG;IAC0B,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACS,QAAQ,EAAzB,QAAQ;IACmB,UAAU,EAArC,OAAO,UAAU,CAAC;IACD,QAAQ,EAAzB,QAAQ;CAClB;aAqFc,iBAAiB;aACjB,kBAAkB;;;;QAoBzB;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAOjB;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;QAiCxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;uBAmBJ,kBAAkB;oBAAU,SAAS;;;uBAarC,kBAAkB;qBAAW,SAAS,EAAE;;;oBAc3C,SAAS;yBACJ,kBAAkB;mBACxB,qBAAqB;;;;;QAmCrC;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;;;;WAMG;sCALQ,MAAM,mBACN;YACN,IAAI,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;YAClD,KAAK,EAAE,aAAa,CAAC;SACtB;;IAsCN;;;OAGG;;QAED,kDAAkD;6BAAtC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;;;;IAYxC;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;IAM1B,kDAAkD;;QAEhD;;;WAGG;uBAFQ,SAAS,QACT,OAAO;QAKlB;;;WAGG;2BAFQ,KAAK,QACL,OAAO;;IAOpB;;;OAGG;;QAED;;;;;WAKG;4BAJQ,WACV,UAAc,0CAA0C,CAAC,CACtD,GACS,WAAW;;IAU1B;;;OAGG;;QAED;;;;;;;WAOG;4BANQ,SACV,WACA,UAAgB,8CAA8C,CAAC,CAC1D,CACF,GACS,WAAW,EAAE;;;;;;;QA8F1B;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAmBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;;;;;;;;;;;QAkFxC;;;;;;;;;;;WAWG;8BAVQ,YAAY,UACZ,SAAS,SAET,qBAAqB,GAGnB,IAAI,GAAG,CAAC;;;;;;;;;GAoE5B;;aAtrBa,MAAM;;;;;oBAKP;IACR,QAAQ,EAAE,YAAY,6BAA6B,CAAC,GAAG,SAAS,CAAC;IACjE,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,kBAAkB,CAAC;CAC7B;+CA8qBU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BA9sBnC,cAAc;qCADU,6CAA6C;kCAI5C,cAAc;4BAFrC,kBAAkB;8BAGX,aAAa;8BAIlB,gBAAgB;gCAXK,gCAAgC;8BAarD,uBAAuB;uCAbF,gCAAgC;wCACgH,uBAAuB;+BAAvB,uBAAuB;0BAQhM,kDAAkD;yBAFzC,aAAa;qCADG,cAAc;2CALkI,uBAAuB;+BAOrK,sBAAsB;8BAAtB,sBAAsB;mCAPwH,uBAAuB;iCAAvB,uBAAuB;gCAOrK,sBAAsB;kCAPwH,uBAAuB;iCACxK,6CAA6C;iCAU9D,mBAAmB"}