@morpho-dev/router 0.1.10 → 0.1.11

package/dist/drizzle/offers_v1.1/meta/_journal.json

@@ -43,6 +43,20 @@
       "when": 1758270235112,
       "tag": "0005_add-missing-indices-to-liquidity-tables",
       "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "7",
+      "when": 1758809713216,
+      "tag": "0006_add-callback-amount-to-queues-table",
+      "breakpoints": true
+    },
+    {
+      "idx": 7,
+      "version": "7",
+      "when": 1758889033235,
+      "tag": "0007_add-index-to-created-at",
+      "breakpoints": true
     }
   ]
 }

package/dist/index.browser.d.cts

@@ -1,5 +1,5 @@
 import * as _morpho_dev_mempool from '@morpho-dev/mempool';
-import { Offer, Errors, Format, Maturity, LLTV, Compute, Chain } from '@morpho-dev/mempool';
+import { Chain, Offer, Errors, Format, Maturity, LLTV, Compute } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import * as viem from 'viem';
 import { PublicActions, Address, Hex } from 'viem';
@@ -34,6 +34,7 @@ type LiquidityQueue = {
     queueId: string;
     availableLiquidityPoolId: string;
     index: number;
+    callbackAmount: string;
     updatedAt: Date;
 };
 type LiquidityPool = {
@@ -56,7 +57,7 @@ declare function fetch(parameters: {
     type: CallbackType;
     pairs: Array<{
         user: Address;
-        contract: Address;
+        loanToken: Address;
     }>;
     options?: {
         batchSize?: number;
@@ -84,15 +85,29 @@ declare enum CallbackType {
     SellWithdrawFromWallet = "sell_withdraw_from_wallet"
 }
 declare const WhitelistedCallbackAddresses: Record<CallbackType, readonly string[]>;
-declare function buildLiquidity(parameters: {
-    type: CallbackType;
-    user: string;
-    contract: string;
-    chainId: bigint;
-    amount: string | bigint;
+type BuildLiquidityParameters = {
+    type: CallbackType.BuyWithEmptyCallback;
+    user: Address;
+    loanToken: Address;
+    chainId: Chain.Id;
+    amount: bigint;
+    index?: number;
+    updatedAt?: Date;
+} | {
+    type: CallbackType.SellWithdrawFromWallet;
+    user: Address;
+    termId: string;
+    chainId: Chain.Id;
+    amount: bigint;
+    collaterals: Array<{
+        collateralAddress: Address;
+        balance: bigint;
+        callbackAmount: bigint;
+    }>;
     index?: number;
     updatedAt?: Date;
-}): Liquidity;
+};
+declare function buildLiquidity(parameters: BuildLiquidityParameters): Liquidity;
 declare function getCallbackIdForOffer(offer: Offer.Offer): string | null;
 declare function decode$1(parameters: {
     type: CallbackType;

package/dist/index.browser.d.ts

@@ -1,5 +1,5 @@
 import * as _morpho_dev_mempool from '@morpho-dev/mempool';
-import { Offer, Errors, Format, Maturity, LLTV, Compute, Chain } from '@morpho-dev/mempool';
+import { Chain, Offer, Errors, Format, Maturity, LLTV, Compute } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import * as viem from 'viem';
 import { PublicActions, Address, Hex } from 'viem';
@@ -34,6 +34,7 @@ type LiquidityQueue = {
     queueId: string;
     availableLiquidityPoolId: string;
     index: number;
+    callbackAmount: string;
     updatedAt: Date;
 };
 type LiquidityPool = {
@@ -56,7 +57,7 @@ declare function fetch(parameters: {
     type: CallbackType;
     pairs: Array<{
         user: Address;
-        contract: Address;
+        loanToken: Address;
     }>;
     options?: {
         batchSize?: number;
@@ -84,15 +85,29 @@ declare enum CallbackType {
     SellWithdrawFromWallet = "sell_withdraw_from_wallet"
 }
 declare const WhitelistedCallbackAddresses: Record<CallbackType, readonly string[]>;
-declare function buildLiquidity(parameters: {
-    type: CallbackType;
-    user: string;
-    contract: string;
-    chainId: bigint;
-    amount: string | bigint;
+type BuildLiquidityParameters = {
+    type: CallbackType.BuyWithEmptyCallback;
+    user: Address;
+    loanToken: Address;
+    chainId: Chain.Id;
+    amount: bigint;
+    index?: number;
+    updatedAt?: Date;
+} | {
+    type: CallbackType.SellWithdrawFromWallet;
+    user: Address;
+    termId: string;
+    chainId: Chain.Id;
+    amount: bigint;
+    collaterals: Array<{
+        collateralAddress: Address;
+        balance: bigint;
+        callbackAmount: bigint;
+    }>;
     index?: number;
     updatedAt?: Date;
-}): Liquidity;
+};
+declare function buildLiquidity(parameters: BuildLiquidityParameters): Liquidity;
 declare function getCallbackIdForOffer(offer: Offer.Offer): string | null;
 declare function decode$1(parameters: {
     type: CallbackType;

package/dist/index.browser.js

@@ -35,46 +35,95 @@ var WhitelistedCallbackAddresses = {
     "0x1111111111111111111111111111111111111111",
     "0x2222222222222222222222222222222222222222"
     // @TODO: update once deployed and add mapping per chain if needed
-  ]
+  ].map((address) => address.toLowerCase())
 };
 function buildLiquidity(parameters) {
-  const { type, user, contract, chainId, amount, index = 0, updatedAt = /* @__PURE__ */ new Date() } = parameters;
-  if (type !== "buy_with_empty_callback" /* BuyWithEmptyCallback */)
-    throw new Error(`CallbackType not implemented: ${type}`);
-  const amountStr = amount.toString();
-  const id = `${user}-${chainId.toString()}-${type}-${contract}`.toLowerCase();
-  return {
-    userPosition: {
-      id,
-      availableLiquidityQueueId: id,
-      user: user.toLowerCase(),
-      chainId,
-      amount: amountStr,
-      updatedAt
-    },
-    queues: [
-      {
-        queue: {
-          queueId: id,
-          availableLiquidityPoolId: id,
-          index,
+  switch (parameters.type) {
+    case "buy_with_empty_callback" /* BuyWithEmptyCallback */: {
+      const { user, loanToken, chainId, amount, index = 0, updatedAt = /* @__PURE__ */ new Date() } = parameters;
+      const amountStr = amount.toString();
+      const id = `${user}-${chainId.toString()}-${parameters.type}-${loanToken}`.toLowerCase();
+      const poolId = `${user}-${chainId.toString()}-${loanToken}`.toLowerCase();
+      return {
+        userPosition: {
+          id,
+          availableLiquidityQueueId: id,
+          user: user.toLowerCase(),
+          chainId,
+          amount: amountStr,
           updatedAt
         },
-        pool: {
+        queues: [
+          {
+            queue: {
+              queueId: id,
+              availableLiquidityPoolId: poolId,
+              index,
+              callbackAmount: "0",
+              updatedAt
+            },
+            pool: {
+              id: poolId,
+              amount: amountStr,
+              updatedAt
+            }
+          }
+        ]
+      };
+    }
+    case "sell_withdraw_from_wallet" /* SellWithdrawFromWallet */: {
+      const {
+        user,
+        termId,
+        chainId,
+        amount,
+        collaterals,
+        index = 0,
+        updatedAt = /* @__PURE__ */ new Date()
+      } = parameters;
+      const amountStr = amount.toString();
+      const id = `${user}-${chainId.toString()}-${parameters.type}-${termId}`.toLowerCase();
+      return {
+        userPosition: {
           id,
+          availableLiquidityQueueId: id,
+          user: user.toLowerCase(),
+          chainId,
           amount: amountStr,
           updatedAt
-        }
-      }
-    ]
-  };
+        },
+        queues: collaterals.map((collateral) => {
+          const poolId = `${user}-${chainId.toString()}-${collateral.collateralAddress}`.toLowerCase();
+          return {
+            queue: {
+              queueId: id,
+              availableLiquidityPoolId: poolId,
+              index,
+              callbackAmount: collateral.callbackAmount.toString(),
+              updatedAt
+            },
+            pool: {
+              id: poolId,
+              amount: collateral.balance.toString(),
+              updatedAt
+            }
+          };
+        })
+      };
+    }
+    default: {
+      throw new Error(`CallbackType not implemented`);
+    }
+  }
 }
 function getCallbackIdForOffer(offer) {
   if (offer.buy && offer.callback.data === "0x") {
-    const type = "buy_with_empty_callback" /* BuyWithEmptyCallback */;
-    const user = offer.offering;
-    const loanToken = offer.loanToken;
-    return `${user}-${offer.chainId.toString()}-${type}-${loanToken}`.toLowerCase();
+    return `${offer.offering}-${offer.chainId.toString()}-${"buy_with_empty_callback" /* BuyWithEmptyCallback */}-${offer.loanToken}`.toLowerCase();
+  }
+  if (!offer.buy && offer.callback.data !== "0x" && WhitelistedCallbackAddresses["sell_withdraw_from_wallet" /* SellWithdrawFromWallet */].includes(
+    offer.callback.address.toLowerCase()
+  )) {
+    return `${offer.offering}-${offer.chainId.toString()}-${"sell_withdraw_from_wallet" /* SellWithdrawFromWallet */}-${mempool.Offer.termId(offer)}`.toLowerCase();
   }
   return null;
 }
@@ -270,20 +319,20 @@ async function fetch2(parameters) {
   const map = await fetchBalancesAndAllowances({
     client,
     spender,
-    pairs: pairs.map(({ user, contract }) => ({ user, token: contract })),
+    pairs: pairs.map(({ user, loanToken }) => ({ user, token: loanToken })),
     options
   });
   const out = [];
-  for (const [user, perContract] of map) {
-    for (const [contract, { balance, allowance }] of perContract) {
+  for (const [user, perLoanToken] of map) {
+    for (const [loanToken, { balance, allowance }] of perLoanToken) {
       const amount = balance < allowance ? balance : allowance;
       out.push(
         buildLiquidity({
           type,
           user,
-          contract,
+          loanToken,
           chainId,
-          amount: amount.toString(),
+          amount,
           index: 0
         })
       );