@agoric/inter-protocol 0.16.2-other-dev-8f8782b.0 → 0.16.2-other-dev-fbe72e7.0.fbe72e7

package/src/clientSupport.d.ts

@@ -0,0 +1,168 @@
+export function lookupOfferIdForVault(vaultId: string, currentP: Promise<import("@agoric/smart-wallet/src/smartWallet.js").CurrentWalletRecord>): Promise<string>;
+export function makeParseAmount(agoricNames: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand" | "vbankAsset">, makeError?: (msg: string) => Error): (a: string) => Amount<"nat">;
+export namespace Offers {
+    namespace auction {
+        export { makeBidOffer as Bid };
+    }
+    namespace fluxAggregator {
+        export { makePushPriceOffer as PushPrice };
+    }
+    namespace psm {
+        export { makePsmSwapOffer as swap };
+    }
+    namespace vaults {
+        export { makeOpenOffer as OpenVault };
+        export { makeAdjustOffer as AdjustBalances };
+        export { makeCloseOffer as CloseVault };
+    }
+    namespace reserve {
+        export { makeAddCollateralOffer as AddCollateral };
+    }
+}
+import type { Amount } from '@agoric/ertp';
+/**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand' | 'vbankAsset'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   give: string;
+ *   maxBuy: string;
+ *   wantMinimum?: string;
+ * } & (
+ *   | {
+ *       price: number;
+ *     }
+ *   | {
+ *       discount: number; // -1 to 1. e.g. 0.10 for 10% discount, -0.05 for 5% markup
+ *     }
+ * )} opts
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+declare function makeBidOffer(agoricNames: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand" | "vbankAsset">, opts: {
+    offerId: string;
+    give: string;
+    maxBuy: string;
+    wantMinimum?: string;
+} & ({
+    price: number;
+} | {
+    discount: number;
+})): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+/**
+ * @param {unknown} _agoricNames
+ * @param {{
+ *   offerId: string;
+ *   roundId?: bigint;
+ *   unitPrice: bigint;
+ * }} opts
+ * @param {string} previousOffer
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+declare function makePushPriceOffer(_agoricNames: unknown, opts: {
+    offerId: string;
+    roundId?: bigint;
+    unitPrice: bigint;
+}, previousOffer: string): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+/**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {Instance} instance
+ * @param {{ offerId: string; feePct?: number; pair: [string, string] } & (
+ *   | { wantMinted: number }
+ *   | { giveMinted: number }
+ * )} opts
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+declare function makePsmSwapOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, instance: Instance, opts: {
+    offerId: string;
+    feePct?: number;
+    pair: [string, string];
+} & ({
+    wantMinted: number;
+} | {
+    giveMinted: number;
+})): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+/**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   wantMinted: number;
+ *   giveCollateral: number;
+ *   collateralBrandKey: string;
+ * }} opts
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+declare function makeOpenOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+    offerId: string;
+    wantMinted: number;
+    giveCollateral: number;
+    collateralBrandKey: string;
+}): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+/**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   collateralBrandKey?: string;
+ *   giveCollateral?: number;
+ *   wantCollateral?: number;
+ *   giveMinted?: number;
+ *   wantMinted?: number;
+ * }} opts
+ * @param {string} previousOffer
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+declare function makeAdjustOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+    offerId: string;
+    collateralBrandKey?: string;
+    giveCollateral?: number;
+    wantCollateral?: number;
+    giveMinted?: number;
+    wantMinted?: number;
+}, previousOffer: string): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+/**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   collateralBrandKey?: string;
+ *   giveMinted: number;
+ * }} opts
+ * @param {string} previousOffer
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+declare function makeCloseOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+    offerId: string;
+    collateralBrandKey?: string;
+    giveMinted: number;
+}, previousOffer: string): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+/**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   give: number;
+ *   collateralBrandKey: string;
+ * }} opts
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+declare function makeAddCollateralOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+    offerId: string;
+    give: number;
+    collateralBrandKey: string;
+}): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+export {};
+//# sourceMappingURL=clientSupport.d.ts.map

package/src/clientSupport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientSupport.d.ts","sourceRoot":"","sources":["clientSupport.js"],"names":[],"mappings":"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"}

package/src/clientSupport.js

@@ -1,9 +1,14 @@
 // @ts-check
 
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { AmountMath } from '@agoric/ertp';
 import { assertAllDefined } from '@agoric/internal';
-import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { parseRatio } from '@agoric/ertp/src/ratio.js';
+
+/**
+ * @import {Amount, Brand, Payment, Purse} from '@agoric/ertp';
+ * @import {Proposal} from '@agoric/zoe';
+ */
 
 // XXX support other decimal places
 const COSMOS_UNIT = 1_000_000n;
@@ -15,23 +20,31 @@ const scaleDecimals = num => BigInt(num * Number(COSMOS_UNIT));
 /**
  * Give/want
  *
- * @param {Record<string, Brand>} brands
- * @param {{ giveMinted?: number, wantMinted?: number } | { collateralBrandKey: string, giveCollateral?: number, wantCollateral?: number }} opts
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{ giveMinted?: number; wantMinted?: number }
+ *   | {
+ *       collateralBrandKey: string;
+ *       giveCollateral?: number;
+ *       wantCollateral?: number;
+ *     }} opts
  * @returns {Proposal}
  */
-const makeVaultProposal = (brands, opts) => {
+const makeVaultProposal = ({ brand }, opts) => {
   const proposal = { give: {}, want: {} };
 
   if ('giveCollateral' in opts && opts.giveCollateral) {
     const { collateralBrandKey } = opts;
     proposal.give.Collateral = {
-      brand: brands[collateralBrandKey],
+      brand: brand[collateralBrandKey],
       value: scaleDecimals(opts.giveCollateral),
     };
   }
   if ('giveMinted' in opts && opts.giveMinted) {
     proposal.give.Minted = {
-      brand: brands.IST,
+      brand: brand.IST,
       value: scaleDecimals(opts.giveMinted),
     };
   }
@@ -39,13 +52,13 @@ const makeVaultProposal = (brands, opts) => {
   if ('wantCollateral' in opts && opts.wantCollateral) {
     const { collateralBrandKey } = opts;
     proposal.want.Collateral = {
-      brand: brands[collateralBrandKey],
+      brand: brand[collateralBrandKey],
       value: scaleDecimals(opts.wantCollateral),
     };
   }
   if ('wantMinted' in opts && opts.wantMinted) {
     proposal.want.Minted = {
-      brand: brands.IST,
+      brand: brand.IST,
       value: scaleDecimals(opts.wantMinted),
     };
   }
@@ -54,18 +67,26 @@ const makeVaultProposal = (brands, opts) => {
 };
 
 /**
- * @param {Record<string, Brand>} brands
- * @param {{ offerId: string, wantMinted: number, giveCollateral: number, collateralBrandKey: string }} opts
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   wantMinted: number;
+ *   giveCollateral: number;
+ *   collateralBrandKey: string;
+ * }} opts
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
-const makeOpenOffer = (brands, opts) => {
-  const proposal = makeVaultProposal(brands, opts);
+const makeOpenOffer = ({ brand }, opts) => {
+  const proposal = makeVaultProposal({ brand }, opts);
 
   // NB: not really a Proposal because the brands are not remotes
   // Instead they're copyRecord like  "{"boardId":"board0257","iface":"Alleged: IST brand"}" to pass through the boardId
   // mustMatch(harden(proposal), ProposalShape);
 
-  const collateralBrand = brands[opts.collateralBrandKey];
+  const collateralBrand = brand[opts.collateralBrandKey];
 
   return {
     id: opts.offerId,
@@ -82,16 +103,26 @@ const makeOpenOffer = (brands, opts) => {
 };
 
 /**
- * @param {Record<string, Brand>} brands
- * @param {{ offerId: string, collateralBrandKey?: string, giveCollateral?: number, wantCollateral?: number, giveMinted?: number, wantMinted?: number }} opts
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   collateralBrandKey?: string;
+ *   giveCollateral?: number;
+ *   wantCollateral?: number;
+ *   giveMinted?: number;
+ *   wantMinted?: number;
+ * }} opts
  * @param {string} previousOffer
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
-const makeAdjustOffer = (brands, opts, previousOffer) => {
+const makeAdjustOffer = ({ brand }, opts, previousOffer) => {
   // NB: not really a Proposal because the brands are not remotes
   // Instead they're copyRecord like  "{"boardId":"board0257","iface":"Alleged: IST brand"}" to pass through the boardId
   // mustMatch(harden(proposal), ProposalShape);
-  const proposal = makeVaultProposal(brands, opts);
+  const proposal = makeVaultProposal({ brand }, opts);
 
   return {
     id: opts.offerId,
@@ -105,13 +136,20 @@ const makeAdjustOffer = (brands, opts, previousOffer) => {
 };
 
 /**
- * @param {Record<string, Brand>} brands
- * @param {{ offerId: string, collateralBrandKey?: string, giveMinted: number }} opts
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
+ * @param {{
+ *   offerId: string;
+ *   collateralBrandKey?: string;
+ *   giveMinted: number;
+ * }} opts
  * @param {string} previousOffer
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
-const makeCloseOffer = (brands, opts, previousOffer) => {
-  const proposal = makeVaultProposal(brands, opts);
+const makeCloseOffer = ({ brand }, opts, previousOffer) => {
+  const proposal = makeVaultProposal({ brand }, opts);
 
   return {
     id: opts.offerId,
@@ -126,7 +164,9 @@ const makeCloseOffer = (brands, opts, previousOffer) => {
 
 /**
  * @param {string} vaultId
- * @param {Promise<import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord>} currentP
+ * @param {Promise<
+ *   import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord
+ * >} currentP
  * @returns {Promise<string>} offer id in which the vault was made
  */
 export const lookupOfferIdForVault = async (vaultId, currentP) => {
@@ -141,11 +181,14 @@ export const lookupOfferIdForVault = async (vaultId, currentP) => {
 };
 
 /**
- * @param {Record<string, Brand>} brands
- * @param {({ wantMinted: number, giveMinted?: undefined } | { giveMinted: number, wantMinted?: undefined })} opts
- * @param {number} [fee=0]
+ * @param {Record<
+ *   string,
+ *   import('@agoric/internal/src/marshal.js').BoardRemote
+ * >} brands
+ * @param {{ wantMinted: number; giveMinted?: undefined }
+ *   | { giveMinted: number; wantMinted?: undefined }} opts
+ * @param {number} [fee]
  * @param {string} [anchor]
- * @returns {Proposal} XXX not a real proposal, uses BoardRemote
  */
 const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
   const giving = 'giveMinted' in opts ? 'minted' : 'anchor';
@@ -171,19 +214,24 @@ const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
 };
 
 /**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
  * @param {Instance} instance
- * @param {Record<string, Brand>} brands
- * @param {{ offerId: string, feePct?: number, pair: [string, string] } &
- *         ({ wantMinted: number } | { giveMinted: number })} opts
+ * @param {{ offerId: string; feePct?: number; pair: [string, string] } & (
+ *   | { wantMinted: number }
+ *   | { giveMinted: number }
+ * )} opts
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
-const makePsmSwapOffer = (instance, brands, opts) => {
+const makePsmSwapOffer = ({ brand }, instance, opts) => {
   const method =
     'wantMinted' in opts
       ? 'makeWantMintedInvitation'
       : 'makeGiveMintedInvitation'; // ref psm.js
   const proposal = makePsmProposal(
-    brands,
+    brand,
     opts,
     opts.feePct ? opts.feePct / 100 : undefined,
     opts.pair[1],
@@ -200,33 +248,81 @@ const makePsmSwapOffer = (instance, brands, opts) => {
       instance,
       publicInvitationMaker: method,
     },
+    // @ts-expect-error BoardRemote not a Brand object
     proposal,
   };
 };
 
 /**
- * @param {Record<string, Brand>} _brands
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand' | 'vbankAsset'
+ * >} 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_]+)?)\s*(?<brand>[A-Za-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 = Object.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;
+  };
+
+/**
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand' | 'vbankAsset'
+ * >} agoricNames
  * @param {{
- *   offerId: string,
- *   give: string,
- *   maxBuy: string,
- *   wantMinimum?: string,
- *   parseAmount: (x: string) => Amount<'nat'>,
- * } & ({
- *   price: number,
- * } | {
- *   discount: number,  // -1 to 1. e.g. 0.10 for 10% discount, -0.05 for 5% markup
- * })} opts
+ *   offerId: string;
+ *   give: string;
+ *   maxBuy: string;
+ *   wantMinimum?: string;
+ * } & (
+ *   | {
+ *       price: number;
+ *     }
+ *   | {
+ *       discount: number; // -1 to 1. e.g. 0.10 for 10% discount, -0.05 for 5% markup
+ *     }
+ * )} opts
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
-const makeBidOffer = (_brands, opts) => {
-  assert.typeof(opts.parseAmount, 'function');
+const makeBidOffer = (agoricNames, opts) => {
   assertAllDefined({
     offerId: opts.offerId,
     give: opts.give,
     maxBuy: opts.maxBuy,
   });
-  const { parseAmount } = opts;
+  const parseAmount = makeParseAmount(agoricNames);
   const proposal = {
     give: { Bid: parseAmount(opts.give) },
     ...(opts.wantMinimum
@@ -276,19 +372,23 @@ const makeBidOffer = (_brands, opts) => {
 };
 
 /**
- * @param {Record<string, Brand>} brands
+ * @param {Pick<
+ *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
+ *   'brand'
+ * >} agoricNames
  * @param {{
- *   offerId: string,
- *   give: number,
- *   collateralBrandKey: string,
+ *   offerId: string;
+ *   give: number;
+ *   collateralBrandKey: string;
  * }} opts
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
-const makeAddCollateralOffer = (brands, opts) => {
+const makeAddCollateralOffer = ({ brand }, opts) => {
   /** @type {AmountKeywordRecord} */
   const give = {
     Collateral: AmountMath.make(
-      brands[opts.collateralBrandKey],
+      // @ts-expect-error BoardRemote not a Brand object
+      brand[opts.collateralBrandKey],
       scaleDecimals(opts.give),
     ),
   };
@@ -307,17 +407,16 @@ const makeAddCollateralOffer = (brands, opts) => {
 };
 
 /**
- *
- * @param {Record<string, Brand>} _brands
+ * @param {unknown} _agoricNames
  * @param {{
- *   offerId: string,
- *   roundId?: bigint,
- *   unitPrice: bigint,
+ *   offerId: string;
+ *   roundId?: bigint;
+ *   unitPrice: bigint;
  * }} opts
  * @param {string} previousOffer
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
-const makePushPriceOffer = (_brands, opts, previousOffer) => {
+const makePushPriceOffer = (_agoricNames, opts, previousOffer) => {
   return {
     id: opts.offerId,
     invitationSpec: {
@@ -332,48 +431,12 @@ const makePushPriceOffer = (_brands, opts, previousOffer) => {
   };
 };
 
-// TODO DRY with CLI wallet.js
 /**
- * @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'>}
+ * @satisfies {Record<
+ *   string,
+ *   Record<string, import('@agoric/smart-wallet/src/types.js').OfferMaker>
+ * >}
  */
-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 = Object.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;
-  };
-
 export const Offers = {
   auction: {
     Bid: makeBidOffer,

package/src/collectFees.d.ts

@@ -0,0 +1,2 @@
+export function makeCollectFeesInvitation(zcf: ZCF, feeSeat: ZCFSeat, feeBrand: Brand, keyword: string): Promise<Invitation<string>>;
+//# sourceMappingURL=collectFees.d.ts.map

package/src/collectFees.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"collectFees.d.ts","sourceRoot":"","sources":["collectFees.js"],"names":[],"mappings":"AAaO,+CANI,GAAG,WACH,OAAO,YACP,KAAK,WACL,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAYvC"}

package/src/contractSupport.d.ts

@@ -0,0 +1,28 @@
+export namespace amountPattern {
+    let brand: import("@endo/patterns").Matcher;
+    let value: import("@endo/patterns").Matcher;
+}
+export namespace ratioPattern {
+    export { amountPattern as numerator };
+    export { amountPattern as denominator };
+}
+export function addSubtract<A extends Amount>(base: A, gain: A, loss: A): A;
+export function subtractToEmpty<T extends Amount>(left: T, right: T): T;
+export function assertOnlyKeys(proposal: ProposalRecord, keys: string[]): void;
+export function allEmpty(amounts: Amount[]): boolean;
+export function checkDebtLimit(debtLimit: Amount<"nat">, totalDebt: Amount<"nat">, toMint: Amount<"nat">): void;
+export function makeNatAmountShape(brand: Brand, min?: NatValue): {
+    brand: globalThis.Brand;
+    value: import("@endo/patterns").Matcher;
+};
+export function quoteAsRatio(quoteAmount: Pick<PriceDescription, "amountIn" | "amountOut">): import("@agoric/ertp/src/ratio").Ratio;
+export type MetricsPublisherKit<T> = {
+    metricsPublication: IterationObserver<T>;
+    metricsSubscription: StoredSubscription<T>;
+};
+export type MetricsPublishKit<T> = {
+    metricsPublisher: Publisher<T>;
+    metricsSubscriber: StoredSubscriber<T>;
+};
+import type { PriceDescription } from '@agoric/zoe/tools/types.js';
+//# sourceMappingURL=contractSupport.d.ts.map

package/src/contractSupport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contractSupport.d.ts","sourceRoot":"","sources":["contractSupport.js"],"names":[],"mappings":";;;;;;;;AA4BO,4BANe,CAAC,SAAT,MAAO,QACV,CAAC,QACD,CAAC,QACD,CAAC,GACC,CAAC,CAGyC;AAQhD,gCALe,CAAC,SAAT,MAAO,QACV,CAAC,SACD,CAAC,GACC,CAAC,CAK2C;AAQlD,yCAHI,cAAc,QACd,MAAM,EAAE,QAQlB;AAMM,kCAHI,MAAM,EAAE,GACN,OAAO,CAInB;AAUM,0CAPI,MAAM,CAAC,KAAK,CAAC,aACb,MAAM,CAAC,KAAK,CAAC,UACb,MAAM,CAAC,KAAK,CAAC,QAcvB;AAoBM,0CAHI,KAAK,QACL,QAAQ;;;EAGmC;AAG/C,0CADK,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,WAAW,CAAC,0CAEO;gCAtBtD,CAAC;wBAEA,iBAAiB,CAAC,CAAC,CAAC;yBACpB,kBAAkB,CAAC,CAAC,CAAC;;8BAItB,CAAC;sBAEA,SAAS,CAAC,CAAC,CAAC;uBACZ,gBAAgB,CAAC,CAAC,CAAC;;sCAvF6D,4BAA4B"}