@agoric/builders 0.1.1-dev-33eb3c9.0 → 0.1.1-dev-c962ba0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-dev-33eb3c9.0+33eb3c9",
+  "version": "0.1.1-dev-c962ba0.0+c962ba0",
   "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-33eb3c9.0+33eb3c9",
-    "@agoric/internal": "0.3.3-dev-33eb3c9.0+33eb3c9",
-    "@agoric/notifier": "0.6.3-dev-33eb3c9.0+33eb3c9",
-    "@agoric/smart-wallet": "0.5.4-dev-33eb3c9.0+33eb3c9",
-    "@agoric/vat-data": "0.5.3-dev-33eb3c9.0+33eb3c9",
-    "@agoric/vats": "0.15.2-dev-33eb3c9.0+33eb3c9",
-    "@agoric/zoe": "0.26.3-dev-33eb3c9.0+33eb3c9",
+    "@agoric/ertp": "0.16.3-dev-c962ba0.0+c962ba0",
+    "@agoric/internal": "0.3.3-dev-c962ba0.0+c962ba0",
+    "@agoric/notifier": "0.6.3-dev-c962ba0.0+c962ba0",
+    "@agoric/smart-wallet": "0.5.4-dev-c962ba0.0+c962ba0",
+    "@agoric/vat-data": "0.5.3-dev-c962ba0.0+c962ba0",
+    "@agoric/vats": "0.15.2-dev-c962ba0.0+c962ba0",
+    "@agoric/zoe": "0.26.3-dev-c962ba0.0+c962ba0",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
     "@endo/eventual-send": "^1.3.1",
@@ -42,14 +42,14 @@
     "import-meta-resolve": "^4.1.0"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-33eb3c9.0+33eb3c9",
-    "@agoric/governance": "0.10.4-dev-33eb3c9.0+33eb3c9",
-    "@agoric/inter-protocol": "0.16.2-dev-33eb3c9.0+33eb3c9",
-    "@agoric/orchestration": "0.1.1-dev-33eb3c9.0+33eb3c9",
-    "@agoric/store": "0.9.3-dev-33eb3c9.0+33eb3c9",
-    "@agoric/swing-store": "0.9.2-dev-33eb3c9.0+33eb3c9",
-    "@agoric/swingset-liveslots": "0.10.3-dev-33eb3c9.0+33eb3c9",
-    "@agoric/time": "0.3.3-dev-33eb3c9.0+33eb3c9",
+    "@agoric/deploy-script-support": "0.10.4-dev-c962ba0.0+c962ba0",
+    "@agoric/governance": "0.10.4-dev-c962ba0.0+c962ba0",
+    "@agoric/inter-protocol": "0.16.2-dev-c962ba0.0+c962ba0",
+    "@agoric/orchestration": "0.1.1-dev-c962ba0.0+c962ba0",
+    "@agoric/store": "0.9.3-dev-c962ba0.0+c962ba0",
+    "@agoric/swing-store": "0.9.2-dev-c962ba0.0+c962ba0",
+    "@agoric/swingset-liveslots": "0.10.3-dev-c962ba0.0+c962ba0",
+    "@agoric/time": "0.3.3-dev-c962ba0.0+c962ba0",
     "@endo/errors": "^1.2.10",
     "ava": "^5.3.0",
     "c8": "^10.1.3"
@@ -82,5 +82,5 @@
   "typeCoverage": {
     "atLeast": 90.62
   },
-  "gitHead": "33eb3c9c00816b734f69a252391c48d461bf622f"
+  "gitHead": "c962ba0771022947027b9bd76339a3ab21406b20"
 }

package/scripts/orchestration/helpers.js

@@ -0,0 +1,46 @@
+/**
+ * @import {DeployScriptEndownments} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
+ * @import {ParseArgsConfig} from 'node:util'
+ */
+
+/**
+ * Parse `chainInfo` and `assetInfo` into builder opts
+ *
+ * NOTE: Ambient authority via `node:util`
+ *
+ * @param {DeployScriptEndownments['scriptArgs']} scriptArgs
+ * @returns {Promise<{
+ *      chainInfo: Record<string, CosmosChainInfo>;
+ *     assetInfo: [Denom, DenomDetail & { brandKey?: string }][];
+ * }>}
+ */
+export const parseChainHubOpts = async scriptArgs => {
+  // import dynamically so the modules can work in CoreEval environment
+  const { parseArgs } = await import('node:util');
+
+  /** @type {ParseArgsConfig['options']} */
+  const parserOpts = {
+    chainInfo: { type: 'string' },
+    assetInfo: { type: 'string' },
+  };
+  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);
+  };
+  return harden({
+    chainInfo: parseChainInfo(),
+    assetInfo: parseAssetInfo(),
+  });
+};

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

@@ -1,16 +1,6 @@
 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' },
