@agoric/builders 0.1.1-dev-e37a322.0 → 0.1.1-dev-9b8cad2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-dev-e37a322.0+e37a322",
+  "version": "0.1.1-dev-9b8cad2.0+9b8cad2",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -23,14 +23,14 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-e37a322.0+e37a322",
-    "@agoric/fast-usdc": "0.1.1-dev-e37a322.0+e37a322",
-    "@agoric/internal": "0.3.3-dev-e37a322.0+e37a322",
-    "@agoric/notifier": "0.6.3-dev-e37a322.0+e37a322",
-    "@agoric/smart-wallet": "0.5.4-dev-e37a322.0+e37a322",
-    "@agoric/vat-data": "0.5.3-dev-e37a322.0+e37a322",
-    "@agoric/vats": "0.15.2-dev-e37a322.0+e37a322",
-    "@agoric/zoe": "0.26.3-dev-e37a322.0+e37a322",
+    "@agoric/ertp": "0.16.3-dev-9b8cad2.0+9b8cad2",
+    "@agoric/fast-usdc": "0.1.1-dev-9b8cad2.0+9b8cad2",
+    "@agoric/internal": "0.3.3-dev-9b8cad2.0+9b8cad2",
+    "@agoric/notifier": "0.6.3-dev-9b8cad2.0+9b8cad2",
+    "@agoric/smart-wallet": "0.5.4-dev-9b8cad2.0+9b8cad2",
+    "@agoric/vat-data": "0.5.3-dev-9b8cad2.0+9b8cad2",
+    "@agoric/vats": "0.15.2-dev-9b8cad2.0+9b8cad2",
+    "@agoric/zoe": "0.26.3-dev-9b8cad2.0+9b8cad2",
     "@endo/bundle-source": "^3.5.0",
     "@endo/captp": "^4.4.3",
     "@endo/eventual-send": "^1.2.8",
@@ -43,14 +43,14 @@
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-e37a322.0+e37a322",
-    "@agoric/governance": "0.10.4-dev-e37a322.0+e37a322",
-    "@agoric/inter-protocol": "0.16.2-dev-e37a322.0+e37a322",
-    "@agoric/orchestration": "0.1.1-dev-e37a322.0+e37a322",
-    "@agoric/store": "0.9.3-dev-e37a322.0+e37a322",
-    "@agoric/swing-store": "0.9.2-dev-e37a322.0+e37a322",
-    "@agoric/swingset-liveslots": "0.10.3-dev-e37a322.0+e37a322",
-    "@agoric/time": "0.3.3-dev-e37a322.0+e37a322",
+    "@agoric/deploy-script-support": "0.10.4-dev-9b8cad2.0+9b8cad2",
+    "@agoric/governance": "0.10.4-dev-9b8cad2.0+9b8cad2",
+    "@agoric/inter-protocol": "0.16.2-dev-9b8cad2.0+9b8cad2",
+    "@agoric/orchestration": "0.1.1-dev-9b8cad2.0+9b8cad2",
+    "@agoric/store": "0.9.3-dev-9b8cad2.0+9b8cad2",
+    "@agoric/swing-store": "0.9.2-dev-9b8cad2.0+9b8cad2",
+    "@agoric/swingset-liveslots": "0.10.3-dev-9b8cad2.0+9b8cad2",
+    "@agoric/time": "0.3.3-dev-9b8cad2.0+9b8cad2",
     "@endo/errors": "^1.2.8",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
@@ -83,5 +83,5 @@
   "typeCoverage": {
     "atLeast": 89.69
   },
-  "gitHead": "e37a3220b45d5b749a1114af1330960752f990f4"
+  "gitHead": "9b8cad23e2e69b417d9ea63513cc77af293c4780"
 }

package/scripts/orchestration/init-basic-flows.js

@@ -1,8 +1,22 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { startBasicFlows } from '@agoric/orchestration/src/proposals/start-basic-flows.js';
+import { parseArgs } from 'node:util';
+
+/**
+ * @import {ParseArgsConfig} from 'node:util'
+ */
+
+/** @type {ParseArgsConfig['options']} */
+const parserOpts = {
+  chainInfo: { type: 'string' },
+  assetInfo: { type: 'string' },
+};
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) => {
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) => {
   return harden({
     sourceSpec: '@agoric/orchestration/src/proposals/start-basic-flows.js',
     getManifestCall: [
@@ -15,6 +29,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             ),
           ),
         },
+        options,
       },
     ],
   });
