@agoric/inter-protocol 0.16.2-dev-8bcf6af.0 → 0.16.2-dev-8baf0aa.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-8bcf6af.0+8bcf6af",
+  "version": "0.16.2-dev-8baf0aa.0+8baf0aa",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -32,15 +32,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-8bcf6af.0+8bcf6af",
-    "@agoric/ertp": "0.16.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/governance": "0.10.4-dev-8bcf6af.0+8bcf6af",
-    "@agoric/internal": "0.3.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/notifier": "0.6.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/store": "0.9.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/time": "0.3.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/vat-data": "0.5.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/zoe": "0.26.3-dev-8bcf6af.0+8bcf6af",
+    "@agoric/assert": "0.6.1-dev-8baf0aa.0+8baf0aa",
+    "@agoric/ertp": "0.16.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/governance": "0.10.4-dev-8baf0aa.0+8baf0aa",
+    "@agoric/internal": "0.3.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/notifier": "0.6.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/store": "0.9.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/time": "0.3.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/vat-data": "0.5.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/zoe": "0.26.3-dev-8baf0aa.0+8baf0aa",
     "@endo/captp": "^3.1.2",
     "@endo/eventual-send": "^0.17.3",
     "@endo/far": "^0.2.19",
@@ -49,12 +49,12 @@
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-8bcf6af.0+8bcf6af",
-    "@agoric/smart-wallet": "0.5.4-dev-8bcf6af.0+8bcf6af",
-    "@agoric/swingset-liveslots": "0.10.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/swingset-vat": "0.32.3-dev-8bcf6af.0+8bcf6af",
-    "@agoric/vats": "0.15.2-dev-8bcf6af.0+8bcf6af",
-    "@agoric/zone": "0.2.3-dev-8bcf6af.0+8bcf6af",
+    "@agoric/deploy-script-support": "0.10.4-dev-8baf0aa.0+8baf0aa",
+    "@agoric/smart-wallet": "0.5.4-dev-8baf0aa.0+8baf0aa",
+    "@agoric/swingset-liveslots": "0.10.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/swingset-vat": "0.32.3-dev-8baf0aa.0+8baf0aa",
+    "@agoric/vats": "0.15.2-dev-8baf0aa.0+8baf0aa",
+    "@agoric/zone": "0.2.3-dev-8baf0aa.0+8baf0aa",
     "@endo/bundle-source": "^2.5.2",
     "@endo/init": "^0.5.57",
     "@endo/promise-kit": "^0.2.57",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8bcf6af10ce538871cc0bf5798000247c367313a"
+  "gitHead": "8baf0aabe3cadeb1cd07fd30641d11baf3e68eaf"
 }

package/scripts/add-collateral-core.js

@@ -10,7 +10,7 @@ export const defaultProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   {
     debtLimitValue = undefined,
-    stabilityFeeValue = undefined,
+    interestRateValue = undefined,
     interchainAssetOptions = /** @type {object} */ ({}),
   } = {},
   { env = process.env } = {},
