@morpho-dev/router 0.1.2 → 0.1.3

package/dist/index.browser.d.cts

@@ -2,7 +2,7 @@ import * as _morpho_dev_mempool from '@morpho-dev/mempool';
 import { Offer, Errors, Format, Maturity, LLTV, Compute, Chain } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import * as viem from 'viem';
-import { Address, Hex, PublicClient } from 'viem';
+import { Address, Hex } from 'viem';
 import { z, ZodError } from 'zod/v4';
 
 declare const OfferStatusValues: readonly ["valid", "callback_not_supported", "callback_error", "unverified"];
@@ -88,8 +88,8 @@ declare const consumedEvent: {
  * @param input - The router offer to create.
  * @returns The created router offer with its hash.
  */
-declare function from$1(input: Omit<RouterOffer, "hash">): RouterOffer;
-declare namespace from$1 {
+declare function from(input: Omit<RouterOffer, "hash">): RouterOffer;
+declare namespace from {
     type ErrorType = InvalidRouterOfferError;
 }
 /**
@@ -132,12 +132,13 @@ declare const RouterOffer$1_OfferStatusValues: typeof OfferStatusValues;
 type RouterOffer$1_RouterOffer = RouterOffer;
 declare const RouterOffer$1_RouterOfferSchema: typeof RouterOfferSchema;
 declare const RouterOffer$1_consumedEvent: typeof consumedEvent;
+declare const RouterOffer$1_from: typeof from;
 declare const RouterOffer$1_fromConsumedLog: typeof fromConsumedLog;
 declare const RouterOffer$1_fromSnakeCase: typeof fromSnakeCase;
 declare const RouterOffer$1_random: typeof random;
 declare const RouterOffer$1_toSnakeCase: typeof toSnakeCase;
 declare namespace RouterOffer$1 {
-  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferConsumed as OfferConsumed, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_consumedEvent as consumedEvent, from$1 as from, RouterOffer$1_fromConsumedLog as fromConsumedLog, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
+  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferConsumed as OfferConsumed, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_consumedEvent as consumedEvent, RouterOffer$1_from as from, RouterOffer$1_fromConsumedLog as fromConsumedLog, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
 }
 
 type OfferResponse = {
@@ -433,32 +434,6 @@ declare namespace index$1 {
   export { type index$1_FindMatchingOffersParams as FindMatchingOffersParams, type index$1_GetAllParams as GetAllParams, type index$1_GetOffersFilters as GetOffersFilters, type index$1_OfferStore as OfferStore, index$1_memory as memory };
 }
 
-declare const types: readonly ["offer_created", "offer_consumed", "offer_validation"];
-type Type = (typeof types)[number];
-type BaseEvent<type extends Type = Type> = {
-    readonly id: string;
-    readonly type: type;
-};
-type RouterEvent<type extends Type = Type> = type extends "offer_consumed" ? Compute<BaseEvent<type> & {
-    readonly offerConsumed: OfferConsumed;
-}> : type extends "offer_created" | "offer_validation" ? Compute<BaseEvent<type> & {
-    readonly offer: Offer.Offer;
-}> : never;
-/**
- * Creates a RouterEvent with a deterministic id.
- */
-declare function from<T extends Type = Type>(base: Omit<RouterEvent<T>, "id" | "type"> & {
-    type: T;
-}): Compute<RouterEvent<T>>;
-
-type RouterEvent$1_RouterEvent<type extends Type = Type> = RouterEvent<type>;
-type RouterEvent$1_Type = Type;
-declare const RouterEvent$1_from: typeof from;
-declare const RouterEvent$1_types: typeof types;
-declare namespace RouterEvent$1 {
-  export { type RouterEvent$1_RouterEvent as RouterEvent, type RouterEvent$1_Type as Type, RouterEvent$1_from as from, RouterEvent$1_types as types };
-}
-
 /**
  * Splits an array into batches of a specified size.
  * @param array The array to split.
@@ -560,11 +535,9 @@ declare function single<Name extends string, T, Ctx = void>(name: Name, run: Sin
  */
 declare function batch<Name extends string, T, Ctx = void>(name: Name, run: Batch<T, Name, Ctx>): Rule<T, Name, Ctx>;
 type MorphoContext = {
-    publicClients: Partial<Record<Chain.ChainName, PublicClient>>;
+    chain: Chain.Chain;
 };
-declare function morpho(parameters: {
-    whitelistedChains: Chain.Chain[];
-}): (Rule<{
+declare function morpho(): (Rule<{
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
@@ -660,55 +633,7 @@ declare function morpho(parameters: {
     readonly hash: viem.Hex;
     signature?: viem.Hex;
     createdAt?: number;
-}, "empty_callback", MorphoContext> | Rule<{
-    readonly offering: Address;
-    readonly assets: bigint;
-    readonly rate: bigint;
-    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
-    readonly expiry: number;
-    readonly nonce: bigint;
-    readonly buy: boolean;
-    readonly chainId: bigint;
-    readonly loanToken: Address;
-    readonly start: number;
-    readonly collaterals: readonly {
-        asset: Address;
-        oracle: Address;
-        lltv: bigint & _morpho_dev_mempool.Brand<"LLTV">;
-    }[];
-    readonly callback: {
-        readonly address: Address;
-        readonly data: viem.Hex;
-        readonly gasLimit: bigint;
-    };
-    readonly hash: viem.Hex;
-    signature?: viem.Hex;
-    createdAt?: number;
-}, "sell_offers_empty_callback", MorphoContext> | Rule<{
-    readonly offering: Address;
-    readonly assets: bigint;
-    readonly rate: bigint;
-    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
-    readonly expiry: number;
-    readonly nonce: bigint;
-    readonly buy: boolean;
-    readonly chainId: bigint;
-    readonly loanToken: Address;
-    readonly start: number;
-    readonly collaterals: readonly {
-        asset: Address;
-        oracle: Address;
-        lltv: bigint & _morpho_dev_mempool.Brand<"LLTV">;
-    }[];
-    readonly callback: {
-        readonly address: Address;
-        readonly data: viem.Hex;
-        readonly gasLimit: bigint;
-    };
-    readonly hash: viem.Hex;
-    signature?: viem.Hex;
-    createdAt?: number;
-}, "buy_offers_empty_callback", MorphoContext>)[];
+}, "empty_callback", MorphoContext>)[];
 
 type ValidationRule_Batch<T, RuleName extends string, Ctx = void> = Batch<T, RuleName, Ctx>;
 type ValidationRule_MorphoContext = MorphoContext;
@@ -763,4 +688,4 @@ declare namespace Validation {
   export { type Validation_Issue as Issue, type Validation_Result as Result, Validation_run as run };
 }
 
-export { index$1 as OfferStore, Client$1 as Router, RouterEvent$1 as RouterEvent, RouterOffer$1 as RouterOffer, index as Utils, Validation, ValidationRule };
+export { index$1 as OfferStore, Client$1 as Router, RouterOffer$1 as RouterOffer, index as Utils, Validation, ValidationRule };

package/dist/index.browser.d.ts

@@ -2,7 +2,7 @@ import * as _morpho_dev_mempool from '@morpho-dev/mempool';
 import { Offer, Errors, Format, Maturity, LLTV, Compute, Chain } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import * as viem from 'viem';
-import { Address, Hex, PublicClient } from 'viem';
+import { Address, Hex } from 'viem';
 import { z, ZodError } from 'zod/v4';
 
 declare const OfferStatusValues: readonly ["valid", "callback_not_supported", "callback_error", "unverified"];
@@ -88,8 +88,8 @@ declare const consumedEvent: {
  * @param input - The router offer to create.
  * @returns The created router offer with its hash.
  */
-declare function from$1(input: Omit<RouterOffer, "hash">): RouterOffer;
-declare namespace from$1 {
+declare function from(input: Omit<RouterOffer, "hash">): RouterOffer;
+declare namespace from {
     type ErrorType = InvalidRouterOfferError;
 }
 /**
@@ -132,12 +132,13 @@ declare const RouterOffer$1_OfferStatusValues: typeof OfferStatusValues;
 type RouterOffer$1_RouterOffer = RouterOffer;
 declare const RouterOffer$1_RouterOfferSchema: typeof RouterOfferSchema;
 declare const RouterOffer$1_consumedEvent: typeof consumedEvent;
+declare const RouterOffer$1_from: typeof from;
 declare const RouterOffer$1_fromConsumedLog: typeof fromConsumedLog;
 declare const RouterOffer$1_fromSnakeCase: typeof fromSnakeCase;
 declare const RouterOffer$1_random: typeof random;
 declare const RouterOffer$1_toSnakeCase: typeof toSnakeCase;
 declare namespace RouterOffer$1 {
-  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferConsumed as OfferConsumed, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_consumedEvent as consumedEvent, from$1 as from, RouterOffer$1_fromConsumedLog as fromConsumedLog, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
+  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferConsumed as OfferConsumed, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_consumedEvent as consumedEvent, RouterOffer$1_from as from, RouterOffer$1_fromConsumedLog as fromConsumedLog, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
 }
 
 type OfferResponse = {
@@ -433,32 +434,6 @@ declare namespace index$1 {
   export { type index$1_FindMatchingOffersParams as FindMatchingOffersParams, type index$1_GetAllParams as GetAllParams, type index$1_GetOffersFilters as GetOffersFilters, type index$1_OfferStore as OfferStore, index$1_memory as memory };
 }
 
-declare const types: readonly ["offer_created", "offer_consumed", "offer_validation"];
-type Type = (typeof types)[number];
-type BaseEvent<type extends Type = Type> = {
-    readonly id: string;
-    readonly type: type;
-};
-type RouterEvent<type extends Type = Type> = type extends "offer_consumed" ? Compute<BaseEvent<type> & {
-    readonly offerConsumed: OfferConsumed;
-}> : type extends "offer_created" | "offer_validation" ? Compute<BaseEvent<type> & {
-    readonly offer: Offer.Offer;
-}> : never;
-/**
- * Creates a RouterEvent with a deterministic id.
- */
-declare function from<T extends Type = Type>(base: Omit<RouterEvent<T>, "id" | "type"> & {
-    type: T;
-}): Compute<RouterEvent<T>>;
-
-type RouterEvent$1_RouterEvent<type extends Type = Type> = RouterEvent<type>;
-type RouterEvent$1_Type = Type;
-declare const RouterEvent$1_from: typeof from;
-declare const RouterEvent$1_types: typeof types;
-declare namespace RouterEvent$1 {
-  export { type RouterEvent$1_RouterEvent as RouterEvent, type RouterEvent$1_Type as Type, RouterEvent$1_from as from, RouterEvent$1_types as types };
-}
-
 /**
  * Splits an array into batches of a specified size.
  * @param array The array to split.
@@ -560,11 +535,9 @@ declare function single<Name extends string, T, Ctx = void>(name: Name, run: Sin
  */
 declare function batch<Name extends string, T, Ctx = void>(name: Name, run: Batch<T, Name, Ctx>): Rule<T, Name, Ctx>;
 type MorphoContext = {
-    publicClients: Partial<Record<Chain.ChainName, PublicClient>>;
+    chain: Chain.Chain;
 };
-declare function morpho(parameters: {
-    whitelistedChains: Chain.Chain[];
-}): (Rule<{
+declare function morpho(): (Rule<{
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
@@ -660,55 +633,7 @@ declare function morpho(parameters: {
     readonly hash: viem.Hex;
     signature?: viem.Hex;
     createdAt?: number;
-}, "empty_callback", MorphoContext> | Rule<{
-    readonly offering: Address;
-    readonly assets: bigint;
-    readonly rate: bigint;
-    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
-    readonly expiry: number;
-    readonly nonce: bigint;
-    readonly buy: boolean;
-    readonly chainId: bigint;
-    readonly loanToken: Address;
-    readonly start: number;
-    readonly collaterals: readonly {
-        asset: Address;
-        oracle: Address;
-        lltv: bigint & _morpho_dev_mempool.Brand<"LLTV">;
-    }[];
-    readonly callback: {
-        readonly address: Address;
-        readonly data: viem.Hex;
-        readonly gasLimit: bigint;
-    };
-    readonly hash: viem.Hex;
-    signature?: viem.Hex;
-    createdAt?: number;
-}, "sell_offers_empty_callback", MorphoContext> | Rule<{
-    readonly offering: Address;
-    readonly assets: bigint;
-    readonly rate: bigint;
-    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
-    readonly expiry: number;
-    readonly nonce: bigint;
-    readonly buy: boolean;
-    readonly chainId: bigint;
-    readonly loanToken: Address;
-    readonly start: number;
-    readonly collaterals: readonly {
-        asset: Address;
-        oracle: Address;
-        lltv: bigint & _morpho_dev_mempool.Brand<"LLTV">;
-    }[];
-    readonly callback: {
-        readonly address: Address;
-        readonly data: viem.Hex;
-        readonly gasLimit: bigint;
-    };
-    readonly hash: viem.Hex;
-    signature?: viem.Hex;
-    createdAt?: number;
-}, "buy_offers_empty_callback", MorphoContext>)[];
+}, "empty_callback", MorphoContext>)[];
 
 type ValidationRule_Batch<T, RuleName extends string, Ctx = void> = Batch<T, RuleName, Ctx>;
 type ValidationRule_MorphoContext = MorphoContext;
@@ -763,4 +688,4 @@ declare namespace Validation {
   export { type Validation_Issue as Issue, type Validation_Result as Result, Validation_run as run };
 }
 
-export { index$1 as OfferStore, Client$1 as Router, RouterEvent$1 as RouterEvent, RouterOffer$1 as RouterOffer, index as Utils, Validation, ValidationRule };
+export { index$1 as OfferStore, Client$1 as Router, RouterOffer$1 as RouterOffer, index as Utils, Validation, ValidationRule };

package/dist/index.browser.js

@@ -1352,18 +1352,6 @@ function memory(parameters) {
   };
 }
 
-// src/RouterEvent.ts
-var RouterEvent_exports = {};
-__export(RouterEvent_exports, {
-  from: () => from2,
-  types: () => types
-});
-var types = ["offer_created", "offer_consumed", "offer_validation"];
-function from2(base) {
-  const id = base.type === "offer_consumed" ? `${base.type}:${base.offerConsumed.id}` : `${base.type}:${base.offer.hash.toLowerCase()}`;
-  return { id, ...base };
-}
-
 // src/Validation.ts
 var Validation_exports = {};
 __export(Validation_exports, {
@@ -1424,25 +1412,19 @@ function single(name, run2) {
 function batch2(name, run2) {
   return { kind: "batch", name, run: run2 };
 }
-function morpho(parameters) {
-  const { whitelistedChains } = parameters;
-  const whitelistedChainIds = new Set(whitelistedChains.map((chain) => chain.id));
-  const whitelistedLoanTokensPerChain = new Map(
-    whitelistedChains.map((chain) => [
-      chain.id,
-      new Set(Array.from(chain.whitelistedAssets).map((a) => a.toLowerCase()))
-    ])
-  );
-  const morphoPerChain = new Map(
-    whitelistedChains.map((chain) => [chain.id, chain.morpho.toLowerCase()])
-  );
-  const chainId = single("chain_id", (offer, _) => {
-    if (!whitelistedChainIds.has(offer.chainId)) {
-      return { message: `Chain ID ${offer.chainId} is not whitelisted` };
+function morpho() {
+  const chainId = single("chain_id", (offer, { chain }) => {
+    if (chain.id !== offer.chainId) {
+      return {
+        message: `Chain ID ${offer.chainId} is not the same as the chain ID in the context (${chain.id})`
+      };
     }
   });
-  const loanToken = single("loan_token", (offer, _) => {
-    if (!whitelistedLoanTokensPerChain.get(offer.chainId)?.has(offer.loanToken.toLowerCase())) {
+  const loanToken = single("loan_token", (offer, { chain }) => {
+    const tokens = new Set(
+      Array.from(chain.whitelistedAssets.values()).map((a) => a.toLowerCase())
+    );
+    if (!tokens.has(offer.loanToken.toLowerCase())) {
       return {
         message: `Loan token ${offer.loanToken} is not whitelisted on chain ${offer.chainId}`
       };
@@ -1453,133 +1435,23 @@ function morpho(parameters) {
       return { message: "Expiry mismatch" };
     }
   });
-  const emptyCallback = single("empty_callback", (offer, _) => {
-    if (offer.callback.data !== "0x") {
-      return { message: "Callback data is not empty. Not supported yet." };
+  const callback = single("empty_callback", (offer, _) => {
+    if (!offer.buy || offer.callback.data !== "0x") {
+      return { message: "Callback not supported yet." };
     }
   });
-  const sellOffersEmptyCallback = single(
-    "sell_offers_empty_callback",
-    (offer, _) => {
-      if (!offer.buy && offer.callback.data === "0x") {
-        return { message: "Sell offers with empty callback are not supported yet." };
-      }
-    }
-  );
-  const buyOffersEmptyCallback = batch2(
-    "buy_offers_empty_callback",
-    async (offers, { publicClients }) => {
-      const issues = /* @__PURE__ */ new Map();
-      const hashToIndex = /* @__PURE__ */ new Map();
-      for (let i = 0; i < offers.length; i++) {
-        const offer = offers[i];
-        hashToIndex.set(offer.hash, i);
-      }
-      const { buyOffers, sellOffers: _sellOffers } = offers.reduce(
-        (acc, offer) => {
-          offer.buy ? acc.buyOffers.push(offer) : issues.set(hashToIndex.get(offer.hash), {
-            message: "Onchain callback for sell offers is not supported yet."
-          });
-          return acc;
-        },
-        { buyOffers: [], sellOffers: [] }
-      );
-      const buyOffersPerLoanAsset = /* @__PURE__ */ new Map();
-      for (const offer of buyOffers) {
-        const chainName = mempool.Chain.getChain(offer.chainId)?.name;
-        const loanTokens = buyOffersPerLoanAsset.get(chainName) ?? /* @__PURE__ */ new Map();
-        const offers2 = loanTokens.get(offer.loanToken.toLowerCase()) ?? [];
-        offers2.push(offer);
-        loanTokens.set(offer.loanToken.toLowerCase(), offers2);
-        buyOffersPerLoanAsset.set(chainName, loanTokens);
-      }
-      await Promise.all(
-        Array.from(buyOffersPerLoanAsset.entries()).map(async ([name, loanTokens]) => {
-          const chainName = name;
-          const publicClient = publicClients[chainName];
-          const morpho2 = morphoPerChain.get(mempool.Chain.chains[chainName].id);
-          if (!publicClient) {
-            const offers2 = Array.from(loanTokens.values()).flat();
-            for (const offer of offers2) {
-              issues.set(hashToIndex.get(offer.hash), {
-                message: `Public client for chain "${chainName}" is not available`
-              });
-            }
-            return;
-          }
-          const balances = /* @__PURE__ */ new Map();
-          const allowances = /* @__PURE__ */ new Map();
-          for (const [loanToken2, offers2] of loanTokens) {
-            const data = await Promise.all(
-              offers2.flatMap((offer) => [
-                publicClient.readContract({
-                  address: loanToken2,
-                  abi: viem.parseAbi([
-                    "function balanceOf(address owner) view returns (uint256 balance)"
-                  ]),
-                  functionName: "balanceOf",
-                  args: [offer.offering]
-                }),
-                publicClient.readContract({
-                  address: loanToken2,
-                  abi: viem.parseAbi([
-                    "function allowance(address owner, address spender) public view returns (uint256 remaining)"
-                  ]),
-                  functionName: "allowance",
-                  args: [offer.offering, morpho2]
-                })
-              ])
-            );
-            for (let i = 0; i < offers2.length; i++) {
-              const user = offers2[i].offering.toLowerCase();
-              const balance = data[i * 2] || 0n;
-              const allowance = data[i * 2 + 1] || 0n;
-              const userBalances = balances.get(user) ?? /* @__PURE__ */ new Map();
-              userBalances.set(loanToken2.toLowerCase(), balance);
-              const userAllowances = allowances.get(user) ?? /* @__PURE__ */ new Map();
-              userAllowances.set(loanToken2.toLowerCase(), allowance);
-              balances.set(user, userBalances);
-              allowances.set(user, userAllowances);
-            }
-          }
-          for (const offer of Array.from(loanTokens.values()).flat()) {
-            const user = offer.offering.toLowerCase();
-            const userBalances = balances.get(user);
-            const balance = userBalances?.get(offer.loanToken.toLowerCase());
-            if (balance < offer.assets) {
-              issues.set(hashToIndex.get(offer.hash), {
-                message: `Insufficient balance for ${offer.loanToken} on chain ${offer.chainId} (${balance.toString()} < ${offer.assets.toString()})`
-              });
-              continue;
-            }
-            const userAllowances = allowances.get(user);
-            const allowance = userAllowances?.get(offer.loanToken.toLowerCase());
-            if (allowance < offer.assets) {
-              issues.set(hashToIndex.get(offer.hash), {
-                message: `Insufficient allowance for ${offer.loanToken} on chain ${offer.chainId} (${allowance.toString()} < ${offer.assets.toString()})`
-              });
-            }
-          }
-        })
-      );
-      return issues;
-    }
-  );
   return [
     chainId,
     loanToken,
     expiry,
-    // note: callback onchain check should be done last since it does not mean that the offer is forever invalid
-    // integrators should be able to keep the offers that have an invalid callback onchain and be sure that is the only check that is not valid
-    emptyCallback,
-    sellOffersEmptyCallback,
-    buyOffersEmptyCallback
+    // note: callback rule should be the last one, since it does not mean that the offer is forever invalid
+    // integrators should be able to choose if they want to keep the offer or not
+    callback
   ];
 }
 
 exports.OfferStore = OfferStore_exports;
 exports.Router = Client_exports;
-exports.RouterEvent = RouterEvent_exports;
 exports.RouterOffer = RouterOffer_exports;
 exports.Utils = utils_exports;
 exports.Validation = Validation_exports;