@@ -22,6 +37,31 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
+  const { scriptArgs } = endowments;
+
+  const {
+    values: { chainInfo, assetInfo },
+  } = parseArgs({
+    args: scriptArgs,
+    options: parserOpts,
+  });
+
+  const parseChainInfo = () => {
+    if (typeof chainInfo !== 'string') return undefined;
+    return JSON.parse(chainInfo);
+  };
+  const parseAssetInfo = () => {
+    if (typeof assetInfo !== 'string') return undefined;
+    return JSON.parse(assetInfo);
+  };
+  const opts = harden({
+    chainInfo: parseChainInfo(),
+    assetInfo: parseAssetInfo(),
+  });
+
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval(startBasicFlows.name, defaultProposalBuilder);
+
+  await writeCoreEval(startBasicFlows.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };

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

@@ -0,0 +1,73 @@
+/**
+ * @file A proposal to start the auto-stake-it contract.
+ *
+ *   AutoStakeIt allows users to to create an auto-forwarding address that
+ *   transfers and stakes tokens on a remote chain when received.
+ */
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { startAutoStakeIt } from '@agoric/orchestration/src/proposals/start-auto-stake-it.js';
+import { parseArgs } from 'node:util';
+
+/**
+ * @import {ParseArgsConfig} from 'node:util'
+ */
+
+/** @type {ParseArgsConfig['options']} */
+const parserOpts = {
+  chainInfo: { type: 'string' },
+  assetInfo: { type: 'string' },
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) => {
+  return harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-auto-stake-it.js',
+    getManifestCall: [
+      'getManifest',
+      {
+        installKeys: {
+          autoAutoStakeIt: publishRef(
+            install(
+              '@agoric/orchestration/src/examples/auto-stake-it.contract.js',
+            ),
+          ),
+        },
+        options,
+      },
+    ],
+  });
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { scriptArgs } = endowments;
+
+  const {
+    values: { chainInfo, assetInfo },
+  } = parseArgs({
+    args: scriptArgs,
+    options: parserOpts,
+  });
+
+  const parseChainInfo = () => {
+    if (typeof chainInfo !== 'string') return undefined;
+    return JSON.parse(chainInfo);
+  };
+  const parseAssetInfo = () => {
+    if (typeof assetInfo !== 'string') return undefined;
+    return JSON.parse(assetInfo);
+  };
+  const opts = harden({
+    chainInfo: parseChainInfo(),
+    assetInfo: parseAssetInfo(),
+  });
+
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+
+  await writeCoreEval(startAutoStakeIt.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
+};

package/scripts/testing/{fix-buggy-sendAnywhere.js → upgrade-send-anywhere.js}

@@ -7,14 +7,14 @@ import {
   makeTracer,
   NonNullish,
 } from '@agoric/internal';
-import { E, Far } from '@endo/far';
+import { E } 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);
+const trace = makeTracer('UpgradeSA', true);
 
 /**
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/send-anywhere.contract.js';
@@ -30,7 +30,7 @@ const trace = makeTracer('FixBuggySA', true);
  * }} powers
  * @param {...any} rest
  */
