@morpho-org/bundler-sdk-viem 3.0.0-next.3 → 3.0.0-next.4

package/lib/ActionBundle.d.ts

@@ -0,0 +1,35 @@
+import type { SimulationResult } from "@morpho-org/simulation-sdk";
+import type { Account, Address, Chain, Client, Hex, Transport } from "viem";
+import type { Action, SignatureRequirement, TransactionRequirement } from "./types/index.js";
+export declare class ActionBundleRequirements<TR extends {
+    tx: {
+        to: Address;
+        data: Hex;
+    };
+} = TransactionRequirement, SR extends SignatureRequirement = SignatureRequirement> {
+    readonly txs: TR[];
+    readonly signatures: SR[];
+    constructor(txs?: TR[], signatures?: SR[]);
+    sign(client: Client<Transport, Chain | undefined, Account>): Promise<Hex[]>;
+    sign(client: Client, account: Account): Promise<Hex[]>;
+}
+export declare class ActionBundle<TR extends {
+    tx: {
+        to: Address;
+        data: Hex;
+    };
+} = TransactionRequirement, SR extends SignatureRequirement = SignatureRequirement> {
+    readonly steps: SimulationResult;
+    readonly actions: Action[];
+    readonly requirements: ActionBundleRequirements<TR, SR>;
+    constructor(steps: SimulationResult, actions?: Action[], requirements?: ActionBundleRequirements<TR, SR>);
+    tx(): {
+        to: `0x${string}`;
+        value: bigint;
+        data: `0x${string}`;
+    };
+    txs(): {
+        to: Address;
+        data: Hex;
+    }[];
+}

package/lib/ActionBundle.js

@@ -0,0 +1,28 @@
+import { BundlerAction } from "./BundlerAction.js";
+export class ActionBundleRequirements {
+    txs;
+    signatures;
+    constructor(txs = [], signatures = []) {
+        this.txs = txs;
+        this.signatures = signatures;
+    }
+    sign(client, account = client.account) {
+        return Promise.all(this.signatures.map((requirement) => requirement.sign(client, account)));
+    }
+}
+export class ActionBundle {
+    steps;
+    actions;
+    requirements;
+    constructor(steps, actions = [], requirements = new ActionBundleRequirements()) {
+        this.steps = steps;
+        this.actions = actions;
+        this.requirements = requirements;
+    }
+    tx() {
+        return BundlerAction.encodeBundle(this.steps[0].chainId, this.actions);
+    }
+    txs() {
+        return this.requirements.txs.map(({ tx }) => tx).concat([this.tx()]);
+    }
+}

package/lib/BundlerAction.d.ts

