agoric 0.21.2-dev-8657c4c.0 → 0.21.2-dev-a2e9363.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-8657c4c.0+8657c4c",
+  "version": "0.21.2-dev-a2e9363.0+a2e9363",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,29 +29,29 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-8657c4c.0+8657c4c",
-    "@agoric/deploy-script-support": "0.10.4-dev-8657c4c.0+8657c4c",
+    "@agoric/cosmic-swingset": "0.41.4-dev-a2e9363.0+a2e9363",
+    "@agoric/deploy-script-support": "0.10.4-dev-a2e9363.0+a2e9363",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-8657c4c.0+8657c4c",
-    "@agoric/cache": "0.3.3-dev-8657c4c.0+8657c4c",
-    "@agoric/casting": "0.4.3-dev-8657c4c.0+8657c4c",
-    "@agoric/client-utils": "0.1.1-dev-8657c4c.0+8657c4c",
-    "@agoric/cosmic-proto": "0.4.1-dev-8657c4c.0+8657c4c",
-    "@agoric/ertp": "0.16.3-dev-8657c4c.0+8657c4c",
-    "@agoric/governance": "0.10.4-dev-8657c4c.0+8657c4c",
-    "@agoric/inter-protocol": "0.16.2-dev-8657c4c.0+8657c4c",
-    "@agoric/internal": "0.3.3-dev-8657c4c.0+8657c4c",
-    "@agoric/network": "0.1.1-dev-8657c4c.0+8657c4c",
-    "@agoric/smart-wallet": "0.5.4-dev-8657c4c.0+8657c4c",
-    "@agoric/store": "0.9.3-dev-8657c4c.0+8657c4c",
-    "@agoric/swingset-vat": "0.32.3-dev-8657c4c.0+8657c4c",
-    "@agoric/vats": "0.15.2-dev-8657c4c.0+8657c4c",
-    "@agoric/zoe": "0.26.3-dev-8657c4c.0+8657c4c",
-    "@agoric/zone": "0.2.3-dev-8657c4c.0+8657c4c",
+    "@agoric/access-token": "0.4.22-dev-a2e9363.0+a2e9363",
+    "@agoric/cache": "0.3.3-dev-a2e9363.0+a2e9363",
+    "@agoric/casting": "0.4.3-dev-a2e9363.0+a2e9363",
+    "@agoric/client-utils": "0.1.1-dev-a2e9363.0+a2e9363",
+    "@agoric/cosmic-proto": "0.4.1-dev-a2e9363.0+a2e9363",
+    "@agoric/ertp": "0.16.3-dev-a2e9363.0+a2e9363",
+    "@agoric/governance": "0.10.4-dev-a2e9363.0+a2e9363",
+    "@agoric/inter-protocol": "0.16.2-dev-a2e9363.0+a2e9363",
+    "@agoric/internal": "0.3.3-dev-a2e9363.0+a2e9363",
+    "@agoric/network": "0.1.1-dev-a2e9363.0+a2e9363",
+    "@agoric/smart-wallet": "0.5.4-dev-a2e9363.0+a2e9363",
+    "@agoric/store": "0.9.3-dev-a2e9363.0+a2e9363",
+    "@agoric/swingset-vat": "0.32.3-dev-a2e9363.0+a2e9363",
+    "@agoric/vats": "0.15.2-dev-a2e9363.0+a2e9363",
+    "@agoric/zoe": "0.26.3-dev-a2e9363.0+a2e9363",
+    "@agoric/zone": "0.2.3-dev-a2e9363.0+a2e9363",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 77.54
   },
-  "gitHead": "8657c4cfc5dcb48602f730574afe5efb6f8ffb24"
+  "gitHead": "a2e936366843f74f9d101f3db4b1e76858abe3d7"
 }

package/src/commands/auction.js

@@ -1,17 +1,16 @@
 // @ts-check
 /* eslint-env node */
-import { InvalidArgumentError } from 'commander';
+import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils';
 import { Fail } from '@endo/errors';
-import { makeVstorageKit } from '@agoric/client-utils';
+import { InvalidArgumentError } from 'commander';
 import { outputActionAndHint } from '../lib/wallet.js';
-import { getNetworkConfig } from '../lib/network-config.js';
 
 /**
  * @import {ParamTypesMap, ParamTypesMapFromRecord} from '@agoric/governance/src/contractGovernance/typedParamManager.js'
  * @import {ParamValueForType} from '@agoric/governance/src/types.js'
  */
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
  * @template {ParamTypesMap} M

