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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/README.md +1 -1
  2. package/bundles/bundle-auctioneer-js-meta.json +193 -181
  3. package/bundles/bundle-auctioneer.js +1 -1
  4. package/bundles/bundle-econCommitteeCharter-js-meta.json +141 -129
  5. package/bundles/bundle-econCommitteeCharter.js +1 -1
  6. package/bundles/bundle-feeDistributor-js-meta.json +127 -115
  7. package/bundles/bundle-feeDistributor.js +1 -1
  8. package/bundles/bundle-fluxAggregatorKit-js-meta.json +181 -169
  9. package/bundles/bundle-fluxAggregatorKit.js +1 -1
  10. package/bundles/bundle-psm-js-meta.json +179 -167
  11. package/bundles/bundle-psm.js +1 -1
  12. package/bundles/bundle-reserve-js-meta.json +178 -166
  13. package/bundles/bundle-reserve.js +1 -1
  14. package/bundles/bundle-scaledPriceAuthority-js-meta.json +148 -136
  15. package/bundles/bundle-scaledPriceAuthority.js +1 -1
  16. package/bundles/bundle-vaultFactory-js-meta.json +210 -198
  17. package/bundles/bundle-vaultFactory.js +1 -1
  18. package/package.json +17 -17
  19. package/scripts/add-collateral-core.js +2 -2
  20. package/src/interest-math.d.ts +1 -1
  21. package/src/interest-math.d.ts.map +1 -1
  22. package/src/interest-math.js +13 -13
  23. package/src/interest.d.ts +6 -6
  24. package/src/interest.d.ts.map +1 -1
  25. package/src/interest.js +25 -26
  26. package/src/proposals/addAssetToVault.d.ts +5 -5
  27. package/src/proposals/addAssetToVault.js +5 -5
  28. package/src/vaultFactory/params.d.ts +5 -5
  29. package/src/vaultFactory/params.js +4 -4
  30. package/src/vaultFactory/storeUtils.d.ts +2 -2
  31. package/src/vaultFactory/storeUtils.d.ts.map +1 -1
  32. package/src/vaultFactory/storeUtils.js +7 -11
  33. package/src/vaultFactory/types.d.ts +4 -4
  34. package/src/vaultFactory/types.d.ts.map +1 -1
  35. package/src/vaultFactory/types.js +4 -4
  36. package/src/vaultFactory/vault.d.ts +11 -11
  37. package/src/vaultFactory/vault.d.ts.map +1 -1
  38. package/src/vaultFactory/vault.js +14 -19
  39. package/src/vaultFactory/vaultDirector.d.ts +10 -10
  40. package/src/vaultFactory/vaultFactory.d.ts +4 -4
  41. package/src/vaultFactory/vaultManager.d.ts +38 -38
  42. package/src/vaultFactory/vaultManager.d.ts.map +1 -1
  43. package/src/vaultFactory/vaultManager.js +35 -34
  44. package/CHANGELOG.md +0 -1033
package/src/vaultFactory/vault.d.ts CHANGED
@@ -10,8 +10,8 @@ export namespace Phase {
10
10
  *
11
11
  * @typedef {object} VaultNotification
12
12
  * @property {Amount<'nat'>} locked Amount of Collateral locked
13
- * @property {{ debt: Amount<'nat'>; stabilityFee: Ratio }} debtSnapshot 'debt'
14
- * at the point the compounded stabilityFee was 'stabilityFee'
13
+ * @property {{ debt: Amount<'nat'>; interest: Ratio }} debtSnapshot 'debt' at
14
+ * the point the compounded interest was 'interest'
15
15
  * @property {HolderPhase} vaultState
16
16
  */
17
17
  /**
@@ -23,7 +23,7 @@ export namespace Phase {
23
23
  * @property {() => Brand<'nat'>} getDebtBrand
24
24
  * @property {MintAndTransfer} mintAndTransfer
25
25
  * @property {(amount: Amount, seat: ZCFSeat) => void} burn
26
- * @property {() => Ratio} getCompoundedStabilityFee
26
+ * @property {() => Ratio} getCompoundedInterest
27
27
  * @property {(
28
28
  * oldDebt: import('./storeUtils.js').NormalizedDebt,
29
29
  * oldCollateral: Amount<'nat'>,
@@ -46,7 +46,7 @@ export namespace Phase {
46
46
  * changed.
47
47
  *
48
48
  * @typedef {{
49
- * stabilityFeeSnapshot: Ratio;
49
+ * interestSnapshot: Ratio;
50
50
  * phase: VaultPhase;
51
51
  * debtSnapshot: Amount<'nat'>;
52
52
  * outerUpdater:
@@ -128,7 +128,7 @@ export function prepareVault(baggage: MapStore<string, unknown>, makeRecorderKit
128
128
  getStateSnapshot(newPhase: HolderPhase): {
129
129
  debtSnapshot: {
130
130
  debt: Amount<"nat">;
131
- stabilityFee: Ratio;
131
+ interest: Ratio;
132
132
  };
133
133
  locked: Amount<"nat">;
134
134
  vaultState: HolderPhase;
@@ -333,7 +333,7 @@ export function prepareVault(baggage: MapStore<string, unknown>, makeRecorderKit
333
333
  getStateSnapshot(newPhase: HolderPhase): {
334
334
  debtSnapshot: {
335
335
  debt: Amount<"nat">;
336
- stabilityFee: Ratio;
336
+ interest: Ratio;
337
337
  };
338
338
  locked: Amount<"nat">;
339
339
  vaultState: HolderPhase;
@@ -499,12 +499,12 @@ export type VaultNotification = {
499
499
  */
500
500
  locked: Amount<'nat'>;
501
501
  /**
502
- * 'debt'
503
- * at the point the compounded stabilityFee was 'stabilityFee'
502
+ * 'debt' at
503
+ * the point the compounded interest was 'interest'
504
504
  */
505
505
  debtSnapshot: {
506
506
  debt: Amount<'nat'>;
507
- stabilityFee: Ratio;
507
+ interest: Ratio;
508
508
  };
509
509
  vaultState: HolderPhase;
510
510
  };
