@agoric/cosmic-swingset 0.41.4-dev-75e8d38.0 → 0.41.4-dev-0e6a9f4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-75e8d38.0+75e8d38",
+  "version": "0.41.4-dev-0e6a9f4.0+0e6a9f4",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,15 +22,15 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/builders": "0.1.1-dev-75e8d38.0+75e8d38",
-    "@agoric/cosmos": "0.34.2-dev-75e8d38.0+75e8d38",
-    "@agoric/deploy-script-support": "0.10.4-dev-75e8d38.0+75e8d38",
-    "@agoric/internal": "0.3.3-dev-75e8d38.0+75e8d38",
-    "@agoric/store": "0.9.3-dev-75e8d38.0+75e8d38",
-    "@agoric/swing-store": "0.9.2-dev-75e8d38.0+75e8d38",
-    "@agoric/swingset-vat": "0.32.3-dev-75e8d38.0+75e8d38",
-    "@agoric/telemetry": "0.6.3-dev-75e8d38.0+75e8d38",
-    "@agoric/vm-config": "0.1.1-dev-75e8d38.0+75e8d38",
+    "@agoric/builders": "0.1.1-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/cosmos": "0.34.2-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/deploy-script-support": "0.10.4-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/internal": "0.3.3-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/store": "0.9.3-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/swing-store": "0.9.2-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/swingset-vat": "0.32.3-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/telemetry": "0.6.3-dev-0e6a9f4.0+0e6a9f4",
+    "@agoric/vm-config": "0.1.1-dev-0e6a9f4.0+0e6a9f4",
     "@endo/bundle-source": "^3.5.1",
     "@endo/env-options": "^1.1.8",
     "@endo/errors": "^1.2.9",
@@ -52,7 +52,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-75e8d38.0+75e8d38",
+    "@agoric/kmarshal": "0.1.1-dev-0e6a9f4.0+0e6a9f4",
     "ava": "^5.3.0",
     "better-sqlite3": "^9.1.1",
     "c8": "^10.1.2"
@@ -75,5 +75,5 @@
   "typeCoverage": {
     "atLeast": 84.59
   },
-  "gitHead": "75e8d388b2e48420f325aae6978d047cf7fe4d33"
+  "gitHead": "0e6a9f409040c4805179f0f8adee40cd1bd22ae2"
 }

package/src/chain-main.js

@@ -37,6 +37,7 @@ import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 import { makeInitMsg } from '@agoric/internal/src/chain-utils.js';
 import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
 import * as ActionType from '@agoric/internal/src/action-types.js';
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
 import { BridgeId, CosmosInitKeyToBridgeId } from '@agoric/internal';
 import {
   makeArchiveSnapshot,
@@ -64,6 +65,8 @@ import {
 
 const ignore = () => {};
 
+const tmpDir = makeTempDirFactory(tmp);
+
 // eslint-disable-next-line no-unused-vars
 let whenHellFreezesOver = null;
 
@@ -700,38 +703,24 @@ export default async function main(
           });
         stateSyncExport = exportData;
 
-        await new Promise((resolve, reject) => {
-          tmp.dir(
-            {
-              prefix: `agd-state-sync-${blockHeight}-`,
-              unsafeCleanup: true,
-            },
-            (err, exportDir, cleanup) => {
-              if (err) {
-                reject(err);
-                return;
-              }
-              exportData.exportDir = exportDir;
-              /** @type {Promise<void> | undefined} */
-              let cleanupResult;
-              exportData.cleanup = async () => {
-                cleanupResult ||= new Promise(cleanupDone => {
-                  // If the exporter is still the same, then the retriever
-                  // is in charge of cleanups
-                  if (stateSyncExport !== exportData) {
-                    // @ts-expect-error wrong type definitions
-                    cleanup(cleanupDone);
-                  } else {
-                    console.warn('unexpected call of state-sync cleanup');
-                    cleanupDone();
-                  }
-                });
-                await cleanupResult;
-              };
-              resolve(null);
-            },
-          );
-        });
+        const [exportDir, cleanup] = tmpDir(`agd-state-sync-${blockHeight}-`);
+        exportData.exportDir = exportDir;
+        /** @type {Promise<void> | undefined} */
+        let cleanupResult;
+        exportData.cleanup = async () => {
+          cleanupResult ||= new Promise(cleanupDone => {
+            // If the exporter is still the same, then the retriever
+            // is in charge of cleanups
+            if (stateSyncExport !== exportData) {
+              // @ts-expect-error wrong type definitions
+              cleanup(cleanupDone);
+            } else {
+              console.warn('unexpected call of state-sync cleanup');
+              cleanupDone();
+            }
+          });
+          await cleanupResult;
+        };
 
         console.warn(
           'Initiating SwingSet state snapshot at block height',

package/tools/test-kit.js

@@ -13,6 +13,7 @@ import {
 } from '@agoric/internal/src/action-types.js';
 import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
 import { deepCopyJsonable } from '@agoric/internal/src/js-utils.js';
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
 import { makeRunUtils } from '@agoric/swingset-vat/tools/run-utils.js';
 import { initSwingStore } from '@agoric/swing-store';
 import {
@@ -28,6 +29,8 @@ import { makeQueue } from '../src/helpers/make-queue.js';
 /** @import { ManagerType, SwingSetConfig } from '@agoric/swingset-vat' */
 /** @import { InboundQueue } from '../src/launch-chain.js'; */
 
+const tmpDir = makeTempDirFactory(tmp);
+
 /**
  * @template T
  * @typedef {(input: T) => T} Replacer
@@ -245,10 +248,7 @@ export const makeCosmicSwingsetTestKit = async (
     STORAGE_PATH.HIGH_PRIORITY_QUEUE,
   );
 
-  const { name: dbDir, removeCallback: cleanupDB } = tmp.dirSync({
-    prefix: debugName || 'testdb',
-    unsafeCleanup: true,
-  });
+  const [dbDir, cleanupDB] = tmpDir(debugName || 'testdb');
   const launchChain = makeLaunchChain(fakeAgcc, dbDir, {
     env,
     fs,