@agoric/cosmic-swingset 0.41.4-dev-afe8a6e.0 → 0.41.4-dev-22cbeb1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-afe8a6e.0+afe8a6e",
+  "version": "0.41.4-dev-22cbeb1.0+22cbeb1",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,14 +22,14 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-afe8a6e.0+afe8a6e",
-    "@agoric/cosmos": "0.34.2-dev-afe8a6e.0+afe8a6e",
-    "@agoric/deploy-script-support": "0.10.4-dev-afe8a6e.0+afe8a6e",
-    "@agoric/internal": "0.3.3-dev-afe8a6e.0+afe8a6e",
-    "@agoric/store": "0.9.3-dev-afe8a6e.0+afe8a6e",
-    "@agoric/swing-store": "0.9.2-dev-afe8a6e.0+afe8a6e",
-    "@agoric/swingset-vat": "0.32.3-dev-afe8a6e.0+afe8a6e",
-    "@agoric/telemetry": "0.6.3-dev-afe8a6e.0+afe8a6e",
+    "@agoric/assert": "0.6.1-dev-22cbeb1.0+22cbeb1",
+    "@agoric/cosmos": "0.34.2-dev-22cbeb1.0+22cbeb1",
+    "@agoric/deploy-script-support": "0.10.4-dev-22cbeb1.0+22cbeb1",
+    "@agoric/internal": "0.3.3-dev-22cbeb1.0+22cbeb1",
+    "@agoric/store": "0.9.3-dev-22cbeb1.0+22cbeb1",
+    "@agoric/swing-store": "0.9.2-dev-22cbeb1.0+22cbeb1",
+    "@agoric/swingset-vat": "0.32.3-dev-22cbeb1.0+22cbeb1",
+    "@agoric/telemetry": "0.6.3-dev-22cbeb1.0+22cbeb1",
     "@endo/far": "^0.2.18",
     "@endo/import-bundle": "^0.3.4",
     "@endo/init": "^0.5.56",
@@ -60,5 +60,5 @@
     ],
     "timeout": "20m"
   },
-  "gitHead": "afe8a6e7881372935ed998ec096ae0c31cfe5f21"
+  "gitHead": "22cbeb145d1b74d9d5ceecce7cd4253ba23d534a"
 }

package/src/chain-main.js

