@agoric/cosmic-swingset 0.41.4-dev-914bee2.0 → 0.41.4-dev-3656582.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-914bee2.0+914bee2",
+  "version": "0.41.4-dev-3656582.0+3656582",
   "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-914bee2.0+914bee2",
-    "@agoric/cosmos": "0.34.2-dev-914bee2.0+914bee2",
-    "@agoric/deploy-script-support": "0.10.4-dev-914bee2.0+914bee2",
-    "@agoric/internal": "0.3.3-dev-914bee2.0+914bee2",
-    "@agoric/store": "0.9.3-dev-914bee2.0+914bee2",
-    "@agoric/swing-store": "0.9.2-dev-914bee2.0+914bee2",
-    "@agoric/swingset-vat": "0.32.3-dev-914bee2.0+914bee2",
-    "@agoric/telemetry": "0.6.3-dev-914bee2.0+914bee2",
-    "@agoric/vm-config": "0.1.1-dev-914bee2.0+914bee2",
+    "@agoric/builders": "0.1.1-dev-3656582.0+3656582",
+    "@agoric/cosmos": "0.34.2-dev-3656582.0+3656582",
+    "@agoric/deploy-script-support": "0.10.4-dev-3656582.0+3656582",
+    "@agoric/internal": "0.3.3-dev-3656582.0+3656582",
+    "@agoric/store": "0.9.3-dev-3656582.0+3656582",
+    "@agoric/swing-store": "0.9.2-dev-3656582.0+3656582",
+    "@agoric/swingset-vat": "0.32.3-dev-3656582.0+3656582",
+    "@agoric/telemetry": "0.6.3-dev-3656582.0+3656582",
+    "@agoric/vm-config": "0.1.1-dev-3656582.0+3656582",
     "@endo/bundle-source": "^3.4.0",
     "@endo/env-options": "^1.1.6",
     "@endo/errors": "^1.2.5",
@@ -71,5 +71,5 @@
   "typeCoverage": {
     "atLeast": 80.53
   },
-  "gitHead": "914bee2aa7472039ba230267d72027b940bf8a1c"
+  "gitHead": "3656582420c8930d16683ff7cd72b9c2c9f89425"
 }

package/src/chain-main.js

@@ -1,14 +1,14 @@
 // @ts-check
 
-import { resolve as pathResolve } from 'path';
+import path from 'node:path';
 import v8 from 'node:v8';
 import process from 'node:process';
 import fs from 'node:fs';
 import fsPromises from 'node:fs/promises';
-import { performance } from 'perf_hooks';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
-import tmpfs from 'tmp';
+import { performance } from 'node:perf_hooks';
 import { fork } from 'node:child_process';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+import tmp from 'tmp';
 
 import { Fail, q } from '@endo/errors';
 import { E } from '@endo/far';
@@ -33,6 +33,10 @@ import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
 import * as ActionType from '@agoric/internal/src/action-types.js';
 import { BridgeId, CosmosInitKeyToBridgeId } from '@agoric/internal';
