agoric 0.21.2-dev-b05c226.0 → 0.21.2-dev-6bce049.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-b05c226.0+b05c226",
+  "version": "0.21.2-dev-6bce049.0+6bce049",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -8,6 +8,10 @@
     "agoric": "src/entrypoint.js",
     "agops": "src/bin-agops.js"
   },
+  "exports": {
+    "./src/entrypoint.js": "./src/entrypoint.js",
+    "./src/helpers.js": "./src/helpers.js"
+  },
   "files": [
     "src",
     "exported.js"
@@ -24,25 +28,25 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-b05c226.0+b05c226",
+    "@agoric/deploy-script-support": "0.10.4-dev-6bce049.0+6bce049",
     "ava": "^5.3.0",
     "c8": "^7.13.0"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-b05c226.0+b05c226",
-    "@agoric/assert": "0.6.1-dev-b05c226.0+b05c226",
-    "@agoric/cache": "0.3.3-dev-b05c226.0+b05c226",
-    "@agoric/casting": "0.4.3-dev-b05c226.0+b05c226",
-    "@agoric/cosmic-proto": "0.3.1-dev-b05c226.0+b05c226",
-    "@agoric/ertp": "0.16.3-dev-b05c226.0+b05c226",
-    "@agoric/inter-protocol": "0.16.2-dev-b05c226.0+b05c226",
-    "@agoric/internal": "0.3.3-dev-b05c226.0+b05c226",
-    "@agoric/smart-wallet": "0.5.4-dev-b05c226.0+b05c226",
-    "@agoric/store": "0.9.3-dev-b05c226.0+b05c226",
-    "@agoric/swingset-vat": "0.32.3-dev-b05c226.0+b05c226",
-    "@agoric/vats": "0.15.2-dev-b05c226.0+b05c226",
-    "@agoric/zoe": "0.26.3-dev-b05c226.0+b05c226",
-    "@agoric/zone": "0.2.3-dev-b05c226.0+b05c226",
+    "@agoric/access-token": "0.4.22-dev-6bce049.0+6bce049",
+    "@agoric/assert": "0.6.1-dev-6bce049.0+6bce049",
+    "@agoric/cache": "0.3.3-dev-6bce049.0+6bce049",
+    "@agoric/casting": "0.4.3-dev-6bce049.0+6bce049",
+    "@agoric/cosmic-proto": "0.3.1-dev-6bce049.0+6bce049",
+    "@agoric/ertp": "0.16.3-dev-6bce049.0+6bce049",
+    "@agoric/inter-protocol": "0.16.2-dev-6bce049.0+6bce049",
+    "@agoric/internal": "0.3.3-dev-6bce049.0+6bce049",
+    "@agoric/smart-wallet": "0.5.4-dev-6bce049.0+6bce049",
+    "@agoric/store": "0.9.3-dev-6bce049.0+6bce049",
+    "@agoric/swingset-vat": "0.32.3-dev-6bce049.0+6bce049",
+    "@agoric/vats": "0.15.2-dev-6bce049.0+6bce049",
+    "@agoric/zoe": "0.26.3-dev-6bce049.0+6bce049",
+    "@agoric/zone": "0.2.3-dev-6bce049.0+6bce049",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -88,5 +92,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "b05c226c053703540fb51df1e274ac6cf5e00b50"
+  "gitHead": "6bce049552bcc46666a9f2eb4afac8a017b5f3d4"
 }

package/src/commands/inter.js

