test(blue-sdk): fix market params types

morpho-org · Oct 21, 2024 · 8ccfa22 · 8ccfa22
1 parent c048141
commit 8ccfa22
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 20 deletions.
diff --git a/packages/blue-sdk/src/market/MarketParams.ts b/packages/blue-sdk/src/market/MarketParams.ts
@@ -71,14 +71,12 @@ export class MarketParams implements InputMarketParams {
   /**
    * The market's hex-encoded id, defined as the hash of the market params.
    */
-  // Cached because params are readonly.
-  public readonly id: MarketId;
+  public readonly id: MarketId; // Cached because params are readonly.
 
   /**
    * The market's liquidation incentive factor.
    */
-  // Cached because lltv is readonly.
-  public readonly liquidationIncentiveFactor: bigint;
+  public readonly liquidationIncentiveFactor: bigint; // Cached because lltv is readonly.
 
   constructor(params: InputMarketParams) {
     const { collateralToken, loanToken, oracle, irm, lltv } = params;

diff --git a/packages/blue-sdk/test/e2e/Market.test.ts b/packages/blue-sdk/test/e2e/Market.test.ts
@@ -1,5 +1,5 @@
 import { Time } from "@morpho-org/morpho-ts";
-import { parseUnits } from "viem";
+import { type Address, parseUnits } from "viem";
 import { describe, expect } from "vitest";
 import { ChainId, Market, MarketParams, addresses } from "../../src/index.js";
 import { adaptiveCurveIrmAbi, blueAbi, blueOracleAbi } from "./abis.js";
@@ -17,6 +17,24 @@ const params = new MarketParams({
   lltv: parseUnits("86", 16),
 });
 
+declare module "../../src/index.js" {
+  interface MarketParams {
+    asArg: {
+      collateralToken: Address;
+      loanToken: Address;
+      oracle: Address;
+      irm: Address;
+      lltv: bigint;
+    };
+  }
+}
+
+Object.defineProperty(MarketParams.prototype, "asArg", {
+  get() {
+    return this;
+  },
+});
+
 describe("Market", () => {
   test("should borrow borrowable assets", async ({ client }) => {
     const collateral = parseUnits("1", 18);
@@ -39,7 +57,7 @@ describe("Market", () => {
       address: morpho,
       functionName: "borrow",
       args: [
-        params,
+        params.asArg,
         parseUnits("1", 6),
         0n,
         client.account.address,
@@ -104,7 +122,7 @@ describe("Market", () => {
         address: morpho,
         functionName: "borrow",
         args: [
-          params,
+          params.asArg,
           maxBorrowable + 10n,
           0n,
           client.account.address,
@@ -118,7 +136,7 @@ describe("Market", () => {
       address: morpho,
       functionName: "borrow",
       args: [
-        params,
+        params.asArg,
         maxBorrowable,
         0n,
         client.account.address,
@@ -154,7 +172,7 @@ describe("Market", () => {
       address: morpho,
       functionName: "borrow",
       args: [
-        params,
+        params.asArg,
         parseUnits("1", 6),
         0n,
         client.account.address,
@@ -233,7 +251,7 @@ describe("Market", () => {
       address: morpho,
       functionName: "borrow",
       args: [
-        params,
+        params.asArg,
         maxBorrowable,
         0n,
         client.account.address,

diff --git a/packages/bundler-sdk-viem/test/helpers.ts b/packages/bundler-sdk-viem/test/helpers.ts
@@ -57,7 +57,7 @@ export const donate =
       abi: blueAbi,
       functionName: "supply",
       args: [
-        data.getMarket(data.getVault(vault).withdrawQueue[0]!).params,
+        data.getMarket(data.getVault(vault).withdrawQueue[0]!).params.asArg,
         donation,
         0n,
         vault,

diff --git a/packages/bundler-sdk-viem/test/populateBundle.test.ts b/packages/bundler-sdk-viem/test/populateBundle.test.ts
@@ -638,7 +638,7 @@ describe("populateBundle", () => {
             address: morpho,
             abi: blueAbi,
             functionName: "createMarket",
-            args: [marketParams],
+            args: [marketParams.asArg],
           });
 
           const block = await client.getBlock();
@@ -798,7 +798,7 @@ describe("populateBundle", () => {
             address: morpho,
             abi: blueAbi,
             functionName: "createMarket",
-            args: [marketParams],
+            args: [marketParams.asArg],
           });
 
           const block = await client.getBlock();
@@ -1601,7 +1601,7 @@ describe("populateBundle", () => {
             abi: blueAbi,
             functionName: "borrow",
             args: [
-              eth_wstEth,
+              eth_wstEth.asArg,
               loanAssets,
               0n,
               client.account.address,
@@ -2213,7 +2213,7 @@ describe("populateBundle", () => {
             abi: blueAbi,
             functionName: "borrow",
             args: [
-              eth_wstEth,
+              eth_wstEth.asArg,
               borrowAmount,
               0n,
               client.account.address,
@@ -3083,7 +3083,7 @@ describe("populateBundle", () => {
             address: morpho,
             abi: blueAbi,
             functionName: "createMarket",
-            args: [marketParams],
+            args: [marketParams.asArg],
           });
 
           const block = await client.getBlock();
@@ -3251,7 +3251,7 @@ describe("populateBundle", () => {
             address: morpho,
             abi: blueAbi,
             functionName: "createMarket",
-            args: [marketParams],
+            args: [marketParams.asArg],
           });
 
           const block = await client.getBlock();
@@ -4090,7 +4090,7 @@ describe("populateBundle", () => {
             abi: blueAbi,
             functionName: "borrow",
             args: [
-              eth_wstEth,
+              eth_wstEth.asArg,
               loanAssets,
               0n,
               client.account.address,
@@ -4725,7 +4725,7 @@ describe("populateBundle", () => {
             abi: blueAbi,
             functionName: "borrow",
             args: [
-              eth_wstEth,
+              eth_wstEth.asArg,
               borrowAmount,
               0n,
               client.account.address,
@@ -4963,7 +4963,7 @@ describe("populateBundle", () => {
             address: morpho,
             abi: blueAbi,
             functionName: "createMarket",
-            args: [marketParams],
+            args: [marketParams.asArg],
           });
 
           const whitelisted = "0x53753098E2660AbD4834A3eD713D11AC1123421A";

diff --git a/packages/morpho-test/src/fixtures/markets.ts b/packages/morpho-test/src/fixtures/markets.ts
@@ -1,4 +1,5 @@
 import {
+  type Address,
   ChainId,
   type InputMarketParams,
   MarketParams,
@@ -209,3 +210,21 @@ export const randomMarket = (params: Partial<InputMarketParams> = {}) =>
     lltv: parseEther("0.80"),
     ...params,
   });
+
+declare module "@morpho-org/blue-sdk" {
+  interface MarketParams {
+    asArg: {
+      collateralToken: Address;
+      loanToken: Address;
+      oracle: Address;
+      irm: Address;
+      lltv: bigint;
+    };
+  }
+}
+
+Object.defineProperty(MarketParams.prototype, "asArg", {
+  get() {
+    return this;
+  },
+});