@agoric/vats 0.15.2-dev-fbea810.0 → 0.15.2-dev-70e543c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-fbea810.0+fbea810",
+  "version": "0.15.2-dev-70e543c.0+70e543c",
   "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-fbea810.0+fbea810",
-    "@agoric/ertp": "0.16.3-dev-fbea810.0+fbea810",
-    "@agoric/governance": "0.10.4-dev-fbea810.0+fbea810",
-    "@agoric/internal": "0.3.3-dev-fbea810.0+fbea810",
-    "@agoric/network": "0.1.1-dev-fbea810.0+fbea810",
-    "@agoric/notifier": "0.6.3-dev-fbea810.0+fbea810",
-    "@agoric/store": "0.9.3-dev-fbea810.0+fbea810",
-    "@agoric/swingset-vat": "0.32.3-dev-fbea810.0+fbea810",
-    "@agoric/time": "0.3.3-dev-fbea810.0+fbea810",
-    "@agoric/vat-data": "0.5.3-dev-fbea810.0+fbea810",
-    "@agoric/vow": "0.1.1-dev-fbea810.0+fbea810",
-    "@agoric/zoe": "0.26.3-dev-fbea810.0+fbea810",
-    "@agoric/zone": "0.2.3-dev-fbea810.0+fbea810",
+    "@agoric/cosmic-proto": "0.4.1-dev-70e543c.0+70e543c",
+    "@agoric/ertp": "0.16.3-dev-70e543c.0+70e543c",
+    "@agoric/governance": "0.10.4-dev-70e543c.0+70e543c",
+    "@agoric/internal": "0.3.3-dev-70e543c.0+70e543c",
+    "@agoric/network": "0.1.1-dev-70e543c.0+70e543c",
+    "@agoric/notifier": "0.6.3-dev-70e543c.0+70e543c",
+    "@agoric/store": "0.9.3-dev-70e543c.0+70e543c",
+    "@agoric/swingset-vat": "0.32.3-dev-70e543c.0+70e543c",
+    "@agoric/time": "0.3.3-dev-70e543c.0+70e543c",
+    "@agoric/vat-data": "0.5.3-dev-70e543c.0+70e543c",
+    "@agoric/vow": "0.1.1-dev-70e543c.0+70e543c",
+    "@agoric/zoe": "0.26.3-dev-70e543c.0+70e543c",
+    "@agoric/zone": "0.2.3-dev-70e543c.0+70e543c",
     "@endo/errors": "^1.2.10",
     "@endo/far": "^1.1.11",
     "@endo/import-bundle": "^1.4.0",
@@ -47,7 +47,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-fbea810.0+fbea810",
+    "@agoric/swingset-liveslots": "0.10.3-dev-70e543c.0+70e543c",
     "@endo/bundle-source": "^4.0.0",
     "@endo/init": "^1.1.9",
     "ava": "^5.3.0",
@@ -79,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 90.43
   },
-  "gitHead": "fbea810678db7e06c8409ed9c163dad88a181ad1"
+  "gitHead": "70e543c8f952246ab36454f8f04ea2589f401d2f"
 }

package/src/proposals/terminate-governed-instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminate-governed-instance.d.ts","sourceRoot":"","sources":["terminate-governed-instance.js"],"names":[],"mappings":"AA0EO,qFAPI,eAAe,qCAEvB;IAAuB,OAAO,EAC9B;QAAiC,gBAAgB,EAAzC,MAAM,EAAE;KAGlB;CAAA,iBAsFA;AAUM,qCAHI,MAAM,oBACN,MAAM,EAAE;;QAMb,CAAC,iBAAiB,CAAC,IAAI,CAAC;;;;;;UAEvB;;;;;EAMN;AAED,2FAA2F;AAC3F,qCADW,OAAO,oDAAoD,EAAE,eAAe,CAYrF;yBAGoB,uFAAK,EAAE,gGAAU"}
+{"version":3,"file":"terminate-governed-instance.d.ts","sourceRoot":"","sources":["terminate-governed-instance.js"],"names":[],"mappings":"AA2EO,qFAPI,eAAe,qCAEvB;IAAuB,OAAO,EAC9B;QAAiC,gBAAgB,EAAzC,MAAM,EAAE;KAGlB;CAAA,iBA+GA;AAUM,qCAHI,MAAM,oBACN,MAAM,EAAE;;QAMb,CAAC,iBAAiB,CAAC,IAAI,CAAC;;;;;;UAEvB;;;;;EAMN;AAED,2FAA2F;AAC3F,qCADW,OAAO,oDAAoD,EAAE,eAAe,CAYrF;yBAGoB,uFAAK,EAAE,gGAAU"}

