@morpho-org/bundler-sdk-viem 2.0.0-next.2 → 2.0.0-next.20

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Morpho Labs
+Copyright (c) 2024 Morpho Association
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/BundlerAction.d.ts

@@ -1,5 +1,5 @@
 import { type Address, type Hex } from "viem";
-import type { Action, Authorization, MarketParams, Permit2PermitSingle, ReallocationWithdrawal } from "./types/index.js";
+import type { Action, Authorization, InputMarketParams, Permit2PermitSingle, ReallocationWithdrawal } from "./types/index.js";
 export type BundlerCall = Hex;
 /**
  * Namespace to easily encode calls to the Bundler contract, using ethers.
@@ -117,7 +117,7 @@ export declare namespace BundlerAction {
      * @param onBehalf The address to supply on behalf of.
      * @param callbackCalls The array of calls to execute inside Morpho Blue's `onMorphoSupply` callback.
      */
-    function morphoSupply(market: MarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, onBehalf: Address, callbackCalls: BundlerCall[]): BundlerCall;
+    function morphoSupply(market: InputMarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, onBehalf: Address, callbackCalls: BundlerCall[]): BundlerCall;
     /**
      * Encodes a call to the Bundler to supply collateral to a Morpho Blue market.
      * @param market The market params to supply to.
@@ -125,7 +125,7 @@ export declare namespace BundlerAction {
      * @param onBehalf The address to supply on behalf of.
      * @param callbackCalls The array of calls to execute inside Morpho Blue's `onMorphoSupplyCollateral` callback.
      */
-    function morphoSupplyCollateral(market: MarketParams, assets: bigint, onBehalf: Address, callbackCalls: BundlerCall[]): BundlerCall;
+    function morphoSupplyCollateral(market: InputMarketParams, assets: bigint, onBehalf: Address, callbackCalls: BundlerCall[]): BundlerCall;
     /**
      * Encodes a call to the Bundler to borrow from a Morpho Blue market.
      * @param market The market params to borrow from.
@@ -134,7 +134,7 @@ export declare namespace BundlerAction {
      * @param slippageAmount The minimum (resp. maximum) amount of assets (resp. borrow shares) to borrow (resp. mint) (protects the sender from unexpected slippage).
      * @param receiver The address to send borrowed tokens to.
      */
-    function morphoBorrow(market: MarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, receiver: Address): BundlerCall;
+    function morphoBorrow(market: InputMarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, receiver: Address): BundlerCall;
     /**
      * Encodes a call to the Bundler to repay to a Morpho Blue market.
      * @param market The market params to repay to.
@@ -144,7 +144,7 @@ export declare namespace BundlerAction {
      * @param onBehalf The address to repay on behalf of.
      * @param callbackCalls The array of calls to execute inside Morpho Blue's `onMorphoSupply` callback.
      */
-    function morphoRepay(market: MarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, onBehalf: Address, callbackCalls: BundlerCall[]): BundlerCall;
+    function morphoRepay(market: InputMarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, onBehalf: Address, callbackCalls: BundlerCall[]): BundlerCall;
     /**
      * Encodes a call to the Bundler to withdraw from a Morpho Blue market.
      * @param market The market params to withdraw from.
@@ -153,14 +153,14 @@ export declare namespace BundlerAction {
      * @param slippageAmount The minimum (resp. maximum) amount of assets (resp. supply shares) to withdraw (resp. redeem) (protects the sender from unexpected slippage).
      * @param receiver The address to send withdrawn tokens to.
      */
-    function morphoWithdraw(market: MarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, receiver: Address): BundlerCall;
+    function morphoWithdraw(market: InputMarketParams, assets: bigint, shares: bigint, slippageAmount: bigint, receiver: Address): BundlerCall;
     /**
      * Encodes a call to the Bundler to withdraw collateral from a Morpho Blue market.
      * @param market The market params to withdraw from.
      * @param assets The amount of assets to withdraw.
      * @param receiver The address to send withdrawn tokens to.
      */
-    function morphoWithdrawCollateral(market: MarketParams, assets: bigint, receiver: Address): BundlerCall;
+    function morphoWithdrawCollateral(market: InputMarketParams, assets: bigint, receiver: Address): BundlerCall;
     /**
      * Encodes a call to the Bundler to flash loan from Morpho Blue.
      * @param asset The address of the ERC20 token to flash loan.
@@ -176,7 +176,7 @@ export declare namespace BundlerAction {
      * @param withdrawals The array of withdrawals to perform, before supplying everything to the supply market.
      * @param supplyMarketParams The market params to reallocate to.
      */
