@agoric/orchestration 0.1.1-dev-252b405.0 → 0.1.1-dev-4e588de.0

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

@@ -28,7 +28,7 @@ import { TransferRouteShape } from './chain-hub.js';
 /**
  * @import {HostOf} from '@agoric/async-flow';
  * @import {LocalChain, LocalChainAccount} from '@agoric/vats/src/localchain.js';
- * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountCommon, LocalAccountMethods, TransferRoute} from '@agoric/orchestration';
+ * @import {AmountArg, CosmosChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountCommon, LocalAccountMethods, TransferRoute, AccountId, AccountIdArg} from '@agoric/orchestration';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'.
  * @import {Zone} from '@agoric/zone';
  * @import {Remote} from '@agoric/internal';
@@ -60,7 +60,7 @@ const EVow$ = shape => M.or(Vow$(shape), M.promise(/* shape */));
  *   topicKit: RecorderKit<LocalChainAccountNotification> | undefined;
  *   packetTools: PacketTools;
  *   account: LocalChainAccount;
- *   address: ChainAddress;
+ *   address: CosmosChainAddress;
  * }} State
  *   Internal to the LocalOrchestrationAccount exo
  */
@@ -180,7 +180,7 @@ export const prepareLocalOrchestrationAccountKit = (
     /**
      * @param {object} initState
      * @param {LocalChainAccount} initState.account
-     * @param {ChainAddress} initState.address
+     * @param {CosmosChainAddress} initState.address
      * @param {Remote<StorageNode>} [initState.storageNode]
      * @returns {State}
      */
@@ -265,7 +265,7 @@ export const prepareLocalOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: ChainAddress; amount: AmountArg }
+           *   { toAccount: CosmosChainAddress; amount: AmountArg }
            * >}
            */
           const offerHandler = (seat, { toAccount, amount }) => {
@@ -278,7 +278,7 @@ export const prepareLocalOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: ChainAddress; amounts: AmountArg[] }
+           *   { toAccount: CosmosChainAddress; amounts: AmountArg[] }
            * >}
            */
           const offerHandler = (seat, { toAccount, amounts }) => {
@@ -293,7 +293,7 @@ export const prepareLocalOrchestrationAccountKit = (
            *   Vow<void>,
            *   {
            *     amount: AmountArg;
-           *     destination: ChainAddress;
+           *     destination: CosmosChainAddress;
            *     opts?: IBCMsgTransferOptions;
            *   }
            * >}
@@ -671,7 +671,7 @@ export const prepareLocalOrchestrationAccountKit = (
           });
         },
         /**
-         * @param {ChainAddress} destination
+         * @param {AccountIdArg} destination
          * @param {AmountArg} amount an ERTP {@link Amount} or a
          *   {@link DenomAmount}
          * @param {IBCMsgTransferOptions} [opts] if either timeoutHeight or
@@ -685,6 +685,7 @@ export const prepareLocalOrchestrationAccountKit = (
         transfer(destination, amount, opts) {
           return asVow(() => {
             trace('Transferring funds over IBC');
+
             const denomAmount = coerceDenomAmount(chainHub, amount);
 
             const { forwardOpts, ...rest } = opts ?? {};

package/src/exos/portfolio-holder-kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portfolio-holder-kit.d.ts","sourceRoot":"","sources":["portfolio-holder-kit.js"],"names":[],"mappings":"AAgOO,6CANI,IAAI,YACJ,QAAQ,GACN,CACZ,GAAO,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,KAC9D,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAKzE;mCAhNY;IACR,QAAQ,EAAE,SAAS,MAAM,EAAE,cAAc,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC;IACrE,YAAY,EAAE,SAAS,MAAM,EAAE,oBAAoB,OAAO,CAAC,CAAC,CAAC;CAC9D;kCA8MU,UAAU,CAAC,OAAO,sBAAsB,CAAC;8BACzC,UAAU,CAAC,mBAAmB,CAAC;0BAvNtB,cAAc;8BAFV,aAAa;AAqBxC;;;;;;GAMG;AACH,iDAHW,IAAI,mBACJ,QAAQ;;QAkDX;;;;;;WAMG;iBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;;;gBAL7C;;;;;;mBAMG;yBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;QA+B7C;;;;WAIG;8BAHQ,MAAM,WACN,cAAc,qBAAqB,GAAG,CAAC,CAAC,eACxC,oBAAoB,OAAO,CAAC;QAgBvC;;WAEG;8BADQ,MAAM;;GAQxB;0CAzI+F,uBAAuB;mCAL/E,oBAAoB;8BACjC,eAAe;yCAEJ,2CAA2C;gDAEe,uBAAuB"}
+{"version":3,"file":"portfolio-holder-kit.d.ts","sourceRoot":"","sources":["portfolio-holder-kit.js"],"names":[],"mappings":"AA+NO,6CANI,IAAI,YACJ,QAAQ,GACN,CACZ,GAAO,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,KAC9D,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAKzE;mCA/MY;IACR,QAAQ,EAAE,SAAS,MAAM,EAAE,cAAc,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC;IACrE,YAAY,EAAE,SAAS,MAAM,EAAE,oBAAoB,OAAO,CAAC,CAAC,CAAC;CAC9D;kCA6MU,UAAU,CAAC,OAAO,sBAAsB,CAAC;8BACzC,UAAU,CAAC,mBAAmB,CAAC;0BAtNtB,cAAc;8BAFV,aAAa;AAqBxC;;;;;;GAMG;AACH,iDAHW,IAAI,mBACJ,QAAQ;;QAkDX;;;;;;WAMG;iBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;;;gBAL7C;;;;;;mBAMG;yBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;QA+B7C;;;;WAIG;8BAHQ,MAAM,WACN,cAAc,qBAAqB,GAAG,CAAC,CAAC,eACxC,oBAAoB,OAAO,CAAC;QAgBvC;;WAEG;8BADQ,MAAM;;GAQxB;0CAzI+F,uBAAuB;mCAL/E,oBAAoB;8BACjC,eAAe;yCAEJ,2CAA2C;gDAEe,uBAAuB"}

package/src/exos/portfolio-holder-kit.js

@@ -200,7 +200,6 @@ const preparePortfolioHolderKit = (zone, { asVow, when }) => {
  *     {
  *       value: 'cosmos1valoper',
  *       chainId: 'cosmoshub-99',
- *       encoding: 'bech32',
  *     },
  *     {
  *       denom: 'uatom',

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":"AAuQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAKjC;sCA5OY;IACR,8BAA8B,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACF,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACR,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,iBAAiB,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCA+NU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA/PxB,mBAAmB;uCAS2D,aAAa;yBAJlF,aAAa;uDAGO,mCAAmC;6CAD7C,qBAAqB;4BAHtC,kBAAkB;kCADZ,cAAc;8BAEb,aAAa;qCAIwD,aAAa;mCAAb,aAAa"}
+{"version":3,"file":"remote-chain-facade.d.ts","sourceRoot":"","sources":["remote-chain-facade.js"],"names":[],"mappings":"AAuQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAKjC;sCA5OY;IACR,8BAA8B,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACF,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACR,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,iBAAiB,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCA+NU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA/PxB,mBAAmB;uCASiE,aAAa;yBAJxF,aAAa;uDAGO,mCAAmC;6CAD7C,qBAAqB;4BAHtC,kBAAkB;kCADZ,cAAc;8BAEb,aAAa;qCAI8D,aAAa;mCAAb,aAAa"}

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

@@ -6,7 +6,7 @@ import { M } from '@endo/patterns';
 import { pickFacet } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
 import {
-  ChainAddressShape,
+  CosmosChainAddressShape,
   chainFacadeMethods,
   ICQMsgShape,
 } from '../typeGuards.js';
@@ -22,7 +22,7 @@ import {
  * @import {LocalIbcAddress, RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
  * @import {CosmosInterchainService} from './exo-interfaces.js';
  * @import {prepareCosmosOrchestrationAccount} from './cosmos-orchestration-account.js';
- * @import {CosmosChainInfo, IBCConnectionInfo, ChainAddress, IcaAccount, Chain, ICQConnection} from '../types.js';
+ * @import {CosmosChainInfo, IBCConnectionInfo, CosmosChainAddress, IcaAccount, Chain, ICQConnection} from '../types.js';
  */
 
 const trace = makeTracer('RemoteChainFacade');