package/src/proposals/terminate-governed-instance.js

@@ -14,6 +14,7 @@
 // dynamic import { getSpecifier } from '@agoric/internal/src/module-utils.js';
 import { E, passStyleOf } from '@endo/far';
 import { makeTracer } from '@agoric/internal/src/debug.js';
+import { isAbandonedError } from '@agoric/internal/src/upgrade-api.js';
 
 const USAGE = `Usage: agoric run /path/to/terminate-governed-instance.js \\
   <$instanceHandleBoardID:$instanceKitLabel>...`;
@@ -97,14 +98,36 @@ export const terminateGoverned = async (
       label === instanceKitLabel ||
         Fail`${logLabel} unexpected instanceKit label, got ${label} but wanted ${q(instanceKitLabel)}`;
       const govTerms = /** @type {any} */ (await E(zoe).getTerms(governor));
-      trace({ govTerms });
+      trace('governor terms', govTerms);
       (passStyleOf(govTerms?.governed) === 'copyRecord' &&
         passStyleOf(govTerms?.governedContractInstallation) === 'remotable') ||
         Fail`${logLabel} instanceKit governor does not appear to have the right terms shape`;
 
-      const instanceAdminFacet = await E(governorCreatorFacet).getAdminFacet();
-      trace({ instanceAdminFacet });
-      return { logLabel, trace, instanceAdminFacet, governorAdminFacet };
+      // We need an adminFacet for the contract instance. Prefer to get it from
+      // the governor, but fall back on extracting it from the kit if the
+      // governor has already been terminated.
+      let { adminFacet: instanceAdminFacet } = instanceKit;
+      let governorOk = true;
+      try {
+        instanceAdminFacet = await E(governorCreatorFacet).getAdminFacet();
+      } catch (err) {
+        if (!isAbandonedError(err)) throw err;
+        governorOk = false;
+      }
+      trace(
+        governorOk
+          ? 'instance adminFacet from governor'
+          : 'instance adminFacet from kit',
+        instanceAdminFacet,
+      );
+      instanceAdminFacet ||
+        Fail`${logLabel} instanceKit is missing the instance admin facet`;
+      return {
+        logLabel,
+        trace,
+        instanceAdminFacet,
+        governorAdminFacet: governorOk ? governorAdminFacet : undefined,
+      };
     }),
   );
   const validationProblems = targets.flatMap(
@@ -129,17 +152,20 @@ export const terminateGoverned = async (
       assert(settlement.status === 'fulfilled');
       const { logLabel, trace, instanceAdminFacet, governorAdminFacet } =
         settlement.value;
+
       const terminateInstanceMessage = `governed contract ${logLabel} terminated by terminate-governed-instance`;
       await E(instanceAdminFacet).terminateContract(
         harden(Error(terminateInstanceMessage)),
       );
       trace('terminated governed instance');
 
-      const terminateGovernorMessage = `governor ${logLabel} terminated by terminate-governed-instance`;
-      await E(governorAdminFacet).terminateContract(
-        harden(Error(terminateGovernorMessage)),
-      );
-      trace('terminated governor');
+      if (governorAdminFacet) {
+        const terminateGovernorMessage = `governor ${logLabel} terminated by terminate-governed-instance`;
+        await E(governorAdminFacet).terminateContract(
+          harden(Error(terminateGovernorMessage)),
+        );
+        trace('terminated governor');
+      }
     }),
   );
   const terminationProblems = targets.flatMap(