@agoric/vats 0.15.2-dev-3d662f8.0 → 0.15.2-dev-1cd6408.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-3d662f8.0+3d662f8",
+  "version": "0.15.2-dev-1cd6408.0+1cd6408",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -22,18 +22,18 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-3d662f8.0+3d662f8",
-    "@agoric/ertp": "0.16.3-dev-3d662f8.0+3d662f8",
-    "@agoric/governance": "0.10.4-dev-3d662f8.0+3d662f8",
-    "@agoric/internal": "0.3.3-dev-3d662f8.0+3d662f8",
-    "@agoric/network": "0.1.1-dev-3d662f8.0+3d662f8",
-    "@agoric/notifier": "0.6.3-dev-3d662f8.0+3d662f8",
-    "@agoric/store": "0.9.3-dev-3d662f8.0+3d662f8",
-    "@agoric/swingset-vat": "0.32.3-dev-3d662f8.0+3d662f8",
-    "@agoric/time": "0.3.3-dev-3d662f8.0+3d662f8",
-    "@agoric/vat-data": "0.5.3-dev-3d662f8.0+3d662f8",
-    "@agoric/zoe": "0.26.3-dev-3d662f8.0+3d662f8",
-    "@agoric/zone": "0.2.3-dev-3d662f8.0+3d662f8",
+    "@agoric/assert": "0.6.1-dev-1cd6408.0+1cd6408",
+    "@agoric/ertp": "0.16.3-dev-1cd6408.0+1cd6408",
+    "@agoric/governance": "0.10.4-dev-1cd6408.0+1cd6408",
+    "@agoric/internal": "0.3.3-dev-1cd6408.0+1cd6408",
+    "@agoric/network": "0.1.1-dev-1cd6408.0+1cd6408",
+    "@agoric/notifier": "0.6.3-dev-1cd6408.0+1cd6408",
+    "@agoric/store": "0.9.3-dev-1cd6408.0+1cd6408",
+    "@agoric/swingset-vat": "0.32.3-dev-1cd6408.0+1cd6408",
+    "@agoric/time": "0.3.3-dev-1cd6408.0+1cd6408",
+    "@agoric/vat-data": "0.5.3-dev-1cd6408.0+1cd6408",
+    "@agoric/zoe": "0.26.3-dev-1cd6408.0+1cd6408",
+    "@agoric/zone": "0.2.3-dev-1cd6408.0+1cd6408",
     "@endo/far": "^1.0.4",
     "@endo/import-bundle": "^1.0.4",
     "@endo/marshal": "^1.3.0",
@@ -44,7 +44,7 @@
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-3d662f8.0+3d662f8",
+    "@agoric/swingset-liveslots": "0.10.3-dev-1cd6408.0+1cd6408",
     "@endo/bundle-source": "^3.1.0",
     "@endo/init": "^1.0.4",
     "ava": "^5.3.0",
@@ -77,5 +77,5 @@
   "typeCoverage": {
     "atLeast": 89.69
   },
-  "gitHead": "3d662f8942693391430a675dad4e68b9867a5e89"
+  "gitHead": "1cd6408e27271160227f8aaa12d9771ea73a1da1"
 }

package/src/ibc.d.ts

