@morpho-org/blue-sdk 2.0.0-next.13 → 2.0.0-next.15

package/lib/market/MarketUtils.js

@@ -1,4 +1,5 @@
-import keccak256 from "keccak256";
+import { keccak_256 } from "@noble/hashes/sha3";
+import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
 import { LIQUIDATION_CURSOR, MAX_LIQUIDATION_INCENTIVE_FACTOR, ORACLE_PRICE_SCALE, SECONDS_PER_YEAR, } from "../constants.js";
 import { MathLib, SharesMath } from "../math/index.js";
 /**
@@ -11,11 +12,14 @@ export var MarketUtils;
      * @param market The market params.
      */
     function getMarketId(market) {
-        return `0x${keccak256(`0x${market.loanToken.substring(2).toLowerCase().padStart(64, "0") +
-            market.collateralToken.substring(2).toLowerCase().padStart(64, "0") +
+        return `0x${bytesToHex(keccak_256(hexToBytes(`${market.loanToken.substring(2).toLowerCase().padStart(64, "0") +
+            market.collateralToken
+                .substring(2)
+                .toLowerCase()
+                .padStart(64, "0") +
             market.oracle.substring(2).padStart(64, "0") +
             market.irm.substring(2).toLowerCase().padStart(64, "0") +
-            BigInt(market.lltv).toString(16).padStart(64, "0")}`).toString("hex")}`;
+            BigInt(market.lltv).toString(16).padStart(64, "0")}`)))}`;
     }
     MarketUtils.getMarketId = getMarketId;
     /**

package/lib/token/ConstantWrappedToken.js

@@ -2,7 +2,7 @@ import { MathLib } from "../math/index.js";
 import { WrappedToken } from "./WrappedToken.js";
 export class ConstantWrappedToken extends WrappedToken {
     underlyingDecimals;
-    constructor(token, underlying, underlyingDecimals = 18n) {
+    constructor(token, underlying, underlyingDecimals = 0) {
         super(token, underlying);
         this.underlyingDecimals = BigInt(underlyingDecimals);
     }

package/lib/token/Token.d.ts

@@ -3,9 +3,10 @@ import { type RoundingDirection } from "../math/index.js";
 import type { Address, BigIntish } from "../types.js";
 export interface InputToken {
     address: Address;
-    decimals: BigIntish;
-    symbol: string;
     name?: string;
+    symbol?: string;
+    decimals?: BigIntish;
+    price?: BigIntish;
 }
 export declare class Token implements InputToken {
     static native(chainId: ChainId): Token;
@@ -14,33 +15,32 @@ export declare class Token implements InputToken {
      */
     readonly address: Address;
     /**
-     * The token's number of decimals.
+     * The token's name.
      */
-    readonly decimals: number;
+    readonly name?: string;
     /**
      * The token's symbol.
      */
-    readonly symbol: string;
+    readonly symbol?: string;
     /**
-     * The name of the token (defaults to the symbol).
+     * The token's number of decimals. Defaults to 0.
      */
-    readonly name: string;
-    constructor({ address, decimals, symbol, name }: InputToken);
-}
-export declare class TokenWithPrice extends Token {
+    readonly decimals: number;
     /**
      * Price of the token in USD (scaled by WAD).
      */
     price?: bigint;
-    constructor(token: InputToken, price?: bigint);
+    constructor({ address, name, symbol, decimals, price }: InputToken);
     /**
      * Quotes an amount in USD (scaled by WAD) in this token.
+     * Returns `undefined` iff the token's price is undefined.
      * @param amount The amount of USD to quote.
      */
-    fromUsd(amount: bigint, rounding?: RoundingDirection): bigint | null;
+    fromUsd(amount: bigint, rounding?: RoundingDirection): bigint | undefined;
     /**
      * Quotes an amount of tokens in USD (scaled by WAD).
+     * Returns `undefined` iff the token's price is undefined.
      * @param amount The amount of tokens to quote.
      */
-    toUsd(amount: bigint, rounding?: RoundingDirection): bigint | null;
+    toUsd(amount: bigint, rounding?: RoundingDirection): bigint | undefined;
 }

package/lib/token/Token.js

@@ -11,49 +11,47 @@ export class Token {
      */
     address;
     /**
-     * The token's number of decimals.
+     * The token's name.
      */
-    decimals;
+    name;
     /**
      * The token's symbol.
      */
     symbol;
     /**
-     * The name of the token (defaults to the symbol).
+     * The token's number of decimals. Defaults to 0.
      */
-    name;
-    constructor({ address, decimals, symbol, name }) {
-        this.address = address;
-        this.decimals = Number(decimals);
-        this.symbol = symbol;
-        this.name = name ?? symbol;
-    }
-}
-export class TokenWithPrice extends Token {
+    decimals;
     /**
      * Price of the token in USD (scaled by WAD).
      */
     price;
-    constructor(token, price) {
-        super(token);
-        this.price = price;
+    constructor({ address, name, symbol, decimals = 0, price }) {
+        this.address = address;
+        this.name = name;
+        this.symbol = symbol;
+        this.decimals = Number(decimals);
+        if (price != null)
+            this.price = BigInt(price);
     }
     /**
      * Quotes an amount in USD (scaled by WAD) in this token.
+     * Returns `undefined` iff the token's price is undefined.
      * @param amount The amount of USD to quote.
      */
     fromUsd(amount, rounding = "Down") {
         if (this.price == null)
-            return null;
+            return;
         return MathLib.mulDiv(amount, 10n ** BigInt(this.decimals), this.price, rounding);
     }
     /**
      * Quotes an amount of tokens in USD (scaled by WAD).
+     * Returns `undefined` iff the token's price is undefined.
      * @param amount The amount of tokens to quote.
      */
     toUsd(amount, rounding = "Down") {
         if (this.price == null)
-            return null;
+            return;
         return MathLib.mulDiv(amount, this.price, 10n ** BigInt(this.decimals), rounding);
     }
 }

package/lib/vault/Vault.d.ts

@@ -41,6 +41,14 @@ export interface InputVault extends InputVaultConfig {
     publicAllocatorConfig?: VaultPublicAllocatorConfig;
 }
 export declare class Vault extends VaultToken implements InputVault {
+    /**
+     * The vault's share token's name.
+     */
+    readonly name: string;
+    /**
+     * The vault's share token's symbol.
+     */
+    readonly symbol: string;
     /**
      * The MetaMorpho vault's owner address.
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/blue-sdk",
   "description": "Framework-agnostic package that defines Morpho-related entity classes (such as `Market`, `Token`, `Vault`).",
-  "version": "2.0.0-next.13",
+  "version": "2.0.0-next.15",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -19,7 +19,7 @@
     "lib"
   ],
   "dependencies": {
-    "keccak256": "^1.0.6"
+    "@noble/hashes": "^1.5.0"
   },
   "peerDependencies": {
     "@morpho-org/morpho-ts": "^2.0.0-next.7"