@agoric/vats 0.15.2-dev-a9dd2ce.0 → 0.15.2-dev-d33a853.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-a9dd2ce.0+a9dd2ce",
+  "version": "0.15.2-dev-d33a853.0+d33a853",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -22,19 +22,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/ertp": "0.16.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/governance": "0.10.4-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/internal": "0.3.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/network": "0.1.1-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/notifier": "0.6.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/store": "0.9.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/swingset-vat": "0.32.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/time": "0.3.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/vat-data": "0.5.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/vow": "0.1.1-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/zoe": "0.26.3-dev-a9dd2ce.0+a9dd2ce",
-    "@agoric/zone": "0.2.3-dev-a9dd2ce.0+a9dd2ce",
+    "@agoric/cosmic-proto": "0.4.1-dev-d33a853.0+d33a853",
+    "@agoric/ertp": "0.16.3-dev-d33a853.0+d33a853",
+    "@agoric/governance": "0.10.4-dev-d33a853.0+d33a853",
+    "@agoric/internal": "0.3.3-dev-d33a853.0+d33a853",
+    "@agoric/network": "0.1.1-dev-d33a853.0+d33a853",
+    "@agoric/notifier": "0.6.3-dev-d33a853.0+d33a853",
+    "@agoric/store": "0.9.3-dev-d33a853.0+d33a853",
+    "@agoric/swingset-vat": "0.32.3-dev-d33a853.0+d33a853",
+    "@agoric/time": "0.3.3-dev-d33a853.0+d33a853",
+    "@agoric/vat-data": "0.5.3-dev-d33a853.0+d33a853",
+    "@agoric/vow": "0.1.1-dev-d33a853.0+d33a853",
+    "@agoric/zoe": "0.26.3-dev-d33a853.0+d33a853",
+    "@agoric/zone": "0.2.3-dev-d33a853.0+d33a853",
     "@endo/errors": "^1.2.4",
     "@endo/far": "^1.1.4",
     "@endo/import-bundle": "^1.2.1",
@@ -47,7 +47,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-a9dd2ce.0+a9dd2ce",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d33a853.0+d33a853",
     "@endo/bundle-source": "^3.3.0",
     "@endo/init": "^1.1.3",
     "ava": "^5.3.0",
@@ -79,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 91.52
   },
-  "gitHead": "a9dd2ce995c59c21cc374e5af61db704ba074e29"
+  "gitHead": "d33a853c29841fab855d71f40c51c0a41e882d47"
 }

package/src/ibc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ibc.d.ts","sourceRoot":"","sources":["ibc.js"],"names":[],"mappings":"AAsDO,kDAHI,IAAI,GACF,GAAG,CAmHf;AAMM,yCAHI,IAAI,UACJ,QAAQ;cASH,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC;;qBAOpC,eAAe;mBACjB,aAAa;EA+mBpC;AAIM,uCADK,IAAI;IAQV;;;OAGG;qBAFQ,MAAM,OACN,GAAG;GAYnB;yBAhyBa,OAAO,kBAAkB,CAAC;uBAG3B,IAAI,CAChB,cAAkB,EAClB,cAAkB,GAAG,WAAW,GAAG,qBAAqB,CACrD,GAAG;IACN,SAAa,EAAE,QAAQ,CAAC;IACxB,UAAc,EAAE,UAAU,CAAC;IAC3B,YAAgB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;0BAdmB,mBAAmB;8BAC0B,aAAa;qCAH+B,iBAAiB;mCACyE,YAAY;yCAAZ,YAAY;wCAZjL,iBAAiB;4BAcc,aAAa;oCAFyH,YAAY;8BADtG,iBAAiB"}
+{"version":3,"file":"ibc.d.ts","sourceRoot":"","sources":["ibc.js"],"names":[],"mappings":"AAsDO,kDAHI,IAAI,GACF,GAAG,CAyHf;AAMM,yCAHI,IAAI,UACJ,QAAQ;cASH,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC;;qBAOpC,eAAe;mBACjB,aAAa;EAonBpC;AAIM,uCADK,IAAI;IAQV;;;OAGG;qBAFQ,MAAM,OACN,GAAG;GAYnB;yBA3yBa,OAAO,kBAAkB,CAAC;uBAG3B,IAAI,CAChB,cAAkB,EAClB,cAAkB,GAAG,WAAW,GAAG,qBAAqB,CACrD,GAAG;IACN,SAAa,EAAE,QAAQ,CAAC;IACxB,UAAc,EAAE,UAAU,CAAC;IAC3B,YAAgB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;0BAdmB,mBAAmB;8BAC0B,aAAa;qCAH+B,iBAAiB;mCACyE,YAAY;yCAAZ,YAAY;wCAZjL,iBAAiB;4BAcc,aAAa;oCAFyH,YAAY;8BADtG,iBAAiB"}