-    function metaMorphoReallocateTo(publicAllocator: Address, vault: Address, value: bigint, withdrawals: ReallocationWithdrawal[], supplyMarketParams: MarketParams): BundlerCall;
+    function metaMorphoReallocateTo(publicAllocator: Address, vault: Address, value: bigint, withdrawals: ReallocationWithdrawal[], supplyMarketParams: InputMarketParams): BundlerCall;
     /**
      * Encodes a call to the Bundler to claim rewards from the Universal Rewards Distributor.
      * @param distributor The address of the distributor to claim rewards from.

package/lib/actions.js

@@ -425,17 +425,17 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_Supply": {
             const { id, assets = 0n, shares = 0n, onBehalf } = operation.args;
-            const { config } = dataBefore.getMarket(id);
+            const { params } = dataBefore.getMarket(id);
             // Already takes slippage into account.
             const slippageAmount = shares === 0n
                 ? dataAfter.getPosition(onBehalf, id).supplyShares -
                     dataBefore.getPosition(onBehalf, id).supplyShares
-                : dataAfter.getHolding(sender, config.loanToken).balance -
-                    dataBefore.getHolding(sender, config.loanToken).balance;
+                : dataAfter.getHolding(sender, params.loanToken).balance -
+                    dataBefore.getHolding(sender, params.loanToken).balance;
             actions.push({
                 type: "morphoSupply",
                 args: [
-                    config,
+                    params,
                     assets,
                     shares,
                     slippageAmount,
@@ -447,47 +447,47 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_Withdraw": {
             const { id, assets = 0n, shares = 0n, onBehalf, receiver, } = operation.args;
-            const { config } = dataBefore.getMarket(id);
+            const { params } = dataBefore.getMarket(id);
             // Already takes slippage into account.
             const slippageAmount = shares === 0n
                 ? dataBefore.getPosition(onBehalf, id).supplyShares -
                     dataAfter.getPosition(onBehalf, id).supplyShares
-                : dataBefore.getHolding(sender, config.loanToken).balance -
-                    dataAfter.getHolding(sender, config.loanToken).balance;
+                : dataBefore.getHolding(sender, params.loanToken).balance -
+                    dataAfter.getHolding(sender, params.loanToken).balance;
             actions.push({
                 type: "morphoWithdraw",
-                args: [config, assets, shares, slippageAmount, receiver],
+                args: [params, assets, shares, slippageAmount, receiver],
             });
             break;
         }
         case "Blue_Borrow": {
             const { id, assets = 0n, shares = 0n, onBehalf, receiver, } = operation.args;
-            const { config } = dataBefore.getMarket(id);
+            const { params } = dataBefore.getMarket(id);
             // Already takes slippage into account.
             const slippageAmount = shares === 0n
                 ? dataAfter.getPosition(onBehalf, id).borrowShares -
                     dataBefore.getPosition(onBehalf, id).borrowShares
-                : dataAfter.getHolding(sender, config.loanToken).balance -
-                    dataBefore.getHolding(sender, config.loanToken).balance;
+                : dataAfter.getHolding(sender, params.loanToken).balance -
+                    dataBefore.getHolding(sender, params.loanToken).balance;
             actions.push({
                 type: "morphoBorrow",
-                args: [config, assets, shares, slippageAmount, receiver],
+                args: [params, assets, shares, slippageAmount, receiver],
             });
             break;
         }
         case "Blue_Repay": {
             const { id, assets = 0n, shares = 0n, onBehalf } = operation.args;
-            const { config } = dataBefore.getMarket(id);
+            const { params } = dataBefore.getMarket(id);
             // Already takes slippage into account.
             const slippageAmount = shares === 0n
                 ? dataBefore.getPosition(onBehalf, id).borrowShares -
                     dataAfter.getPosition(onBehalf, id).borrowShares
-                : dataBefore.getHolding(sender, config.loanToken).balance -
-                    dataAfter.getHolding(sender, config.loanToken).balance;
+                : dataBefore.getHolding(sender, params.loanToken).balance -
+                    dataAfter.getHolding(sender, params.loanToken).balance;
             actions.push({
                 type: "morphoRepay",
                 args: [
-                    config,
+                    params,
                     assets,
                     shares,
                     slippageAmount,
@@ -499,26 +499,26 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_SupplyCollateral": {
             const { id, assets, onBehalf } = operation.args;
-            const { config } = dataBefore.getMarket(id);
-            if (convexWrapperTokens[chainId].has(config.collateralToken)) {
+            const { params } = dataBefore.getMarket(id);
+            if (convexWrapperTokens[chainId].has(params.collateralToken)) {
                 actions.push({
                     type: "erc20WrapperDepositFor",
-                    args: [config.collateralToken, assets],
+                    args: [params.collateralToken, assets],
                 });
                 break;
             }
             actions.push({
                 type: "morphoSupplyCollateral",
-                args: [config, assets, onBehalf, callbackBundle?.actions ?? []],
+                args: [params, assets, onBehalf, callbackBundle?.actions ?? []],
             });
             break;
         }
         case "Blue_WithdrawCollateral": {
             const { id, assets, receiver } = operation.args;
-            const { config } = dataBefore.getMarket(id);
+            const { params } = dataBefore.getMarket(id);
             actions.push({
                 type: "morphoWithdrawCollateral",
-                args: [config, assets, receiver],
+                args: [params, assets, receiver],
             });
             break;
         }
@@ -581,10 +581,10 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     address,
                     fee,
                     withdrawals.map(({ id, assets }) => ({
-                        marketParams: dataBefore.getMarket(id).config,
+                        marketParams: dataBefore.getMarket(id).params,
                         amount: assets,
                     })),
-                    dataBefore.getMarket(supplyMarketId).config,
+                    dataBefore.getMarket(supplyMarketId).params,
                 ],
             });
             break;

package/lib/operations.js

@@ -195,7 +195,7 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
         const newTotalSupplyAssets = market.totalSupplyAssets - withdrawnAssets;
         const newTotalBorrowAssets = market.totalBorrowAssets + borrowedAssets;
         const reallocations = {};
-        const supplyTargetUtilization = publicAllocatorOptions?.supplyTargetUtilization?.[market.config.id] ??
+        const supplyTargetUtilization = publicAllocatorOptions?.supplyTargetUtilization?.[market.params.id] ??
             DEFAULT_SUPPLY_TARGET_UTILIZATION;
         if (MarketUtils.getUtilization({
             totalSupplyAssets: newTotalSupplyAssets,
@@ -439,10 +439,10 @@ export const finalizeBundle = (operations, startData, receiver, unwrapTokens = n
         switch (operation.type) {
             case "Blue_Borrow":
             case "Blue_Withdraw":
-                token = startData.getMarket(operation.args.id).config.loanToken;
+                token = startData.getMarket(operation.args.id).params.loanToken;
                 break;
             case "Blue_WithdrawCollateral":
-                token = startData.getMarket(operation.args.id).config.collateralToken;
+                token = startData.getMarket(operation.args.id).params.collateralToken;
                 break;
             case "MetaMorpho_Withdraw":
                 token = startData.getVault(operation.address).asset;

package/lib/types/actions.d.ts

@@ -1,7 +1,7 @@
 import type { Account, Chain, Client, Hex, SendTransactionRequest, Transport } from "viem";
-import type { Address, MarketConfig } from "@morpho-org/blue-sdk";
+import type { Address, MarketParams } from "@morpho-org/blue-sdk";
 import type { SimulationResult } from "@morpho-org/simulation-sdk";
-export type MarketParams = Pick<MarketConfig, "loanToken" | "collateralToken" | "oracle" | "irm" | "lltv">;
+export type InputMarketParams = Pick<MarketParams, "loanToken" | "collateralToken" | "oracle" | "irm" | "lltv">;
 export interface Authorization {
     authorizer: Address;
     authorized: Address;
@@ -10,7 +10,7 @@ export interface Authorization {
     deadline: bigint;
 }
 export interface ReallocationWithdrawal {
-    marketParams: MarketParams;
+    marketParams: InputMarketParams;
     amount: bigint;
 }
 export interface Permit2PermitSingleDetails {
@@ -88,7 +88,7 @@ export interface ActionArgs {
         skipRevert?: boolean
     ];
     morphoSupply: [
-        market: MarketParams,
+        market: InputMarketParams,
         assets: bigint,
         shares: bigint,
         slippageAmount: bigint,
@@ -96,20 +96,20 @@ export interface ActionArgs {
         onMorphoSupply: Action[]
     ];
     morphoSupplyCollateral: [
-        market: MarketParams,
+        market: InputMarketParams,
         assets: bigint,
         onBehalf: Address,
         onMorphoSupplyCollateral: Action[]
     ];
     morphoBorrow: [
-        market: MarketParams,
+        market: InputMarketParams,
         assets: bigint,
         shares: bigint,
         slippageAmount: bigint,
         receiver: Address
     ];
     morphoRepay: [
-        market: MarketParams,
+        market: InputMarketParams,
         assets: bigint,
         shares: bigint,
         slippageAmount: bigint,
@@ -117,14 +117,14 @@ export interface ActionArgs {
         onMorphoRepay: Action[]
     ];
     morphoWithdraw: [
-        market: MarketParams,
+        market: InputMarketParams,
         assets: bigint,
         shares: bigint,
         slippageAmount: bigint,
         receiver: Address
     ];
     morphoWithdrawCollateral: [
-        market: MarketParams,
+        market: InputMarketParams,
         assets: bigint,
         receiver: Address
     ];
@@ -133,7 +133,7 @@ export interface ActionArgs {
         vault: Address,
         value: bigint,
         withdrawals: ReallocationWithdrawal[],
-        supplyMarket: MarketParams
+        supplyMarket: InputMarketParams
     ];
     urdClaim: [
         distributor: Address,

package/package.json

@@ -1,7 +1,17 @@
 {
   "name": "@morpho-org/bundler-sdk-viem",
-  "version": "2.0.0-next.2",
-  "author": "Morpho Labs <contact@morpho.org>",
+  "description": "Viem-based extension of `@morpho-org/simulation-sdk` that exports utilities to transform simple interactions on Morpho (such as `Blue_Borrow`) and Morpho Vaults (such as `MetaMorpho_Deposit`) into the required bundles (with ERC20 approvals, transfers, etc) to submit to the bundler onchain.",
+  "version": "2.0.0-next.20",
+  "author": "Morpho Association <contact@morpho.org>",
+  "contributors": [
+    "Rubilmax <rmilon@gmail.com>"
+  ],
+  "repository": "github:morpho-org/sdks",
+  "homepage": "https://github.com/morpho-org/sdks",
+  "bugs": {
+    "url": "https://github.com/morpho-org/sdks/issues",
+    "email": "contact@morpho.org"
+  },
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
@@ -10,59 +20,31 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk-viem": "^1.12.4",
-    "@morpho-org/morpho-ts": "^1.12.4",
-    "@morpho-org/blue-sdk": "^1.12.4",
-    "@morpho-org/simulation-sdk": "^1.12.4"
+    "@morpho-org/blue-sdk-viem": "^2.0.0-next.18",
+    "@morpho-org/blue-sdk": "^2.0.0-next.20",
+    "@morpho-org/morpho-ts": "^2.0.0-next.9",
+    "@morpho-org/simulation-sdk": "^2.0.0-next.15"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",
-    "@types/lodash": "^4.17.7",
-    "@types/node": "^22.2.0",
+    "@types/lodash": "^4.17.12",
+    "@types/node": "^22.7.8",
     "lodash": "^4.17.21",
     "typescript": "^5.6.3",
-    "viem": "^2.21.19",
+    "viem": "^2.21.36",
     "vitest": "^2.1.3",
-    "@morpho-org/blue-sdk": "^1.12.4",
-    "@morpho-org/blue-sdk-viem": "^1.12.4",
-    "@morpho-org/morpho-test": "^1.12.4",
-    "@morpho-org/morpho-ts": "^1.12.4",
-    "@morpho-org/simulation-sdk": "^1.12.4",
-    "@morpho-org/test-viem": "^1.12.4",
-    "@morpho-org/test-wagmi": "^1.12.4",
-    "@morpho-org/simulation-sdk-wagmi": "^1.12.4"
-  },
-  "release": {
-    "branches": [
-      "main",
-      {
-        "name": "next",
-        "prerelease": true
-      }
-    ],
-    "extends": "semantic-release-monorepo",
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      [
-        "@semantic-release/exec",
-        {
-          "prepareCmd": "pnpm version ${nextRelease.version} --no-git-tag-version",
-          "publishCmd": "pnpm publish --access public --tag ${nextRelease.channel} --no-git-checks"
-        }
-      ],
-      "@semantic-release/github"
-    ]
+    "@morpho-org/blue-sdk": "^2.0.0-next.20",
+    "@morpho-org/morpho-test": "^2.0.0-next.11",
+    "@morpho-org/morpho-ts": "^2.0.0-next.9",
+    "@morpho-org/blue-sdk-viem": "^2.0.0-next.18",
+    "@morpho-org/simulation-sdk": "^2.0.0-next.15",
+    "@morpho-org/simulation-sdk-wagmi": "^2.0.0-next.18",
+    "@morpho-org/test": "^2.0.0-next.16",
+    "@morpho-org/test-wagmi": "^2.0.0-next.16"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",
     "build": "tsc --build tsconfig.build.json"
   },
-  "types": "lib/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "default": "./lib/index.js"
-    }
-  }
+  "types": "lib/index.d.ts"
 }