@agoric/builders 0.1.1-dev-1dd4589.0 → 0.1.1-dev-8657c4c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-dev-1dd4589.0+1dd4589",
+  "version": "0.1.1-dev-8657c4c.0+8657c4c",
   "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-1dd4589.0+1dd4589",
-    "@agoric/fast-usdc": "0.1.1-dev-1dd4589.0+1dd4589",
-    "@agoric/internal": "0.3.3-dev-1dd4589.0+1dd4589",
-    "@agoric/notifier": "0.6.3-dev-1dd4589.0+1dd4589",
-    "@agoric/smart-wallet": "0.5.4-dev-1dd4589.0+1dd4589",
-    "@agoric/vat-data": "0.5.3-dev-1dd4589.0+1dd4589",
-    "@agoric/vats": "0.15.2-dev-1dd4589.0+1dd4589",
-    "@agoric/zoe": "0.26.3-dev-1dd4589.0+1dd4589",
+    "@agoric/ertp": "0.16.3-dev-8657c4c.0+8657c4c",
+    "@agoric/fast-usdc": "0.1.1-dev-8657c4c.0+8657c4c",
+    "@agoric/internal": "0.3.3-dev-8657c4c.0+8657c4c",
+    "@agoric/notifier": "0.6.3-dev-8657c4c.0+8657c4c",
+    "@agoric/smart-wallet": "0.5.4-dev-8657c4c.0+8657c4c",
+    "@agoric/vat-data": "0.5.3-dev-8657c4c.0+8657c4c",
+    "@agoric/vats": "0.15.2-dev-8657c4c.0+8657c4c",
+    "@agoric/zoe": "0.26.3-dev-8657c4c.0+8657c4c",
     "@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-1dd4589.0+1dd4589",
-    "@agoric/governance": "0.10.4-dev-1dd4589.0+1dd4589",
-    "@agoric/inter-protocol": "0.16.2-dev-1dd4589.0+1dd4589",
-    "@agoric/orchestration": "0.1.1-dev-1dd4589.0+1dd4589",
-    "@agoric/store": "0.9.3-dev-1dd4589.0+1dd4589",
-    "@agoric/swing-store": "0.9.2-dev-1dd4589.0+1dd4589",
-    "@agoric/swingset-liveslots": "0.10.3-dev-1dd4589.0+1dd4589",
-    "@agoric/time": "0.3.3-dev-1dd4589.0+1dd4589",
+    "@agoric/deploy-script-support": "0.10.4-dev-8657c4c.0+8657c4c",
+    "@agoric/governance": "0.10.4-dev-8657c4c.0+8657c4c",
+    "@agoric/inter-protocol": "0.16.2-dev-8657c4c.0+8657c4c",
+    "@agoric/orchestration": "0.1.1-dev-8657c4c.0+8657c4c",
+    "@agoric/store": "0.9.3-dev-8657c4c.0+8657c4c",
+    "@agoric/swing-store": "0.9.2-dev-8657c4c.0+8657c4c",
+    "@agoric/swingset-liveslots": "0.10.3-dev-8657c4c.0+8657c4c",
+    "@agoric/time": "0.3.3-dev-8657c4c.0+8657c4c",
     "@endo/errors": "^1.2.8",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
@@ -83,5 +83,5 @@
   "typeCoverage": {
     "atLeast": 89.69
   },
-  "gitHead": "1dd458941b740258ee2d43de48a8a1b9e0fdcae8"
+  "gitHead": "8657c4cfc5dcb48602f730574afe5efb6f8ffb24"
 }

package/scripts/fast-usdc/init-fast-usdc.js

@@ -6,6 +6,8 @@ import {
   getManifestForFastUSDC,
 } from '@agoric/fast-usdc/src/fast-usdc.start.js';
 import { toExternalConfig } from '@agoric/fast-usdc/src/utils/config-marshal.js';