@@ -38,7 +38,7 @@ export const defaultProposalBuilder = async (
       getManifestForAddAssetToVault.name,
       {
         debtLimitValue: debtLimitValue && BigInt(debtLimitValue),
-        stabilityFeeValue: stabilityFeeValue && BigInt(stabilityFeeValue),
+        interestRateValue: interestRateValue && BigInt(interestRateValue),
         interchainAssetOptions: {
           denom,
           issuerBoardId,

package/src/interest-math.d.ts

@@ -1,3 +1,3 @@
-export function calculateCurrentDebt(debtSnapshot: Amount<'nat'>, stabilityFeeSnapshot: Ratio, currentCompoundedStabilityFee: Ratio): Amount<'nat'>;
+export function calculateCurrentDebt(debtSnapshot: Amount<'nat'>, interestSnapshot: Ratio, currentCompoundedInterest: Ratio): Amount<'nat'>;
 export function reverseInterest(debt: Amount<'nat'>, interestApplied: Ratio): Amount<'nat'>;
 //# sourceMappingURL=interest-math.d.ts.map

package/src/interest-math.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interest-math.d.ts","sourceRoot":"","sources":["interest-math.js"],"names":[],"mappings":"AAgCO,mDALI,OAAO,KAAK,CAAC,wBACb,KAAK,iCACL,KAAK,GACH,OAAO,KAAK,CAAC,CAiBzB;AAOM,sCAJI,OAAO,KAAK,CAAC,mBACb,KAAK,GACH,OAAO,KAAK,CAAC,CAIzB"}
+{"version":3,"file":"interest-math.d.ts","sourceRoot":"","sources":["interest-math.js"],"names":[],"mappings":"AAgCO,mDALI,OAAO,KAAK,CAAC,oBACb,KAAK,6BACL,KAAK,GACH,OAAO,KAAK,CAAC,CAiBzB;AAOM,sCAJI,OAAO,KAAK,CAAC,mBACb,KAAK,GACH,OAAO,KAAK,CAAC,CAIzB"}

package/src/interest-math.js

@@ -9,39 +9,39 @@ import {
 } from '@agoric/zoe/src/contractSupport/ratio.js';
 
 /**
- * @param {Ratio} currentCompoundedStabilityFee as coefficient
- * @param {Ratio} previousCompoundedStabilityFee as coefficient
+ * @param {Ratio} currentCompoundedInterest as coefficient
+ * @param {Ratio} previousCompoundedInterest as coefficient
  * @returns {Ratio} additional compounding since the previous
  */
 const calculateRelativeCompounding = (
-  currentCompoundedStabilityFee,
-  previousCompoundedStabilityFee,
+  currentCompoundedInterest,
+  previousCompoundedInterest,
 ) => {
   // divide compounded interest by the snapshot
   return multiplyRatios(
-    currentCompoundedStabilityFee,
-    invertRatio(previousCompoundedStabilityFee),
+    currentCompoundedInterest,
+    invertRatio(previousCompoundedInterest),
   );
 };
 
 /**
  * @param {Amount<'nat'>} debtSnapshot
- * @param {Ratio} stabilityFeeSnapshot as coefficient
- * @param {Ratio} currentCompoundedStabilityFee as coefficient
+ * @param {Ratio} interestSnapshot as coefficient
+ * @param {Ratio} currentCompoundedInterest as coefficient
  * @returns {Amount<'nat'>}
  */
 export const calculateCurrentDebt = (
   debtSnapshot,
-  stabilityFeeSnapshot,
-  currentCompoundedStabilityFee,
+  interestSnapshot,
+  currentCompoundedInterest,
 ) => {
-  if (ratiosSame(stabilityFeeSnapshot, currentCompoundedStabilityFee)) {
+  if (ratiosSame(interestSnapshot, currentCompoundedInterest)) {
     return debtSnapshot;
   }
 
   const interestSinceSnapshot = calculateRelativeCompounding(
-    currentCompoundedStabilityFee,
-    stabilityFeeSnapshot,
+    currentCompoundedInterest,
+    interestSnapshot,
   );
 
   return multiplyBy(debtSnapshot, interestSinceSnapshot);

package/src/interest.d.ts

@@ -5,23 +5,23 @@
  */
 export const SECONDS_PER_YEAR: bigint;
 export function makeInterestCalculator(annualRate: Ratio, chargingPeriod: RelativeTime, recordingPeriod: RelativeTime): CalculatorKit;
-export function calculateCompoundedStabilityFee(priorCompoundedStabilityFee: Ratio, priorDebt: NatValue, newDebt: NatValue): Ratio;
+export function calculateCompoundedInterest(priorCompoundedInterest: Ratio, priorDebt: NatValue, newDebt: NatValue): Ratio;
 export function chargeInterest(powers: {
     mint: ZCFMint<'nat'>;
     mintAndTransferWithFee: MintAndTransfer;
     poolIncrementSeat: ZCFSeat;
     seatAllocationKeyword: Keyword;
 }, params: {
-    stabilityFee: Ratio;
+    interestRate: Ratio;
     chargingPeriod: RelativeTime;
     recordingPeriod: RelativeTime;
 }, prior: {
-    latestStabilityFeeUpdate: Timestamp;
-    compoundedStabilityFee: Ratio;
+    latestInterestUpdate: Timestamp;
+    compoundedInterest: Ratio;
     totalDebt: Amount<'nat'>;
 }, accruedUntil: Timestamp): {
-    compoundedStabilityFee: Ratio;
-    latestStabilityFeeUpdate: Timestamp;
+    compoundedInterest: Ratio;
+    latestInterestUpdate: Timestamp;
     totalDebt: Amount<'nat'>;
 };
 export type Timestamp = import('@agoric/time/src/types').Timestamp;

package/src/interest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interest.d.ts","sourceRoot":"","sources":["interest.js"],"names":[],"mappings":"AAYA;;;;GAIG;AAEH,sCAAuD;AAchD,mDALI,KAAK,kBACL,YAAY,mBACZ,YAAY,GACV,aAAa,CA+EzB;AASM,6EAJI,KAAK,aACL,QAAQ,WACR,QAAQ,SAalB;AA0CM,uCAvBI;IACV,IAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;IACzB,sBAA0B,EAAE,eAAe,CAAC;IAC5C,iBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAyB,EAAE,OAAO,CAAC;CAChC,UACO;IACV,YAAgB,EAAE,KAAK,CAAC;IACxB,cAAkB,EAAE,YAAY,CAAC;IACjC,eAAmB,EAAE,YAAY,CAAC;CAC/B;8BAE2B,SAAS;4BACX,KAAK;eAClB,OAAO,KAAK,CAAC;iBAElB,SAAS;4BAES,KAAK;8BACH,SAAS;eACxB,OAAO,KAAK,CAAC;EA+D5B;wBA1NY,OAAO,wBAAwB,EAAE,SAAS;2BAE1C,OAAO,wBAAwB,EAAE,YAAY"}
+{"version":3,"file":"interest.d.ts","sourceRoot":"","sources":["interest.js"],"names":[],"mappings":"AAYA;;;;GAIG;AAEH,sCAAuD;AAchD,mDALI,KAAK,kBACL,YAAY,mBACZ,YAAY,GACV,aAAa,CA+EzB;AASM,qEAJI,KAAK,aACL,QAAQ,WACR,QAAQ,SAalB;AAyCM,uCAvBI;IACV,IAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;IACzB,sBAA0B,EAAE,eAAe,CAAC;IAC5C,iBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAyB,EAAE,OAAO,CAAC;CAChC,UACO;IACV,YAAgB,EAAE,KAAK,CAAC;IACxB,cAAkB,EAAE,YAAY,CAAC;IACjC,eAAmB,EAAE,YAAY,CAAC;CAC/B;0BAEuB,SAAS;wBACX,KAAK;eACd,OAAO,KAAK,CAAC;iBAElB,SAAS;wBAEK,KAAK;0BACH,SAAS;eACpB,OAAO,KAAK,CAAC;EA+D5B;wBAzNY,OAAO,wBAAwB,EAAE,SAAS;2BAE1C,OAAO,wBAAwB,EAAE,YAAY"}

package/src/interest.js

@@ -56,8 +56,8 @@ export const makeInterestCalculator = (
    * @type {Calculate}
    */
   const calculate = (debtStatus, currentTime) => {
-    const { newDebt, latestStabilityFeeUpdate } = debtStatus;
-    let newRecent = latestStabilityFeeUpdate;
+    const { newDebt, latestInterestUpdate } = debtStatus;
+    let newRecent = latestInterestUpdate;
     let growingInterest = debtStatus.interest;
     let growingDebt = newDebt;
     while (
@@ -77,7 +77,7 @@ export const makeInterestCalculator = (
       growingDebt += newInterest;
     }
     return {
-      latestStabilityFeeUpdate: newRecent,
+      latestInterestUpdate: newRecent,
       interest: growingInterest,
       newDebt: growingDebt,
     };
@@ -92,9 +92,9 @@ export const makeInterestCalculator = (
    * @type {Calculate}
    */
   const calculateReportingPeriod = (debtStatus, currentTime) => {
-    const { latestStabilityFeeUpdate } = debtStatus;
+    const { latestInterestUpdate } = debtStatus;
     const overshoot = TimeMath.modRelRel(
-      TimeMath.subtractAbsAbs(currentTime, latestStabilityFeeUpdate),
+      TimeMath.subtractAbsAbs(currentTime, latestInterestUpdate),
       recordingPeriod,
     );
     return calculate(
@@ -110,20 +110,20 @@ export const makeInterestCalculator = (
 };
 
 /**
- * compoundedStabilityFee *= (new debt) / (prior total debt)
+ * compoundedInterest *= (new debt) / (prior total debt)
  *
- * @param {Ratio} priorCompoundedStabilityFee
+ * @param {Ratio} priorCompoundedInterest
  * @param {NatValue} priorDebt
  * @param {NatValue} newDebt
  */
-export const calculateCompoundedStabilityFee = (
-  priorCompoundedStabilityFee,
+export const calculateCompoundedInterest = (
+  priorCompoundedInterest,
   priorDebt,
   newDebt,
 ) => {
-  const brand = priorCompoundedStabilityFee.numerator.brand;
+  const brand = priorCompoundedInterest.numerator.brand;
   const compounded = multiplyRatios(
-    priorCompoundedStabilityFee,
+    priorCompoundedInterest,
     makeRatio(newDebt, brand, priorDebt, brand),
   );
   return quantize(compounded, COMPOUNDED_INTEREST_DENOMINATOR);
@@ -143,8 +143,7 @@ const validatedBrand = (mint, debt) => {
 };
 
 /**
- * Charge interest accrued between `latestStabilityFeeUpdate` and
- * `accruedUntil`.
+ * Charge interest accrued between `latestInterestUpdate` and `accruedUntil`.
  *
  * @param {{
  *   mint: ZCFMint<'nat'>;
@@ -153,19 +152,19 @@ const validatedBrand = (mint, debt) => {
  *   seatAllocationKeyword: Keyword;
  * }} powers
  * @param {{
- *   stabilityFee: Ratio;
+ *   interestRate: Ratio;
  *   chargingPeriod: RelativeTime;
  *   recordingPeriod: RelativeTime;
  * }} params
  * @param {{
- *   latestStabilityFeeUpdate: Timestamp;
- *   compoundedStabilityFee: Ratio;
+ *   latestInterestUpdate: Timestamp;
+ *   compoundedInterest: Ratio;
  *   totalDebt: Amount<'nat'>;
  * }} prior
  * @param {Timestamp} accruedUntil
  * @returns {{
- *   compoundedStabilityFee: Ratio;
- *   latestStabilityFeeUpdate: Timestamp;
+ *   compoundedInterest: Ratio;
+ *   latestInterestUpdate: Timestamp;
  *   totalDebt: Amount<'nat'>;
  * }}
  */
@@ -173,7 +172,7 @@ export const chargeInterest = (powers, params, prior, accruedUntil) => {
   const brand = validatedBrand(powers.mint, prior.totalDebt);
 
   const interestCalculator = makeInterestCalculator(
-    params.stabilityFee,
+    params.interestRate,
     params.chargingPeriod,
     params.recordingPeriod,
   );
@@ -181,7 +180,7 @@ export const chargeInterest = (powers, params, prior, accruedUntil) => {
   // calculate delta of accrued debt
   const debtStatus = interestCalculator.calculateReportingPeriod(
     {
-      latestStabilityFeeUpdate: prior.latestStabilityFeeUpdate,
+      latestInterestUpdate: prior.latestInterestUpdate,
       newDebt: prior.totalDebt.value,
       interest: 0n, // XXX this is always zero, doesn't need to be an option
     },
@@ -192,8 +191,8 @@ export const chargeInterest = (powers, params, prior, accruedUntil) => {
   // done if none
   if (interestAccrued === 0n) {
     return {
-      compoundedStabilityFee: prior.compoundedStabilityFee,
-      latestStabilityFeeUpdate: debtStatus.latestStabilityFeeUpdate,
+      compoundedInterest: prior.compoundedInterest,
+      latestInterestUpdate: debtStatus.latestInterestUpdate,
       totalDebt: prior.totalDebt,
     };
   }
@@ -203,8 +202,8 @@ export const chargeInterest = (powers, params, prior, accruedUntil) => {
   // testing with small numbers there's 5 digits of precision, and with large
   // numbers the ratios tend towards ample precision.
   // TODO adopt banker's rounding https://github.com/Agoric/agoric-sdk/issues/4573
-  const compoundedStabilityFee = calculateCompoundedStabilityFee(
-    prior.compoundedStabilityFee,
+  const compoundedInterest = calculateCompoundedInterest(
+    prior.compoundedInterest,
     prior.totalDebt.value,
     debtStatus.newDebt,
   );
@@ -225,8 +224,8 @@ export const chargeInterest = (powers, params, prior, accruedUntil) => {
   );
 
   return {
-    compoundedStabilityFee,
-    latestStabilityFeeUpdate: debtStatus.latestStabilityFeeUpdate,
+    compoundedInterest,
+    latestInterestUpdate: debtStatus.latestInterestUpdate,
     totalDebt,
   };
 };

package/src/proposals/addAssetToVault.d.ts

@@ -14,18 +14,18 @@ export function registerScaledPriceAuthority({ consume: { agoricNamesAdmin, star
         interchainAssetOptions: InterchainAssetOptions;
     };
 }): Promise<void>;
-export function addAssetToVault({ consume: { vaultFactoryKit, agoricNamesAdmin, auctioneerKit }, brand: { consume: { [Stable.symbol]: stableP }, }, instance: { consume: consumeInstance }, }: EconomyBootstrapPowers, { options: { debtLimitValue, stabilityFeeValue, interchainAssetOptions, }, }: {
+export function addAssetToVault({ consume: { vaultFactoryKit, agoricNamesAdmin, auctioneerKit }, brand: { consume: { [Stable.symbol]: stableP }, }, instance: { consume: consumeInstance }, }: EconomyBootstrapPowers, { options: { debtLimitValue, interestRateValue, interchainAssetOptions, }, }: {
     options: {
         interchainAssetOptions: InterchainAssetOptions;
         debtLimitValue: bigint | number | string;
-        stabilityFeeValue: bigint;
+        interestRateValue: bigint;
     };
 }): Promise<void>;
 export function getManifestForAddAssetToVault({ restoreRef }: {
     restoreRef: any;
-}, { debtLimitValue, stabilityFeeValue, interchainAssetOptions, scaledPriceAuthorityRef, }: {
+}, { debtLimitValue, interestRateValue, interchainAssetOptions, scaledPriceAuthorityRef, }: {
     debtLimitValue: any;
-    stabilityFeeValue: any;
+    interestRateValue: any;
     interchainAssetOptions: any;
     scaledPriceAuthorityRef: any;
 }): {
@@ -138,7 +138,7 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
     options: {
         debtLimitValue: any;
         interchainAssetOptions: any;
-        stabilityFeeValue: any;
+        interestRateValue: any;
     };
 };
 export type InterchainAssetOptions = {

package/src/proposals/addAssetToVault.js

@@ -212,7 +212,7 @@ export const registerScaledPriceAuthority = async (
  * @param {object} config.options
  * @param {InterchainAssetOptions} config.options.interchainAssetOptions
  * @param {bigint | number | string} config.options.debtLimitValue
- * @param {bigint} config.options.stabilityFeeValue
+ * @param {bigint} config.options.interestRateValue
  */
 export const addAssetToVault = async (
   {
@@ -228,7 +228,7 @@ export const addAssetToVault = async (
       debtLimitValue = 1_000n * 1_000_000n,
       // Default to a safe value. Production will likely set this through governance.
       // Allow setting through bootstrap to simplify testing.
-      stabilityFeeValue = 1n,
+      interestRateValue = 1n,
       interchainAssetOptions,
     },
   },
@@ -250,7 +250,7 @@ export const addAssetToVault = async (
   const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
   await E(vaultFactoryCreator).addVaultType(interchainIssuer, oracleBrand, {
     debtLimit: AmountMath.make(stable, BigInt(debtLimitValue)),
-    stabilityFee: makeRatio(stabilityFeeValue, stable),
+    interestRate: makeRatio(interestRateValue, stable),
     // The rest of these we use safe defaults.
     // In production they will be governed by the Econ Committee.
     // Product deployments are also expected to have a low debtLimitValue at the outset,
@@ -268,7 +268,7 @@ export const getManifestForAddAssetToVault = (
   { restoreRef },
   {
     debtLimitValue,
-    stabilityFeeValue,
+    interestRateValue,
     interchainAssetOptions,
     scaledPriceAuthorityRef,
   },
@@ -341,7 +341,7 @@ export const getManifestForAddAssetToVault = (
     options: {
       debtLimitValue,
       interchainAssetOptions,
-      stabilityFeeValue,
+      interestRateValue,
     },
   };
 };

package/src/vaultFactory/params.d.ts

@@ -4,7 +4,7 @@ export const DEBT_LIMIT_KEY: "DebtLimit";
 export const LIQUIDATION_MARGIN_KEY: "LiquidationMargin";
 export const LIQUIDATION_PADDING_KEY: "LiquidationPadding";
 export const LIQUIDATION_PENALTY_KEY: "LiquidationPenalty";
-export const STABILITY_FEE_KEY: "StabilityFee";
+export const INTEREST_RATE_KEY: "InterestRate";
 export const MINT_FEE_KEY: "MintFee";
 export const MIN_INITIAL_DEBT_KEY: "MinInitialDebt";
 export const SHORTFALL_INVITATION_KEY: "ShortfallInvitation";
@@ -15,9 +15,9 @@ export namespace vaultDirectorParamTypes {
     let RecordingPeriod: "nat";
     let ReferencedUI: "string";
 }
-export function makeVaultParamManager(publisherKit: import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>, { debtLimit, stabilityFee, liquidationMargin, liquidationPadding, liquidationPenalty, mintFee, }: VaultManagerParamValues): import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
+export function makeVaultParamManager(publisherKit: import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>, { debtLimit, interestRate, liquidationMargin, liquidationPadding, liquidationPenalty, mintFee, }: VaultManagerParamValues): import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
     DebtLimit: "amount";
-    StabilityFee: "ratio";
+    InterestRate: "ratio";
     LiquidationPadding: "ratio";
     LiquidationMargin: "ratio";
     LiquidationPenalty: "ratio";
@@ -104,7 +104,7 @@ export function provideVaultParamManagers(baggage: MapStore<string, unknown>, ma
      */
     addParamManager(brand: Brand, storageNode: StorageNode, initialParamValues: VaultManagerParamValues): import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
         DebtLimit: "amount";
-        StabilityFee: "ratio";
+        InterestRate: "ratio";
         LiquidationPadding: "ratio";
         LiquidationMargin: "ratio";
         LiquidationPenalty: "ratio";
@@ -113,7 +113,7 @@ export function provideVaultParamManagers(baggage: MapStore<string, unknown>, ma
     /** @param {Brand} brand */
     get(brand: Brand): import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
         DebtLimit: "amount";
-        StabilityFee: "ratio";
+        InterestRate: "ratio";
         LiquidationPadding: "ratio";
         LiquidationMargin: "ratio";
         LiquidationPenalty: "ratio";

package/src/vaultFactory/params.js

@@ -21,7 +21,7 @@ export const DEBT_LIMIT_KEY = 'DebtLimit';
 export const LIQUIDATION_MARGIN_KEY = 'LiquidationMargin';
 export const LIQUIDATION_PADDING_KEY = 'LiquidationPadding';
 export const LIQUIDATION_PENALTY_KEY = 'LiquidationPenalty';
-export const STABILITY_FEE_KEY = 'StabilityFee';
+export const INTEREST_RATE_KEY = 'InterestRate';
 export const MINT_FEE_KEY = 'MintFee';
 export const MIN_INITIAL_DEBT_KEY = 'MinInitialDebt';
 export const SHORTFALL_INVITATION_KEY = 'ShortfallInvitation';
@@ -93,7 +93,7 @@ export const makeVaultParamManager = (
   publisherKit,
   {
     debtLimit,
-    stabilityFee,
+    interestRate,
     liquidationMargin,
     liquidationPadding = zeroRatio(liquidationMargin),
     liquidationPenalty,
@@ -102,7 +102,7 @@ export const makeVaultParamManager = (
 ) =>
   makeParamManagerSync(publisherKit, {
     [DEBT_LIMIT_KEY]: [ParamTypes.AMOUNT, debtLimit],
-    [STABILITY_FEE_KEY]: [ParamTypes.RATIO, stabilityFee],
+    [INTEREST_RATE_KEY]: [ParamTypes.RATIO, interestRate],
     [LIQUIDATION_PADDING_KEY]: [ParamTypes.RATIO, liquidationPadding],
     [LIQUIDATION_MARGIN_KEY]: [ParamTypes.RATIO, liquidationMargin],
     [LIQUIDATION_PENALTY_KEY]: [ParamTypes.RATIO, liquidationPenalty],
@@ -114,7 +114,7 @@ export const vaultParamPattern = M.splitRecord(
   {
     liquidationMargin: ratioPattern,
     liquidationPenalty: ratioPattern,
-    stabilityFee: ratioPattern,
+    interestRate: ratioPattern,
     mintFee: ratioPattern,
     debtLimit: amountPattern,
   },

package/src/vaultFactory/storeUtils.d.ts

@@ -12,8 +12,8 @@ export const encodeData: (passable: any) => string;
 export const decodeData: (encoded: string) => any;
 export function toVaultKey(normalizedDebt: NormalizedDebt, collateral: Amount<'nat'>, vaultId: VaultId): string;
 export function fromVaultKey(key: string): [normalizedCollateralization: number, vaultId: VaultId];
-export function normalizedCollRatio(quote: PriceQuote, compoundedStabilityFee: Ratio, margin: Ratio): number;
-export function normalizedCollRatioKey(quote: PriceQuote, compoundedStabilityFee: Ratio, margin: Ratio): string;
+export function normalizedCollRatio(quote: PriceQuote, compoundedInterest: Ratio, margin: Ratio): number;
+export function normalizedCollRatioKey(quote: PriceQuote, compoundedInterest: Ratio, margin: Ratio): string;
 export type PureData = import('@endo/marshal').PureData;
 export type CompositeKey = [normalizedCollateralization: number, vaultId: VaultId];
 export type NormalizedDebt = Amount<'nat'> & {

package/src/vaultFactory/storeUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storeUtils.d.ts","sourceRoot":"","sources":["storeUtils.js"],"names":[],"mappings":"AAqBA,2DAA2D;AAE3D,sFAAsF;AAOtF;;;GAGG;AACH,mDAA+C;AAO/C;;;GAGG;AACH,kDAA+C;AAkDxC,2CANI,cAAc,cACd,OAAO,KAAK,CAAC,WACb,OAAO,GACL,MAAM,CAelB;AAOM,kCAHI,MAAM,GACJ,CAAC,2BAA2B,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAKnE;AAgBM,2CALI,UAAU,0BACV,KAAK,UACL,KAAK,GACH,MAAM,CAiBlB;AAcM,8CANI,UAAU,0BACV,KAAK,UACL,KAAK,GACH,MAAM,CAUlB;uBApJa,OAAO,eAAe,EAAE,QAAQ;2BAEhC,CAAC,2BAA2B,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;6BA4CvD,OAAO,KAAK,CAAC,GAAG;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE;yBACpC,OAAO,KAAK,CAAC,GAAG;IAAE,UAAU,EAAE,KAAK,CAAA;CAAE"}
+{"version":3,"file":"storeUtils.d.ts","sourceRoot":"","sources":["storeUtils.js"],"names":[],"mappings":"AAqBA,2DAA2D;AAE3D,sFAAsF;AAOtF;;;GAGG;AACH,mDAA+C;AAO/C;;;GAGG;AACH,kDAA+C;AAkDxC,2CANI,cAAc,cACd,OAAO,KAAK,CAAC,WACb,OAAO,GACL,MAAM,CAelB;AAOM,kCAHI,MAAM,GACJ,CAAC,2BAA2B,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAKnE;AAgBM,2CALI,UAAU,sBACV,KAAK,UACL,KAAK,GACH,MAAM,CAiBlB;AAcM,8CANI,UAAU,sBACV,KAAK,UACL,KAAK,GACH,MAAM,CAMlB;uBAhJa,OAAO,eAAe,EAAE,QAAQ;2BAEhC,CAAC,2BAA2B,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;6BA4CvD,OAAO,KAAK,CAAC,GAAG;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE;yBACpC,OAAO,KAAK,CAAC,GAAG;IAAE,UAAU,EAAE,KAAK,CAAA;CAAE"}

package/src/vaultFactory/storeUtils.js

@@ -127,15 +127,15 @@ harden(fromVaultKey);
  * For use by `normalizedCollRatioKey` and tests.
  *
  * @param {PriceQuote} quote
- * @param {Ratio} compoundedStabilityFee
+ * @param {Ratio} compoundedInterest
  * @param {Ratio} margin
  * @returns {number}
  */
-export const normalizedCollRatio = (quote, compoundedStabilityFee, margin) => {
+export const normalizedCollRatio = (quote, compoundedInterest, margin) => {
   const amountIn = getAmountIn(quote).value;
   const amountOut = getAmountOut(quote).value;
-  const interestNumerator = compoundedStabilityFee.numerator.value;
-  const interestBase = compoundedStabilityFee.denominator.value;
+  const interestNumerator = compoundedInterest.numerator.value;
+  const interestBase = compoundedInterest.denominator.value;
   const numerator = multiply(
     margin.numerator.value,
     multiply(amountIn, interestNumerator),
@@ -155,17 +155,13 @@ harden(normalizedCollRatio);
  * out the numerator and the denominator, and divide only once.
  *
  * @param {PriceQuote} quote
- * @param {Ratio} compoundedStabilityFee
+ * @param {Ratio} compoundedInterest
  * @param {Ratio} margin
  * @returns {string} lexically sortable string in which highest
  *   debt-to-collateral is earliest
  */
-export const normalizedCollRatioKey = (
-  quote,
-  compoundedStabilityFee,
-  margin,
-) => {
-  const collRatio = normalizedCollRatio(quote, compoundedStabilityFee, margin);
+export const normalizedCollRatioKey = (quote, compoundedInterest, margin) => {
+  const collRatio = normalizedCollRatio(quote, compoundedInterest, margin);
   return `${encodeNumber(collRatio)}:`;
 };
 harden(normalizedCollRatioKey);

package/src/vaultFactory/types.d.ts

@@ -28,7 +28,7 @@ type VaultManagerParamValues = {
      * - annual interest rate charged on debt
      * positions
      */
-    stabilityFee: Ratio;
+    interestRate: Ratio;
     /**
      * - The fee (in BasisPoints) charged when creating or
      * increasing a debt position.
@@ -69,7 +69,7 @@ type GetVaultParams = {
      * - The annual interest rate on a debt
      * position
      */
-    getStabilityFee: () => Ratio;
+    getInterestRate: () => Ratio;
     /**
      * - The period (in seconds) at
      * which interest is charged to the debt position.
@@ -104,9 +104,9 @@ type Liquidator = {
     }>>;
 };
 type DebtStatus = {
-    latestStabilityFeeUpdate: Timestamp;
+    latestInterestUpdate: Timestamp;
     /**
-     * interest accrued since latestStabilityFeeUpdate
+     * interest accrued since latestInterestUpdate
      */
     interest: NatValue;
     /**

package/src/vaultFactory/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"yBAGa,OAAO,SAAS,EAAE,iBAAiB;aAEnC,OAAO,SAAS,EAAE,KAAK;gBAEvB,OAAO,YAAY,EAAE,QAAQ;oBAE7B,OAAO,gBAAgB,EAAE,YAAY;yBAErC,OAAO,gBAAgB,EAAE,iBAAiB;gCAE1C,OAAO,4BAA4B,EAAE,+BAA+B;+BAEpE,OAAO,4BAA4B,EAAE,uBAAuB;6BAE5D,OAAO,0BAA0B,EAAE,qBAAqB;+BAExD,OAAO,mBAAmB,EAAE,oBAAoB,CAAC,aAAa,CAAC;iBAE/D,OAAO,wBAAwB,EAAE,SAAS;oBAE1C,OAAO,wBAAwB,EAAE,YAAY;;4BAKnC,MAAM,SAAS,KAAK,KAAK,MAAM;wBACxC,MAAM,UAAU;;;;;;;uBAKhB,KAAK;;;;;wBAEL,KAAK;;;;;kBAEL,KAAK;;;;;aAEL,KAAK;eAEL,OAAO,KAAK,CAAC;;;;;;;uCAOhB,MAAM,qBACN,OAAO,UACP,uBAAuB,KACrB,QAAQ,YAAY,CAAC;;kBAKpB,YAAY;yBACZ,MAAM,UAAU;+BAChB,MAAM,QAAQ,WAAW,MAAM,EAAE,KAAK,CAAC,CAAC;0BACxC,MAAM,OAAO,wBAAwB,EAAE,UAAU;wBACjD,MAAM,OAAO,wBAAwB,EAAE,UAAU;;;;;;;;sCAQpD,OAAO,UACP,OAAO,KAAK,CAAC,OACb,OAAO,KAAK,CAAC,aACb,OAAO,mDAAmD,EAAE,YAAY,EAAE,KACxE,IAAI;;;;;yBAMN,MAAM,YACN,OAAO,KACL,IAAI;;0BAKH,MAAM,KAAK;gBACX,MAAM,KAAK;wBACX,MAAM,QAAQ,UAAU,CAAC;;;;;qBACzB,MAAM,KAAK;;;;;uBAEX,MAAM,YAAY;;;;;wBAElB,MAAM,YAAY;;eAIlB,MAAM;;;;;oBAIN,YAAY;;;;qBACZ,YAAY;;;oBAKZ,MAAM,oBAAoB;+BACb,MAAM,OAAO,MAAM,KAAK,QAAQ;2BACtC,MAAM,KAAK,QAAQ,UAAU,CAAC;;;6BAKrC,MAAM,QACnB,WAAe,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,KAAK,CAAC,CAAC;QAAC,WAAW,EAAE,KAAK,CAAA;KAAE,CAAC,CAC9D;;;8BAKU,SAAS;;;;cACT,QAAQ;;;;aACR,QAAQ;;8BAKX,UAAU,eACV,SAAS,KACP,UAAU;;;;;;eAKT,SAAS;;;;;;;8BAET,SAAS;;6BAMT;IAAE,GAAG,EAAE,gBAAgB,GAAG;QAAE,eAAe,EAAE,KAAK,CAAA;KAAE,CAAA;CAAE"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"yBAGa,OAAO,SAAS,EAAE,iBAAiB;aAEnC,OAAO,SAAS,EAAE,KAAK;gBAEvB,OAAO,YAAY,EAAE,QAAQ;oBAE7B,OAAO,gBAAgB,EAAE,YAAY;yBAErC,OAAO,gBAAgB,EAAE,iBAAiB;gCAE1C,OAAO,4BAA4B,EAAE,+BAA+B;+BAEpE,OAAO,4BAA4B,EAAE,uBAAuB;6BAE5D,OAAO,0BAA0B,EAAE,qBAAqB;+BAExD,OAAO,mBAAmB,EAAE,oBAAoB,CAAC,aAAa,CAAC;iBAE/D,OAAO,wBAAwB,EAAE,SAAS;oBAE1C,OAAO,wBAAwB,EAAE,YAAY;;4BAKnC,MAAM,SAAS,KAAK,KAAK,MAAM;wBACxC,MAAM,UAAU;;;;;;;uBAKhB,KAAK;;;;;wBAEL,KAAK;;;;;kBAEL,KAAK;;;;;aAEL,KAAK;eAEL,OAAO,KAAK,CAAC;;;;;;;uCAOhB,MAAM,qBACN,OAAO,UACP,uBAAuB,KACrB,QAAQ,YAAY,CAAC;;kBAKpB,YAAY;yBACZ,MAAM,UAAU;+BAChB,MAAM,QAAQ,WAAW,MAAM,EAAE,KAAK,CAAC,CAAC;0BACxC,MAAM,OAAO,wBAAwB,EAAE,UAAU;wBACjD,MAAM,OAAO,wBAAwB,EAAE,UAAU;;;;;;;;sCAQpD,OAAO,UACP,OAAO,KAAK,CAAC,OACb,OAAO,KAAK,CAAC,aACb,OAAO,mDAAmD,EAAE,YAAY,EAAE,KACxE,IAAI;;;;;yBAMN,MAAM,YACN,OAAO,KACL,IAAI;;0BAKH,MAAM,KAAK;gBACX,MAAM,KAAK;wBACX,MAAM,QAAQ,UAAU,CAAC;;;;;qBACzB,MAAM,KAAK;;;;;uBAEX,MAAM,YAAY;;;;;wBAElB,MAAM,YAAY;;eAIlB,MAAM;;;;;oBAIN,YAAY;;;;qBACZ,YAAY;;;oBAKZ,MAAM,oBAAoB;+BACb,MAAM,OAAO,MAAM,KAAK,QAAQ;2BACtC,MAAM,KAAK,QAAQ,UAAU,CAAC;;;6BAKrC,MAAM,QACnB,WAAe,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,KAAK,CAAC,CAAC;QAAC,WAAW,EAAE,KAAK,CAAA;KAAE,CAAC,CAC9D;;;0BAKU,SAAS;;;;cACT,QAAQ;;;;aACR,QAAQ;;8BAKX,UAAU,eACV,SAAS,KACP,UAAU;;;;;;eAKT,SAAS;;;;;;;8BAET,SAAS;;6BAMT;IAAE,GAAG,EAAE,gBAAgB,GAAG;QAAE,eAAe,EAAE,KAAK,CAAA;KAAE,CAAA;CAAE"}

package/src/vaultFactory/types.js

@@ -36,7 +36,7 @@
  *   liquidated to satisfy the debt.
  * @property {Ratio} liquidationPenalty - penalty charged upon liquidation as
  *   proportion of debt
- * @property {Ratio} stabilityFee - annual interest rate charged on debt
+ * @property {Ratio} interestRate - annual interest rate charged on debt
  *   positions
  * @property {Ratio} mintFee - The fee (in BasisPoints) charged when creating or
  *   increasing a debt position.
@@ -87,7 +87,7 @@
  * @property {() => Ratio} getLiquidationMargin
  * @property {() => Ratio} getMintFee
  * @property {() => Promise<PriceQuote>} getCollateralQuote
- * @property {() => Ratio} getStabilityFee - The annual interest rate on a debt
+ * @property {() => Ratio} getInterestRate - The annual interest rate on a debt
  *   position
  * @property {() => RelativeTime} getChargingPeriod - The period (in seconds) at
  *   which interest is charged to the debt position.
@@ -119,8 +119,8 @@
 
 /**
  * @typedef {object} DebtStatus
- * @property {Timestamp} latestStabilityFeeUpdate
- * @property {NatValue} interest interest accrued since latestStabilityFeeUpdate
+ * @property {Timestamp} latestInterestUpdate
+ * @property {NatValue} interest interest accrued since latestInterestUpdate
  * @property {NatValue} newDebt total including principal and interest
  */