@@ -9,7 +9,7 @@ export interface BundlerCall {
     callbackHash: Hex;
 }
 /**
- * Namespace to easily encode calls to the Bundler contract, using ethers.
+ * Namespace to easily encode calls to the Bundler contract, using viem.
  */
 export declare namespace BundlerAction {
     function encodeBundle(chainId: ChainId, actions: Action[]): {
@@ -388,4 +388,3 @@ export declare namespace BundlerAction {
      */
     function compoundV3AllowBySig(chainId: ChainId, instance: Address, owner: Address, isAllowed: boolean, nonce: bigint, expiry: bigint, signature: Hex, manager?: Address, skipRevert?: boolean): BundlerCall[];
 }
-export default BundlerAction;

package/lib/BundlerAction.js

@@ -5,7 +5,7 @@ import { encodeAbiParameters, encodeFunctionData, keccak256, maxUint256, parseSi
 import { BundlerErrors } from "./errors.js";
 const reenterSelectorHash = keccak256(toFunctionSelector(bundler3Abi.find((item) => item.type === "function" && item.name === "reenter")));
 /**
- * Namespace to easily encode calls to the Bundler contract, using ethers.
+ * Namespace to easily encode calls to the Bundler contract, using viem.
  */
 export var BundlerAction;
 (function (BundlerAction) {
@@ -1465,4 +1465,3 @@ export var BundlerAction;
     }
     BundlerAction.compoundV3AllowBySig = compoundV3AllowBySig;
 })(BundlerAction || (BundlerAction = {}));
-export default BundlerAction;

package/lib/actions.d.ts

@@ -1,14 +1,12 @@
 import { type Address } from "viem";
 import { type MaybeDraft, type SimulationState } from "@morpho-org/simulation-sdk";
-import type { Action, ActionBundle, BundlerOperation, TransactionRequirement } from "./types/index.js";
+import { ActionBundle, ActionBundleRequirements } from "./ActionBundle.js";
+import type { Action, BundlerOperation, TransactionRequirement } from "./types/index.js";
 export declare const APPROVE_ONLY_ONCE_TOKENS: Partial<Record<number, Address[]>>;
 export declare const MAX_TOKEN_APPROVALS: Partial<Record<number, Record<Address, bigint>>>;
 export declare const encodeOperation: (operation: BundlerOperation, dataBefore: MaybeDraft<SimulationState>, supportsSignature?: boolean, index?: number) => {
     dataAfter: MaybeDraft<SimulationState>;
     actions: Action[];
-    requirements: {
-        signatures: import("./types/actions.js").SignatureRequirement[];
-        txs: TransactionRequirement[];
-    };
+    requirements: ActionBundleRequirements<TransactionRequirement, import("./types/actions.js").SignatureRequirement>;
 };
-export declare function encodeBundle(operations: BundlerOperation[], startData: MaybeDraft<SimulationState>, supportsSignature?: boolean): ActionBundle;
+export declare function encodeBundle(operations: BundlerOperation[], startData: MaybeDraft<SimulationState>, supportsSignature?: boolean): ActionBundle<TransactionRequirement, import("./types/actions.js").SignatureRequirement>;

package/lib/actions.js

@@ -4,7 +4,7 @@ import { Time, getValue } from "@morpho-org/morpho-ts";
 import { simulateOperation, } from "@morpho-org/simulation-sdk";
 import { blueAbi, getAuthorizationTypedData, getDaiPermitTypedData, getPermit2PermitTypedData, getPermitTypedData, } from "@morpho-org/blue-sdk-viem";
 import { signTypedData } from "viem/actions";
-import BundlerAction from "./BundlerAction.js";
+import { ActionBundle, ActionBundleRequirements } from "./ActionBundle.js";
 export const APPROVE_ONLY_ONCE_TOKENS = {
     [ChainId.EthMainnet]: [
         "0xdAC17F958D2ee523a2206206994597C13D831ec7", // USDT
@@ -67,10 +67,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     const deadline = Time.timestamp() + Time.s.from.h(24n);
     const { morpho, bundler3: { bundler3, generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
     const actions = [];
-    const requirements = {
-        signatures: [],
-        txs: [],
-    };
+    const requirements = new ActionBundleRequirements();
     let callbackBundle;
     const callback = getValue(operation.args, "callback");
     const simulatedOperation = {
@@ -531,24 +528,13 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     };
 };
 export function encodeBundle(operations, startData, supportsSignature = true) {
-    const { chainId } = startData;
-    const actions = [];
-    const requirements = {
-        signatures: [],
-        txs: [],
-    };
-    const steps = [startData];
+    const bundle = new ActionBundle([startData]);
     for (let index = 0; index < operations.length; ++index) {
-        const bundle = encodeOperation(operations[index], steps[index], supportsSignature, index);
-        steps.push(bundle.dataAfter);
-        actions.push(...bundle.actions);
-        requirements.signatures.push(...bundle.requirements.signatures);
-        requirements.txs.push(...bundle.requirements.txs);
+        const { dataAfter, actions, requirements } = encodeOperation(operations[index], bundle.steps[index], supportsSignature, index);
+        bundle.steps.push(dataAfter);
+        bundle.actions.push(...actions);
+        bundle.requirements.signatures.push(...requirements.signatures);
+        bundle.requirements.txs.push(...requirements.txs);
     }
-    return {
-        steps,
-        actions,
-        requirements,
-        tx: () => BundlerAction.encodeBundle(chainId, actions),
-    };
+    return bundle;
 }

package/lib/bundle.d.ts

@@ -0,0 +1,12 @@
+import type { SimulationState } from "@morpho-org/simulation-sdk";
+import type { Address } from "viem";
+import { type BundlingOptions } from "./operations.js";
+import type { InputBundlerOperation } from "./types/index.js";
+export declare const setupBundle: (inputOperations: InputBundlerOperation[], startData: SimulationState, receiver: Address, { supportsSignature, unwrapTokens, unwrapSlippage, ...options }?: BundlingOptions & {
+    supportsSignature?: boolean;
+    unwrapTokens?: Set<Address>;
+    unwrapSlippage?: bigint;
+}) => {
+    operations: import("./types/operations.js").BundlerOperation[];
+    bundle: import("./ActionBundle.js").ActionBundle<import("./types/actions.js").TransactionRequirement, import("./types/actions.js").SignatureRequirement>;
+};

package/lib/bundle.js

@@ -0,0 +1,11 @@
+import { encodeBundle } from "./actions.js";
+import { finalizeBundle, populateBundle, } from "./operations.js";
+export const setupBundle = (inputOperations, startData, receiver, { supportsSignature, unwrapTokens, unwrapSlippage, ...options } = {}) => {
+    let { operations } = populateBundle(inputOperations, startData, options);
+    operations = finalizeBundle(operations, startData, receiver, unwrapTokens, unwrapSlippage);
+    const bundle = encodeBundle(operations, startData, supportsSignature);
+    return {
+        operations,
+        bundle,
+    };
+};

package/lib/index.d.ts

@@ -3,3 +3,5 @@ export * from "./operations.js";
 export * from "./errors.js";
 export * from "./types/index.js";
 export * from "./BundlerAction.js";
+export * from "./bundle.js";
+export * from "./ActionBundle.js";

package/lib/index.js

@@ -3,3 +3,5 @@ export * from "./operations.js";
 export * from "./errors.js";
 export * from "./types/index.js";
 export * from "./BundlerAction.js";
+export * from "./bundle.js";
+export * from "./ActionBundle.js";

package/lib/types/actions.d.ts

@@ -1,6 +1,5 @@
 import type { Account, Chain, Client, Hex, TransactionRequest, Transport } from "viem";
 import type { Address, InputMarketParams } from "@morpho-org/blue-sdk";
-import type { SimulationResult } from "@morpho-org/simulation-sdk";
 export interface Authorization {
     authorizer: Address;
     authorized: Address;
@@ -267,15 +266,3 @@ export interface SignatureRequirement {
     action: Action;
     sign: SignatureRequirementFunction;
 }
-export interface ActionBundle {
-    steps: SimulationResult;
-    actions: Action[];
-    requirements: {
-        signatures: SignatureRequirement[];
-        txs: TransactionRequirement[];
-    };
-    tx: () => TransactionRequest & {
-        to: Address;
-        data: Hex;
-    };
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/bundler-sdk-viem",
   "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": "3.0.0-next.3",
+  "version": "3.0.0-next.4",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -20,10 +20,10 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk": "^3.0.0-next.5",
-    "@morpho-org/blue-sdk-viem": "^3.0.0-next.2",
-    "@morpho-org/simulation-sdk": "^3.0.0-next.2",
-    "@morpho-org/morpho-ts": "^2.2.0-next.0"
+    "@morpho-org/blue-sdk": "^2.3.1",
+    "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/morpho-ts": "^2.1.0",
+    "@morpho-org/simulation-sdk": "^2.1.3"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -35,14 +35,14 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk": "^3.0.0-next.5",
-    "@morpho-org/blue-sdk-viem": "^3.0.0-next.2",
-    "@morpho-org/morpho-test": "^2.3.0-next.0",
-    "@morpho-org/simulation-sdk": "^3.0.0-next.2",
-    "@morpho-org/morpho-ts": "^2.2.0-next.0",
+    "@morpho-org/morpho-ts": "^2.1.0",
+    "@morpho-org/blue-sdk": "^2.3.1",
+    "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/morpho-test": "^2.2.1",
+    "@morpho-org/simulation-sdk": "^2.1.3",
+    "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
     "@morpho-org/test": "^2.0.6",
-    "@morpho-org/test-wagmi": "^2.0.4",
-    "@morpho-org/simulation-sdk-wagmi": "^3.0.0-next.1"
+    "@morpho-org/test-wagmi": "^2.0.4"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",