@agoric/swingset-vat 0.32.3-dev-048a67c.0 → 0.32.3-dev-8093cf6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-048a67c.0+048a67c",
+  "version": "0.32.3-dev-8093cf6.0+8093cf6",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,15 +27,15 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-048a67c.0+048a67c",
-    "@agoric/kmarshal": "0.1.1-dev-048a67c.0+048a67c",
-    "@agoric/store": "0.9.3-dev-048a67c.0+048a67c",
-    "@agoric/swing-store": "0.9.2-dev-048a67c.0+048a67c",
-    "@agoric/swingset-liveslots": "0.10.3-dev-048a67c.0+048a67c",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-048a67c.0+048a67c",
-    "@agoric/time": "0.3.3-dev-048a67c.0+048a67c",
-    "@agoric/vat-data": "0.5.3-dev-048a67c.0+048a67c",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-048a67c.0+048a67c",
+    "@agoric/internal": "0.3.3-dev-8093cf6.0+8093cf6",
+    "@agoric/kmarshal": "0.1.1-dev-8093cf6.0+8093cf6",
+    "@agoric/store": "0.9.3-dev-8093cf6.0+8093cf6",
+    "@agoric/swing-store": "0.9.2-dev-8093cf6.0+8093cf6",
+    "@agoric/swingset-liveslots": "0.10.3-dev-8093cf6.0+8093cf6",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-8093cf6.0+8093cf6",
+    "@agoric/time": "0.3.3-dev-8093cf6.0+8093cf6",
+    "@agoric/vat-data": "0.5.3-dev-8093cf6.0+8093cf6",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-8093cf6.0+8093cf6",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^3.5.1",
     "@endo/captp": "^4.4.4",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 76.28
   },
-  "gitHead": "048a67cc119529a818e59946d071fb0da74a4dbf"
+  "gitHead": "8093cf63e76c44a830bd5eabd58e7bad58f5f9f3"
 }

package/src/kernel/state/kernelKeeper.js

@@ -1,5 +1,6 @@
 import { Nat, isNat } from '@endo/nat';
 import { assert, Fail } from '@endo/errors';
+import { naturalCompare } from '@agoric/internal/src/natural-sort.js';
 import {
   initializeVatState,
   makeVatKeeper,
@@ -1886,39 +1887,12 @@ export default function makeKernelKeeper(
       }
     }
 
-    function compareNumbers(a, b) {
-      return Number(a - b);
-    }
-
-    function compareStrings(a, b) {
-      // natural-sort strings having a shared prefix followed by digits
-      // (e.g., 'ko42' and 'ko100')
-      const [_a, aPrefix, aDigits] = /^(\D+)(\d+)$/.exec(a) || [];
-      if (aPrefix) {
-        const [_b, bPrefix, bDigits] = /^(\D+)(\d+)$/.exec(b) || [];
-        if (bPrefix === aPrefix) {
-          return compareNumbers(aDigits, bDigits);
-        }
-      }
-
-      // otherwise use the default string ordering
-      if (a > b) {
-        return 1;
-      }
-      if (a < b) {
-        return -1;
-      }
-      return 0;
-    }
-
+    // Perform an element-by-element natural sort.
     kernelTable.sort(
       (a, b) =>
-        compareStrings(a[0], b[0]) ||
-        compareStrings(a[1], b[1]) ||
-        compareNumbers(a[2], b[2]) ||
-        compareStrings(a[3], b[3]) ||
-        compareNumbers(a[4], b[4]) ||
-        compareNumbers(a[5], b[5]) ||
+        naturalCompare(a[0], b[0]) ||
+        naturalCompare(a[1], b[1]) ||
+        naturalCompare(a[2], b[2]) ||
         0,
     );
 
@@ -1931,7 +1905,7 @@ export default function makeKernelKeeper(
         promises.push({ id: kpid, ...getKernelPromise(kpid) });
       }
     }
-    promises.sort((a, b) => compareStrings(a.id, b.id));
+    promises.sort((a, b) => naturalCompare(a.id, b.id));
 
     const objects = [];
     const nextObjectID = Nat(BigInt(getRequired('ko.nextID')));