@@ -89,14 +89,14 @@ const prepareRemoteChainFacadeKit = (
       ),
       getAddressesWatcher: M.interface('getAddressWatcher', {
         onFulfilled: M.call(
-          [ChainAddressShape, M.string(), M.string()],
+          [CosmosChainAddressShape, M.string(), M.string()],
           M.remotable(),
         ).returns(VowShape),
       }),
       makeChildNodeWatcher: M.interface('makeChildNodeWatcher', {
         onFulfilled: M.call(M.or(M.remotable(), M.undefined()), {
           account: M.remotable(),
-          chainAddress: ChainAddressShape,
+          chainAddress: CosmosChainAddressShape,
           localAddress: M.string(),
           remoteAddress: M.string(),
         }).returns(M.remotable()),
@@ -206,7 +206,7 @@ const prepareRemoteChainFacadeKit = (
       },
       getAddressesWatcher: {
         /**
-         * @param {[ChainAddress, LocalIbcAddress, RemoteIbcAddress]} chainAddresses
+         * @param {[CosmosChainAddress, LocalIbcAddress, RemoteIbcAddress]} chainAddresses
          * @param {IcaAccount} account
          */
         onFulfilled([chainAddress, localAddress, remoteAddress], account) {
@@ -226,7 +226,7 @@ const prepareRemoteChainFacadeKit = (
          * @param {Remote<StorageNode> | undefined} childNode
          * @param {{
          *   account: IcaAccount;
-         *   chainAddress: ChainAddress;
+         *   chainAddress: CosmosChainAddress;
          *   localAddress: LocalIbcAddress;
          *   remoteAddress: RemoteIbcAddress;
          * }} ctx

package/src/orchestration-api.d.ts

@@ -38,14 +38,40 @@ export type DenomAmount = {
 };
 /** Amounts can be provided as pure data using denoms or as ERTP Amounts */
 export type AmountArg = DenomAmount | Amount<'nat'>;
-/** An address on some blockchain, e.g., cosmos, eth, etc. */
-export type ChainAddress = {
-    /** e.g. 1 for Ethereum, agoric-3 for Agoric, cosmoshub-4 for Cosmos */
+/**
+ * Per `chain_id` in CAIP-2. In that spec all chain IDs are scoped
+ * (namespace:reference) but in the Cosmos ecosystem the namespace is implied
+ * and they use `chain_id`/`chainId` for what CAIP-2 calls the `reference`. We
+ * qualify the term here to avoid confusion.
+ *
+ * @see {@link https://chainagnostic.org/CAIPs/caip-2}
+ */
+export type ScopedChainId = `${string}:${string}`;
+/**
+ * à la CAIP-10
+ *
+ *   account_id:        chain_id + ":" + account_address
+ *   chain_id:          [-a-z0-9]{3,8}:[-_a-zA-Z0-9]{1,32} (See [CAIP-2][])
+ *   account_address:   [-.%a-zA-Z0-9]{1,128}
+ *
+ * @see {@link https://chainagnostic.org/CAIPs/caip-10}
+ */
+export type AccountId = `${ScopedChainId}:${string}`;
+/**
+ * Specific to Cosmos chains
+ * @see {AccountId} for universal account identifier
+ */
+export type CosmosChainAddress = {
+    /** Within the Cosmos ecosystem. e.g. `agoric-3' or 'cosmoshub-4' */
     chainId: string;
     /** The address value used on-chain */
     value: string;
-    encoding: 'bech32' | 'ethereum';
 };
+/**
+ * A value that can be converted mechanically to an AccountId.
+ * @see {@link ChainHub.resolveAccountId}
+ */
+export type AccountIdArg = AccountId | CosmosChainAddress;
 /**
  * Object that controls an account on a particular chain.
  *
@@ -113,7 +139,7 @@ export interface OrchestrationAccountCommon {
     /**
      * @returns the address of the account on the remote chain
      */
-    getAddress: () => ChainAddress;
+    getAddress: () => CosmosChainAddress;
     /** @returns an array of amounts for every balance in the account. */
     getBalances: () => Promise<DenomAmount[]>;
     /** @returns the balance of a specific denom for the account. */
@@ -124,14 +150,14 @@ export interface OrchestrationAccountCommon {
      * @param amount - the amount to send
      * @returns void
      */
-    send: (toAccount: ChainAddress, amount: AmountArg) => Promise<void>;
+    send: (toAccount: CosmosChainAddress, amount: AmountArg) => Promise<void>;
     /**
      * Transfer multiple amounts to another account on the same chain. The promise settles when the transfer is complete.
      * @param toAccount - the account to send the amount to. MUST be on the same chain
      * @param amounts - the amounts to send
      * @returns void
      */
-    sendAll: (toAccount: ChainAddress, amounts: AmountArg[]) => Promise<void>;
+    sendAll: (toAccount: CosmosChainAddress, amounts: AmountArg[]) => Promise<void>;
     /**
      * Transfer an amount to another account, typically on another chain.
      * The promise settles when the transfer is complete.
@@ -142,7 +168,7 @@ export interface OrchestrationAccountCommon {
      * @throws {Error} if route is not determinable, asset is not recognized, or
      * the transfer is rejected (insufficient funds, timeout)
      */
-    transfer: (destination: ChainAddress, amount: AmountArg, opts?: IBCMsgTransferOptions) => Promise<void>;
+    transfer: (destination: AccountIdArg, amount: AmountArg, opts?: IBCMsgTransferOptions) => Promise<void>;
     /**
      * Transfer an amount to another account in multiple steps. The promise settles when
      * the entire path of the transfer is complete.
@@ -196,7 +222,7 @@ export interface OrchestrationFlow<CT = unknown> {
  * @internal
  */
 export interface TransferMsg {
-    toAccount: ChainAddress;
+    toAccount: CosmosChainAddress;
     timeout?: Timestamp;
     next?: TransferMsg;
     data?: object;
@@ -204,7 +230,7 @@ export interface TransferMsg {
 /** @alpha */
 export interface AfterAction {
     destChain: string;
-    destAddress: ChainAddress;
+    destAddress: CosmosChainAddress;
 }
 /** @alpha */
 export interface SwapExact {

package/src/orchestration-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestration-api.d.ts","sourceRoot":"","sources":["orchestration-api.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EACV,kBAAkB,EAClB,SAAS,EACT,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAE1E;;;;;;;;;;GAUG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC;AAI3B;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;AAE5C;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,2EAA2E;AAC3E,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;AAEpD,6DAA6D;AAC7D,MAAM,MAAM,YAAY,GAAG;IACzB,uEAAuE;IACvE,OAAO,EAAE,MAAM,CAAC;IAChB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,CAAC,EAAE,SAAS,SAAS,IACnD,0BAA0B,GACxB,CAAC,EAAE,SAAS,eAAe,GACvB,EAAE,CAAC,SAAS,CAAC,SAAS,SAAS,MAAM,EAAE,GACrC,mBAAmB,GACnB,yBAAyB,CAAC,EAAE,CAAC,GAC/B,MAAM,CAAC,CAAC;AAEhB;;;;;GAKG;AACH,MAAM,WAAW,KAAK,CAAC,EAAE,SAAS,SAAS;IACzC,YAAY,EAAE,MAAM,OAAO,CAAC,EAAE,CAAC,CAAC;IAGhC;;;OAGG;IACH,WAAW,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;IAGrD,KAAK,EAAE,EAAE,SAAS;QAAE,UAAU,EAAE,IAAI,CAAA;KAAE,GAClC,gBAAgB,GAChB,EAAE,CAAC,SAAS,CAAC,SAAS,SAAS,MAAM,EAAE,GACrC,WAAW,GACX,KAAK,CAAC;CAGb;AAED;;GAEG;AACH,MAAM,WAAW,SAAS,CACxB,YAAY,SAAS,MAAM,WAAW,EACtC,YAAY,SAAS,MAAM,WAAW;IAEtC,0DAA0D;IAC1D,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,yFAAyF;IACzF,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IACxC,2DAA2D;IAC3D,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IACvC,6DAA6D;IAC7D,SAAS,EAAE,KAAK,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,QAAQ,EAAE,CAAC,CAAC,SAAS,MAAM,EACzB,SAAS,EAAE,CAAC,KACT,OAAO,CACV,KAAK,CAAC,CAAC,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GACvD,CAAC,CAAC,SAAS,QAAQ,GAAG,kBAAkB,GAAG,MAAM,CAAC,CACrD,CAAC;IAEF;;;;;OAKG;IACH,YAAY,EAAE,CACZ,YAAY,SAAS,MAAM,WAAW,EACtC,YAAY,SAAS,MAAM,WAAW,EAEtC,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,KACvB,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAE3C;;;;OAIG;IACH,QAAQ,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,SAAS,CAAC;CAC9C;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,UAAU,EAAE,MAAM,YAAY,CAAC;IAE/B,qEAAqE;IACrE,WAAW,EAAE,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAE1C,gEAAgE;IAChE,UAAU,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,IAAI,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;OAKG;IACH,OAAO,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E;;;;;;;;;OASG;IACH,QAAQ,EAAE,CACR,WAAW,EAAE,YAAY,EACzB,MAAM,EAAE,SAAS,EACjB,IAAI,CAAC,EAAE,qBAAqB,KACzB,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB;;;;;;OAMG;IACH,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtE;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAEhE;;;;;OAKG;IACH,eAAe,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAC9E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,iBAAiB,CAAC,EAAE,GAAG,OAAO;IAC7C,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrE;AAED;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,aAAa;AACb,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,YAAY,CAAC;CAC3B;AACD,aAAa;AACb,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AACD,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"orchestration-api.d.ts","sourceRoot":"","sources":["orchestration-api.ts"],"names":[],"mappings":"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"}

package/src/orchestration-api.ts

@@ -55,15 +55,44 @@ export type DenomAmount = {
 /** Amounts can be provided as pure data using denoms or as ERTP Amounts */
 export type AmountArg = DenomAmount | Amount<'nat'>;
 
-/** An address on some blockchain, e.g., cosmos, eth, etc. */
-export type ChainAddress = {
-  /** e.g. 1 for Ethereum, agoric-3 for Agoric, cosmoshub-4 for Cosmos */
+/**
+ * Per `chain_id` in CAIP-2. In that spec all chain IDs are scoped
+ * (namespace:reference) but in the Cosmos ecosystem the namespace is implied
+ * and they use `chain_id`/`chainId` for what CAIP-2 calls the `reference`. We
+ * qualify the term here to avoid confusion.
+ *
+ * @see {@link https://chainagnostic.org/CAIPs/caip-2}
+ */
+export type ScopedChainId = `${string}:${string}`;
+
+/**
+ * à la CAIP-10
+ *
+ *   account_id:        chain_id + ":" + account_address
+ *   chain_id:          [-a-z0-9]{3,8}:[-_a-zA-Z0-9]{1,32} (See [CAIP-2][])
+ *   account_address:   [-.%a-zA-Z0-9]{1,128}
+ *
+ * @see {@link https://chainagnostic.org/CAIPs/caip-10}
+ */
+export type AccountId = `${ScopedChainId}:${string}`;
+
+/**
+ * Specific to Cosmos chains
+ * @see {AccountId} for universal account identifier
+ */
+export type CosmosChainAddress = {
+  /** Within the Cosmos ecosystem. e.g. `agoric-3' or 'cosmoshub-4' */
   chainId: string;
   /** The address value used on-chain */
   value: string;
-  encoding: 'bech32' | 'ethereum';
 };
 
+/**
+ * A value that can be converted mechanically to an AccountId.
+ * @see {@link ChainHub.resolveAccountId}
+ */
+export type AccountIdArg = AccountId | CosmosChainAddress;
+
 /**
  * Object that controls an account on a particular chain.
  *
@@ -165,7 +194,7 @@ export interface OrchestrationAccountCommon {
   /**
    * @returns the address of the account on the remote chain
    */
-  getAddress: () => ChainAddress;
+  getAddress: () => CosmosChainAddress;
 
   /** @returns an array of amounts for every balance in the account. */
   getBalances: () => Promise<DenomAmount[]>;
@@ -179,7 +208,7 @@ export interface OrchestrationAccountCommon {
    * @param amount - the amount to send
    * @returns void
    */
-  send: (toAccount: ChainAddress, amount: AmountArg) => Promise<void>;
+  send: (toAccount: CosmosChainAddress, amount: AmountArg) => Promise<void>;
 
   /**
    * Transfer multiple amounts to another account on the same chain. The promise settles when the transfer is complete.
@@ -187,7 +216,10 @@ export interface OrchestrationAccountCommon {
    * @param amounts - the amounts to send
    * @returns void
    */
-  sendAll: (toAccount: ChainAddress, amounts: AmountArg[]) => Promise<void>;
+  sendAll: (
+    toAccount: CosmosChainAddress,
+    amounts: AmountArg[],
+  ) => Promise<void>;
 
   /**
    * Transfer an amount to another account, typically on another chain.
@@ -200,7 +232,7 @@ export interface OrchestrationAccountCommon {
    * the transfer is rejected (insufficient funds, timeout)
    */
   transfer: (
-    destination: ChainAddress,
+    destination: AccountIdArg,
     amount: AmountArg,
     opts?: IBCMsgTransferOptions,
   ) => Promise<void>;
@@ -262,7 +294,7 @@ export interface OrchestrationFlow<CT = unknown> {
  * @internal
  */
 export interface TransferMsg {
-  toAccount: ChainAddress;
+  toAccount: CosmosChainAddress;
   timeout?: Timestamp;
   next?: TransferMsg;
   data?: object;
@@ -271,7 +303,7 @@ export interface TransferMsg {
 /** @alpha */
 export interface AfterAction {
   destChain: string;
-  destAddress: ChainAddress;
+  destAddress: CosmosChainAddress;
 }
 /** @alpha */
 export interface SwapExact {

package/src/typeGuards.d.ts

@@ -1,6 +1,6 @@
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions} from './types.js';
+ * @import {CosmosAssetInfo, ChainInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions, AccountIdArg} from './types.js';
  * @import {Any as Proto3Msg} from '@agoric/cosmic-proto/google/protobuf/any.js';
  * @import {TxBody} from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
  * @import {Coin} from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
@@ -16,8 +16,15 @@ export const OutboundConnectionHandlerI: import("@endo/patterns").InterfaceGuard
     onOpen: import("@endo/patterns").MethodGuard;
     onClose: import("@endo/patterns").MethodGuard;
 }>;
-/** @type {TypedPattern<ChainAddress>} */
-export const ChainAddressShape: TypedPattern<ChainAddress>;
+export const CosmosChainAddressShape: import("@endo/patterns").Matcher;
+/** @deprecated use CosmosChainAddressShape */
+export const ChainAddressShape: import("@endo/patterns").Matcher;
+/**
+ * NB: For the AccountId case does not fully verify it is CAIP-10 (only string)
+ *
+ * @type {TypedPattern<AccountIdArg>}
+ */
+export const AccountArgShape: TypedPattern<AccountIdArg>;
 /** @type {TypedPattern<Proto3Msg>} */
 export const Proto3Shape: TypedPattern<Proto3Msg>;
 /** @internal */
@@ -95,7 +102,7 @@ export const ForwardOptsShape: TypedPattern<IBCMsgTransferOptions["forwardOpts"]
  * @internal
  */
 export const IBCTransferOptionsShape: TypedPattern<IBCMsgTransferOptions>;
-import type { ChainAddress } from './types.js';
+import type { AccountIdArg } from './types.js';
 import type { TypedPattern } from '@agoric/internal';
 import type { Any as Proto3Msg } from '@agoric/cosmic-proto/google/protobuf/any.js';
 import type { CosmosAssetInfo } from './types.js';

package/src/typeGuards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH;;;;GAIG;AACH;;;GAQE;AAEF,yCAAyC;AACzC,gCADW,aAAa,YAAY,CAAC,CAKnC;AAGF,sCAAsC;AACtC,0BADW,aAAa,SAAS,CAAC,CACoC;AAGtE,gBAAgB;AAChB,iEAA4C;AAE5C,gBAAgB;AAChB,mEAQG;AAEH,gBAAgB;AAChB,oEAA+C;AAE/C,gBAAgB;AAChB,sEASG;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CASrC;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CAatC;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CAG/B;AACH,0DAAqC;AAErC,iCAAiC;AACjC,wBADW,aAAa,IAAI,CAAC,CAK3B;AAGF,gDAAgD;AAChD,6BADW,aAAa,UAAU,GAAG,EAAE,GAAG,CAAC,CAAC,CAM1C;AAGF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CAIlC;AAGF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CACkC;AAGtE,0CAA0C;AAC1C,gCADW,aAAa,MAAM,CAAC,KAAK,CAAC,CAAC,CAIpC;AAGF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACsC;AAExE;;;;;GAKG;AACH,8BALU,aAAa;IAClB,SAAS,EAAE,sBAAsB,CAAC;IAClC,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC,CAQH;AAEF,sCAAsC;AACtC,2DAGE;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACmC;;;;;;;;;AAmBrE;;;;GAIG;AACH,+DAQE;AAEF;;;GAGG;AACH,mEAGE;AAEF,gDAAgD;AAChD,uCADW,aAAa,mBAAmB,CAAC,CAO1C;AAYF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CAWlC;AAGF;;;;GAIG;AACH,+BAFU,aAAa,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAU1D;AAEF;;;GAGG;AACH,sCAHU,aAAa,qBAAqB,CAAC,CAc3C;kCArQqM,YAAY;kCADpL,kBAAkB;sCAEd,6CAA6C;qCADuH,YAAY;qCAAZ,YAAY;+BAAZ,YAAY;0BAG5L,kDAAkD;+BAH8H,YAAY;iCAKrL,qBAAqB;iCALoJ,YAAY;+BAAZ,YAAY;4CAAZ,YAAY;+BAIvL,sBAAsB;yCAJqJ,YAAY;iCAAZ,YAAY;2CAAZ,YAAY"}
+{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH;;;;GAIG;AACH;;;GAQE;AAIF,uEASE;AAEF,8CAA8C;AAC9C,iEAAyD;AAEzD;;;;GAIG;AACH,8BAFU,aAAa,YAAY,CAAC,CAEqC;AAEzE,sCAAsC;AACtC,0BADW,aAAa,SAAS,CAAC,CACoC;AAGtE,gBAAgB;AAChB,iEAA4C;AAE5C,gBAAgB;AAChB,mEAQG;AAEH,gBAAgB;AAChB,oEAA+C;AAE/C,gBAAgB;AAChB,sEASG;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CASrC;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CAatC;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CAG/B;AACH,0DAAqC;AAErC,iCAAiC;AACjC,wBADW,aAAa,IAAI,CAAC,CAK3B;AAGF,gDAAgD;AAChD,6BADW,aAAa,UAAU,GAAG,EAAE,GAAG,CAAC,CAAC,CAM1C;AAGF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CAIlC;AAGF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CACkC;AAGtE,0CAA0C;AAC1C,gCADW,aAAa,MAAM,CAAC,KAAK,CAAC,CAAC,CAIpC;AAGF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACsC;AAExE;;;;;GAKG;AACH,8BALU,aAAa;IAClB,SAAS,EAAE,sBAAsB,CAAC;IAClC,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC,CAQH;AAEF,sCAAsC;AACtC,2DAGE;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACmC;;;;;;;;;AAmBrE;;;;GAIG;AACH,+DAQE;AAEF;;;GAGG;AACH,mEAGE;AAEF,gDAAgD;AAChD,uCADW,aAAa,mBAAmB,CAAC,CAO1C;AAYF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CAWlC;AAGF;;;;GAIG;AACH,+BAFU,aAAa,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAU1D;AAEF;;;GAGG;AACH,sCAHU,aAAa,qBAAqB,CAAC,CAc3C;kCApR8L,YAAY;kCAD7K,kBAAkB;sCAEd,6CAA6C;qCADgH,YAAY;qCAAZ,YAAY;+BAAZ,YAAY;0BAGrL,kDAAkD;+BAHuH,YAAY;iCAK9K,qBAAqB;iCAL6I,YAAY;+BAAZ,YAAY;4CAAZ,YAAY;+BAIhL,sBAAsB;yCAJ8I,YAAY;iCAAZ,YAAY;2CAAZ,YAAY"}

package/src/typeGuards.js

@@ -4,7 +4,7 @@ import { M } from '@endo/patterns';
 
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions} from './types.js';
+ * @import {CosmosAssetInfo, ChainInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions, AccountIdArg} from './types.js';
  * @import {Any as Proto3Msg} from '@agoric/cosmic-proto/google/protobuf/any.js';
  * @import {TxBody} from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
  * @import {Coin} from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
@@ -27,17 +27,32 @@ export const OutboundConnectionHandlerI = M.interface(
   },
 );
 
-/** @type {TypedPattern<ChainAddress>} */
-export const ChainAddressShape = {
-  chainId: M.string(),
-  encoding: M.string(),
-  value: M.string(),
-};
-harden(ChainAddressShape);
+// XXX @type {TypedPattern<CosmosChainAddress>} but that's causing error:
+// Declaration emit for this file requires using private name 'validatedType' from module '"/opt/agoric/agoric-sdk/packages/internal/src/types"'. An explicit type annotation may unblock declaration emit.
+export const CosmosChainAddressShape = M.splitRecord(
+  {
+    chainId: M.string(),
+    value: M.string(),
+  },
+  {
+    // Ignored but maintained for backwards compatibility
+    encoding: 'bech32',
+  },
+);
+harden(CosmosChainAddressShape);
+/** @deprecated use CosmosChainAddressShape */
+export const ChainAddressShape = CosmosChainAddressShape;
+
+/**
+ * NB: For the AccountId case does not fully verify it is CAIP-10 (only string)
+ *
+ * @type {TypedPattern<AccountIdArg>}
+ */
+export const AccountArgShape = M.or(M.string(), CosmosChainAddressShape);
 
 /** @type {TypedPattern<Proto3Msg>} */
 export const Proto3Shape = { typeUrl: M.string(), value: M.string() };
-harden(ChainAddressShape);
+harden(Proto3Shape);
 
 /** @internal */
 export const IBCChannelIDShape = M.string();
@@ -146,10 +161,10 @@ export const AmountArgShape = M.or(AnyNatAmountShape, DenomAmountShape);
  */
 export const DelegationShape = M.splitRecord(
   {
-    validator: ChainAddressShape,
+    validator: CosmosChainAddressShape,
     amount: AmountArgShape,
   },
-  { delegator: ChainAddressShape },
+  { delegator: CosmosChainAddressShape },
 );
 
 /** Approximately @see RequestQuery */
@@ -245,7 +260,7 @@ export const ForwardOptsShape = M.splitRecord(
   {
     timeout: M.string(),
     retries: M.number(),
-    intermediateRecipient: ChainAddressShape,
+    intermediateRecipient: CosmosChainAddressShape,
   },
   {},
 );

package/src/utils/address.d.ts

@@ -1,8 +1,15 @@
 export function makeICAChannelAddress(hostConnectionId: IBCConnectionID, controllerConnectionId: IBCConnectionID, { version, encoding, ordering, txType, }?: ICAChannelAddressOpts): RemoteIbcAddress;
 export const DEFAULT_ICQ_VERSION: "icq-1";
 export function makeICQChannelAddress(controllerConnectionId: IBCConnectionID, version?: string): RemoteIbcAddress;
-export function findAddressField(remoteAddressString: RemoteIbcAddress): ChainAddress["value"] | undefined;
+export function findAddressField(remoteAddressString: RemoteIbcAddress): CosmosChainAddress["value"] | undefined;
 export function getBech32Prefix(address: string): string;
+export function parseAccountId(partialId: string): {
+    namespace: string;
+    reference: string;
+    accountAddress: string;
+} | {
+    accountAddress: string;
+};
 export type ICAChannelAddressOpts = {
     /**
      * message encoding format for the
@@ -25,5 +32,5 @@ export type ICAChannelAddressOpts = {
 };
 import type { IBCConnectionID } from '@agoric/vats';
 import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
-import type { ChainAddress } from '../types.js';
+import type { CosmosChainAddress } from '../types.js';
 //# sourceMappingURL=address.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AAwBO,wDALI,eAAe,0BACf,eAAe,6CACf,qBAAqB,GACnB,gBAAgB,CAuB5B;AAGD,kCAAmC,OAAO,CAAC;AAOpC,8DAJI,eAAe,YACf,MAAM,GACJ,gBAAgB,CAQ5B;AAaM,sDAJI,gBAAgB,GAEd,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAY7C;AAYM,yCAFI,MAAM,UAQhB;;;;;;;;;;;;;;;;;;;;;qCAnGiC,cAAc;sCAEb,iCAAiC;kCADrC,aAAa"}
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AAwBO,wDALI,eAAe,0BACf,eAAe,6CACf,qBAAqB,GACnB,gBAAgB,CAuB5B;AAGD,kCAAmC,OAAO,CAAC;AAOpC,8DAJI,eAAe,YACf,MAAM,GACJ,gBAAgB,CAQ5B;AAaM,sDAJI,gBAAgB,GAEd,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAYnD;AAaM,yCAHI,MAAM,GACJ,MAAM,CAQlB;AAgBM,0CAXI,MAAM,GACJ;IACJ,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB,GACD;IACE,cAAc,EAAE,MAAM,CAAC;CACxB,CAyBP;;;;;;;;;;;;;;;;;;;;;qCA1IiC,cAAc;sCAEb,iCAAiC;wCADhB,aAAa"}

package/src/utils/address.js

@@ -2,7 +2,7 @@ import { Fail, q } from '@endo/errors';
 
 /**
  * @import {IBCConnectionID} from '@agoric/vats';
- * @import {ChainAddress} from '../types.js';
+ * @import {CosmosChainAddress, ScopedChainId} from '../types.js';
  * @import {RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
  */
 
@@ -70,7 +70,7 @@ harden(makeICQChannelAddress);
  *
  * @param {RemoteIbcAddress} remoteAddressString - remote address string,
  *   including version
- * @returns {ChainAddress['value'] | undefined} returns undefined on error
+ * @returns {CosmosChainAddress['value'] | undefined} returns undefined on error
  */
 export const findAddressField = remoteAddressString => {
   try {
@@ -86,13 +86,14 @@ export const findAddressField = remoteAddressString => {
 harden(findAddressField);
 
 /**
- * Extracts the human readable part (HRP), aka `bech32Prefix`, from an address.
+ * Extracts the human-readable part (HRP), aka `bech32Prefix`, from an address.
  *
  * see
  * [bech32.js](https://github.com/bitcoinjs/bech32/blob/5ceb0e3d4625561a459c85643ca6947739b2d83c/src/index.ts#L146)
- * for reference implementation
+ * for the reference implementation.
  *
- * @param {string} address
+ * @param {string} address - The full Bech32-encoded address.
+ * @returns {string} - The extracted HRP (prefix).
  */
 export const getBech32Prefix = address => {
   assert(address, 'address is required');
@@ -101,3 +102,42 @@ export const getBech32Prefix = address => {
   if (split === 0) return Fail`Missing prefix for ${q(address)}`;
   return address.slice(0, split);
 };
+
+/**
+ * Parses an account ID into a structured format following CAIP-10 standards.
+ *
+ * @param {string} partialId CAIP-10 account ID or an unscoped on-chain address
+ * @returns {{
+ *       namespace: string;
+ *       reference: string;
+ *       accountAddress: string;
+ *     }
+ *   | {
+ *       accountAddress: string;
+ *     }}
+ *   - The parsed account details.
+ */
+export const parseAccountId = partialId => {
+  if (typeof partialId !== 'string' || !partialId.length) {
+    Fail`Empty accountId: ${q(partialId)}`;
+  }
+
+  const parts = partialId.split(':');
+
+  if (parts.length === 3) {
+    // Full CAIP-10
+    const [namespace, reference, accountAddress] = parts;
+    return {
+      namespace,
+      reference,
+      accountAddress,
+    };
+  } else if (parts.length === 1) {
+    return {
+      accountAddress: partialId,
+    };
+  }
+
+  throw Fail`Invalid accountId: ${q(partialId)}`;
+};
+harden(parseAccountId);

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

@@ -1 +1 @@
-{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["cosmos.js"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,mFAAmF;AACnF,kCAAsC;AAO/B,kCAJM,CAAC,UACH,MAAM,gBACN,CAAC,CAAC,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,KAAK,CAAC,KAY1D;AAED;;;;;GAKG;AACH,4BAHU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,WAAW,CAGiB;AAEhF;;;;;GAKG;AACH,qCAFU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,WAAW,CAK5D;AAEH;;;;;;;;GAQG;AACH,uCALU,CACL,CAAC,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAA;CAAE,EAC/B,OAAO,EAAE,MAAM,KACZ,sBAAsB,CAM3B;AAEH;;;;;;;;GAQG;AACH,yCALU,CACL,SAAS,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAC9B,CAAC,EAAE,kBAAkB,KAClB,wBAAwB,CAU7B;iCA5E6E,aAAa;4CAAb,aAAa;wCAExD,wDAAwD;8CAFb,aAAa"}
+{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["cosmos.js"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,mFAAmF;AACnF,kCAAsC;AAO/B,kCAJM,CAAC,UACH,MAAM,gBACN,CAAC,CAAC,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,KAAK,CAAC,KAY1D;AAED;;;;;GAKG;AACH,4BAHU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,WAAW,CAGiB;AAEhF;;;;;GAKG;AACH,qCAFU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,WAAW,CAK5D;AAEH;;;;;;;;GAQG;AACH,uCALU,CACL,CAAC,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAA;CAAE,EAC/B,OAAO,EAAE,MAAM,KACZ,sBAAsB,CAK3B;AAEH;;;;;;;;GAQG;AACH,yCALU,CACL,SAAS,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAC9B,CAAC,EAAE,kBAAkB,KAClB,wBAAwB,CAS7B;iCA1E6E,aAAa;4CAAb,aAAa;wCAExD,wDAAwD;8CAFb,aAAa"}

package/src/utils/cosmos.js

@@ -57,7 +57,6 @@ export const toTruncatedDenomAmount = c => ({
  * ) => CosmosValidatorAddress}
  */
 export const toCosmosValidatorAddress = (r, chainId) => ({
-  encoding: 'bech32',
   value: /** @type {CosmosValidatorAddress['value']} */ (r.validatorAddress),
   chainId,
 });
@@ -74,7 +73,6 @@ export const toCosmosValidatorAddress = (r, chainId) => ({
 export const toCosmosDelegationResponse = ({ chainId }, r) => ({
   delegator: {
     chainId,
-    encoding: 'bech32',
     value: r.delegation.delegatorAddress,
   },
   validator: toCosmosValidatorAddress(r.delegation, chainId),

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

@@ -1 +1 @@
-{"version":3,"file":"orc.d.ts","sourceRoot":"","sources":["orc.js"],"names":[],"mappings":";IASmB,gCAHN,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,GACvB,WAAW,CAWvB;IACD;;;;;;;OAOG;IACH,gCALW,CAAC,SAAS,GAAG,eAAe,CAAC,GACvC,CAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,GAE7B,WAAW,CAWvB;;iCApCqE,aAAa;+BAAb,aAAa;qCAAb,aAAa;iCAAb,aAAa"}
+{"version":3,"file":"orc.d.ts","sourceRoot":"","sources":["orc.js"],"names":[],"mappings":";IASmB,gCAHN,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,GACvB,WAAW,CAUvB;IACD;;;;;;;OAOG;IACH,gCALW,CAAC,SAAS,GAAG,eAAe,CAAC,GACvC,CAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,GAE7B,WAAW,CAUvB;;iCAlCqE,aAAa;+BAAb,aAAa;qCAAb,aAAa;iCAAb,aAAa"}

package/src/utils/orc.js

@@ -13,7 +13,6 @@ export const orcUtils = {
       toAccount: {
         chainId: 'osmosis-test',
         value: 'osmo1234',
-        encoding: 'bech32',
       },
     };
   },
@@ -31,7 +30,6 @@ export const orcUtils = {
       toAccount: {
         chainId: 'osmosis-test',
         value: 'osmo1234',
-        encoding: 'bech32',
       },
     };
   },