@agoric/orchestration 0.1.1-dev-a9e951a.0 → 0.1.1-dev-607ed82.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-a9e951a.0+a9e951a",
+  "version": "0.1.1-dev-607ed82.0+607ed82",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -33,19 +33,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-a9e951a.0+a9e951a",
-    "@agoric/cosmic-proto": "0.4.1-dev-a9e951a.0+a9e951a",
-    "@agoric/ertp": "0.16.3-dev-a9e951a.0+a9e951a",
-    "@agoric/internal": "0.3.3-dev-a9e951a.0+a9e951a",
-    "@agoric/network": "0.1.1-dev-a9e951a.0+a9e951a",
-    "@agoric/notifier": "0.6.3-dev-a9e951a.0+a9e951a",
-    "@agoric/store": "0.9.3-dev-a9e951a.0+a9e951a",
-    "@agoric/time": "0.3.3-dev-a9e951a.0+a9e951a",
-    "@agoric/vat-data": "0.5.3-dev-a9e951a.0+a9e951a",
-    "@agoric/vats": "0.15.2-dev-a9e951a.0+a9e951a",
-    "@agoric/vow": "0.1.1-dev-a9e951a.0+a9e951a",
-    "@agoric/zoe": "0.26.3-dev-a9e951a.0+a9e951a",
-    "@agoric/zone": "0.2.3-dev-a9e951a.0+a9e951a",
+    "@agoric/async-flow": "0.1.1-dev-607ed82.0+607ed82",
+    "@agoric/cosmic-proto": "0.4.1-dev-607ed82.0+607ed82",
+    "@agoric/ertp": "0.16.3-dev-607ed82.0+607ed82",
+    "@agoric/internal": "0.3.3-dev-607ed82.0+607ed82",
+    "@agoric/network": "0.1.1-dev-607ed82.0+607ed82",
+    "@agoric/notifier": "0.6.3-dev-607ed82.0+607ed82",
+    "@agoric/store": "0.9.3-dev-607ed82.0+607ed82",
+    "@agoric/time": "0.3.3-dev-607ed82.0+607ed82",
+    "@agoric/vat-data": "0.5.3-dev-607ed82.0+607ed82",
+    "@agoric/vats": "0.15.2-dev-607ed82.0+607ed82",
+    "@agoric/vow": "0.1.1-dev-607ed82.0+607ed82",
+    "@agoric/zoe": "0.26.3-dev-607ed82.0+607ed82",
+    "@agoric/zone": "0.2.3-dev-607ed82.0+607ed82",
     "@endo/base64": "^1.0.7",
     "@endo/errors": "^1.2.5",
     "@endo/far": "^1.1.5",
@@ -54,7 +54,7 @@
     "@noble/hashes": "^1.5.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-a9e951a.0+a9e951a",
+    "@agoric/swingset-liveslots": "0.10.3-dev-607ed82.0+607ed82",
     "@chain-registry/client": "^1.47.4",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
@@ -94,5 +94,5 @@
   "typeCoverage": {
     "atLeast": 97.57
   },
-  "gitHead": "a9e951a4f18457787d1d21b11e1a57d4f06339bb"
+  "gitHead": "607ed82dddecb1296b2c9507a55cd2c73be3537e"
 }

package/src/cosmos-api.d.ts

