@agoric/cosmic-swingset 0.41.4-dev-1b5e57f.0 → 0.41.4-dev-241c60a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-1b5e57f.0+1b5e57f",
+  "version": "0.41.4-dev-241c60a.0+241c60a",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,16 +22,16 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-1b5e57f.0+1b5e57f",
-    "@agoric/builders": "0.1.1-dev-1b5e57f.0+1b5e57f",
-    "@agoric/cosmos": "0.34.2-dev-1b5e57f.0+1b5e57f",
-    "@agoric/deploy-script-support": "0.10.4-dev-1b5e57f.0+1b5e57f",
-    "@agoric/internal": "0.3.3-dev-1b5e57f.0+1b5e57f",
-    "@agoric/store": "0.9.3-dev-1b5e57f.0+1b5e57f",
-    "@agoric/swing-store": "0.9.2-dev-1b5e57f.0+1b5e57f",
-    "@agoric/swingset-vat": "0.32.3-dev-1b5e57f.0+1b5e57f",
-    "@agoric/telemetry": "0.6.3-dev-1b5e57f.0+1b5e57f",
-    "@agoric/vm-config": "0.1.1-dev-1b5e57f.0+1b5e57f",
+    "@agoric/assert": "0.6.1-dev-241c60a.0+241c60a",
+    "@agoric/builders": "0.1.1-dev-241c60a.0+241c60a",
+    "@agoric/cosmos": "0.34.2-dev-241c60a.0+241c60a",
+    "@agoric/deploy-script-support": "0.10.4-dev-241c60a.0+241c60a",
+    "@agoric/internal": "0.3.3-dev-241c60a.0+241c60a",
+    "@agoric/store": "0.9.3-dev-241c60a.0+241c60a",
+    "@agoric/swing-store": "0.9.2-dev-241c60a.0+241c60a",
+    "@agoric/swingset-vat": "0.32.3-dev-241c60a.0+241c60a",
+    "@agoric/telemetry": "0.6.3-dev-241c60a.0+241c60a",
+    "@agoric/vm-config": "0.1.1-dev-241c60a.0+241c60a",
     "@endo/bundle-source": "^2.7.0",
     "@endo/far": "^0.2.21",
     "@endo/import-bundle": "^0.4.1",
@@ -69,5 +69,5 @@
   "typeCoverage": {
     "atLeast": 79.4
   },
-  "gitHead": "1b5e57f17a043a43171621bbe3ef68131954f714"
+  "gitHead": "241c60a3deb1ab4cbac43b44d11438a80bb0aba5"
 }

package/src/export-kernel-db.js

@@ -14,7 +14,7 @@ import { makePromiseKit } from '@endo/promise-kit';
 import { Fail, q } from '@agoric/assert';
 import { makeAggregateError } from '@agoric/internal';
 import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
-import { openSwingStore, makeSwingStoreExporter } from '@agoric/swing-store';
+import { makeSwingStoreExporter } from '@agoric/swing-store';
 
 import { isEntrypoint } from './helpers/is-entrypoint.js';
 import { makeProcessValue } from './helpers/process-value.js';
@@ -144,7 +144,6 @@ export const validateExporterOptions = options => {
  * @param {Pick<import('fs/promises'), 'open' | 'writeFile'>} powers.fs
  * @param {import('path')['resolve']} powers.pathResolve
  * @param {typeof import('@agoric/swing-store')['makeSwingStoreExporter']} [powers.makeSwingStoreExporter]
- * @param {typeof import('@agoric/swing-store')['openSwingStore']} [powers.openSwingStore]
  * @param {null | ((...args: any[]) => void)} [powers.log]
  * @returns {StateSyncExporter}
  */
@@ -154,7 +153,6 @@ export const initiateSwingStoreExport = (
     fs: { open, writeFile },
     pathResolve,
     makeSwingStoreExporter: makeExporter = makeSwingStoreExporter,
-    openSwingStore: openDB = openSwingStore,
     log = console.log,
   },
 ) => {
@@ -183,10 +181,7 @@ export const initiateSwingStoreExport = (
     });
     cleanup.push(async () => swingStoreExporter.close());
 
-    const { hostStorage } = openDB(stateDir);
-
-    savedBlockHeight = Number(hostStorage.kvStore.get('host.height')) || 0;
-    await hostStorage.close();
+    savedBlockHeight = Number(swingStoreExporter.getHostKV('host.height')) || 0;
 
     if (blockHeight) {
       blockHeight === savedBlockHeight ||

package/src/import-kernel-db.js

@@ -145,6 +145,9 @@ export const performStateSyncImport = async (
   // Represent the data in `exportDir` as a SwingSetExporter object.
   /** @type {import('@agoric/swing-store').SwingStoreExporter} */
   const exporter = harden({
+    getHostKV(_key) {
+      return undefined;
+    },
     async *getExportData() {
       log?.('importing export data');
       const exportData = createReadStream(