@agoric/builders 0.1.1-dev-6909994.0 → 0.1.1-dev-e3b41dc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-dev-6909994.0+6909994",
+  "version": "0.1.1-dev-e3b41dc.0+e3b41dc",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -23,13 +23,13 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-6909994.0+6909994",
-    "@agoric/internal": "0.3.3-dev-6909994.0+6909994",
-    "@agoric/notifier": "0.6.3-dev-6909994.0+6909994",
-    "@agoric/smart-wallet": "0.5.4-dev-6909994.0+6909994",
-    "@agoric/vat-data": "0.5.3-dev-6909994.0+6909994",
-    "@agoric/vats": "0.15.2-dev-6909994.0+6909994",
-    "@agoric/zoe": "0.26.3-dev-6909994.0+6909994",
+    "@agoric/ertp": "0.16.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/internal": "0.3.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/notifier": "0.6.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/smart-wallet": "0.5.4-dev-e3b41dc.0+e3b41dc",
+    "@agoric/vat-data": "0.5.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/vats": "0.15.2-dev-e3b41dc.0+e3b41dc",
+    "@agoric/zoe": "0.26.3-dev-e3b41dc.0+e3b41dc",
     "@endo/bundle-source": "^3.4.0",
     "@endo/captp": "^4.3.0",
     "@endo/eventual-send": "^1.2.5",
@@ -41,14 +41,14 @@
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-6909994.0+6909994",
-    "@agoric/governance": "0.10.4-dev-6909994.0+6909994",
-    "@agoric/inter-protocol": "0.16.2-dev-6909994.0+6909994",
-    "@agoric/orchestration": "0.1.1-dev-6909994.0+6909994",
-    "@agoric/store": "0.9.3-dev-6909994.0+6909994",
-    "@agoric/swing-store": "0.9.2-dev-6909994.0+6909994",
-    "@agoric/swingset-liveslots": "0.10.3-dev-6909994.0+6909994",
-    "@agoric/time": "0.3.3-dev-6909994.0+6909994",
+    "@agoric/deploy-script-support": "0.10.4-dev-e3b41dc.0+e3b41dc",
+    "@agoric/governance": "0.10.4-dev-e3b41dc.0+e3b41dc",
+    "@agoric/inter-protocol": "0.16.2-dev-e3b41dc.0+e3b41dc",
+    "@agoric/orchestration": "0.1.1-dev-e3b41dc.0+e3b41dc",
+    "@agoric/store": "0.9.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/swing-store": "0.9.2-dev-e3b41dc.0+e3b41dc",
+    "@agoric/swingset-liveslots": "0.10.3-dev-e3b41dc.0+e3b41dc",
+    "@agoric/time": "0.3.3-dev-e3b41dc.0+e3b41dc",
     "@endo/errors": "^1.2.5",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
@@ -81,5 +81,5 @@
   "typeCoverage": {
     "atLeast": 81.8
   },
-  "gitHead": "6909994fc7df88c73d6a476f4d10f56aea85bea5"
+  "gitHead": "e3b41dc204ce335217bf18ed4889aba18734d8f6"
 }

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

@@ -0,0 +1,142 @@
+/**
+ * @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, Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ */
+
+const trace = makeTracer('FixBuggySA', true);
+
+/**
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/send-anywhere.contract.js';
+ */
+
+/**
+ * @param {BootstrapPowers & {
+ *   instance: {
+ *     consume: {
+ *       sendAnywhere: Instance<StartFn>;
+ *     };
+ *   };
+ * }} powers
+ * @param {...any} rest
+ */
+export const fixSendAnywhere = async (
+  {
+    consume: {
+      agoricNames,
+      board,
+      chainStorage,
+      chainTimerService,
+      contractKits,
+      cosmosInterchainService,
+      localchain,
+    },
+    instance: instances,
+  },
+  { options: { sendAnywhereRef } },
+) => {
+  trace(fixSendAnywhere.name);
+
+  const saInstance = await instances.consume.sendAnywhere;
+  trace('saInstance', saInstance);
+  const saKit = await E(contractKits).get(saInstance);
+
+  const marshaller = await E(board).getReadonlyMarshaller();
+
+  // This apparently pointless wrapper is to maintain structural parity
+  // with the buggy core-eval's wrapper to make lookup() hang.
+  const agoricNamesResolves = Far('agoricNames that resolves', {
+    lookup: async (...args) => {
+      return E(agoricNames).lookup(...args);
+    },
+  });
+
+  const privateArgs = await deeplyFulfilledObject(
+    harden({
+      agoricNames: agoricNamesResolves,
+      localchain,
+      marshaller,
+      orchestrationService: cosmosInterchainService,
+      storageNode: E(NonNullish(await chainStorage)).makeChildNode(
+        'sendAnywhere',
+      ),
+      timerService: chainTimerService,
+    }),
+  );
+
+  trace('upgrading...');
+  await E(saKit.adminFacet).upgradeContract(
+    sendAnywhereRef.bundleID,
+    privateArgs,
+  );
+
+  trace('done');
+};
+harden(fixSendAnywhere);
+
+export const getManifestForValueVow = ({ restoreRef }, { sendAnywhereRef }) => {
+  console.log('sendAnywhereRef', sendAnywhereRef);
+  return {
+    manifest: {
+      [fixSendAnywhere.name]: {
+        consume: {
+          agoricNames: true,
+          board: true,
+          chainStorage: true,
+          chainTimerService: true,
+          cosmosInterchainService: true,
+          localchain: true,
+
+          contractKits: true,
+        },
+        installation: {
+          consume: { sendAnywhere: true },
+        },
+        instance: {
+          consume: { sendAnywhere: true },
+        },
+      },
+    },
+    installations: {
+      sendAnywhere: restoreRef(sendAnywhereRef),
+    },
+    options: {
+      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/fix-buggy-sendAnywhere.js',
+    getManifestCall: [
+      'getManifestForValueVow',
+      {
+        sendAnywhereRef: publishRef(
+          install(
+            '@agoric/orchestration/src/examples/send-anywhere.contract.js',
+          ),
+        ),
+      },
+    ],
+  });
+
+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(fixSendAnywhere.name, defaultProposalBuilder);
+};

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

@@ -0,0 +1,142 @@
+/**
+ * @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',
+          ),
+        ),
+      },
+    ],
+  });
+
+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);
+};