@agoric/orchestration 0.1.1-dev-9b5b61a.0 → 0.1.1-dev-9553675.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-9b5b61a.0+9b5b61a",
+  "version": "0.1.1-dev-9553675.0+9553675",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -29,19 +29,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-9b5b61a.0+9b5b61a",
-    "@agoric/cosmic-proto": "0.4.1-dev-9b5b61a.0+9b5b61a",
-    "@agoric/ertp": "0.16.3-dev-9b5b61a.0+9b5b61a",
-    "@agoric/internal": "0.3.3-dev-9b5b61a.0+9b5b61a",
-    "@agoric/network": "0.1.1-dev-9b5b61a.0+9b5b61a",
-    "@agoric/notifier": "0.6.3-dev-9b5b61a.0+9b5b61a",
-    "@agoric/store": "0.9.3-dev-9b5b61a.0+9b5b61a",
-    "@agoric/time": "0.3.3-dev-9b5b61a.0+9b5b61a",
-    "@agoric/vat-data": "0.5.3-dev-9b5b61a.0+9b5b61a",
-    "@agoric/vats": "0.15.2-dev-9b5b61a.0+9b5b61a",
-    "@agoric/vow": "0.1.1-dev-9b5b61a.0+9b5b61a",
-    "@agoric/zoe": "0.26.3-dev-9b5b61a.0+9b5b61a",
-    "@agoric/zone": "0.2.3-dev-9b5b61a.0+9b5b61a",
+    "@agoric/assert": "0.6.1-dev-9553675.0+9553675",
+    "@agoric/cosmic-proto": "0.4.1-dev-9553675.0+9553675",
+    "@agoric/ertp": "0.16.3-dev-9553675.0+9553675",
+    "@agoric/internal": "0.3.3-dev-9553675.0+9553675",
+    "@agoric/network": "0.1.1-dev-9553675.0+9553675",
+    "@agoric/notifier": "0.6.3-dev-9553675.0+9553675",
+    "@agoric/store": "0.9.3-dev-9553675.0+9553675",
+    "@agoric/time": "0.3.3-dev-9553675.0+9553675",
+    "@agoric/vat-data": "0.5.3-dev-9553675.0+9553675",
+    "@agoric/vats": "0.15.2-dev-9553675.0+9553675",
+    "@agoric/vow": "0.1.1-dev-9553675.0+9553675",
+    "@agoric/zoe": "0.26.3-dev-9553675.0+9553675",
+    "@agoric/zone": "0.2.3-dev-9553675.0+9553675",
     "@endo/base64": "^1.0.5",
     "@endo/far": "^1.1.2",
     "@endo/marshal": "^1.5.0",
@@ -83,5 +83,5 @@
   "typeCoverage": {
     "atLeast": 96.18
   },
-  "gitHead": "9b5b61af3496abdd21313e5373913920b9cf2e3f"
+  "gitHead": "9553675cd136d389c427e024fc4da78558344779"
 }

package/src/examples/stakeAtom.contract.js

@@ -2,7 +2,7 @@
 /**
  * @file Example contract that uses orchestration
  */
-import { makeTracer } from '@agoric/internal';
+import { makeTracer, StorageNodeShape } from '@agoric/internal';
 import { makeDurableZone } from '@agoric/zone/durable.js';
 import { V as E } from '@agoric/vow/vat.js';
 import { M } from '@endo/patterns';
@@ -13,9 +13,20 @@ const trace = makeTracer('StakeAtom');
 /**
  * @import { Baggage } from '@agoric/vat-data';
  * @import { IBCConnectionID } from '@agoric/vats';
+ * @import { TimerService } from '@agoric/time';
  * @import { ICQConnection, OrchestrationService } from '../types.js';
  */
 
+export const meta = harden({
+  privateArgsShape: {
+    orchestration: M.remotable('orchestration'),
+    storageNode: StorageNodeShape,
+    marshaller: M.remotable('Marshaller'),
+    timer: M.remotable('TimerService'),
+  },
+});
+export const privateArgsShape = meta.privateArgsShape;
+
 /**
  * @typedef {{
  *  hostConnectionId: IBCConnectionID;
@@ -31,6 +42,7 @@ const trace = makeTracer('StakeAtom');
  *  orchestration: OrchestrationService;
  *  storageNode: StorageNode;
  *  marshaller: Marshaller;
+ *  timer: TimerService;
  * }} privateArgs
  * @param {Baggage} baggage
  */
