@agoric/vats 0.15.2-dev-cc54325.0 → 0.15.2-dev-3a7ade3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-cc54325.0+cc54325",
+  "version": "0.15.2-dev-3a7ade3.0+3a7ade3",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -15,6 +15,7 @@
     "build:boot-viz-sim-gov": "node src/authorityViz.js --sim-chain --gov >docs/boot-sim-gov.dot && dot -Tsvg docs/boot-sim-gov.dot >docs/boot-sim-gov.dot.svg",
     "build:restart-vats-proposal": "agoric run scripts/restart-vats.js",
     "build:add-STARS-proposal": "agoric run scripts/add-STARS.js",
+    "build:zcf-proposal": "agoric run scripts/replace-zoe.js",
     "prepack": "tsc --build jsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "test": "ava",
@@ -30,19 +31,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-cc54325.0+cc54325",
-    "@agoric/ertp": "0.16.3-dev-cc54325.0+cc54325",
-    "@agoric/governance": "0.10.4-dev-cc54325.0+cc54325",
-    "@agoric/inter-protocol": "0.16.2-dev-cc54325.0+cc54325",
-    "@agoric/internal": "0.3.3-dev-cc54325.0+cc54325",
-    "@agoric/notifier": "0.6.3-dev-cc54325.0+cc54325",
-    "@agoric/sharing-service": "0.2.12-dev-cc54325.0+cc54325",
-    "@agoric/store": "0.9.3-dev-cc54325.0+cc54325",
-    "@agoric/swingset-vat": "0.32.3-dev-cc54325.0+cc54325",
-    "@agoric/time": "0.3.3-dev-cc54325.0+cc54325",
-    "@agoric/vat-data": "0.5.3-dev-cc54325.0+cc54325",
-    "@agoric/zoe": "0.26.3-dev-cc54325.0+cc54325",
-    "@agoric/zone": "0.2.3-dev-cc54325.0+cc54325",
+    "@agoric/assert": "0.6.1-dev-3a7ade3.0+3a7ade3",
+    "@agoric/ertp": "0.16.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/governance": "0.10.4-dev-3a7ade3.0+3a7ade3",
+    "@agoric/inter-protocol": "0.16.2-dev-3a7ade3.0+3a7ade3",
+    "@agoric/internal": "0.3.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/notifier": "0.6.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/sharing-service": "0.2.12-dev-3a7ade3.0+3a7ade3",
+    "@agoric/store": "0.9.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/swingset-vat": "0.32.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/time": "0.3.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/vat-data": "0.5.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/zoe": "0.26.3-dev-3a7ade3.0+3a7ade3",
+    "@agoric/zone": "0.2.3-dev-3a7ade3.0+3a7ade3",
     "@endo/far": "^0.2.19",
     "@endo/import-bundle": "^0.3.5",
     "@endo/init": "^0.5.57",
@@ -53,11 +54,11 @@
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-cc54325.0+cc54325",
-    "@agoric/deploy-script-support": "0.10.4-dev-cc54325.0+cc54325",
-    "@agoric/smart-wallet": "0.5.4-dev-cc54325.0+cc54325",
-    "@agoric/swing-store": "0.9.2-dev-cc54325.0+cc54325",
-    "@agoric/swingset-liveslots": "0.10.3-dev-cc54325.0+cc54325",
+    "@agoric/cosmic-swingset": "0.41.4-dev-3a7ade3.0+3a7ade3",
+    "@agoric/deploy-script-support": "0.10.4-dev-3a7ade3.0+3a7ade3",
+    "@agoric/smart-wallet": "0.5.4-dev-3a7ade3.0+3a7ade3",
+    "@agoric/swing-store": "0.9.2-dev-3a7ade3.0+3a7ade3",
+    "@agoric/swingset-liveslots": "0.10.3-dev-3a7ade3.0+3a7ade3",
     "@endo/bundle-source": "^2.5.2",
     "@endo/captp": "^3.1.2",
     "@endo/eventual-send": "^0.17.3",
@@ -87,5 +88,5 @@
     "timeout": "20m",
     "workerThreads": false
   },
-  "gitHead": "cc543255026eb4aa3c8e0ad97ef7b572871063cd"
+  "gitHead": "3a7ade3a50f96df1d197cd9472e31e84d00b34bf"
 }

package/scripts/replace-zoe.js

@@ -0,0 +1,19 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) =>
+  harden({
+    sourceSpec: '../src/proposals/zcf-proposal.js',
+    getManifestCall: [
+      'getManifestForZoe',
+      {
+        zoeRef: publishRef(install('../src/vat-zoe.js')),
+        zcfRef: publishRef(install('../../zoe/src/contractFacet/vatRoot.js')),
+      },
+    ],
+  });
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  await writeCoreProposal('replace-zcf', defaultProposalBuilder);
+};

package/src/proposals/zcf-proposal.d.ts

