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

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

@@ -24,7 +24,6 @@ export const IcaAccountHolderI: import("@endo/patterns").InterfaceGuard<{
     transferSteps: import("@endo/patterns").MethodGuard;
     asContinuingOffer: import("@endo/patterns").MethodGuard;
     getPublicTopics: import("@endo/patterns").MethodGuard;
-    depositForBurn: import("@endo/patterns").MethodGuard;
 }>;
 export const CosmosOrchestrationInvitationMakersI: import("@endo/patterns").InterfaceGuard<{
     Delegate: import("@endo/patterns").MethodGuard;
@@ -45,7 +44,7 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
     vowTools: VowTools;
     zcf: ZCF;
 }): (args_0: {
-    chainAddress: CosmosChainAddress;
+    chainAddress: ChainAddress;
     localAddress: LocalIbcAddress;
     remoteAddress: RemoteIbcAddress;
 }, io: {
@@ -156,7 +155,7 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
          *   bigint,
          * ]} results
          * @param {{
-         *   destination: CosmosChainAddress;
+         *   destination: ChainAddress;
          *   opts?: IBCMsgTransferOptions;
          *   token: Coin;
          * }} ctx
@@ -164,7 +163,7 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         onFulfilled([{ transferChannel }, timeoutTimestamp]: [{
             transferChannel: IBCConnectionInfo["transferChannel"];
         }, bigint], { opts, token, destination }: {
-            destination: CosmosChainAddress;
+            destination: ChainAddress;
             opts?: IBCMsgTransferOptions;
             token: Coin;
         }): Vow<undefined>;
