@agoric/vats 0.16.0-upgrade-16-dev-12b78e3.0 → 0.16.0-upgrade-17-dev-a61cdab.0

package/src/ibc.js

@@ -1,10 +1,11 @@
 // @ts-check
 
-import { assert, details as X, Fail } from '@agoric/assert';
+import { assert, X, Fail } from '@endo/errors';
 import { E } from '@endo/far';
 
 import { byteSourceToBase64, base64ToBytes } from '@agoric/network';
 
+import { makeTracer } from '@agoric/internal';
 import {
   localAddrToPortID,
   decodeRemoteIbcAddress,
@@ -12,6 +13,8 @@ import {
   encodeRemoteIbcAddress,
 } from '../tools/ibc-utils.js';
 
+const trace = makeTracer('IBC', false);
+
 /**
  * @import {LocalIbcAddress, RemoteIbcAddress} from '../tools/ibc-utils.js';
  * @import {AttemptDescription} from '@agoric/network';
@@ -105,7 +108,7 @@ export const prepareIBCConnectionHandler = zone => {
       async onOpen(conn, localAddr, remoteAddr, _handler) {
         const { channelID, portID, channelKeyToConnP } = this.state;
 
-        console.debug(
+        trace(
           'onOpen Remote IBC Connection',
           channelID,
           portID,
@@ -137,26 +140,32 @@ export const prepareIBCConnectionHandler = zone => {
         return protocolUtils.ibcSendPacket(packet, relativeTimeoutNs);
       },
       /** @type {Required<ConnectionHandler>['onClose']} */
-      async onClose() {
+      onClose(_conn, _reason) {
         const { portID, channelID } = this.state;
-        const { protocolUtils, channelKeyToSeqAck } = this.state;
+        const { protocolUtils, channelKeyToSeqAck, channelKeyToConnP } =
+          this.state;
 
         const packet = {
           source_port: portID,
           source_channel: channelID,
         };
-        await protocolUtils.downcall('startChannelCloseInit', {
-          packet,
-        });
-        const rejectReason = Error('Connection closed');
         const channelKey = `${channelID}:${portID}`;
-
+        const rejectReason = Error('Connection closed');
         const seqToAck = channelKeyToSeqAck.get(channelKey);
 
         for (const ackKit of seqToAck.values()) {
           ackKit.resolver.reject(rejectReason);
         }
         channelKeyToSeqAck.delete(channelKey);
+
+        // This Connection object is initiating the close event
+        if (channelKeyToConnP.has(channelKey)) {
+          channelKeyToConnP.delete(channelKey);
+          return protocolUtils.downcall('startChannelCloseInit', {
+            packet,
+          });
+        }
+        return Promise.resolve();
       },
     },
   );