@@ -17,7 +17,7 @@ export function prepareIBCProtocol(zone: import('@agoric/base-zone').Zone, power
     isRetryableReason?: ((reason: any) => boolean) | undefined;
     watchPromise?: ((p: PromiseLike<any>, watcher: import("@agoric/vow/src/watch-promise.js").PromiseWatcher, ...args: unknown[]) => void) | undefined;
 } | undefined) => {
-    when: <T = any, TResult1 = import("@agoric/vow/src/E.js").Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("@agoric/vow/src/E.js").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
+    when: <T, TResult1 = import("@agoric/vow").Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("@agoric/vow").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
     watch: <T_1 = any, TResult1_1 = T_1, TResult2_1 = T_1>(specimenP: import("@agoric/vow").ERef<T_1 | import("@agoric/vow").Vow<T_1>>, watcher?: import("@agoric/vow").Watcher<T_1, TResult1_1, TResult2_1> | undefined, watcherContext?: unknown) => import("@agoric/vow").Vow<TResult1_1 | TResult2_1>;
     makeVowKit: <T_2>() => import("@agoric/vow").VowKit<T_2>;
     allVows: (vows: any) => import("@agoric/vow").Vow<any>;

package/src/ibc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ibc.d.ts","sourceRoot":"","sources":["ibc.js"],"names":[],"mappings":"AA2DO,kDADK,OAAO,mBAAmB,EAAE,IAAI;;IA+CtC;;;;;;;OAOG;qBANQ,UAAU,eACV,KAAK,YACL,iBAAiB;QAEF,iBAAiB;QAC9B,WAAW,KAAK,CAAC;;GA6CnC;AAMM,yCAHI,OAAO,mBAAmB,EAAE,IAAI,UAChC;;;;;;;;EAAiD;qBAgBlC,eAAe;mBACjB,aAAa;;;;;;;;;;;;;;;EA6lBpC;AAKM,uCADK,OAAO,mBAAmB,EAAE,IAAI;;GAkB3C;4BAnxBa,OAAO,YAAY,EAAE,aAAa;wBAGnC,MAAM;2BAEN,MAAM;8BAEN,MAAM;;;oBAML,YAAY;iBACZ,SAAS;yBACT,YAAY;sBACZ,SAAS;;;aAKT,MAAM;gBACN,MAAM;;;WAGN,SAAS,GAAG,WAAW;oBACvB,MAAM,EAAE;YACR,MAAM;eACN,MAAM;kBACN,YAAY;aACZ,MAAM;;yBAEP,OAAO,aAAa,EAAE,MAAM,CAAC,kBAAkB,CAAC;uBAEhD,KAAK,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,GAAG;IACjE,SAAa,EAAE,QAAQ,CAAC;IACxB,UAAc,EAAE,UAAU,CAAC;IAC3B,YAAgB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC"}
+{"version":3,"file":"ibc.d.ts","sourceRoot":"","sources":["ibc.js"],"names":[],"mappings":"AA2DO,kDADK,OAAO,mBAAmB,EAAE,IAAI;;IA+CtC;;;;;;;OAOG;qBANQ,UAAU,eACV,KAAK,YACL,iBAAiB;QAEF,iBAAiB;QAC9B,WAAW,KAAK,CAAC;;GA6CnC;AAMM,yCAHI,OAAO,mBAAmB,EAAE,IAAI,UAChC;;;;;;;;EAAiD;qBAgBlC,eAAe;mBACjB,aAAa;;;;;;;;;;;;;;;EAqmBpC;AAKM,uCADK,OAAO,mBAAmB,EAAE,IAAI;;GAkB3C;4BA3xBa,OAAO,YAAY,EAAE,aAAa;wBAGnC,MAAM;2BAEN,MAAM;8BAEN,MAAM;;;oBAML,YAAY;iBACZ,SAAS;yBACT,YAAY;sBACZ,SAAS;;;aAKT,MAAM;gBACN,MAAM;;;WAGN,SAAS,GAAG,WAAW;oBACvB,MAAM,EAAE;YACR,MAAM;eACN,MAAM;kBACN,YAAY;aACZ,MAAM;;yBAEP,OAAO,aAAa,EAAE,MAAM,CAAC,kBAAkB,CAAC;uBAEhD,KAAK,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,GAAG;IACjE,SAAa,EAAE,QAAQ,CAAC;IACxB,UAAc,EAAE,UAAU,CAAC;IAC3B,YAAgB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC"}

package/src/ibc.js

@@ -12,8 +12,8 @@ import '@agoric/network/exported.js';
 // empty acknowledgements as distinct from unacknowledged packets.
 const DEFAULT_ACKNOWLEDGEMENT = '\x00';
 
-// Default timeout after 10 minutes.
-const DEFAULT_PACKET_TIMEOUT_NS = 10n * 60n * 1_000_000_000n;
+// Default timeout after 60 minutes.
+const DEFAULT_PACKET_TIMEOUT_NS = 60n * 60n * 1_000_000_000n;
 
 /** @typedef {import('./types.js').BridgeHandler} BridgeHandler */
 
@@ -194,13 +194,18 @@ export const prepareIBCProtocol = (zone, powers) => {
     'IBCProtocolHandler',
     undefined,
     ibcdev => {
-      /** @type {MapStore<string, Connection>} */
+      /** @type {MapStore<string, import('@agoric/vow').Remote<Connection>>} */
       const channelKeyToConnP = detached.mapStore('channelKeyToConnP');
 
       /** @type {MapStore<string, ConnectingInfo>} */
       const channelKeyToInfo = detached.mapStore('channelKeyToInfo');
 
-      /** @type {MapStore<string, InboundAttempt>} */
+      /**
+       * @type {MapStore<
+       *   string,
+       *   import('@agoric/vow').Remote<InboundAttempt>
+       * >}
+       */
       const channelKeyToAttempt = detached.mapStore('channelKeyToAttempt');
 
       /** @type {MapStore<string, Outbound[]>} */
@@ -230,8 +235,9 @@ export const prepareIBCProtocol = (zone, powers) => {
         srcPortToOutbounds,
         channelKeyToSeqAck,
         portToPendingConns,
-        lastPortID: 0, // Nonce for creating port identifiers.
-        /** @type {ProtocolImpl | undefined} */ protocolImpl: undefined,
+        lastPortID: 0n, // Nonce for creating port identifiers.
+        /** @type {import('@agoric/vow').Remote<ProtocolImpl> | null} */
+        protocolImpl: null,
       };
     },
     {
@@ -245,7 +251,7 @@ export const prepareIBCProtocol = (zone, powers) => {
           return '';
         },
         async generatePortID(_localAddr, _protocolHandler) {
-          this.state.lastPortID += 1;
+          this.state.lastPortID += 1n;
           return `port-${this.state.lastPortID}`;
         },
         async onBind(port, localAddr, _protocolHandler) {
@@ -315,7 +321,10 @@ export const prepareIBCProtocol = (zone, powers) => {
             onConnectP: kit,
             localAddr,
           };
-          if (!srcPortToOutbounds.has(portID)) {
+          if (srcPortToOutbounds.has(portID)) {
+            const outbounds = srcPortToOutbounds.get(portID);
+            srcPortToOutbounds.set(portID, harden([...outbounds, ob]));
+          } else {
             srcPortToOutbounds.init(portID, harden([ob]));
           }
 
@@ -426,11 +435,10 @@ export const prepareIBCProtocol = (zone, powers) => {
               //     e => console.warn('Manual packet', e, 'failed:', e),
               //   );
 
+              assert(protocolImpl);
+
               return watch(
-                /** @type {ProtocolImpl} */ (protocolImpl).inbound(
-                  localAddr,
-                  remoteAddr,
-                ),
+                E(protocolImpl).inbound(localAddr, remoteAddr),
                 this.facets.protocolImplInboundWatcher,
                 {
                   obj,
@@ -556,7 +564,7 @@ export const prepareIBCProtocol = (zone, powers) => {
               const conn = channelKeyToConnP.get(channelKey);
               const data = base64ToBytes(data64);
 
-              return watch(conn.send(data), this.facets.ackWatcher, {
+              return watch(E(conn).send(data), this.facets.ackWatcher, {
                 packet,
               });
             }
@@ -592,7 +600,7 @@ export const prepareIBCProtocol = (zone, powers) => {
               if (channelKeyToConnP.has(channelKey)) {
                 const conn = channelKeyToConnP.get(channelKey);
                 channelKeyToConnP.delete(channelKey);
-                void conn.close();
+                void E(conn).close();
               }
               break;
             }
@@ -664,7 +672,7 @@ export const prepareIBCProtocol = (zone, powers) => {
             return seqToAck.get(sequence);
           }
           const kit = makeVowKit();
-          seqToAck.init(sequence, harden(kit));
+          seqToAck.init(sequence, kit);
           return kit;
         },
       },

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

@@ -1 +1 @@
-{"version":3,"file":"network-proposal.d.ts","sourceRoot":"","sources":["network-proposal.js"],"names":[],"mappings":"AAiBO,+CAHI,QAAQ,GAAG,OAAO,kGAoC5B;AAqCM,gOAhBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,UAAU,GAAG,CAAC,CAAA;KAAE,CAAC;IACjD,OAAW,EAAE;QAAE,UAAU,EAAE,SAAS,GAAG,CAAC,CAAA;KAAE,CAAC;CACxC;;oBAEqB,YAAY;gBAAU,YAAY;;kBAiF1D;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;;;;;;;;;;;;;;;;;;;;iCAtGmB,SAAS,KAAK,UAAU,YAAY,KAAK,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;sBAE5D;IACZ,OAAW,EAAE,KAAK,UAAU,CAAC,CAAC;IAC9B,GAAO,EAAE,KAAK,MAAM,CAAC,CAAC;IACtB,YAAgB,EAAE,KAAK,eAAe,GAAG,SAAS,CAAC,CAAC;CACjD"}
+{"version":3,"file":"network-proposal.d.ts","sourceRoot":"","sources":["network-proposal.js"],"names":[],"mappings":"AAoBO,+CAHI,QAAQ,GAAG,OAAO,kGAuC5B;AAqCM,gOAhBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,UAAU,GAAG,CAAC,CAAA;KAAE,CAAC;IACjD,OAAW,EAAE;QAAE,UAAU,EAAE,SAAS,GAAG,CAAC,CAAA;KAAE,CAAC;CACxC;;oBAEqB,YAAY;gBAAU,YAAY;;kBA4E1D;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;;;;;;;;;;;;;;;;;;;;iCAjGmB,SAAS,KAAK,UAAU,YAAY,KAAK,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;sBAE5D;IACZ,OAAW,EAAE,KAAK,UAAU,CAAC,CAAC;IAC9B,GAAO,EAAE,KAAK,MAAM,CAAC,CAAC;IACtB,YAAgB,EAAE,KAAK,eAAe,GAAG,SAAS,CAAC,CAAC;CACjD"}

package/src/proposals/network-proposal.js

@@ -4,10 +4,13 @@
  */
 import { E } from '@endo/far';
 import { BridgeId as BRIDGE_ID } from '@agoric/internal';
-import { prepareVowTools } from '@agoric/vat-data/vow.js';
-import { makeHeapZone } from '@agoric/zone';
+
 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 { when } from '@agoric/vat-data/vow.js';
+
 const NUM_IBC_PORTS_PER_CLIENT = 3;
 const INTERCHAIN_ACCOUNT_CONTROLLER_PORT_PREFIX = 'icacontroller-';
 
@@ -16,9 +19,12 @@ const INTERCHAIN_ACCOUNT_CONTROLLER_PORT_PREFIX = 'icacontroller-';
  * @param {ERef<import('../types.js').ScopedBridgeManager>} [dibcBridgeManager]
  */
 export const registerNetworkProtocols = async (vats, dibcBridgeManager) => {
+  /** @type {Promise<void>[]} */
   const ps = [];
 
-  const loopbackHandler = await E(vats.network).makeLoopbackProtocolHandler();
+  const loopbackHandler = /** @type {Remote<ProtocolHandler>} */ (
+    await E(vats.network).makeLoopbackProtocolHandler()
+  );
   // Every vat has a loopback device.
   ps.push(E(vats.network).registerProtocolHandler(['/local'], loopbackHandler));
 
@@ -42,8 +48,8 @@ export const registerNetworkProtocols = async (vats, dibcBridgeManager) => {
         ),
     );
   } else {
-    const loHandler = await E(vats.network).makeLoopbackProtocolHandler(
-      'ibc-channel/channel-',
+    const loHandler = /** @type {Remote<ProtocolHandler>} */ (
+      await E(vats.network).makeLoopbackProtocolHandler('ibc-channel/channel-')
     );
     ps.push(E(vats.network).registerProtocolHandler(['/ibc-port'], loHandler));
   }
@@ -134,7 +140,7 @@ export const setupNetworkProtocols = async (
         lastICAPort += 1;
         bindAddr += `${INTERCHAIN_ACCOUNT_CONTROLLER_PORT_PREFIX}${lastICAPort}`;
       }
-      const port = E(vats.network).bind(bindAddr);
+      const port = when(E(vats.network).bind(bindAddr));
       ibcportP.push(port);
     }
     return Promise.all(ibcportP);
@@ -145,15 +151,10 @@ export const setupNetworkProtocols = async (
   // ibc-port etc.
   await registerNetworkProtocols(vats, dibcBridgeManager);
 
-  // Heap-based vow resolution is used for this module because the
-  // bootstrap vat can't yet be upgraded.
-  const powers = prepareVowTools(makeHeapZone());
-
-  const { when } = powers;
   // Add an echo listener on our ibc-port network (whether real or virtual).
   const echoPort = await when(E(vats.network).bind('/ibc-port/echo'));
   const { listener } = await E(vats.network).makeEchoConnectionKit();
-  await E(echoPort).addListener(listener);
+  await when(E(echoPort).addListener(listener));
   return E(client).assignBundle([_a => ({ ibcport: makePorts() })]);
 };
 

package/src/vat-network.d.ts

@@ -3,10 +3,10 @@ export function buildRootObject(_vatPowers: any, _args: any, baggage: any): {
         onCreate(_impl: any, _protocolHandler: any): Promise<void>;
         generatePortID(_localAddr: any, _protocolHandler: any): Promise<string>;
         onBind(_port: any, _localAddr: any, _protocolHandler: any): Promise<void>;
-        onConnect(_port: any, localAddr: any, remoteAddr: any, _chandler: any, protocolHandler: any): Promise<import("@agoric/vow").Vow<any>>;
+        onConnect(_port: any, localAddr: string, remoteAddr: string): PromiseVow<AttemptDescription>;
         onInstantiate(_port: any, _localAddr: any, _remote: any, _protocol: any): Promise<string>;
         onListen(port: any, localAddr: any, listenHandler: any, _protocolHandler: any): Promise<void>;
-        onListenRemove(port: Port, localAddr: string, listenHandler: ListenHandler, _protocolHandler: any): Promise<void>;
+        onListenRemove(port: Remote<Port>, localAddr: string, listenHandler: Remote<ListenHandler>, _protocolHandler: any): Promise<void>;
         onRevoke(_port: any, _localAddr: any, _protocolHandler: any): Promise<void>;
     }>;
     makeEchoConnectionKit: () => import("@endo/exo/src/exo-makers").GuardedKit<{
@@ -23,9 +23,9 @@ export function buildRootObject(_vatPowers: any, _args: any, baggage: any): {
         };
     }>;
     /** @param {Parameters<typeof protocol.registerProtocolHandler>} args */
-    registerProtocolHandler: (paths: string[], protocolHandler: ProtocolHandler) => void;
+    registerProtocolHandler: (paths: string[], protocolHandler: Remote<ProtocolHandler>) => void;
     /** @param {Parameters<typeof protocol.unregisterProtocolHandler>} args */
-    unregisterProtocolHandler: (prefix: string, protocolHandler: ProtocolHandler) => void;
+    unregisterProtocolHandler: (prefix: string, protocolHandler: Remote<ProtocolHandler>) => void;
     /** @param {Parameters<typeof protocol.bind>} args */
     bind: (localAddr: string) => Promise<Port | import("@agoric/vow").Vow<Port>>;
 } & import("@endo/eventual-send").RemotableBrand<{}, {
@@ -33,10 +33,10 @@ export function buildRootObject(_vatPowers: any, _args: any, baggage: any): {
         onCreate(_impl: any, _protocolHandler: any): Promise<void>;
         generatePortID(_localAddr: any, _protocolHandler: any): Promise<string>;
         onBind(_port: any, _localAddr: any, _protocolHandler: any): Promise<void>;
-        onConnect(_port: any, localAddr: any, remoteAddr: any, _chandler: any, protocolHandler: any): Promise<import("@agoric/vow").Vow<any>>;
+        onConnect(_port: any, localAddr: string, remoteAddr: string): PromiseVow<AttemptDescription>;
         onInstantiate(_port: any, _localAddr: any, _remote: any, _protocol: any): Promise<string>;
         onListen(port: any, localAddr: any, listenHandler: any, _protocolHandler: any): Promise<void>;
-        onListenRemove(port: Port, localAddr: string, listenHandler: ListenHandler, _protocolHandler: any): Promise<void>;
+        onListenRemove(port: Remote<Port>, localAddr: string, listenHandler: Remote<ListenHandler>, _protocolHandler: any): Promise<void>;
         onRevoke(_port: any, _localAddr: any, _protocolHandler: any): Promise<void>;
     }>;
     makeEchoConnectionKit: () => import("@endo/exo/src/exo-makers").GuardedKit<{
@@ -53,9 +53,9 @@ export function buildRootObject(_vatPowers: any, _args: any, baggage: any): {
         };
     }>;
     /** @param {Parameters<typeof protocol.registerProtocolHandler>} args */
-    registerProtocolHandler: (paths: string[], protocolHandler: ProtocolHandler) => void;
+    registerProtocolHandler: (paths: string[], protocolHandler: Remote<ProtocolHandler>) => void;
     /** @param {Parameters<typeof protocol.unregisterProtocolHandler>} args */
-    unregisterProtocolHandler: (prefix: string, protocolHandler: ProtocolHandler) => void;
+    unregisterProtocolHandler: (prefix: string, protocolHandler: Remote<ProtocolHandler>) => void;
     /** @param {Parameters<typeof protocol.bind>} args */
     bind: (localAddr: string) => Promise<Port | import("@agoric/vow").Vow<Port>>;
 }>;