package/src/ibc.js

@@ -140,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();
       },
     },
   );
@@ -586,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/proposals/upgrade-orch-core-proposal.d.ts

@@ -0,0 +1,29 @@
+export function upgradeOrchCore({ consume: { vatAdminSvc, vatStore } }: BootstrapPowers & {
+    consume: {
+        vatAdminSvc: VatAdminSvc;
+        vatStore: MapStore<string, import("@agoric/swingset-vat").CreateVatResults>;
+    };
+}, options: {
+    options: {
+        bundleRefs: {
+            [vatName: string]: VatSourceRef;
+        };
+    };
+}): Promise<void>;
+export function getManifestForUpgradingOrchCore(_powers: any, { bundleRefs }: {
+    bundleRefs: any;
+}): {
+    manifest: {
+        [x: string]: {
+            consume: {
+                vatAdminSvc: string;
+                vatStore: string;
+            };
+            produce: {};
+        };
+    };
+    options: {
+        bundleRefs: any;
+    };
+};
+//# sourceMappingURL=upgrade-orch-core-proposal.d.ts.map

package/src/proposals/upgrade-orch-core-proposal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade-orch-core-proposal.d.ts","sourceRoot":"","sources":["upgrade-orch-core-proposal.js"],"names":[],"mappings":"AAeO,wEAZI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,WAAiB,EAAE,WAAW,CAAC;QAC/B,QAAc,EAAE,QAAQ,CACxB,MAAc,EACd,OAAe,sBAAsB,EAAE,gBAAgB,CAChD,CAAC;KACH,CAAC;CACH,WAED;IAAqE,OAAO,EAApE;QAAE,UAAU,EAAE;YAAE,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAA;SAAE,CAAA;KAAE;CAC7D,iBAeA;AAEM;;;;;;;;;;;;;;;EAWL"}

package/src/proposals/upgrade-orch-core-proposal.js

@@ -0,0 +1,43 @@
+import { E } from '@endo/far';
+
+/**
+ * @param {BootstrapPowers & {
+ *   consume: {
+ *     vatAdminSvc: VatAdminSvc;
+ *     vatStore: MapStore<
+ *       string,
+ *       import('@agoric/swingset-vat').CreateVatResults
+ *     >;
+ *   };
+ * }} powers
+ * @param {object} options
+ * @param {{ bundleRefs: { [vatName: string]: VatSourceRef } }} options.options
+ */
+export const upgradeOrchCore = async (
+  { consume: { vatAdminSvc, vatStore } },
+  options,
+) => {
+  const { bundleRefs } = options.options;
+
+  for await (const [name, ref] of Object.entries(bundleRefs)) {
+    assert(ref.bundleID, `bundleID missing for ${name}`);
+    console.log(name, `BUNDLE ID: `, ref.bundleID);
+    const bundleCap = await E(vatAdminSvc).getBundleCap(ref.bundleID);
+
+    const { adminNode } = await E(vatStore).get(name);
+    await E(adminNode).upgrade(bundleCap, {});
+  }
+};
+
+export const getManifestForUpgradingOrchCore = (_powers, { bundleRefs }) => ({
+  manifest: {
+    [upgradeOrchCore.name]: {
+      consume: {
+        vatAdminSvc: 'vatAdminSvc',
+        vatStore: 'vatStore',
+      },
+      produce: {},
+    },
+  },
+  options: { bundleRefs },
+});

