WIP tighter proposal

Agoric · Nov 8, 2023 · 4f69131 · 4f69131
1 parent 2954646
commit 4f69131
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 41 deletions.
diff --git a/proposals/b:zoe1/README.md b/proposals/b:zoe1/README.md
@@ -5,7 +5,13 @@ This uses the Zoe in https://github.com/Agoric/agoric-sdk/pull/8453/
 It's currently a draft proposal, built from that branch with,
 
 ```
+# whatever your checkout
+A3P=/opt/agoric/agoric-3-proposals
 cd packages/builders
-yarn build:zcf-proposal
-cp replace-zcf* $A3P/proposals/b:zoe1
+# build the proposal
+agoric run scripts/vats/upgrade-zoe.js | tee run-report.txt
+# copy the proposal
+cp upgrade-zoe* $A3P/proposals/b:zoe1/submission
+# copy the bundles built for the proposal
+cat run-report.txt | grep install-bundle | sed "s/agd tx swingset install-bundle @//" |xargs -I _ cp _ $A3P/proposals/b:zoe1/submission
 ```
diff --git a/proposals/b:zoe1/performActions.ts b/proposals/b:zoe1/performActions.ts
@@ -7,22 +7,13 @@ import * as process from 'process';
 
 import { ZipReader } from '@endo/zip';
 import dbOpen from 'better-sqlite3';
-import { tmpName } from 'tmp';
 
 import assert from 'assert';
 import { makeAgd } from '../../upgrade-test-scripts/lib/agd-lib.js';
-import {
-  agoric,
-  wellKnownIdentities,
-} from '../../upgrade-test-scripts/lib/cliHelper.js';
+import { agoric } from '../../upgrade-test-scripts/lib/cliHelper.js';
 import { voteLatestProposalAndWait } from '../../upgrade-test-scripts/lib/commonUpgradeHelpers.js';
 import { dbTool } from '../../upgrade-test-scripts/lib/vat-status.js';