@@ -0,0 +1,30 @@
+export function upgradeZcf({ consume: { vatAdminSvc, vatStore } }: BootstrapPowers & {
+    consume: {
+        vatAdminSvc: VatAdminSve;
+        vatStore: MapStore<string, CreateVatResults>;
+    };
+}, options: {
+    options: {
+        zoeRef: VatSourceRef;
+        zcfRef: VatSourceRef;
+    };
+}): Promise<void>;
+export function getManifestForZoe(_powers: any, { zoeRef, zcfRef }: {
+    zoeRef: any;
+    zcfRef: any;
+}): {
+    manifest: {
+        [x: string]: {
+            consume: {
+                vatAdminSvc: string;
+                vatStore: string;
+            };
+            produce: {};
+        };
+    };
+    options: {
+        zoeRef: any;
+        zcfRef: any;
+    };
+};
+//# sourceMappingURL=zcf-proposal.d.ts.map

package/src/proposals/zcf-proposal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zcf-proposal.d.ts","sourceRoot":"","sources":["zcf-proposal.js"],"names":[],"mappings":"AAYO,mEATI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,WAAiB,cAAc;QAC/B,QAAc,EAAE,SAAS,MAAM,mBAAmB,CAAC;KAC9C,CAAC;CACH;;gBAEiB,YAAY;gBAAU,YAAY;;kBAkBtD;AAEM;;;;;;;;;;;;;;;;;EAcL"}

package/src/proposals/zcf-proposal.js

@@ -0,0 +1,45 @@
+import { E } from '@endo/far';
+
+/**
+ * @param {BootstrapPowers & {
+ *   consume: {
+ *     vatAdminSvc: VatAdminSve;
+ *     vatStore: MapStore<string, CreateVatResults>;
+ *   };
+ * }} powers
+ * @param {object} options
+ * @param {{ zoeRef: VatSourceRef; zcfRef: VatSourceRef }} options.options
+ */
+export const upgradeZcf = async (
+  { consume: { vatAdminSvc, vatStore } },
+  options,
+) => {
+  const { zoeRef, zcfRef } = options.options;
+
+  const zoeBundleCap = await E(vatAdminSvc).getBundleCap(zoeRef.bundleID);
+  console.log(`ZOE BUNDLE ID: `, zoeRef.bundleID);
+
+  const { adminNode, root: zoeRoot } = await E(vatStore).get('zoe');
+
+  await E(adminNode).upgrade(zoeBundleCap, {});
+
+  const zoeConfigFacet = await E(zoeRoot).getZoeConfigFacet();
+  await E(zoeConfigFacet).updateZcfBundleId(zcfRef.bundleID);
+  console.log(`ZCF BUNDLE ID: `, zcfRef.bundleID);
+};
+
+export const getManifestForZoe = (_powers, { zoeRef, zcfRef }) => ({
+  manifest: {
+    [upgradeZcf.name]: {
+      consume: {
+        vatAdminSvc: 'vatAdminSvc',
+        vatStore: 'vatStore',
+      },
+      produce: {},
+    },
+  },
+  options: {
+    zoeRef,
+    zcfRef,
+  },
+});

package/src/vat-zoe.d.ts

@@ -3,10 +3,12 @@ export function buildRootObject(vatPowers: any, _vatParams: any, zoeBaggage: any
         zoeService: ZoeService;
         feeMintAccess: FeeMintAccess;
     }>;
+    getZoeConfigFacet: () => any;
 } & import("@endo/eventual-send").RemotableBrand<{}, {
     buildZoe: (adminVat: any, feeIssuerConfig: any, zcfBundleName: any) => Promise<{
         zoeService: ZoeService;
         feeMintAccess: FeeMintAccess;
     }>;
+    getZoeConfigFacet: () => any;
 }>;
 //# sourceMappingURL=vat-zoe.d.ts.map

package/src/vat-zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vat-zoe.d.ts","sourceRoot":"","sources":["vat-zoe.js"],"names":[],"mappings":"AAKA;;;;;;;;;;GA0CC"}
+{"version":3,"file":"vat-zoe.d.ts","sourceRoot":"","sources":["vat-zoe.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAgDC"}

package/src/vat-zoe.js

@@ -6,15 +6,20 @@ const BUILD_PARAMS_KEY = 'buildZoeParams';
 export function buildRootObject(vatPowers, _vatParams, zoeBaggage) {
   const shutdownZoeVat = vatPowers.exitVatWithFailure;
 
+  let zoeConfigFacet;
+
   if (zoeBaggage.has(BUILD_PARAMS_KEY)) {
     const { feeIssuerConfig, zcfSpec } = zoeBaggage.get(BUILD_PARAMS_KEY);
-    makeDurableZoeKit({
+    // The return value is `{ zoeService, zoeConfigFacet, feeMintAccess }`. This
+    // call only needs zoeConfigFacet because the others have been returned.
+    // zoeConfigFacet was added after the first release of Zoe on-chain.
+    ({ zoeConfigFacet } = makeDurableZoeKit({
       // For now Zoe will rewire vatAdminSvc on its own
       shutdownZoeVat,
       feeIssuerConfig,
       zcfSpec,
       zoeBaggage,
-    });
+    }));
   }
 
   return Far('root', {
@@ -44,5 +49,6 @@ export function buildRootObject(vatPowers, _vatParams, zoeBaggage) {
         feeMintAccess,
       });
     },
+    getZoeConfigFacet: () => zoeConfigFacet,
   });
 }