@agoric/orchestration 0.2.0-upgrade-20-dev-ef71cfd.0 → 0.2.0-upgrade-19-devnet-dev-5428c4d.0

package/src/fixtures/query-flows.contract.d.ts

@@ -2,23 +2,22 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
     marshaller: Marshaller;
 }, baggage: import("@agoric/vat-data").Baggage) => Promise<{
     publicFacet: import("@endo/exo").Guarded<{
-        makeSendICQQueryInvitation(): Promise<globalThis.Invitation<import("@agoric/vow").Vow<string>, {
+        makeSendICQQueryInvitation(): Promise<Invitation<import("@agoric/vow").Vow<string>, {
             chainName: string;
             msgs: Parameters<import("../cosmos-api.js").ICQQueryFunction>[0];
         }>>;
-        makeAccountAndGetBalanceQueryInvitation(): Promise<globalThis.Invitation<import("@agoric/vow").Vow<string>, {
+        makeAccountAndGetBalanceQueryInvitation(): Promise<Invitation<import("@agoric/vow").Vow<string>, {
             chainName: string;
             denom: import("../orchestration-api.js").DenomArg;
         }>>;
-        makeAccountAndGetBalancesQueryInvitation(): Promise<globalThis.Invitation<import("@agoric/vow").Vow<string>, {
+        makeAccountAndGetBalancesQueryInvitation(): Promise<Invitation<import("@agoric/vow").Vow<string>, {
             chainName: string;
         }>>;
-        makeSendLocalQueryInvitation(): Promise<globalThis.Invitation<import("@agoric/vow").Vow<string>, {
+        makeSendLocalQueryInvitation(): Promise<Invitation<import("@agoric/vow").Vow<string>, {
             msgs: Parameters<import("@agoric/vats/src/localchain.js").QueryManyFn>[0];
         }>>;
     }>;
 }>;
 export type QueryFlowsSF = typeof start;
-import type { ZCF } from '@agoric/zoe';
 import type { OrchestrationPowers } from '..//utils/start-helper.js';
 //# sourceMappingURL=query-flows.contract.d.ts.map

package/src/fixtures/query-flows.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-flows.contract.d.ts","sourceRoot":"","sources":["query-flows.contract.js"],"names":[],"mappings":"AAmEA;gBAjDiB,UAAU;;;;;;;;;;;;;;;;;;GAiDoD;2BAGjE,OAAO,KAAK;yBA7DJ,aAAa;yCAEG,2BAA2B"}
+{"version":3,"file":"query-flows.contract.d.ts","sourceRoot":"","sources":["query-flows.contract.js"],"names":[],"mappings":"AAkEA;gBAjDiB,UAAU;;;;;;;;;;;;;;;;;;GAiDoD;2BAGjE,OAAO,KAAK;yCA3DY,2BAA2B"}

package/src/fixtures/query-flows.contract.js

@@ -7,7 +7,6 @@ import { withOrchestration } from '../utils/start-helper.js';
 import * as flows from './query-flows.flows.js';
 
 /**
- * @import {ZCF} from '@agoric/zoe';
  * @import {Zone} from '@agoric/zone';
  * @import {OrchestrationPowers} from '..//utils/start-helper.js';
  * @import {OrchestrationTools} from '../utils/start-helper.js';

package/src/orchestration-api.d.ts

@@ -8,7 +8,7 @@ import type { Timestamp } from '@agoric/time';
 import type { QueryManyFn } from '@agoric/vats/src/localchain.js';
 import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
 import type { Passable } from '@endo/marshal';
-import type { AgoricChainMethods, CosmosChainAccountMethods, CosmosChainInfo, IBCMsgTransferOptions, KnownChains, LocalAccountMethods, ICQQueryFunction, KnownNamespace, NobleMethods, Bech32Address } from './types.js';
+import type { AgoricChainMethods, ChainInfo, CosmosChainAccountMethods, CosmosChainInfo, IBCMsgTransferOptions, KnownChains, LocalAccountMethods, ICQQueryFunction } from './types.js';
 import type { ResolvedContinuingOfferResult } from './utils/zoe-tools.js';
 /**
  * A denom that designates a path to a token type on some blockchain.
@@ -38,93 +38,36 @@ export type DenomAmount = {
 };
 /** Amounts can be provided as pure data using denoms or as ERTP Amounts */
 export type AmountArg = DenomAmount | Amount<'nat'>;
-/**
- * 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 CaipChainId = `${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 = `${CaipChainId}:${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' */
+/** 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 */
     chainId: string;
     /** The address value used on-chain */
-    value: Bech32Address;
-    encoding: 'bech32';
-};
-/**
- * Info used to identify blockchains across ecosystems
- * @see {@link https://chainagnostic.org/CAIPs/caip-2}
- */
-export interface BaseChainInfo<N extends KnownNamespace = KnownNamespace> {
-    /** CAIP-2 namespace, e.g. 'cosmos', 'eip155' */
-    namespace: N;
-    /** CAIP-2 reference, `e.g. `1`, `agoric-3` */
-    reference: N extends 'eip155' ? `${number}` : string;
-    /**
-     * Circle CCTP Destination Domain
-     * @see {@link https://developers.circle.com/stablecoins/supported-domains}
-     */
-    cctpDestinationDomain?: number;
-}
-/**
- * Shape that `ChainHub` is expecting
- */
-export type ChainInfo<N extends KnownNamespace = KnownNamespace> = N extends 'cosmos' ? CosmosChainInfo : BaseChainInfo<N>;
-/**
- * A value that can be converted mechanically to an AccountId.
- * @see {@link ChainHub.resolveAccountId}
- */
-export type AccountIdArg = AccountId | CosmosChainAddress;
-export type Caip10Record = {
-    namespace: string;
-    reference: string;
-    accountAddress: string;
+    value: string;
+    encoding: 'bech32' | 'ethereum';
 };
 /**
  * Object that controls an account on a particular chain.
  *
  * The methods available depend on the chain and its capabilities.
  */
-export type OrchestrationAccount<CI extends Partial<ChainInfo>> = OrchestrationAccountCommon & (CI extends {
-    chainId: string;
-} ? CI['chainId'] extends `agoric${string}` ? LocalAccountMethods : CI['chainId'] extends `noble${string}` ? CosmosChainAccountMethods<CI> & NobleMethods : CosmosChainAccountMethods<CI> : object);
+export type OrchestrationAccount<CI extends ChainInfo> = OrchestrationAccountCommon & (CI extends CosmosChainInfo ? CI['chainId'] extends `agoric${string}` ? LocalAccountMethods : CosmosChainAccountMethods<CI> : object);
 /**
  * An object for access the core functions of a remote chain.
  *
  * Note that "remote" can mean the local chain; it's just that
  * accounts are treated as remote/arms length for consistency.
  */
-export interface Chain<CI extends Partial<ChainInfo>> {
+export interface Chain<CI extends ChainInfo> {
     getChainInfo: () => Promise<CI>;
     /**
      * Creates a new Orchestration Account on the current Chain.
      * @returns an object that controls the account
      */
-    makeAccount: () => CI extends {
-        chainId: string;
-    } ? Promise<OrchestrationAccount<CI>> : never;
+    makeAccount: () => Promise<OrchestrationAccount<CI>>;
     query: CI extends {
         icqEnabled: true;
-    } ? ICQQueryFunction : CI extends {
-        chainId: string;
-    } ? CI['chainId'] extends `agoric${string}` ? QueryManyFn : never : never;
+    } ? ICQQueryFunction : CI['chainId'] extends `agoric${string}` ? QueryManyFn : never;
 }
 /**
  * Used with `orch.getDenomInfo('ibc/1234')`. See {@link Orchestrator.getDenomInfo}
@@ -170,7 +113,7 @@ export interface OrchestrationAccountCommon {
     /**
      * @returns the address of the account on the remote chain
      */
-    getAddress: () => CosmosChainAddress;
+    getAddress: () => ChainAddress;
     /** @returns an array of amounts for every balance in the account. */
     getBalances: () => Promise<DenomAmount[]>;
     /** @returns the balance of a specific denom for the account. */
@@ -181,14 +124,14 @@ export interface OrchestrationAccountCommon {
      * @param amount - the amount to send
      * @returns void
      */
-    send: (toAccount: AccountIdArg, amount: AmountArg) => Promise<void>;
+    send: (toAccount: ChainAddress, 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: CosmosChainAddress, amounts: AmountArg[]) => Promise<void>;
+    sendAll: (toAccount: ChainAddress, amounts: AmountArg[]) => Promise<void>;
     /**
      * Transfer an amount to another account, typically on another chain.
      * The promise settles when the transfer is complete.
@@ -199,7 +142,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: AccountIdArg, amount: AmountArg, opts?: IBCMsgTransferOptions) => Promise<void>;
+    transfer: (destination: ChainAddress, 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.
@@ -253,7 +196,7 @@ export interface OrchestrationFlow<CT = unknown> {
  * @internal
  */
 export interface TransferMsg {
-    toAccount: CosmosChainAddress;
+    toAccount: ChainAddress;
     timeout?: Timestamp;
     next?: TransferMsg;
     data?: object;
@@ -261,7 +204,7 @@ export interface TransferMsg {
 /** @alpha */
 export interface AfterAction {
     destChain: string;
-    destAddress: CosmosChainAddress;
+    destAddress: ChainAddress;
 }
 /** @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":"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"}
+{"version":3,"file":"orchestration-api.d.ts","sourceRoot":"","sources":["orchestration-api.ts"],"names":[],"mappings":"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"}

package/src/orchestration-api.ts

@@ -11,15 +11,13 @@ import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics
 import type { Passable } from '@endo/marshal';
 import type {
   AgoricChainMethods,
+  ChainInfo,
   CosmosChainAccountMethods,
   CosmosChainInfo,
   IBCMsgTransferOptions,
   KnownChains,
   LocalAccountMethods,
   ICQQueryFunction,
-  KnownNamespace,
-  NobleMethods,
-  Bech32Address,
 } from './types.js';
 import type { ResolvedContinuingOfferResult } from './utils/zoe-tools.js';
 
@@ -57,71 +55,13 @@ export type DenomAmount = {
 /** Amounts can be provided as pure data using denoms or as ERTP Amounts */
 export type AmountArg = DenomAmount | Amount<'nat'>;
 
-/**
- * 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 CaipChainId = `${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 = `${CaipChainId}:${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' */
+/** 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 */
   chainId: string;
   /** The address value used on-chain */
-  value: Bech32Address;
-  encoding: 'bech32';
-};
-
-/**
- * Info used to identify blockchains across ecosystems
- * @see {@link https://chainagnostic.org/CAIPs/caip-2}
- */
-export interface BaseChainInfo<N extends KnownNamespace = KnownNamespace> {
-  /** CAIP-2 namespace, e.g. 'cosmos', 'eip155' */
-  namespace: N;
-  /** CAIP-2 reference, `e.g. `1`, `agoric-3` */
-  reference: N extends 'eip155' ? `${number}` : string;
-  /**
-   * Circle CCTP Destination Domain
-   * @see {@link https://developers.circle.com/stablecoins/supported-domains}
-   */
-  cctpDestinationDomain?: number;
-}
-
-/**
- * Shape that `ChainHub` is expecting
- */
-export type ChainInfo<N extends KnownNamespace = KnownNamespace> =
-  N extends 'cosmos' ? CosmosChainInfo : BaseChainInfo<N>;
-
-/**
- * A value that can be converted mechanically to an AccountId.
- * @see {@link ChainHub.resolveAccountId}
- */
-export type AccountIdArg = AccountId | CosmosChainAddress;
-
-export type Caip10Record = {
-  namespace: string;
-  reference: string;
-  accountAddress: string;
+  value: string;
+  encoding: 'bech32' | 'ethereum';
 };
 
 /**
@@ -129,14 +69,12 @@ export type Caip10Record = {
  *
  * The methods available depend on the chain and its capabilities.
  */
-export type OrchestrationAccount<CI extends Partial<ChainInfo>> =
+export type OrchestrationAccount<CI extends ChainInfo> =
   OrchestrationAccountCommon &
-    (CI extends { chainId: string }
+    (CI extends CosmosChainInfo
       ? CI['chainId'] extends `agoric${string}`
         ? LocalAccountMethods
-        : CI['chainId'] extends `noble${string}`
-          ? CosmosChainAccountMethods<CI> & NobleMethods
-          : CosmosChainAccountMethods<CI>
+        : CosmosChainAccountMethods<CI>
       : object);
 
 /**
@@ -145,26 +83,21 @@ export type OrchestrationAccount<CI extends Partial<ChainInfo>> =
  * Note that "remote" can mean the local chain; it's just that
  * accounts are treated as remote/arms length for consistency.
  */
-export interface Chain<CI extends Partial<ChainInfo>> {
+export interface Chain<CI extends ChainInfo> {
   getChainInfo: () => Promise<CI>;
 
   // "makeAccount" suggests an operation within a vat
-  // TODO: scope to { icaEnabled: true }. Currently, only scoped to `namespace: 'cosmos'` chains
   /**
    * Creates a new Orchestration Account on the current Chain.
    * @returns an object that controls the account
    */
-  makeAccount: () => CI extends { chainId: string }
-    ? Promise<OrchestrationAccount<CI>>
-    : never;
+  makeAccount: () => Promise<OrchestrationAccount<CI>>;
   // FUTURE supply optional port object; also fetch port object
 
   query: CI extends { icqEnabled: true }
     ? ICQQueryFunction
-    : CI extends { chainId: string }
-      ? CI['chainId'] extends `agoric${string}`
-        ? QueryManyFn
-        : never
+    : CI['chainId'] extends `agoric${string}`
+      ? QueryManyFn
       : never;
 
   // TODO provide a way to get the local denom/brand/whatever for this chain
@@ -232,7 +165,7 @@ export interface OrchestrationAccountCommon {
   /**
    * @returns the address of the account on the remote chain
    */
-  getAddress: () => CosmosChainAddress;
+  getAddress: () => ChainAddress;
 
   /** @returns an array of amounts for every balance in the account. */
   getBalances: () => Promise<DenomAmount[]>;
@@ -246,7 +179,7 @@ export interface OrchestrationAccountCommon {
    * @param amount - the amount to send
    * @returns void
    */
-  send: (toAccount: AccountIdArg, amount: AmountArg) => Promise<void>;
+  send: (toAccount: ChainAddress, amount: AmountArg) => Promise<void>;
 
   /**
    * Transfer multiple amounts to another account on the same chain. The promise settles when the transfer is complete.
@@ -254,10 +187,7 @@ export interface OrchestrationAccountCommon {
    * @param amounts - the amounts to send
    * @returns void
    */
-  sendAll: (
-    toAccount: CosmosChainAddress,
-    amounts: AmountArg[],
-  ) => Promise<void>;
+  sendAll: (toAccount: ChainAddress, amounts: AmountArg[]) => Promise<void>;
 
   /**
    * Transfer an amount to another account, typically on another chain.
@@ -270,7 +200,7 @@ export interface OrchestrationAccountCommon {
    * the transfer is rejected (insufficient funds, timeout)
    */
   transfer: (
-    destination: AccountIdArg,
+    destination: ChainAddress,
     amount: AmountArg,
     opts?: IBCMsgTransferOptions,
   ) => Promise<void>;
@@ -332,7 +262,7 @@ export interface OrchestrationFlow<CT = unknown> {
  * @internal
  */
 export interface TransferMsg {
-  toAccount: CosmosChainAddress;
+  toAccount: ChainAddress;
   timeout?: Timestamp;
   next?: TransferMsg;
   data?: object;
@@ -341,7 +271,7 @@ export interface TransferMsg {
 /** @alpha */
 export interface AfterAction {
   destChain: string;
-  destAddress: CosmosChainAddress;
+  destAddress: ChainAddress;
 }
 /** @alpha */
 export interface SwapExact {

package/src/proposals/start-send-anywhere.js

@@ -97,16 +97,12 @@ export const startSendAnywhere = async (
   const osmoIssuer = await safeFulfill(() =>
     E(agoricNames).lookup('issuer', 'OSMO'),
   );
-  const USDCIssuer = await safeFulfill(() =>
-    E(agoricNames).lookup('issuer', 'USDC'),
-  );
 
   const issuerKeywordRecord = harden({
     BLD: await BLD,
     IST: await IST,
     ...(atomIssuer && { ATOM: atomIssuer }),
     ...(osmoIssuer && { OSMO: osmoIssuer }),
-    ...(USDCIssuer && { USDC: USDCIssuer }),
   });
   trace('issuerKeywordRecord', issuerKeywordRecord);
 

package/src/typeGuards.d.ts

@@ -1,6 +1,6 @@
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {CosmosAssetInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions, AccountIdArg, BaseChainInfo, ChainInfo,Caip10Record} from './types.js';
+ * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions} 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,20 +16,8 @@ export const OutboundConnectionHandlerI: import("@endo/patterns").InterfaceGuard
     onOpen: import("@endo/patterns").MethodGuard;
     onClose: import("@endo/patterns").MethodGuard;
 }>;
-export namespace CosmosChainAddressShape {
-    let chainId: import("@endo/patterns").Matcher;
-    let encoding: import("@endo/patterns").Matcher;
-    let value: import("@endo/patterns").Matcher;
-}
-/** @type {TypedPattern<Caip10Record>} */
-export const Caip10RecordShape: TypedPattern<Caip10Record>;
-export namespace ChainAddressShape { }
-/**
- * NB: For the AccountId case does not fully verify it is CAIP-10 (only string)
- *
- * @type {TypedPattern<AccountIdArg>}
- */
-export const AccountIdArgShape: TypedPattern<AccountIdArg>;
+/** @type {TypedPattern<ChainAddress>} */
+export const ChainAddressShape: TypedPattern<ChainAddress>;
 /** @type {TypedPattern<Proto3Msg>} */
 export const Proto3Shape: TypedPattern<Proto3Msg>;
 /** @internal */
@@ -42,8 +30,6 @@ export const IBCConnectionIDShape: import("@endo/patterns").Matcher;
 export const IBCConnectionInfoShape: import("@endo/patterns").Matcher;
 /** @type {TypedPattern<CosmosAssetInfo>} */
 export const CosmosAssetInfoShape: TypedPattern<CosmosAssetInfo>;
-/** @type {TypedPattern<BaseChainInfo>} */
-export const BaseChainInfoShape: TypedPattern<BaseChainInfo>;
 /** @type {TypedPattern<CosmosChainInfo>} */
 export const CosmosChainInfoShape: TypedPattern<CosmosChainInfo>;
 /** @type {TypedPattern<ChainInfo>} */
@@ -109,12 +95,10 @@ export const ForwardOptsShape: TypedPattern<IBCMsgTransferOptions["forwardOpts"]
  * @internal
  */
 export const IBCTransferOptionsShape: TypedPattern<IBCMsgTransferOptions>;
-import type { Caip10Record } from './types.js';
+import type { ChainAddress } from './types.js';
 import type { TypedPattern } from '@agoric/internal';
-import type { AccountIdArg } from './types.js';
 import type { Any as Proto3Msg } from '@agoric/cosmic-proto/google/protobuf/any.js';
 import type { CosmosAssetInfo } from './types.js';
-import type { BaseChainInfo } from './types.js';
 import type { CosmosChainInfo } from './types.js';
 import type { ChainInfo } from './types.js';
 import type { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.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;;;;;;AAYF,yCAAyC;AACzC,gCADW,aAAa,YAAY,CAAC,CAKnC;;AAMF;;;;GAIG;AACH,gCAFU,aAAa,YAAY,CAAC,CAEuC;AAE3E,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;AAWH,0CAA0C;AAC1C,iCADW,aAAa,aAAa,CAAC,CAIpC;AAGF,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CAetC;AAGF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CAC2C;AAG7E,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;kCA5S0N,YAAY;kCADzM,kBAAkB;kCAC2K,YAAY;sCACrM,6CAA6C;qCAD4I,YAAY;mCAAZ,YAAY;qCAAZ,YAAY;+BAAZ,YAAY;0BAGjN,kDAAkD;+BAHmJ,YAAY;iCAK1M,qBAAqB;iCALyK,YAAY;+BAAZ,YAAY;4CAAZ,YAAY;+BAI5M,sBAAsB;yCAJ0K,YAAY;iCAAZ,YAAY;2CAAZ,YAAY"}
+{"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"}

package/src/typeGuards.js

@@ -4,7 +4,7 @@ import { M } from '@endo/patterns';
 
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {CosmosAssetInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions, AccountIdArg, BaseChainInfo, ChainInfo,Caip10Record} from './types.js';
+ * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomInfo, AmountArg, CosmosValidatorAddress, OrchestrationPowers, ForwardInfo, IBCMsgTransferOptions} 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,37 +27,17 @@ export const OutboundConnectionHandlerI = M.interface(
   },
 );
 
-// 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 = {
+/** @type {TypedPattern<ChainAddress>} */
+export const ChainAddressShape = {
   chainId: M.string(),
-  // Ignored but maintained for backwards compatibility
   encoding: M.string(),
   value: M.string(),
 };
-harden(CosmosChainAddressShape);
-
-/** @type {TypedPattern<Caip10Record>} */
-export const Caip10RecordShape = {
-  namespace: M.string(),
-  reference: M.string(),
-  accountAddress: M.string(),
-};
-harden(Caip10RecordShape);
-
-/** @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 AccountIdArgShape = M.or(M.string(), CosmosChainAddressShape);
+harden(ChainAddressShape);
 
 /** @type {TypedPattern<Proto3Msg>} */
 export const Proto3Shape = { typeUrl: M.string(), value: M.string() };
-harden(Proto3Shape);
+harden(ChainAddressShape);
 
 /** @internal */
 export const IBCChannelIDShape = M.string();
@@ -99,44 +79,25 @@ export const CosmosAssetInfoShape = M.splitRecord({
   ),
 });
 
-const ChainInfoRequiredShape = {
-  namespace: M.string(),
-  reference: M.string(),
-};
-
-const ChainInfoOptionalShape = {
-  cctpDestinationDomain: M.number(),
-};
-
-/** @type {TypedPattern<BaseChainInfo>} */
-export const BaseChainInfoShape = M.splitRecord(
-  ChainInfoRequiredShape,
-  ChainInfoOptionalShape,
-);
-harden(BaseChainInfoShape);
-
 /** @type {TypedPattern<CosmosChainInfo>} */
 export const CosmosChainInfoShape = M.splitRecord(
   {
     chainId: M.string(),
-    bech32Prefix: M.string(),
-    ...ChainInfoRequiredShape,
   },
   {
+    bech32Prefix: M.string(),
     connections: M.record(),
+    stakingTokens: M.arrayOf({ denom: M.string() }),
     // UNTIL https://github.com/Agoric/agoric-sdk/issues/9326
     icqEnabled: M.boolean(),
     pfmEnabled: M.boolean(),
-    stakingTokens: M.arrayOf({ denom: M.string() }),
-    ...ChainInfoOptionalShape,
   },
 );
-harden(CosmosChainInfoShape);
 
 /** @type {TypedPattern<ChainInfo>} */
-export const ChainInfoShape = M.or(CosmosChainInfoShape, BaseChainInfoShape);
-harden(ChainInfoShape);
-
+export const ChainInfoShape = M.splitRecord({
+  chainId: M.string(),
+});
 export const DenomShape = M.string();
 
 /** @type {TypedPattern<Coin>} */
@@ -185,10 +146,10 @@ export const AmountArgShape = M.or(AnyNatAmountShape, DenomAmountShape);
  */
 export const DelegationShape = M.splitRecord(
   {
-    validator: CosmosChainAddressShape,
+    validator: ChainAddressShape,
     amount: AmountArgShape,
   },
-  { delegator: CosmosChainAddressShape },
+  { delegator: ChainAddressShape },
 );
 
 /** Approximately @see RequestQuery */
@@ -284,7 +245,7 @@ export const ForwardOptsShape = M.splitRecord(
   {
     timeout: M.string(),
     retries: M.number(),
-    intermediateRecipient: CosmosChainAddressShape,
+    intermediateRecipient: ChainAddressShape,
   },
   {},
 );

package/src/types.d.ts

@@ -1,7 +1,7 @@
 /** @file Rollup of all type definitions in the package, for local import and external export */
-import type { ZCF } from '@agoric/zoe';
 export type * from './chain-info.js';
 export type * from './cosmos-api.js';
+export type * from './ethereum-api.js';
 export type * from './exos/chain-hub.js';
 export type * from './exos/combine-invitation-makers.js';
 export type * from './exos/cosmos-interchain-service.js';

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAEhG,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEvC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,0BAA0B,CAAC;AAC9C,mBAAmB,2BAA2B,CAAC;AAC/C,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,gCAAgC,CAAC;AACpD,mBAAmB,wBAAwB,CAAC;AAC5C,mBAAmB,wBAAwB,CAAC;AAC5C,mBAAmB,yBAAyB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,mBAAmB,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAChD,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACxC,cAAc,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;CACvC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAEhG,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,mBAAmB,CAAC;AACvC,mBAAmB,qBAAqB,CAAC;AACzC,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,0BAA0B,CAAC;AAC9C,mBAAmB,2BAA2B,CAAC;AAC/C,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,8BAA8B,CAAC;AAClD,mBAAmB,gCAAgC,CAAC;AACpD,mBAAmB,wBAAwB,CAAC;AAC5C,mBAAmB,wBAAwB,CAAC;AAC5C,mBAAmB,yBAAyB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,mBAAmB,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAChD,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACxC,cAAc,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;CACvC"}

package/src/types.ts

@@ -1,9 +1,8 @@
 /** @file Rollup of all type definitions in the package, for local import and external export */
 
-import type { ZCF } from '@agoric/zoe';
-
 export type * from './chain-info.js';
 export type * from './cosmos-api.js';
+export type * from './ethereum-api.js';
 export type * from './exos/chain-hub.js';
 export type * from './exos/combine-invitation-makers.js';
 export type * from './exos/cosmos-interchain-service.js';