@@ -236,7 +245,7 @@ export const prepareIBCProtocol = (zone, powers) => {
       protocolHandler: {
         /** @type {Required<ProtocolHandler>['onCreate']} */
         async onCreate(impl) {
-          console.debug('IBC onCreate');
+          trace('onCreate');
           this.state.protocolImpl = impl;
         },
         /** @type {Required<ProtocolHandler>['onInstantiate']} */
@@ -267,7 +276,7 @@ export const prepareIBCProtocol = (zone, powers) => {
           const { util } = this.facets;
           const { portToPendingConns, srcPortToOutbounds } = this.state;
 
-          console.debug('IBC onConnect', localAddr, remoteAddr);
+          trace('onConnect', localAddr, remoteAddr);
           // @ts-expect-error may not be LocalIbcAddress
           const portID = localAddrToPortID(localAddr);
           const pendingConns = portToPendingConns.get(portID);
@@ -313,16 +322,16 @@ export const prepareIBCProtocol = (zone, powers) => {
         },
         /** @type {Required<ProtocolHandler>['onListen']} */
         async onListen(_port, localAddr) {
-          console.debug('IBC onListen', localAddr);
+          trace('onListen', localAddr);
         },
         /** @type {Required<ProtocolHandler>['onListenRemove']} */
         async onListenRemove(_port, localAddr) {
-          console.debug('IBC onListenRemove', localAddr);
+          trace('onListenRemove', localAddr);
         },
         /** @type {Required<ProtocolHandler>['onRevoke']} */
         async onRevoke(_port, localAddr) {
           const { portToPendingConns } = this.state;
-          console.debug('IBC onRevoke', localAddr);
+          trace('onRevoke', localAddr);
           // @ts-expect-error may not be LocalIbcAddress
           const portID = localAddrToPortID(localAddr);
 
@@ -583,11 +592,16 @@ export const prepareIBCProtocol = (zone, powers) => {
               break;
             }
 
-            case 'channelCloseInit':
+            // We ignore the close init tx message, since any decision to
+            // close should be left to the VM...
+            case 'channelCloseInit': {
+              break;
+            }
+
+            // ... or received from the other side.
             case 'channelCloseConfirm': {
               const { portID, channelID } =
-                // could be either but that complicates line wrapping
-                /** @type {IBCEvent<'channelCloseInit'>} */ (obj);
+                /** @type {IBCEvent<'channelCloseConfirm'>} */ (obj);
               const channelKey = `${channelID}:${portID}`;
               if (channelKeyToConnP.has(channelKey)) {
                 const conn = channelKeyToConnP.get(channelKey);

package/src/lib-board.d.ts

@@ -1,6 +1,6 @@
 /**
  * @import {RemotableObject} from '@endo/pass-style';
- * @import {Key} from '@endo/patterns');
+ * @import {Key} from '@endo/patterns';
  */
 export const DEFAULT_CRC_DIGITS: 2;
 export const DEFAULT_PREFIX: "board0";
@@ -80,7 +80,7 @@ export function prepareBoardKit(baggage: import("@agoric/vat-data").Baggage): (i
         unserialize(data: any): any;
     };
 }>;
-export function prepareRecorderFactory(zone: import("@agoric/zone").Zone): (label: string, marshaller: Marshaller) => <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: import("@agoric/zoe/src/contractSupport/recorder.js").TypedMatcher<T> | undefined) => RecorderKit<T>;
+export function prepareRecorderFactory(zone: import("@agoric/zone").Zone): (label: string, marshaller: Marshaller) => <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: import("@agoric/internal").TypedPattern<T> | undefined) => RecorderKit<T>;
 /**
  * For a value with a known id in the board, we can use that board id as a slot
  * to preserve identity when marshaling.
@@ -100,9 +100,6 @@ import type { RemotableObject } from '@endo/pass-style';
 /**
  * @typedef {ReturnType<typeof initDurableBoardState>} BoardState // TODO: use
  *   Key from @agoric/store when available
- * @import {Passable} from '@endo/marshal'
- * @see {prepareExoClassKit}
- * @see {@link ../../SwingSet/docs/virtual-objects.md|SwingSet Virtual Objects} Hoisting this function makes defining the state type concise.
  */
 /**
  * Make state for the board. Hoisted up to define the BoardState type.

package/src/lib-board.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib-board.d.ts","sourceRoot":"","sources":["lib-board.js"],"names":[],"mappings":"AAiBA;;;GAGG;AAEH,mCAAoC;AACpC,sCAAuC;AAsOhC,yCAHI,OAAO,kBAAkB,EAAE,OAAO;;;yBAdpB,WAAW;;QAyB5B;;;;;;;;;;;;WAYG;qBADQ,eAAe;QAK1B;;;WAGG;qBAFQ,OAAO;QAMlB;;;;;;;;;WASG;wBADW,MAAM,EAAA;QAiBpB,mCAAmC;iBAAvB,eAAe;;QAS3B;;;WAGG;;;;;;;QAIH;;;;;;;WAOG;;;;;;;;;;;;;;;;;;;;GAuCV;AAGM,6CADK,OAAO,cAAc,EAAE,IAAI,WAS1B,MAAM,cACN,UAAU,mDA7NuB,WAAW,0IAyOxD;;;;;;;;;;sBA9UY,MAAM;;;;;yBAmBN,UAAU,CAAC,OAAO,qBAAqB,CAAC;qCA9DnB,kBAAkB;AA6DpD;;;;;;GAMG;AAGH;;;;;;;;GAQG;AACH;;;;;;;;;EA0BC"}
+{"version":3,"file":"lib-board.d.ts","sourceRoot":"","sources":["lib-board.js"],"names":[],"mappings":"AAiBA;;;GAGG;AAEH,mCAAoC;AACpC,sCAAuC;AAmOhC,yCAHI,OAAO,kBAAkB,EAAE,OAAO;;;yBAHhB,WAAU;;QAc/B;;;;;;;;;;;;WAYG;qBADQ,eAAe;QAK1B;;;WAGG;qBAFQ,OAAO;QAMlB;;;;;;;;;WASG;wBADW,MAAM,EAAA;QAiBpB,mCAAmC;iBAAvB,eAAe;;QAS3B;;;WAGG;;;;;;;QAIH;;;;;;;WAOG;;;;;;;;;;;;;;;;;;;;GAuCV;AAGM,6CADK,OAAO,cAAc,EAAE,IAAI,WAS1B,MAAM,cACN,UAAU,mDAxNR,WAAW,+GAoOzB;;;;;;;;;;sBA3UY,MAAM;;;;;yBAmBN,UAAU,CAAC,OAAO,qBAAqB,CAAC;qCA9DnB,kBAAkB;AA6DpD;;;GAGG;AAGH;;;;;;;;GAQG;AACH;;;;;;;;;EA0BC"}

package/src/lib-board.js

@@ -3,7 +3,7 @@
  * @see prepareBoardKit()
  */
 
-import { assert, Fail, q } from '@agoric/assert';
+import { assert, Fail, q } from '@endo/errors';
 import { prepareDurablePublishKit } from '@agoric/notifier';
 import { M, makeScalarBigMapStore, prepareExoClassKit } from '@agoric/vat-data';
 import {
@@ -17,7 +17,7 @@ import { crc6 } from './crc.js';
 
 /**
  * @import {RemotableObject} from '@endo/pass-style';
- * @import {Key} from '@endo/patterns');
+ * @import {Key} from '@endo/patterns';
  */
 
 export const DEFAULT_CRC_DIGITS = 2;
@@ -80,9 +80,6 @@ const calcCrc = (data, crcDigits) => {
 /**
  * @typedef {ReturnType<typeof initDurableBoardState>} BoardState // TODO: use
  *   Key from @agoric/store when available
- * @import {Passable} from '@endo/marshal'
- * @see {prepareExoClassKit}
- * @see {@link ../../SwingSet/docs/virtual-objects.md|SwingSet Virtual Objects} Hoisting this function makes defining the state type concise.
  */
 
 // TODO consider tightening initSequence to bigint only

package/src/localchain.d.ts

@@ -18,6 +18,20 @@
  *   Vow<JsonSafe<MsgTransferResponse & { ...; }>[]>' must have a
  *   '[Symbol.iterator]()' method that returns an iterator.
  */
+/**
+ * Send a batch of query requests to the local chain. Unless there is a system
+ * error, will return all results to indicate their success or failure.
+ *
+ * @template {TypedJson[]} [RT=TypedJson[]]
+ * @callback QueryManyFn
+ * @param {RT} requests
+ * @returns {PromiseVowOfTupleMappedToGenerics<{
+ *   [K in keyof RT]: JsonSafe<{
+ *     error?: string;
+ *     reply: ResponseTo<RT[K]>;
+ *   }>;
+ * }>}
+ */
 /**
  * @typedef {{
  *   system: ScopedBridgeManager<'vlocalchain'>;
@@ -66,12 +80,12 @@ export function prepareLocalChainAccountKit(zone: import("@agoric/base-zone").Zo
          * This is safe, since even if the payment lies about its brand, ERTP
          * will reject spoofed payment objects when depositing into a purse.
          *
-         * @param {Payment<'nat'>} payment
+         * @param {ERef<Payment<'nat'>>} payment
          * @param {Pattern} [optAmountShape] throws if the Amount of the Payment
          *   does not match the provided Pattern
          * @returns {PromiseVow<Amount<'nat'>>}
          */
-        deposit(payment: Payment<"nat">, optAmountShape?: Pattern): PromiseVow<Amount<"nat">>;
+        deposit(payment: ERef<Payment<"nat">>, optAmountShape?: Pattern): PromiseVow<Amount<"nat">>;
         /**
          * Withdraw a payment from the account's bank purse of the amount's
          * brand.
@@ -81,10 +95,14 @@ export function prepareLocalChainAccountKit(zone: import("@agoric/base-zone").Zo
          */
         withdraw(amount: Amount<"nat">): PromiseVow<Payment<"nat">>;
         /**
-         * Execute a batch of messages in order as a single atomic transaction
-         * and return the responses. If any of the messages fails, the entire
-         * batch will be rolled back. Use `typedJson()` on the arguments to get
-         * typed return values.
+         * Execute a batch of messages on the local chain. Note in particular,
+         * that for IBC `MsgTransfer`, execution only queues a packet for the
+         * local chain's IBC stack, and returns a `MsgTransferResponse`
+         * immediately, not waiting for the confirmation on the other chain.
+         *
+         * Messages are executed in order as a single atomic transaction and
+         * returns the responses. If any of the messages fails, the entire batch
+         * will be rolled back on the local chain.
          *
          * @template {TypedJson[]} MT messages tuple (use const with multiple
          *   elements or it will be a mixed array)
@@ -92,6 +110,9 @@ export function prepareLocalChainAccountKit(zone: import("@agoric/base-zone").Zo
          * @returns {PromiseVowOfTupleMappedToGenerics<{
          *   [K in keyof MT]: JsonSafe<ResponseTo<MT[K]>>;
          * }>}
+         *
+         * @see {typedJson} which can be used on arguments to get typed return
+         * values.
          */
         executeTx<MT extends TypedJson[]>(messages: MT): PromiseVowOfTupleMappedToGenerics<{ [K in keyof MT]: JsonSafe<ResponseTo<MT[K]>>; }>;
         /**
@@ -135,23 +156,16 @@ export function prepareLocalChainTools(zone: import("@agoric/base-zone").Zone, v
         query<T extends TypedJson = {
             '@type': string;
         }>(request: T): PromiseVow<JsonSafe<ResponseTo<T>>>;
-        /**
-         * Send a batch of query requests to the local chain. Unless there is a
-         * system error, will return all results to indicate their success or
-         * failure.
-         *
-         * @template {import('@agoric/cosmic-proto').TypedJson[]} RT
-         * @param {RT} requests
-         * @returns {PromiseVowOfTupleMappedToGenerics<{
-         *   [K in keyof RT]: JsonSafe<{
-         *     error?: string;
-         *     reply: ResponseTo<RT[K]>;
-         *   }>;
-         * }>}
-         */
-        queryMany<RT extends import("@agoric/cosmic-proto").TypedJson[]>(requests: RT): PromiseVowOfTupleMappedToGenerics<{ [K in keyof RT]: JsonSafe<{
+        /** @type {QueryManyFn} */
+        queryMany(requests: {
+            '@type': string;
+        }[]): PromiseVowOfTupleMappedToGenerics<{ [K in keyof {
+            '@type': string;
+        }[]]: JsonSafe<{
             error?: string;
-            reply: ResponseTo<RT[K]>;
+            reply: ResponseTo<{
+                '@type': string;
+            }[][K]>;
         }>; }>;
     }>;
 };
@@ -168,6 +182,16 @@ export function prepareLocalChainTools(zone: import("@agoric/base-zone").Zone, v
  *   '[Symbol.iterator]()' method that returns an iterator.
  */
 export type PromiseVowOfTupleMappedToGenerics<T extends unknown[]> = Promise<T>;
+/**
+ * Send a batch of query requests to the local chain. Unless there is a system
+ * error, will return all results to indicate their success or failure.
+ */
+export type QueryManyFn<RT extends TypedJson[] = {
+    '@type': string;
+}[]> = (requests: RT) => PromiseVowOfTupleMappedToGenerics<{ [K in keyof RT]: JsonSafe<{
+    error?: string;
+    reply: ResponseTo<RT[K]>;
+}>; }>;
 export type AccountPowers = {
     system: ScopedBridgeManager<"vlocalchain">;
     bank: Bank;

package/src/localchain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localchain.d.ts","sourceRoot":"","sources":["localchain.js"],"names":[],"mappings":"AASA;;;;;;GAMG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAaG;AAMI,kDAHI,OAAO,mBAAmB,EAAE,IAAI,aAChC,QAAQ;;QA2BX;;;;;;WAMG;2BALQ,KAAK,CAAC,KAAK,CAAC,+BACZ;YACV,OAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,cAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/B;;;;QAYJ;;;WAGG;0BAFQ,KAAK,CAAC,KAAK,CAAC,GACV,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAOtC;;;;;;;;;WASG;yBAJQ,OAAO,CAAC,KAAK,CAAC,mBACd,OAAO,GAEL,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAYtC;;;;;;WAMG;yBAFQ,MAAM,CAAC,KAAK,CAAC,GACX,WAAW,OAAO,CAAC,KAAK,CAAC,CAAC;QAOvC;;;;;;;;;;;;WAYG;kBANwB,EAAE,SAAf,SAAS,EAAG,YAEf,EAAE,GACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAC7C,CAAC;QAgBL;;;WAGG;8BAFQ,SAAS,GACP,WAAW,kBAAkB,CAAC;;GAQhD;AAEH;;;;GAIG;AAEH,mEAAmE;AAEnE;;;;GAMG;AAiHI,6CAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;6BARN,gBAAgB;QA9ErB;;;;;;;WAOG;uBADU,WAAW,iBAAiB,CAAC;QAU1C;;;;;;;;WAQG;cAHuB,CAAC,SAAd,SAAW;;oBACb,CAAC,GACC,WAAW,SAAS,WAAW,CAAC,CAAC,CAAC,CAAC;QAShD;;;;;;;;;;;;;WAaG;kBARuD,EAAE,SAA9C,OAAO,sBAAsB,EAAE,SAAS,EAAG,YAC9C,EAAE,GACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS;YAC9B,KAAW,CAAC,EAAE,MAAM,CAAC;YACrB,KAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1B,CAAC,GACH,CAAC;;EAiDZ;;;;;;;;;;;;;8CA9SwB,CAAC,SAAZ,OAAO,EAAG,IACX,OAAO,CAAC,CAAC,CAAC;4BAaV;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,IAAQ,EAAE,IAAI,CAAC;IACf,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;+BAIS;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,WAAe,EAAE,WAAW,CAAC;IAC7B,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;mCAiJS,OAAO,CACnB,UAAc,CAAC,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC,CAC3D;gCAGU,oBAAoB,CAAC,SAAS,CAAC;8BAiI/B,UAAU,CAAC,OAAO,sBAAsB,CAAC;yBACzC,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;8BAzTpB,aAAa;gCAAb,aAAa;+BADF,sBAAsB;gCAAtB,sBAAsB;8BAAtB,sBAAsB;+BAExB,oBAAoB;wCAApB,oBAAoB;yCAE9B,YAAY;0BADd,eAAe;iCAAf,eAAe"}
+{"version":3,"file":"localchain.d.ts","sourceRoot":"","sources":["localchain.js"],"names":[],"mappings":"AAcA;;;;;;GAMG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;;;;;;;;;GAaG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAaG;AAMI,kDAHI,OAAO,mBAAmB,EAAE,IAAI,aAChC,QAAQ;;QA2BX;;;;;;WAMG;2BALQ,KAAK,CAAC,KAAK,CAAC,+BACZ;YACV,OAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,cAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/B;;;;QAYJ;;;WAGG;0BAFQ,KAAK,CAAC,KAAK,CAAC,GACV,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAUtC;;;;;;;;;WASG;yBAJQ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,mBACpB,OAAO,GAEL,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAYtC;;;;;;WAMG;yBAFQ,MAAM,CAAC,KAAK,CAAC,GACX,WAAW,OAAO,CAAC,KAAK,CAAC,CAAC;QAOvC;;;;;;;;;;;;;;;;;;;WAmBG;kBATwB,EAAE,SAAf,SAAS,EAAG,YAEf,EAAE,GACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAC7C,CAAC;QAmBL;;;WAGG;8BAFQ,SAAS,GACP,WAAW,kBAAkB,CAAC;;GAQhD;AAEH;;;;GAIG;AAEH,mEAAmE;AAEnE;;;;GAMG;AAoGI,6CAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;6BARN,gBAAgB;QAjErB;;;;;;;WAOG;uBADU,WAAW,iBAAiB,CAAC;QAU1C;;;;;;;;WAQG;cAHuB,CAAC,SAAd,SAAW;;oBACb,CAAC,GACC,WAAW,SAAS,WAAW,CAAC,CAAC,CAAC,CAAC;QAShD,0BAA0B;;;cAtPrB,iCAAiC,CAAC,GACzC,CAAa;;WAAA,GAAG,SAAS;YAC9B,KAAW,CAAC,EAAE,MAAM,CAAC;YACrB,KAAW,EAAE;;mBAAiB,CAAC;SAC1B,CAAC,GACH,CAAC;;EAiSJ;;;;;;;;;;;;;8CA1TwB,CAAC,SAAZ,OAAO,EAAG,IACX,OAAO,CAAC,CAAC,CAAC;;;;;wBAgBK,EAAE,SAAhB,SAAS,EAAG;;kBAEf,EAAE,KACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS;IAC9B,KAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;CAC1B,CAAC,GACH,CAAC;4BAIQ;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,IAAQ,EAAE,IAAI,CAAC;IACf,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;+BAIS;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,WAAe,EAAE,WAAW,CAAC;IAC7B,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;mCA2JS,OAAO,CACnB,UAAc,CAAC,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC,CAC3D;gCAGU,oBAAoB,CAAC,SAAS,CAAC;8BAoH/B,UAAU,CAAC,OAAO,sBAAsB,CAAC;yBACzC,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;8BArUpB,aAAa;gCAAb,aAAa;+BADF,sBAAsB;gCAAtB,sBAAsB;8BAAtB,sBAAsB;+BAExB,oBAAoB;wCAApB,oBAAoB;yCAE9B,YAAY;0BADd,eAAe;iCAAf,eAAe"}

package/src/localchain.js

@@ -1,10 +1,15 @@
 // @ts-check
+import { Fail } from '@endo/errors';
 import { E } from '@endo/far';
 import { M } from '@endo/patterns';
-import { AmountShape, BrandShape, PaymentShape } from '@agoric/ertp';
+import {
+  AmountPatternShape,
+  AmountShape,
+  BrandShape,
+  PaymentShape,
+} from '@agoric/ertp';
 import { Shape as NetworkShape } from '@agoric/network';
 
-const { Fail } = assert;
 const { Vow$ } = NetworkShape;
 
 /**
@@ -29,6 +34,21 @@ const { Vow$ } = NetworkShape;
  *   '[Symbol.iterator]()' method that returns an iterator.
  */
 
+/**
+ * Send a batch of query requests to the local chain. Unless there is a system
+ * error, will return all results to indicate their success or failure.
+ *
+ * @template {TypedJson[]} [RT=TypedJson[]]
+ * @callback QueryManyFn
+ * @param {RT} requests
+ * @returns {PromiseVowOfTupleMappedToGenerics<{
+ *   [K in keyof RT]: JsonSafe<{
+ *     error?: string;
+ *     reply: ResponseTo<RT[K]>;
+ *   }>;
+ * }>}
+ */
+
 /**
  * @typedef {{
  *   system: ScopedBridgeManager<'vlocalchain'>;
@@ -49,7 +69,7 @@ export const LocalChainAccountI = M.interface('LocalChainAccount', {
   getAddress: M.callWhen().returns(Vow$(M.string())),
   getBalance: M.callWhen(BrandShape).returns(Vow$(AmountShape)),
   deposit: M.callWhen(PaymentShape)
-    .optional(M.pattern())
+    .optional(AmountPatternShape)
     .returns(Vow$(AmountShape)),
   withdraw: M.callWhen(AmountShape).returns(Vow$(PaymentShape)),
   executeTx: M.callWhen(M.arrayOf(M.record())).returns(
@@ -115,12 +135,15 @@ export const prepareLocalChainAccountKit = (zone, { watch }) =>
           const purse = E(bank).getPurse(brand);
           return E(purse).getCurrentAmount();
         },
+
+        // TODO The payment parameter type below should be Payment<'nat'>.
+        // https://github.com/Agoric/agoric-sdk/issues/9828
         /**
          * Deposit a payment into the bank purse that matches the alleged brand.
          * This is safe, since even if the payment lies about its brand, ERTP
          * will reject spoofed payment objects when depositing into a purse.
          *
-         * @param {Payment<'nat'>} payment
+         * @param {ERef<Payment<'nat'>>} payment
          * @param {Pattern} [optAmountShape] throws if the Amount of the Payment
          *   does not match the provided Pattern
          * @returns {PromiseVow<Amount<'nat'>>}
@@ -148,10 +171,14 @@ export const prepareLocalChainAccountKit = (zone, { watch }) =>
           return E(purse).withdraw(amount);
         },
         /**
-         * Execute a batch of messages in order as a single atomic transaction
-         * and return the responses. If any of the messages fails, the entire
-         * batch will be rolled back. Use `typedJson()` on the arguments to get
-         * typed return values.
+         * Execute a batch of messages on the local chain. Note in particular,
+         * that for IBC `MsgTransfer`, execution only queues a packet for the
+         * local chain's IBC stack, and returns a `MsgTransferResponse`
+         * immediately, not waiting for the confirmation on the other chain.
+         *
+         * Messages are executed in order as a single atomic transaction and
+         * returns the responses. If any of the messages fails, the entire batch
+         * will be rolled back on the local chain.
          *
          * @template {TypedJson[]} MT messages tuple (use const with multiple
          *   elements or it will be a mixed array)
@@ -159,6 +186,9 @@ export const prepareLocalChainAccountKit = (zone, { watch }) =>
          * @returns {PromiseVowOfTupleMappedToGenerics<{
          *   [K in keyof MT]: JsonSafe<ResponseTo<MT[K]>>;
          * }>}
+         *
+         * @see {typedJson} which can be used on arguments to get typed return
+         * values.
          */
         async executeTx(messages) {
           const { address, system } = this.state;
@@ -257,20 +287,7 @@ const prepareLocalChain = (zone, makeAccountKit, { watch }) => {
             this.facets.extractFirstQueryResultWatcher,
           );
         },
-        /**
-         * Send a batch of query requests to the local chain. Unless there is a
-         * system error, will return all results to indicate their success or
-         * failure.
-         *
-         * @template {import('@agoric/cosmic-proto').TypedJson[]} RT
-         * @param {RT} requests
-         * @returns {PromiseVowOfTupleMappedToGenerics<{
-         *   [K in keyof RT]: JsonSafe<{
-         *     error?: string;
-         *     reply: ResponseTo<RT[K]>;
-         *   }>;
-         * }>}
-         */
+        /** @type {QueryManyFn} */
         async queryMany(requests) {
           const { system } = this.state;
           return E(system).toBridge({

package/src/nameHub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nameHub.d.ts","sourceRoot":"","sources":["nameHub.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AA8CO,4CADK,OAAO,cAAc,EAAE,IAAI,eA4B1B,OAAO,YAAY,EAAE,SAAS,WAC9B,MAAM,0EAalB;AA4CM,wCAFI,OAAO,cAAc,EAAE,IAAI,SAcnB,OAAO,YAAY,EAAE,UAAU,CA0NjD;AAED;;;;;GAKG;AACH,mCAlOmB,OAAO,YAAY,EAAE,UAAU,CAkOc;2BAvRlD;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE"}
+{"version":3,"file":"nameHub.d.ts","sourceRoot":"","sources":["nameHub.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AA4CO,4CADK,OAAO,cAAc,EAAE,IAAI,eA4B1B,OAAO,YAAY,EAAE,SAAS,WAC9B,MAAM,0EAalB;AA4CM,wCAFI,OAAO,cAAc,EAAE,IAAI,SAcnB,OAAO,YAAY,EAAE,UAAU,CA0NjD;AAED;;;;;GAKG;AACH,mCAlOmB,OAAO,YAAY,EAAE,UAAU,CAkOc;2BAvRlD;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE"}

package/src/nameHub.js

@@ -1,4 +1,4 @@
-import { assert, NonNullish } from '@agoric/assert';
+import { assert, Fail, q } from '@endo/errors';
 import { E } from '@endo/far';
 import { makePromiseKit } from '@endo/promise-kit';
 import { M, getInterfaceGuardPayload } from '@endo/patterns';
@@ -9,9 +9,7 @@ import {
   prepareGuardedAttenuator,
 } from '@agoric/internal/src/callback.js';
 import { makeHeapZone } from '@agoric/zone';
-import { deeplyFulfilledObject } from '@agoric/internal';
-
-const { Fail, quote: q } = assert;
+import { deeplyFulfilledObject, NonNullish } from '@agoric/internal';
 
 const KeyShape = M.string();
 const PathShape = M.arrayOf(KeyShape);

package/src/priceAuthorityRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityRegistry.d.ts","sourceRoot":"","sources":["priceAuthorityRegistry.js"],"names":[],"mappings":"AAiDO,uDAHI,OAAO,kBAAkB,EAAE,OAAO,GAChC,sBAAsB,CA4KlC;;YAtMa,MAAM,IAAI;;;;;;4BAKV,CACb,EAAM,EAAE,IAAI,CAAC,cAAc,CAAC,EAC5B,OAAW,EAAE,KAAK,EAClB,QAAY,EAAE,KAAK,EACnB,KAAS,CAAC,EAAE,OAAO,KACZ,OAAO,CAAC,OAAO,CAAC;;;;;;;;oBAQV,cAAc;gBACd,2BAA2B;;oCA1BgD,4BAA4B"}
+{"version":3,"file":"priceAuthorityRegistry.d.ts","sourceRoot":"","sources":["priceAuthorityRegistry.js"],"names":[],"mappings":"AAiDO,uDAHI,OAAO,kBAAkB,EAAE,OAAO,GAChC,sBAAsB,CA4KlC;;YAtMa,MAAM,IAAI;;;;;;4BAKV,CACb,EAAM,EAAE,IAAI,CAAC,cAAc,CAAC,EAC5B,OAAW,EAAE,KAAK,EAClB,QAAY,EAAE,KAAK,EACnB,KAAS,CAAC,EAAE,OAAO,KACZ,OAAO,CAAC,OAAO,CAAC;;;;;;;;oBAQV,cAAc;gBACd,2BAA2B;;oCAxBgD,4BAA4B"}

package/src/priceAuthorityRegistry.js

@@ -1,3 +1,7 @@
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { Far } from '@endo/marshal';
+
 import { BrandShape } from '@agoric/ertp';
 import {
   M,
@@ -6,8 +10,6 @@ import {
   provideDurableMapStore,
 } from '@agoric/vat-data';
 import { provideLazy } from '@agoric/store';
-import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
 import { PriceAuthorityI } from '@agoric/zoe/src/contractSupport/priceAuthority.js';
 
 /**
@@ -15,8 +17,6 @@ import { PriceAuthorityI } from '@agoric/zoe/src/contractSupport/priceAuthority.
  * @import {MutableQuote, PriceAuthority, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  */
 
-const { Fail } = assert;
-
 /**
  * @typedef {object} Deleter
  * @property {() => void} delete

package/src/proposals/localchain-proposal.d.ts

@@ -1,6 +1,5 @@
 export function setupLocalChainVat({ consume: { loadCriticalVat, bridgeManager: bridgeManagerP, localchainBridgeManager: localchainBridgeManagerP, bankManager, transferMiddleware, }, produce: { localchainVat, localchain, localchainBridgeManager }, }: BootstrapPowers & {
     consume: {
-        loadCriticalVat: VatLoader<any>;
         bridgeManager: import("../types").BridgeManager;
         localchainBridgeManager: import("../types").ScopedBridgeManager<"vlocalchain">;
         bankManager: Promise<import("../vat-bank.js").BankManager>;

package/src/proposals/localchain-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localchain-proposal.d.ts","sourceRoot":"","sources":["localchain-proposal.js"],"names":[],"mappings":"AA0BO,2PArBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,eAAqB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QACtC,aAAmB,EAAE,OAAO,UAAU,EAAE,aAAa,CAAC;QACtD,uBAA6B,EAAE,OAAO,UAAU,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACrF,WAAiB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,WAAW,CAAC,CAAC;QACjE,kBAAwB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;KAC1E,CAAC;IACN,OAAW,EAAE;QACb,UAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChC,aAAmB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,uBAA6B,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACxC,CAAC;CACH,WAED;IAAiD,OAAO,EAAhD;QAAE,aAAa,EAAE,YAAY,CAAA;KAAE;CAEvC,iBA4DF;AAUM,2EAPI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,UAAgB,EAAE,OAAO,kBAAkB,EAAE,UAAU,CAAC;KACnD,CAAC;CACH,YACO,MAAM,iBAOhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BL;6BAxGW;IACZ,UAAc,EAAE,IAAI,CAAC,OAAO,sBAAsB,EAAE,aAAa,CAAC,CAAC;CAChE"}
+{"version":3,"file":"localchain-proposal.d.ts","sourceRoot":"","sources":["localchain-proposal.js"],"names":[],"mappings":"AA0BO,2PApBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,aAAmB,EAAE,OAAO,UAAU,EAAE,aAAa,CAAC;QACtD,uBAA6B,EAAE,OAAO,UAAU,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACrF,WAAiB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,WAAW,CAAC,CAAC;QACjE,kBAAwB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;KAC1E,CAAC;IACN,OAAW,EAAE;QACb,UAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChC,aAAmB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,uBAA6B,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACxC,CAAC;CACH,WAED;IAAiD,OAAO,EAAhD;QAAE,aAAa,EAAE,YAAY,CAAA;KAAE;CAEvC,iBA6DF;AAUM,2EAPI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,UAAgB,EAAE,OAAO,kBAAkB,EAAE,UAAU,CAAC;KACnD,CAAC;CACH,YACO,MAAM,iBAOhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BL;6BAzGW;IACZ,UAAc,EAAE,IAAI,CAAC,OAAO,sBAAsB,EAAE,aAAa,CAAC,CAAC;CAChE"}

package/src/proposals/localchain-proposal.js

@@ -1,11 +1,11 @@
 // @ts-check
 import { E } from '@endo/far';
 import { BridgeId as BRIDGE_ID } from '@agoric/internal';
+import { makeScopedBridge } from '../bridge.js';
 
 /**
  * @param {BootstrapPowers & {
  *   consume: {
- *     loadCriticalVat: VatLoader<any>;
  *     bridgeManager: import('../types').BridgeManager;
  *     localchainBridgeManager: import('../types').ScopedBridgeManager<'vlocalchain'>;
  *     bankManager: Promise<import('../vat-bank.js').BankManager>;
@@ -58,9 +58,10 @@ export const setupLocalChainVat = async (
   /** @type {import('../types').ScopedBridgeManager<'vlocalchain'>} */
   let scopedManager;
   try {
-    /** @type {import('../types.js').ScopedBridgeManager<'vlocalchain'>} */
-    // @ts-expect-error XXX EProxy
-    scopedManager = await E(bridgeManager).register(BRIDGE_ID.VLOCALCHAIN);
+    scopedManager = await makeScopedBridge(
+      bridgeManager,
+      BRIDGE_ID.VLOCALCHAIN,
+    );
     localchainBridgeManager.reset();
     localchainBridgeManager.resolve(scopedManager);
   } catch (e) {

package/src/proposals/localchain-test.js

@@ -1,6 +1,6 @@
 // @ts-check
 import { heapVowE as E } from '@agoric/vow/vat.js';
-import { typedJson } from '@agoric/cosmic-proto/vatsafe';
+import { typedJson } from '@agoric/cosmic-proto';
 
 /**
  * @param {BootstrapPowers & {
@@ -20,7 +20,7 @@ export const testLocalChain = async (
   let node = await chainStorage;
   if (!node) {
     console.error('testLocalChain no chainStorage');
-    throw new Error('no chainStorage');
+    throw Error('no chainStorage');
   }
 
   let result;
@@ -58,7 +58,7 @@ export const testLocalChain = async (
     const emptyQuery = await E(localchain).queryMany([]);
     console.info('emptyQuery', emptyQuery);
     if (emptyQuery.length !== 0) {
-      throw new Error('emptyQuery results should be empty');
+      throw Error('emptyQuery results should be empty');
     }
 
     result = { success: true };

package/src/proposals/network-proposal.d.ts

@@ -1,8 +1,5 @@
 export function registerNetworkProtocols(vats: SoloVats | NetVats, dibcBridgeManager?: globalThis.ERef<import("../types.js").ScopedBridgeManager<"dibc">> | undefined): Promise<void>;
 export function setupNetworkProtocols({ consume: { client, loadCriticalVat, bridgeManager: bridgeManagerP, provisioning, vatUpgradeInfo: vatUpgradeInfoP, }, produce: { portAllocator, vatUpgradeInfo: produceVatUpgradeInfo }, }: BootstrapPowers & {
-    consume: {
-        loadCriticalVat: VatLoader<any>;
-    };
     produce: {
         portAllocator: Producer<any>;
     };
@@ -38,23 +35,6 @@ export function getManifestForNetwork(_powers: any, { networkRef, ibcRef }: {
         ibcRef: any;
     };
 };
-/**
- * Create the network and IBC vats; produce `portAllocator` in the core /
- * bootstrap space.
- *
- * The `portAllocator` is CLOSELY HELD in the core space, where later, we claim
- * ports using `E(portAllocator).allocateCustomIBCPort`, for example.
- *
- * Contracts are expected to use the services of the network and IBC vats by way
- * of such ports.
- *
- * Testing facilities include:
- *
- * - loopback ports: `E(portAllocator).allocateCustomLocalPort()`
- * - an echo port: `E(portAllocator).allocateCustomIBCPort("echo")`
- * - echo port addrees: /ibc-port/custom-echo
- */
-export type VatLoader2 = ((name: "network") => NetworkVat) & ((name: "ibc") => IBCVat);
 /**
  * Create the network and IBC vats; produce `portAllocator` in the core /
  * bootstrap space.

package/src/proposals/network-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network-proposal.d.ts","sourceRoot":"","sources":["network-proposal.js"],"names":[],"mappings":"AA0BO,+CAHI,QAAQ,GAAG,OAAO,qHAuC5B;AAmCM,mOAjBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;IACjD,OAAW,EAAE;QAAE,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CAC3C,WAED;IAAoE,OAAO,EAAnE;QAAE,UAAU,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE;CAG1D,iBAgFF;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;;;;;;;;;;;;;;;;;yBAxGW,CAAC,CAAC,IAAI,EAAE,SAAS,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC;;;;;;;;;;;;;;;;;sBAG7D;IACZ,OAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9B,GAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,YAAgB,EAAE,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;CACjD"}
+{"version":3,"file":"network-proposal.d.ts","sourceRoot":"","sources":["network-proposal.js"],"names":[],"mappings":"AA2BO,+CAHI,QAAQ,GAAG,OAAO,qHAuC5B;AA8BM,mOAZI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CAC3C,WAED;IAAoE,OAAO,EAAnE;QAAE,UAAU,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE;CAE1D,iBA2EF;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;;;;;;;;;;;;;;;;;sBAnGW;IACZ,OAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9B,GAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,YAAgB,EAAE,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;CACjD"}

package/src/proposals/network-proposal.js

@@ -10,6 +10,7 @@ import { makeScalarBigMapStore } from '@agoric/vat-data';
 // Heap-based vow resolution is used for this module because the
 // bootstrap vat can't yet be upgraded.
 import { heapVowTools } from '@agoric/vow/vat.js';
+import { makeScopedBridge } from '../bridge.js';
 
 const { when } = heapVowTools;
 
@@ -79,15 +80,10 @@ export const registerNetworkProtocols = async (vats, dibcBridgeManager) => {
  * - echo port addrees: /ibc-port/custom-echo
  *
  * @param {BootstrapPowers & {
- *   consume: { loadCriticalVat: VatLoader<any> };
  *   produce: { portAllocator: Producer<any> };
  * }} powers
  * @param {object} options
  * @param {{ networkRef: VatSourceRef; ibcRef: VatSourceRef }} options.options
- *   // TODO: why doesn't overloading VatLoader work???
- *
- * @typedef {((name: 'network') => NetworkVat) & ((name: 'ibc') => IBCVat)} VatLoader2
- *
  *
  * @typedef {{
  *   network: ERef<NetworkVat>;
@@ -133,10 +129,8 @@ export const setupNetworkProtocols = async (
   const allocator = await portAllocatorP;
 
   const bridgeManager = await bridgeManagerP;
-  /** @type {import('../types.js').ScopedBridgeManager<'dibc'> | undefined} */
-  // @ts-expect-error XXX EProxy
   const dibcBridgeManager =
-    bridgeManager && E(bridgeManager).register(BRIDGE_ID.DIBC);
+    bridgeManager && makeScopedBridge(bridgeManager, BRIDGE_ID.DIBC);
 
   // The Interchain Account (ICA) Controller must be bound to a port that starts
   // with 'icacontroller', so we provide one such port to each client.

package/src/proposals/restart-vats-proposal.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { M, mustMatch } from '@agoric/store';
 import { E, getInterfaceOf } from '@endo/far';