@agoric/orchestration 0.1.1-dev-90906b1.0 → 0.1.1-dev-4202f3e.0

package/package.json

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

package/src/cosmos-api.d.ts

@@ -4,6 +4,11 @@ import type { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
 import type { Brand, Payment, Purse } from '@agoric/ertp/src/types.js';
 import type { Port } from '@agoric/network';
 import type { LocalIbcAddress, RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
+import { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
+import type { State as IBCConnectionState } from '@agoric/cosmic-proto/ibc/core/connection/v1/connection.js';
+import type { Order, State as IBCChannelState } from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
+import { IBCChannelID, IBCConnectionID } from '@agoric/vats';
+import { MapStore } from '@agoric/store';
 import type { AmountArg, ChainAddress, DenomAmount } from './types.js';
 /** A helper type for type extensions. */
 export type TypeUrl = string;
@@ -16,28 +21,39 @@ export type CosmosValidatorAddress = ChainAddress & {
     address: `${string}valoper${string}`;
     addressEncoding: 'bech32';
 };
+/** Represents an IBC Connection between two chains, which can contain multiple Channels. */
+export type IBCConnectionInfo = {
+    id: IBCConnectionID;
+    client_id: string;
+    state: IBCConnectionState;
+    counterparty: {
+        client_id: string;
+        connection_id: IBCConnectionID;
+        prefix: {
+            key_prefix: string;
+        };
+    };
+    versions: {
+        identifier: string;
+        features: string[];
+    }[];
+    delay_period: bigint;
+    transferChannel: {
+        portId: string;
+        channelId: IBCChannelID;
+        counterPartyPortId: string;
+        counterPartyChannelId: IBCChannelID;
+        ordering: Order;
+        state: IBCChannelState;
+        version: string;
+    };
+};
 /**
  * Info for a Cosmos-based chain.
  */
 export type CosmosChainInfo = {
     chainId: string;
-    ibcConnectionInfo: {
-        id: string;
-        client_id: string;
-        state: 'OPEN' | 'TRYOPEN' | 'INIT' | 'CLOSED';
-        counterparty: {
-            client_id: string;
-            connection_id: string;
-            prefix: {
-                key_prefix: string;
-            };
-        };
-        versions: {
-            identifier: string;
-            features: string[];
-        }[];
-        delay_period: bigint;
-    };
+    connections: MapStore<string, IBCConnectionInfo>;
     icaEnabled: boolean;
     icqEnabled: boolean;
     pfmEnabled: boolean;
@@ -156,4 +172,9 @@ export interface IcaAccount {
 export type LiquidStakingMethods = {
     liquidStake: (amount: AmountArg) => Promise<void>;
 };
+export type IBCMsgTransferOptions = {
+    timeoutHeight?: MsgTransfer['timeoutHeight'];
+    timeoutTimestamp?: MsgTransfer['timeoutTimestamp'];
+    memo?: string;
+};
 //# sourceMappingURL=cosmos-api.d.ts.map

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

@@ -11,6 +11,14 @@ import type {
   LocalIbcAddress,
   RemoteIbcAddress,
 } from '@agoric/vats/tools/ibc-utils.js';
+import { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
+import type { State as IBCConnectionState } from '@agoric/cosmic-proto/ibc/core/connection/v1/connection.js';
+import type {
+  Order,
+  State as IBCChannelState,
+} from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
+import { IBCChannelID, IBCConnectionID } from '@agoric/vats';
+import { MapStore } from '@agoric/store';
 import type { AmountArg, ChainAddress, DenomAmount } from './types.js';
 
 /** A helper type for type extensions. */
@@ -29,25 +37,37 @@ export type CosmosValidatorAddress = ChainAddress & {
   addressEncoding: 'bech32';
 };
 
+/** Represents an IBC Connection between two chains, which can contain multiple Channels. */
+export type IBCConnectionInfo = {
+  id: IBCConnectionID; // e.g. connection-0
+  client_id: string; // '07-tendermint-0'
+  state: IBCConnectionState;
+  counterparty: {
+    client_id: string;
+    connection_id: IBCConnectionID;
+    prefix: {
+      key_prefix: string;
+    };
+  };
+  versions: { identifier: string; features: string[] }[];
+  delay_period: bigint;
+  transferChannel: {
+    portId: string;
+    channelId: IBCChannelID;
+    counterPartyPortId: string;
+    counterPartyChannelId: IBCChannelID;
+    ordering: Order;
+    state: IBCChannelState;
+    version: string; // e.eg. 'ics20-1'
+  };
+};
+
 /**
  * Info for a Cosmos-based chain.
  */
 export type CosmosChainInfo = {
   chainId: string;
-  ibcConnectionInfo: {
-    id: string; // e.g. connection-0
-    client_id: string; // '07-tendermint-0'
-    state: 'OPEN' | 'TRYOPEN' | 'INIT' | 'CLOSED';
-    counterparty: {
-      client_id: string;
-      connection_id: string;
-      prefix: {
-        key_prefix: string;
-      };
-    };
-    versions: { identifier: string; features: string[] }[];
-    delay_period: bigint;
-  };
+  connections: MapStore<string, IBCConnectionInfo>; // chainId or wellKnownName
   icaEnabled: boolean;
   icqEnabled: boolean;
   pfmEnabled: boolean;
@@ -197,3 +217,9 @@ export interface IcaAccount {
 export type LiquidStakingMethods = {
   liquidStake: (amount: AmountArg) => Promise<void>;
 };
+
+export type IBCMsgTransferOptions = {
+  timeoutHeight?: MsgTransfer['timeoutHeight'];
+  timeoutTimestamp?: MsgTransfer['timeoutTimestamp'];
+  memo?: string;
+};

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

@@ -1 +1 @@
-{"version":3,"file":"stakeAtom.contract.d.ts","sourceRoot":"","sources":["stakeAtom.contract.js"],"names":[],"mappings":";;;;;;;;;AA+CO,2BATI,GAAG,CAAC,cAAc,CAAC;;;;;;;;;iBAGb,WAAW;gBACZ,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+FAgFooH,OAAO,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;GAH1qH;;;;eAvFc,MAAM;;0BAyFP,OAAO,KAAK;iCAtHmB,kBAAkB;kCAW9B,cAAc;6BAFnB,kBAAkB"}
+{"version":3,"file":"stakeAtom.contract.d.ts","sourceRoot":"","sources":["stakeAtom.contract.js"],"names":[],"mappings":";;;;;;;;;AAiDO,2BATI,GAAG,CAAC,cAAc,CAAC;;;;;;;;;iBAGb,WAAW;gBACZ,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+FAiFqiH,OAAO,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;GAH3kH;;;;eAxFc,MAAM;;0BA0FP,OAAO,KAAK;iCAxHmB,kBAAkB;kCAY9B,cAAc;6BAFnB,kBAAkB"}

package/src/examples/stakeAtom.contract.js

@@ -1,11 +1,13 @@
 /**
  * @file Example contract that uses orchestration
  */
+
 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';
 import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport';
+import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { M } from '@endo/patterns';
 import { prepareStakingAccountKit } from '../exos/stakingAccountKit.js';
 
 const trace = makeTracer('StakeAtom');
@@ -61,7 +63,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     zcf,
   );
 
-  async function makeAccount() {
+  async function makeAccountKit() {
     const account = await E(orchestration).makeAccount(
       hostConnectionId,
       controllerConnectionId,
@@ -94,19 +96,20 @@ export const start = async (zcf, privateArgs, baggage) => {
     'StakeAtom',
     M.interface('StakeAtomI', {
       makeAccount: M.callWhen().returns(M.remotable('ChainAccount')),
-      makeAcountInvitationMaker: M.call().returns(M.promise()),
+      makeAcountInvitationMaker: M.callWhen().returns(InvitationShape),
     }),
     {
       async makeAccount() {
         trace('makeAccount');
-        return makeAccount().then(({ account }) => account);
+        const { account } = await makeAccountKit();
+        return account;
       },
       makeAcountInvitationMaker() {
         trace('makeCreateAccountInvitation');
         return zcf.makeInvitation(
           async seat => {
             seat.exit();
-            return makeAccount();
+            return makeAccountKit();
           },
           'wantStakingAccount',
           undefined,

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

@@ -2,20 +2,22 @@ export function start(zcf: ZCF, privateArgs: {
     localchain: import("@agoric/vats/src/localchain.js").LocalChain;
     marshaller: Marshaller;
     storageNode: StorageNode;
+    timerService: TimerService;
+    timerBrand: TimerBrand;
 }, baggage: import("@agoric/vat-data").Baggage): Promise<{
     publicFacet: import("@endo/exo").Guarded<{
         makeStakeBldInvitation(): Promise<Invitation<{
             publicSubscribers: {
                 account: {
                     description: string;
-                    subscriber: globalThis.Subscriber<import("../exos/localchainAccountKit.js").LocalChainAccountNotification>;
+                    subscriber: globalThis.Subscriber<import("../exos/local-chain-account-kit.js").LocalChainAccountNotification>;
                     storagePath: Promise<string>;
                 };
             };
             invitationMakers: import("@endo/exo").Guarded<{
-                Delegate(validatorAddress: any, amount: any): Promise<Invitation<(import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
+                Delegate(validatorAddress: any, amount: any): Promise<Invitation<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
                     '@type': "/cosmos.staking.v1beta1.MsgDelegateResponse";
-                })[], undefined>>;
+                }, undefined>>;
                 CloseAccount(): never;
                 TransferAccount(): never;
             }>;
@@ -23,17 +25,75 @@ export function start(zcf: ZCF, privateArgs: {
                 getPublicTopics(): {
                     account: {
                         description: string;
-                        subscriber: globalThis.Subscriber<import("../exos/localchainAccountKit.js").LocalChainAccountNotification>;
+                        subscriber: globalThis.Subscriber<import("../exos/local-chain-account-kit.js").LocalChainAccountNotification>;
                         storagePath: Promise<string>;
                     };
                 };
-                makeDelegateInvitation(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<(import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
+                makeDelegateInvitation(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
                     '@type': "/cosmos.staking.v1beta1.MsgDelegateResponse";
-                })[], undefined>>;
+                }, undefined>>;
                 makeCloseAccountInvitation(): never;
                 makeTransferAccountInvitation(): never;
+                deposit(payment: Payment<"nat">, optAmountShape?: Pattern): Promise<globalThis.Amount>;
+                withdraw(amount: Amount<"nat">): Promise<globalThis.Payment>;
+                getAddress(): string;
+                transfer(amount: import("../orchestration-api.js").AmountArg, destination: import("../orchestration-api.js").ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Promise<void>;
+            }>;
+        }, undefined>>;
+        makeAccount(): Promise<import("@endo/exo").Guarded<{
+            getPublicTopics(): {
+                account: {
+                    description: string;
+                    subscriber: globalThis.Subscriber<import("../exos/local-chain-account-kit.js").LocalChainAccountNotification>;
+                    storagePath: Promise<string>;
+                };
+            };
+            makeDelegateInvitation(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
+                '@type': "/cosmos.staking.v1beta1.MsgDelegateResponse";
+            }, undefined>>;
+            makeCloseAccountInvitation(): never;
+            makeTransferAccountInvitation(): never;
+            deposit(payment: Payment<"nat">, optAmountShape?: Pattern): Promise<globalThis.Amount>;
+            withdraw(amount: Amount<"nat">): Promise<globalThis.Payment>;
+            getAddress(): string;
+            transfer(amount: import("../orchestration-api.js").AmountArg, destination: import("../orchestration-api.js").ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Promise<void>;
+        }>>;
+        makeAcountInvitationMaker(): Promise<Invitation<{
+            publicSubscribers: {
+                account: {
+                    description: string;
+                    subscriber: globalThis.Subscriber<import("../exos/local-chain-account-kit.js").LocalChainAccountNotification>;
+                    storagePath: Promise<string>;
+                };
+            };
+            invitationMakers: import("@endo/exo").Guarded<{
+                Delegate(validatorAddress: any, amount: any): Promise<Invitation<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
+                    '@type': "/cosmos.staking.v1beta1.MsgDelegateResponse";
+                }, undefined>>;
+                CloseAccount(): never;
+                TransferAccount(): never;
+            }>;
+            account: import("@endo/exo").Guarded<{
+                getPublicTopics(): {
+                    account: {
+                        description: string;
+                        subscriber: globalThis.Subscriber<import("../exos/local-chain-account-kit.js").LocalChainAccountNotification>;
+                        storagePath: Promise<string>;
+                    };
+                };
+                makeDelegateInvitation(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
+                    '@type': "/cosmos.staking.v1beta1.MsgDelegateResponse";
+                }, undefined>>;
+                makeCloseAccountInvitation(): never;
+                makeTransferAccountInvitation(): never;
+                deposit(payment: Payment<"nat">, optAmountShape?: Pattern): Promise<globalThis.Amount>;
+                withdraw(amount: Amount<"nat">): Promise<globalThis.Payment>;
+                getAddress(): string;
+                transfer(amount: import("../orchestration-api.js").AmountArg, destination: import("../orchestration-api.js").ChainAddress, opts?: import("../cosmos-api.js").IBCMsgTransferOptions | undefined): Promise<void>;
             }>;
         }, undefined>>;
     }>;
 }>;
+import type { TimerService } from '@agoric/time';
+import type { TimerBrand } from '@agoric/time';
 //# sourceMappingURL=stakeBld.contract.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"stakeBld.contract.d.ts","sourceRoot":"","sources":["stakeBld.contract.js"],"names":[],"mappings":"AAyBO,2BARI,GAAG,eACH;IACV,UAAc,EAAE,OAAO,gCAAgC,EAAE,UAAU,CAAC;IACpE,UAAc,EAAE,UAAU,CAAC;IAC3B,WAAe,EAAE,WAAW,CAAC;CAC1B,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;6EA0DyqC,OAAO,KAAK,CAAC;;;;;;;;GADluC"}
+{"version":3,"file":"stakeBld.contract.d.ts","sourceRoot":"","sources":["stakeBld.contract.js"],"names":[],"mappings":"AAgCO,2BAVI,GAAG;gBAEG,OAAO,gCAAgC,EAAE,UAAU;gBACnD,UAAU;iBACT,WAAW;;;YAIlB,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;6EA4FipC,OAAO,KAAK,CAAC;;;;;iCAzEnqC,QAAQ,KAAK,CAAC,mBAElD,OAAO;iCAoB0D,OAAO,KAC5E,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDA;kCA1G0C,cAAc;gCAAd,cAAc"}

package/src/examples/stakeBld.contract.js

@@ -1,15 +1,20 @@
 /**
  * @file Stake BLD contract
- *
  */
-
 import { makeTracer } from '@agoric/internal';
+import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
+import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
+import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
 import { makeDurableZone } from '@agoric/zone/durable.js';
-import { M } from '@endo/patterns';
 import { E } from '@endo/far';
-import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
-import { atomicTransfer } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
-import { prepareLocalchainAccountKit } from '../exos/localchainAccountKit.js';
+import { deeplyFulfilled } from '@endo/marshal';
+import { M } from '@endo/patterns';
+import { prepareLocalChainAccountKit } from '../exos/local-chain-account-kit.js';
+import { prepareMockChainInfo } from '../utils/mockChainInfo.js';
+
+/**
+ * @import {TimerBrand, TimerService} from '@agoric/time';
+ */
 
 const trace = makeTracer('StakeBld');
 
@@ -20,12 +25,15 @@ const trace = makeTracer('StakeBld');
  *   localchain: import('@agoric/vats/src/localchain.js').LocalChain;
  *   marshaller: Marshaller;
  *   storageNode: StorageNode;
+ *   timerService: TimerService;
+ *   timerBrand: TimerBrand;
  * }} privateArgs
  * @param {import("@agoric/vat-data").Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
-  const { BLD } = zcf.getTerms().brands;
+  const BLD = zcf.getTerms().brands.In;
 
+  // XXX is this safe to call before prepare statements are completed?
   const bldAmountShape = await E(BLD).getAmountShape();
 
   const zone = makeDurableZone(baggage);
@@ -34,48 +42,81 @@ export const start = async (zcf, privateArgs, baggage) => {
     baggage,
     privateArgs.marshaller,
   );
-  const makeLocalchainAccountKit = prepareLocalchainAccountKit(
+
+  // Mocked until #8879
+  // Would expect this to be instantiated elsewhere, and passed in as a reference
+  const agoricChainInfo = prepareMockChainInfo(zone);
+
+  const makeLocalChainAccountKit = prepareLocalChainAccountKit(
     baggage,
     makeRecorderKit,
     zcf,
+    privateArgs.timerService,
+    privateArgs.timerBrand,
+    agoricChainInfo,
   );
 
-  const publicFacet = zone.exo('StakeBld', undefined, {
-    makeStakeBldInvitation() {
-      return zcf.makeInvitation(
-        async seat => {
-          const { give } = seat.getProposal();
-          trace('makeStakeBldInvitation', give);
-          // XXX type appears local but it's remote
-          const account = await E(privateArgs.localchain).makeAccount();
-          const lcaSeatKit = zcf.makeEmptySeatKit();
-          atomicTransfer(zcf, seat, lcaSeatKit.zcfSeat, give);
-          seat.exit();
-          trace('makeStakeBldInvitation tryExit lca userSeat');
-          await E(lcaSeatKit.userSeat).tryExit();
-          trace('awaiting payouts');
-          const payouts = await E(lcaSeatKit.userSeat).getPayouts();
-          const { holder, invitationMakers } = makeLocalchainAccountKit(
-            account,
-            privateArgs.storageNode,
-          );
-          trace('awaiting deposit');
-          await E(account).deposit(await payouts.In);
+  async function makeLocalAccountKit() {
+    const account = await E(privateArgs.localchain).makeAccount();
+    const address = await E(account).getAddress();
+    return makeLocalChainAccountKit({
+      account,
+      address,
+      storageNode: privateArgs.storageNode,
+    });
+  }
 
-          return {
+  const publicFacet = zone.exo(
+    'StakeBld',
+    M.interface('StakeBldI', {
+      makeAccount: M.callWhen().returns(M.remotable('LocalChainAccountHolder')),
+      makeAcountInvitationMaker: M.callWhen().returns(InvitationShape),
+      makeStakeBldInvitation: M.callWhen().returns(InvitationShape),
+    }),
+    {
+      makeStakeBldInvitation() {
+        return zcf.makeInvitation(
+          async seat => {
+            const { give } = seat.getProposal();
+            trace('makeStakeBldInvitation', give);
+            const { holder, invitationMakers } = await makeLocalAccountKit();
+            const { In } = await deeplyFulfilled(
+              withdrawFromSeat(zcf, seat, give),
+            );
+            await E(holder).deposit(In);
+            seat.exit();
+            return harden({
+              publicSubscribers: holder.getPublicTopics(),
+              invitationMakers,
+              account: holder,
+            });
+          },
+          'wantStake',
+          undefined,
+          M.splitRecord({
+            give: { In: bldAmountShape },
+          }),
+        );
+      },
+      async makeAccount() {
+        trace('makeAccount');
+        const { holder } = await makeLocalAccountKit();
+        return holder;
+      },
+      makeAcountInvitationMaker() {
+        trace('makeCreateAccountInvitation');
+        return zcf.makeInvitation(async seat => {
+          seat.exit();
+          const { holder, invitationMakers } = await makeLocalAccountKit();
+          return harden({
             publicSubscribers: holder.getPublicTopics(),
             invitationMakers,
             account: holder,
-          };
-        },
-        'wantStake',
-        undefined,
-        M.splitRecord({
-          give: { In: bldAmountShape },
-        }),
-      );
+          });
+        }, 'wantLocalChainAccount');
+      },
     },
-  });
+  );
 
   return { publicFacet };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"swapExample.contract.d.ts","sourceRoot":"","sources":["swapExample.contract.js"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAUrB;AASK,0CAHI,KAAK;;;EAIsC;AAY/C,2BATI,GAAG;;;;6BAYqC,QAAQ,KAAK,CAAC,mBACrD,OAEX;6BAgBe,OAAO,KAAK,CAAC;;;2BAgBP,EAAE;;uBAuC4mC,OAAO,sBAAsB,EAAE,SAAS;;;4BAAyqB,OAAO,sBAAsB,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;oBA7Dn1D,MAAM,CAAC,KAAK,CAAC;;;;;oBAAb,MAAM,CAAC,KAAK,CAAC;;;;GA4DxD;0BAjHsB,WAAW;gCAHiC,aAAa;kCACjD,cAAc;0BAItB,cAAc;4CAL8B,aAAa"}
+{"version":3,"file":"swapExample.contract.d.ts","sourceRoot":"","sources":["swapExample.contract.js"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAUrB;AASK,0CAHI,KAAK;;;EAIsC;AAY/C,2BATI,GAAG;;;;6BAYqC,QAAQ,KAAK,CAAC,mBACrD,OAEX;6BAgBe,OAAO,KAAK,CAAC;;;2BAkBvB,EADD;;uBAuC4mC,OAAO,sBAAsB,EAAE,SAAS;;;4BAAyqB,OAAO,sBAAsB,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;oBA9Dh0D,MAAM,CAAC,KAAK,CAAC;;;;;oBAAb,MAAM,CAAC,KAAK,CAAC;;;;GA6DxD;0BAlHsB,WAAW;gCAHiC,aAAa;kCACjD,cAAc;0BAItB,cAAc;4CAL8B,aAAa"}

package/src/examples/swapExample.contract.js

@@ -84,6 +84,7 @@ export const start = async (zcf, privateArgs) => {
       // deposit funds from user seat to LocalChainAccount
       const payments = await withdrawFromSeat(zcf, seat, give);
       await deeplyFulfilled(objectMap(payments, localAccount.deposit));
+      seat.exit();
 
       // build swap instructions with orcUtils library
       const transferMsg = orcUtils.makeOsmosisSwap({

package/src/exos/chainAccountKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chainAccountKit.d.ts","sourceRoot":"","sources":["chainAccountKit.js"],"names":[],"mappings":"AAgCA;;;;;;;;;;;GAaG;AAcI;;QAqBC;;WAEG;;;;;;QAyBH;;;;;;WAMG;wFAFU,OAAO,CAAC,MAAM,CAAC;QAY5B;;WAEG;;;QAaH;;;WAGG;wBADQ,KAAK;;;;QAahB;;;;WAIG;;;;;GAyBR;qCAzJW,0BAA0B;;;;;4BAuBX,MAAM;;;;8BAoIrB,UAAU,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;0BAvK1C,mBAAmB;0BACP,iBAAiB;kCAKrB,aAAa;6BAHlB,sBAAsB;4BACvB,8CAA8C;gCAHpC,iBAAiB;4BAC3B,aAAa"}
+{"version":3,"file":"chainAccountKit.d.ts","sourceRoot":"","sources":["chainAccountKit.js"],"names":[],"mappings":"AA+BA;;;;;;;;;;;GAaG;AAcI;;QAqBC;;WAEG;;;;;;QAyBH;;;;;;WAMG;wFAFU,OAAO,CAAC,MAAM,CAAC;QAY5B;;WAEG;;;QAaH;;;WAGG;wBADQ,KAAK;;;;QAahB;;;;WAIG;;;;;GAyBR;qCAzJW,0BAA0B;;;;;4BAuBX,MAAM;;;;8BAoIrB,UAAU,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;0BAvK1C,mBAAmB;0BACP,iBAAiB;kCAKrB,aAAa;6BAHlB,sBAAsB;4BACvB,8CAA8C;gCAHpC,iBAAiB;4BAC3B,aAAa"}

package/src/exos/chainAccountKit.js

@@ -1,5 +1,4 @@
 /** @file ChainAccount exo */
-
 import { NonNullish } from '@agoric/assert';
 import { makeTracer } from '@agoric/internal';
 import { V as E } from '@agoric/vow/vat.js';