price() and poolPrice() fixes

src/PartyPool.sol

@@ -94,6 +94,7 @@ contract PartyPool is PartyPoolBase, OwnableExternal, ERC20External, IPartyPool
     /// @inheritdoc IPartyPool
     function denominators() external view returns (uint256[] memory) { return _bases; }
 
+    /// @inheritdoc IPartyPool
     function LMSR() external view returns (LMSRStabilized.State memory) { return _lmsr; }
 
 
@@ -430,7 +431,7 @@ contract PartyPool is PartyPoolBase, OwnableExternal, ERC20External, IPartyPool
         );
 
         bytes memory result = Address.functionDelegateCall(address(MINT_IMPL), data);
-        return abi.decode(result, (uint256,uint256 ));
+        return abi.decode(result, (uint256,uint256));
     }
 
 

src/PartyPoolMintImpl.sol

@@ -139,13 +139,13 @@ contract PartyPoolMintImpl is PartyPoolBase {
         return actualLpToMint;
     }
 
-    /// @notice Burn LP _tokens and withdraw the proportional basket to receiver. Functional even if the pool has been
-    /// killed.
-    /// @dev Payer must own or approve the LP _tokens being burned. The function updates LMSR state
+    /// @notice Burn LP tokens and withdraw the proportional basket to receiver. Functional even if the pool
+    /// has been killed.
+    /// @dev Payer must own or approve the LP tokens being burned. The function updates LMSR state
     ///      proportionally to reflect the reduced pool size after the withdrawal.
-    /// @param payer address that provides the LP _tokens to burn
-    /// @param receiver address that receives the withdrawn _tokens
-    /// @param lpAmount amount of LP _tokens to burn (proportional withdrawal)
+    /// @param payer address that provides the LP tokens to burn
+    /// @param receiver address that receives the withdrawn tokens
+    /// @param lpAmount amount of LP tokens to burn (proportional withdrawal)
     /// @param deadline timestamp after which the transaction will revert. Pass 0 to ignore.
     /// @param unwrap if true and the native token is being withdrawn, it is unwraped and sent as native currency
     function burn(address payer, address receiver, uint256 lpAmount, uint256 deadline, bool unwrap) external nonReentrant

src/PartyPoolViewer.sol

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.30;
 
+import "forge-std/console2.sol";
 import {ABDKMath64x64} from "../lib/abdk-libraries-solidity/ABDKMath64x64.sol";
 import {IERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import {IPartyPool} from "./IPartyPool.sol";
+import {IPartyPoolViewer} from "./IPartyPoolViewer.sol";
 import {LMSRStabilized} from "./LMSRStabilized.sol";
 import {PartyPoolHelpers} from "./PartyPoolHelpers.sol";
 import {PartyPoolMintImpl} from "./PartyPoolMintImpl.sol";
 import {PartyPoolSwapImpl} from "./PartyPoolSwapImpl.sol";
-import {IPartyPoolViewer} from "./IPartyPoolViewer.sol";
 
 contract PartyPoolViewer is PartyPoolHelpers, IPartyPoolViewer {
     using ABDKMath64x64 for int128;
@@ -36,7 +37,11 @@ contract PartyPoolViewer is PartyPoolHelpers, IPartyPoolViewer {
         uint256 nAssets = lmsr.qInternal.length;
         require(nAssets > 0, "price: uninit");
         require(baseTokenIndex < nAssets && quoteTokenIndex < nAssets, "price: idx");
-        return LMSRStabilized.price(pool.kappa(), lmsr.qInternal, baseTokenIndex, quoteTokenIndex);
+        int128 internalPrice = LMSRStabilized.price(pool.kappa(), lmsr.qInternal, baseTokenIndex, quoteTokenIndex);
+        // Convert to external units
+        uint256 bd = pool.denominators()[baseTokenIndex];
+        uint256 qd = pool.denominators()[quoteTokenIndex];
+        return internalPrice.mul(ABDKMath64x64.divu(bd, qd));
     }
 
     /// @notice Price of one LP token denominated in `quote` as Q64.64.
@@ -52,22 +57,7 @@ contract PartyPoolViewer is PartyPoolHelpers, IPartyPoolViewer {
         require(quoteTokenIndex < nAssets, "poolPrice: idx");
 
         // price per unit of qTotal (Q64.64) from LMSR
-        int128 pricePerQ = LMSRStabilized.poolPrice( pool.kappa(), lmsr.qInternal, quoteTokenIndex);
-
-        // total internal q (qTotal) as Q64.64
-        int128 qTotal = LMSRStabilized._computeSizeMetric(lmsr.qInternal);
-        require(qTotal > int128(0), "poolPrice: qTotal zero");
-
-        // totalSupply as Q64.64
-        uint256 supply = pool.totalSupply();
-        require(supply > 0, "poolPrice: zero supply");
-        int128 supplyQ64 = ABDKMath64x64.fromUInt(supply);
-
-        // factor = totalSupply / qTotal (Q64.64)
-        int128 factor = supplyQ64.div(qTotal);
-
-        // price per LP token = pricePerQ * factor (Q64.64)
-        return pricePerQ.mul(factor);
+        return LMSRStabilized.poolPrice( pool.kappa(), lmsr.qInternal, quoteTokenIndex);
     }
 
 
@@ -171,11 +161,9 @@ contract PartyPoolViewer is PartyPoolHelpers, IPartyPoolViewer {
         return IERC20(token).balanceOf(address(pool));
     }
 
-    /**
-     * @dev The fee to be charged for a given loan.
-     * @param amount The amount of _tokens lent.
-     * @return fee The amount of `token` to be charged for the loan, on top of the returned principal.
-     */
+    /// @dev The fee to be charged for a given loan.
+    /// @param amount The amount of _tokens lent.
+    /// @return fee The amount of `token` to be charged for the loan, on top of the returned principal.
     function flashFee(
         IPartyPool pool,
         address /*token*/,