@@ -38,7 +50,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   // TODO #9063 this roughly matches what we'll get from Chain<C>.getChainInfo()
   const { hostConnectionId, controllerConnectionId, bondDenom } =
     zcf.getTerms();
-  const { orchestration, marshaller, storageNode } = privateArgs;
+  const { orchestration, marshaller, storageNode, timer } = privateArgs;
 
   const zone = makeDurableZone(baggage);
 
@@ -63,11 +75,14 @@ export const start = async (zcf, privateArgs, baggage) => {
     const accountAddress = await E(account).getAddress();
     trace('account address', accountAddress);
     const { holder, invitationMakers } = makeStakingAccountKit(
-      account,
-      storageNode,
       accountAddress,
-      icqConnection,
       bondDenom,
+      {
+        account,
+        storageNode,
+        icqConnection,
+        timer,
+      },
     );
     return {
       publicSubscribers: holder.getPublicTopics(),

package/src/exos/stakingAccountKit.js

@@ -5,8 +5,11 @@ import {
   MsgWithdrawDelegatorRewardResponse,
 } from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/tx.js';
 import {
+  MsgBeginRedelegate,
   MsgDelegate,
   MsgDelegateResponse,
+  MsgUndelegate,
+  MsgUndelegateResponse,
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
 import {
   QueryBalanceRequest,
@@ -15,19 +18,31 @@ import {
 import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
 import { AmountShape } from '@agoric/ertp';
 import { makeTracer } from '@agoric/internal';
-import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
 import { M, prepareExoClassKit } from '@agoric/vat-data';
 import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
-import { decodeBase64 } from '@endo/base64';
+import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
+import { decodeBase64, encodeBase64 } from '@endo/base64';
 import { E } from '@endo/far';
 import { toRequestQueryJson } from '@agoric/cosmic-proto';
-import { ChainAddressShape, CoinShape } from '../typeGuards.js';
+import {
+  AmountArgShape,
+  ChainAddressShape,
+  ChainAmountShape,
+  CoinShape,
+  DelegationShape,
+} from '../typeGuards.js';
+
+/** maximum clock skew, in seconds, for unbonding time reported from other chain */
+export const maxClockSkew = 10n * 60n;
 
 /**
- * @import {ChainAccount, ChainAddress, ChainAmount, CosmosValidatorAddress, ICQConnection} from '../types.js';
+ * @import {AmountArg, ChainAccount, ChainAddress, ChainAmount, CosmosValidatorAddress, ICQConnection, StakingAccountActions} from '../types.js';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  * @import {Baggage} from '@agoric/swingset-liveslots';
  * @import {AnyJson} from '@agoric/cosmic-proto';
+ * @import { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
+ * @import { Delegation } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
+ * @import {TimerService} from '@agoric/time';
  */
 
 const trace = makeTracer('StakingAccountHolder');
@@ -45,6 +60,7 @@ const { Fail } = assert;
  *  chainAddress: ChainAddress;
  *  icqConnection: ICQConnection;
  *  bondDenom: string;
+ *  timer: TimerService;
  * }} State
  */
 
@@ -52,8 +68,17 @@ export const ChainAccountHolderI = M.interface('ChainAccountHolder', {
   getPublicTopics: M.call().returns(TopicsRecordShape),
   getAddress: M.call().returns(ChainAddressShape),
   getBalance: M.callWhen().optional(M.string()).returns(CoinShape),
-  delegate: M.callWhen(ChainAddressShape, AmountShape).returns(M.record()),
-  withdrawReward: M.callWhen(ChainAddressShape).returns(M.arrayOf(CoinShape)),
+  delegate: M.callWhen(ChainAddressShape, AmountShape).returns(M.undefined()),
+  redelegate: M.callWhen(
+    ChainAddressShape,
+    ChainAddressShape,
+    AmountShape,
+  ).returns(M.undefined()),
+  withdrawReward: M.callWhen(ChainAddressShape).returns(
+    M.arrayOf(ChainAmountShape),
+  ),
+  withdrawRewards: M.callWhen().returns(M.arrayOf(ChainAmountShape)),
+  undelegate: M.callWhen(M.arrayOf(DelegationShape)).returns(M.undefined()),
 });
 
 /** @type {{ [name: string]: [description: string, valueShape: Pattern] }} */
@@ -68,6 +93,25 @@ const PUBLIC_TOPICS = {
  */
 const toAnyJSON = x => /** @type {AnyJson} */ (Any.toJSON(x));
 
+export const encodeTxResponse = (response, toProtoMsg) => {
+  const protoMsg = toProtoMsg(response);
+  const any1 = Any.fromPartial(protoMsg);
+  const any2 = Any.fromPartial({ value: Any.encode(any1).finish() });
+  const ackStr = encodeBase64(Any.encode(any2).finish());
+  return ackStr;
+};
+
+export const trivialDelegateResponse = encodeTxResponse(
+  {},
+  MsgDelegateResponse.toProtoMsg,
+);
+
+const expect = (actual, expected, message) => {
+  if (actual !== expected) {
+    console.log(message, { actual, expected });
+  }
+};
+
 /**
  * @template T
  * @param {string} ackStr
@@ -98,29 +142,46 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
     baggage,
     'Staking Account Holder',
     {
-      helper: UnguardedHelperI,
+      helper: M.interface('helper', {
+        owned: M.call().returns(M.remotable()),
+        getUpdater: M.call().returns(M.remotable()),
+        amountToCoin: M.call(AmountShape).returns(M.record()),
+      }),
       holder: ChainAccountHolderI,
       invitationMakers: M.interface('invitationMakers', {
-        Delegate: M.call(ChainAddressShape, AmountShape).returns(M.promise()),
-        WithdrawReward: M.call(ChainAddressShape).returns(M.promise()),
-        CloseAccount: M.call().returns(M.promise()),
-        TransferAccount: M.call().returns(M.promise()),
+        Delegate: M.callWhen(ChainAddressShape, AmountShape).returns(
+          InvitationShape,
+        ),
+        Redelegate: M.callWhen(
+          ChainAddressShape,
+          ChainAddressShape,
+          AmountArgShape,
+        ).returns(InvitationShape),
+        WithdrawReward: M.callWhen(ChainAddressShape).returns(InvitationShape),
+        Undelegate: M.callWhen(M.arrayOf(DelegationShape)).returns(
+          InvitationShape,
+        ),
+        CloseAccount: M.callWhen().returns(InvitationShape),
+        TransferAccount: M.callWhen().returns(InvitationShape),
       }),
     },
     /**
-     * @param {ChainAccount} account
-     * @param {StorageNode} storageNode
      * @param {ChainAddress} chainAddress
-     * @param {ICQConnection} icqConnection
      * @param {string} bondDenom e.g. 'uatom'
+     * @param {object} io
+     * @param {ChainAccount} io.account
+     * @param {StorageNode} io.storageNode
+     * @param {ICQConnection} io.icqConnection
+     * @param {TimerService} io.timer
      * @returns {State}
      */
-    (account, storageNode, chainAddress, icqConnection, bondDenom) => {
+    (chainAddress, bondDenom, io) => {
+      const { storageNode, ...rest } = io;
       // must be the fully synchronous maker because the kit is held in durable state
       // @ts-expect-error XXX Patterns
       const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
 
-      return { account, chainAddress, topicKit, icqConnection, bondDenom };
+      return { chainAddress, bondDenom, topicKit, ...rest };
     },
     {
       helper: {
@@ -135,6 +196,23 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
         getUpdater() {
           return this.state.topicKit.recorder;
         },
+        /**
+         * @param {AmountArg} amount
+         * @returns {Coin}
+         */
+        amountToCoin(amount) {
+          const { bondDenom } = this.state;
+          if ('denom' in amount) {
+            assert.equal(amount.denom, bondDenom);
+          } else {
+            trace('TODO: handle brand', amount);
+            // FIXME(#9211) brand handling
+          }
+          return harden({
+            denom: bondDenom,
+            amount: String(amount.value),
+          });
+        },
       },
       invitationMakers: {
         /**
@@ -150,6 +228,23 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
             return this.facets.holder.delegate(validator, amount);
           }, 'Delegate');
         },
+        /**
+         * @param {CosmosValidatorAddress} srcValidator
+         * @param {CosmosValidatorAddress} dstValidator
+         * @param {AmountArg} amount
+         */
+        Redelegate(srcValidator, dstValidator, amount) {
+          trace('Redelegate', srcValidator, dstValidator, amount);
+
+          return zcf.makeInvitation(async seat => {
+            seat.exit();
+            return this.facets.holder.redelegate(
+              srcValidator,
+              dstValidator,
+              amount,
+            );
+          }, 'Redelegate');
+        },
         /** @param {CosmosValidatorAddress} validator */
         WithdrawReward(validator) {
           trace('WithdrawReward', validator);
@@ -159,6 +254,17 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
             return this.facets.holder.withdrawReward(validator);
           }, 'WithdrawReward');
         },
+        /**
+         * @param {Delegation[]} delegations
+         */
+        Undelegate(delegations) {
+          trace('Undelegate', delegations);
+
+          return zcf.makeInvitation(async seat => {
+            seat.exit();
+            return this.facets.holder.undelegate(delegations);
+          }, 'Undelegate');
+        },
         CloseAccount() {
           throw Error('not yet implemented');
         },
@@ -181,6 +287,7 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
             },
           });
         },
+
         // TODO move this beneath the Orchestration abstraction,
         // to the OrchestrationAccount provided by makeAccount()
         /** @returns {ChainAddress} */
@@ -190,33 +297,47 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
         /**
          * _Assumes users has already sent funds to their ICA, until #9193
          * @param {CosmosValidatorAddress} validator
-         * @param {Amount<'nat'>} ertpAmount
+         * @param {AmountArg} amount
          */
-        async delegate(validator, ertpAmount) {
-          trace('delegate', validator, ertpAmount);
-
-          // FIXME brand handling and amount scaling #9211
-          trace('TODO: handle brand', ertpAmount);
-          const amount = {
-            amount: String(ertpAmount.value),
-            denom: this.state.bondDenom,
-          };
-
-          const account = this.facets.helper.owned();
-          const delegatorAddress = this.state.chainAddress.address;
+        async delegate(validator, amount) {
+          trace('delegate', validator, amount);
+          const { helper } = this.facets;
+          const { chainAddress } = this.state;
 
-          const result = await E(account).executeEncodedTx([
+          const result = await E(helper.owned()).executeEncodedTx([
             toAnyJSON(
               MsgDelegate.toProtoMsg({
-                delegatorAddress,
+                delegatorAddress: chainAddress.address,
                 validatorAddress: validator.address,
-                amount,
+                amount: helper.amountToCoin(amount),
               }),
             ),
           ]);
 
-          if (!result) throw Fail`Failed to delegate.`;
-          return tryDecodeResponse(result, MsgDelegateResponse.fromProtoMsg);
+          expect(result, trivialDelegateResponse, 'MsgDelegateResponse');
+        },
+        /**
+         * _Assumes users has already sent funds to their ICA, until #9193
+         * @param {CosmosValidatorAddress} srcValidator
+         * @param {CosmosValidatorAddress} dstValidator
+         * @param {AmountArg} amount
+         */
+        async redelegate(srcValidator, dstValidator, amount) {
+          trace('redelegate', srcValidator, dstValidator, amount);
+          const { helper } = this.facets;
+          const { chainAddress } = this.state;
+
+          // NOTE: response, including completionTime, is currently discarded.
+          await E(helper.owned()).executeEncodedTx([
+            toAnyJSON(
+              MsgBeginRedelegate.toProtoMsg({
+                delegatorAddress: chainAddress.address,
+                validatorSrcAddress: srcValidator.address,
+                validatorDstAddress: dstValidator.address,
+                amount: helper.amountToCoin(amount),
+              }),
+            ),
+          ]);
         },
 
         /**
@@ -224,18 +345,21 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
          * @returns {Promise<ChainAmount[]>}
          */
         async withdrawReward(validator) {
+          trace('withdrawReward', validator);
+          const { helper } = this.facets;
           const { chainAddress } = this.state;
-          assert.typeof(validator.address, 'string');
           const msg = MsgWithdrawDelegatorReward.toProtoMsg({
             delegatorAddress: chainAddress.address,
             validatorAddress: validator.address,
           });
-          const account = this.facets.helper.owned();
+          const account = helper.owned();
           const result = await E(account).executeEncodedTx([toAnyJSON(msg)]);
-          const { amount: coins } = tryDecodeResponse(
+          const response = tryDecodeResponse(
             result,
             MsgWithdrawDelegatorRewardResponse.fromProtoMsg,
           );
+          trace('withdrawReward response', response);
+          const { amount: coins } = response;
           return harden(coins.map(toChainAmount));
         },
         /**
@@ -262,9 +386,55 @@ export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
           if (!balance) throw Fail`Result lacked balance key: ${result}`;
           return harden(toChainAmount(balance));
         },
+
+        withdrawRewards() {
+          throw assert.error('Not implemented');
+        },
+
+        /**
+         * @param {Delegation[]} delegations
+         */
+        async undelegate(delegations) {
+          trace('undelegate', delegations);
+          const { helper } = this.facets;
+          const { chainAddress, bondDenom, timer } = this.state;
+
+          const result = await E(helper.owned()).executeEncodedTx(
+            delegations.map(d =>
+              toAnyJSON(
+                MsgUndelegate.toProtoMsg({
+                  delegatorAddress: chainAddress.address,
+                  validatorAddress: d.validatorAddress,
+                  amount: { denom: bondDenom, amount: d.shares },
+                }),
+              ),
+            ),
+          );
+
+          const response = tryDecodeResponse(
+            result,
+            MsgUndelegateResponse.fromProtoMsg,
+          );
+          trace('undelegate response', response);
+          const { completionTime } = response;
+          const endTime = BigInt(completionTime.getTime() / 1000);
+
+          await E(timer).wakeAt(endTime + maxClockSkew);
+        },
       },
     },
   );
+
+  /** check holder facet against StakingAccountActions interface. */
+  // eslint-disable-next-line no-unused-vars
+  const typeCheck = () => {
+    /** @type {any} */
+    const arg = null;
+    /** @satisfies { StakingAccountActions } */
+    // eslint-disable-next-line no-unused-vars
+    const kit = makeStakingAccountKit(arg, arg, arg).holder;
+  };
+
   return makeStakingAccountKit;
 };
 

package/src/proposals/start-stakeAtom.js

@@ -17,6 +17,7 @@ export const startStakeAtom = async (
       agoricNames,
       board,
       chainStorage,
+      chainTimerService,
       orchestration,
       startUpgradable,
     },
@@ -56,6 +57,7 @@ export const startStakeAtom = async (
       orchestration: await orchestration,
       storageNode,
       marshaller,
+      timer: await chainTimerService,
     },
   };
 
