@moonwell-fi/moonwell-sdk 0.19.1 → 0.20.1

package/actions/morpho/markets/common.ts

@@ -603,13 +603,13 @@ async function getMorphoMarketRewards(
                 maxIn
                 maxOut
                 market {
-                  uniqueKey
+                  marketId
                 }
               }
             }
           }
-          allocationMarket {
-            uniqueKey
+          allocationMarket: withdrawMarket {
+            marketId
             loanAsset {
               address
             }
@@ -640,11 +640,9 @@ async function getMorphoMarketRewards(
             }
             supplyApr
             borrowApr
-            amountPerBorrowedToken
-            amountPerSuppliedToken
           }
         }
-        uniqueKey
+        marketId
       }
     }
   } `;
@@ -657,7 +655,7 @@ async function getMorphoMarketRewards(
             id: number;
           };
         };
-        uniqueKey: string;
+        marketId: string;
         reallocatableLiquidityAssets: string;
         publicAllocatorSharedLiquidity: {
           assets: string;
@@ -668,7 +666,7 @@ async function getMorphoMarketRewards(
               fee: number;
               flowCaps: {
                 market: {
-                  uniqueKey: string;
+                  marketId: string;
                 };
                 maxIn: number;
                 maxOut: number;
@@ -676,7 +674,7 @@ async function getMorphoMarketRewards(
             };
           };
           allocationMarket: {
-            uniqueKey: string;
+            marketId: string;
             loanAsset: {
               address: string;
             };
@@ -706,9 +704,7 @@ async function getMorphoMarketRewards(
               name: string;
             };
             supplyApr: number;
-            amountPerSuppliedToken: string;
             borrowApr: number;
-            amountPerBorrowedToken: string;
           }[];
         };
       }[];
@@ -720,7 +716,7 @@ async function getMorphoMarketRewards(
       const loanAssetDecimals = item.loanAsset.decimals;
       const mapping: GetMorphoMarketsRewardsReturnType = {
         chainId: item.morphoBlue.chain.id,
-        marketId: item.uniqueKey,
+        marketId: item.marketId,
         reallocatableLiquidityAssets: new Amount(
           BigInt(item.reallocatableLiquidityAssets),
           loanAssetDecimals,
@@ -742,31 +738,43 @@ async function getMorphoMarketRewards(
             vault: {
               address: item.vault.address,
               name: item.vault.name,
-              publicAllocatorConfig: item.vault.publicAllocatorConfig,
+              // The Morpho API renamed Market.uniqueKey to marketId; map it
+              // back to keep the SDK's public types unchanged.
+              publicAllocatorConfig: {
+                fee: item.vault.publicAllocatorConfig.fee,
+                flowCaps: item.vault.publicAllocatorConfig.flowCaps.map(
+                  (flowCap) => ({
+                    market: { uniqueKey: flowCap.market.marketId },
+                    maxIn: flowCap.maxIn,
+                    maxOut: flowCap.maxOut,
+                  }),
+                ),
+              },
+            },
+            allocationMarket: {
+              uniqueKey: item.allocationMarket.marketId,
+              loanAsset: item.allocationMarket.loanAsset,
+              ...(item.allocationMarket.collateralAsset
+                ? { collateralAsset: item.allocationMarket.collateralAsset }
+                : {}),
+              oracleAddress: item.allocationMarket.oracleAddress,
+              irmAddress: item.allocationMarket.irmAddress,
+              lltv: item.allocationMarket.lltv,
             },
-            allocationMarket: item.allocationMarket,
           }),
         ),
         rewards: item.state?.rewards.map((reward) => {
-          const tokenDecimals = 10 ** reward.asset.decimals;
-
           //Supply APR is used only for vaults, zeroing it for now to avoid confusion
-          //const tokenAmountPer1000 = ((parseFloat(reward.amountPerSuppliedToken) / item.loanAsset.priceUsd) * 1000) || "0"
-          //const amount = (Number(tokenAmountPer1000) / tokenDecimals)
-
-          const borrowTokenAmountPer1000 =
-            (Number.parseFloat(reward.amountPerBorrowedToken) /
-              item.loanAsset.priceUsd) *
-            1000;
-
-          const borrowAmount = borrowTokenAmountPer1000 / tokenDecimals;
+          // Morpho removed the per-token amount fields from the API
+          // (MarketStateReward.amountPerBorrowedToken et al.), so reward
+          // amounts can no longer be computed and are reported as 0.
           return {
-            marketId: item.uniqueKey,
+            marketId: item.marketId,
             asset: reward.asset,
             supplyApr: 0, //(reward.supplyApr || 0) * 100,
-            supplyAmount: 0, //amount,
+            supplyAmount: 0,
             borrowApr: (reward.borrowApr || 0) * 100 * -1,
-            borrowAmount: borrowAmount,
+            borrowAmount: 0,
           };
         }),
       };

package/actions/morpho/utils/graphql.ts

@@ -20,20 +20,16 @@ export async function getGraphQL<T>(
 
     const json = await response.json();
     if (response.status !== 200 || json.errors) {
-      if (typeof window !== "undefined") {
-        console.debug(
-          `[Morpho GraphQL] Non-200 (${response.statusText}) or errors:`,
-          json.errors,
-        );
-      }
+      console.error(
+        `[Morpho GraphQL] Non-200 (${response.statusText}) or errors:`,
+        JSON.stringify(json.errors),
+      );
       return undefined;
     }
 
     return json.data as T;
   } catch (error) {
-    if (typeof window !== "undefined") {
-      console.debug("[Morpho GraphQL] Error fetching data:", error);
-    }
+    console.error("[Morpho GraphQL] Error fetching data:", error);
     return undefined;
   }
 }
@@ -94,20 +90,16 @@ export async function getVaultV2Apy(
 
     const json = await response.json();
     if (response.status !== 200 || json.errors) {
-      if (typeof window !== "undefined") {
-        console.debug(
-          `[Morpho V2 APY] Non-200 (${response.statusText}) or errors:`,
-          json.errors,
-        );
-      }
+      console.error(
+        `[Morpho V2 APY] Non-200 (${response.statusText}) or errors:`,
+        JSON.stringify(json.errors),
+      );
       return undefined;
     }
 
     return json.data?.vaultV2ByAddress as MorphoVaultV2ApyResponse | undefined;
   } catch (error) {
-    if (typeof window !== "undefined") {
-      console.debug("[Morpho V2 APY] Error fetching data:", error);
-    }
+    console.error("[Morpho V2 APY] Error fetching data:", error);
     return undefined;
   }
 }

package/actions/morpho/vaults/common.ts

@@ -1372,11 +1372,8 @@ export async function getMorphoVaultsRewards(
         }
         id
         address
-        asset {
-          priceUsd
-        }
         state {
-          rewards {
+          allRewards {
             asset {
               address
               symbol
@@ -1387,7 +1384,6 @@ export async function getMorphoVaultsRewards(
               }
             }
             supplyApr
-            amountPerSuppliedToken
           }
         }
       }
@@ -1405,10 +1401,7 @@ export async function getMorphoVaultsRewards(
               id
             }
           }
-          uniqueKey
-          loanAsset {
-            priceUsd
-          }
+          marketId
           state {
             rewards {
               asset {
@@ -1421,7 +1414,6 @@ export async function getMorphoVaultsRewards(
                 }
               }
               supplyApr
-              amountPerSuppliedToken
             }
           }
         }
@@ -1437,11 +1429,8 @@ export async function getMorphoVaultsRewards(
         };
         id: string;
         address: Address;
-        asset: {
-          priceUsd: number;
-        };
         state: {
-          rewards: {
+          allRewards: {
             asset: {
               address: Address;
               symbol: string;
@@ -1452,7 +1441,6 @@ export async function getMorphoVaultsRewards(
               };
             };
             supplyApr: number;
-            amountPerSuppliedToken: string;
           }[];
         };
       }[];
@@ -1468,10 +1456,7 @@ export async function getMorphoVaultsRewards(
               id: number;
             };
           };
-          uniqueKey: string;
-          loanAsset: {
-            priceUsd: number;
-          };
+          marketId: string;
           state: {
             rewards: {
               asset: {
@@ -1484,7 +1469,6 @@ export async function getMorphoVaultsRewards(
                 };
               };
               supplyApr: number;
-              amountPerSuppliedToken: string;
             }[];
           };
         };
@@ -1494,22 +1478,18 @@ export async function getMorphoVaultsRewards(
 
   if (result) {
     try {
+      // Morpho removed the per-supplied-token amount fields from the API
+      // (VaultStateReward.amountPerSuppliedToken et al.), so reward amounts
+      // can no longer be computed and are reported as 0.
       const marketsRewards = result.marketPositions.items.flatMap((item) => {
         const rewards = (item.market.state?.rewards || []).map((reward) => {
-          const tokenAmountPer1000 =
-            (Number.parseFloat(reward.amountPerSuppliedToken) /
-              item.market.loanAsset.priceUsd) *
-            1000;
-          const tokenDecimals = 10 ** reward.asset.decimals;
-          const amount = Number(tokenAmountPer1000) / tokenDecimals;
-
           return {
             chainId: reward.asset.chain.id,
             vaultId: item.user.address,
-            marketId: item.market.uniqueKey,
+            marketId: item.market.marketId,
             asset: reward.asset,
             supplyApr: (reward.supplyApr || 0) * 100,
-            supplyAmount: amount,
+            supplyAmount: 0,
             borrowApr: 0,
             borrowAmount: 0,
           };
@@ -1518,21 +1498,14 @@ export async function getMorphoVaultsRewards(
       });
 
       const vaultsRewards = result.vaults.items.flatMap((item) => {
-        return (item.state?.rewards || []).map((reward) => {
-          const tokenAmountPer1000 =
-            (Number.parseFloat(reward.amountPerSuppliedToken) /
-              item.asset.priceUsd) *
-            1000;
-          const tokenDecimals = 10 ** reward.asset.decimals;
-          const amount = Number(tokenAmountPer1000) / tokenDecimals;
-
+        return (item.state?.allRewards || []).map((reward) => {
           return {
             chainId: reward.asset.chain.id,
             vaultId: item.address,
             marketId: undefined,
             asset: reward.asset,
             supplyApr: (reward.supplyApr || 0) * 100,
-            supplyAmount: amount,
+            supplyAmount: 0,
             borrowApr: 0,
             borrowAmount: 0,
           };

package/common/getBlockNumberAtTimestamp.ts

@@ -1,18 +1,34 @@
 import type { PublicClient } from "viem";
 
 /**
- * Safety cap on interpolation iterations. With near-linear `ts(block)` the search
- * converges in ~3–5 reads; 8 leaves headroom for chains with variable block times
- * (e.g. Moonbeam) without unbounded RPC fan-out on pathological inputs.
+ * Cap on interpolation iterations before falling back to binary search. With
+ * near-linear `ts(block)` the interpolation phase converges in ~3–5 reads.
+ * On chains whose block time changed over their history the projection can
+ * fail to converge at all — see the binary completion phase below.
  */
-const MAX_ITERATIONS = 8;
+const MAX_INTERPOLATION_ITERATIONS = 8;
 
 /**
  * Find the block number on a chain whose timestamp is the latest one ≤ the target unix timestamp.
  *
- * Uses interpolation search anchored on the latest block and block 1: each iteration
- * narrows the range by reading one block and projecting the target via the slope of the
- * remaining range. Converges in ~3–5 RPC calls even on chains with variable block times.
+ * Two phases:
+ *
+ * 1. Interpolation search anchored on the latest block and block 1: each iteration
+ *    narrows the range by reading one block and projecting the target via the slope
+ *    of the remaining range. Converges in ~3–5 RPC calls on chains with a roughly
+ *    constant block time.
+ * 2. Binary-search completion: if interpolation hasn't converged after
+ *    `MAX_INTERPOLATION_ITERATIONS`, finish with plain bisection — guaranteed
+ *    convergence in ~log2(remaining range) reads.
+ *
+ * The completion phase is load-bearing, not defensive: on Moonbeam the block time
+ * changed ~12s → ~6s (async backing), so the interpolated projection — whose slope
+ * is the all-history average — lands after the target on every probe. Only the
+ * upper bound moves, the lower bound never leaves block 1, and the previous
+ * implementation silently returned that unconverged bound. Voting-power reads then
+ * executed against a block years before the views contract existed and reverted
+ * (governance proposal 171 incident, June 2026). An unconverged bound must never
+ * be returned.
  *
  * Assumes block 1 exists on the chain — true for every EVM chain Moonwell supports.
  *
@@ -30,12 +46,13 @@ export async function getBlockNumberAtTimestamp(
   const first = await publicClient.getBlock({ blockNumber: 1n });
   if (targetTimestamp <= first.timestamp) return first.number;
 
+  // Invariant throughout: ts(lo) <= targetTimestamp < ts(hi).
   let lo = first.number;
   let loTs = first.timestamp;
   let hi = latest.number;
   let hiTs = latest.timestamp;
 
-  for (let i = 0; i < MAX_ITERATIONS; i += 1) {
+  for (let i = 0; i < MAX_INTERPOLATION_ITERATIONS; i += 1) {
     if (hi - lo <= 1n) break;
     const tsRange = hiTs - loTs;
     if (tsRange <= 0n) break;
@@ -55,5 +72,16 @@ export async function getBlockNumberAtTimestamp(
     }
   }
 
+  // Binary completion: never return an unconverged bound.
+  while (hi - lo > 1n) {
+    const mid = (lo + hi) / 2n;
+    const block = await publicClient.getBlock({ blockNumber: mid });
+    if (block.timestamp <= targetTimestamp) {
+      lo = mid;
+    } else {
+      hi = mid;
+    }
+  }
+
   return lo;
 }

package/errors/version.ts

@@ -1 +1 @@
-export const version = '0.19.1'
+export const version = '0.20.1'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonwell-fi/moonwell-sdk",
   "description": "TypeScript Interface for Moonwell",
-  "version": "0.19.1",
+  "version": "0.20.1",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",