fixup! feat: liquidity pool borrower and repayer facets

Author: 0xpatrickdev

packages/fast-usdc/src/exos/liquidity-pool.js

@@ -150,14 +150,14 @@ export const prepareLiquidityPoolKit = (zone, { zcf, usdc, tools }) => {
         },
         /**
          * @param {ZCFSeat} assetManagerSeat
-         * @param {{ USDC: Amount<'nat'>}} amounts
+         * @param {{ USDC: Amount<'nat'>}} amountKWR
          */
-        borrow(assetManagerSeat, amounts) {
+        borrow(assetManagerSeat, amountKWR) {
           const { outstandingLends, poolSeat, poolStats } = this.state;
           const available = poolSeat.getAmountAllocated('USDC', usdc.brand);
           // Validate amount is available in pool
           const post = borrowCalc(
-            amounts.USDC,
+            amountKWR.USDC,
             available,
             outstandingLends,
             poolStats,
@@ -166,7 +166,7 @@ export const prepareLiquidityPoolKit = (zone, { zcf, usdc, tools }) => {
           // COMMIT POINT
           try {
             zcf.atomicRearrange(
-              harden([[poolSeat, assetManagerSeat, amounts]]),
+              harden([[poolSeat, assetManagerSeat, amountKWR]]),
             );
           } catch (cause) {
             const reason = Error('🚨 cannot commit borrow', { cause });
@@ -177,7 +177,7 @@ export const prepareLiquidityPoolKit = (zone, { zcf, usdc, tools }) => {
           Object.assign(this.state, post);
           this.facets.external.publishPoolMetrics();
         },
-        // TODO repay failed `LOA.deposit()`
+        // TODO method to repay failed `LOA.deposit()`
       },
       repayer: {
         /**

packages/fast-usdc/src/pool-share-math.js

@@ -11,6 +11,7 @@ const { getValue, add, isEmpty, isGTE, subtract } = AmountMath;
 
 /**
  * @import {PoolStats} from './types';
+ * @import {RepayAmountKWR} from './exos/liquidity-pool';
  */
 
 /**
@@ -152,7 +153,7 @@ export const borrowCalc = (
 
 /**
  * @param {ShareWorth} shareWorth
- * @param {{ Principal: Amount<'nat'>; PoolFee: Amount<'nat'>; ContractFee: Amount<'nat'> }} amounts
+ * @param {RepayAmountKWR} amounts
  * @param {Amount<'nat'>} outstandingLends
  * @param {PoolStats} poolStats
  */

packages/fast-usdc/test/fast-usdc.contract.test.ts

@@ -15,6 +15,7 @@ import { MockCctpTxEvidences } from './fixtures.js';
 import { commonSetup } from './supports.js';
 import { makeFeeTools } from '../src/utils/fees.js';
 import { makeTestFeeConfig } from './mocks.js';
+import type { RepayPaymentKWR } from '../src/exos/liquidity-pool.js';
 
 const dirname = path.dirname(new URL(import.meta.url).pathname);
 
@@ -238,8 +239,7 @@ test('LP deposits, earns fees, withdraws', async t => {
     }
     const remaining = await E(creatorFacet).testRepay(
       splits,
-      // @ts-expect-error TODO narrow PaymentKWR keys
-      repayPayments,
+      repayPayments as RepayPaymentKWR,
     );
     for (const r of Object.values(remaining)) {
       t.is(r.value, 0n, 'testRepay consumes all payments');