@@ -196,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: AccountIdArg;
+            toAccount: ChainAddress;
             amount: AmountArg;
         }>>;
         SendAll(): Promise<Invitation<Vow<void>, {
-            toAccount: CosmosChainAddress;
+            toAccount: ChainAddress;
             amounts: AmountArg[];
         }>>;
         /**
@@ -211,27 +210,27 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         TransferAccount(): never;
         Transfer(): Promise<Invitation<Vow<void>, {
             amount: AmountArg;
-            destination: AccountIdArg;
+            destination: ChainAddress;
             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<CosmosChainAddress>;
+        getAddress(): import("@agoric/async-flow").HostInterface<ChainAddress>;
         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: AccountIdArg, amount: AmountArg): Vow<void>;
-        sendAll(toAccount: CosmosChainAddress, amounts: AmountArg[]): Vow<void>;
-        transfer(destination: AccountIdArg, amount: AmountArg, opts?: IBCMsgTransferOptions | undefined): Vow<void>;
+        send(toAccount: ChainAddress, amount: AmountArg): Vow<void>;
+        sendAll(toAccount: ChainAddress, amounts: AmountArg[]): Vow<void>;
+        transfer(destination: ChainAddress, 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?: CosmosChainAddress;
+            delegator?: ChainAddress;
             validator: CosmosValidatorAddress;
         }[]): Vow<void>;
         deactivate(): Vow<void>;
@@ -240,76 +239,12 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         getDelegations(): Vow<{
             delegator: {
                 chainId: string;
-                value: import("../cosmos-api.js").Bech32Address;
-                encoding: "bech32";
+                value: string;
+                encoding: "bech32" | "ethereum";
             };
             validator: {
                 chainId: string;
-                value: {
-                    readonly [x: number]: string;
-                    toString: () => string;
-                    charAt: (pos: number) => string;
-                    charCodeAt: (index: number) => number;
-                    concat: (...args: string[]) => string;
-                    indexOf: (searchString: string, position?: number | undefined) => number;
-                    lastIndexOf: (searchString: string, position?: number | undefined) => number;
-                    localeCompare: (that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions | undefined) => number;
-                    match: ((matcher: {
-                        [Symbol.match](string: string): RegExpMatchArray | null;
-                    }) => null) | ((matcher: {
-                        [Symbol.match](string: string): RegExpMatchArray | null;
-                    }) => import("@agoric/async-flow").HostInterface<RegExpMatchArray>);
-                    replace: (searchValue: {
-                        [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
-                    }, replacer: (substring: string, ...args: any[]) => string) => string;
-                    search: (searcher: {
-                        [Symbol.search](string: string): number;
-                    }) => number;
-                    slice: (start?: number | undefined, end?: number | undefined) => string;
-                    split: (splitter: {
-                        [Symbol.split](string: string, limit?: number): string[];
-                    }, limit?: number | undefined) => string[];
-                    substring: (start: number, end?: number | undefined) => string;
-                    toLowerCase: () => string;
-                    toLocaleLowerCase: (locales?: Intl.LocalesArgument) => string;
-                    toUpperCase: () => string;
-                    toLocaleUpperCase: (locales?: Intl.LocalesArgument) => string;
-                    trim: () => string;
-                    readonly length: number;
-                    substr: (from: number, length?: number | undefined) => string;
-                    valueOf: () => string;
-                    codePointAt: ((pos: number) => undefined) | ((pos: number) => number);
-                    includes: ((searchString: string, position?: number | undefined) => false) | ((searchString: string, position?: number | undefined) => true);
-                    endsWith: ((searchString: string, endPosition?: number | undefined) => false) | ((searchString: string, endPosition?: number | undefined) => true);
-                    normalize: (form?: string | undefined) => string;
-                    repeat: (count: number) => string;
-                    startsWith: ((searchString: string, position?: number | undefined) => false) | ((searchString: string, position?: number | undefined) => true);
-                    anchor: (name: string) => string;
-                    big: () => string;
-                    blink: () => string;
-                    bold: () => string;
-                    fixed: () => string;
-                    fontcolor: (color: string) => string;
-                    fontsize: (size: string) => string;
-                    italics: () => string;
-                    link: (url: string) => string;
-                    small: () => string;
-                    strike: () => string;
-                    sub: () => string;
-                    sup: () => string;
-                    padStart: (maxLength: number, fillString?: string | undefined) => string;
-                    padEnd: (maxLength: number, fillString?: string | undefined) => string;
-                    trimEnd: () => string;
-                    trimStart: () => string;
-                    trimLeft: () => string;
-                    trimRight: () => string;
-                    matchAll: (regexp: RegExp) => import("@agoric/async-flow").HostInterface<RegExpStringIterator<RegExpExecArray>>;
-                    replaceAll: (searchValue: string | RegExp, replacer: (substring: string, ...args: any[]) => string) => string;
-                    at: ((index: number) => undefined) | ((index: number) => string);
-                    isWellFormed: (() => false) | (() => true);
-                    toWellFormed: () => string;
-                    [Symbol.iterator]: () => import("@agoric/async-flow").HostInterface<StringIterator<string>>;
-                };
+                value: `${string}valoper${string}`;
                 encoding: "bech32";
             };
             amount: {
@@ -366,7 +301,6 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
             typeUrl: string;
             value: string;
         }[], opts?: Partial<Omit<import("@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js").TxBody, "messages">> | undefined): Vow<string>;
-        depositForBurn(mintRecipient: `${string}:${string}:${string}`, amount: AmountArg, caller?: `${string}:${string}:${string}` | undefined): Vow<void>;
     };
 }>;
 export function prepareCosmosOrchestrationAccount(zone: Zone, { chainHub, makeRecorderKit, timerService, vowTools, zcf }: {
@@ -377,14 +311,14 @@ export function prepareCosmosOrchestrationAccount(zone: Zone, { chainHub, makeRe
     zcf: ZCF;
 }): (...args: Parameters<ReturnType<typeof prepareCosmosOrchestrationAccountKit>>) => CosmosOrchestrationAccountKit["holder"];
 export type CosmosOrchestrationAccountNotification = {
-    chainAddress: CosmosChainAddress;
+    chainAddress: ChainAddress;
 };
 /**
  * Internal to the IcaAccountHolder exo
  */
 export type State = {
     account: IcaAccount;
-    chainAddress: CosmosChainAddress;
+    chainAddress: ChainAddress;
     icqConnection: ICQConnection | undefined;
     localAddress: LocalIbcAddress;
     remoteAddress: RemoteIbcAddress;
@@ -403,8 +337,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 { ZCF } from '@agoric/zoe';
-import type { CosmosChainAddress } from '../types.js';
+import type { ChainAddress } from '../types.js';
 import type { LocalIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
 import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
 import type { IcaAccount } from '../types.js';
@@ -418,8 +351,6 @@ import type { CosmosRewardsResponse } from '../types.js';
 import type { IBCConnectionInfo } from '../types.js';
 import type { IBCMsgTransferOptions } from '../types.js';
 import type { CosmosValidatorAddress } from '../types.js';
-import type { Invitation } from '@agoric/zoe';
-import type { AccountIdArg } from '../types.js';
 import type { ICQConnection } from '../types.js';
 import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 //# sourceMappingURL=cosmos-orchestration-account.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"AAyJA,wCAAwC;AACxC;;;;;;;;;;;;;;;;;;;;;;;;;;GAUG;AAOH;;;;;;;;;;;GAoBE;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,kBAAkB;kBAClB,eAAe;mBACf,gBAAgB;;aAEhB,UAAU;;;;;;;WAGV,OAAO,YAAY,CAAC;;;QAuC3B,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,kBAAkB,CAAC;YAChC,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,kBAAkB;qBAAW,SAAS,EAAE;;QAS5D;;;;WAIG;;;oBASc,SAAS;yBACJ,YAAY;mBAClB,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwe5C;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;;kBArnCa,kBAAkB;;;;;oBAKnB;IACR,OAAO,EAAE,UAAU,CAAC;IACpB,YAAY,EAAE,kBAAkB,CAAC;IACjC,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;4CAikCS,UAAU,CAClB,UAAU,CAAC,OAAO,oCAAoC,CAAC,CACxD;yCA8BU,6BAA6B,CAAC,QAAQ,CAAC;0BAnoC9B,cAAc;8BATsR,aAAa;qCAEzR,6CAA6C;kCAK7D,cAAc;4BAHpB,kBAAkB;8BAIX,aAAa;yBAP0B,aAAa;wCADuO,aAAa;qCAapR,iCAAiC;sCAAjC,iCAAiC;gCAbsO,aAAa;8BAW7S,sBAAsB;mCADjB,+CAA+C;yBAF/C,aAAa;+BAR8Q,aAAa;0BAGjT,kDAAkD;8CAHkP,aAAa;2CAAb,aAAa;uCAAb,aAAa;2CAAb,aAAa;4CAAb,aAAa;gCACjQ,aAAa;kCADuO,aAAa;mCAAb,aAAa;iCAEzR,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

@@ -1,9 +1,5 @@
 /** @file Use-object for the owner of a staking account */
 import { toRequestQueryJson } from '@agoric/cosmic-proto';
-import {
-  MsgDepositForBurn,
-  MsgDepositForBurnWithCaller,
-} from '@agoric/cosmic-proto/circle/cctp/v1/tx.js';
 import {
   QueryAllBalancesRequest,
   QueryAllBalancesResponse,
@@ -50,7 +46,7 @@ import { Fail, makeError, q } from '@endo/errors';
 import { E } from '@endo/far';
 import {
   AmountArgShape,
-  CosmosChainAddressShape,
+  ChainAddressShape,
   DelegationShape,
   DenomAmountShape,
   IBCTransferOptionsShape,
@@ -68,12 +64,10 @@ import {
 } from '../utils/cosmos.js';
 import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
 import { makeTimestampHelper } from '../utils/time.js';
-import { accountIdTo32Bytes, parseAccountId } from '../utils/address.js';
 
 /**
  * @import {HostOf} from '@agoric/async-flow';
- * @import {AmountArg, IcaAccount, CosmosChainAddress, CosmosValidatorAddress, ICQConnection, StakingAccountActions, StakingAccountQueries, NobleMethods, OrchestrationAccountCommon, CosmosRewardsResponse, IBCConnectionInfo, IBCMsgTransferOptions, ChainHub, CosmosDelegationResponse, CaipChainId, AccountIdArg} from '../types.js';
- * @import {ContractMeta, Invitation, OfferHandler, ZCF, ZCFSeat} from '@agoric/zoe';
+ * @import {AmountArg, IcaAccount, ChainAddress, 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';
@@ -94,14 +88,14 @@ const { Vow$ } = NetworkShape; // TODO #9611
 
 /**
  * @typedef {object} CosmosOrchestrationAccountNotification
- * @property {CosmosChainAddress} chainAddress
+ * @property {ChainAddress} chainAddress
  */
 
 /**
  * @private
  * @typedef {{
  *   account: IcaAccount;
- *   chainAddress: CosmosChainAddress;
+ *   chainAddress: ChainAddress;
  *   icqConnection: ICQConnection | undefined;
  *   localAddress: LocalIbcAddress;
  *   remoteAddress: RemoteIbcAddress;
@@ -120,14 +114,14 @@ const { Vow$ } = NetworkShape; // TODO #9611
 
 /** @see {StakingAccountActions} */
 const stakingAccountActionsMethods = {
-  delegate: M.call(CosmosChainAddressShape, AmountArgShape).returns(VowShape),
+  delegate: M.call(ChainAddressShape, AmountArgShape).returns(VowShape),
   redelegate: M.call(
-    CosmosChainAddressShape,
-    CosmosChainAddressShape,
+    ChainAddressShape,
+    ChainAddressShape,
     AmountArgShape,
   ).returns(VowShape),
   undelegate: M.call(M.arrayOf(DelegationShape)).returns(VowShape),
-  withdrawReward: M.call(CosmosChainAddressShape).returns(
+  withdrawReward: M.call(ChainAddressShape).returns(
     Vow$(M.arrayOf(DenomAmountShape)),
   ),
   withdrawRewards: M.call().returns(Vow$(M.arrayOf(DenomAmountShape))),
@@ -135,25 +129,17 @@ const stakingAccountActionsMethods = {
 
 /** @see {StakingAccountQueries} */
 const stakingAccountQueriesMethods = {
-  getDelegation: M.call(CosmosChainAddressShape).returns(VowShape),
+  getDelegation: M.call(ChainAddressShape).returns(VowShape),
   getDelegations: M.call().returns(VowShape),
-  getUnbondingDelegation: M.call(CosmosChainAddressShape).returns(VowShape),
+  getUnbondingDelegation: M.call(ChainAddressShape).returns(VowShape),
   getUnbondingDelegations: M.call().returns(VowShape),
   getRedelegations: M.call().returns(VowShape),
-  getReward: M.call(CosmosChainAddressShape).returns(VowShape),
+  getReward: M.call(ChainAddressShape).returns(VowShape),
   getRewards: M.call().returns(VowShape),
 };
 
-/** @see {NobleMethods} */
-const nobleMethods = {
-  depositForBurn: M.call(M.string(), AmountArgShape)
-    .optional(M.string())
-    .returns(VowShape),
-};
-
 /** @see {OrchestrationAccountCommon} */
 export const IcaAccountHolderI = M.interface('IcaAccountHolder', {
-  ...nobleMethods,
   ...orchestrationAccountMethods,
   ...stakingAccountActionsMethods,
   ...stakingAccountQueriesMethods,
@@ -172,15 +158,13 @@ const PUBLIC_TOPICS = {
 export const CosmosOrchestrationInvitationMakersI = M.interface(
   'invitationMakers',
   {
-    Delegate: M.call(CosmosChainAddressShape, AmountArgShape).returns(
-      M.promise(),
-    ),
+    Delegate: M.call(ChainAddressShape, AmountArgShape).returns(M.promise()),
     Redelegate: M.call(
-      CosmosChainAddressShape,
-      CosmosChainAddressShape,
+      ChainAddressShape,
+      ChainAddressShape,
       AmountArgShape,
     ).returns(M.promise()),
-    WithdrawReward: M.call(CosmosChainAddressShape).returns(M.promise()),
+    WithdrawReward: M.call(ChainAddressShape).returns(M.promise()),
     Undelegate: M.call(M.arrayOf(DelegationShape)).returns(M.promise()),
     DeactivateAccount: M.call().returns(M.promise()),
     ReactivateAccount: M.call().returns(M.promise()),
@@ -221,7 +205,7 @@ export const prepareCosmosOrchestrationAccountKit = (
         amountToCoin: M.call(AmountArgShape).returns(M.record()),
       }),
       returnVoidWatcher: M.interface('returnVoidWatcher', {
-        onFulfilled: M.call(M.any())
+        onFulfilled: M.call(M.or(M.string(), M.record()))
           .optional(M.arrayOf(M.undefined()))
           .returns(M.undefined()),
       }),
@@ -248,7 +232,7 @@ export const prepareCosmosOrchestrationAccountKit = (
       transferWatcher: M.interface('transferWatcher', {
         onFulfilled: M.call([M.record(), M.nat()])
           .optional({
-            destination: CosmosChainAddressShape,
+            destination: ChainAddressShape,
             opts: M.or(M.undefined(), IBCTransferOptionsShape),
             token: {
               denom: M.string(),
@@ -302,7 +286,7 @@ export const prepareCosmosOrchestrationAccountKit = (
     },
     /**
      * @param {object} info
-     * @param {CosmosChainAddress} info.chainAddress
+     * @param {ChainAddress} info.chainAddress
      * @param {LocalIbcAddress} info.localAddress
      * @param {RemoteIbcAddress} info.remoteAddress
      * @param {object} io
@@ -313,11 +297,6 @@ export const prepareCosmosOrchestrationAccountKit = (
      * @returns {State}
      */
     ({ chainAddress, localAddress, remoteAddress }, io) => {
-      trace('cosmos orch acct init', {
-        chainAddress,
-        localAddress,
-        remoteAddress,
-      });
       const { storageNode } = io;
       // must be the fully synchronous maker because the kit is held in durable state
       const topicKit = storageNode
@@ -582,7 +561,7 @@ export const prepareCosmosOrchestrationAccountKit = (
          *   bigint,
          * ]} results
          * @param {{
-         *   destination: CosmosChainAddress;
+         *   destination: ChainAddress;
          *   opts?: IBCMsgTransferOptions;
          *   token: Coin;
          * }} ctx
@@ -676,7 +655,7 @@ export const prepareCosmosOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: AccountIdArg; amount: AmountArg }
+           *   { toAccount: ChainAddress; amount: AmountArg }
            * >}
            */
           const offerHandler = (seat, { toAccount, amount }) => {
@@ -689,7 +668,7 @@ export const prepareCosmosOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: CosmosChainAddress; amounts: AmountArg[] }
+           *   { toAccount: ChainAddress; amounts: AmountArg[] }
            * >}
            */
           const offerHandler = (seat, { toAccount, amounts }) => {
@@ -712,7 +691,7 @@ export const prepareCosmosOrchestrationAccountKit = (
            *   Vow<void>,
            *   {
            *     amount: AmountArg;
-           *     destination: AccountIdArg;
+           *     destination: ChainAddress;
            *     opts?: IBCMsgTransferOptions;
            *   }
            * >}
@@ -875,17 +854,14 @@ export const prepareCosmosOrchestrationAccountKit = (
         send(toAccount, amount) {
           return asVow(() => {
             trace('send', toAccount, amount);
-            const cosmosDest = chainHub.coerceCosmosAddress(toAccount);
-            const { chainAddress } = this.state;
-            cosmosDest.chainId === chainAddress.chainId ||
-              Fail`bank/send cannot send to a different chain ${q(cosmosDest.chainId)}`;
             const { helper } = this.facets;
+            const { chainAddress } = this.state;
             return watch(
               E(helper.owned()).executeEncodedTx([
                 Any.toJSON(
                   MsgSend.toProtoMsg({
                     fromAddress: chainAddress.value,
-                    toAddress: cosmosDest.value,
+                    toAddress: toAccount.value,
                     amount: [helper.amountToCoin(amount)],
                   }),
                 ),
@@ -920,19 +896,13 @@ 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 `coerceCosmosChainAddress` to throw if `destination` has another namespace.
-
-            const cosmosDest = chainHub.coerceCosmosAddress(destination);
-
             const { helper } = this.facets;
             const token = helper.amountToCoin(amount);
 
             const connectionInfoV = watch(
               chainHub.getConnectionInfo(
                 this.state.chainAddress.chainId,
-                cosmosDest.chainId,
+                destination.chainId,
               ),
             );
 
@@ -951,7 +921,7 @@ export const prepareCosmosOrchestrationAccountKit = (
             return watch(
               allVows([connectionInfoV, timeoutTimestampVowOrValue]),
               this.facets.transferWatcher,
-              { opts, token, destination: cosmosDest },
+              { opts, token, destination },
             );
           });
         },
@@ -1005,7 +975,6 @@ export const prepareCosmosOrchestrationAccountKit = (
         },
         /** @type {HostOf<StakingAccountQueries['getDelegation']>} */
         getDelegation(validator) {
-          // @ts-expect-error XXX string template with generics
           return asVow(() => {
             trace('getDelegation', validator);
             const { chainAddress, icqConnection } = this.state;
@@ -1025,7 +994,6 @@ export const prepareCosmosOrchestrationAccountKit = (
         },
         /** @type {HostOf<StakingAccountQueries['getDelegations']>} */
         getDelegations() {
-          // @ts-expect-error XXX string template with generics
           return asVow(() => {
             trace('getDelegations');
             const { chainAddress, icqConnection } = this.state;
@@ -1121,7 +1089,6 @@ export const prepareCosmosOrchestrationAccountKit = (
         },
         /** @type {HostOf<StakingAccountQueries['getRewards']>} */
         getRewards() {
-          // @ts-expect-error XXX string template with generics
           return asVow(() => {
             trace('getRewards');
             const { chainAddress, icqConnection } = this.state;
@@ -1144,58 +1111,6 @@ export const prepareCosmosOrchestrationAccountKit = (
             watch(E(this.facets.helper.owned()).executeEncodedTx(msgs, opts)),
           );
         },
-        /**
-         * @type {HostOf<NobleMethods['depositForBurn']>}
-         */
-        depositForBurn(destination, amount, caller) {
-          return asVow(() => {
-            trace('depositForBurn', { destination, amount });
-            const { helper } = this.facets;
-            const { chainAddress } = this.state;
-
-            const destParts = parseAccountId(destination);
-            /** @type {CaipChainId} */
-            const chainId = `${destParts.namespace}:${destParts.reference}`;
-
-            const { cctpDestinationDomain } =
-              chainHub.getChainInfoByChainId(chainId);
-            if (typeof cctpDestinationDomain !== 'number') {
-              throw Fail`${q(chainId)} does not have "cctpDestinationDomain" set in ChainInfo`;
-            }
-
-            /** @satisfies {MsgDepositForBurn} */
-            const depositForBurn = {
-              amount: helper.amountToCoin(amount)?.amount,
-              from: chainAddress.value,
-              destinationDomain: cctpDestinationDomain,
-              mintRecipient: accountIdTo32Bytes(destination),
-              // safe to hardcode since `uusdc` is the only asset supported by CCTP
-              burnToken: 'uusdc',
-            };
-
-            const destinationCaller = (() => {
-              if (!caller) return undefined;
-              const callerParts = parseAccountId(caller);
-              callerParts.namespace === destParts.namespace ||
-                Fail`caller ${q(caller)} must be in same namespace as destination ${q(destination)}`;
-              return accountIdTo32Bytes(caller);
-            })();
-
-            return watch(
-              E(helper.owned()).executeEncodedTx([
-                Any.toJSON(
-                  destinationCaller
-                    ? MsgDepositForBurnWithCaller.toProtoMsg({
-                        ...depositForBurn,
-                        destinationCaller,
-                      })
-                    : MsgDepositForBurn.toProtoMsg(depositForBurn),
-                ),
-              ]),
-              this.facets.returnVoidWatcher,
-            );
-          });
-        },
       },
     },
   );

package/src/exos/ibc-packet.d.ts

@@ -61,7 +61,6 @@ export function prepareIBCTools(zone: import("@agoric/base-zone").Zone, vowTools
     };
 };
 export type MakeIBCReplyKit = ReturnType<typeof prepareIBCReplyKit>;
-import type { Pattern } from '@endo/patterns';
 import type { VowTools } from '@agoric/vow';
 import type { Vow } from '@agoric/vow';
 import type { LocalChainAccount } from '@agoric/vats/src/localchain.js';

package/src/exos/ibc-packet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ibc-packet.d.ts","sourceRoot":"","sources":["ibc-packet.js"],"names":[],"mappings":"AAMA,4CAA6C,MAAM,CAAC;AAqB7C,gDAHI,GAAG,GACD,OAAO,CAgCnB;AAOM,+CAHI,OAAO,mBAAmB,EAAE,IAAI,8BAChC,QAAQ,GAAG;IAAE,eAAe,EAAE,eAAe,CAAA;CAAE,IA+FhD,GAAG,MAFA,UAAU;eA3EH,iBAAiB,CAAC,WAAW,CAAC;;;;;;;;;;;QAoB1C;;;;;;;;;;;WAWG;oCARQ,CACV,SACA,WACA,UAAkB,2CAA2C,CAAC,CACvD,CACF,CACF,OACO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;;;;GA+CrB;;;;;GAChB;AAOM,yCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ,wBAyBN,OAAO,UACP,IAAI,GAAG,CAAC,QACR,aAAa;;;EAmBzB;AAQM,sCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;;mBAvIC,iBAAiB,CAAC,WAAW,CAAC;;;;;;;;;0CA4GrC,OAAO,UACP,IAAI,GAAG,CAAC,QACR,aAAa;;;;EAkCzB;8BAba,UAAU,CAAC,OAAO,kBAAkB,CAAC;6BAxMpB,gBAAgB;8BAEf,aAAa;yBAAb,aAAa;uCACT,gCAAgC;+BAFlB,sBAAsB;gCAAtB,sBAAsB;8BAAtB,sBAAsB;mCAGxC,mBAAmB"}
+{"version":3,"file":"ibc-packet.d.ts","sourceRoot":"","sources":["ibc-packet.js"],"names":[],"mappings":"AAMA,4CAA6C,MAAM,CAAC;AAkB7C,gDAHI,GAAG,GACD,OAAO,CAgCnB;AAOM,+CAHI,OAAO,mBAAmB,EAAE,IAAI,8BAChC,QAAQ,GAAG;IAAE,eAAe,EAAE,eAAe,CAAA;CAAE,IA2FhD,GAAG,MAFA,UAAU;eAvEH,iBAAiB,CAAC,WAAW,CAAC;;;;;;;;;;;QAoB1C;;;;;;;;;;;WAWG;oCARQ,CACV,SACA,WACA,UAAkB,2CAA2C,CAAC,CACvD,CACF,CACF,OACO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;;;;GA2CrB;;;;;GAChB;AAOM,yCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ,wBAyBN,OAAO,UACP,IAAI,GAAG,CAAC,QACR,aAAa;;;EAmBzB;AAQM,sCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;;mBAnIC,iBAAiB,CAAC,WAAW,CAAC;;;;;;;;;0CAwGrC,OAAO,UACP,IAAI,GAAG,CAAC,QACR,aAAa;;;;EAkCzB;8BAba,UAAU,CAAC,OAAO,kBAAkB,CAAC;8BAlMnB,aAAa;yBAAb,aAAa;uCACT,gCAAgC;+BAFlB,sBAAsB;gCAAtB,sBAAsB;8BAAtB,sBAAsB;mCAGxC,mBAAmB"}

package/src/exos/ibc-packet.js

@@ -1,4 +1,4 @@
-import { assertAllDefined, makeTracer } from '@agoric/internal';
+import { assertAllDefined } from '@agoric/internal';
 import { base64ToBytes, Shape as NetworkShape } from '@agoric/network';
 import { M } from '@endo/patterns';
 import { E } from '@endo/far';
@@ -6,10 +6,7 @@ import { E } from '@endo/far';
 // As specified in ICS20, the success result is a base64-encoded '\0x1' byte.
 export const ICS20_TRANSFER_SUCCESS_RESULT = 'AQ==';
 
-const trace = makeTracer('IBCP');
-
 /**
- * @import {Key, Pattern} from '@endo/patterns';
  * @import {JsonSafe, TypedJson, ResponseTo} from '@agoric/cosmic-proto';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {LocalChainAccount} from '@agoric/vats/src/localchain.js';
@@ -114,10 +111,6 @@ export const prepareIBCTransferSender = (zone, { watch, makeIBCReplyKit }) => {
           const { match } = ctx;
           const { transferMsg } = this.state;
 
-          // sequence + sourceChannel uniquely identifies a transfer.
-          // trace with receiver etc. for forensics
-          trace('sequence', sequence, transferMsg);
-
           // Match the port/channel and sequence number.
           const replyPacketPattern = M.splitRecord({
             source_port: transferMsg.sourcePort,

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 {CosmosChainAddress} */
-        getAddress(): CosmosChainAddress;
+        /** @returns {ChainAddress} */
+        getAddress(): ChainAddress;
         getLocalAddress(): `/ibc-port/${string}`;
         getRemoteAddress(): `/${string}ibc-port/${string}/ordered/${string}` | `/${string}ibc-port/${string}/unordered/${string}`;
         getPort(): Port;
@@ -71,16 +71,14 @@ export type State = {
     localAddress: LocalIbcAddress | undefined;
     requestedRemoteAddress: string;
     remoteAddress: RemoteIbcAddress | undefined;
-    chainAddress: (CosmosChainAddress | {
-        value: typeof UNPARSABLE_CHAIN_ADDRESS;
-    }) | undefined;
+    chainAddress: ChainAddress | 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 { CosmosChainAddress } from '../types.js';
+import type { ChainAddress } 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';
@@ -88,6 +86,4 @@ import type { Connection } from '@agoric/network';
 import type { Remote } from '@agoric/vow';
 import type { LocalIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
 import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
-declare const UNPARSABLE_CHAIN_ADDRESS: "UNPARSABLE_CHAIN_ADDRESS";
-export {};
 //# sourceMappingURL=ica-account-kit.d.ts.map

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;AA4BI,2CAJI,IAAI,oBACJ,QAAQ;;QAiCX,0BAA0B;yBAAd,MAAM;;;QAMlB,oCAAoC;sBAAtB,kBAAkB;;;;;QA0BhC;;;;;;;;;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;;;;oBAzLU;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,EACR,CAAC,kBAAkB,GAAG;QAAE,KAAK,EAAE,OAAO,wBAAwB,CAAA;KAAE,CAAC,GACjE,SAAS,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAC;CAC5B;4BAgLU,UAAU,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;0BAxN1C,mBAAmB;8BAEF,aAAa;0BADlB,iBAAiB;wCAKH,aAAa;yBAJtB,aAAa;6BAC3B,sBAAsB;4BACvB,8CAA8C;gCAHpC,iBAAiB;4BACZ,aAAa;qCAGD,iCAAiC;sCAAjC,iCAAiC;AAMrF,wCAAiC,0BAA0B,CAAC"}
+{"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"}