package/src/commands/gov.js

@@ -1,11 +1,10 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
-import { makeVstorageKit } from '@agoric/client-utils';
+import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
 import { Command, CommanderError } from 'commander';
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
-import { getNetworkConfig } from '../lib/network-config.js';
 import {
   findContinuingIds,
   getCurrent,
@@ -26,7 +25,7 @@ const collectValues = (val, memo) => {
 
 const defaultKeyring = process.env.AGORIC_KEYRING_BACKEND || 'test';
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
  * @param {import('anylogger').Logger} _logger

package/src/commands/inter.js

@@ -4,20 +4,19 @@
  */
 
 // @ts-check
-import { makeWalletUtils } from '@agoric/client-utils';
+import { fetchEnvNetworkConfig, makeWalletUtils } from '@agoric/client-utils';
 import { makeOfferSpecShape } from '@agoric/inter-protocol/src/auction/auctionBook.js';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { objectMap } from '@agoric/internal';
 import { M, matches } from '@endo/patterns';
 import { CommanderError, InvalidArgumentError } from 'commander';
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
-import { getCurrent, outputActionAndHint, sendAction } from '../lib/wallet.js';
 import {
   asBoardRemote,
   bigintReplacer,
   makeAmountFormatter,
 } from '../lib/format.js';
-import { getNetworkConfig } from '../lib/network-config.js';
+import { getCurrent, outputActionAndHint, sendAction } from '../lib/wallet.js';
 
 const { values } = Object;
 
@@ -232,7 +231,7 @@ export const makeInterCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      const networkConfig = await getNetworkConfig({ env, fetch });
+      const networkConfig = await fetchEnvNetworkConfig({ env, fetch });
       return makeWalletUtils({ fetch, delay }, networkConfig);
     } catch (err) {
       // CommanderError is a class constructor, and so

package/src/commands/oracle.js

@@ -2,6 +2,7 @@
 /* eslint-disable func-names */
 /* eslint-env node */
 import {
+  fetchEnvNetworkConfig,
   makeVstorageKit,
   makeWalletUtils,
   storageHelper,
@@ -14,14 +15,13 @@ import * as cp from 'child_process';
 import { Command } from 'commander';
 import { inspect } from 'util';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
-import { getNetworkConfig } from '../lib/network-config.js';
+import { bigintReplacer } from '../lib/format.js';
 import {
   getCurrent,
   outputAction,
   sendAction,
   sendHint,
 } from '../lib/wallet.js';
-import { bigintReplacer } from '../lib/format.js';
 
 /** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
 
@@ -86,7 +86,10 @@ export const makeOracleCommand = (logger, io = {}) => {
 
   const rpcTools = async () => {
     // XXX pass fetch to getNetworkConfig() explicitly
-    const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+    const networkConfig = await fetchEnvNetworkConfig({
+      env: process.env,
+      fetch,
+    });
     const utils = await makeVstorageKit({ fetch }, networkConfig);
 
     const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {

package/src/commands/perf.js

@@ -7,6 +7,7 @@ import {
   makeFollower,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
+import { fetchEnvNetworkConfig } from '@agoric/client-utils';
 import { slotToRemotable } from '@agoric/internal/src/storage-test-utils.js';
 import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
 import { Command } from 'commander';
@@ -17,12 +18,11 @@ import {
   execSwingsetTransaction,
   normalizeAddressWithOptions,
 } from '../lib/chain.js';
-import { getNetworkConfig } from '../lib/network-config.js';
 
 // tight for perf testing but less than this tends to hang.
 const SLEEP_SECONDS = 0.1;
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
  * @param {import('anylogger').Logger} logger

package/src/commands/psm.js

@@ -1,14 +1,17 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
-import { makeVstorageKit, storageHelper } from '@agoric/client-utils';
+import {
+  fetchEnvNetworkConfig,
+  makeVstorageKit,
+  storageHelper,
+} from '@agoric/client-utils';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { Command } from 'commander';
-import { getNetworkConfig } from '../lib/network-config.js';
-import { outputExecuteOfferAction } from '../lib/wallet.js';
 import { asPercent } from '../lib/format.js';
+import { outputExecuteOfferAction } from '../lib/wallet.js';
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 // Adapted from https://gist.github.com/dckc/8b5b2f16395cb4d7f2ff340e0bc6b610#file-psm-tool
 

package/src/commands/reserve.js

@@ -1,13 +1,12 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
-import { makeVstorageKit } from '@agoric/client-utils';
+import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { Command } from 'commander';
-import { getNetworkConfig } from '../lib/network-config.js';
 import { outputActionAndHint } from '../lib/wallet.js';
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
  * @param {import('anylogger').Logger} _logger

package/src/commands/test-upgrade.js

@@ -1,12 +1,11 @@
 // @ts-check
 /* eslint-env node */
-import { makeWalletUtils } from '@agoric/client-utils';
+import { fetchEnvNetworkConfig, makeWalletUtils } from '@agoric/client-utils';
 import { Fail } from '@endo/errors';
 import { CommanderError } from 'commander';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
-import { getNetworkConfig } from '../lib/network-config.js';
-import { sendAction } from '../lib/wallet.js';
 import { bigintReplacer } from '../lib/format.js';
+import { sendAction } from '../lib/wallet.js';
 
 /**
  * Make commands for testing.
@@ -39,7 +38,7 @@ export const makeTestCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      const networkConfig = await getNetworkConfig({ env, fetch });
+      const networkConfig = await fetchEnvNetworkConfig({ env, fetch });
       return makeWalletUtils({ fetch, delay }, networkConfig);
     } catch (err) {
       // CommanderError is a class constructor, and so

package/src/commands/vaults.js

@@ -1,7 +1,7 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
-import { makeVstorageKit } from '@agoric/client-utils';
+import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils';
 import {
   lookupOfferIdForVault,
   Offers,
@@ -9,9 +9,8 @@ import {
 import { Command } from 'commander';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';
-import { getNetworkConfig } from '../lib/network-config.js';
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
  * @param {import('anylogger').Logger} logger

package/src/commands/wallet.js

@@ -8,7 +8,7 @@ import {
   makeLeader,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
-import { makeVstorageKit } from '@agoric/client-utils';
+import { makeVstorageKit, fetchEnvNetworkConfig } from '@agoric/client-utils';
 import { execFileSync } from 'child_process';
 import fs from 'fs';
 import util from 'util';
@@ -19,15 +19,14 @@ import {
   fetchSwingsetParams,
   normalizeAddressWithOptions,
 } from '../lib/chain.js';
-import { getNetworkConfig } from '../lib/network-config.js';
-import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 import {
-  summarize,
   fmtRecordOfLines,
   parseFiniteNumber,
+  summarize,
 } from '../lib/format.js';
+import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 const SLEEP_SECONDS = 3;
 

package/src/helpers.js

@@ -3,7 +3,8 @@
 
 /** @import { ChildProcess } from 'child_process' */
 
-export { getNetworkConfig } from './lib/network-config.js';
+// Backwards compatibility
+export { fetchEnvNetworkConfig as getNetworkConfig } from '@agoric/client-utils';
 
 export const getSDKBinaries = ({
   jsPfx = '../..',

package/src/lib/network-config.js

@@ -1,41 +0,0 @@
-import { NonNullish } from '@agoric/internal';
-
-/**
- * @import {MinimalNetworkConfig} from '@agoric/client-utils';
- */
-
-export const networkConfigUrl = agoricNetSubdomain =>
-  `https://${agoricNetSubdomain}.agoric.net/network-config`;
-export const rpcUrl = agoricNetSubdomain =>
-  `https://${agoricNetSubdomain}.rpc.agoric.net:443`;
-
-/**
- * @param {string} str
- * @param {{ fetch: typeof fetch }} io
- * @returns {Promise<MinimalNetworkConfig>}
- */
-const fromAgoricNet = (str, { fetch }) => {
-  const [netName, chainName] = str.split(',');
-  if (chainName) {
-    return Promise.resolve({ chainName, rpcAddrs: [rpcUrl(netName)] });
-  }
-  return fetch(networkConfigUrl(netName)).then(res => res.json());
-};
-
-/**
- * @param {{ env: typeof process.env, fetch: typeof fetch }} io
- * @returns {Promise<MinimalNetworkConfig>}
- */
-export const getNetworkConfig = async ({ env, fetch }) => {
-  if (!('AGORIC_NET' in env) || env.AGORIC_NET === 'local') {
-    return { rpcAddrs: ['http://0.0.0.0:26657'], chainName: 'agoriclocal' };
-  }
-
-  return fromAgoricNet(NonNullish(env.AGORIC_NET), { fetch }).catch(err => {
-    throw Error(
-      `cannot get network config (${env.AGORIC_NET || 'local'}): ${
-        err.message
-      }`,
-    );
-  });
-};