@@ -516,7 +516,7 @@ export type VaultManager = {
516
516
  getDebtBrand: () => Brand<'nat'>;
517
517
  mintAndTransfer: MintAndTransfer;
518
518
  burn: (amount: Amount, seat: ZCFSeat) => void;
519
- getCompoundedStabilityFee: () => Ratio;
519
+ getCompoundedInterest: () => Ratio;
520
520
  handleBalanceChange: (oldDebt: import('./storeUtils.js').NormalizedDebt, oldCollateral: Amount<'nat'>, vaultId: VaultId, vaultPhase: VaultPhase, vault: Vault) => void;
521
521
  getGovernedParams: () => import('./vaultManager.js').GovernedParamGetters;
522
522
  };
@@ -531,7 +531,7 @@ export type ImmutableState = Readonly<{
531
531
  * changed.
532
532
  */
533
533
  export type MutableState = {
534
- stabilityFeeSnapshot: Ratio;
534
+ interestSnapshot: Ratio;
535
535
  phase: VaultPhase;
536
536
  debtSnapshot: Amount<'nat'>;
537
537
  outerUpdater: import('@agoric/zoe/src/contractSupport/recorder.js').Recorder<VaultNotification> | null;
package/src/vaultFactory/vault.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vault.d.ts","sourceRoot":"","sources":["vault.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vault.d.ts","sourceRoot":"","sources":["vault.js"],"names":[],"mappings":";;;;;;;AA0EA;;;;;;;;GAQG;AAGH;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;;;;;;;;GAYG;AAkBI,kFAHI,OAAO,6CAA6C,EAAE,eAAe,OACrE,GAAG;;;;;;QAuDN;;;;;WAKG;QACH;;;WAGG;8BAFQ,cAAc;kBALd;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;kBACpD;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;;QA0B/D,mCAAmC;8BAAvB,UAAU;;;QAwBtB;;;;;WAKG;oCADQ,OAAO,KAAK,CAAC;QAUxB;;;;;;;;;WASG;gDALQ,cAAc,iBAEd,OAAO,KAAK,CAAC,iBACb,OAAO,KAAK,CAAC;QAiBxB,4BAA4B;qCAAhB,OAAO;;;QAqBnB;;;WAGG;qDAFQ,OAAO,KAAK,CAAC,gBACb,OAAO,KAAK,CAAC;QAWxB,oCAAoC;mCAAxB,WAAW;;;;;;;;QAevB,2CAA2C;;QA4B3C,4BAA4B;wBAAhB,OAAO;QAqEnB;;;;;;;;;;WAUG;6BAHQ,OAAO,KAAK,CAAC,cACb,OAAO,KAAK,CAAC,cACb,OAAO,KAAK,CAAC;;;;;;QAaxB;;;;;WAKG;uCAFQ,OAAO,GACL,MAAM;QAwDnB;;;;;;;;WAQG;4CAPQ,OAAO;kBA9TP;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;kBACpD;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;8CA+TpD,WAAW,yBAAyB,CAAC;YAEV,iBAAiB,EAA5C,cAAc;YACY,aAAa,EAAvC,OAAO,KAAK,CAAC;YACX,MAAM;QAsCnB;;;WAGG;yCAFQ,OAAO,GACL,QAAQ;;;;QAsBrB;;;WAGG;2BAFQ,OAAO,eACP,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA2EtB,iDAAiD;;QASjD;;;WAGG;;QAcH;;;;;WAKG;;;;QAwEH,qCAAqC;kCAAvB,QAAQ,UAAU,CAAC;QAgCjC,+BAA+B;+BAAjB,OAAO,KAAK,CAAC;QAW3B;;;;;;;;;;;;WAYG;0BAFU,OAAO,KAAK,CAAC;QAY1B;;;;;;;;;;WAUG;6BAJU,OAAO,iBAAiB,EAAE,cAAc;;;;;;;;QA/nBrD;;;;;WAKG;QACH;;;WAGG;8BAFQ,cAAc;kBALd;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;kBACpD;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;;QA0B/D,mCAAmC;8BAAvB,UAAU;;;QAwBtB;;;;;WAKG;oCADQ,OAAO,KAAK,CAAC;QAUxB;;;;;;;;;WASG;gDALQ,cAAc,iBAEd,OAAO,KAAK,CAAC,iBACb,OAAO,KAAK,CAAC;QAiBxB,4BAA4B;qCAAhB,OAAO;;;QAqBnB;;;WAGG;qDAFQ,OAAO,KAAK,CAAC,gBACb,OAAO,KAAK,CAAC;QAWxB,oCAAoC;mCAAxB,WAAW;;;;;;;;QAevB,2CAA2C;;QA4B3C,4BAA4B;wBAAhB,OAAO;QAqEnB;;;;;;;;;;WAUG;6BAHQ,OAAO,KAAK,CAAC,cACb,OAAO,KAAK,CAAC,cACb,OAAO,KAAK,CAAC;;;;;;QAaxB;;;;;WAKG;uCAFQ,OAAO,GACL,MAAM;QAwDnB;;;;;;;;WAQG;4CAPQ,OAAO;kBA9TP;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;kBACpD;gBAAE,UAAU,EAAE,OAAO,KAAK,CAAC,CAAC;gBAAC,MAAM,EAAE,OAAO,KAAK,CAAC,CAAA;aAAE;8CA+TpD,WAAW,yBAAyB,CAAC;YAEV,iBAAiB,EAA5C,cAAc;YACY,aAAa,EAAvC,OAAO,KAAK,CAAC;YACX,MAAM;QAsCnB;;;WAGG;yCAFQ,OAAO,GACL,QAAQ;;;;QAsBrB;;;WAGG;2BAFQ,OAAO,eACP,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA2EtB,iDAAiD;;QASjD;;;WAGG;;QAcH;;;;;WAKG;;;;QAwEH,qCAAqC;kCAAvB,QAAQ,UAAU,CAAC;QAgCjC,+BAA+B;+BAAjB,OAAO,KAAK,CAAC;QAW3B;;;;;;;;;;;;WAYG;0BAFU,OAAO,KAAK,CAAC;QAY1B;;;;;;;;;;WAUG;6BAJU,OAAO,iBAAiB,EAAE,cAAc;;GAiB5D;6BA90Ba,OAAO,iBAAiB,EAAE,cAAc;yBA2CzC;;;;;;EAAM,MAAM,KAAK,YAAY,EAAE,UAAU,CAAC,CAAC;0BAW3C;;;;;;EAAM,MAAM,YAAY,CAAC;;;;;YAGxB,OAAO,KAAK,CAAC;;;;;kBACb;QAAE,IAAI,EAAE,OAAO,KAAK,CAAC,CAAC;QAAC,QAAQ,EAAE,KAAK,CAAA;KAAE;gBAExC,WAAW;;;wBAMX,MAAM,WAAW,OAAO,gBAAgB,EAAE,UAAU,CAAC;mCAClC,MAAM,KAAK,OAAO,KAAK,CAAC;wBAC3C,MAAM,KAAK;6BACJ,MAAM,KAAK,MAAM;kBACxB,MAAM,MAAM,KAAK,CAAC;qBAClB,eAAe;mBACN,MAAM,QAAQ,OAAO,KAAK,IAAI;2BACvC,MAAM,KAAK;mCAEX,OAAO,iBAAiB,EAAE,cAAc,iBAClC,OAAO,KAAK,CAAC,WACnB,OAAO,cACJ,UAAU,SACf,KAAK,KACT,IAAI;uBACE,MAAM,OAAO,mBAAmB,EAAE,oBAAoB;;6BAIvD,SAAS;IACrB,WAAe,EAAE,OAAO,CAAC;IACzB,OAAW,EAAE,YAAY,CAAC;IAC1B,WAAe,EAAE,WAAW,CAAC;IAC7B,SAAa,EAAE,OAAO,CAAC;CACpB,CAAC;;;;;2BAOQ;IACZ,gBAAoB,EAAE,KAAK,CAAC;IAC5B,KAAS,EAAE,UAAU,CAAC;IACtB,YAAgB,EAAE,OAAO,KAAK,CAAC,CAAC;IAChC,YAAgB,EACR,OAAO,6CAA6C,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GACjF,IAAI,CAAC;CACV;oBAwuBU,WAAW,WAAW,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC;mCAt1B9B,WAAW"}
package/src/vaultFactory/vault.js CHANGED
@@ -77,8 +77,8 @@ const validTransitions = {
77
77
  *
78
78
  * @typedef {object} VaultNotification
79
79
  * @property {Amount<'nat'>} locked Amount of Collateral locked
80
- * @property {{ debt: Amount<'nat'>; stabilityFee: Ratio }} debtSnapshot 'debt'
81
- * at the point the compounded stabilityFee was 'stabilityFee'
80
+ * @property {{ debt: Amount<'nat'>; interest: Ratio }} debtSnapshot 'debt' at
81
+ * the point the compounded interest was 'interest'
82
82
  * @property {HolderPhase} vaultState
83
83
  */
84
84
 
@@ -92,7 +92,7 @@ const validTransitions = {
92
92
  * @property {() => Brand<'nat'>} getDebtBrand
93
93
  * @property {MintAndTransfer} mintAndTransfer
94
94
  * @property {(amount: Amount, seat: ZCFSeat) => void} burn
95
- * @property {() => Ratio} getCompoundedStabilityFee
95
+ * @property {() => Ratio} getCompoundedInterest
96
96
  * @property {(
97
97
  * oldDebt: import('./storeUtils.js').NormalizedDebt,
98
98
  * oldCollateral: Amount<'nat'>,
@@ -117,7 +117,7 @@ const validTransitions = {
117
117
  * changed.
118
118
  *
119
119
  * @typedef {{
120
- * stabilityFeeSnapshot: Ratio;
120
+ * interestSnapshot: Ratio;
121
121
  * phase: VaultPhase;
122
122
  * debtSnapshot: Amount<'nat'>;
123
123
  * outerUpdater:
@@ -147,7 +147,7 @@ const VaultStateShape = harden({
147
147
  phase: M.any(),
148
148
  storageNode: M.any(),
149
149
  vaultSeat: M.any(),
150
- stabilityFeeSnapshot: M.any(),
150
+ interestSnapshot: M.any(),
151
151
  debtSnapshot: M.any(),
152
152
  });
153
153
 
@@ -189,7 +189,7 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
189
189
  vaultSeat: zcf.makeEmptySeatKit().zcfSeat,
190
190
 
191
191
  // Two values from the same moment
192
- stabilityFeeSnapshot: manager.getCompoundedStabilityFee(),
192
+ interestSnapshot: manager.getCompoundedInterest(),
193
193
  debtSnapshot: AmountMath.makeEmpty(manager.getDebtBrand()),
194
194
  });
195
195
  },
@@ -273,8 +273,7 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
273
273
 
274
274
  // update local state
275
275
  state.debtSnapshot = newDebt;
276
- state.stabilityFeeSnapshot =
277
- state.manager.getCompoundedStabilityFee();
276
+ state.interestSnapshot = state.manager.getCompoundedInterest();
278
277
  },
279
278
 
280
279
  /**
@@ -339,11 +338,10 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
339
338
  getStateSnapshot(newPhase) {
340
339
  const { state, facets } = this;
341
340
 
342
- const { debtSnapshot: debt, stabilityFeeSnapshot: stabilityFee } =
343
- state;
341
+ const { debtSnapshot: debt, interestSnapshot: interest } = state;
344
342
  /** @type {VaultNotification} */
345
343
  return harden({
346
- debtSnapshot: { debt, stabilityFee },
344
+ debtSnapshot: { debt, interest },
347
345
  locked: facets.self.getCollateralAmount(),
348
346
  // newPhase param is so that makeTransferInvitation can finish without setting the vault's phase
349
347
  // TODO refactor https://github.com/Agoric/agoric-sdk/issues/4415
@@ -788,7 +786,7 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
788
786
  helper.updateDebtSnapshot(self.getCurrentDebt());
789
787
  const {
790
788
  debtSnapshot: debt,
791
- stabilityFeeSnapshot: stabilityFee,
789
+ interestSnapshot: interest,
792
790
  phase,
793
791
  } = state;
794
792
  if (outerUpdater) {
@@ -798,7 +796,7 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
798
796
  state.outerUpdater = null;
799
797
  }
800
798
  const transferState = {
801
- debtSnapshot: { debt, stabilityFee },
799
+ debtSnapshot: { debt, interest },
802
800
  locked: self.getCollateralAmount(),
803
801
  vaultState: phase,
804
802
  };
@@ -839,8 +837,8 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
839
837
  const { state } = this;
840
838
  return calculateCurrentDebt(
841
839
  state.debtSnapshot,
842
- state.stabilityFeeSnapshot,
843
- state.manager.getCompoundedStabilityFee(),
840
+ state.interestSnapshot,
841
+ state.manager.getCompoundedInterest(),
844
842
  );
845
843
  },
846
844
 
@@ -858,10 +856,7 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
858
856
  getNormalizedDebt() {
859
857
  const { state } = this;
860
858
  // @ts-expect-error cast
861
- return reverseInterest(
862
- state.debtSnapshot,
863
- state.stabilityFeeSnapshot,
864
- );
859
+ return reverseInterest(state.debtSnapshot, state.interestSnapshot);
865
860
  },
866
861
  },
867
862
  },
package/src/vaultFactory/vaultDirector.d.ts CHANGED
@@ -63,7 +63,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
63
63
  /** @param {VaultFactoryParamPath} paramPath */
64
64
  get: (paramPath?: VaultFactoryParamPath) => import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
65
65
  DebtLimit: "amount";
66
- StabilityFee: "ratio";
66
+ InterestRate: "ratio";
67
67
  LiquidationPadding: "ratio";
68
68
  LiquidationMargin: "ratio";
69
69
  LiquidationPenalty: "ratio";
@@ -73,7 +73,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
73
73
  /** @param {VaultFactoryParamPath} paramPath */
74
74
  get: (paramPath?: VaultFactoryParamPath) => import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
75
75
  DebtLimit: "amount";
76
- StabilityFee: "ratio";
76
+ InterestRate: "ratio";
77
77
  LiquidationPadding: "ratio";
78
78
  LiquidationMargin: "ratio";
79
79
  LiquidationPenalty: "ratio";
@@ -124,7 +124,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
124
124
  getPublicFacet(): {
125
125
  makeVaultInvitation(): Promise<Invitation<R, A>>;
126
126
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
127
- getCompoundedStabilityFee(): Ratio;
127
+ getCompoundedInterest(): Ratio;
128
128
  getPublicTopics(): {
129
129
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
130
130
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
@@ -220,7 +220,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
220
220
  getPublicFacet(): {
221
221
  makeVaultInvitation(): Promise<Invitation<R, A>>;
222
222
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
223
- getCompoundedStabilityFee(): Ratio;
223
+ getCompoundedInterest(): Ratio;
224
224
  getPublicTopics(): {
225
225
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
226
226
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
@@ -274,7 +274,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
274
274
  getCollateralManager(brandIn: Brand): {
275
275
  makeVaultInvitation(): Promise<Invitation<R, A>>;
276
276
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
277
- getCompoundedStabilityFee(): Ratio;
277
+ getCompoundedInterest(): Ratio;
278
278
  getPublicTopics(): {
279
279
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
280
280
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
@@ -312,7 +312,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
312
312
  /** @param {VaultFactoryParamPath} paramPath */
313
313
  get: (paramPath?: VaultFactoryParamPath) => import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
314
314
  DebtLimit: "amount";
315
- StabilityFee: "ratio";
315
+ InterestRate: "ratio";
316
316
  LiquidationPadding: "ratio";
317
317
  LiquidationMargin: "ratio";
318
318
  LiquidationPenalty: "ratio";
@@ -322,7 +322,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
322
322
  /** @param {VaultFactoryParamPath} paramPath */
323
323
  get: (paramPath?: VaultFactoryParamPath) => import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
324
324
  DebtLimit: "amount";
325
- StabilityFee: "ratio";
325
+ InterestRate: "ratio";
326
326
  LiquidationPadding: "ratio";
327
327
  LiquidationMargin: "ratio";
328
328
  LiquidationPenalty: "ratio";
@@ -373,7 +373,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
373
373
  getPublicFacet(): {
374
374
  makeVaultInvitation(): Promise<Invitation<R, A>>;
375
375
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
376
- getCompoundedStabilityFee(): Ratio;
376
+ getCompoundedInterest(): Ratio;
377
377
  getPublicTopics(): {
378
378
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
379
379
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
@@ -469,7 +469,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
469
469
  getPublicFacet(): {
470
470
  makeVaultInvitation(): Promise<Invitation<R, A>>;
471
471
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
472
- getCompoundedStabilityFee(): Ratio;
472
+ getCompoundedInterest(): Ratio;
473
473
  getPublicTopics(): {
474
474
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
475
475
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
@@ -523,7 +523,7 @@ declare function prepareVaultDirector(baggage: MapStore<string, unknown>, zcf: i
523
523
  getCollateralManager(brandIn: Brand): {
524
524
  makeVaultInvitation(): Promise<Invitation<R, A>>;
525
525
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
526
- getCompoundedStabilityFee(): Ratio;
526
+ getCompoundedInterest(): Ratio;
527
527
  getPublicTopics(): {
528
528
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
529
529
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
package/src/vaultFactory/vaultFactory.d.ts CHANGED
@@ -20,7 +20,7 @@ export function prepare(zcf: VaultFactoryZCF, privateArgs: {
20
20
  getParamMgrRetriever: () => {
21
21
  get: (paramPath?: VaultFactoryParamPath) => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
22
22
  DebtLimit: "amount";
23
- StabilityFee: "ratio";
23
+ InterestRate: "ratio";
24
24
  LiquidationPadding: "ratio";
25
25
  LiquidationMargin: "ratio";
26
26
  LiquidationPenalty: "ratio";
@@ -29,7 +29,7 @@ export function prepare(zcf: VaultFactoryZCF, privateArgs: {
29
29
  } & import("@endo/eventual-send").RemotableBrand<{}, {
30
30
  get: (paramPath?: VaultFactoryParamPath) => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
31
31
  DebtLimit: "amount";
32
- StabilityFee: "ratio";
32
+ InterestRate: "ratio";
33
33
  LiquidationPadding: "ratio";
34
34
  LiquidationMargin: "ratio";
35
35
  LiquidationPenalty: "ratio";
@@ -74,7 +74,7 @@ export function prepare(zcf: VaultFactoryZCF, privateArgs: {
74
74
  getPublicFacet(): {
75
75
  makeVaultInvitation(): Promise<Invitation<R, A>>;
76
76
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
77
- getCompoundedStabilityFee(): Ratio;
77
+ getCompoundedInterest(): Ratio;
78
78
  getPublicTopics(): {
79
79
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
80
80
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
@@ -131,7 +131,7 @@ export function prepare(zcf: VaultFactoryZCF, privateArgs: {
131
131
  getCollateralManager(brandIn: Brand<AssetKind>): {
132
132
  makeVaultInvitation(): Promise<Invitation<R, A>>;
133
133
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
134
- getCompoundedStabilityFee(): Ratio;
134
+ getCompoundedInterest(): Ratio;
135
135
  getPublicTopics(): {
136
136
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").AssetState>;
137
137
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./vaultManager.js").MetricsNotification>;
package/src/vaultFactory/vaultManager.d.ts CHANGED
@@ -17,7 +17,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
17
17
  collateral: {
18
18
  makeVaultInvitation(): Promise<Invitation<R, A>>;
19
19
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
20
- getCompoundedStabilityFee(): Ratio;
20
+ getCompoundedInterest(): Ratio;
21
21
  getPublicTopics(): {
22
22
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
23
23
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<MetricsNotification>;
@@ -61,7 +61,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
61
61
  }>, totalCollateral: Amount<'nat'>): {
62
62
  plan: import("./proceeds.js").DistributionPlan;
63
63
  vaultsInPlan: {
64
- getVaultSeat(): ZCFSeat;
64
+ getVaultSeat(): ZCFSeat; /** @type {MetricsNotification} */
65
65
  initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
66
66
  publicSubscribers: {
67
67
  vault: {
@@ -104,16 +104,16 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
104
104
  */
105
105
  /**
106
106
  * @typedef {{
107
- * compoundedStabilityFee: Ratio;
108
- * stabilityFee: Ratio;
109
- * latestStabilityFeeUpdate: Timestamp;
107
+ * compoundedInterest: Ratio;
108
+ * interestRate: Ratio;
109
+ * latestInterestUpdate: Timestamp;
110
110
  * }} AssetState
111
111
  *
112
112
  * @typedef {{
113
113
  * getChargingPeriod: () => RelativeTime;
114
114
  * getRecordingPeriod: () => RelativeTime;
115
115
  * getDebtLimit: () => Amount<'nat'>;
116
- * getStabilityFee: () => Ratio;
116
+ * getInterestRate: () => Ratio;
117
117
  * getLiquidationPadding: () => Ratio;
118
118
  * getLiquidationMargin: () => Ratio;
119
119
  * getLiquidationPenalty: () => Ratio;
@@ -144,8 +144,8 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
144
144
  */
145
145
  /**
146
146
  * @typedef {{
147
- * compoundedStabilityFee: Ratio;
148
- * latestStabilityFeeUpdate: Timestamp;
147
+ * compoundedInterest: Ratio;
148
+ * latestInterestUpdate: Timestamp;
149
149
  * numLiquidationsCompleted: number;
150
150
  * numLiquidationsAborted: number;
151
151
  * totalCollateral: Amount<'nat'>;
@@ -247,7 +247,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
247
247
  */
248
248
  scopeDescription(base: string): string;
249
249
  /** coefficient on existing debt to calculate new debt */
250
- getCompoundedStabilityFee(): Ratio;
250
+ getCompoundedInterest(): Ratio;
251
251
  /**
252
252
  * Called by a vault when its balances change.
253
253
  *
@@ -306,16 +306,16 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
306
306
  */
307
307
  /**
308
308
  * @typedef {{
309
- * compoundedStabilityFee: Ratio;
310
- * stabilityFee: Ratio;
311
- * latestStabilityFeeUpdate: Timestamp;
309
+ * compoundedInterest: Ratio;
310
+ * interestRate: Ratio;
311
+ * latestInterestUpdate: Timestamp;
312
312
  * }} AssetState
313
313
  *
314
314
  * @typedef {{
315
315
  * getChargingPeriod: () => RelativeTime;
316
316
  * getRecordingPeriod: () => RelativeTime;
317
317
  * getDebtLimit: () => Amount<'nat'>;
318
- * getStabilityFee: () => Ratio;
318
+ * getInterestRate: () => Ratio;
319
319
  * getLiquidationPadding: () => Ratio;
320
320
  * getLiquidationMargin: () => Ratio;
321
321
  * getLiquidationPenalty: () => Ratio;
@@ -346,8 +346,8 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
346
346
  */
347
347
  /**
348
348
  * @typedef {{
349
- * compoundedStabilityFee: Ratio;
350
- * latestStabilityFeeUpdate: Timestamp;
349
+ * compoundedInterest: Ratio;
350
+ * latestInterestUpdate: Timestamp;
351
351
  * numLiquidationsCompleted: number;
352
352
  * numLiquidationsAborted: number;
353
353
  * totalCollateral: Amount<'nat'>;
@@ -394,7 +394,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
394
394
  getPublicFacet(): {
395
395
  makeVaultInvitation(): Promise<Invitation<R, A>>;
396
396
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
397
- getCompoundedStabilityFee(): Ratio;
397
+ getCompoundedInterest(): Ratio;
398
398
  getPublicTopics(): {
399
399
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
400
400
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<MetricsNotification>;
@@ -408,7 +408,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
408
408
  collateral: {
409
409
  makeVaultInvitation(): Promise<Invitation<R, A>>;
410
410
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
411
- getCompoundedStabilityFee(): Ratio;
411
+ getCompoundedInterest(): Ratio;
412
412
  getPublicTopics(): {
413
413
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
414
414
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<MetricsNotification>;
@@ -452,7 +452,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
452
452
  }>, totalCollateral: Amount<'nat'>): {
453
453
  plan: import("./proceeds.js").DistributionPlan;
454
454
  vaultsInPlan: {
455
- getVaultSeat(): ZCFSeat;
455
+ getVaultSeat(): ZCFSeat; /** @type {MetricsNotification} */
456
456
  initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
457
457
  publicSubscribers: {
458
458
  vault: {
@@ -495,16 +495,16 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
495
495
  */
496
496
  /**
497
497
  * @typedef {{
498
- * compoundedStabilityFee: Ratio;
499
- * stabilityFee: Ratio;
500
- * latestStabilityFeeUpdate: Timestamp;
498
+ * compoundedInterest: Ratio;
499
+ * interestRate: Ratio;
500
+ * latestInterestUpdate: Timestamp;
501
501
  * }} AssetState
502
502
  *
503
503
  * @typedef {{
504
504
  * getChargingPeriod: () => RelativeTime;
505
505
  * getRecordingPeriod: () => RelativeTime;
506
506
  * getDebtLimit: () => Amount<'nat'>;
507
- * getStabilityFee: () => Ratio;
507
+ * getInterestRate: () => Ratio;
508
508
  * getLiquidationPadding: () => Ratio;
509
509
  * getLiquidationMargin: () => Ratio;
510
510
  * getLiquidationPenalty: () => Ratio;
@@ -535,8 +535,8 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
535
535
  */
536
536
  /**
537
537
  * @typedef {{
538
- * compoundedStabilityFee: Ratio;
539
- * latestStabilityFeeUpdate: Timestamp;
538
+ * compoundedInterest: Ratio;
539
+ * latestInterestUpdate: Timestamp;
540
540
  * numLiquidationsCompleted: number;
541
541
  * numLiquidationsAborted: number;
542
542
  * totalCollateral: Amount<'nat'>;
@@ -638,7 +638,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
638
638
  */
639
639
  scopeDescription(base: string): string;
640
640
  /** coefficient on existing debt to calculate new debt */
641
- getCompoundedStabilityFee(): Ratio;
641
+ getCompoundedInterest(): Ratio;
642
642
  /**
643
643
  * Called by a vault when its balances change.
644
644
  *
@@ -697,16 +697,16 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
697
697
  */
698
698
  /**
699
699
  * @typedef {{
700
- * compoundedStabilityFee: Ratio;
701
- * stabilityFee: Ratio;
702
- * latestStabilityFeeUpdate: Timestamp;
700
+ * compoundedInterest: Ratio;
701
+ * interestRate: Ratio;
702
+ * latestInterestUpdate: Timestamp;
703
703
  * }} AssetState
704
704
  *
705
705
  * @typedef {{
706
706
  * getChargingPeriod: () => RelativeTime;
707
707
  * getRecordingPeriod: () => RelativeTime;
708
708
  * getDebtLimit: () => Amount<'nat'>;
709
- * getStabilityFee: () => Ratio;
709
+ * getInterestRate: () => Ratio;
710
710
  * getLiquidationPadding: () => Ratio;
711
711
  * getLiquidationMargin: () => Ratio;
712
712
  * getLiquidationPenalty: () => Ratio;
@@ -737,8 +737,8 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
737
737
  */
738
738
  /**
739
739
  * @typedef {{
740
- * compoundedStabilityFee: Ratio;
741
- * latestStabilityFeeUpdate: Timestamp;
740
+ * compoundedInterest: Ratio;
741
+ * latestInterestUpdate: Timestamp;
742
742
  * numLiquidationsCompleted: number;
743
743
  * numLiquidationsAborted: number;
744
744
  * totalCollateral: Amount<'nat'>;
@@ -785,7 +785,7 @@ export function prepareVaultManagerKit(baggage: MapStore<string, unknown>, { zcf
785
785
  getPublicFacet(): {
786
786
  makeVaultInvitation(): Promise<Invitation<R, A>>;
787
787
  getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
788
- getCompoundedStabilityFee(): Ratio;
788
+ getCompoundedInterest(): Ratio;
789
789
  getPublicTopics(): {
790
790
  asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
791
791
  metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<MetricsNotification>;
@@ -877,15 +877,15 @@ export type MetricsNotification = {
877
877
  numLiquidationsAborted: number;
878
878
  };
879
879
  export type AssetState = {
880
- compoundedStabilityFee: Ratio;
881
- stabilityFee: Ratio;
882
- latestStabilityFeeUpdate: Timestamp;
880
+ compoundedInterest: Ratio;
881
+ interestRate: Ratio;
882
+ latestInterestUpdate: Timestamp;
883
883
  };
884
884
  export type GovernedParamGetters = {
885
885
  getChargingPeriod: () => RelativeTime;
886
886
  getRecordingPeriod: () => RelativeTime;
887
887
  getDebtLimit: () => Amount<'nat'>;
888
- getStabilityFee: () => Ratio;
888
+ getInterestRate: () => Ratio;
889
889
  getLiquidationPadding: () => Ratio;
890
890
  getLiquidationMargin: () => Ratio;
891
891
  getLiquidationPenalty: () => Ratio;
@@ -910,8 +910,8 @@ export type ImmutableState = {
910
910
  unsettledVaults: MapStore<string, Vault>;
911
911
  };
912
912
  export type MutableState = {
913
- compoundedStabilityFee: Ratio;
914
- latestStabilityFeeUpdate: Timestamp;
913
+ compoundedInterest: Ratio;
914
+ latestInterestUpdate: Timestamp;
915
915
  numLiquidationsCompleted: number;
916
916
  numLiquidationsAborted: number;
917
917
  totalCollateral: Amount<'nat'>;
package/src/vaultFactory/vaultManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vaultManager.d.ts","sourceRoot":"","sources":["vaultManager.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vaultManager.d.ts","sourceRoot":"","sources":["vaultManager.js"],"names":[],"mappings":"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"}