@moonwell-fi/moonwell-sdk 0.3.2 → 0.4.0

package/actions/morpho/user-rewards/common.ts

@@ -14,10 +14,7 @@ export async function getUserMorphoRewardsData(params: {
     params.account,
   );
 
-  const assets = await getMorphoAssetsData(
-    params.environment.chainId,
-    rewards.map((r) => r.asset.address),
-  );
+  const assets = await getMorphoAssetsData(rewards.map((r) => r.asset.address));
 
   const result: (MorphoUserReward | undefined)[] = rewards.map((r) => {
     const asset = assets.find(
@@ -51,8 +48,8 @@ export async function getUserMorphoRewardsData(params: {
 
         const uniformReward: MorphoUserReward = {
           type: "uniform-reward",
-          chainId: r.program.chain_id,
-          account: r.accountId,
+          chainId: r.asset.chain_id,
+          account: r.user,
           rewardToken,
           claimableNow,
           claimableNowUsd,
@@ -63,6 +60,19 @@ export async function getUserMorphoRewardsData(params: {
       }
 
       case "market-reward": {
+        const claimableNow = new Amount(
+          BigInt(r.for_supply?.claimable_now || 0),
+          rewardToken.decimals,
+        );
+        const claimableNowUsd = claimableNow.value * (asset.priceUsd || 0);
+
+        const claimableFuture = new Amount(
+          BigInt(r.for_supply?.claimable_next || 0),
+          rewardToken.decimals,
+        );
+        const claimableFutureUsd =
+          claimableFuture.value * (asset.priceUsd || 0);
+
         const collateralClaimableNow = new Amount(
           BigInt(r.for_collateral?.claimable_now || 0),
           rewardToken.decimals,
@@ -89,26 +99,42 @@ export async function getUserMorphoRewardsData(params: {
         const borrowClaimableFutureUsd =
           borrowClaimableFuture.value * (asset.priceUsd || 0);
 
-        const marketReward: MorphoUserReward = {
-          type: "market-reward",
-          chainId: r.program.chain_id,
-          account: r.accountId,
-          marketId: r.program.market_id || "",
-          rewardToken,
-          collateralRewards: {
-            claimableNow: collateralClaimableNow,
-            claimableNowUsd: collateralClaimableNowUsd,
-            claimableFuture: collateralClaimableFuture,
-            claimableFutureUsd: collateralClaimableFutureUsd,
-          },
-          borrowRewards: {
-            claimableNow: borrowClaimableNow,
-            claimableNowUsd: borrowClaimableNowUsd,
-            claimableFuture: borrowClaimableFuture,
-            claimableFutureUsd: borrowClaimableFutureUsd,
-          },
-        };
-        return marketReward;
+        //Rewards reallocated to vaults are reported as vault rewards
+        if (r.reallocated_from) {
+          const vaultReward: MorphoUserReward = {
+            type: "vault-reward",
+            chainId: r.program.chain_id,
+            account: r.user,
+            vaultId: r.reallocated_from,
+            rewardToken,
+            claimableNow,
+            claimableNowUsd,
+            claimableFuture,
+            claimableFutureUsd,
+          };
+          return vaultReward;
+        } else {
+          const marketReward: MorphoUserReward = {
+            type: "market-reward",
+            chainId: r.program.chain_id,
+            account: r.user,
+            marketId: r.program.market_id || "",
+            rewardToken,
+            collateralRewards: {
+              claimableNow: collateralClaimableNow,
+              claimableNowUsd: collateralClaimableNowUsd,
+              claimableFuture: collateralClaimableFuture,
+              claimableFutureUsd: collateralClaimableFutureUsd,
+            },
+            borrowRewards: {
+              claimableNow: borrowClaimableNow,
+              claimableNowUsd: borrowClaimableNowUsd,
+              claimableFuture: borrowClaimableFuture,
+              claimableFutureUsd: borrowClaimableFutureUsd,
+            },
+          };
+          return marketReward;
+        }
       }
       case "vault-reward": {
         const claimableNow = new Amount(
@@ -126,7 +152,7 @@ export async function getUserMorphoRewardsData(params: {
         const vaultReward: MorphoUserReward = {
           type: "vault-reward",
           chainId: r.program.chain_id,
-          account: r.accountId,
+          account: r.user,
           vaultId: r.program.vault,
           rewardToken,
           claimableNow,
@@ -144,7 +170,7 @@ export async function getUserMorphoRewardsData(params: {
 }
 
 type MorphoRewardsResponse = {
-  accountId: Address;
+  user: Address;
   for_borrow: {
     claimable_next: string;
     claimable_now: string;
@@ -169,10 +195,10 @@ type MorphoRewardsResponse = {
     chain_id: number;
     vault: Address;
   };
-  asset: { address: Address };
+  asset: { address: Address; chain_id: number };
   amount?: { claimable_next: string; claimable_now: string };
   type: "vault-reward" | "market-reward" | "uniform-reward";
-  reallocated_from: string;
+  reallocated_from: Address;
 };
 
 type MorphoAssetResponse = {
@@ -195,7 +221,6 @@ async function getMorphoRewardsData(
 }
 
 async function getMorphoAssetsData(
-  chainId: number,
   addresses: Address[],
 ): Promise<MorphoAssetResponse[]> {
   const rewardsRequest = await getGraphQL<{
@@ -204,9 +229,9 @@ async function getMorphoAssetsData(
     };
   }>(`
     query {
-      assets(where: {address_in: [${uniq(addresses)
-        .map((a: string) => `"${a}"`)
-        .join(",")}], chainId_in: ${chainId}}) {
+      assets(where: { address_in:[${uniq(addresses)
+        .map((a: string) => `"${a.toLowerCase()}"`)
+        .join(",")}]}) {
         items {
           address     
           symbol

package/actions/morpho/vaults/getMorphoVaultSnapshots.ts

@@ -0,0 +1,135 @@
+import axios from "axios";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc.js";
+import type { MoonwellClient } from "../../../client/createMoonwellClient.js";
+import { getEnvironmentFromArgs, isStartOfDay } from "../../../common/index.js";
+import type {
+  MorphoVaultParameterType,
+  NetworkParameterType,
+} from "../../../common/types.js";
+import type { Chain, Environment } from "../../../environments/index.js";
+import type { MorphoVaultSnapshot } from "../../../types/morphoVault.js";
+
+dayjs.extend(utc);
+
+export type GetMorphoVaultSnapshotsParameters<
+  environments,
+  network extends Chain | undefined,
+> = NetworkParameterType<environments, network> &
+  MorphoVaultParameterType<network>;
+
+export type GetMorphoVaultSnapshotsReturnType = Promise<MorphoVaultSnapshot[]>;
+
+export async function getMorphoVaultSnapshots<
+  environments,
+  Network extends Chain | undefined,
+>(
+  client: MoonwellClient,
+  args: GetMorphoVaultSnapshotsParameters<environments, Network>,
+): GetMorphoVaultSnapshotsReturnType {
+  const environment = getEnvironmentFromArgs(client, args);
+
+  if (!environment) {
+    return [];
+  }
+
+  return fetchVaultSnapshots(
+    (args as GetMorphoVaultSnapshotsParameters<environments, undefined>)
+      .vaultAddress,
+    environment,
+  );
+}
+
+async function fetchVaultSnapshots(
+  vaultAddress: string,
+  environment: Environment,
+): Promise<MorphoVaultSnapshot[]> {
+  const dailyData: VaultDailyData[] = [];
+  let hasNextPage = true;
+  let endCursor: string | undefined;
+
+  interface VaultDailyData {
+    totalBorrows: number;
+    totalBorrowsUSD: number;
+    totalSupplies: number;
+    totalSuppliesUSD: number;
+    totalLiquidity: number;
+    totalLiquidityUSD: number;
+    timestamp: number;
+  }
+
+  while (hasNextPage) {
+    const result = await axios.post<{
+      data: {
+        vaultDailySnapshots: {
+          items: VaultDailyData[];
+          pageInfo: {
+            hasNextPage: boolean;
+            endCursor: string;
+          };
+        };
+      };
+    }>(environment.indexerUrl, {
+      query: `
+          query {
+            vaultDailySnapshots (        
+              limit: 365,
+              orderBy: "timestamp"
+              orderDirection: "desc"
+              where: {vaultAddress: "${vaultAddress.toLowerCase()}", chainId: ${environment.chainId}}
+              ${endCursor ? `after: "${endCursor}"` : ""}
+            ) {
+              items {
+                  totalBorrows
+                  totalBorrowsUSD
+                  totalSupplies
+                  totalSuppliesUSD
+                  totalLiquidity
+                  totalLiquidityUSD
+                  timestamp
+              }
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
+            }
+          }
+        `,
+    });
+
+    dailyData.push(
+      ...result.data.data.vaultDailySnapshots.items.filter(
+        (f: { timestamp: number }) => isStartOfDay(f.timestamp),
+      ),
+    );
+    hasNextPage = result.data.data.vaultDailySnapshots.pageInfo.hasNextPage;
+    endCursor = result.data.data.vaultDailySnapshots.pageInfo.endCursor;
+  }
+
+  if (dailyData.length > 0) {
+    return dailyData.map((point: VaultDailyData) => {
+      const supplied = Number(point.totalSupplies);
+      const borrow = Number(point.totalBorrows);
+      const borrowUsd = Number(point.totalBorrowsUSD);
+      const suppliedUsd = Number(point.totalSuppliesUSD);
+      const liquidity = Number(point.totalLiquidity);
+      const liquidityUsd = Number(point.totalLiquidityUSD);
+
+      const result: MorphoVaultSnapshot = {
+        vaultAddress: vaultAddress.toLowerCase(),
+        chainId: environment.chainId,
+        timestamp: point.timestamp * 1000,
+        totalSupply: supplied,
+        totalSupplyUsd: suppliedUsd,
+        totalBorrows: borrow,
+        totalBorrowsUsd: borrowUsd,
+        totalLiquidity: liquidity,
+        totalLiquidityUsd: liquidityUsd,
+      };
+
+      return result;
+    });
+  } else {
+    return [];
+  }
+}

package/client/createActions.ts

@@ -149,6 +149,11 @@ import {
   type GetMorphoVaultReturnType,
   getMorphoVault,
 } from "../actions/morpho/vaults/getMorphoVault.js";
+import {
+  type GetMorphoVaultSnapshotsParameters,
+  type GetMorphoVaultSnapshotsReturnType,
+  getMorphoVaultSnapshots,
+} from "../actions/morpho/vaults/getMorphoVaultSnapshots.js";
 import {
   type GetMorphoVaultsParameters,
   type GetMorphoVaultsReturnType,
@@ -288,6 +293,12 @@ export type Actions<
   getMarketSnapshots: <chain extends Chain | undefined = Chain | undefined>(
     args: GetMarketSnapshotsParameters<environments, chain>,
   ) => GetMarketSnapshotsReturnType;
+
+  getMorphoVaultSnapshots: <
+    chain extends Chain | undefined = Chain | undefined,
+  >(
+    args: GetMorphoVaultSnapshotsParameters<environments, chain>,
+  ) => GetMorphoVaultSnapshotsReturnType;
 };
 
 export const actions = <
@@ -332,5 +343,6 @@ export const actions = <
     getCirculatingSupplySnapshots: (args) =>
       getCirculatingSupplySnapshots(client, args),
     getMarketSnapshots: (args) => getMarketSnapshots(client, args),
+    getMorphoVaultSnapshots: (args) => getMorphoVaultSnapshots(client, args),
   };
 };

package/environments/abis/index.ts

@@ -5,6 +5,7 @@ import CoreViewsAbi from "./coreViewsAbi.js";
 import GovernanceTokenAbi from "./governanceTokenAbi.js";
 import GovernorAbi from "./governorAbi.js";
 import MarketTokenAbi from "./marketTokenAbi.js";
+import MaximillionAbi from "./maximillionAbi.js";
 import MorphoBlueAbi from "./morphoBlueAbi.js";
 import MorphoBundlerAbi from "./morphoBundlerAbi.js";
 import MorphoPublicAllocatorAbi from "./morphoPublicAllocatorAbi.js";
@@ -40,4 +41,5 @@ export {
   TokenSaleAbi,
   VoteCollectorAbi,
   WrappedNativeTokenAbi,
+  MaximillionAbi,
 };

package/environments/abis/maximillionAbi.ts

@@ -0,0 +1,64 @@
+export default [
+  {
+    inputs: [
+      {
+        internalType: "contract MGlimmer",
+        name: "mGlimmer_",
+        type: "address",
+      },
+    ],
+    payable: false,
+    stateMutability: "nonpayable",
+    type: "constructor",
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: "mGlimmer",
+    outputs: [
+      {
+        internalType: "contract MGlimmer",
+        name: "",
+        type: "address",
+      },
+    ],
+    payable: false,
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: "address",
+        name: "borrower",
+        type: "address",
+      },
+    ],
+    name: "repayBehalf",
+    outputs: [],
+    payable: true,
+    stateMutability: "payable",
+    type: "function",
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: "address",
+        name: "borrower",
+        type: "address",
+      },
+      {
+        internalType: "contract MGlimmer",
+        name: "mGlimmer_",
+        type: "address",
+      },
+    ],
+    name: "repayBehalfExplicit",
+    outputs: [],
+    payable: true,
+    stateMutability: "payable",
+    type: "function",
+  },
+] as const;

package/environments/definitions/moonbeam/contracts.ts

@@ -9,6 +9,7 @@ export const contracts = createContractsConfig({
     wrappedNativeToken: "WGLMR",
     tokenSale: "0x933fCDf708481c57E9FD82f6BAA084f42e98B60e",
     comptroller: "0x8E00D5e02E65A19337Cdba98bbA9F84d4186a180",
+    maximillion: "0xe5Ef9310cC7E3437bAD83466675f24FD62A380c3",
     views: "0xe76C8B8706faC85a8Fbdcac3C42e3E7823c73994",
     oracle: "0xED301cd3EB27217BDB05C4E9B820a8A3c8B665f9",
     governor: "0xfc4DFB17101A12C5CEc5eeDd8E92B5b16557666d",

package/environments/definitions/moonriver/contracts.ts

@@ -8,6 +8,7 @@ export const contracts = createContractsConfig({
     stakingToken: "stkMFAM",
     wrappedNativeToken: "WMOVR",
     comptroller: "0x0b7a0EAA884849c6Af7a129e899536dDDcA4905E",
+    maximillion: "0x1650C0AD9483158f9e240fd58d0E173807A80CcC",
     views: "0xb4104C02BBf4E9be85AAa41a62974E4e28D59A33",
     oracle: "0x892bE716Dcf0A6199677F355f45ba8CC123BAF60",
     governor: "0x2BE2e230e89c59c8E20E633C524AD2De246e7370",

package/environments/types/config.ts

@@ -19,6 +19,7 @@ import {
   GovernanceTokenAbi,
   GovernorAbi,
   MarketTokenAbi,
+  MaximillionAbi,
   MorphoBlueAbi,
   MorphoBundlerAbi,
   MorphoPublicAllocatorAbi,
@@ -41,6 +42,7 @@ import type {
   GovernanceTokenContractReturnType,
   GovernorContractReturnType,
   MarketTokenContractReturnType,
+  MaximillionContractReturnType,
   MorphoBlueContractReturnType,
   MorphoBundlerContractReturnType,
   MorphoPublicAllocatorContractReturnType,
@@ -86,6 +88,7 @@ export type ContractConfig<tokens> = {
   governanceToken?: keyof tokens;
   wrappedNativeToken?: keyof tokens;
   comptroller?: Address;
+  maximillion?: Address;
   views?: Address;
   tokenSale?: Address;
   morphoViews?: Address;
@@ -106,6 +109,7 @@ export type ContractsConfigReturnType = {
   governanceToken: TokenContractReturnType;
   wrappedNativeToken: TokenContractReturnType;
   comptroller: ComptrollerContractReturnType;
+  maximillion: MaximillionContractReturnType;
   views: CoreViewsContractReturnType;
   tokenSale: TokenSaleContractReturnType;
   morphoViews: MorphoViewsContractReturnType;
@@ -293,6 +297,9 @@ export const createEnvironmentConfig = <
       case "comptroller":
         abi = ComptrollerTokenAbi;
         break;
+      case "maximillion":
+        abi = MaximillionAbi;
+        break;
       case "views":
         abi = CoreViewsAbi;
         break;
@@ -373,6 +380,11 @@ export const createEnvironmentConfig = <
         name,
         "comptroller"
       >]: ComptrollerContractReturnType;
+    } & {
+      [name in keyof contracts as Extract<
+        name,
+        "maximillion"
+      >]: MaximillionContractReturnType;
     } & {
       [name in keyof contracts as Extract<
         name,
@@ -513,6 +525,11 @@ export type Environment<
         name,
         "comptroller"
       >]: ComptrollerContractReturnType;
+    } & {
+      [name in keyof contracts as Extract<
+        name,
+        "maximillion"
+      >]: MaximillionContractReturnType;
     } & {
       [name in keyof contracts as Extract<
         name,

package/environments/types/contracts.ts

@@ -7,6 +7,7 @@ import type {
   GovernanceTokenAbi,
   GovernorAbi,
   MarketTokenAbi,
+  MaximillionAbi,
   MorphoBlueAbi,
   MorphoBundlerAbi,
   MorphoPublicAllocatorAbi,
@@ -58,6 +59,12 @@ export type ComptrollerContractReturnType = GetContractReturnType<
   Address
 >;
 
+export type MaximillionContractReturnType = GetContractReturnType<
+  typeof MaximillionAbi,
+  PublicClient,
+  Address
+>;
+
 export type MultiRewardDistributorContractReturnType = GetContractReturnType<
   typeof MultiRewardDistributorAbi,
   PublicClient,

package/errors/version.ts

@@ -1 +1 @@
-export const version = '0.3.2'
+export const version = '0.4.0'

package/index.ts

@@ -24,7 +24,11 @@ export type {
   MorphoVaultUserPosition,
 } from "./types/morphoUserPosition.js";
 export type { MorphoUserReward } from "./types/morphoUserReward.js";
-export type { MorphoVault, MorphoVaultMarket } from "./types/morphoVault.js";
+export type {
+  MorphoVault,
+  MorphoVaultMarket,
+  MorphoVaultSnapshot,
+} from "./types/morphoVault.js";
 export {
   MultichainProposalState,
   ProposalState,

package/package.json

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

package/types/morphoMarket.ts

@@ -12,6 +12,7 @@ export type MorphoMarket = {
   performanceFee: number;
   loanToken: TokenConfig;
   loanTokenPrice: number;
+  collateralAssets: Amount;
   collateralToken: TokenConfig;
   collateralTokenPrice: number;
   totalSupply: Amount;

package/types/morphoVault.ts

@@ -35,3 +35,15 @@ export type MorphoVaultMarket = {
   totalSuppliedUsd: number;
   rewards: Omit<MorphoReward, "marketId">[];
 };
+
+export type MorphoVaultSnapshot = {
+  chainId: number;
+  vaultAddress: string;
+  totalSupply: number;
+  totalSupplyUsd: number;
+  totalBorrows: number;
+  totalBorrowsUsd: number;
+  totalLiquidity: number;
+  totalLiquidityUsd: number;
+  timestamp: number;
+};