@@ -25,7 +25,6 @@ import {
 import { getNetworkConfig } from '../lib/rpc.js';
 import {
   getCurrent,
-  makeParseAmount,
   makeWalletUtils,
   outputActionAndHint,
   sendAction,
@@ -415,14 +414,7 @@ inter auction status
       async ({ generateOnly, dryRun, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const parseAmount = makeParseAmount(
-          tools.agoricNames,
-          msg => new InvalidArgumentError(msg),
-        );
-        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
-          ...opts,
-          parseAmount,
-        });
+        const offer = Offers.auction.Bid(tools.agoricNames, opts);
 
         if (generateOnly) {
           outputActionAndHint(
@@ -463,14 +455,7 @@ inter auction status
       async ({ generateOnly, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const parseAmount = makeParseAmount(
-          tools.agoricNames,
-          msg => new InvalidArgumentError(msg),
-        );
-        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
-          ...opts,
-          parseAmount,
-        });
+        const offer = Offers.auction.Bid(tools.agoricNames, opts);
         if (generateOnly) {
           outputActionAndHint(
             { method: 'executeOffer', offer },

package/src/commands/psm.js

@@ -157,7 +157,7 @@ export const makePsmCommand = logger => {
       console.warn('running with options', opts);
       const { agoricNames, lookupPsmInstance } = await rpcTools();
       const instance = await lookupPsmInstance(opts.pair);
-      const offer = Offers.psm.swap(instance, agoricNames.brand, opts);
+      const offer = Offers.psm.swap(agoricNames, instance, opts);
       outputExecuteOfferAction(offer);
     });
 

package/src/commands/reserve.js

@@ -31,7 +31,7 @@ export const makeReserveCommand = (_logger, io = {}) => {
       async ({ collateralBrand, ...opts }) => {
         const { agoricNames } = await makeRpcUtils({ fetch });
 
-        const offer = Offers.reserve.AddCollateral(agoricNames.brand, {
+        const offer = Offers.reserve.AddCollateral(agoricNames, {
           collateralBrandKey: collateralBrand,
           ...opts,
         });

package/src/commands/vaults.js

@@ -63,7 +63,7 @@ export const makeVaultsCommand = logger => {
       logger.warn('running with options', opts);
       const { agoricNames } = await makeRpcUtils({ fetch });
 
-      const offer = Offers.vaults.OpenVault(agoricNames.brand, {
+      const offer = Offers.vaults.OpenVault(agoricNames, {
         giveCollateral: opts.giveCollateral,
         wantMinted: opts.wantMinted,
         offerId: opts.offerId,
@@ -104,7 +104,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.AdjustBalances(
-        agoricNames.brand,
+        agoricNames,
         {
           giveCollateral: opts.giveCollateral,
           wantCollateral: opts.wantCollateral,
@@ -145,7 +145,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.CloseVault(
-        agoricNames.brand,
+        agoricNames,
         {
           giveMinted: opts.giveMinted,
           offerId: opts.offerId,

package/src/lib/wallet.js

@@ -9,7 +9,6 @@ import { boardSlottingMarshaller, makeRpcUtils } from './rpc.js';
 /** @typedef {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} CurrentWalletRecord  */
 /** @typedef {import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} AgoricNamesRemotes  */
 
-const { values } = Object;
 const { Fail } = assert;
 const marshaller = boardSlottingMarshaller();
 
@@ -271,44 +270,3 @@ export const makeWalletUtils = async (
     pollOffer,
   };
 };
-
-/**
- * @param {{
- *   brand: Record<string, Brand>,
- *   vbankAsset: Record<string, { brand: Brand, displayInfo: DisplayInfo }>,
- * }} agoricNames
- * @param {(msg: string) => Error} makeError error constructor
- * @returns {(a: string) => Amount<'nat'>}
- */
-export const makeParseAmount =
-  (agoricNames, makeError = msg => RangeError(msg)) =>
-  opt => {
-    assert.typeof(opt, 'string', 'parseAmount expected string');
-    const m = opt.match(/^(?<value>[\d_]+(\.[\d_]+)?)(?<brand>[A-Z]\w*?)$/);
-    if (!m || !m.groups) {
-      throw makeError(`invalid amount: ${opt}`);
-    }
-    const anyBrand = agoricNames.brand[m.groups.brand];
-    if (!anyBrand) {
-      throw makeError(`unknown brand: ${m.groups.brand}`);
-    }
-    const assetDesc = values(agoricNames.vbankAsset).find(
-      d => d.brand === anyBrand,
-    );
-    if (!assetDesc) {
-      throw makeError(`unknown brand: ${m.groups.brand}`);
-    }
-    const { displayInfo } = assetDesc;
-    if (!displayInfo.decimalPlaces || displayInfo.assetKind !== 'nat') {
-      throw makeError(`bad brand: ${displayInfo}`);
-    }
-    const value = BigInt(
-      Number(m.groups.value.replace(/_/g, '')) *
-        10 ** displayInfo.decimalPlaces,
-    );
-    /** @type {Brand<'nat'>} */
-    // @ts-expect-error dynamic cast
-    const natBrand = anyBrand;
-    const amt = { value, brand: natBrand };
-    return amt;
-  };