feat: liquidate loan, settle auction and lockup seconds

gondixyz · Feb 23, 2024 · a3934a4 · a3934a4
1 parent f1312cc
commit a3934a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/contracts/MslV6.ts b/src/contracts/MslV6.ts
@@ -489,6 +489,7 @@ export class MslV6 extends BaseContract<typeof multiSourceLoanAbiV6> {
 
   async liquidateLoan({ loan, loanId }: { loan: LoanV6; loanId: bigint }) {
     const txHash = await this.safeContractWrite.liquidateLoan([loanId, loan]);
+    // TODO: Check with examples if events from other contracts are included in the receipt
     return {
       txHash,
       waitTxInBlock: async () => await this.bcClient.waitForTransactionReceipt({ hash: txHash }),

diff --git a/src/gondi.ts b/src/gondi.ts
@@ -429,7 +429,7 @@ export class Gondi {
 
   async getRemainingLockupSeconds({ loan }: { loan: Loan }) {
     return this.contracts.Msl(loan.contractAddress).getRemainingLockupSeconds({
-      loan,
+      loan: loanToMslLoan(loan),
     });
   }
 
@@ -572,10 +572,9 @@ export class Gondi {
   }
 
   async liquidateLoan({ loan, loanId }: { loan: Loan; loanId: bigint }) {
-    return this.contracts.Msl(loan.contractAddress).liquidateLoan({
-      loan,
-      loanId,
-    });
+    return this.contracts
+      .Msl(loan.contractAddress)
+      .liquidateLoan({ loanId, loan: loanToMslLoan(loan) });
   }
 
   async placeBid({
@@ -595,7 +594,9 @@ export class Gondi {
   }
 
   async settleAuction({ loan, auction }: { loan: Loan; auction: model.Auction }) {
-    return this.contracts.All(auction.loanAddress).settleAuction({ loan, auction });
+    return this.contracts
+      .All(auction.loanAddress)
+      .settleAuction({ auction, loan: loanToMslLoan(loan) });
   }
 
   async buy(