package/src/types.d.ts

@@ -192,8 +192,8 @@ type IBCPacketEvents = {
   timeoutPacket: {
     packet: IBCPacket;
   };
-  channelCloseInit: ConnectingInfo; // TODO update
-  channelCloseConfirm: ConnectingInfo; // TODO update
+  channelCloseInit: { channelID: IBCChannelID; portID: IBCPortID };
+  channelCloseConfirm: { channelID: IBCChannelID; portID: IBCPortID };
   sendPacket: { relativeTimeoutNs: bigint; packet: IBCPacket };
 };
 

package/src/vat-network.d.ts

@@ -12,12 +12,12 @@ export function buildRootObject(_vatPowers: any, _args: any, baggage: any): {
     makeEchoConnectionKit: () => import("@endo/exo").GuardedKit<{
         handler: {
             onReceive(_connection: import("@agoric/network").Connection, bytes: import("@agoric/network").Bytes, _connectionHandler: import("@agoric/network").ConnectionHandler): Promise<string>;
-            onClose(_connection: import("@agoric/network").Connection, _reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
+            onClose(_connection: import("@agoric/network").Connection, reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
         };
         listener: {
             onAccept(_port: any, _localAddr: any, _remoteAddr: any, _listenHandler: any): Promise<import("@endo/exo").Guarded<{
                 onReceive(_connection: import("@agoric/network").Connection, bytes: import("@agoric/network").Bytes, _connectionHandler: import("@agoric/network").ConnectionHandler): Promise<string>;
-                onClose(_connection: import("@agoric/network").Connection, _reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
+                onClose(_connection: import("@agoric/network").Connection, reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
             }>>;
             onListen(port: any, _listenHandler: any): Promise<void>;
         };
@@ -46,12 +46,12 @@ export function buildRootObject(_vatPowers: any, _args: any, baggage: any): {
     makeEchoConnectionKit: () => import("@endo/exo").GuardedKit<{
         handler: {
             onReceive(_connection: import("@agoric/network").Connection, bytes: import("@agoric/network").Bytes, _connectionHandler: import("@agoric/network").ConnectionHandler): Promise<string>;
-            onClose(_connection: import("@agoric/network").Connection, _reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
+            onClose(_connection: import("@agoric/network").Connection, reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
         };
         listener: {
             onAccept(_port: any, _localAddr: any, _remoteAddr: any, _listenHandler: any): Promise<import("@endo/exo").Guarded<{
                 onReceive(_connection: import("@agoric/network").Connection, bytes: import("@agoric/network").Bytes, _connectionHandler: import("@agoric/network").ConnectionHandler): Promise<string>;
-                onClose(_connection: import("@agoric/network").Connection, _reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
+                onClose(_connection: import("@agoric/network").Connection, reason?: import("@agoric/network").CloseReason, _connectionHandler?: import("@agoric/network").ConnectionHandler | undefined): Promise<void>;
             }>>;
             onListen(port: any, _listenHandler: any): Promise<void>;
         };

package/src/vat-network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vat-network.d.ts","sourceRoot":"","sources":["vat-network.js"],"names":[],"mappings":"AAWA;;;;;qIAqCo5nC,aAAa;;;oCAAmuE,kBAAa,+GAAsF,kBAAa;;;;;;;;;;;;;;;;IAXhvsC,wEAAwE;;IAGxE,0EAA0E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAH1E,wEAAwE;;IAGxE,0EAA0E;;;;;;;;GAO7E"}
+{"version":3,"file":"vat-network.d.ts","sourceRoot":"","sources":["vat-network.js"],"names":[],"mappings":"AAYA;;;;;qIAsC+hnC,aAAa;;;;;;;;;;;;;;;;;;;IAXxinC,wEAAwE;;IAGxE,0EAA0E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAH1E,wEAAwE;;IAGxE,0EAA0E;;;;;;;;GAO7E"}

package/src/vat-network.js

@@ -3,6 +3,7 @@ import { makeDurableZone } from '@agoric/zone/durable.js';
 import {
   prepareEchoConnectionKit,
   prepareLoopbackProtocolHandler,
+  prepareNetworkPowers,
   preparePortAllocator,
   prepareRouterProtocol,
 } from '@agoric/network';
@@ -11,7 +12,8 @@ import { Far } from '@endo/far';
 
 export function buildRootObject(_vatPowers, _args, baggage) {
   const zone = makeDurableZone(baggage);
-  const powers = prepareVowTools(zone.subZone('vow'));
+  const vowTools = prepareVowTools(zone.subZone('vow'));
+  const powers = prepareNetworkPowers(zone, vowTools);
 
   const makeRouterProtocol = prepareRouterProtocol(
     zone.subZone('network'),

package/tools/fake-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fake-bridge.d.ts","sourceRoot":"","sources":["fake-bridge.js"],"names":[],"mappings":"AAkBA,6EAA6E;AAE7E,sCAAuC;AAchC,yCANI,OAAO,cAAc,EAAE,IAAI,SAEnC;IAAuB,QAAQ,EAAvB,QAAQ;CAChB,GAAU,oBAAoB,MAAM,CAAC,CA0FvC;AAOM,wCAJI,OAAO,cAAc,EAAE,IAAI,cAC3B,CAAC,GAAG,KAAA,KAAK,IAAI,GACX,oBAAoB,MAAM,CAAC,CA8BvC;AAED,iEAAkE;;;;;AAwB3D,0DALI,MAAM,YACN,MAAM,GACJ,OAAO,CAsCnB;AAOM,+CAJI,OAAO,cAAc,EAAE,IAAI,8BAClB,IAAI,gBACX,oBAAoB,aAAa,CAAC,CA2C9C;AAOM,6CAJI,OAAO,cAAc,EAAE,IAAI,8BAClB,IAAI,gBACX,oBAAoB,WAAW,CAAC,CAuC5C;uBAnSa;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAAE;yCAPX,iBAAiB"}
+{"version":3,"file":"fake-bridge.d.ts","sourceRoot":"","sources":["fake-bridge.js"],"names":[],"mappings":"AAkBA,6EAA6E;AAE7E,sCAAuC;AAchC,yCANI,OAAO,cAAc,EAAE,IAAI,SAEnC;IAAuB,QAAQ,EAAvB,QAAQ;CAChB,GAAU,oBAAoB,MAAM,CAAC,CA0FvC;AAOM,wCAJI,OAAO,cAAc,EAAE,IAAI,cAC3B,CAAC,GAAG,KAAA,KAAK,IAAI,GACX,oBAAoB,MAAM,CAAC,CAwCvC;AAED,iEAAkE;;;;;AAwB3D,0DALI,MAAM,YACN,MAAM,GACJ,OAAO,CAsCnB;AAOM,+CAJI,OAAO,cAAc,EAAE,IAAI,8BAClB,IAAI,gBACX,oBAAoB,aAAa,CAAC,CA2C9C;AAOM,6CAJI,OAAO,cAAc,EAAE,IAAI,8BAClB,IAAI,gBACX,oBAAoB,WAAW,CAAC,CAuC5C;uBA7Sa;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAAE;yCAPX,iBAAiB"}

package/tools/fake-bridge.js

@@ -138,6 +138,16 @@ export const makeFakeIbcBridge = (zone, onToBridge) => {
       if (method === 'sendPacket') {
         const { packet } = params;
         return { ...packet, sequence: '39' };
+      } else if (method === 'startChannelCloseInit') {
+        const { packet } = params;
+        if (hndlr)
+          E(hndlr)
+            .fromBridge({
+              type: 'IBC_EVENT',
+              event: 'channelCloseConfirm',
+              packet,
+            })
+            .catch(e => console.error(e));
       }
       return undefined;
     },