#35 Fixed liquidation not triggering after there's a closed loan, #34 …

…Cleaned up code space
anilhelvaci · Sep 22, 2022 · e6c4ff4 · e6c4ff4
1 parent eb4b197
commit e6c4ff4
Show file tree

Hide file tree

Showing 34 changed files with 219 additions and 1,132 deletions.
diff --git a/.github/workflows/deploy-treasury.yml b/.github/workflows/deploy-treasury.yml
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
diff --git a/api/setVanPrice.js b/api/setVanPrice.js
@@ -8,7 +8,7 @@ const setVanPrice = async homeP => {
   const home = await homeP;
   const { scratch, board } = home;
 
-  const NEW_PRICE_VAL = 300n;
+  const NEW_PRICE_VAL = 100n;
 
   const {
     VAN_ISSUER_BOARD_ID,

diff --git a/contract/src/lendingPool/liquidationObserver.js b/contract/src/lendingPool/liquidationObserver.js
@@ -120,10 +120,10 @@ export const makeLiquidationObserver = (
       }
     },
     fail: reason => {
-
+      console.log(`ColPriceObserver failed with the reason ${reason}`);
     },
     finish: done => {
-
+      console.log(`ColPriceObserver finished with ${done}`);
     },
   };
 
@@ -135,15 +135,17 @@ export const makeLiquidationObserver = (
       }
     },
     fail: reason => {
-
+      console.log(`DebtPriceObserver failed with the reason ${reason}`);
     },
     finish: done => {
-
+      console.log(`DebtPriceObserver finished with ${done}`);
     },
   };
 
-  observeNotifier(wrappedCollateralPriceAuthority.notifier, colPriceObserver);
-  observeNotifier(wrappedDebtPriceAuthority.notifier, debtPriceObserver);
+  observeNotifier(wrappedCollateralPriceAuthority.notifier, colPriceObserver)
+    .catch(err => console.log(`Error observing colPriceObserver: ${err}`));
+  observeNotifier(wrappedDebtPriceAuthority.notifier, debtPriceObserver)
+    .catch(err => console.log(`Error observing debtPriceObserver: ${err}`));
 
   /**
    * Called from the debtsPerCollateral when there's a new loan with a closer

diff --git a/contract/src/lendingPool/loan.js b/contract/src/lendingPool/loan.js
@@ -684,6 +684,7 @@ export const makeInnerLoan = (
   /** @type Loan */
   const innerLoan = Far('innerLoan', {
     getLoanSeat: () => state.loanSeat,
+    getPhase: () => state.phase,
     initLoanKit: (seat, poolSeat, exchangeRate, loanKey) => initLoanKit(seat, poolSeat, innerLoan, exchangeRate, loanKey),
     liquidating,
     liquidated,

diff --git a/contract/src/lendingPool/loanStoreUtils.js b/contract/src/lendingPool/loanStoreUtils.js
@@ -2,6 +2,7 @@ import { keyEQ, keyLT } from '@agoric/store';
 import { AmountMath } from '@agoric/ertp';
 import { toVaultKey } from '@agoric/run-protocol/src/vaultFactory/storeUtils.js';
 import { makeOrderedVaultStore } from '@agoric/run-protocol/src/vaultFactory/orderedVaultStore.js';
+import { LoanPhase } from './loan.js'
 
 /**
  * This module is somehow similar to the ~/run-protocol/vaultFactory/prioritizedVaults.js.
@@ -107,7 +108,7 @@ export const makeLoanStoreUtils = () => {
    */
   const refreshLoanPriorityByAttributes = (oldDebt, oldCollateral, loanId) => {
     const loan = removeLoanByAttributes(oldDebt, oldCollateral, loanId);
-    addLoan(loanId, loan);
+    return addIfActive(loanId, loan);
   };
 
   /**
@@ -118,9 +119,14 @@ export const makeLoanStoreUtils = () => {
    */
   const refreshLoanPriorityByKey = (key, loanId) => {
     const loan = removeLoan(key);
-    return addLoan(loanId, loan);
+    return addIfActive(loanId, loan);
   }
 
+  const addIfActive = (loanId, loan) => {
+    if (loan.getPhase() !== LoanPhase.ACTIVE) return 'Not exist';
+    return addLoan(loanId, loan);
+  };
+
   return harden({
     addLoan,
     refreshLoanPriorityByAttributes,

diff --git a/contract/src/lendingPool/types.js b/contract/src/lendingPool/types.js
@@ -170,6 +170,7 @@
  * @typedef {Object} Loan
 
  * @property {() => ZCFSeat} getLoanSeat
+ * @property {() => string} getPhase
  * @property {() => void} liquidating
  * @property {(amount: Amount<'nat'>) => void} liquidated
  * @property {(seat: ZCFSeat, poolSeat: ZCFSeat, exchangeRate: Ratio, loanKey: string) => Promise<LoanKit>} initLoanKit