-};
+import { parseChainHubOpts } from './helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
@@ -38,29 +28,8 @@ export const defaultProposalBuilder = async (
 /** @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 opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-
   await writeCoreEval(startBasicFlows.name, utils =>
     defaultProposalBuilder(utils, opts),
   );

package/scripts/orchestration/init-stakeAtom.js

@@ -1,7 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { parseChainHubOpts } from './helpers.js';
 
 /** @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-stakeAtom.js',
     getManifestCall: [
@@ -12,6 +16,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             install('@agoric/orchestration/src/examples/stake-ica.contract.js'),
           ),
         },
+        options,
       },
     ],
   });
@@ -19,6 +24,10 @@ 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 opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval('start-stakeAtom', defaultProposalBuilder);
+  await writeCoreEval('start-stakeAtom', utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };

package/scripts/orchestration/init-stakeOsmo.js

@@ -1,7 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { parseChainHubOpts } from './helpers.js';
 
 /** @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-stakeOsmo.js',
     getManifestCall: [
@@ -12,6 +16,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             install('@agoric/orchestration/src/examples/stake-ica.contract.js'),
           ),
         },
+        options,
       },
     ],
   });
@@ -19,6 +24,10 @@ 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 opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval('start-stakeOsmo', defaultProposalBuilder);
+  await writeCoreEval('start-stakeOsmo', utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };

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

@@ -6,17 +6,7 @@
  */
 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' },
-};
+import { parseChainHubOpts } from '../orchestration/helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
@@ -44,29 +34,8 @@ export const defaultProposalBuilder = async (
 /** @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 opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-
   await writeCoreEval(startAutoStakeIt.name, utils =>
     defaultProposalBuilder(utils, opts),
   );

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

@@ -3,17 +3,7 @@ import {
   getManifest,
   startSendAnywhere,
 } from '@agoric/orchestration/src/proposals/start-send-anywhere.js';
-import { parseArgs } from 'node:util';
-
-/**
- * @import {ParseArgsConfig} from 'node:util'
- */
-
-/** @type {ParseArgsConfig['options']} */
-const parserOpts = {
-  chainInfo: { type: 'string' },
-  assetInfo: { type: 'string' },
-};
+import { parseChainHubOpts } from '../orchestration/helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
@@ -38,29 +28,8 @@ export const defaultProposalBuilder = async (
 /** @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 opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-
   await writeCoreEval(startSendAnywhere.name, utils =>
     defaultProposalBuilder(utils, opts),
   );

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

@@ -7,8 +7,10 @@
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
+import { parseChainHubOpts } from '../orchestration/helpers.js';
 
 /**
+ * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  * @import {QueryFlowsSF as StartFn} from '@agoric/orchestration/src/fixtures/query-flows.contract.js';
  */
 
@@ -28,25 +30,34 @@ const trace = makeTracer(contractName, true);
  *     };
  *   };
  * }} powers
+ * @param {{
+ *   options: {
+ *     chainInfo: Record<string, CosmosChainInfo>;
+ *     assetInfo: [Denom, DenomDetail & { brandKey?: string }][];
+ *   };
+ * }} config
  */
-export const startQueryFlows = async ({
-  consume: {
-    agoricNames,
-    board,
-    chainStorage,
-    chainTimerService,
-    cosmosInterchainService,
-    localchain,
-    startUpgradable,
-  },
-  installation: {
-    consume: { [contractName]: installation },
-  },
-  instance: {
-    // @ts-expect-error unknown instance
-    produce: { [contractName]: produceInstance },
+export const startQueryFlows = async (
+  {
+    consume: {
+      agoricNames,
+      board,
+      chainStorage,
+      chainTimerService,
+      cosmosInterchainService,
+      localchain,
+      startUpgradable,
+    },
+    installation: {
+      consume: { [contractName]: installation },
+    },
+    instance: {
+      // @ts-expect-error unknown instance
+      produce: { [contractName]: produceInstance },
+    },
   },
-}) => {
+  { options: { chainInfo, assetInfo } },
+) => {
   trace(`start ${contractName}`);
 
   const storageNode = await makeStorageNodeChild(chainStorage, contractName);
@@ -60,6 +71,8 @@ export const startQueryFlows = async ({
     privateArgs: await deeplyFulfilledObject(
       harden({
         agoricNames,
+        assetInfo,
+        chainInfo,
         orchestrationService: cosmosInterchainService,
         localchain,
         storageNode,
@@ -76,7 +89,7 @@ harden(startQueryFlows);
 
 export const getManifestForContract = (
   { restoreRef },
-  { installKeys, ...options },
+  { installKeys, options },
 ) => {
   return {
     manifest: {
@@ -106,7 +119,10 @@ export const getManifestForContract = (
 };
 
 /** @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({
     // Somewhat unorthodox, source the exports from this builder module
     sourceSpec: '@agoric/builders/scripts/testing/start-query-flows.js',
@@ -120,6 +136,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             ),
           ),
         },
+        options,
       },
     ],
   });
@@ -127,9 +144,12 @@ 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');
-  const { makeHelpers } = dspModule;
+  // import dynamically so the modules can work in CoreEval environment
+  const { makeHelpers } = await import('@agoric/deploy-script-support');
+  const { scriptArgs } = endowments;
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval(startQueryFlows.name, defaultProposalBuilder);
+  await writeCoreEval(startQueryFlows.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };