@agoric/vats 0.15.2-dev-da94029.0 → 0.15.2-dev-d950170.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-da94029.0+da94029",
+  "version": "0.15.2-dev-d950170.0+d950170",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -79,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 90.49
   },
-  "gitHead": "da940299e592bd6866ddb29e4ceebdbe17c79ce0"
+  "gitHead": "d9501704148a9118bc62a9d84aada966dc2deb0f"
 }

package/src/proposals/upgrade-vats-generic-proposal.d.ts

@@ -13,6 +13,14 @@ export function upgradeVatsGeneric({ consume: { vatAdminSvc, vatStore } }: Boots
         };
     };
 }): Promise<void>;
+export function upgradeZoeContractsGeneric({ consume }: PromiseSpaceOf<Record<string, any>>, options: {
+    options: {
+        contractKitSpecs: ContractKitSpec[];
+        installationBundleRefs: {
+            [bundleName: string]: VatSourceRef;
+        };
+    };
+}): Promise<void>;
 export function getManifestForUpgradingVats(_powers: any, { bundleRefs, vatOptions }: {
     bundleRefs: any;
     vatOptions: any;
@@ -31,4 +39,32 @@ export function getManifestForUpgradingVats(_powers: any, { bundleRefs, vatOptio
         vatOptions: any;
     };
 };
+export function getManifestForUpgradingZoeContractKits({ restoreRef }: any, { contractKitSpecs, installationBundleRefs }: {
+    contractKitSpecs: ContractKitSpec[];
+    installationBundleRefs: {
+        [bundleName: string]: VatSourceRef;
+    };
+}): {
+    manifest: {
+        [upgradeZoeContractsGeneric.name]: {
+            consume: {
+                instancePrivateArgs: boolean;
+            };
+        };
+    };
+    installations: {
+        [k: string]: any;
+    };
+    options: {
+        contractKitSpecs: ContractKitSpec[];
+        installationBundleRefs: {
+            [bundleName: string]: VatSourceRef;
+        };
+    };
+};
+export type ContractKitSpec = {
+    kitLookup: string[];
+    bundleName: string;
+    entrypoint?: string;
+};
 //# sourceMappingURL=upgrade-vats-generic-proposal.d.ts.map

package/src/proposals/upgrade-vats-generic-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-vats-generic-proposal.d.ts","sourceRoot":"","sources":["upgrade-vats-generic-proposal.js"],"names":[],"mappings":"AAoBO,2EAjBI,eAAe,GAAG;IACxB,OAAO,EAAE;QACP,WAAW,EAAE,WAAW,CAAC;QACzB,QAAQ,EAAE,QAAQ,CACxB,MAAc,EACd,OAAe,sBAAsB,EAAE,gBAAgB,CAChD,CAAC;KACH,CAAC;CACH,WAED;IAKW,OAAO,EALV;QACN,UAAU,EAAE;YAAE,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAA;SAAE,CAAC;QAChD,UAAU,CAAC,EAAE;YACjB,CAAO,OAAO,EAAE,MAAM,GAAG,OAAO,sBAAsB,EAAE,iBAAiB,CAAC;SACrE,CAAC;KACH;CACH,iBAeA;AAEM;;;;;QAKH,CAAC,kBAAkB,CAAC,IAAI,CAAC;;;;;;UAMxB;;;;;;EAGH"}
+{"version":3,"file":"upgrade-vats-generic-proposal.d.ts","sourceRoot":"","sources":["upgrade-vats-generic-proposal.js"],"names":[],"mappings":"AAwBO,2EAjBI,eAAe,GAAG;IACxB,OAAO,EAAE;QACP,WAAW,EAAE,WAAW,CAAC;QACzB,QAAQ,EAAE,QAAQ,CACxB,MAAc,EACd,OAAe,sBAAsB,EAAE,gBAAgB,CAChD,CAAC;KACH,CAAC;CACH,WAED;IAKW,OAAO,EALV;QACN,UAAU,EAAE;YAAE,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAA;SAAE,CAAC;QAChD,UAAU,CAAC,EAAE;YACjB,CAAO,OAAO,EAAE,MAAM,GAAG,OAAO,sBAAsB,EAAE,iBAAiB,CAAC;SACrE,CAAC;KACH;CACH,iBAoBA;AAcM,wDAPI,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAE3C;IAGW,OAAO,EAHV;QACN,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,sBAAsB,EAAE;YAAE,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CAAA;SAAE,CAAC;KAChE;CACH,iBAqEA;AAEM;;;;;QAKH,CAAC,kBAAkB,CAAC,IAAI,CAAC;;;;;;UAMxB;;;;;;EAGH;AAUK,uEAPI,GAAG,gDACH;IACN,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,sBAAsB,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;CAChE;;QAoBE,CAAC,0BAA0B,CAAC,IAAI,CAAC;;;;UAIhC;;;;;;;;;;;EAaN;8BA3IY;IAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE"}

package/src/proposals/upgrade-vats-generic-proposal.js

@@ -1,5 +1,9 @@
 import { E } from '@endo/far';
 
+import { makeTracer } from '@agoric/internal';
+
+const trace = makeTracer('UpgradeVats');
+
 /**
  * @param {BootstrapPowers & {
  *   consume: {
@@ -22,16 +26,103 @@ export const upgradeVatsGeneric = async (
   { consume: { vatAdminSvc, vatStore } },
   options,
 ) => {
+  trace('Starting upgrade of vats');
   const { bundleRefs, vatOptions = {} } = options.options;
 
   for await (const [name, ref] of Object.entries(bundleRefs)) {
     assert(ref.bundleID, `bundleID missing for ${name}`);
-    console.log(name, `BUNDLE ID: `, ref.bundleID);
+    trace(name, `BUNDLE ID: `, ref.bundleID);
     const bundleCap = await E(vatAdminSvc).getBundleCap(ref.bundleID);
 
+    trace(name, 'Getting admin node from vatStore');
     const { adminNode } = await E(vatStore).get(name);
+    trace(name, 'Upgrading via adminNode');
     await E(adminNode).upgrade(bundleCap, vatOptions[name] || {});
   }
+
+  trace('Done upgrading vats');
+};
+
+/**
+ * @typedef {{ kitLookup: string[]; bundleName: string; entrypoint?: string }} ContractKitSpec
+ */
+
+/**
+ * @param {PromiseSpaceOf<Record<string, any>>} powers
+ * @param {object} options
+ * @param {{
+ *   contractKitSpecs: ContractKitSpec[];
+ *   installationBundleRefs: { [bundleName: string]: VatSourceRef };
+ * }} options.options
+ */
+export const upgradeZoeContractsGeneric = async ({ consume }, options) => {
+  trace('Starting upgrade of Zoe contract kits');
+
+  const { instancePrivateArgs: instancePrivateArgsP } = consume;
+
+  const { contractKitSpecs, installationBundleRefs } = options.options;
+
+  const kitWithPrivateArgs = async (kitName, contractKitP) => {
+    trace(kitName, 'awaiting contract kit');
+    const contractKit = await contractKitP;
+    if (contractKit.privateArgs) {
+      trace(
+        kitName,
+        'contractKit already has privateArgs',
+        contractKit.privateArgs,
+      );
+      return harden(contractKit);
+    }
+
+    // If the privateArgs are not directly on the contractKit, they may be
+    // on the instancePrivateArgs.
+    trace(kitName, 'getting privateArgs from instancePrivateArgs');
+    const privateArgs = await E(instancePrivateArgsP).get(contractKit.instance);
+    trace(
+      kitName,
+      'adding instancePrivateArgs',
+      privateArgs,
+      'to contract kit',
+    );
+    return harden({ ...contractKit, privateArgs });
+  };
+
+  await null;
+  for (const { kitLookup, bundleName } of contractKitSpecs) {
+    const humanLookup = JSON.stringify(kitLookup);
+    trace(humanLookup, 'Looking for contract kit');
+    let contractKit = consume;
+    for (let i = 0; i < kitLookup.length; i += 1) {
+      contractKit = await contractKit[kitLookup[i]];
+    }
+
+    const { adminFacet, privateArgs } = await kitWithPrivateArgs(
+      humanLookup,
+      contractKit,
+    );
+
+    const contractRef = installationBundleRefs[bundleName];
+    assert(contractRef, `No installation bundle found for ${bundleName}`);
+    assert(
+      contractRef.bundleID,
+      `No bundleID found for ${bundleName} in installationBundleRefs`,
+    );
+
+    trace(humanLookup, 'Upgrading contract kit to', bundleName);
+    const upgradeResult = await E(adminFacet).upgradeContract(
+      contractRef.bundleID,
+      privateArgs,
+    );
+    trace(
+      humanLookup,
+      'Upgraded contract kit to',
+      bundleName,
+      'completed with',
+      upgradeResult,
+    );
+  }
+
+  trace('Done upgrading contract kits.');
 };
 
 export const getManifestForUpgradingVats = (
@@ -49,3 +140,47 @@ export const getManifestForUpgradingVats = (
   },
   options: { bundleRefs, vatOptions },
 });
+
+/**
+ * @param {any} powers
+ * @param {{
+ *   contractKitSpecs: ContractKitSpec[];
+ *   installationBundleRefs: { [bundleName: string]: VatSourceRef };
+ * }} options
+ * @returns
+ */
+export const getManifestForUpgradingZoeContractKits = (
+  { restoreRef },
+  { contractKitSpecs, installationBundleRefs },
+) => {
+  const consumePermits = {
+    instancePrivateArgs: true,
+  };
+  for (const { kitLookup } of contractKitSpecs) {
+    let current = consumePermits;
+    for (let i = 0; i < kitLookup.length - 1; i += 1) {
+      current = current[kitLookup[i]] || (current[kitLookup[i]] = {});
+    }
+    current[kitLookup[kitLookup.length - 1]] ||= true;
+  }
+
+  return {
+    manifest: {
+      [upgradeZoeContractsGeneric.name]: {
+        // Other consume permits should only be added in the definition of
+        // `consumePermits`, at the top of this function.
+        consume: consumePermits,
+      },
+    },
+    installations: Object.fromEntries(
+      Object.entries(installationBundleRefs).map(([bundleName, bundleRef]) => [
+        bundleName,
+        restoreRef(bundleRef),
+      ]),
+    ),
+    options: {
+      contractKitSpecs,
+      installationBundleRefs,
+    },
+  };
+};