+import { denomHash, withChainCapabilities } from '@agoric/orchestration';
+import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
 import {
   multiplyBy,
   parseRatio,
@@ -17,12 +19,35 @@ import { parseArgs } from 'node:util';
  * @import {CoreEvalBuilder, DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js'
  * @import {ParseArgsConfig} from 'node:util'
  * @import {FastUSDCConfig} from '@agoric/fast-usdc/src/fast-usdc.start.js'
+ * @import {Passable} from '@endo/marshal';
+ * @import {CosmosChainInfo} from '@agoric/orchestration';
  */
 
 const { keys } = Object;
 
+const defaultAssetInfo = {
+  uusdc: {
+    baseName: 'noble',
+    chainName: 'noble',
+    baseDenom: 'uusdc',
+  },
+  [`ibc/${denomHash({ denom: 'uusdc', channelId: fetchedChainInfo.agoric.connections['noble-1'].transferChannel.channelId })}`]:
+    {
+      baseName: 'noble',
+      chainName: 'agoric',
+      baseDenom: 'uusdc',
+      brandKey: 'USDC',
+    },
+  [`ibc/${denomHash({ denom: 'uusdc', channelId: fetchedChainInfo.osmosis.connections['noble-1'].transferChannel.channelId })}`]:
+    {
+      baseName: 'noble',
+      chainName: 'osmosis',
+      baseDenom: 'uusdc',
+    },
+};
+
 /**
- * @type {Record<string, Pick<FastUSDCConfig, 'oracles' | 'feedPolicy'>>}
+ * @type {Record<string, Pick<FastUSDCConfig, 'oracles' | 'feedPolicy' | 'chainInfo' | 'assetInfo' >>}
  *
  * TODO: determine OCW operator addresses
  * meanwhile, use price oracle addresses (from updatePriceFeeds.js).
@@ -47,6 +72,10 @@ const configurations = {
         },
       },
     },
+    chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
+      withChainCapabilities(fetchedChainInfo)
+    ),
+    assetInfo: defaultAssetInfo,
   },
   MAINNET: {
     oracles: {
@@ -69,6 +98,10 @@ const configurations = {
         },
       },
     },
+    chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
+      withChainCapabilities(fetchedChainInfo)
+    ),
+    assetInfo: defaultAssetInfo,
   },
   DEVNET: {
     oracles: {
@@ -90,6 +123,10 @@ const configurations = {
         },
       },
     },
+    chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
+      withChainCapabilities(fetchedChainInfo) // TODO: use devnet values
+    ),
+    assetInfo: defaultAssetInfo, // TODO: use emerynet values
   },
   EMERYNET: {
     oracles: {
@@ -108,6 +145,10 @@ const configurations = {
         },
       },
     },
+    chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
+      withChainCapabilities(fetchedChainInfo) // TODO: use emerynet values
+    ),
+    assetInfo: defaultAssetInfo, // TODO: use emerynet values
   },
 };
 
@@ -124,11 +165,17 @@ const options = {
     default:
       'ibc/FE98AAD68F02F03565E9FA39A5E627946699B2B07115889ED812D8BA639576A9',
   },
+  chainInfo: { type: 'string' },
+  assetInfo: { type: 'string' },
 };
 const oraclesUsage = 'use --oracle name:address ...';
 
 const feedPolicyUsage = 'use --feedPolicy <policy> ...';
 
+const chainInfoUsage = 'use --chainInfo chainName:CosmosChainInfo ...';
+const assetInfoUsage =
+  'use --assetInfo denom:DenomInfo & {brandKey?: string} ...';
+
 /**
  * @typedef {{
  *   flatFee: string;
@@ -139,6 +186,8 @@ const feedPolicyUsage = 'use --feedPolicy <policy> ...';
  *   oracle?: string[];
  *   usdcDenom: string;
  *   feedPolicy?: string;
+ *   chainInfo: string;
+ *   assetInfo: string;
  * }} FastUSDCOpts
  */
 
@@ -180,7 +229,15 @@ export default async (homeP, endowments) => {
   /** @type {{ values: FastUSDCOpts }} */
   // @ts-expect-error ensured by options
   const {
-    values: { oracle: oracleArgs, net, usdcDenom, feedPolicy, ...fees },
+    values: {
+      oracle: oracleArgs,
+      net,
+      usdcDenom,
+      feedPolicy,
+      chainInfo,
+      assetInfo,
+      ...fees
+    },
   } = parseArgs({ args: scriptArgs, options });
 
   const parseFeedPolicy = () => {
@@ -226,6 +283,27 @@ export default async (homeP, endowments) => {
     };
   };
 
+  const parseChainInfo = () => {
+    if (net) {
+      if (!(net in configurations)) {
+        throw Error(`${net} not in ${keys(configurations)}`);
+      }
+      return configurations[net].chainInfo;
+    }
+    if (!chainInfo) throw Error(chainInfoUsage);
+    return JSON.parse(chainInfo);
+  };
+  const parseAssetInfo = () => {
+    if (net) {
+      if (!(net in configurations)) {
+        throw Error(`${net} not in ${keys(configurations)}`);
+      }
+      return configurations[net].assetInfo;
+    }
+    if (!assetInfo) throw Error(assetInfoUsage);
+    return JSON.parse(assetInfo);
+  };
+
   /** @type {FastUSDCConfig} */
   const config = harden({
     oracles: parseOracleArgs(),
@@ -234,6 +312,8 @@ export default async (homeP, endowments) => {
     },
     feeConfig: parseFeeConfigArgs(),
     feedPolicy: parseFeedPolicy(),
+    chainInfo: parseChainInfo(),
+    assetInfo: parseAssetInfo(),
   });
 
   await writeCoreEval('start-fast-usdc', utils =>

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

@@ -0,0 +1,67 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+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' },
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) =>
+  harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-send-anywhere.js',
+    getManifestCall: [
+      getManifest.name,
+      {
+        installationRef: publishRef(
+          install(
+            '@agoric/orchestration/src/examples/send-anywhere.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(startSendAnywhere.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
+};

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

@@ -1,136 +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 } from '@endo/far';
-
-/// <reference types="@agoric/vats/src/core/types-ambient"/>
-/**
- * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
- */
-
-const trace = makeTracer('StartSA', 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 },
-  },
-  issuer: {
-    consume: { IST },
-  },
-}) => {
-  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(
-        'send-anywhere',
-      ),
-      timerService: chainTimerService,
-    }),
-  );
-
-  const { instance } = await E(startUpgradable)({
-    label: 'send-anywhere',
-    installation: sendAnywhere,
-    issuerKeywordRecord: { Stable: await IST },
-    privateArgs,
-  });
-  produceInstance.resolve(instance);
-  trace('done');
-};
-harden(startSendAnywhere);
-
-export const getManifest = ({ restoreRef }, { installationRef }) => {
-  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 },
-        },
-        issuer: {
-          consume: { IST: true },
-        },
-      },
-    },
-    installations: {
-      sendAnywhere: restoreRef(installationRef),
-    },
-  };
-};
-
-/** @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-send-anywhere.js',
-    getManifestCall: [
-      getManifest.name,
-      {
-        installationRef: 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);
-};