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

package/src/exos/ica-account-kit.js

@@ -5,7 +5,7 @@ import { M } from '@endo/patterns';
 import { NonNullish, makeTracer } from '@agoric/internal';
 import { VowShape } from '@agoric/vow';
 import {
-  CosmosChainAddressShape,
+  ChainAddressShape,
   OutboundConnectionHandlerI,
   Proto3Shape,
   TxBodyOptsShape,
@@ -21,7 +21,7 @@ import { makeTxPacket, parseTxPacket } from '../utils/packet.js';
  * @import {AnyJson} from '@agoric/cosmic-proto';
  * @import {TxBody} from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
  * @import {LocalIbcAddress, RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
- * @import {CosmosChainAddress, IcaAccount} from '../types.js';
+ * @import {ChainAddress, IcaAccount} from '../types.js';
  */
 
 const trace = makeTracer('IcaAccountKit');
@@ -29,7 +29,7 @@ const trace = makeTracer('IcaAccountKit');
 const UNPARSABLE_CHAIN_ADDRESS = 'UNPARSABLE_CHAIN_ADDRESS';
 
 export const IcaAccountI = M.interface('IcaAccount', {
-  getAddress: M.call().returns(CosmosChainAddressShape),
+  getAddress: M.call().returns(ChainAddressShape),
   getLocalAddress: M.call().returns(M.string()),
   getRemoteAddress: M.call().returns(M.string()),
   getPort: M.call().returns(M.remotable('Port')),
@@ -51,9 +51,7 @@ export const IcaAccountI = M.interface('IcaAccount', {
  *   localAddress: LocalIbcAddress | undefined;
  *   requestedRemoteAddress: string;
  *   remoteAddress: RemoteIbcAddress | undefined;
- *   chainAddress:
- *     | (CosmosChainAddress | { value: typeof UNPARSABLE_CHAIN_ADDRESS })
- *     | undefined;
+ *   chainAddress: ChainAddress | undefined;
  *   isInitiatingClose: boolean;
  * }} State
  *   Internal to the IcaAccountKit exo
@@ -103,9 +101,8 @@ export const prepareIcaAccountKit = (zone, { watch, asVow }) =>
         },
       },
       account: {
-        /** @returns {CosmosChainAddress} */
+        /** @returns {ChainAddress} */
         getAddress() {
-          // @ts-expect-error value may be UNPARSABLE_CHAIN_ADDRESS
           return NonNullish(
             this.state.chainAddress,
             'ICA channel creation acknowledgement not yet received.',

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

@@ -1,5 +1,25 @@
-export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowers): (localChainInfo: CosmosChainInfo) => import("@endo/exo").Guarded<{
-    getChainInfo(): Vow<CosmosChainInfo>;
+export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowers): (localChainInfo: Readonly<{
+    bech32Prefix?: string;
+    chainId: string;
+    connections?: Record<string, IBCConnectionInfo>;
+    icqEnabled?: boolean;
+    pfmEnabled?: boolean;
+    stakingTokens?: Readonly<Array<{
+        denom: string;
+    }>>;
+    icaEnabled?: boolean;
+}>) => import("@endo/exo").Guarded<{
+    getChainInfo(): Vow<Readonly<{
+        bech32Prefix?: string;
+        chainId: string;
+        connections?: Record<string, IBCConnectionInfo>;
+        icqEnabled?: boolean;
+        pfmEnabled?: boolean;
+        stakingTokens?: Readonly<Array<{
+            denom: string;
+        }>>;
+        icaEnabled?: boolean;
+    }>>;
     /** @returns {Vow<LocalOrchestrationAccountKit['holder']>} */
     makeAccount(): Vow<LocalOrchestrationAccountKit["holder"]>;
     query(args_0: {
@@ -36,7 +56,7 @@ export type LocalChainFacadePowers = {
 export type MakeLocalChainFacade = ReturnType<typeof prepareLocalChainFacade>;
 export type LocalChainFacade = ReturnType<MakeLocalChainFacade>;
 import type { Zone } from '@agoric/base-zone';
-import type { CosmosChainInfo } from '../types.js';
+import type { IBCConnectionInfo } from '../types.js';
 import type { Vow } from '@agoric/vow';
 import type { LocalOrchestrationAccountKit } from './local-orchestration-account.js';
 import type { AssetInfo } from '@agoric/vats/src/vat-bank.js';

package/src/exos/local-chain-facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA8LO,8CAJI,IAAI,UACJ,sBAAsB;;IAtFzB,6DAA6D;mBAA/C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC;;;;;;;;;;GA4FhE;;;;;;;;;;;uBArKa,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;;qCAO3B;IACR,gCAAgC,EAAE,gCAAgC,CAAC;IACnE,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;CACpB;mCAyJU,UAAU,CAAC,OAAO,uBAAuB,CAAC;+BAC1C,UAAU,CAAC,oBAAoB,CAAC;0BAzLvB,mBAAmB;qCASuE,aAAa;yBAH9F,aAAa;kDAEoC,kCAAkC;+BAJvF,8BAA8B;sDAIuB,kCAAkC;6CADzE,qBAAqB;4BALtC,kBAAkB;6BAGjB,cAAc;kCAJT,cAAc;gCAEgB,gCAAgC;8BAG7D,aAAa"}
+{"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA8LO,8CAJI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;IAtFzB,6DAA6D;mBAA/C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC;;;;;;;;;;GA4FhE;;;;;;;;;;;uBArKa,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;;qCAO3B;IACR,gCAAgC,EAAE,gCAAgC,CAAC;IACnE,aAAa,EAAE,OAAO,uBAAuB,CAAC,CAAC;IAC/C,WAAW,EAAE,OAAO,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;CACpB;mCAyJU,UAAU,CAAC,OAAO,uBAAuB,CAAC;+BAC1C,UAAU,CAAC,oBAAoB,CAAC;0BAzLvB,mBAAmB;uCASiE,aAAa;yBAHxF,aAAa;kDAEoC,kCAAkC;+BAJvF,8BAA8B;sDAIuB,kCAAkC;6CADzE,qBAAqB;4BALtC,kBAAkB;6BAGjB,cAAc;kCAJT,cAAc;gCAEgB,gCAAgC;8BAG7D,aAAa"}

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

@@ -19,7 +19,7 @@ import { chainFacadeMethods, TypedJsonShape } from '../typeGuards.js';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {CosmosInterchainService} from './exo-interfaces.js';
  * @import {LocalOrchestrationAccountKit, MakeLocalOrchestrationAccountKit} from './local-orchestration-account.js';
- * @import {Chain, CosmosChainAddress, ChainInfo, CosmosChainInfo, IBCConnectionInfo, OrchestrationAccount} from '../types.js';
+ * @import {Chain, ChainAddress, ChainInfo, CosmosChainInfo, IBCConnectionInfo, OrchestrationAccount} from '../types.js';
  */
 
 /**
@@ -142,7 +142,7 @@ const prepareLocalChainFacadeKit = (
       },
       makeAccountWatcher: {
         /**
-         * @param {[LocalChainAccount, CosmosChainAddress['value']]} results
+         * @param {[LocalChainAccount, ChainAddress['value']]} results
          */
         onFulfilled([account, address]) {
           const optionalStorageNode = storageNode
@@ -159,7 +159,7 @@ const prepareLocalChainFacadeKit = (
          * @param {Remote<StorageNode>} childNode
          * @param {{
          *   account: LocalChainAccount;
-         *   address: CosmosChainAddress['value'];
+         *   address: ChainAddress['value'];
          * }} ctx
          */
         onFulfilled(childNode, { account, address }) {

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

@@ -8,7 +8,7 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
     zoeTools: ZoeTools;
 }): (args_0: {
     account: LocalChainAccount;
-    address: CosmosChainAddress;
+    address: ChainAddress;
     storageNode?: Remote<globalThis.StorageNode> | undefined;
 }) => import("@endo/exo").GuardedKit<{
     helper: {
@@ -32,16 +32,16 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
         Undelegate(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<Vow<TimestampRecord>, undefined>>;
         CloseAccount(): never;
         Send(): Promise<Invitation<Vow<void>, {
-            toAccount: AccountIdArg;
+            toAccount: ChainAddress;
             amount: AmountArg;
         }>>;
         SendAll(): Promise<Invitation<Vow<void>, {
-            toAccount: CosmosChainAddress;
+            toAccount: ChainAddress;
             amounts: AmountArg[];
         }>>;
         Transfer(): Promise<Invitation<Vow<void>, {
             amount: AmountArg;
-            destination: AccountIdArg;
+            destination: ChainAddress;
             opts?: IBCMsgTransferOptions;
         }>>;
         Withdraw(): Promise<Invitation<Vow<void>, undefined>>;
@@ -156,11 +156,11 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
         }[]): Vow<{
             '@type': string;
         }[]>;
-        getAddress(): CosmosChainAddress;
-        send(toAccount: AccountIdArg, amount: AmountArg): Vow<void>;
-        sendAll(toAccount: CosmosChainAddress, amounts: AmountArg[]): Vow<void>;
+        getAddress(): ChainAddress;
+        send(toAccount: ChainAddress, amount: AmountArg): Vow<void>;
+        sendAll(toAccount: ChainAddress, amounts: AmountArg[]): Vow<void>;
         /**
-         * @param {AccountIdArg} destination
+         * @param {ChainAddress} destination
          * @param {AmountArg} amount an ERTP {@link Amount} or a
          *   {@link DenomAmount}
          * @param {IBCMsgTransferOptions} [opts] if either timeoutHeight or
@@ -171,10 +171,10 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
          *   recognized, or the transfer is rejected (insufficient funds,
          *   timeout)
          */
-        transfer(destination: AccountIdArg, amount: AmountArg, opts?: IBCMsgTransferOptions): Vow<any>;
+        transfer(destination: ChainAddress, amount: AmountArg, opts?: IBCMsgTransferOptions): Vow<any>;
         transferSteps(amount: AmountArg, msg: import("@agoric/orchestration").TransferMsg): Vow<void>;
         sendThenWaitForAck(packetSender: Remote<import("./packet-tools.js").PacketSender>, opts?: import("./packet-tools.js").PacketOptions | undefined): import("@agoric/async-flow").HostInterface<Vow<any>>;
-        matchFirstPacket(args_0?: import("@agoric/vow").EVow<Pattern>): import("@agoric/async-flow").HostInterface<Vow<{
+        matchFirstPacket(args_0?: import("@agoric/vow").EVow<globalThis.Pattern>): import("@agoric/async-flow").HostInterface<Vow<{
             resolver: import("@agoric/vow").VowResolver<any>;
             match: Vow<any>;
         }>>;
@@ -191,13 +191,12 @@ export type State = {
     topicKit: RecorderKit<LocalChainAccountNotification> | undefined;
     packetTools: PacketTools;
     account: LocalChainAccount;
-    address: CosmosChainAddress;
+    address: ChainAddress;
 };
 export type MakeLocalOrchestrationAccountKit = ReturnType<typeof prepareLocalOrchestrationAccountKit>;
 export type LocalOrchestrationAccountKit = ReturnType<MakeLocalOrchestrationAccountKit>;
 import type { Zone } from '@agoric/zone';
 import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
-import type { ZCF } from '@agoric/zoe';
 import type { TimerService } from '@agoric/time';
 import type { Remote } from '@agoric/internal';
 import type { VowTools } from '@agoric/vow';
@@ -205,19 +204,16 @@ import type { ChainHub } from './chain-hub.js';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
 import type { ZoeTools } from '../utils/zoe-tools.js';
 import type { LocalChainAccount } from '@agoric/vats/src/localchain.js';
-import type { CosmosChainAddress } from '@agoric/orchestration';
+import type { ChainAddress } from '@agoric/orchestration';
 import type { AmountArg } from '@agoric/orchestration';
 import type { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
 import type { Vow } from '@agoric/vow';
-import type { Invitation } from '@agoric/zoe';
 import type { TimestampRecord } from '@agoric/time';
-import type { AccountIdArg } from '@agoric/orchestration';
 import type { IBCMsgTransferOptions } from '@agoric/orchestration';
 import type { TypedJson } from '@agoric/cosmic-proto';
 import type { JsonSafe } from '@agoric/cosmic-proto';
 import type { TransferRoute } from '@agoric/orchestration';
 import type { DenomAmount } from '@agoric/orchestration';
-import type { ZCFSeat } from '@agoric/zoe';
 import type { ResponseTo } from '@agoric/cosmic-proto';
 import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { PacketTools } from './packet-tools.js';

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

@@ -1 +1 @@
-{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"AAkGO,0DAVI,IAAI,qFAEZ;IAAgC,eAAe,EAAvC,eAAe;IACH,GAAG,EAAf,GAAG;IAC0B,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACS,QAAQ,EAAzB,QAAQ;IACmB,UAAU,EAArC,OAAO,UAAU,CAAC;IACD,QAAQ,EAAzB,QAAQ;CAClB;aAqFc,iBAAiB;aACjB,kBAAkB;;;;QAoBzB;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAOjB;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;QAiCxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;uBAmBJ,YAAY;oBAAU,SAAS;;;uBAa/B,kBAAkB;qBAAW,SAAS,EAAE;;;oBAc3C,SAAS;yBACJ,YAAY;mBAClB,qBAAqB;;;;;QAmCrC;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;;;;WAMG;sCALQ,MAAM,mBACN;YACN,IAAI,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;YAClD,KAAK,EAAE,aAAa,CAAC;SACtB;;IAsCN;;;OAGG;;QAED,kDAAkD;6BAAtC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;;;;IAYxC;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;IAM1B,kDAAkD;;QAEhD;;;WAGG;uBAFQ,SAAS,QACT,OAAO;QAKlB;;;WAGG;2BAFQ,KAAK,QACL,OAAO;;IAOpB;;;OAGG;;QAED;;;;;WAKG;4BAJQ,WACV,UAAc,0CAA0C,CAAC,CACtD,GACS,WAAW;;IAU1B;;;OAGG;;QAED;;;;;;;WAOG;4BANQ,SACV,WACA,UAAgB,8CAA8C,CAAC,CAC1D,CACF,GACS,WAAW,EAAE;;;;;;;QA8F1B;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAmBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;;;;;;;;;;;QAqFxC;;;;;;;;;;;WAWG;8BAVQ,YAAY,UACZ,SAAS,SAET,qBAAqB,GAGnB,IAAI,GAAG,CAAC;;;;;;;;;GAoE5B;;aAzrBa,MAAM;;;;;oBAKP;IACR,QAAQ,EAAE,YAAY,6BAA6B,CAAC,GAAG,SAAS,CAAC;IACjE,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,kBAAkB,CAAC;CAC7B;+CAirBU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BAjtBnC,cAAc;qCADU,6CAA6C;yBADrB,aAAa;kCAKpC,cAAc;4BAFrC,kBAAkB;8BAGX,aAAa;8BAIlB,gBAAgB;gCAZK,gCAAgC;8BAcrD,uBAAuB;uCAdF,gCAAgC;wCACgH,uBAAuB;+BAAvB,uBAAuB;0BAShM,kDAAkD;yBAFzC,aAAa;gCAN0B,aAAa;qCAKpC,cAAc;kCANkI,uBAAuB;2CAAvB,uBAAuB;+BAQrK,sBAAsB;8BAAtB,sBAAsB;mCARwH,uBAAuB;iCAAvB,uBAAuB;6BAChJ,aAAa;gCAOlC,sBAAsB;iCANzB,6CAA6C;iCAU9D,mBAAmB"}
+{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"AAiGO,0DAVI,IAAI,qFAEZ;IAAgC,eAAe,EAAvC,eAAe;IACH,GAAG,EAAf,GAAG;IAC0B,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACS,QAAQ,EAAzB,QAAQ;IACmB,UAAU,EAArC,OAAO,UAAU,CAAC;IACD,QAAQ,EAAzB,QAAQ;CAClB;aAqFc,iBAAiB;aACjB,YAAY;;;;QAoBnB;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QAOjB;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;QAiCxB;;;WAGG;qCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;uBAmBJ,YAAY;oBAAU,SAAS;;;uBAa/B,YAAY;qBAAW,SAAS,EAAE;;;oBAcrC,SAAS;yBACJ,YAAY;mBAClB,qBAAqB;;;;;QAmCrC;;;;;;WAMG;8BALQ,CACV,SACA,UAAgB,+CAA+C,CAAC,CAC3D,CACF;;;QAcJ;;;;;;WAMG;sCALQ,MAAM,mBACN;YACN,IAAI,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;YAClD,KAAK,EAAE,aAAa,CAAC;SACtB;;IAsCN;;;OAGG;;QAED,kDAAkD;6BAAtC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;;;;;IAYxC;;;OAGG;;QAED;;;;WAIG;+BAHQ,MAAM,CAAC,KAAK,CAAC,SACb,WAAW,CAAC,OAAO,CAAC,GAClB,WAAW;;IAM1B,kDAAkD;;QAEhD;;;WAGG;uBAFQ,SAAS,QACT,OAAO;QAKlB;;;WAGG;2BAFQ,KAAK,QACL,OAAO;;IAOpB;;;OAGG;;QAED;;;;;WAKG;4BAJQ,WACV,UAAc,0CAA0C,CAAC,CACtD,GACS,WAAW;;IAU1B;;;OAGG;;QAED;;;;;;;WAOG;4BANQ,SACV,WACA,UAAgB,8CAA8C,CAAC,CAC1D,CACF,GACS,WAAW,EAAE;;;;;;;QA8F1B;;;WAGG;mCAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;QAmBxB;;;;WAIG;qCAHQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC,GACX,IAAI,IAAI,GAAG,eAAe,CAAC;;;;;;;;;;;QAkFxC;;;;;;;;;;;WAWG;8BAVQ,YAAY,UACZ,SAAS,SAET,qBAAqB,GAGnB,IAAI,GAAG,CAAC;;;;;;;;;GAmE5B;;aArrBa,MAAM;;;;;oBAKP;IACR,QAAQ,EAAE,YAAY,6BAA6B,CAAC,GAAG,SAAS,CAAC;IACjE,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,YAAY,CAAC;CACvB;+CA6qBU,UAAU,CAAC,OAAO,mCAAmC,CAAC;2CACtD,UAAU,CAAC,gCAAgC,CAAC;0BA7sBnC,cAAc;qCADU,6CAA6C;kCAI5C,cAAc;4BAFrC,kBAAkB;8BAGX,aAAa;8BAIlB,gBAAgB;gCAXK,gCAAgC;8BAarD,uBAAuB;uCAbF,gCAAgC;kCACiF,uBAAuB;+BAAvB,uBAAuB;0BAQjK,kDAAkD;yBAFzC,aAAa;qCADG,cAAc;2CALmG,uBAAuB;+BAOtI,sBAAsB;8BAAtB,sBAAsB;mCAPyF,uBAAuB;iCAAvB,uBAAuB;gCAOtI,sBAAsB;iCANzB,6CAA6C;iCAU9D,mBAAmB"}

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

@@ -28,8 +28,7 @@ import { TransferRouteShape } from './chain-hub.js';
 /**
  * @import {HostOf} from '@agoric/async-flow';
  * @import {LocalChain, LocalChainAccount} from '@agoric/vats/src/localchain.js';
- * @import {AmountArg, CosmosChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountCommon, LocalAccountMethods, TransferRoute, AccountId, AccountIdArg} from '@agoric/orchestration';
- * @import {ContractMeta, Invitation, OfferHandler, ZCF, ZCFSeat} from '@agoric/zoe';
+ * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, IBCConnectionInfo, OrchestrationAccountCommon, LocalAccountMethods, TransferRoute} from '@agoric/orchestration';
  * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'.
  * @import {Zone} from '@agoric/zone';
  * @import {Remote} from '@agoric/internal';
@@ -61,7 +60,7 @@ const EVow$ = shape => M.or(Vow$(shape), M.promise(/* shape */));
  *   topicKit: RecorderKit<LocalChainAccountNotification> | undefined;
  *   packetTools: PacketTools;
  *   account: LocalChainAccount;
- *   address: CosmosChainAddress;
+ *   address: ChainAddress;
  * }} State
  *   Internal to the LocalOrchestrationAccount exo
  */
@@ -181,7 +180,7 @@ export const prepareLocalOrchestrationAccountKit = (
     /**
      * @param {object} initState
      * @param {LocalChainAccount} initState.account
-     * @param {CosmosChainAddress} initState.address
+     * @param {ChainAddress} initState.address
      * @param {Remote<StorageNode>} [initState.storageNode]
      * @returns {State}
      */
@@ -266,7 +265,7 @@ export const prepareLocalOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: AccountIdArg; amount: AmountArg }
+           *   { toAccount: ChainAddress; amount: AmountArg }
            * >}
            */
           const offerHandler = (seat, { toAccount, amount }) => {
@@ -279,7 +278,7 @@ export const prepareLocalOrchestrationAccountKit = (
           /**
            * @type {OfferHandler<
            *   Vow<void>,
-           *   { toAccount: CosmosChainAddress; amounts: AmountArg[] }
+           *   { toAccount: ChainAddress; amounts: AmountArg[] }
            * >}
            */
           const offerHandler = (seat, { toAccount, amounts }) => {
@@ -294,7 +293,7 @@ export const prepareLocalOrchestrationAccountKit = (
            *   Vow<void>,
            *   {
            *     amount: AmountArg;
-           *     destination: AccountIdArg;
+           *     destination: ChainAddress;
            *     opts?: IBCMsgTransferOptions;
            *   }
            * >}
@@ -637,15 +636,12 @@ export const prepareLocalOrchestrationAccountKit = (
         send(toAccount, amount) {
           return asVow(() => {
             trace('send', toAccount, amount);
-            const cosmosDest = chainHub.coerceCosmosAddress(toAccount);
-            cosmosDest.chainId === this.state.address.chainId ||
-              Fail`bank/send cannot send to a different chain ${q(cosmosDest.chainId)}`;
             const { helper } = this.facets;
             return watch(
               E(this.state.account).executeTx([
                 typedJson('/cosmos.bank.v1beta1.MsgSend', {
                   amount: [helper.amountToCoin(amount)],
-                  toAddress: cosmosDest.value,
+                  toAddress: toAccount.value,
                   fromAddress: this.state.address.value,
                 }),
               ]),
@@ -675,7 +671,7 @@ export const prepareLocalOrchestrationAccountKit = (
           });
         },
         /**
-         * @param {AccountIdArg} destination
+         * @param {ChainAddress} destination
          * @param {AmountArg} amount an ERTP {@link Amount} or a
          *   {@link DenomAmount}
          * @param {IBCMsgTransferOptions} [opts] if either timeoutHeight or
@@ -689,7 +685,6 @@ export const prepareLocalOrchestrationAccountKit = (
         transfer(destination, amount, opts) {
           return asVow(() => {
             trace('Transferring funds over IBC');
-
             const denomAmount = coerceDenomAmount(chainHub, amount);
 
             const { forwardOpts, ...rest } = opts ?? {};

package/src/exos/orchestrator.d.ts

@@ -11,7 +11,7 @@ export function prepareOrchestrator(zone: Zone, powers: {
     vowTools: VowTools;
 }): () => import("@endo/exo").Guarded<{
     getChain(chainName: string): Vow<HostInterface<Chain<any> & object>>;
-    getDenomInfo(denom: string, srcChainName: "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon", "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon">>;
+    getDenomInfo(denom: string, srcChainName: "agoric" | "archway" | "celestia" | "dydx" | "evmos" | "haqq" | "juno" | "kava" | "kujira" | "migaloo" | "neutron" | "noble" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "stride" | "titan" | "umee" | "beezee" | "carbon" | "coreum" | "cosmoshub" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "omniflixhub" | "osmosis" | "planq" | "provenance" | "quicksilver" | "secretnetwork" | "sifchain" | "stargaze" | "terra2"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "archway" | "celestia" | "dydx" | "evmos" | "haqq" | "juno" | "kava" | "kujira" | "migaloo" | "neutron" | "noble" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "stride" | "titan" | "umee" | "beezee" | "carbon" | "coreum" | "cosmoshub" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "omniflixhub" | "osmosis" | "planq" | "provenance" | "quicksilver" | "secretnetwork" | "sifchain" | "stargaze" | "terra2", "agoric" | "archway" | "celestia" | "dydx" | "evmos" | "haqq" | "juno" | "kava" | "kujira" | "migaloo" | "neutron" | "noble" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "stride" | "titan" | "umee" | "beezee" | "carbon" | "coreum" | "cosmoshub" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "omniflixhub" | "osmosis" | "planq" | "provenance" | "quicksilver" | "secretnetwork" | "sifchain" | "stargaze" | "terra2">>;
     /** @type {HostOf<Orchestrator['asAmount']>} */
     asAmount: HostOf<Orchestrator["asAmount"]>;
 }>;
@@ -51,7 +51,17 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
          * @param {ActualChainInfo<'agoric'>} agoricChainInfo
          */
         onFulfilled(agoricChainInfo: ActualChainInfo<"agoric">): import("@endo/exo").Guarded<{
-            getChainInfo(): Vow<import("../cosmos-api.js").CosmosChainInfo>;
+            getChainInfo(): Vow<Readonly<{
+                bech32Prefix?: string;
+                chainId: string;
+                connections?: Record<string, IBCConnectionInfo>;
+                icqEnabled?: boolean;
+                pfmEnabled?: boolean;
+                stakingTokens?: Readonly<Array<{
+                    denom: string;
+                }>>;
+                icaEnabled?: boolean;
+            }>>;
             makeAccount(): Vow<import("./local-orchestration-account.js").LocalOrchestrationAccountKit["holder"]>;
             query(args_0: {
                 '@type': string;
@@ -78,7 +88,7 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
          */
         onFulfilled([_agoricChainInfo, remoteChainInfo, connectionInfo]: [ChainInfo, ChainInfo, IBCConnectionInfo], name: string): import("@endo/exo").Guarded<{
             getChainInfo(): Vow<any>;
-            makeAccount(): Vow<HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & object> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").LocalAccountMethods> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & object & import("../cosmos-api.js").NobleMethods> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries & import("../cosmos-api.js").NobleMethods> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & object> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries>>;
+            makeAccount(): Vow<HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & object> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").LocalAccountMethods> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & object> | HostInterface<import("../orchestration-api.js").OrchestrationAccountCommon & import("../cosmos-api.js").IcaAccountMethods & import("../cosmos-api.js").StakingAccountActions & import("../cosmos-api.js").StakingAccountQueries>>;
             query(msgs: {
                 data: string;
                 path: string;
@@ -105,13 +115,13 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
     };
     orchestrator: {
         getChain(chainName: string): Vow<HostInterface<Chain<any> & object>>;
-        getDenomInfo(denom: string, srcChainName: "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon", "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon">>;
+        getDenomInfo(denom: string, srcChainName: "agoric" | "archway" | "celestia" | "dydx" | "evmos" | "haqq" | "juno" | "kava" | "kujira" | "migaloo" | "neutron" | "noble" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "stride" | "titan" | "umee" | "beezee" | "carbon" | "coreum" | "cosmoshub" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "omniflixhub" | "osmosis" | "planq" | "provenance" | "quicksilver" | "secretnetwork" | "sifchain" | "stargaze" | "terra2"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "archway" | "celestia" | "dydx" | "evmos" | "haqq" | "juno" | "kava" | "kujira" | "migaloo" | "neutron" | "noble" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "stride" | "titan" | "umee" | "beezee" | "carbon" | "coreum" | "cosmoshub" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "omniflixhub" | "osmosis" | "planq" | "provenance" | "quicksilver" | "secretnetwork" | "sifchain" | "stargaze" | "terra2", "agoric" | "archway" | "celestia" | "dydx" | "evmos" | "haqq" | "juno" | "kava" | "kujira" | "migaloo" | "neutron" | "noble" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "stride" | "titan" | "umee" | "beezee" | "carbon" | "coreum" | "cosmoshub" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "omniflixhub" | "osmosis" | "planq" | "provenance" | "quicksilver" | "secretnetwork" | "sifchain" | "stargaze" | "terra2">>;
         /** @type {HostOf<Orchestrator['asAmount']>} */
         asAmount: HostOf<Orchestrator["asAmount"]>;
     };
 }>;
 import type { ActualChainInfo } from './chain-hub.js';
-import type { ChainInfo } from '../types.js';
 import type { IBCConnectionInfo } from '../types.js';
+import type { ChainInfo } from '../types.js';
 export {};
 //# sourceMappingURL=orchestrator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AA4BA,0BAA0B;AAC1B;;;;GAIG;AAqJI,0CARI,IAAI,UACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;;;IAfI,+CAA+C;cAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;GAoBlD;;;;;+BAMY,UAAU,CAClB,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAvLG,mBAAmB;8BACE,gBAAgB;0CASrB,yBAAyB;2CACxB,0BAA0B;8BARlC,aAAa;2BASoC,aAAa;mCAVtC,oBAAoB;yBAC5C,aAAa;kCASoC,aAAa;4BAVtC,oBAAoB;AAuB5E;;;;;;;;GAQG;AACH,8CARW,IAAI,0FACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;IA4CE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;yEAFQ,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,CAAC,QACzC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0DjB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCA/J2C,gBAAgB;+BAWqB,aAAa;uCAAb,aAAa"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AAiCA,0BAA0B;AAC1B;;;;GAIG;AAiJI,0CARI,IAAI,UACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;;;IAfI,+CAA+C;cAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;GAoBlD;;;;;+BAMY,UAAU,CAClB,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAnLG,mBAAmB;8BACE,gBAAgB;0CASrB,yBAAyB;2CACxB,0BAA0B;8BARlC,aAAa;2BASoC,aAAa;mCAVtC,oBAAoB;yBAC5C,aAAa;kCASoC,aAAa;4BAVtC,oBAAoB;AAuB5E;;;;;;;;GAQG;AACH,8CARW,IAAI,0FACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;IAwCE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;0HADQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0DjB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCA3J2C,gBAAgB;uCAWqB,aAAa;+BAAb,aAAa"}

package/src/exos/orchestrator.js

@@ -1,11 +1,16 @@
 /** @file Orchestrator exo */
 import { AmountShape } from '@agoric/ertp';
-import { makeScalarMapStore, pickFacet } from '@agoric/vat-data';
+import { pickFacet } from '@agoric/vat-data';
 import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { Fail, q } from '@endo/errors';
 import { M } from '@endo/patterns';
-import { DenomInfoShape, DenomAmountShape, DenomShape } from '../typeGuards.js';
+import {
+  DenomInfoShape,
+  ChainInfoShape,
+  DenomAmountShape,
+  DenomShape,
+} from '../typeGuards.js';
 
 /**
  * @import {Zone} from '@agoric/base-zone';
@@ -28,7 +33,7 @@ const trace = makeTracer('Orchestrator');
 
 /** @see {Orchestrator} */
 export const OrchestratorI = M.interface('Orchestrator', {
-  getChain: M.call(M.string()).returns(Vow$(M.remotable('ChainFacade'))),
+  getChain: M.call(M.string()).returns(Vow$(ChainInfoShape)),
   getDenomInfo: M.call(DenomShape, M.string()).returns(DenomInfoShape),
   asAmount: M.call(DenomAmountShape).returns(AmountShape),
 });
@@ -56,12 +61,8 @@ const prepareOrchestratorKit = (
    * @typedef {{ vow: Vow<T>; pending: true } | { value: T; pending: false }} MaybePendingValue
    */
 
-  /**
-   * heap store is fine for a cache
-   *
-   * @type {MapStore<string, MaybePendingValue<HostInterface<Chain>>>}
-   */
-  const chainByName = makeScalarMapStore('chainName');
+  /** @type {MapStore<string, MaybePendingValue<HostInterface<Chain>>>} */
+  const chainByName = zone.mapStore('chainName');
 
   return zone.exoClassKit(
     'Orchestrator',

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

@@ -1,5 +1,5 @@
 export function preparePacketTools(zone: import("@agoric/base-zone").Zone, vowTools: VowTools): (lca: import("@endo/exo").Guarded<{
-    getAddress(): `${string}1${string}`;
+    getAddress(): string;
     getBalance(brand: Brand<"nat">): import("@agoric/vow").PromiseVow<Amount<"nat">>;
     deposit(payment: ERef<Payment<"nat">>, optAmountShape?: Pattern): import("@agoric/vow").PromiseVow<Amount<"nat">>;
     withdraw(amount: Amount<"nat">): import("@agoric/vow").PromiseVow<Payment<"nat">>;

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

@@ -1 +1 @@
-{"version":3,"file":"packet-tools.d.ts","sourceRoot":"","sources":["packet-tools.js"],"names":[],"mappings":"AA+DO,yCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;;;;;;;;IAiFX;;OAEG;8BADQ,IAAI,CAAC,SAAS,CAAC;;;;8BAnHvB,KAAK,OAAO,CAAC,GACX,IAAI;QAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;QAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;IAsIzD;;;;OAIG;qCAHQ,OAAO,YAAY,CAAC,SACpB,aAAa,GACX,IAAI,GAAG,CAAC;GAyM5B;mCAnVU,KAAK,OAAO,CAAC,KACX,IAAI;IAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;IAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;CAAE,CAAC;;gBAKnD,CACT,IAAI,EAAE,aAAa,KAChB,IAAI;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;;;;;;4BAU5C,IAAI,CAChB,OAAW,eAAe,EAAE,qBAAqB,EACjD,eAAmB,GAAG,kBAAkB,CACrC;0BAkUS,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;8BA/VZ,aAAa;6BAD9C,gBAAgB;+BAIM,mCAAmC;wCAAnC,mCAAmC;0BAHxB,aAAa;iCAAb,aAAa;yBAAb,aAAa;4BAAb,aAAa"}
+{"version":3,"file":"packet-tools.d.ts","sourceRoot":"","sources":["packet-tools.js"],"names":[],"mappings":"AA2DO,yCAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;;;;;;;;IAiFX;;OAEG;8BADQ,IAAI,CAAC,SAAS,CAAC;;;;8BAnHvB,KAAK,OAAO,CAAC,GACX,IAAI;QAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;QAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;IAsIzD;;;;OAIG;qCAHQ,OAAO,YAAY,CAAC,SACpB,aAAa,GACX,IAAI,GAAG,CAAC;GAwM5B;mCAlVU,KAAK,OAAO,CAAC,KACX,IAAI;IAAE,QAAQ,EAAE,YAAY,GAAG,CAAC,CAAC;IAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;CAAE,CAAC;;gBAKnD,CACT,IAAI,EAAE,aAAa,KAChB,IAAI;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,CAAC,CAAA;KAAE,CAAC;;;;;;4BAU5C,IAAI,CAChB,OAAW,eAAe,EAAE,qBAAqB,EACjD,eAAmB,GAAG,kBAAkB,CACrC;0BAiUS,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;8BA7VZ,aAAa;6BAD9C,gBAAgB;+BAGM,mCAAmC;wCAAnC,mCAAmC;0BAFxB,aAAa;iCAAb,aAAa;yBAAb,aAAa;4BAAb,aAAa"}

package/src/exos/packet-tools.js

@@ -3,9 +3,6 @@ import { Shape as NetworkShape } from '@agoric/network';
 import { M, matches } from '@endo/patterns';
 import { E } from '@endo/far';
 import { pickFacet } from '@agoric/vat-data';
-import { makeTracer } from '@agoric/internal';
-
-const trace = makeTracer('PacketTools');
 
 const { toCapData } = makeMarshal(undefined, undefined, {
   marshalName: 'JustEncoder',
@@ -13,14 +10,13 @@ const { toCapData } = makeMarshal(undefined, undefined, {
 });
 const just = obj => {
   const { body } = toCapData(obj);
-  return decodeToJustin(JSON.parse(body), false);
+  return decodeToJustin(JSON.parse(body), true);
 };
 
 /**
  * @import {Pattern} from '@endo/patterns';
  * @import {EVow, Remote, Vow, VowResolver, VowTools} from '@agoric/vow';
  * @import {LocalChainAccount} from '@agoric/vats/src/localchain.js';
- * @import {VTransferIBCEvent} from '@agoric/vats';
  * @import {TargetApp, TargetRegistration} from '@agoric/vats/src/bridge-target.js';
  */
 
@@ -207,13 +203,11 @@ export const preparePacketTools = (zone, vowTools) => {
         },
       },
       tap: {
-        /**
-         * @param {VTransferIBCEvent} obj
-         */
+        // eslint-disable-next-line no-restricted-syntax
         async receiveUpcall(obj) {
           const { monitor, resolverToPattern, upcallQueue, pending } =
             this.state;
-          trace(
+          console.debug(
             `Trying ${resolverToPattern.getSize()} current patterns and ${pending} pending patterns against`,
             just(obj),
           );
@@ -225,7 +219,7 @@ export const preparePacketTools = (zone, vowTools) => {
           // Check all our fulfilled patterns for matches.
           for (const [resolver, pattern] of resolverToPattern.entries()) {
             if (matches(obj, pattern)) {
-              trace('Matched pattern:', just(pattern));
+              console.debug('Matched pattern:', just(pattern));
               resolver.resolve(obj);
               resolverToPattern.delete(resolver);
               return;
@@ -234,10 +228,10 @@ export const preparePacketTools = (zone, vowTools) => {
           if (upcallQueue) {
             // We have some pending patterns (ones that have been requested but
             // haven't yet settled) that may match this object.
-            trace('Stashing object in upcallQueue');
+            console.debug('Stashing object in upcallQueue');
             this.state.upcallQueue = harden(upcallQueue.concat(obj));
           }
-          trace('No match yet.');
+          console.debug('No match yet.');
         },
       },
       sendPacketWatcher: {
@@ -282,24 +276,25 @@ export const preparePacketTools = (zone, vowTools) => {
         onFulfilled(pattern, { resolver }) {
           const { resolverToPattern, upcallQueue } = this.state;
 
-          trace('watchPacketPattern onFulfilled', just(pattern));
+          console.debug('watchPacketPattern onFulfilled', just(pattern));
           if (!upcallQueue) {
             // Save the pattern for later.
-            trace('No upcall queue yet.  Save the pattern for later.');
+            console.debug('No upcall queue yet.  Save the pattern for later.');
             resolverToPattern.init(resolver, pattern);
             return;
           }
 
           // Try matching the first in queue.
           const i = upcallQueue.findIndex(obj => matches(obj, pattern));
-          if (i === -1) {
-            trace('No match yet. Save the pattern for later.');
+          if (i < 0) {
+            // No match yet. Save the pattern for later.
+            console.debug('No match yet. Save the pattern for later.');
             resolverToPattern.init(resolver, pattern);
             return;
           }
 
           // Success! Remove the matched object from the queue.
-          trace(
+          console.debug(
             'Success! Remove the matched object from the queue.',
             just(upcallQueue[i]),
           );

package/src/exos/portfolio-holder-kit.d.ts

@@ -60,7 +60,6 @@ import type { OrchestrationAccount } from '@agoric/orchestration';
 import type { HostInterface } from '@agoric/async-flow';
 import type { MapStore } from '@agoric/store';
 import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
-import type { Invitation } from '@agoric/zoe';
 import type { OrchestrationAccountCommon } from '@agoric/orchestration';
 export {};
 //# sourceMappingURL=portfolio-holder-kit.d.ts.map

package/src/exos/portfolio-holder-kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portfolio-holder-kit.d.ts","sourceRoot":"","sources":["portfolio-holder-kit.js"],"names":[],"mappings":"AAiOO,6CANI,IAAI,YACJ,QAAQ,GACN,CACZ,GAAO,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,KAC9D,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAKzE;mCAhNY;IACR,QAAQ,EAAE,SAAS,MAAM,EAAE,cAAc,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC;IACrE,YAAY,EAAE,SAAS,MAAM,EAAE,oBAAoB,OAAO,CAAC,CAAC,CAAC;CAC9D;kCA8MU,UAAU,CAAC,OAAO,sBAAsB,CAAC;8BACzC,UAAU,CAAC,mBAAmB,CAAC;0BAvNtB,cAAc;8BAHV,aAAa;AAsBxC;;;;;;GAMG;AACH,iDAHW,IAAI,mBACJ,QAAQ;;QAkDX;;;;;;WAMG;iBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,WAAW,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;;;gBAL7C;;;;;;mBAMG;yBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,WAAW,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;QA+B7C;;;;WAIG;8BAHQ,MAAM,WACN,cAAc,qBAAqB,GAAG,CAAC,CAAC,eACxC,oBAAoB,OAAO,CAAC;QAgBvC;;WAEG;8BADQ,MAAM;;GAQxB;0CAzI+F,uBAAuB;mCAN/E,oBAAoB;8BACjC,eAAe;yCAEJ,2CAA2C;gCAC/C,aAAa;gDAEiD,uBAAuB"}
+{"version":3,"file":"portfolio-holder-kit.d.ts","sourceRoot":"","sources":["portfolio-holder-kit.js"],"names":[],"mappings":"AAgOO,6CANI,IAAI,YACJ,QAAQ,GACN,CACZ,GAAO,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,KAC9D,UAAU,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAKzE;mCAhNY;IACR,QAAQ,EAAE,SAAS,MAAM,EAAE,cAAc,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC;IACrE,YAAY,EAAE,SAAS,MAAM,EAAE,oBAAoB,OAAO,CAAC,CAAC,CAAC;CAC9D;kCA8MU,UAAU,CAAC,OAAO,sBAAsB,CAAC;8BACzC,UAAU,CAAC,mBAAmB,CAAC;0BAvNtB,cAAc;8BAFV,aAAa;AAqBxC;;;;;;GAMG;AACH,iDAHW,IAAI,mBACJ,QAAQ;;QAkDX;;;;;;WAMG;iBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;;;gBAL7C;;;;;;mBAMG;yBALsB,EAAE,SAAb,OAAO,EAAG,aACb,MAAM,UACN,MAAM,mBACN,EAAE,GACA,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;;;;;;QA+B7C;;;;WAIG;8BAHQ,MAAM,WACN,cAAc,qBAAqB,GAAG,CAAC,CAAC,eACxC,oBAAoB,OAAO,CAAC;QAgBvC;;WAEG;8BADQ,MAAM;;GAQxB;0CAzI+F,uBAAuB;mCAL/E,oBAAoB;8BACjC,eAAe;yCAEJ,2CAA2C;gDAEe,uBAAuB"}

package/src/exos/portfolio-holder-kit.js

@@ -12,7 +12,6 @@ const { fromEntries } = Object;
  * @import {MapStore} from '@agoric/store';
  * @import {VowTools} from '@agoric/vow';
  * @import {ResolvedPublicTopic} from '@agoric/zoe/src/contractSupport/topics.js';
- * @import {Invitation, ZCF} from '@agoric/zoe';
  * @import {Zone} from '@agoric/zone';
  * @import {OrchestrationAccount, OrchestrationAccountCommon, MakeCombineInvitationMakers} from '@agoric/orchestration';
  */