@@ -144,7 +144,10 @@ export interface StakingAccountActions {
      * The unbonding time is padded by 10 minutes to account for clock skew.
      * @param delegations - the delegation to undelegate
      */
-    undelegate: (delegations: Omit<Delegation, 'delegatorAddress'>[]) => Promise<void>;
+    undelegate: (delegations: {
+        amount: AmountArg;
+        validator: CosmosValidatorAddress;
+    }[]) => Promise<void>;
     /**
      * Withdraw rewards from all validators. The promise settles when the rewards are withdrawn.
      * @returns The total amounts of rewards withdrawn

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

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

package/src/cosmos-api.ts

@@ -187,7 +187,7 @@ export interface StakingAccountActions {
    * @param delegations - the delegation to undelegate
    */
   undelegate: (
-    delegations: Omit<Delegation, 'delegatorAddress'>[],
+    delegations: { amount: AmountArg; validator: CosmosValidatorAddress }[],
   ) => Promise<void>;
 
   /**

package/src/examples/auto-stake-it.contract.d.ts

@@ -15,7 +15,7 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
         }>>;
     }>;
     creatorFacet: import("@endo/exo").Guarded<{
-        initChain(chainName: string, chainInfo: Readonly<{
+        registerChain(chainName: string, chainInfo: Readonly<{
             chainId: string;
             connections?: Record<string, import("../cosmos-api.js").IBCConnectionInfo>;
             icqEnabled?: boolean;

package/src/examples/send-anywhere.contract.d.ts

@@ -13,7 +13,7 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
         }>>;
     }>;
     creatorFacet: import("@endo/exo").Guarded<{
-        initChain(chainName: string, chainInfo: Readonly<{
+        registerChain(chainName: string, chainInfo: Readonly<{
             chainId: string;
             connections?: Record<string, import("../cosmos-api.js").IBCConnectionInfo>;
             icqEnabled?: boolean;

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

@@ -37,7 +37,10 @@ export function start(zcf: ZCF<StakeIcaTerms>, privateArgs: {
             transfer(amount: import("../orchestration-api.js").AmountArg, destination: import("../orchestration-api.js").ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             withdrawRewards(): import("@agoric/vow").Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
-            undelegate(delegations: Omit<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js").Delegation, "delegatorAddress">[]): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
+            undelegate(delegations: {
+                amount: import("../orchestration-api.js").AmountArg;
+                validator: import("../cosmos-api.js").CosmosValidatorAddress;
+            }[]): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             deactivate(): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             reactivate(): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
         }>>;
@@ -48,7 +51,6 @@ export type StakeIcaTerms = {
     chainId: string;
     hostConnectionId: IBCConnectionID;
     controllerConnectionId: IBCConnectionID;
-    bondDenom: string;
     icqEnabled: boolean;
 };
 export type StakeIcaSF = typeof start;

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

@@ -1 +1 @@
-{"version":3,"file":"stakeIca.contract.d.ts","sourceRoot":"","sources":["stakeIca.contract.js"],"names":[],"mappings":"AAgBA;;;;;;;GAOG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAgBlC;AAEH;;;;;;cAAsD;AAwB/C,2BAVI,GAAG,CAAC,aAAa,CAAC,eAClB;IACV,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;IACjC,uBAA2B,EAAE,uBAAuB,CAAC;IACrD,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;IAC3B,KAAS,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;GA0GjB;4BA5HY;IACZ,OAAW,EAAE,MAAM,CAAC;IACpB,gBAAoB,EAAE,eAAe,CAAC;IACtC,sBAA0B,EAAE,eAAe,CAAC;IAC5C,SAAa,EAAE,MAAM,CAAC;IACtB,UAAc,EAAE,OAAO,CAAC;CACrB;yBAyHU,OAAO,KAAK;6BA3JiB,cAAc;4BADhC,kBAAkB;6CAIwB,aAAa;kCAFjD,cAAc;6BAHnB,kBAAkB;mDAII,uBAAuB;qCAF5B,cAAc"}
+{"version":3,"file":"stakeIca.contract.d.ts","sourceRoot":"","sources":["stakeIca.contract.js"],"names":[],"mappings":"AAgBA;;;;;;;GAOG;AAEH,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAelC;AAEH;;;;;;cAAsD;AAuB/C,2BAVI,GAAG,CAAC,aAAa,CAAC,eAClB;IACV,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;IACjC,uBAA2B,EAAE,uBAAuB,CAAC;IACrD,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;IAC3B,KAAS,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;GAqGjB;4BAtHY;IACZ,OAAW,EAAE,MAAM,CAAC;IACpB,gBAAoB,EAAE,eAAe,CAAC;IACtC,sBAA0B,EAAE,eAAe,CAAC;IAC5C,UAAc,EAAE,OAAO,CAAC;CACrB;yBAoHU,OAAO,KAAK;6BApJiB,cAAc;4BADhC,kBAAkB;6CAIwB,aAAa;kCAFjD,cAAc;6BAHnB,kBAAkB;mDAII,uBAAuB;qCAF5B,cAAc"}

package/src/examples/stakeIca.contract.js

@@ -29,7 +29,6 @@ export const meta = harden({
     chainId: M.string(),
     hostConnectionId: M.string(),
     controllerConnectionId: M.string(),
-    bondDenom: M.string(),
     icqEnabled: M.boolean(),
   },
   privateArgsShape: {
@@ -49,7 +48,6 @@ harden(privateArgsShape);
  *   chainId: string;
  *   hostConnectionId: IBCConnectionID;
  *   controllerConnectionId: IBCConnectionID;
- *   bondDenom: string;
  *   icqEnabled: boolean;
  * }} StakeIcaTerms
  */
@@ -66,13 +64,8 @@ harden(privateArgsShape);
  * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
-  const {
-    chainId,
-    hostConnectionId,
-    controllerConnectionId,
-    bondDenom,
-    icqEnabled,
-  } = zcf.getTerms();
+  const { chainId, hostConnectionId, controllerConnectionId, icqEnabled } =
+    zcf.getTerms();
   const {
     agoricNames,
     cosmosInterchainService: orchestration,
@@ -125,7 +118,7 @@ export const start = async (zcf, privateArgs, baggage) => {
       chainAddress.value,
     );
     const holder = makeCosmosOrchestrationAccount(
-      { chainAddress, bondDenom, localAddress, remoteAddress },
+      { chainAddress, localAddress, remoteAddress },
       {
         account,
         storageNode: accountNode,

package/src/examples/staking-combinations.contract.d.ts

@@ -1,22 +1,22 @@
-export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: {
-    agoricNames: Remote<NameHub>;
-    localchain: Remote<LocalChain>;
-    orchestrationService: Remote<CosmosInterchainService>;
-    storageNode: Remote<StorageNode>;
+export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: OrchestrationPowers & {
     marshaller: Marshaller;
-    timerService: Remote<TimerService>;
 }, baggage: import("@agoric/vat-data").Baggage) => Promise<{
     publicFacet: import("@endo/exo").Guarded<{
-        makeAccount(): Promise<Invitation<Vow<ContinuingOfferResult>, {
+        makeAccount(): Promise<Invitation<import("@agoric/vow").Vow<import("@agoric/smart-wallet/src/types.js").ContinuingOfferResult>, {
             chainName: string;
         }>>;
     }>;
+    creatorFacet: import("@endo/exo").Guarded<{
+        registerChain(chainName: string, chainInfo: Readonly<{
+            chainId: string;
+            connections?: Record<string, import("../cosmos-api.js").IBCConnectionInfo>;
+            icqEnabled?: boolean;
+            stakingTokens?: Readonly<Array<{
+                denom: string;
+            }>>;
+        }>, connectionInfo: import("../cosmos-api.js").IBCConnectionInfo): Promise<void>;
+        registerAsset(denom: import("../orchestration-api.js").Denom, detail: import("../types.js").DenomDetail): Promise<void>;
+    }>;
 }>;
-import type { NameHub } from '@agoric/vats';
-import type { Remote } from '@agoric/internal';
-import type { LocalChain } from '@agoric/vats/src/localchain.js';
-import type { CosmosInterchainService } from '../exos/exo-interfaces.js';
-import type { TimerService } from '@agoric/time';
-import type { ContinuingOfferResult } from '@agoric/smart-wallet/src/types.js';
-import type { Vow } from '@agoric/vow';
+import type { OrchestrationPowers } from '../utils/start-helper.js';
 //# sourceMappingURL=staking-combinations.contract.d.ts.map

package/src/examples/staking-combinations.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staking-combinations.contract.d.ts","sourceRoot":"","sources":["staking-combinations.contract.js"],"names":[],"mappings":"AA8HA;iBArFkB,OAAO,OAAO,CAAC;gBAChB,OAAO,UAAU,CAAC;0BACR,OAAO,uBAAuB,CAAC;iBACxC,OAAO,WAAW,CAAC;gBACpB,UAAU;kBACR,OAAO,YAAY,CAAC;;;;;;;GAgFU;6BA1GvB,cAAc;4BAEf,kBAAkB;gCAHd,gCAAgC;6CAKnB,2BAA2B;kCANtC,cAAc;2CADL,mCAAmC;yBAIrD,aAAa"}
+{"version":3,"file":"staking-combinations.contract.d.ts","sourceRoot":"","sources":["staking-combinations.contract.js"],"names":[],"mappings":"AA+JA;gBA1HiB,UAAU;;;;;;;;;;;;;;;;;;GA0HsB;yCA3IS,0BAA0B"}

package/src/examples/staking-combinations.contract.js

@@ -5,26 +5,22 @@
  *   The primary offer result is a power for invitation makers that can perform
  *   actions with an ICA account.
  */
+import { makeSharedStateRecord } from '@agoric/async-flow';
 import { AmountShape } from '@agoric/ertp';
 import { M } from '@endo/patterns';
 import { prepareCombineInvitationMakers } from '../exos/combine-invitation-makers.js';
-import { CosmosOrchestrationInvitationMakersInterface } from '../exos/cosmos-orchestration-account.js';
+import { CosmosOrchestrationInvitationMakersI } from '../exos/cosmos-orchestration-account.js';
+import { ChainAddressShape, DelegationShape } from '../typeGuards.js';
 import { withOrchestration } from '../utils/start-helper.js';
 import * as flows from './staking-combinations.flows.js';
+import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
 
 /**
  * @import {GuestInterface} from '@agoric/async-flow';
- * @import {Delegation} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
- * @import {ContinuingOfferResult} from '@agoric/smart-wallet/src/types.js';
- * @import {TimerService} from '@agoric/time';
- * @import {LocalChain} from '@agoric/vats/src/localchain.js';
- * @import {NameHub} from '@agoric/vats';
- * @import {Vow} from '@agoric/vow';
- * @import {Remote} from '@agoric/internal';
  * @import {Zone} from '@agoric/zone';
- * @import {CosmosInterchainService} from '../exos/exo-interfaces.js';
- * @import {OrchestrationTools} from '../utils/start-helper.js';
+ * @import {OrchestrationTools, OrchestrationPowers} from '../utils/start-helper.js';
  * @import {CosmosOrchestrationAccount} from '../exos/cosmos-orchestration-account.js';
+ * @import {AmountArg, ChainAddress, CosmosValidatorAddress} from '../types.js';
  */
 
 const emptyOfferShape = harden({
@@ -38,26 +34,43 @@ const emptyOfferShape = harden({
  * Orchestration contract to be wrapped by withOrchestration for Zoe.
  *
  * @param {ZCF} zcf
- * @param {{
- *   agoricNames: Remote<NameHub>;
- *   localchain: Remote<LocalChain>;
- *   orchestrationService: Remote<CosmosInterchainService>;
- *   storageNode: Remote<StorageNode>;
+ * @param {OrchestrationPowers & {
  *   marshaller: Marshaller;
- *   timerService: Remote<TimerService>;
  * }} privateArgs
  * @param {Zone} zone
  * @param {OrchestrationTools} tools
  */
-const contract = async (zcf, privateArgs, zone, { orchestrateAll }) => {
-  const ExtraInvitationMakerInterface = M.interface('', {
-    DepositAndDelegate: M.call(M.array()).returns(M.promise()),
-    UndelegateAndTransfer: M.call(M.array()).returns(M.promise()),
-  });
+const contract = async (
+  zcf,
+  privateArgs,
+  zone,
+  { orchestrateAll, zoeTools, chainHub },
+) => {
+  const contractState = makeSharedStateRecord(
+    /**
+     * @type {{
+     *   account: (OrchestrationAccount<any> & LocalAccountMethods) | undefined;
+     * }}
+     */ {
+      localAccount: undefined,
+    },
+  );
+
+  const StakingCombinationsInvitationMakersI = M.interface(
+    'StakingCombinationsInvitationMakersI',
+    {
+      DepositAndDelegate: M.call().returns(M.promise()),
+      UndelegateAndTransfer: M.call(
+        M.arrayOf(DelegationShape),
+        ChainAddressShape,
+      ).returns(M.promise()),
+    },
+  );
+
   /** @type {any} XXX async membrane */
   const makeExtraInvitationMaker = zone.exoClass(
-    'ContinuingInvitationExampleInvitationMakers',
-    ExtraInvitationMakerInterface,
+    'StakingCombinationsInvitationMakers',
+    StakingCombinationsInvitationMakersI,
     /** @param {GuestInterface<CosmosOrchestrationAccount>} account */
     account => {
       return { account };
@@ -67,27 +80,39 @@ const contract = async (zcf, privateArgs, zone, { orchestrateAll }) => {
         const { account } = this.state;
 
         return zcf.makeInvitation(
-          (seat, validatorAddr, amountArg) =>
+          /**
+           * @param {ZCFSeat} seat
+           * @param {{ validator: CosmosValidatorAddress }} offerArgs
+           */
+          (seat, { validator }) =>
             // eslint-disable-next-line no-use-before-define -- defined by orchestrateAll, necessarily after this
-            orchFns.depositAndDelegate(account, seat, validatorAddr, amountArg),
+            orchFns.depositAndDelegate(account, seat, validator),
           'Deposit and delegate',
           undefined,
           {
             give: {
               Stake: AmountShape,
             },
+            want: {},
+            // user cannot exit their seat; contract must exit it.
+            exit: { waived: M.null() },
           },
         );
       },
       /**
-       * @param {Omit<Delegation, 'delegatorAddress'>[]} delegations
+       * @param {{ amount: AmountArg; validator: CosmosValidatorAddress }[]} delegations
+       * @param {ChainAddress} destination
        */
-      UndelegateAndTransfer(delegations) {
+      UndelegateAndTransfer(delegations, destination) {
         const { account } = this.state;
 
         return zcf.makeInvitation(
-          // eslint-disable-next-line no-use-before-define -- defined by orchestrateAll, necessarily after this
-          () => orchFns.undelegateAndTransfer(account, delegations),
+          () =>
+            // eslint-disable-next-line no-use-before-define -- defined by orchestrateAll, necessarily after this
+            orchFns.undelegateAndTransfer(account, {
+              delegations,
+              destination,
+            }),
           'Undelegate and transfer',
           undefined,
           emptyOfferShape,
@@ -99,17 +124,25 @@ const contract = async (zcf, privateArgs, zone, { orchestrateAll }) => {
   /** @type {any} XXX async membrane */
   const makeCombineInvitationMakers = prepareCombineInvitationMakers(
     zone,
-    CosmosOrchestrationInvitationMakersInterface,
-    ExtraInvitationMakerInterface,
+    CosmosOrchestrationInvitationMakersI,
+    StakingCombinationsInvitationMakersI,
   );
 
   const orchFns = orchestrateAll(flows, {
+    contractState,
     makeCombineInvitationMakers,
     makeExtraInvitationMaker,
     flows,
     zcf,
+    zoeTools,
   });
 
+  /**
+   * Provide invitations to contract deployer for registering assets and chains
+   * in the local ChainHub for this contract.
+   */
+  const creatorFacet = prepareChainHubAdmin(zone, chainHub);
+
   const publicFacet = zone.exo('publicFacet', undefined, {
     makeAccount() {
       return zcf.makeInvitation(
@@ -121,7 +154,7 @@ const contract = async (zcf, privateArgs, zone, { orchestrateAll }) => {
     },
   });
 
-  return harden({ publicFacet });
+  return harden({ publicFacet, creatorFacet });
 };
 
 export const start = withOrchestration(contract);

package/src/examples/staking-combinations.flows.d.ts

@@ -4,15 +4,29 @@ export function makeAccount(orch: Orchestrator, ctx: {
 }, _seat: ZCFSeat, { chainName }: {
     chainName: string;
 }): Promise<ContinuingOfferResult>;
-export function depositAndDelegate(orch: Orchestrator, ctx: object, account: GuestInterface<CosmosOrchestrationAccount>, seat: ZCFSeat, validator: CosmosValidatorAddress, amount: AmountArg): Promise<string>;
-export function undelegateAndTransfer(orch: Orchestrator, ctx: object, account: GuestInterface<CosmosOrchestrationAccount>, delegations: Omit<Delegation, "delegatorAddress">[]): Promise<string>;
+export function depositAndDelegate(orch: Orchestrator, { contractState, zoeTools }: {
+    contractState: {
+        localAccount?: OrchestrationAccountI & LocalAccountMethods;
+    };
+    zoeTools: GuestInterface<ZoeTools>;
+}, account: GuestInterface<CosmosOrchestrationAccount>, seat: ZCFSeat, validator: CosmosValidatorAddress): Promise<void>;
+export function undelegateAndTransfer(orch: Orchestrator, ctx: object, account: GuestInterface<CosmosOrchestrationAccount>, { delegations, destination }: {
+    delegations: {
+        amount: AmountArg;
+        validator: CosmosValidatorAddress;
+    }[];
+    destination: ChainAddress;
+}): Promise<void>;
 import type { Orchestrator } from '../types.js';
 import type { MakeCombineInvitationMakers } from '../exos/combine-invitation-makers.js';
 import type { InvitationMakers } from '@agoric/smart-wallet/src/types.js';
 import type { ContinuingOfferResult } from '@agoric/smart-wallet/src/types.js';
-import type { CosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
+import type { OrchestrationAccountI } from '../types.js';
+import type { LocalAccountMethods } from '../types.js';
+import type { ZoeTools } from '../utils/zoe-tools.js';
 import type { GuestInterface } from '@agoric/async-flow';
+import type { CosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
 import type { CosmosValidatorAddress } from '../types.js';
 import type { AmountArg } from '../types.js';
-import type { Delegation } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
+import type { ChainAddress } from '../types.js';
 //# sourceMappingURL=staking-combinations.flows.d.ts.map

package/src/examples/staking-combinations.flows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staking-combinations.flows.d.ts","sourceRoot":"","sources":["staking-combinations.flows.js"],"names":[],"mappings":"AAoBO,kCATI,YAAY,OACZ;IACV,2BAA+B,EAAE,2BAA2B,CAAC;IAC7D,wBAA4B,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,gBAAgB,CAAC;CAC9D,SACO,OAAO,iBACP;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACnB,OAAO,CAAC,qBAAqB,CAAC,CAkB1C;AAaM,yCARI,YAAY,OACZ,MAAM,WACN,eAAe,0BAA0B,CAAC,QAC1C,OAAO,aACP,sBAAsB,UACtB,SAAS,GACP,OAAO,CAAC,MAAM,CAAC,CAc3B;AAWM,4CANI,YAAY,OACZ,MAAM,WACN,eAAe,0BAA0B,CAAC,eAC1C,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE,GACpC,OAAO,CAAC,MAAM,CAAC,CAW3B;kCA/EwJ,aAAa;iDAExH,sCAAsC;sCAD1B,mCAAmC;2CAAnC,mCAAmC;gDAGhD,yCAAyC;oCALrD,oBAAoB;4CACoG,aAAa;+BAAb,aAAa;gCAGzI,wDAAwD"}
+{"version":3,"file":"staking-combinations.flows.d.ts","sourceRoot":"","sources":["staking-combinations.flows.js"],"names":[],"mappings":"AA2BO,kCATI,YAAY,OACZ;IACV,2BAA+B,EAAE,2BAA2B,CAAC;IAC7D,wBAA4B,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,gBAAgB,CAAC;CAC9D,SACO,OAAO,iBACP;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACnB,OAAO,CAAC,qBAAqB,CAAC,CAkB1C;AAcM,yCATI,YAAY,+BAEpB;IAA4E,aAAa,EAAjF;QAAE,YAAY,CAAC,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;KAAE;IAChC,QAAQ,EAAtC,eAAe,QAAQ,CAAC;CAChC,WAAQ,eAAe,0BAA0B,CAAC,QAC1C,OAAO,aACP,sBAAsB,GACpB,OAAO,CAAC,IAAI,CAAC,CA6BzB;AAcM,4CATI,YAAY,OACZ,MAAM,WACN,eAAe,0BAA0B,CAAC,gCAC1C;IACV,WAAe,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,sBAAsB,CAAA;KAAE,EAAE,CAAC;IAC5E,WAAe,EAAE,YAAY,CAAC;CAC3B,GACS,OAAO,CAAC,IAAI,CAAC,CAYzB;kCA1G8I,aAAa;iDAE9G,sCAAsC;sCAD1B,mCAAmC;2CAAnC,mCAAmC;2CADkD,aAAa;yCAAb,aAAa;8BAIjI,uBAAuB;oCALjB,oBAAoB;gDAIR,yCAAyC;4CAHyD,aAAa;+BAAb,aAAa;kCAAb,aAAa"}

package/src/examples/staking-combinations.flows.js

@@ -1,12 +1,19 @@
 /**
  * @import {GuestInterface} from '@agoric/async-flow';
- * @import {Orchestrator, OrchestrationFlow, OrchestrationAccount, OrchestrationAccountI, StakingAccountActions, AmountArg, CosmosValidatorAddress} from '../types.js'
+ * @import {Orchestrator, OrchestrationFlow, AmountArg, CosmosValidatorAddress, ChainAddress, LocalAccountMethods, OrchestrationAccountI} from '../types.js'
  * @import {ContinuingOfferResult, InvitationMakers} from '@agoric/smart-wallet/src/types.js';
  * @import {MakeCombineInvitationMakers} from '../exos/combine-invitation-makers.js';
- * @import {Delegation} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
  * @import {CosmosOrchestrationAccount} from '../exos/cosmos-orchestration-account.js';
+ * @import {ZoeTools} from '../utils/zoe-tools.js';
  */
 
+import { mustMatch } from '@endo/patterns';
+import { makeError } from '@endo/errors';
+import { makeTracer } from '@agoric/internal';
+import { ChainAddressShape } from '../typeGuards.js';
+
+const trace = makeTracer('StakingCombinationsFlows');
+
 /**
  * @satisfies {OrchestrationFlow}
  * @param {Orchestrator} orch
@@ -41,24 +48,40 @@ harden(makeAccount);
  * @satisfies {OrchestrationFlow}
  * @param {Orchestrator} orch
  * @param {object} ctx
+ * @param {{ localAccount?: OrchestrationAccountI & LocalAccountMethods }} ctx.contractState
+ * @param {GuestInterface<ZoeTools>} ctx.zoeTools
  * @param {GuestInterface<CosmosOrchestrationAccount>} account
  * @param {ZCFSeat} seat
  * @param {CosmosValidatorAddress} validator
- * @param {AmountArg} amount
- * @returns {Promise<string>}
+ * @returns {Promise<void>}
  */
 export const depositAndDelegate = async (
   orch,
-  ctx,
+  { contractState, zoeTools },
   account,
   seat,
   validator,
-  amount,
 ) => {
-  console.log('depositAndDelegate', account, seat, validator, amount);
-  // TODO deposit the amount
-  await account.delegate(validator, amount);
-  return 'guest depositAndDelegate complete';
+  await null;
+  trace('depositAndDelegate', account, seat, validator);
+  mustMatch(validator, ChainAddressShape);
+  if (!contractState.localAccount) {
+    const agoricChain = await orch.getChain('agoric');
+    contractState.localAccount = await agoricChain.makeAccount();
+  }
+  const { give } = seat.getProposal();
+  await zoeTools.localTransfer(seat, contractState.localAccount, give);
+
+  const address = account.getAddress();
+  try {
+    await contractState.localAccount.transfer(give.Stake, address);
+  } catch (cause) {
+    // TODO, put funds back on user seat and exit
+    // https://github.com/Agoric/agoric-sdk/issues/9925
+    throw makeError('ibc transfer failed', undefined, { cause });
+  }
+  seat.exit();
+  await account.delegate(validator, give.Stake);
 };
 harden(depositAndDelegate);
 
@@ -67,17 +90,21 @@ harden(depositAndDelegate);
  * @param {Orchestrator} orch
  * @param {object} ctx
  * @param {GuestInterface<CosmosOrchestrationAccount>} account
- * @param {Omit<Delegation, 'delegatorAddress'>[]} delegations
- * @returns {Promise<string>}
+ * @param {{
+ *   delegations: { amount: AmountArg; validator: CosmosValidatorAddress }[];
+ *   destination: ChainAddress;
+ * }} offerArgs
+ * @returns {Promise<void>}
  */
 export const undelegateAndTransfer = async (
   orch,
   ctx,
   account,
-  delegations,
+  { delegations, destination },
 ) => {
   await account.undelegate(delegations);
-  // TODO transfer something
-  return 'guest undelegateAndTransfer complete';
+  for (const { amount } of delegations) {
+    await account.transfer(amount, destination);
+  }
 };
 harden(undelegateAndTransfer);

package/src/exos/README.md

@@ -108,7 +108,6 @@ classDiagram
 
     class CosmosOrchestrationAccount {
       account: LocalChainAccount
-      bondDenom: string
       chainAddress: ChainAddress
       icqConnection: ICQConnection | undefined
       timer: Timer

package/src/exos/chain-hub-admin.d.ts

@@ -6,7 +6,7 @@ export function prepareChainHubAdmin(zone: Zone, chainHub: ChainHub): import("@e
      * @param {CosmosChainInfo} chainInfo
      * @param {IBCConnectionInfo} connectionInfo - from Agoric chain
      */
-    initChain(chainName: string, chainInfo: CosmosChainInfo, connectionInfo: IBCConnectionInfo): Promise<void>;
+    registerChain(chainName: string, chainInfo: CosmosChainInfo, connectionInfo: IBCConnectionInfo): Promise<void>;
     /**
      * Register an asset that may be held on a chain other than the issuing
      * chain.
@@ -25,7 +25,7 @@ export type ChainHubAdmin = ReturnType<(zone: Zone, chainHub: ChainHub) => impor
      * @param {CosmosChainInfo} chainInfo
      * @param {IBCConnectionInfo} connectionInfo - from Agoric chain
      */
-    initChain(chainName: string, chainInfo: CosmosChainInfo, connectionInfo: IBCConnectionInfo): Promise<void>;
+    registerChain(chainName: string, chainInfo: CosmosChainInfo, connectionInfo: IBCConnectionInfo): Promise<void>;
     /**
      * Register an asset that may be held on a chain other than the issuing
      * chain.

package/src/exos/chain-hub-admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain-hub-admin.d.ts","sourceRoot":"","sources":["chain-hub-admin.js"],"names":[],"mappings":"AAgCO,2CAHI,IAAI,YACJ,QAAQ;IAeb;;;;;;OAMG;yBAHQ,MAAM,aACN,eAAe,kBACf,iBAAiB;IAe5B;;;;;;;OAOG;yBAHQ,KAAK,UAEL,WAAW;GAU3B;4BAEa,UAAU,QAtDb,IAAI,YACJ,QAAQ;IAeb;;;;;;OAMG;yBAHQ,MAAM,aACN,eAAe,kBACf,iBAAiB;IAe5B;;;;;;;OAOG;yBAHQ,KAAK,UAEL,WAAW;GAYkB;0BA3EvB,cAAc;8BAEG,gBAAgB;qCADI,uBAAuB;uCAAvB,uBAAuB;2BAAvB,uBAAuB;iCAC3C,gBAAgB"}
+{"version":3,"file":"chain-hub-admin.d.ts","sourceRoot":"","sources":["chain-hub-admin.js"],"names":[],"mappings":"AAgCO,2CAHI,IAAI,YACJ,QAAQ;IAeb;;;;;;OAMG;6BAHQ,MAAM,aACN,eAAe,kBACf,iBAAiB;IAe5B;;;;;;;OAOG;yBAHQ,KAAK,UAEL,WAAW;GAU3B;4BAEa,UAAU,QAtDb,IAAI,YACJ,QAAQ;IAeb;;;;;;OAMG;6BAHQ,MAAM,aACN,eAAe,kBACf,iBAAiB;IAe5B;;;;;;;OAOG;yBAHQ,KAAK,UAEL,WAAW;GAYkB;0BA3EvB,cAAc;8BAEG,gBAAgB;qCADI,uBAAuB;uCAAvB,uBAAuB;2BAAvB,uBAAuB;iCAC3C,gBAAgB"}

package/src/exos/chain-hub-admin.js

@@ -35,7 +35,7 @@ export const prepareChainHubAdmin = (zone, chainHub) => {
   const makeCreatorFacet = zone.exo(
     'ChainHub Admin',
     M.interface('ChainHub Admin', {
-      initChain: M.callWhen(
+      registerChain: M.callWhen(
         M.string(),
         CosmosChainInfoShape,
         ConnectionInfoShape,
@@ -50,7 +50,7 @@ export const prepareChainHubAdmin = (zone, chainHub) => {
        * @param {CosmosChainInfo} chainInfo
        * @param {IBCConnectionInfo} connectionInfo - from Agoric chain
        */
-      async initChain(chainName, chainInfo, connectionInfo) {
+      async registerChain(chainName, chainInfo, connectionInfo) {
         // when() because chainHub methods return vows. If this were inside
         // orchestrate() the membrane would wrap/unwrap automatically.
         const agoricChainInfo = await heapVowE.when(

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

@@ -11,7 +11,6 @@
  *   localAddress: LocalIbcAddress;
  *   remoteAddress: RemoteIbcAddress;
  *   icqConnection: ICQConnection | undefined;
- *   bondDenom: string;
  *   timer: Remote<TimerService>;
  * }} State
  *   Internal to the IcaAccountHolder exo
@@ -41,7 +40,7 @@ export const IcaAccountHolderI: import("@endo/patterns").InterfaceGuard<{
     asContinuingOffer: import("@endo/patterns").MethodGuard;
     getPublicTopics: import("@endo/patterns").MethodGuard;
 }>;
-export const CosmosOrchestrationInvitationMakersInterface: import("@endo/patterns").InterfaceGuard<{
+export const CosmosOrchestrationInvitationMakersI: import("@endo/patterns").InterfaceGuard<{
     Delegate: import("@endo/patterns").MethodGuard;
     Redelegate: import("@endo/patterns").MethodGuard;
     WithdrawReward: import("@endo/patterns").MethodGuard;
@@ -61,7 +60,6 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
     zcf: ZCF;
 }): (args_0: {
     chainAddress: ChainAddress;
-    bondDenom: string;
     localAddress: LocalIbcAddress;
     remoteAddress: RemoteIbcAddress;
 }, io: {
@@ -144,8 +142,16 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         Redelegate(srcValidator: CosmosValidatorAddress, dstValidator: CosmosValidatorAddress, amount: AmountArg): Promise<Invitation<Vow<void>, undefined>>;
         /** @param {CosmosValidatorAddress} validator */
         WithdrawReward(validator: CosmosValidatorAddress): Promise<Invitation<Vow<DenomAmount[]>, undefined>>;
-        /** @param {Omit<Delegation, 'delegatorAddress'>[]} delegations */
-        Undelegate(delegations: Omit<Delegation, "delegatorAddress">[]): Promise<Invitation<Vow<void>, undefined>>;
+        /**
+         * @param {{
+         *   amount: AmountArg;
+         *   validator: CosmosValidatorAddress;
+         * }[]} delegations
+         */
+        Undelegate(delegations: {
+            amount: AmountArg;
+            validator: CosmosValidatorAddress;
+        }[]): Promise<Invitation<Vow<void>, undefined>>;
         DeactivateAccount(): Promise<Invitation<Vow<void>, undefined>>;
         ReactivateAccount(): Promise<Invitation<Vow<void>, undefined>>;
         Send(): Promise<Invitation<Vow<void>, {
@@ -196,7 +202,10 @@ export function prepareCosmosOrchestrationAccountKit(zone: Zone, { chainHub, mak
         /** @type {HostOf<StakingAccountActions['withdrawRewards']>} */
         withdrawRewards(): Vow<DenomAmount[] extends import("@endo/pass-style").Passable ? DenomAmount[] : import("@agoric/async-flow").HostInterface<DenomAmount[]>>;
         /** @type {HostOf<StakingAccountActions['undelegate']>} */
-        undelegate(delegations: Omit<Delegation, "delegatorAddress">[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
+        undelegate(delegations: {
+            amount: AmountArg;
+            validator: CosmosValidatorAddress;
+        }[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
         /** @type {HostOf<IcaAccount['deactivate']>} */
         deactivate(): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
         /** @type {HostOf<IcaAccount['reactivate']>} */
@@ -223,7 +232,6 @@ export type State = {
     localAddress: LocalIbcAddress;
     remoteAddress: RemoteIbcAddress;
     icqConnection: ICQConnection | undefined;
-    bondDenom: string;
     timer: Remote<TimerService>;
 };
 export type CosmosOrchestrationAccountStorageState = {
@@ -252,6 +260,5 @@ import type { Vow } from '@agoric/vow';
 import type { IBCConnectionInfo } from '../types.js';
 import type { IBCMsgTransferOptions } from '../types.js';
 import type { CosmosValidatorAddress } from '../types.js';
-import type { Delegation } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.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":"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"}
+{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"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"}

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

@@ -77,7 +77,6 @@ const { Vow$ } = NetworkShape; // TODO #9611
  *   localAddress: LocalIbcAddress;
  *   remoteAddress: RemoteIbcAddress;
  *   icqConnection: ICQConnection | undefined;
- *   bondDenom: string;
  *   timer: Remote<TimerService>;
  * }} State
  *   Internal to the IcaAccountHolder exo
@@ -113,7 +112,7 @@ const PUBLIC_TOPICS = {
   account: ['Staking Account holder status', M.any()],
 };
 
-export const CosmosOrchestrationInvitationMakersInterface = M.interface(
+export const CosmosOrchestrationInvitationMakersI = M.interface(
   'invitationMakers',
   {
     Delegate: M.call(ChainAddressShape, AmountArgShape).returns(M.promise()),
@@ -132,7 +131,7 @@ export const CosmosOrchestrationInvitationMakersInterface = M.interface(
     Transfer: M.call().returns(M.promise()),
   },
 );
-harden(CosmosOrchestrationInvitationMakersInterface);
+harden(CosmosOrchestrationInvitationMakersI);
 
 /**
  * @param {Zone} zone
@@ -200,12 +199,11 @@ export const prepareCosmosOrchestrationAccountKit = (
           .returns(Vow$(M.record())),
       }),
       holder: IcaAccountHolderI,
-      invitationMakers: CosmosOrchestrationInvitationMakersInterface,
+      invitationMakers: CosmosOrchestrationInvitationMakersI,
     },
     /**
      * @param {object} info
      * @param {ChainAddress} info.chainAddress
-     * @param {string} info.bondDenom e.g. 'uatom'
      * @param {LocalIbcAddress} info.localAddress
      * @param {RemoteIbcAddress} info.remoteAddress
      * @param {object} io
@@ -215,7 +213,7 @@ export const prepareCosmosOrchestrationAccountKit = (
      * @param {Remote<TimerService>} io.timer
      * @returns {State}
      */
-    ({ chainAddress, bondDenom, localAddress, remoteAddress }, io) => {
+    ({ chainAddress, localAddress, remoteAddress }, io) => {
       const { storageNode } = io;
       // must be the fully synchronous maker because the kit is held in durable state
       const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
@@ -233,7 +231,6 @@ export const prepareCosmosOrchestrationAccountKit = (
       const { account, icqConnection, timer } = io;
       return {
         account,
-        bondDenom,
         chainAddress,
         icqConnection,
         localAddress,
@@ -407,16 +404,19 @@ export const prepareCosmosOrchestrationAccountKit = (
         /** @param {CosmosValidatorAddress} validator */
         WithdrawReward(validator) {
           trace('WithdrawReward', validator);
-
           return zcf.makeInvitation(seat => {
             seat.exit();
             return watch(this.facets.holder.withdrawReward(validator));
           }, 'WithdrawReward');
         },
-        /** @param {Omit<Delegation, 'delegatorAddress'>[]} delegations */
+        /**
+         * @param {{
+         *   amount: AmountArg;
+         *   validator: CosmosValidatorAddress;
+         * }[]} delegations
+         */
         Undelegate(delegations) {
           trace('Undelegate', delegations);
-
           return zcf.makeInvitation(seat => {
             seat.exit();
             return watch(this.facets.holder.undelegate(delegations));
@@ -537,10 +537,9 @@ export const prepareCosmosOrchestrationAccountKit = (
           return asVow(() => {
             trace('delegate', validator, amount);
             const { helper } = this.facets;
-            const { chainAddress, bondDenom } = this.state;
+            const { chainAddress } = this.state;
 
             const amountAsCoin = helper.amountToCoin(amount);
-            assert.equal(amountAsCoin.denom, bondDenom);
 
             const results = E(helper.owned()).executeEncodedTx([
               Any.toJSON(
@@ -725,16 +724,16 @@ export const prepareCosmosOrchestrationAccountKit = (
           return asVow(() => {
             trace('undelegate', delegations);
             const { helper } = this.facets;
-            const { chainAddress, bondDenom } = this.state;
+            const { chainAddress } = this.state;
 
             const undelegateV = watch(
               E(helper.owned()).executeEncodedTx(
-                delegations.map(d =>
+                delegations.map(({ validator, amount }) =>
                   Any.toJSON(
                     MsgUndelegate.toProtoMsg({
                       delegatorAddress: chainAddress.value,
-                      validatorAddress: d.validatorAddress,
-                      amount: { denom: bondDenom, amount: d.shares },
+                      validatorAddress: validator.value,
+                      amount: coerceCoin(chainHub, amount),
                     }),
                   ),
                 ),

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

@@ -43,7 +43,10 @@ export function prepareRemoteChainFacade(zone: Zone, powers: RemoteChainFacadePo
             transfer(amount: import("../orchestration-api.js").AmountArg, destination: ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             withdrawRewards(): Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
-            undelegate(delegations: Omit<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js").Delegation, "delegatorAddress">[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
+            undelegate(delegations: {
+                amount: import("../orchestration-api.js").AmountArg;
+                validator: import("../cosmos-api.js").CosmosValidatorAddress;
+            }[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             deactivate(): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             reactivate(): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
         }>>;
@@ -75,7 +78,10 @@ export function prepareRemoteChainFacade(zone: Zone, powers: RemoteChainFacadePo
             transfer(amount: import("../orchestration-api.js").AmountArg, destination: ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             withdrawRewards(): Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
-            undelegate(delegations: Omit<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js").Delegation, "delegatorAddress">[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
+            undelegate(delegations: {
+                amount: import("../orchestration-api.js").AmountArg;
+                validator: import("../cosmos-api.js").CosmosValidatorAddress;
+            }[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             deactivate(): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             reactivate(): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
         }>>;
@@ -109,7 +115,10 @@ export function prepareRemoteChainFacade(zone: Zone, powers: RemoteChainFacadePo
             transfer(amount: import("../orchestration-api.js").AmountArg, destination: ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             withdrawRewards(): Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
-            undelegate(delegations: Omit<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js").Delegation, "delegatorAddress">[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
+            undelegate(delegations: {
+                amount: import("../orchestration-api.js").AmountArg;
+                validator: import("../cosmos-api.js").CosmosValidatorAddress;
+            }[]): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             deactivate(): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
             reactivate(): Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
         }>;

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":"AAwQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;QAhJ1B,4CAA4C;;QAK5C,2CAA2C;;QA0B3C;;;;WAIG;;;;QAuBH;;WAEG;8CADQ,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;QAmBlD;;;;WAIG;mCAHQ,aAAa,QACb,SAAS,YAAY,CAAC,EAAE,GACtB,IAAI,SAAS,aAAa,CAAC,EAAE,CAAC;;;QAU3C;;;WAGG;iEAFQ,CAAC,YAAY,EAAE,eAAe,EAAE,gBAAgB,CAAC,WACjD,UAAU;;;;;;;;;;;;;;;;;;;;QAWrB;;;;;;;;WAQG;+BAPQ,OAAO,WAAW,CAAC,0DACnB;YACV,OAAW,EAAE,UAAU,CAAC;YACxB,YAAgB,EAAE,YAAY,CAAC;YAC/B,YAAgB,EAAE,eAAe,CAAC;YAClC,aAAiB,EAAE,gBAAgB,CAAC;SACjC;;;;;;;;;;;;;;;;;;;cAsCX;sCA7OY;IACZ,8BAAkC,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACN,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,QAAY,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACZ,eAAmB,EAAE,eAAe,CAAC;IACrC,cAAkB,EAAE,iBAAiB,CAAC;IACtC,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCAgOU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BAhQxB,mBAAmB;uCAS2D,aAAa;yBAJlF,aAAa;kCAHC,+CAA+C;8BADlE,sBAAsB;mCACH,+CAA+C;gCAOQ,aAAa;mCAAb,aAAa;kCAAb,aAAa;qCAH9D,iCAAiC;sCAAjC,iCAAiC;4BAF5D,kBAAkB;uDAIS,mCAAmC;6CAD7C,qBAAqB;kCAJhC,cAAc;8BAEb,aAAa;qCAIwD,aAAa"}
+{"version":3,"file":"remote-chain-facade.d.ts","sourceRoot":"","sources":["remote-chain-facade.js"],"names":[],"mappings":"AAqQO,+CAHI,IAAI,UACJ,uBAAuB;;;;;;;;;;;;;;;;QA7I1B,4CAA4C;;QAK5C,2CAA2C;;QA0B3C;;;;WAIG;;;;QAuBH;;WAEG;8CADQ,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;QAmBlD;;;;WAIG;mCAHQ,aAAa,QACb,SAAS,YAAY,CAAC,EAAE,GACtB,IAAI,SAAS,aAAa,CAAC,EAAE,CAAC;;;QAU3C;;;WAGG;iEAFQ,CAAC,YAAY,EAAE,eAAe,EAAE,gBAAgB,CAAC,WACjD,UAAU;;;;;;;;;;;;;;;;;;;;;;;QAWrB;;;;;;;;WAQG;+BAPQ,OAAO,WAAW,CAAC,0DACnB;YACV,OAAW,EAAE,UAAU,CAAC;YACxB,YAAgB,EAAE,YAAY,CAAC;YAC/B,YAAgB,EAAE,eAAe,CAAC;YAClC,aAAiB,EAAE,gBAAgB,CAAC;SACjC;;;;;;;;;;;;;;;;;;;;;;cAmCX;sCA1OY;IACZ,8BAAkC,EAAE,UAAU,CAC9C,wCAA8C,CACzC,CAAC;IACN,aAAiB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACnD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,QAAY,EAAE,QAAQ,CAAC;CACpB;qCAIS;IACZ,eAAmB,EAAE,eAAe,CAAC;IACrC,cAAkB,EAAE,iBAAiB,CAAC;IACtC,aAAiB,EAAE,aAAa,GAAG,SAAS,CAAC;CAC1C;oCA6NU,UAAU,CAAC,OAAO,wBAAwB,CAAC;gCAC3C,UAAU,CAAC,qBAAqB,CAAC;0BA7PxB,mBAAmB;uCAS2D,aAAa;yBAJlF,aAAa;kCAHC,+CAA+C;8BADlE,sBAAsB;mCACH,+CAA+C;gCAOQ,aAAa;mCAAb,aAAa;kCAAb,aAAa;qCAH9D,iCAAiC;sCAAjC,iCAAiC;4BAF5D,kBAAkB;uDAIS,mCAAmC;6CAD7C,qBAAqB;kCAJhC,cAAc;8BAEb,aAAa;qCAIwD,aAAa"}

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

@@ -233,14 +233,11 @@ const prepareRemoteChainFacadeKit = (
           childNode,
           { account, chainAddress, localAddress, remoteAddress },
         ) {
-          const { remoteChainInfo, icqConnection } = this.state;
-          const stakingDenom = remoteChainInfo.stakingTokens?.[0]?.denom;
-          if (!stakingDenom) throw Fail`chain info lacks staking denom`;
+          const { icqConnection } = this.state;
 
           return makeCosmosOrchestrationAccount(
             {
               chainAddress,
-              bondDenom: stakingDenom,
               localAddress,
               remoteAddress,
             },

package/src/proposals/start-stakeAtom.d.ts

@@ -23,7 +23,10 @@ export function startStakeAtom({ consume: { agoricNames, board, chainStorage, ch
                         transfer(amount: import("../orchestration-api.js").AmountArg, destination: import("../orchestration-api.js").ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         withdrawRewards(): import("@agoric/vow").Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
-                        undelegate(delegations: Omit<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js").Delegation, "delegatorAddress">[]): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
+                        undelegate(delegations: {
+                            amount: import("../orchestration-api.js").AmountArg;
+                            validator: import("../cosmos-api.js").CosmosValidatorAddress;
+                        }[]): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         deactivate(): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         reactivate(): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                     }>>;

package/src/proposals/start-stakeAtom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-stakeAtom.d.ts","sourceRoot":"","sources":["start-stakeAtom.js"],"names":[],"mappings":"AAyBO,0PAVI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;CACH,iBAwDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN;mCArG4C,+BAA+B"}
+{"version":3,"file":"start-stakeAtom.d.ts","sourceRoot":"","sources":["start-stakeAtom.js"],"names":[],"mappings":"AAyBO,0PAVI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;CACH,iBAuDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN;mCApG4C,+BAA+B"}

package/src/proposals/start-stakeAtom.js

@@ -61,7 +61,6 @@ export const startStakeAtom = async ({
       chainId: cosmoshub.chainId,
       hostConnectionId: connectionInfo.counterparty.connection_id,
       controllerConnectionId: connectionInfo.id,
-      bondDenom: cosmoshub.stakingTokens[0].denom,
       icqEnabled: cosmoshub.icqEnabled,
     },
     privateArgs: await deeplyFulfilledObject(

package/src/proposals/start-stakeOsmo.d.ts

@@ -23,7 +23,10 @@ export function startStakeOsmo({ consume: { agoricNames, board, chainStorage, ch
                         transfer(amount: import("../orchestration-api.js").AmountArg, destination: import("../orchestration-api.js").ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         transferSteps(amount: import("../orchestration-api.js").AmountArg, msg: import("../orchestration-api.js").TransferMsg): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         withdrawRewards(): import("@agoric/vow").Vow<import("../orchestration-api.js").DenomAmount[] extends import("@endo/pass-style").Passable ? import("../orchestration-api.js").DenomAmount[] : import("@agoric/async-flow").HostInterface<import("../orchestration-api.js").DenomAmount[]>>;
-                        undelegate(delegations: Omit<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js").Delegation, "delegatorAddress">[]): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
+                        undelegate(delegations: {
+                            amount: import("../orchestration-api.js").AmountArg;
+                            validator: import("../cosmos-api.js").CosmosValidatorAddress;
+                        }[]): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         deactivate(): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                         reactivate(): import("@agoric/vow").Vow<void extends import("@endo/pass-style").Passable ? void : import("@agoric/async-flow").HostInterface<void>>;
                     }>>;

package/src/proposals/start-stakeOsmo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-stakeOsmo.d.ts","sourceRoot":"","sources":["start-stakeOsmo.js"],"names":[],"mappings":"AA8BO,0PAfI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;IACN,QAAY,EAAE;QACd,OAAa,EAAE;YACf,SAAiB,EAAE,GAAG,CAAC;SAChB,CAAC;KACH,CAAC;CACH,iBAwDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN"}
+{"version":3,"file":"start-stakeOsmo.d.ts","sourceRoot":"","sources":["start-stakeOsmo.js"],"names":[],"mappings":"AA8BO,0PAfI,eAAe,GAAG;IAC5B,YAAgB,EAAE;QAClB,OAAa,EAAE;YACf,QAAgB,EAAE,YAAY,CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA0D,CACjD,CAAC;SACH,CAAC;KACH,CAAC;IACN,QAAY,EAAE;QACd,OAAa,EAAE;YACf,SAAiB,EAAE,GAAG,CAAC;SAChB,CAAC;KACH,CAAC;CACH,iBAuDH;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BN"}

package/src/proposals/start-stakeOsmo.js

@@ -66,7 +66,6 @@ export const startStakeOsmo = async ({
       chainId: osmosis.chainId,
       hostConnectionId: connectionInfo.counterparty.connection_id,
       controllerConnectionId: connectionInfo.id,
-      bondDenom: osmosis.stakingTokens[0].denom,
       icqEnabled: osmosis.icqEnabled,
     },
     privateArgs: await deeplyFulfilledObject(

package/src/typeGuards.d.ts

@@ -1,6 +1,6 @@
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomDetail, DenomInfo, AmountArg} from './types.js';
+ * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomDetail, DenomInfo, AmountArg, CosmosValidatorAddress} from './types.js';
  * @import {Any as Proto3Msg} from '@agoric/cosmic-proto/google/protobuf/any.js';
  * @import {Delegation} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
  * @import {TxBody} from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
@@ -19,8 +19,6 @@ export const OutboundConnectionHandlerI: import("@endo/patterns").InterfaceGuard
 export const ChainAddressShape: TypedPattern<ChainAddress>;
 /** @type {TypedPattern<Proto3Msg>} */
 export const Proto3Shape: TypedPattern<Proto3Msg>;
-/** @type {TypedPattern<Delegation>} */
-export const DelegationShape: TypedPattern<Delegation>;
 /** @internal */
 export const IBCTransferOptionsShape: import("@endo/patterns").Matcher;
 /** @internal */
@@ -43,8 +41,20 @@ export const DenomShape: import("@endo/patterns").Matcher;
 export const DenomInfoShape: TypedPattern<DenomInfo<any, any>>;
 /** @type {TypedPattern<DenomAmount>} */
 export const DenomAmountShape: TypedPattern<DenomAmount>;
+/** @type {TypedPattern<Amount<'nat'>>} */
+export const AnyNatAmountShape: TypedPattern<Amount<"nat">>;
 /** @type {TypedPattern<AmountArg>} */
 export const AmountArgShape: TypedPattern<AmountArg>;
+/**
+ * @type {TypedPattern<{
+ *   validator: CosmosValidatorAddress;
+ *   amount: AmountArg;
+ * }>}
+ */
+export const DelegationShape: TypedPattern<{
+    validator: CosmosValidatorAddress;
+    amount: AmountArg;
+}>;
 /** Approximately @see RequestQuery */
 export const ICQMsgShape: import("@endo/patterns").Matcher;
 /** @type {TypedPattern<TypedJson>} */
@@ -66,12 +76,12 @@ export const TxBodyOptsShape: import("@endo/patterns").Matcher;
 import type { ChainAddress } from './types.js';
 import type { TypedPattern } from '@agoric/internal';
 import type { Any as Proto3Msg } from '@agoric/cosmic-proto/google/protobuf/any.js';
-import type { Delegation } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
 import type { CosmosAssetInfo } from './types.js';
 import type { CosmosChainInfo } from './types.js';
 import type { ChainInfo } from './types.js';
 import type { DenomInfo } from './types.js';
 import type { DenomAmount } from './types.js';
 import type { AmountArg } from './types.js';
+import type { CosmosValidatorAddress } from './types.js';
 import type { TypedJson } from '@agoric/cosmic-proto';
 //# sourceMappingURL=typeGuards.d.ts.map

package/src/typeGuards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AAEH;;;;GAIG;AACH;;;GAQE;AAEF,yCAAyC;AACzC,gCADW,aAAa,YAAY,CAAC,CAKnC;AAEF,sCAAsC;AACtC,0BADW,aAAa,SAAS,CAAC,CAIhC;AAGF,uCAAuC;AACvC,8BADW,aAAa,UAAU,CAAC,CAIhC;AAEH,gBAAgB;AAChB,uEAUE;AAEF,gBAAgB;AAChB,iEAA4C;AAC5C,gBAAgB;AAChB,mEAQG;AACH,gBAAgB;AAChB,oEAA+C;AAC/C,gBAAgB;AAChB,sEAYG;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CASrC;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CAWtC;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CAG/B;AACH,sEAAuE;AACvE,0DAAqC;AAErC,gDAAgD;AAChD,6BADW,aAAa,UAAU,GAAG,EAAE,GAAG,CAAC,CAAC,CAM1C;AAEF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CACqC;AAEzE,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACgC;AAElE,sCAAsC;AACtC,2DAGE;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACmC;;;;;;;;;AAcrE;;;;GAIG;AACH,+DAQE;kCAnKiI,YAAY;kCADhH,kBAAkB;sCAEd,6CAA6C;gCACnD,wDAAwD;qCAF8C,YAAY;qCAAZ,YAAY;+BAAZ,YAAY;+BAAZ,YAAY;iCAAZ,YAAY;+BAAZ,YAAY;+BAInH,sBAAsB"}
+{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AAEH;;;;GAIG;AACH;;;GAQE;AAEF,yCAAyC;AACzC,gCADW,aAAa,YAAY,CAAC,CAKnC;AAEF,sCAAsC;AACtC,0BADW,aAAa,SAAS,CAAC,CAIhC;AAEF,gBAAgB;AAChB,uEAUE;AAEF,gBAAgB;AAChB,iEAA4C;AAC5C,gBAAgB;AAChB,mEAQG;AACH,gBAAgB;AAChB,oEAA+C;AAC/C,gBAAgB;AAChB,sEAYG;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CASrC;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CAWtC;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CAG/B;AACH,sEAAuE;AACvE,0DAAqC;AAErC,gDAAgD;AAChD,6BADW,aAAa,UAAU,GAAG,EAAE,GAAG,CAAC,CAAC,CAM1C;AAEF,wCAAwC;AACxC,+BADW,aAAa,WAAW,CAAC,CACqC;AAEzE,0CAA0C;AAC1C,gCADW,aAAa,MAAM,CAAC,KAAK,CAAC,CAAC,CAInC;AAEH,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACsC;AAExE;;;;;GAKG;AACH,8BALU,aAAa;IACtB,SAAa,EAAE,sBAAsB,CAAC;IACtC,MAAU,EAAE,SAAS,CAAC;CACnB,CAAC,CAKF;AAEH,sCAAsC;AACtC,2DAGE;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CACmC;;;;;;;;;AAcrE;;;;GAIG;AACH,+DAQE;kCA7KyJ,YAAY;kCADxI,kBAAkB;sCAEd,6CAA6C;qCAD2E,YAAY;qCAAZ,YAAY;+BAAZ,YAAY;+BAAZ,YAAY;iCAAZ,YAAY;+BAAZ,YAAY;4CAAZ,YAAY;+BAI3I,sBAAsB"}

package/src/typeGuards.js

@@ -1,10 +1,9 @@
-import { AmountShape } from '@agoric/ertp';
 import { VowShape } from '@agoric/vow';
 import { M } from '@endo/patterns';
 
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomDetail, DenomInfo, AmountArg} from './types.js';
+ * @import {ChainAddress, CosmosAssetInfo, Chain, ChainInfo, CosmosChainInfo, DenomAmount, DenomDetail, DenomInfo, AmountArg, CosmosValidatorAddress} from './types.js';
  * @import {Any as Proto3Msg} from '@agoric/cosmic-proto/google/protobuf/any.js';
  * @import {Delegation} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
  * @import {TxBody} from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
@@ -39,13 +38,6 @@ export const Proto3Shape = {
   value: M.string(),
 };
 
-// FIXME missing `delegatorAddress` from the type
-/** @type {TypedPattern<Delegation>} */
-export const DelegationShape = harden({
-  validatorAddress: M.string(),
-  shares: M.string(), // TODO: bigint?
-});
-
 /** @internal */
 export const IBCTransferOptionsShape = M.splitRecord(
   {},
@@ -130,8 +122,25 @@ export const DenomInfoShape = {
 /** @type {TypedPattern<DenomAmount>} */
 export const DenomAmountShape = { denom: DenomShape, value: M.bigint() };
 
+/** @type {TypedPattern<Amount<'nat'>>} */
+export const AnyNatAmountShape = harden({
+  brand: M.remotable('Brand'),
+  value: M.nat(),
+});
+
 /** @type {TypedPattern<AmountArg>} */
-export const AmountArgShape = M.or(AmountShape, DenomAmountShape);
+export const AmountArgShape = M.or(AnyNatAmountShape, DenomAmountShape);
+
+/**
+ * @type {TypedPattern<{
+ *   validator: CosmosValidatorAddress;
+ *   amount: AmountArg;
+ * }>}
+ */
+export const DelegationShape = harden({
+  validator: ChainAddressShape,
+  amount: AmountArgShape,
+});
 
 /** Approximately @see RequestQuery */
 export const ICQMsgShape = M.splitRecord(