-import {
-  WebCache,
-  makeFileRW,
-  makeWebCache,
-  makeWebRd,
-} from '../../upgrade-test-scripts/lib/webAsset.js';
+import { type WebCache } from '../../upgrade-test-scripts/lib/webAsset.js';
 import {
   bundleDetail,
   ensureISTForInstall,
@@ -48,16 +39,12 @@ const assetInfo = {
   branch: 'auction-update',
   /** @type {Record<string, import('./core-eval-support.js').ProposalInfo>} */
   buildAssets: {
-    'replace-zcf': {
-      evals: [{ permit: 'replace-zcf-permit.json', script: 'replace-zcf.js' }],
+    'upgrade-zoe': {
+      evals: [{ permit: 'upgrade-zoe-permit.json', script: 'upgrade-zoe.js' }],
       // TODO read these from the script
       bundles: [
-        // manifest
-        'b1-9fa7c85b4802de2e72b549a745c6668184d6697c736bb7bde773a8eb0b20542acf9379e34a85015296acf5f6bf1814fb3880a0f18369aecf7b89ced0c20cdebf.json',
-        // zcfRef
-        'b1-0e2fa79268c146fe8b032a1c73d2823ac5f1497419b93a45114755105a1c0f079bfdc886654ddefdb81c0ccfdacd86784303078b0b7f637974e545850127b923.json',
-        // zoeRef
-        'b1-179cbba79c4b9f26a5e7b5df9976cd0d86062414860247094b65a171c3a5a78a3f7ec17a6c0adf31a2ed8eeff72f3084a0bb5b388623be5bfb2fe1c719ba70f8.json',
+        'b1-31f084378c798adc3018ac20670b43774adeb2c17e67c5676909a7ae7a806cb3c23cb671252d829a65f12ca052be8ef796dd9815d651b9e0372cfb8699e6e939.json',
+        'b1-8eb193574b53b1b4938a713ca776dd5c8989041a1ad1e22ef16034e1789ebb9d9998540461c46c4734382b8e5ab4b2d4245ace09f4af57d90cbeebfeab46cc95.json',
       ],
     },
   },
@@ -69,7 +56,6 @@ const staticConfig = {
   proposer: 'validator',
   collateralPrice: 6, // conservatively low price. TODO: look up
   swingstorePath: '~/.agoric/data/agoric/swingstore.sqlite',
-  assetBase: `${assetInfo.repo.url}/raw/${assetInfo.branch}/`, // alternative
   title: assetInfo.repo.name,
   description: assetInfo.repo.description,
   buildInfo: Object.values(assetInfo.buildAssets),

diff --git a/...3a45114755105a1c0f079bfdc886654ddefdb81c0ccfdacd86784303078b0b7f637974e545850127b923.json b/...3a45114755105a1c0f079bfdc886654ddefdb81c0ccfdacd86784303078b0b7f637974e545850127b923.json
diff --git a/...3084a0bb5b388623be5bfb2fe1c719ba70f8.json → ...8ef796dd9815d651b9e0372cfb8699e6e939.json b/...3084a0bb5b388623be5bfb2fe1c719ba70f8.json → ...8ef796dd9815d651b9e0372cfb8699e6e939.json
diff --git a/...b7bde773a8eb0b20542acf9379e34a85015296acf5f6bf1814fb3880a0f18369aecf7b89ced0c20cdebf.json b/...b7bde773a8eb0b20542acf9379e34a85015296acf5f6bf1814fb3880a0f18369aecf7b89ced0c20cdebf.json
diff --git a/...b27f8c571601a6f641ffae2b925dd7e3d67c6953a1f8122c8ba814305e034c9087056816a6f05dd41069.json b/...b27f8c571601a6f641ffae2b925dd7e3d67c6953a1f8122c8ba814305e034c9087056816a6f05dd41069.json
diff --git a/...b:zoe1/submission/replace-zcf-permit.json → ...b:zoe1/submission/upgrade-zoe-permit.json b/...b:zoe1/submission/replace-zcf-permit.json → ...b:zoe1/submission/upgrade-zoe-permit.json
diff --git a/proposals/b:zoe1/submission/replace-zcf.js → proposals/b:zoe1/submission/upgrade-zoe.js b/proposals/b:zoe1/submission/replace-zcf.js → proposals/b:zoe1/submission/upgrade-zoe.js
@@ -1,20 +1,17 @@
 // This is generated by writeCoreProposal; please edit!
 /* eslint-disable */
 
-const manifestBundleRef = {bundleID:"b1-9fa7c85b4802de2e72b549a745c6668184d6697c736bb7bde773a8eb0b20542acf9379e34a85015296acf5f6bf1814fb3880a0f18369aecf7b89ced0c20cdebf"};
+const manifestBundleRef = {bundleID:"b1-a3dc21c56535b4bebdf8c8413650eec2b37a6d9f5669b27f8c571601a6f641ffae2b925dd7e3d67c6953a1f8122c8ba814305e034c9087056816a6f05dd41069"};
 const getManifestCall = harden([
-  "getManifestForZoe",
+  "getManifestForUpgradingZoe",
   {
-    zcfRef: {
-      bundleID: "b1-0e2fa79268c146fe8b032a1c73d2823ac5f1497419b93a45114755105a1c0f079bfdc886654ddefdb81c0ccfdacd86784303078b0b7f637974e545850127b923",
-    },
     zoeRef: {
-      bundleID: "b1-179cbba79c4b9f26a5e7b5df9976cd0d86062414860247094b65a171c3a5a78a3f7ec17a6c0adf31a2ed8eeff72f3084a0bb5b388623be5bfb2fe1c719ba70f8",
+      bundleID: "b1-31f084378c798adc3018ac20670b43774adeb2c17e67c5676909a7ae7a806cb3c23cb671252d829a65f12ca052be8ef796dd9815d651b9e0372cfb8699e6e939",
     },
   },
 ]);
 const overrideManifest = {
-  upgradeZcf: {
+  upgradeZoe: {
     consume: {
       vatAdminSvc: "vatAdminSvc",
       vatStore: "vatStore",