@@ -240,11 +240,11 @@ export default async function main(progname, args, { env, homedir, agcc }) {
   /** @type {((obj: object) => void) | undefined} */
   let writeSlogObject;
 
-  // this storagePort changes for every single message. We define it out here
-  // so the 'externalStorage' object can close over the single mutable
-  // instance, and we update the 'portNums.storage' value each time toSwingSet is called
+  // the storagePort used to change for every single message. It's defined out
+  // here so 'sendToChainStorage' can close over the single mutable instance,
+  // when we updated the 'portNums.storage' value each time toSwingSet was called.
   async function launchAndInitializeSwingSet(bootMsg) {
-    const sendToChain = msg => chainSend(portNums.storage, msg);
+    const sendToChainStorage = msg => chainSend(portNums.storage, msg);
     // this object is used to store the mailbox state.
     const fromBridgeMailbox = data => {
       const ack = toNumber(data.ack);
@@ -253,7 +253,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     };
     const mailboxStorage = makeReadCachingStorage(
       makePrefixedBridgeStorage(
-        sendToChain,
+        sendToChainStorage,
         `${STORAGE_PATH.MAILBOX}.`,
         'legacySet',
         val => fromBridgeMailbox(JSON.parse(val)),
@@ -263,7 +263,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     const makeQueueStorage = queuePath => {
       const { kvStore, commit, abort } = makeBufferedStorage(
         makePrefixedBridgeStorage(
-          sendToChain,
+          sendToChainStorage,
           `${queuePath}.`,
           'setWithoutNotify',
           x => x,
@@ -305,7 +305,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         }
         return [path, value];
       });
-      sendToChain(
+      sendToChainStorage(
         stringify({
           method: 'setWithoutNotify',
           args: entries,
@@ -493,6 +493,9 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     };
   }
 
+  /** @type {Awaited<ReturnType<typeof launch>>['blockingSend'] | undefined} */
+  let blockingSend;
+
   async function handleCosmosSnapshot(blockHeight, request, requestArgs) {
     await null;
     switch (request) {
@@ -501,6 +504,9 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         if (typeof exportDir !== 'string') {
           throw Fail`Invalid exportDir argument ${q(exportDir)}`;
         }
+        !stateSyncExport ||
+          Fail`Snapshot already in progress for ${stateSyncExport.blockHeight}`;
+        !blockingSend || Fail`Cannot restore snapshot after init`;
         console.info(
           'Restoring SwingSet state from snapshot at block height',
           blockHeight,
@@ -607,74 +613,82 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     }
   }
 
-  /** @type {Awaited<ReturnType<typeof launch>>['blockingSend'] | undefined} */
-  let blockingSend;
-
   async function toSwingSet(action, _replier) {
     // console.log(`toSwingSet`, action);
-    if (action.vibcPort) {
-      portNums.dibc = action.vibcPort;
-    }
 
-    if (action.storagePort) {
-      // Initialize the storage for this particular transaction.
-      // console.log(` setting portNums.storage to`, action.storagePort);
-      portNums.storage = action.storagePort;
-    }
+    await null;
 
-    if (action.vbankPort) {
-      portNums.bank = action.vbankPort;
-    }
+    switch (action.type) {
+      case AG_COSMOS_INIT: {
+        // console.error('got AG_COSMOS_INIT', action);
 
-    if (action.lienPort) {
-      portNums.lien = action.lienPort;
-    }
+        !blockingSend || Fail`Swingset already initialized`;
 
-    // Snapshot actions are specific to cosmos chains and handled here
-    if (action.type === ActionType.COSMOS_SNAPSHOT) {
-      const { blockHeight, request, args: requestArgs } = action;
-      writeSlogObject?.({
-        type: 'cosmic-swingset-snapshot-start',
-        blockHeight,
-        request,
-        args: requestArgs,
-      });
+        if (action.vibcPort) {
+          portNums.dibc = action.vibcPort;
+        }
 
-      const resultP = handleCosmosSnapshot(blockHeight, request, requestArgs);
+        if (action.storagePort) {
+          portNums.storage = action.storagePort;
+        }
 
-      resultP.then(
-        result => {
-          writeSlogObject?.({
-            type: 'cosmic-swingset-snapshot-finish',
-            blockHeight,
-            request,
-            args: requestArgs,
-            result,
-          });
-        },
-        error => {
-          writeSlogObject?.({
-            type: 'cosmic-swingset-snapshot-finish',
-            blockHeight,
-            request,
-            args: requestArgs,
-            error,
-          });
-        },
-      );
+        if (action.vbankPort) {
+          portNums.bank = action.vbankPort;
+        }
 
-      return resultP;
-    }
+        if (action.lienPort) {
+          portNums.lien = action.lienPort;
+        }
+        harden(portNums);
 
-    // Ensure that initialization has completed.
-    blockingSend = await (blockingSend || launchAndInitializeSwingSet(action));
+        // Ensure that initialization has completed.
+        blockingSend = await launchAndInitializeSwingSet(action);
 
-    if (action.type === AG_COSMOS_INIT) {
-      // console.error('got AG_COSMOS_INIT', action);
-      return true;
-    }
+        return true;
+      }
+
+      // Snapshot actions are specific to cosmos chains and handled here
+      case ActionType.COSMOS_SNAPSHOT: {
+        const { blockHeight, request, args: requestArgs } = action;
+        writeSlogObject?.({
+          type: 'cosmic-swingset-snapshot-start',
+          blockHeight,
+          request,
+          args: requestArgs,
+        });
 
-    // Block related actions are processed by `blockingSend`
-    return blockingSend(action);
+        const resultP = handleCosmosSnapshot(blockHeight, request, requestArgs);
+
+        resultP.then(
+          result => {
+            writeSlogObject?.({
+              type: 'cosmic-swingset-snapshot-finish',
+              blockHeight,
+              request,
+              args: requestArgs,
+              result,
+            });
+          },
+          error => {
+            writeSlogObject?.({
+              type: 'cosmic-swingset-snapshot-finish',
+              blockHeight,
+              request,
+              args: requestArgs,
+              error,
+            });
+          },
+        );
+
+        return resultP;
+      }
+
+      default: {
+        if (!blockingSend) throw Fail`Swingset not initialized`;
+
+        // Block related actions are processed by `blockingSend`
+        return blockingSend(action);
+      }
+    }
   }
 }