@agoric/builders 0.1.1-orchestration-dev-096c4e8.0 → 0.1.1-other-dev-fbe72e7.0.fbe72e7

package/scripts/vats/upgrade-vats.js

@@ -0,0 +1,49 @@
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const upgradeVatsProposalBuilder = async (
+  { publishRef, install },
+  vatNameToEntrypoint,
+) => {
+  if (!vatNameToEntrypoint) {
+    throw Error('Missing vatNameToEntrypoint');
+  }
+  return harden({
+    sourceSpec: '@agoric/vats/src/proposals/upgrade-vats-generic-proposal.js',
+    getManifestCall: [
+      'getManifestForUpgradingVats',
+      {
+        bundleRefs: Object.fromEntries(
+          Object.entries(vatNameToEntrypoint).map(
+            ([name, entrypoint]) =>
+              /** @type {const} */ ([name, publishRef(install(entrypoint))]),
+          ),
+        ),
+      },
+    ],
+  });
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const upgradeZoeContractsProposalBuilder = async (
+  { publishRef, install },
+  contractKitSpecs,
+) => {
+  if (!contractKitSpecs) {
+    throw Error('Missing contractKitSpecs');
+  }
+  return harden({
+    sourceSpec: '@agoric/vats/src/proposals/upgrade-vats-generic-proposal.js',
+    getManifestCall: [
+      'getManifestForUpgradingZoeContractKits',
+      {
+        contractKitSpecs,
+        /** @type {{ [bundleName: string]: VatSourceRef }} */
+        installationBundleRefs: Object.fromEntries(
+          contractKitSpecs.map(({ bundleName, entrypoint }) => [
+            bundleName,
+            publishRef(install(entrypoint)),
+          ]),
+        ),
+      },
+    ],
+  });
+};

package/scripts/vats/upgrade-zcf.js

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

package/scripts/vats/upgrade-zoe.js

@@ -1,6 +1,6 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-zoe-proposal.js',
@@ -12,7 +12,8 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
-  await writeCoreProposal('upgrade-zoe', defaultProposalBuilder);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('upgrade-zoe', defaultProposalBuilder);
 };

package/scripts/vats/upgradeScaledPriceAuthorities.js

@@ -0,0 +1,23 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) =>
+  harden({
+    sourceSpec:
+      '@agoric/inter-protocol/src/proposals/upgrade-scaledPriceAuthorities.js',
+    getManifestCall: [
+      'getManifestForUpgradeScaledPriceAuthorities',
+      {
+        scaledPARef: publishRef(
+          install('@agoric/zoe/src/contracts/scaledPriceAuthority.js'),
+        ),
+      },
+    ],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+
+  await writeCoreEval('upgradeScaledPriceAuthorities', defaultProposalBuilder);
+};

package/scripts/vats/upgradeVaults.js

@@ -0,0 +1,24 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) =>
+  harden({
+    sourceSpec: '@agoric/inter-protocol/src/proposals/upgrade-vaults.js',
+    getManifestCall: [
+      'getManifestForUpgradeVaults',
+      {
+        VaultFactoryRef: publishRef(
+          install(
+            '@agoric/inter-protocol/src/vaultFactory/vaultFactory.js',
+            '../bundles/bundle-vaultFactory.js',
+          ),
+        ),
+      },
+    ],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('upgrade-vaults', defaultProposalBuilder);
+};

package/tsconfig.json

@@ -1,9 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
     "checkJs": true,
-    "maxNodeModuleJsDepth": 2,
   },
   "include": [
     "*.js",

package/index.js

@@ -1,2 +0,0 @@
-// Ambient types
-import '@agoric/network/exported.js';

package/scripts/inter-protocol/deploy-contracts.js

@@ -1,110 +0,0 @@
-#!/usr/bin/env node
-import url from 'url';
-import { makeHelpers } from '@agoric/deploy-script-support';
-import { E } from '@endo/eventual-send';
-import { getCopyMapEntries, makeCopyMap } from '@agoric/store';
-
-// TODO: CLI options to choose contracts
-const contractRefs = [
-  '../../governance/bundles/bundle-contractGovernor.js',
-  '../../governance/bundles/bundle-committee.js',
-  '../../governance/bundles/bundle-binaryVoteCounter.js',
-  '../bundles/bundle-vaultFactory.js',
-  '../bundles/bundle-reserve.js',
-  '../bundles/bundle-psm.js',
-  '../bundles/bundle-auctioneer.js',
-  '../../vats/bundles/bundle-mintHolder.js',
-];
-const contractRoots = contractRefs.map(ref =>
-  url.fileURLToPath(new URL(ref, import.meta.url)),
-);
-
-/** @type {<T>(store: any, key: string, make: () => T) => Promise<T>} */
-const provideWhen = async (store, key, make) => {
-  const found = await E(store).get(key);
-  if (found) {
-    return found;
-  }
-  const value = make();
-  await E(store).set(key, value);
-  return value;
-};
-
-export default async (homeP, endowments) => {
-  const home = await homeP;
-  const { zoe, scratch, board } = home;
-
-  const { installInPieces, getBundlerMaker } = await makeHelpers(
-    homeP,
-    endowments,
-  );
-  const bundler = E(getBundlerMaker({ log: console.log })).makeBundler({
-    zoe,
-  });
-
-  console.log('getting installCache...');
-  /**
-   * @type {CopyMap<
-   *   string,
-   *   { installation: Installation; boardId: string; path?: string }
-   * >}
-   */
-  const initial = await provideWhen(scratch, 'installCache', () =>
-    makeCopyMap([]),
-  );
-  console.log('initially:', initial.payload.keys.length, 'entries');
-
-  // ISSUE: getCopyMapEntries of CopyMap<K, V> loses K, V.
-  /**
-   * @type {Map<
-   *   string,
-   *   { installation: Installation; boardId: string; path?: string }
-   * >}
-   */
-  const working = new Map(getCopyMapEntries(initial));
-
-  let added = 0;
-
-  /** @type {EndoZipBase64Bundle[]} */
-  const bundles = await Promise.all(
-    contractRoots.map(path => import(path).then(m => m.default)),
-  );
-
-  let ix = 0;
-  for await (const bundle of bundles) {
-    const sha512 = bundle.endoZipBase64Sha512;
-    if (working.has(bundle.endoZipBase64Sha512)) {
-      console.log('hit:', { path: contractRefs[ix], sha512 });
-    } else {
-      console.log('miss:', {
-        path: contractRefs[ix],
-        length: bundle.endoZipBase64.length,
-        sha512,
-      });
-      const installation = await installInPieces(bundle, bundler, {
-        persist: true,
-      });
-      const boardId = await E(board).getId(installation);
-      working.set(sha512, { installation, boardId, path: contractRefs[ix] });
-      added += 1;
-    }
-    ix += 1;
-  }
-
-  const final = makeCopyMap(working);
-  assert.equal(final.payload.keys.length, working.size);
-  await (added > 0 && E(home.scratch).set('installCache', final));
-  console.log({
-    initial: initial.payload.keys.length,
-    added,
-    total: working.size,
-  });
-
-  const items = [...working.entries()]
-    .map(([sha512, { boardId, path }]) => ({ sha512, boardId, path }))
-    .sort();
-  const boardId = await E(board).getId(JSON.stringify(items));
-  console.log({
-    boardId,
-  });
-};