@agoric/cosmic-swingset 0.41.4-dev-fed2b5e.0 → 0.41.4-dev-35e67be.0

package/economy-template.json

@@ -1,8 +1,8 @@
 [
-  "@agoric/vats/scripts/init-core.js",
-  "@agoric/vats/scripts/init-network.js",
+  "@agoric/builders/scripts/vats/init-core.js",
+  "@agoric/builders/scripts/vats/init-network.js",
   {
-    "module": "@agoric/inter-protocol/scripts/init-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/init-core.js",
     "entrypoint": "defaultProposalBuilder",
     "args": [
       {
@@ -13,9 +13,9 @@
       }
     ]
   },
-  "@agoric/pegasus/scripts/init-core.js",
+  "@agoric/builders/scripts/pegasus/init-core.js",
   {
-    "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
     "entrypoint": "defaultProposalBuilder",
     "args": [
       {
@@ -30,7 +30,7 @@
     ]
   },
   {
-    "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
     "entrypoint": "psmProposalBuilder",
     "args": [
       {
@@ -44,7 +44,7 @@
     ]
   },
   {
-    "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
     "entrypoint": "psmProposalBuilder",
     "args": [
       {
@@ -58,7 +58,7 @@
     ]
   },
   {
-    "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
     "entrypoint": "psmProposalBuilder",
     "args": [
       {
@@ -72,7 +72,7 @@
     ]
   },
   {
-    "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
     "entrypoint": "psmProposalBuilder",
     "args": [
       {
@@ -86,7 +86,7 @@
     ]
   },
   {
-    "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
     "entrypoint": "psmProposalBuilder",
     "args": [
       {
@@ -100,7 +100,7 @@
     ]
   },
   {
-    "module": "@agoric/inter-protocol/scripts/price-feed-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/price-feed-core.js",
     "entrypoint": "defaultProposalBuilder",
     "args": [
       {
@@ -125,7 +125,7 @@
     ]
   },
   {
-    "module": "@agoric/inter-protocol/scripts/invite-committee-core.js",
+    "module": "@agoric/builders/scripts/inter-protocol/invite-committee-core.js",
     "entrypoint": "defaultProposalBuilder",
     "args": [
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-fed2b5e.0+fed2b5e",
+  "version": "0.41.4-dev-35e67be.0+35e67be",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,15 +22,16 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-fed2b5e.0+fed2b5e",
-    "@agoric/cosmos": "0.34.2-dev-fed2b5e.0+fed2b5e",
-    "@agoric/deploy-script-support": "0.10.4-dev-fed2b5e.0+fed2b5e",
-    "@agoric/internal": "0.3.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/store": "0.9.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/swing-store": "0.9.2-dev-fed2b5e.0+fed2b5e",
-    "@agoric/swingset-vat": "0.32.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/telemetry": "0.6.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/vm-config": "0.1.1-dev-fed2b5e.0+fed2b5e",
+    "@agoric/assert": "0.6.1-dev-35e67be.0+35e67be",
+    "@agoric/cosmos": "0.34.2-dev-35e67be.0+35e67be",
+    "@agoric/deploy-script-support": "0.10.4-dev-35e67be.0+35e67be",
+    "@agoric/internal": "0.3.3-dev-35e67be.0+35e67be",
+    "@agoric/store": "0.9.3-dev-35e67be.0+35e67be",
+    "@agoric/swing-store": "0.9.2-dev-35e67be.0+35e67be",
+    "@agoric/swingset-vat": "0.32.3-dev-35e67be.0+35e67be",
+    "@agoric/telemetry": "0.6.3-dev-35e67be.0+35e67be",
+    "@agoric/vm-config": "0.1.1-dev-35e67be.0+35e67be",
+    "@endo/bundle-source": "^2.5.2",
     "@endo/far": "^0.2.19",
     "@endo/import-bundle": "^0.3.5",
     "@endo/init": "^0.5.57",
@@ -61,5 +62,5 @@
     ],
     "timeout": "20m"
   },
-  "gitHead": "fed2b5e4658fc5b55c794622aa1684a8093f1604"
+  "gitHead": "35e67bed9eae0896e32b549ad0d1fd02fb83a905"
 }

package/src/helpers/json.js

@@ -0,0 +1,19 @@
+// @ts-check
+
+/**
+ * Parses JSON and, if necessary, throws exceptions that include the location
+ * of the offending file.
+ *
+ * @param {string} source
+ * @param {string} location
+ */
+export const parseLocatedJson = (source, location) => {
+  try {
+    return JSON.parse(source);
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      throw SyntaxError(`Cannot parse JSON from ${location}, ${error}`);
+    }
+    throw error;
+  }
+};

package/src/launch-chain.js

@@ -3,6 +3,8 @@
 import anylogger from 'anylogger';
 
 import { E } from '@endo/far';
+import bundleSource from '@endo/bundle-source';
+
 import {
   buildMailbox,
   buildMailboxStateMap,
@@ -22,6 +24,7 @@ import { makeWithQueue } from '@agoric/internal/src/queue.js';
 import * as ActionType from '@agoric/internal/src/action-types.js';
 
 import { extractCoreProposalBundles } from '@agoric/deploy-script-support/src/extract-proposal.js';
+import { fileURLToPath } from 'url';
 
 import {
   makeDefaultMeterProvider,
@@ -38,6 +41,7 @@ import {
 import { parseParams } from './params.js';
 import { makeQueue } from './helpers/make-queue.js';
 import { exportStorage } from './export-storage.js';
+import { parseLocatedJson } from './helpers/json.js';
 
 const console = anylogger('launch-chain');
 const blockManagerConsole = anylogger('block-manager');
@@ -67,7 +71,7 @@ const getHostKey = path => `host.${path}`;
  * @param {Map<*, *>} mailboxStorage
  * @param {undefined | ((dstID: string, obj: any) => any)} bridgeOutbound
  * @param {SwingStoreKernelStorage} kernelStorage
- * @param {string | (() => string | Promise<string>)} vatconfig absolute path
+ * @param {string | (() => string | Promise<string>)} vatconfig absolute path or thunk
  * @param {unknown} bootstrapArgs JSON-serializable data
  * @param {{}} env
  * @param {*} options
@@ -398,10 +402,10 @@ export async function launch({
     bridgeInbound(source, body);
   }
 
-  async function installBundle(bundleSource) {
+  async function installBundle(bundleJson) {
     let bundle;
     try {
-      bundle = JSON.parse(bundleSource);
+      bundle = JSON.parse(bundleJson);
     } catch (e) {
       blockManagerConsole.warn('INSTALL_BUNDLE warn:', e);
       return;
@@ -733,7 +737,14 @@ export async function launch({
               blockTime,
               upgradePlan,
             });
-            // TODO: Process upgrade plan
+            // Process upgrade plan
+            const upgradedAction = {
+              type: ActionType.ENACTED_UPGRADE,
+              upgradePlan,
+              blockHeight,
+              blockTime,
+            };
+            await doBlockingSend(upgradedAction);
             controller.writeSlogObject({
               type: 'cosmic-swingset-upgrade-finish',
               blockHeight,
@@ -744,6 +755,72 @@ export async function launch({
         return true;
       }
 
+      case ActionType.ENACTED_UPGRADE: {
+        // Install and execute new core proposals.
+        const {
+          upgradePlan: { info: upgradeInfoJson = null } = {},
+          blockHeight,
+          blockTime,
+        } = action;
+        const upgradePlanInfo =
+          upgradeInfoJson &&
+          parseLocatedJson(upgradeInfoJson, 'ENACTED_UPGRADE upgradePlan.info');
+
+        // Handle the planned core proposals as just another action.
+        const { coreProposals = [] } = upgradePlanInfo || {};
+
+        if (!coreProposals.length) {
+          // Nothing to do.
+          return undefined;
+        }
+
+        // Find scripts relative to our location.
+        const myFilename = fileURLToPath(import.meta.url);
+        const { bundles, code: coreEvalCode } =
+          await extractCoreProposalBundles(coreProposals, myFilename, {
+            handleToBundleSpec: async (handle, source, _sequence, _piece) => {
+              const bundle = await bundleSource(source);
+              const { endoZipBase64Sha512: hash } = bundle;
+              const bundleID = `b1-${hash}`;
+              handle.bundleID = bundleID;
+              harden(handle);
+              return harden([`${bundleID}: ${source}`, bundle]);
+            },
+          });
+
+        for (const [meta, bundle] of Object.entries(bundles)) {
+          await controller
+            .validateAndInstallBundle(bundle)
+            .catch(e => Fail`Cannot validate and install ${meta}: ${e}`);
+        }
+
+        // Now queue the code for evaluation.
+        //
+        // TODO: Once SwingSet sprouts some tools for preemption, we should use
+        // them to help the upgrade process finish promptly.
+        const coreEvalAction = {
+          type: ActionType.CORE_EVAL,
+          blockHeight,
+          blockTime,
+          evals: [
+            {
+              json_permits: 'true',
+              js_code: coreEvalCode,
+            },
+          ],
+        };
+        highPriorityQueue.push({
+          context: {
+            blockHeight,
+            txHash: 'x/upgrade',
+            msgIdx: 0,
+          },
+          action: coreEvalAction,
+        });
+
+        return undefined;
+      }
+
       case ActionType.COMMIT_BLOCK: {
         const { blockHeight, blockTime } = action;
         verboseBlocks &&