+import {
+  makeArchiveSnapshot,
+  makeArchiveTranscript,
+} from '@agoric/swing-store';
 import {
   makeBufferedStorage,
   makeReadCachingStorage,
@@ -76,6 +80,8 @@ const toNumber = specimen => {
  * @property {number} [maxVatsOnline]
  * @property {'debug' | 'operational'} [vatSnapshotRetention]
  * @property {'archival' | 'operational'} [vatTranscriptRetention]
+ * @property {string} [vatSnapshotArchiveDir]
+ * @property {string} [vatTranscriptArchiveDir]
  */
 const SwingsetConfigShape = M.splitRecord(
   // All known properties are optional, but unknown properties are not allowed.
@@ -85,6 +91,8 @@ const SwingsetConfigShape = M.splitRecord(
     maxVatsOnline: M.number(),
     vatSnapshotRetention: M.or('debug', 'operational'),
     vatTranscriptRetention: M.or('archival', 'operational'),
+    vatSnapshotArchiveDir: M.string(),
+    vatTranscriptArchiveDir: M.string(),
   },
   {},
 );
@@ -159,8 +167,8 @@ const makePrefixedBridgeStorage = (
       return fromBridgeStringValue(ret);
     },
     set: (key, value) => {
-      const path = `${prefix}${key}`;
-      const entry = [path, toBridgeStringValue(value)];
+      const fullPath = `${prefix}${key}`;
+      const entry = [fullPath, toBridgeStringValue(value)];
       call(
         stringify({
           method: setterMethod,
@@ -169,8 +177,8 @@ const makePrefixedBridgeStorage = (
       );
     },
     delete: key => {
-      const path = `${prefix}${key}`;
-      const entry = [path];
+      const fullPath = `${prefix}${key}`;
+      const entry = [fullPath];
       call(
         stringify({
           method: setterMethod,
@@ -315,8 +323,13 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     /** @type {CosmosSwingsetConfig} */
     const swingsetConfig = harden(initAction.resolvedConfig || {});
     validateSwingsetConfig(swingsetConfig);
-    const { slogfile, vatSnapshotRetention, vatTranscriptRetention } =
-      swingsetConfig;
+    const {
+      slogfile,
+      vatSnapshotRetention,
+      vatTranscriptRetention,
+      vatSnapshotArchiveDir,
+      vatTranscriptArchiveDir,
+    } = swingsetConfig;
     const keepSnapshots = vatSnapshotRetention
       ? vatSnapshotRetention !== 'operational'
       : ['1', 'true'].includes(XSNAP_KEEP_SNAPSHOTS);
@@ -471,14 +484,14 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     const swingStoreTraceFile = processValue.getPath({
       envName: 'SWING_STORE_TRACE',
       flagName: 'trace-store',
-      trueValue: pathResolve(stateDBDir, 'store-trace.log'),
+      trueValue: path.resolve(stateDBDir, 'store-trace.log'),
     });
 
     const nodeHeapSnapshots = Number.parseInt(NODE_HEAP_SNAPSHOTS, 10);
 
     let lastCommitTime = 0;
     let commitCallsSinceLastSnapshot = NaN;
-    const snapshotBaseDir = pathResolve(stateDBDir, 'node-heap-snapshots');
+    const snapshotBaseDir = path.resolve(stateDBDir, 'node-heap-snapshots');
 
     if (nodeHeapSnapshots >= 0) {
       fs.mkdirSync(snapshotBaseDir, { recursive: true });
@@ -514,7 +527,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         ) {
           commitCallsSinceLastSnapshot = 0;
           heapSnapshot = `Heap-${process.pid}-${Date.now()}.heapsnapshot`;
-          const snapshotPath = pathResolve(snapshotBaseDir, heapSnapshot);
+          const snapshotPath = path.resolve(snapshotBaseDir, heapSnapshot);
           v8.writeHeapSnapshot(snapshotPath);
           heapSnapshotTime = performance.now() - t3;
         }
@@ -537,6 +550,14 @@ export default async function main(progname, args, { env, homedir, agcc }) {
       }
     };
 
+    const fsPowers = { fs, path, tmp };
+    const archiveSnapshot = vatSnapshotArchiveDir
+      ? makeArchiveSnapshot(vatSnapshotArchiveDir, fsPowers)
+      : undefined;
+    const archiveTranscript = vatTranscriptArchiveDir
+      ? makeArchiveTranscript(vatTranscriptArchiveDir, fsPowers)
+      : undefined;
+
     const s = await launch({
       actionQueueStorage,
       highPriorityQueueStorage,
@@ -556,6 +577,8 @@ export default async function main(progname, args, { env, homedir, agcc }) {
       swingStoreTraceFile,
       keepSnapshots,
       keepTranscripts,
+      archiveSnapshot,
+      archiveTranscript,
       afterCommitCallback,
       swingsetConfig,
     });
@@ -608,7 +631,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         );
         return performStateSyncImport(options, {
           fs: { ...fs, ...fsPromises },
-          pathResolve,
+          pathResolve: path.resolve,
           log: null,
         });
       }
@@ -632,7 +655,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         stateSyncExport = exportData;
 
         await new Promise((resolve, reject) => {
-          tmpfs.dir(
+          tmp.dir(
             {
               prefix: `agd-state-sync-${blockHeight}-`,
               unsafeCleanup: true,

package/src/launch-chain.js

@@ -332,6 +332,8 @@ export async function launch({
   swingStoreExportCallback,
   keepSnapshots,
   keepTranscripts,
+  archiveSnapshot,
+  archiveTranscript,
   afterCommitCallback = async () => ({}),
   swingsetConfig,
 }) {
@@ -375,6 +377,8 @@ export async function launch({
     exportCallback: swingStoreExportSyncCallback,
     keepSnapshots,
     keepTranscripts,
+    archiveSnapshot,
+    archiveTranscript,
   });
   const { kvStore, commit } = hostStorage;