@agoric/builders 0.1.1-upgrade-17-dev-e67cd91.0 → 0.1.1-upgrade-18-dev-d7c994b.0

package/scripts/testing/restart-send-anywhere.js

@@ -91,6 +91,7 @@ export const defaultProposalBuilder = async () =>
     getManifestCall: [getManifest.name],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/restart-stakeAtom.js

@@ -11,7 +11,7 @@ import { E } from '@endo/far';
 const trace = makeTracer('RestartSA', true);
 
 /**
- * @import {start as StartFn} from '@agoric/orchestration/src/examples/stakeIca.contract.js';
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/stake-ica.contract.js';
  */
 
 /**
@@ -81,6 +81,7 @@ export const defaultProposalBuilder = async () =>
     getManifestCall: [getManifest.name],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/restart-valueVow.js

@@ -72,6 +72,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/start-auto-stake-it.js

@@ -118,6 +118,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/start-buggy-sendAnywhere.js

@@ -0,0 +1,143 @@
+/**
+ * @file This is for use in tests in a3p-integration
+ * Unlike most builder scripts, this one includes the proposal exports as well.
+ */
+import {
+  deeplyFulfilledObject,
+  makeTracer,
+  NonNullish,
+} from '@agoric/internal';
+import { E, Far } from '@endo/far';
+
+/// <reference types="@agoric/vats/src/core/types-ambient"/>
+/**
+ * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
+ */
+
+const trace = makeTracer('StartBuggySA', true);
+
+/**
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/send-anywhere.contract.js';
+ */
+
+/**
+ * @param {BootstrapPowers & {
+ *   installation: {
+ *     consume: {
+ *       sendAnywhere: Installation<StartFn>;
+ *     };
+ *   };
+ * }} powers
+ */
+export const startSendAnywhere = async ({
+  consume: {
+    agoricNames,
+    board,
+    chainStorage,
+    chainTimerService,
+    cosmosInterchainService,
+    localchain,
+    startUpgradable,
+  },
+  installation: {
+    consume: { sendAnywhere },
+  },
+  instance: {
+    // @ts-expect-error unknown instance
+    produce: { sendAnywhere: produceInstance },
+  },
+}) => {
+  trace(startSendAnywhere.name);
+
+  const marshaller = await E(board).getReadonlyMarshaller();
+
+  const privateArgs = await deeplyFulfilledObject(
+    harden({
+      agoricNames,
+      localchain,
+      marshaller,
+      orchestrationService: cosmosInterchainService,
+      storageNode: E(NonNullish(await chainStorage)).makeChildNode(
+        'sendAnywhere',
+      ),
+      timerService: chainTimerService,
+    }),
+  );
+
+  /** @type {import('@agoric/vats').NameHub} */
+  // @ts-expect-error intentional fake
+  const agoricNamesHangs = Far('agoricNames that hangs', {
+    lookup: async () => {
+      trace('agoricNames.lookup being called that will never resolve');
+      // BUG: this never resolves
+      return new Promise(() => {});
+    },
+  });
+
+  const { instance } = await E(startUpgradable)({
+    label: 'sendAnywhere',
+    installation: sendAnywhere,
+    privateArgs: {
+      ...privateArgs,
+      agoricNames: agoricNamesHangs,
+    },
+  });
+  produceInstance.resolve(instance);
+  trace('done');
+};
+harden(startSendAnywhere);
+
+export const getManifestForValueVow = ({ restoreRef }, { sendAnywhereRef }) => {
+  trace('sendAnywhereRef', sendAnywhereRef);
+  return {
+    manifest: {
+      [startSendAnywhere.name]: {
+        consume: {
+          agoricNames: true,
+          board: true,
+          chainStorage: true,
+          chainTimerService: true,
+          cosmosInterchainService: true,
+          localchain: true,
+
+          startUpgradable: true,
+        },
+        installation: {
+          consume: { sendAnywhere: true },
+        },
+        instance: {
+          produce: { sendAnywhere: true },
+        },
+      },
+    },
+    installations: {
+      sendAnywhere: restoreRef(sendAnywhereRef),
+    },
+  };
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) =>
+  harden({
+    // Somewhat unorthodox, source the exports from this builder module
+    sourceSpec: '@agoric/builders/scripts/testing/start-buggy-sendAnywhere.js',
+    getManifestCall: [
+      'getManifestForValueVow',
+      {
+        sendAnywhereRef: publishRef(
+          install(
+            '@agoric/orchestration/src/examples/send-anywhere.contract.js',
+          ),
+        ),
+      },
+    ],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  // import dynamically so the module can work in CoreEval environment
+  const dspModule = await import('@agoric/deploy-script-support');
+  const { makeHelpers } = dspModule;
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(startSendAnywhere.name, defaultProposalBuilder);
+};

package/scripts/testing/start-query-flows.js

@@ -125,6 +125,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/start-send-anywhere.js

@@ -126,6 +126,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/start-valueVow.js

@@ -83,6 +83,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/tweak-chain-info.js

@@ -16,9 +16,6 @@ const chainInfo = {
         counterparty: {
           client_id: '07-tendermint-2',
           connection_id: 'connection-1',
-          prefix: {
-            key_prefix: '',
-          },
         },
         state: 3 /* IBCConnectionState.STATE_OPEN */,
         transferChannel: {
@@ -47,6 +44,7 @@ export const defaultProposalBuilder = async () =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('revise-chain-info', defaultProposalBuilder);

package/scripts/vats/add-auction.js

@@ -7,17 +7,24 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
     getManifestCall: [
       'getManifestForAddAuction',
       {
-        auctionsRef: publishRef(
+        auctioneerRef: publishRef(
           install(
             '@agoric/inter-protocol/src/auction/auctioneer.js',
             '../../inter-protocol/bundles/bundle-auctioneer.js',
           ),
         ),
+        contractGovernorRef: publishRef(
+          install(
+            '@agoric/governance/src/contractGovernor.js',
+            '../bundles/bundle-contractGovernor.js',
+          ),
+        ),
       },
     ],
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('add-auction', defaultProposalBuilder);

package/scripts/vats/init-core.js

@@ -25,6 +25,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-vats', defaultProposalBuilder);

package/scripts/vats/init-localchain.js

@@ -14,6 +14,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-localchain', defaultProposalBuilder);

package/scripts/vats/init-network.js

@@ -13,6 +13,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-network', defaultProposalBuilder);

package/scripts/vats/init-orchestration.js

@@ -14,6 +14,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-orchestration', defaultProposalBuilder);

package/scripts/vats/init-transfer.js

@@ -12,6 +12,7 @@ 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('gov-transfer', defaultProposalBuilder);

package/scripts/vats/probe-zcf-bundle.js

@@ -16,6 +16,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('probeZcfBundle', defaultProposalBuilder);

package/scripts/vats/replace-provisioning.js

@@ -17,6 +17,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-provisioning', defaultProposalBuilder);

package/scripts/vats/replace-zoe.js

@@ -13,6 +13,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('replace-zcf', defaultProposalBuilder);

package/scripts/vats/restart-vats.js

@@ -19,6 +19,7 @@ export const defaultProposalBuilder = async () => {
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('restart-vats', defaultProposalBuilder);

package/scripts/vats/revive-kread.js

@@ -7,6 +7,7 @@ export const defaultProposalBuilder = async () =>
     getManifestCall: ['getManifestForKread'],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('revive-kread', defaultProposalBuilder);

package/scripts/vats/test-localchain.js

@@ -12,6 +12,7 @@ export const defaultProposalBuilder = async _powers =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('test-localchain', defaultProposalBuilder);

package/scripts/vats/test-vtransfer.js

@@ -12,6 +12,7 @@ export const defaultProposalBuilder = async _powers =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('test-vtransfer', defaultProposalBuilder);

package/scripts/vats/updateAtomPriceFeed.js

@@ -14,6 +14,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStAtomPriceFeed.js

@@ -14,6 +14,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStOsmoPriceFeed.js

@@ -14,6 +14,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStTiaPriceFeed.js

@@ -14,6 +14,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStkAtomPriceFeed.js

@@ -14,6 +14,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/upgrade-bank.js

@@ -12,6 +12,7 @@ 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-bank', defaultProposalBuilder);

package/scripts/vats/upgrade-orch-core.js

@@ -17,6 +17,7 @@ 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-network', defaultProposalBuilder);

package/scripts/vats/upgrade-provisionPool.js

@@ -14,6 +14,7 @@ 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-provision-pool', defaultProposalBuilder);

package/scripts/vats/upgrade-zcf.js

@@ -12,6 +12,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @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

@@ -12,6 +12,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('upgrade-zoe', defaultProposalBuilder);

package/scripts/vats/upgradeScaledPriceAuthorities.js

@@ -15,6 +15,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/upgradeVaults.js

@@ -7,7 +7,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     getManifestCall: [
       'getManifestForUpgradeVaults',
       {
-        vaultsRef: publishRef(
+        VaultFactoryRef: publishRef(
           install(
             '@agoric/inter-protocol/src/vaultFactory/vaultFactory.js',
             '../bundles/bundle-vaultFactory.js',
@@ -17,6 +17,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
+/** @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/scripts/inter-protocol/deploy-contracts.js

@@ -1,111 +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';
-/** @import {CopyMap} from '@endo/patterns' */
-
-// 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,
-  });
-};