-export const fixSendAnywhere = async (
+export const upgradeSendAnywhere = async (
   {
     consume: {
       agoricNames,
@@ -45,7 +45,7 @@ export const fixSendAnywhere = async (
   },
   { options: { sendAnywhereRef } },
 ) => {
-  trace(fixSendAnywhere.name);
+  trace(upgradeSendAnywhere.name);
 
   const saInstance = await instances.consume.sendAnywhere;
   trace('saInstance', saInstance);
@@ -53,28 +53,24 @@ export const fixSendAnywhere = async (
 
   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,
+      agoricNames,
       localchain,
       marshaller,
       orchestrationService: cosmosInterchainService,
       storageNode: E(NonNullish(await chainStorage)).makeChildNode(
-        'sendAnywhere',
+        'send-anywhere',
       ),
       timerService: chainTimerService,
+      // undefined so `registerKnownChainsAndAssets` does not run again
+      chainInfo: undefined,
+      assetInfo: undefined,
     }),
   );
 
   trace('upgrading...');
+  trace('ref', sendAnywhereRef);
   await E(saKit.adminFacet).upgradeContract(
     sendAnywhereRef.bundleID,
     privateArgs,
@@ -82,13 +78,13 @@ export const fixSendAnywhere = async (
 
   trace('done');
 };
-harden(fixSendAnywhere);
+harden(upgradeSendAnywhere);
 
 export const getManifestForValueVow = ({ restoreRef }, { sendAnywhereRef }) => {
   console.log('sendAnywhereRef', sendAnywhereRef);
   return {
     manifest: {
-      [fixSendAnywhere.name]: {
+      [upgradeSendAnywhere.name]: {
         consume: {
           agoricNames: true,
           board: true,
@@ -120,7 +116,7 @@ export const getManifestForValueVow = ({ restoreRef }, { sendAnywhereRef }) => {
 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',
+    sourceSpec: '@agoric/builders/scripts/testing/upgrade-send-anywhere.js',
     getManifestCall: [
       'getManifestForValueVow',
       {
@@ -139,5 +135,5 @@ export default async (homeP, endowments) => {
   const dspModule = await import('@agoric/deploy-script-support');
   const { makeHelpers } = dspModule;
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval(fixSendAnywhere.name, defaultProposalBuilder);
+  await writeCoreEval(upgradeSendAnywhere.name, defaultProposalBuilder);
 };

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

@@ -1,128 +0,0 @@
-/**
- * @file A proposal to start the auto-stake-it contract.
- *
- *   AutoStakeIt allows users to to create an auto-forwarding address that
- *   transfers and stakes tokens on a remote chain when received.
- */
-import { makeTracer } from '@agoric/internal';
-import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
-import { E } from '@endo/far';
-import { deeplyFulfilled } from '@endo/marshal';
-
-/**
- * @import {AutoStakeItSF} from '@agoric/orchestration/src/examples/auto-stake-it.contract.js';
- */
-
-const contractName = 'autoAutoStakeIt';
-const trace = makeTracer(contractName, true);
-
-/**
- * @param {BootstrapPowers} powers
- */
-export const startAutoStakeIt = async ({
-  consume: {
-    agoricNames,
-    board,
-    chainStorage,
-    chainTimerService,
-    cosmosInterchainService,
-    localchain,
-    startUpgradable,
-  },
-  installation: {
-    // @ts-expect-error not a WellKnownName
-    consume: { [contractName]: installation },
-  },
-  instance: {
-    // @ts-expect-error not a WellKnownName
-    produce: { [contractName]: produceInstance },
-  },
-}) => {
-  trace(`start ${contractName}`);
-  await null;
-
-  const storageNode = await makeStorageNodeChild(chainStorage, contractName);
-  const marshaller = await E(board).getPublishingMarshaller();
-
-  /** @type {StartUpgradableOpts<AutoStakeItSF>} */
-  const startOpts = {
-    label: 'autoAutoStakeIt',
-    installation,
-    terms: undefined,
-    privateArgs: await deeplyFulfilled(
-      // @ts-expect-error
-      harden({
-        agoricNames,
-        orchestrationService: cosmosInterchainService,
-        localchain,
-        storageNode,
-        marshaller,
-        timerService: chainTimerService,
-      }),
-    ),
-  };
-
-  const { instance } = await E(startUpgradable)(startOpts);
-  produceInstance.resolve(instance);
-};
-harden(startAutoStakeIt);
-
-export const getManifestForContract = (
-  { restoreRef },
-  { installKeys, ...options },
-) => {
-  return {
-    manifest: {
-      [startAutoStakeIt.name]: {
-        consume: {
-          agoricNames: true,
-          board: true,
-          chainStorage: true,
-          chainTimerService: true,
-          cosmosInterchainService: true,
-          localchain: true,
-          startUpgradable: true,
-        },
-        installation: {
-          consume: { [contractName]: true },
-        },
-        instance: {
-          produce: { [contractName]: true },
-        },
-      },
-    },
-    installations: {
-      [contractName]: restoreRef(installKeys[contractName]),
-    },
-    options,
-  };
-};
-
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) => {
-  return harden({
-    // Somewhat unorthodox, source the exports from this builder module
-    sourceSpec: '@agoric/builders/scripts/testing/start-auto-stake-it.js',
-    getManifestCall: [
-      'getManifestForContract',
-      {
-        installKeys: {
-          autoAutoStakeIt: publishRef(
-            install(
-              '@agoric/orchestration/src/examples/auto-stake-it.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(startAutoStakeIt.name, defaultProposalBuilder);
-};

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

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