@@ -75,6 +77,7 @@ export const getManifestForStakeAtom = (
           agoricNames: true,
           board: true,
           chainStorage: true,
+          chainTimerService: true,
           orchestration: true,
           startUpgradable: true,
         },

package/src/typeGuards.js

@@ -1,3 +1,5 @@
+// @ts-check
+import { AmountShape } from '@agoric/ertp';
 import { M } from '@endo/patterns';
 
 export const ConnectionHandlerI = M.interface('ConnectionHandler', {
@@ -18,3 +20,9 @@ export const Proto3Shape = {
 };
 
 export const CoinShape = { value: M.bigint(), denom: M.string() };
+
+export const ChainAmountShape = harden({ denom: M.string(), value: M.nat() });
+
+export const AmountArgShape = M.or(AmountShape, ChainAmountShape);
+
+export const DelegationShape = M.record(); // TODO: DelegationShape fields

package/src/types.d.ts

@@ -3,10 +3,6 @@ import type { Timestamp } from '@agoric/time';
 import type { Invitation } from '@agoric/zoe/exported.js';
 import type { Any } from '@agoric/cosmic-proto/google/protobuf/any';
 import type { AnyJson } from '@agoric/cosmic-proto';
-import type {
-  MsgBeginRedelegateResponse,
-  MsgUndelegateResponse,
-} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
 import type {
   Delegation,
   Redelegation,
@@ -283,28 +279,7 @@ export interface ChainAccount {
   getPort: () => Port;
 }
 
-/**
- * An object that supports high-level operations for an account on a remote chain.
- */
-export interface BaseOrchestrationAccount {
-  /** @returns the underlying low-level operation object. */
-  getChainAcccount: () => Promise<ChainAccount>;
-
-  /**
-   * @returns the address of the account on the remote chain
-   */
-  getAddress: () => ChainAddress;
-
-  /** @returns an array of amounts for every balance in the account. */
-  getBalances: () => Promise<ChainAmount[]>;
-
-  /** @returns the balance of a specific denom for the account. */
-  getBalance: (denom: DenomArg) => Promise<ChainAmount>;
-
-  getDenomTrace: (
-    denom: string,
-  ) => Promise<{ path: string; base_denom: string }>;
-
+export interface StakingAccountQueries {
   /**
    * @returns all active delegations from the account to any validator (or [] if none)
    */
@@ -347,15 +322,8 @@ export interface BaseOrchestrationAccount {
    * @returns the amount of the account's rewards pending from a specific validator
    */
   getReward: (validator: CosmosValidatorAddress) => Promise<ChainAmount[]>;
-
-  /**
-   * Transfer amount to another account on the same chain. The promise settles when the transfer is complete.
-   * @param toAccount - the account to send the amount to. MUST be on the same chain
-   * @param amount - the amount to send
-   * @returns void
-   */
-  send: (toAccount: ChainAddress, amount: AmountArg) => Promise<void>;
-
+}
+export interface StakingAccountActions {
   /**
    * Delegate an amount to a validator. The promise settles when the delegation is complete.
    * @param validator - the validator to delegate to
@@ -369,7 +337,7 @@ export interface BaseOrchestrationAccount {
 
   /**
    * Redelegate from one delegator to another.
-   * Settles when teh redelegation is established, not 21 days later.
+   * Settles when the redelegation is established, not 21 days later.
    * @param srcValidator - the current validator for the delegation.
    * @param dstValidator - the validator that will receive the delegation.
    * @param amount - how much to redelegate.
@@ -379,14 +347,15 @@ export interface BaseOrchestrationAccount {
     srcValidator: CosmosValidatorAddress,
     dstValidator: CosmosValidatorAddress,
     amount: AmountArg,
-  ) => Promise<MsgBeginRedelegateResponse>;
+  ) => Promise<void>;
 
   /**
    * Undelegate multiple delegations (concurrently). To delegate independently, pass an array with one item.
    * Resolves when the undelegation is complete and the tokens are no longer bonded. Note it may take weeks.
+   * The unbonding time is padded by 10 minutes to account for clock skew.
    * @param {Delegation[]} delegations - the delegation to undelegate
    */
-  undelegate: (delegations: Delegation[]) => Promise<MsgUndelegateResponse>;
+  undelegate: (delegations: Delegation[]) => Promise<void>;
 
   /**
    * Withdraw rewards from all validators. The promise settles when the rewards are withdrawn.
@@ -400,6 +369,39 @@ export interface BaseOrchestrationAccount {
    * @returns
    */
   withdrawReward: (validator: CosmosValidatorAddress) => Promise<ChainAmount[]>;
+}
+
+/**
+ * An object that supports high-level operations for an account on a remote chain.
+ */
+export interface BaseOrchestrationAccount
+  extends StakingAccountQueries,
+    StakingAccountActions {
+  /** @returns the underlying low-level operation object. */
+  getChainAcccount: () => Promise<ChainAccount>;
+
+  /**
+   * @returns the address of the account on the remote chain
+   */
+  getAddress: () => ChainAddress;
+
+  /** @returns an array of amounts for every balance in the account. */
+  getBalances: () => Promise<ChainAmount[]>;
+
+  /** @returns the balance of a specific denom for the account. */
+  getBalance: (denom: DenomArg) => Promise<ChainAmount>;
+
+  getDenomTrace: (
+    denom: string,
+  ) => Promise<{ path: string; base_denom: string }>;
+
+  /**
+   * Transfer amount to another account on the same chain. The promise settles when the transfer is complete.
+   * @param toAccount - the account to send the amount to. MUST be on the same chain
+   * @param amount - the amount to send
+   * @returns void
+   */
+  send: (toAccount: ChainAddress, amount: AmountArg) => Promise<void>;
 
   /**
    * Transfer an amount to another account, typically on another chain.