@gearbox-protocol/sdk 14.10.2 → 14.10.3-next.1

package/dist/cjs/dev/AccountOpener.js

@@ -524,12 +524,11 @@ class AccountOpener extends import_sdk.SDKConstruct {
       if (!depositCall) {
         throw new Error(`no deposit call could be created for ${poolName}`);
       }
-      txHash = await this.#anvil.writeContract({
+      txHash = await this.#anvil.sendTransaction({
         account: depositor,
-        address: depositCall.target,
-        abi: depositCall.abi,
-        functionName: depositCall.functionName,
-        args: depositCall.args,
+        to: depositCall.tx.to,
+        data: depositCall.tx.callData,
+        value: BigInt(depositCall.tx.value ?? "0"),
         chain: this.#anvil.chain
       });
       receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });

package/dist/cjs/sdk/market/index.js

@@ -24,6 +24,7 @@ __reExport(market_exports, require("./pool/index.js"), module.exports);
 __reExport(market_exports, require("./pricefeeds/index.js"), module.exports);
 __reExport(market_exports, require("./rwa/index.js"), module.exports);
 __reExport(market_exports, require("./types.js"), module.exports);
+__reExport(market_exports, require("./zapper/index.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./adapters/index.js"),
@@ -34,5 +35,6 @@ __reExport(market_exports, require("./types.js"), module.exports);
   ...require("./pool/index.js"),
   ...require("./pricefeeds/index.js"),
   ...require("./rwa/index.js"),
-  ...require("./types.js")
+  ...require("./types.js"),
+  ...require("./zapper/index.js")
 });

package/dist/cjs/sdk/market/pool/PoolV310Contract.js

@@ -127,6 +127,26 @@ class PoolV310Contract extends import_base.BaseContract {
         break;
     }
   }
+  /**
+   * Deposits underlying assets into the pool on behalf of a user with a
+   * referral code.
+   */
+  depositWithReferral(amount, onBehalfOf, referralCode) {
+    return this.createRawTx({
+      functionName: "depositWithReferral",
+      args: [amount, onBehalfOf, referralCode]
+    });
+  }
+  /**
+   * Redeems pool shares from the owner and sends the underlying assets to
+   * the receiver.
+   */
+  redeem(amount, owner, receiver) {
+    return this.createRawTx({
+      functionName: "redeem",
+      args: [amount, owner, receiver]
+    });
+  }
   stringifyFunctionParams(params) {
     switch (params.functionName) {
       case "deposit": {

package/dist/cjs/sdk/market/zapper/IERC20ZapperDepositsContract.js

@@ -0,0 +1,54 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var IERC20ZapperDepositsContract_exports = {};
+__export(IERC20ZapperDepositsContract_exports, {
+  IERC20ZapperDepositsContract: () => IERC20ZapperDepositsContract
+});
+module.exports = __toCommonJS(IERC20ZapperDepositsContract_exports);
+var import_iERC20ZapperDeposits = require("../../../abi/iERC20ZapperDeposits.js");
+var import_base = require("../../base/index.js");
+const abi = import_iERC20ZapperDeposits.ierc20ZapperDepositsAbi;
+class IERC20ZapperDepositsContract extends import_base.BaseContract {
+  constructor(options, args) {
+    super(options, { ...args, abi });
+  }
+  /**
+   * Deposits ERC20 tokens into the pool via this zapper using a referral code.
+   */
+  depositWithReferral(tokenInAmount, receiver, referralCode) {
+    return this.createRawTx({
+      functionName: "depositWithReferral",
+      args: [tokenInAmount, receiver, referralCode]
+    });
+  }
+  /**
+   * Deposits ERC20 tokens via this zapper with a referral code and an
+   * EIP-2612 permit signature, skipping a separate approve transaction.
+   */
+  depositWithReferralAndPermit(tokenInAmount, receiver, referralCode, deadline, v, r, s) {
+    return this.createRawTx({
+      functionName: "depositWithReferralAndPermit",
+      args: [tokenInAmount, receiver, referralCode, deadline, v, r, s]
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  IERC20ZapperDepositsContract
+});

package/dist/cjs/sdk/market/zapper/IETHZapperDepositsContract.js

@@ -0,0 +1,45 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var IETHZapperDepositsContract_exports = {};
+__export(IETHZapperDepositsContract_exports, {
+  IETHZapperDepositsContract: () => IETHZapperDepositsContract
+});
+module.exports = __toCommonJS(IETHZapperDepositsContract_exports);
+var import_iETHZapperDeposits = require("../../../abi/iETHZapperDeposits.js");
+var import_base = require("../../base/index.js");
+const abi = import_iETHZapperDeposits.iethZapperDepositsAbi;
+class IETHZapperDepositsContract extends import_base.BaseContract {
+  constructor(options, args) {
+    super(options, { ...args, abi });
+  }
+  /**
+   * Deposits native ETH into the pool via this zapper using a referral code.
+   * The caller must attach the deposit amount as msg.value.
+   */
+  depositWithReferral(receiver, referralCode) {
+    return this.createRawTx({
+      functionName: "depositWithReferral",
+      args: [receiver, referralCode]
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  IETHZapperDepositsContract
+});

package/dist/cjs/sdk/market/zapper/IZapperContract.js

@@ -0,0 +1,54 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var IZapperContract_exports = {};
+__export(IZapperContract_exports, {
+  IZapperContract: () => IZapperContract
+});
+module.exports = __toCommonJS(IZapperContract_exports);
+var import_iZapper = require("../../../abi/iZapper.js");
+var import_base = require("../../base/index.js");
+const abi = import_iZapper.iZapperAbi;
+class IZapperContract extends import_base.BaseContract {
+  constructor(options, args) {
+    super(options, { ...args, abi });
+  }
+  /**
+   * Redeems pool shares (diesel tokens) for the underlying asset via this zapper.
+   */
+  redeem(tokenInAmount, receiver) {
+    return this.createRawTx({
+      functionName: "redeem",
+      args: [tokenInAmount, receiver]
+    });
+  }
+  /**
+   * Redeems pool shares via this zapper with an EIP-2612 permit signature,
+   * skipping a separate approve transaction.
+   */
+  redeemWithPermit(tokenInAmount, receiver, deadline, v, r, s) {
+    return this.createRawTx({
+      functionName: "redeemWithPermit",
+      args: [tokenInAmount, receiver, deadline, v, r, s]
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  IZapperContract
+});

package/dist/cjs/sdk/market/zapper/index.js

@@ -0,0 +1,26 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var zapper_exports = {};
+module.exports = __toCommonJS(zapper_exports);
+__reExport(zapper_exports, require("./IERC20ZapperDepositsContract.js"), module.exports);
+__reExport(zapper_exports, require("./IETHZapperDepositsContract.js"), module.exports);
+__reExport(zapper_exports, require("./IZapperContract.js"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./IERC20ZapperDepositsContract.js"),
+  ...require("./IETHZapperDepositsContract.js"),
+  ...require("./IZapperContract.js")
+});

package/dist/cjs/sdk/pools/PoolService.js

@@ -21,13 +21,10 @@ __export(PoolService_exports, {
   PoolService: () => PoolService
 });
 module.exports = __toCommonJS(PoolService_exports);
-var import_generated = require("../../abi/310/generated.js");
 var import_iERC20 = require("../../abi/iERC20.js");
-var import_iERC20ZapperDeposits = require("../../abi/iERC20ZapperDeposits.js");
-var import_iETHZapperDeposits = require("../../abi/iETHZapperDeposits.js");
-var import_iZapper = require("../../abi/iZapper.js");
 var import_base = require("../base/index.js");
 var import_constants = require("../constants/index.js");
+var import_zapper = require("../market/zapper/index.js");
 var import_utils = require("../utils/index.js");
 class PoolService extends import_base.SDKConstruct {
   /**
@@ -100,41 +97,49 @@ class PoolService extends import_base.SDKConstruct {
     }
     const { zapper } = meta;
     if (zapper && (0, import_utils.hexEq)(zapper.tokenIn.addr, import_constants.NATIVE_ADDRESS)) {
+      const zapperContract = new import_zapper.IETHZapperDepositsContract(this.sdk, {
+        addr: zapper.baseParams.addr,
+        name: `ETHZapper(${this.labelAddress(zapper.baseParams.addr)})`
+      });
+      const tx2 = zapperContract.depositWithReferral(wallet, referralCode ?? 0n);
+      tx2.value = collateral.balance.toString();
       return {
-        target: zapper.baseParams.addr,
-        abi: import_iETHZapperDeposits.iethZapperDepositsAbi,
-        functionName: "depositWithReferral",
-        args: [wallet, referralCode],
-        value: collateral.balance
+        tx: tx2,
+        calls: [{ target: zapper.baseParams.addr, callData: tx2.callData }]
       };
     } else if (zapper) {
-      return permit ? {
-        target: zapper.baseParams.addr,
-        abi: import_iERC20ZapperDeposits.ierc20ZapperDepositsAbi,
-        functionName: "depositWithReferralAndPermit",
-        args: [
-          collateral.balance,
-          wallet,
-          referralCode,
-          permit.deadline,
-          permit.v,
-          permit.r,
-          permit.s
-        ]
-      } : {
-        target: zapper.baseParams.addr,
-        abi: import_iERC20ZapperDeposits.ierc20ZapperDepositsAbi,
-        functionName: "depositWithReferral",
-        args: [collateral.balance, wallet, referralCode]
-      };
-    } else {
+      const zapperContract = new import_zapper.IERC20ZapperDepositsContract(this.sdk, {
+        addr: zapper.baseParams.addr,
+        name: `ERC20Zapper(${this.labelAddress(zapper.baseParams.addr)})`
+      });
+      const tx2 = permit ? zapperContract.depositWithReferralAndPermit(
+        collateral.balance,
+        wallet,
+        referralCode ?? 0n,
+        permit.deadline,
+        permit.v,
+        permit.r,
+        permit.s
+      ) : zapperContract.depositWithReferral(
+        collateral.balance,
+        wallet,
+        referralCode ?? 0n
+      );
       return {
-        target: pool,
-        abi: import_generated.iPoolV310Abi,
-        functionName: "depositWithReferral",
-        args: [collateral.balance, wallet, referralCode]
+        tx: tx2,
+        calls: [{ target: zapper.baseParams.addr, callData: tx2.callData }]
       };
     }
+    const poolContract = this.sdk.marketRegister.findByPool(pool).pool.pool;
+    const tx = poolContract.depositWithReferral(
+      collateral.balance,
+      wallet,
+      referralCode ?? 0n
+    );
+    return {
+      tx,
+      calls: [{ target: pool, callData: tx.callData }]
+    };
   }
   /**
    * {@inheritDoc IPoolsService.getWithdrawalTokensIn}
@@ -174,39 +179,44 @@ class PoolService extends import_base.SDKConstruct {
     const underlying = this.#describeUnderlying(pool);
     if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       if (underlying.contractType === import_base.RWA_UNDERLYING_ON_DEMAND) {
-        return {
+        const tokenContract = new import_base.BaseContract(this.sdk, {
+          addr: underlying.asset,
           abi: import_iERC20.ierc20Abi,
+          name: "ERC20"
+        });
+        const tx2 = tokenContract.createRawTx({
           functionName: "approve",
-          args: [underlying.liquidityProvider, 0n],
-          target: underlying.asset
+          args: [underlying.liquidityProvider.addr, 0n]
+        });
+        return {
+          tx: tx2,
+          calls: [{ target: underlying.asset, callData: tx2.callData }]
         };
       }
     }
     if (meta.zapper) {
-      return permit ? {
-        target: meta.zapper.baseParams.addr,
-        abi: import_iZapper.iZapperAbi,
-        functionName: "redeemWithPermit",
-        args: [
-          amount,
-          wallet,
-          permit.deadline,
-          permit.v,
-          permit.r,
-          permit.s
-        ]
-      } : {
-        target: meta.zapper.baseParams.addr,
-        abi: import_iZapper.iZapperAbi,
-        functionName: "redeem",
-        args: [amount, wallet]
+      const zapperContract = new import_zapper.IZapperContract(this.sdk, {
+        addr: meta.zapper.baseParams.addr,
+        name: `Zapper(${this.labelAddress(meta.zapper.baseParams.addr)})`
+      });
+      const tx2 = permit ? zapperContract.redeemWithPermit(
+        amount,
+        wallet,
+        permit.deadline,
+        permit.v,
+        permit.r,
+        permit.s
+      ) : zapperContract.redeem(amount, wallet);
+      return {
+        tx: tx2,
+        calls: [{ target: meta.zapper.baseParams.addr, callData: tx2.callData }]
       };
     }
+    const poolContract = this.sdk.marketRegister.findByPool(pool).pool.pool;
+    const tx = poolContract.redeem(amount, wallet, wallet);
     return {
-      target: pool,
-      abi: import_generated.iPoolV310Abi,
-      functionName: "redeem",
-      args: [amount, wallet, wallet]
+      tx,
+      calls: [{ target: pool, callData: tx.callData }]
     };
   }
   /**

package/dist/esm/dev/AccountOpener.js

@@ -516,12 +516,11 @@ class AccountOpener extends SDKConstruct {
       if (!depositCall) {
         throw new Error(`no deposit call could be created for ${poolName}`);
       }
-      txHash = await this.#anvil.writeContract({
+      txHash = await this.#anvil.sendTransaction({
         account: depositor,
-        address: depositCall.target,
-        abi: depositCall.abi,
-        functionName: depositCall.functionName,
-        args: depositCall.args,
+        to: depositCall.tx.to,
+        data: depositCall.tx.callData,
+        value: BigInt(depositCall.tx.value ?? "0"),
         chain: this.#anvil.chain
       });
       receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });

package/dist/esm/sdk/market/index.js

@@ -7,3 +7,4 @@ export * from "./pool/index.js";
 export * from "./pricefeeds/index.js";
 export * from "./rwa/index.js";
 export * from "./types.js";
+export * from "./zapper/index.js";

package/dist/esm/sdk/market/pool/PoolV310Contract.js

@@ -109,6 +109,26 @@ class PoolV310Contract extends BaseContract {
         break;
     }
   }
+  /**
+   * Deposits underlying assets into the pool on behalf of a user with a
+   * referral code.
+   */
+  depositWithReferral(amount, onBehalfOf, referralCode) {
+    return this.createRawTx({
+      functionName: "depositWithReferral",
+      args: [amount, onBehalfOf, referralCode]
+    });
+  }
+  /**
+   * Redeems pool shares from the owner and sends the underlying assets to
+   * the receiver.
+   */
+  redeem(amount, owner, receiver) {
+    return this.createRawTx({
+      functionName: "redeem",
+      args: [amount, owner, receiver]
+    });
+  }
   stringifyFunctionParams(params) {
     switch (params.functionName) {
       case "deposit": {

package/dist/esm/sdk/market/zapper/IERC20ZapperDepositsContract.js

@@ -0,0 +1,30 @@
+import { ierc20ZapperDepositsAbi } from "../../../abi/iERC20ZapperDeposits.js";
+import { BaseContract } from "../../base/index.js";
+const abi = ierc20ZapperDepositsAbi;
+class IERC20ZapperDepositsContract extends BaseContract {
+  constructor(options, args) {
+    super(options, { ...args, abi });
+  }
+  /**
+   * Deposits ERC20 tokens into the pool via this zapper using a referral code.
+   */
+  depositWithReferral(tokenInAmount, receiver, referralCode) {
+    return this.createRawTx({
+      functionName: "depositWithReferral",
+      args: [tokenInAmount, receiver, referralCode]
+    });
+  }
+  /**
+   * Deposits ERC20 tokens via this zapper with a referral code and an
+   * EIP-2612 permit signature, skipping a separate approve transaction.
+   */
+  depositWithReferralAndPermit(tokenInAmount, receiver, referralCode, deadline, v, r, s) {
+    return this.createRawTx({
+      functionName: "depositWithReferralAndPermit",
+      args: [tokenInAmount, receiver, referralCode, deadline, v, r, s]
+    });
+  }
+}
+export {
+  IERC20ZapperDepositsContract
+};

package/dist/esm/sdk/market/zapper/IETHZapperDepositsContract.js

@@ -0,0 +1,21 @@
+import { iethZapperDepositsAbi } from "../../../abi/iETHZapperDeposits.js";
+import { BaseContract } from "../../base/index.js";
+const abi = iethZapperDepositsAbi;
+class IETHZapperDepositsContract extends BaseContract {
+  constructor(options, args) {
+    super(options, { ...args, abi });
+  }
+  /**
+   * Deposits native ETH into the pool via this zapper using a referral code.
+   * The caller must attach the deposit amount as msg.value.
+   */
+  depositWithReferral(receiver, referralCode) {
+    return this.createRawTx({
+      functionName: "depositWithReferral",
+      args: [receiver, referralCode]
+    });
+  }
+}
+export {
+  IETHZapperDepositsContract
+};

package/dist/esm/sdk/market/zapper/IZapperContract.js

@@ -0,0 +1,30 @@
+import { iZapperAbi } from "../../../abi/iZapper.js";
+import { BaseContract } from "../../base/index.js";
+const abi = iZapperAbi;
+class IZapperContract extends BaseContract {
+  constructor(options, args) {
+    super(options, { ...args, abi });
+  }
+  /**
+   * Redeems pool shares (diesel tokens) for the underlying asset via this zapper.
+   */
+  redeem(tokenInAmount, receiver) {
+    return this.createRawTx({
+      functionName: "redeem",
+      args: [tokenInAmount, receiver]
+    });
+  }
+  /**
+   * Redeems pool shares via this zapper with an EIP-2612 permit signature,
+   * skipping a separate approve transaction.
+   */
+  redeemWithPermit(tokenInAmount, receiver, deadline, v, r, s) {
+    return this.createRawTx({
+      functionName: "redeemWithPermit",
+      args: [tokenInAmount, receiver, deadline, v, r, s]
+    });
+  }
+}
+export {
+  IZapperContract
+};

package/dist/esm/sdk/market/zapper/index.js

@@ -0,0 +1,3 @@
+export * from "./IERC20ZapperDepositsContract.js";
+export * from "./IETHZapperDepositsContract.js";
+export * from "./IZapperContract.js";

package/dist/esm/sdk/pools/PoolService.js

@@ -1,14 +1,16 @@
-import { iPoolV310Abi } from "../../abi/310/generated.js";
 import { ierc20Abi } from "../../abi/iERC20.js";
-import { ierc20ZapperDepositsAbi } from "../../abi/iERC20ZapperDeposits.js";
-import { iethZapperDepositsAbi } from "../../abi/iETHZapperDeposits.js";
-import { iZapperAbi } from "../../abi/iZapper.js";
 import {
+  BaseContract,
   RWA_UNDERLYING_DEFAULT,
   RWA_UNDERLYING_ON_DEMAND,
   SDKConstruct
 } from "../base/index.js";
 import { NATIVE_ADDRESS } from "../constants/index.js";
+import {
+  IERC20ZapperDepositsContract,
+  IETHZapperDepositsContract,
+  IZapperContract
+} from "../market/zapper/index.js";
 import { AddressSet, hexEq } from "../utils/index.js";
 class PoolService extends SDKConstruct {
   /**
@@ -81,41 +83,49 @@ class PoolService extends SDKConstruct {
     }
     const { zapper } = meta;
     if (zapper && hexEq(zapper.tokenIn.addr, NATIVE_ADDRESS)) {
+      const zapperContract = new IETHZapperDepositsContract(this.sdk, {
+        addr: zapper.baseParams.addr,
+        name: `ETHZapper(${this.labelAddress(zapper.baseParams.addr)})`
+      });
+      const tx2 = zapperContract.depositWithReferral(wallet, referralCode ?? 0n);
+      tx2.value = collateral.balance.toString();
       return {
-        target: zapper.baseParams.addr,
-        abi: iethZapperDepositsAbi,
-        functionName: "depositWithReferral",
-        args: [wallet, referralCode],
-        value: collateral.balance
+        tx: tx2,
+        calls: [{ target: zapper.baseParams.addr, callData: tx2.callData }]
       };
     } else if (zapper) {
-      return permit ? {
-        target: zapper.baseParams.addr,
-        abi: ierc20ZapperDepositsAbi,
-        functionName: "depositWithReferralAndPermit",
-        args: [
-          collateral.balance,
-          wallet,
-          referralCode,
-          permit.deadline,
-          permit.v,
-          permit.r,
-          permit.s
-        ]
-      } : {
-        target: zapper.baseParams.addr,
-        abi: ierc20ZapperDepositsAbi,
-        functionName: "depositWithReferral",
-        args: [collateral.balance, wallet, referralCode]
-      };
-    } else {
+      const zapperContract = new IERC20ZapperDepositsContract(this.sdk, {
+        addr: zapper.baseParams.addr,
+        name: `ERC20Zapper(${this.labelAddress(zapper.baseParams.addr)})`
+      });
+      const tx2 = permit ? zapperContract.depositWithReferralAndPermit(
+        collateral.balance,
+        wallet,
+        referralCode ?? 0n,
+        permit.deadline,
+        permit.v,
+        permit.r,
+        permit.s
+      ) : zapperContract.depositWithReferral(
+        collateral.balance,
+        wallet,
+        referralCode ?? 0n
+      );
       return {
-        target: pool,
-        abi: iPoolV310Abi,
-        functionName: "depositWithReferral",
-        args: [collateral.balance, wallet, referralCode]
+        tx: tx2,
+        calls: [{ target: zapper.baseParams.addr, callData: tx2.callData }]
       };
     }
+    const poolContract = this.sdk.marketRegister.findByPool(pool).pool.pool;
+    const tx = poolContract.depositWithReferral(
+      collateral.balance,
+      wallet,
+      referralCode ?? 0n
+    );
+    return {
+      tx,
+      calls: [{ target: pool, callData: tx.callData }]
+    };
   }
   /**
    * {@inheritDoc IPoolsService.getWithdrawalTokensIn}
@@ -155,39 +165,44 @@ class PoolService extends SDKConstruct {
     const underlying = this.#describeUnderlying(pool);
     if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       if (underlying.contractType === RWA_UNDERLYING_ON_DEMAND) {
-        return {
+        const tokenContract = new BaseContract(this.sdk, {
+          addr: underlying.asset,
           abi: ierc20Abi,
+          name: "ERC20"
+        });
+        const tx2 = tokenContract.createRawTx({
           functionName: "approve",
-          args: [underlying.liquidityProvider, 0n],
-          target: underlying.asset
+          args: [underlying.liquidityProvider.addr, 0n]
+        });
+        return {
+          tx: tx2,
+          calls: [{ target: underlying.asset, callData: tx2.callData }]
         };
       }
     }
     if (meta.zapper) {
-      return permit ? {
-        target: meta.zapper.baseParams.addr,
-        abi: iZapperAbi,
-        functionName: "redeemWithPermit",
-        args: [
-          amount,
-          wallet,
-          permit.deadline,
-          permit.v,
-          permit.r,
-          permit.s
-        ]
-      } : {
-        target: meta.zapper.baseParams.addr,
-        abi: iZapperAbi,
-        functionName: "redeem",
-        args: [amount, wallet]
+      const zapperContract = new IZapperContract(this.sdk, {
+        addr: meta.zapper.baseParams.addr,
+        name: `Zapper(${this.labelAddress(meta.zapper.baseParams.addr)})`
+      });
+      const tx2 = permit ? zapperContract.redeemWithPermit(
+        amount,
+        wallet,
+        permit.deadline,
+        permit.v,
+        permit.r,
+        permit.s
+      ) : zapperContract.redeem(amount, wallet);
+      return {
+        tx: tx2,
+        calls: [{ target: meta.zapper.baseParams.addr, callData: tx2.callData }]
       };
     }
+    const poolContract = this.sdk.marketRegister.findByPool(pool).pool.pool;
+    const tx = poolContract.redeem(amount, wallet, wallet);
     return {
-      target: pool,
-      abi: iPoolV310Abi,
-      functionName: "redeem",
-      args: [amount, wallet, wallet]
+      tx,
+      calls: [{ target: pool, callData: tx.callData }]
     };
   }
   /**

package/dist/types/sdk/market/index.d.ts

@@ -7,3 +7,4 @@ export * from "./pool/index.js";
 export * from "./pricefeeds/index.js";
 export * from "./rwa/index.js";
 export * from "./types.js";
+export * from "./zapper/index.js";

package/dist/types/sdk/market/pool/PoolV310Contract.d.ts

@@ -1,8 +1,8 @@
-import type { ContractEventName, DecodeFunctionDataReturnType, Log } from "viem";
+import type { Address, ContractEventName, DecodeFunctionDataReturnType, Log } from "viem";
 import type { CreditManagerDebtParams, PoolState } from "../../base/index.js";
 import { BaseContract } from "../../base/index.js";
 import type { OnchainSDK } from "../../OnchainSDK.js";
-import type { PoolStateHuman } from "../../types/index.js";
+import type { PoolStateHuman, RawTx } from "../../types/index.js";
 import { AddressMap } from "../../utils/index.js";
 import type { IRWAFactory } from "../rwa/types.js";
 declare const abi: readonly [{
@@ -1138,6 +1138,16 @@ export declare class PoolV310Contract extends BaseContract<abi> {
     get rwaFactory(): IRWAFactory | undefined;
     stateHuman(raw?: boolean): PoolStateHuman;
     processLog(log: Log<bigint, number, false, undefined, undefined, abi, ContractEventName<abi>>): void;
+    /**
+     * Deposits underlying assets into the pool on behalf of a user with a
+     * referral code.
+     */
+    depositWithReferral(amount: bigint, onBehalfOf: Address, referralCode: bigint): RawTx;
+    /**
+     * Redeems pool shares from the owner and sends the underlying assets to
+     * the receiver.
+     */
+    redeem(amount: bigint, owner: Address, receiver: Address): RawTx;
     protected stringifyFunctionParams(params: DecodeFunctionDataReturnType<abi>): string[];
 }
 export {};

package/dist/types/sdk/market/zapper/IERC20ZapperDepositsContract.d.ts

@@ -0,0 +1,211 @@
+import type { Address, Hex } from "viem";
+import type { BaseContractArgs, ConstructOptions } from "../../base/index.js";
+import { BaseContract } from "../../base/index.js";
+import type { RawTx } from "../../types/index.js";
+declare const abi: readonly [{
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }];
+    readonly name: "deposit";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }, {
+        readonly name: "deadline";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "v";
+        readonly internalType: "uint8";
+        readonly type: "uint8";
+    }, {
+        readonly name: "r";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "s";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }];
+    readonly name: "depositWithPermit";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }, {
+        readonly name: "nonce";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "expiry";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "v";
+        readonly internalType: "uint8";
+        readonly type: "uint8";
+    }, {
+        readonly name: "r";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "s";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }];
+    readonly name: "depositWithPermitAllowed";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }, {
+        readonly name: "referralCode";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly name: "depositWithReferral";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }, {
+        readonly name: "referralCode";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "deadline";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "v";
+        readonly internalType: "uint8";
+        readonly type: "uint8";
+    }, {
+        readonly name: "r";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "s";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }];
+    readonly name: "depositWithReferralAndPermit";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }, {
+        readonly name: "referralCode";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "nonce";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "expiry";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "v";
+        readonly internalType: "uint8";
+        readonly type: "uint8";
+    }, {
+        readonly name: "r";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "s";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }];
+    readonly name: "depositWithReferralAndPermitAllowed";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}];
+type abi = typeof abi;
+export declare class IERC20ZapperDepositsContract extends BaseContract<abi> {
+    constructor(options: ConstructOptions, args: Omit<BaseContractArgs<abi>, "abi">);
+    /**
+     * Deposits ERC20 tokens into the pool via this zapper using a referral code.
+     */
+    depositWithReferral(tokenInAmount: bigint, receiver: Address, referralCode: bigint): RawTx;
+    /**
+     * Deposits ERC20 tokens via this zapper with a referral code and an
+     * EIP-2612 permit signature, skipping a separate approve transaction.
+     */
+    depositWithReferralAndPermit(tokenInAmount: bigint, receiver: Address, referralCode: bigint, deadline: bigint, v: number, r: Hex, s: Hex): RawTx;
+}
+export {};

package/dist/types/sdk/market/zapper/IETHZapperDepositsContract.d.ts

@@ -0,0 +1,47 @@
+import type { Address } from "viem";
+import type { BaseContractArgs, ConstructOptions } from "../../base/index.js";
+import { BaseContract } from "../../base/index.js";
+import type { RawTx } from "../../types/index.js";
+declare const abi: readonly [{
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }];
+    readonly name: "deposit";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "payable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }, {
+        readonly name: "referralCode";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly name: "depositWithReferral";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "payable";
+}];
+type abi = typeof abi;
+export declare class IETHZapperDepositsContract extends BaseContract<abi> {
+    constructor(options: ConstructOptions, args: Omit<BaseContractArgs<abi>, "abi">);
+    /**
+     * Deposits native ETH into the pool via this zapper using a referral code.
+     * The caller must attach the deposit amount as msg.value.
+     */
+    depositWithReferral(receiver: Address, referralCode: bigint): RawTx;
+}
+export {};

package/dist/types/sdk/market/zapper/IZapperContract.d.ts

@@ -0,0 +1,139 @@
+import type { Address, Hex } from "viem";
+import type { BaseContractArgs, ConstructOptions } from "../../base/index.js";
+import { BaseContract } from "../../base/index.js";
+import type { RawTx } from "../../types/index.js";
+declare const abi: readonly [{
+    readonly type: "function";
+    readonly inputs: readonly [];
+    readonly name: "pool";
+    readonly outputs: readonly [{
+        readonly name: "";
+        readonly internalType: "address";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly name: "previewDeposit";
+    readonly outputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly name: "previewRedeem";
+    readonly outputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }];
+    readonly name: "redeem";
+    readonly outputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [{
+        readonly name: "tokenOutAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "receiver";
+        readonly internalType: "address";
+        readonly type: "address";
+    }, {
+        readonly name: "deadline";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }, {
+        readonly name: "v";
+        readonly internalType: "uint8";
+        readonly type: "uint8";
+    }, {
+        readonly name: "r";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "s";
+        readonly internalType: "bytes32";
+        readonly type: "bytes32";
+    }];
+    readonly name: "redeemWithPermit";
+    readonly outputs: readonly [{
+        readonly name: "tokenInAmount";
+        readonly internalType: "uint256";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "nonpayable";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [];
+    readonly name: "tokenIn";
+    readonly outputs: readonly [{
+        readonly name: "";
+        readonly internalType: "address";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [];
+    readonly name: "tokenOut";
+    readonly outputs: readonly [{
+        readonly name: "";
+        readonly internalType: "address";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly inputs: readonly [];
+    readonly name: "underlying";
+    readonly outputs: readonly [{
+        readonly name: "";
+        readonly internalType: "address";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "view";
+}];
+type abi = typeof abi;
+export declare class IZapperContract extends BaseContract<abi> {
+    constructor(options: ConstructOptions, args: Omit<BaseContractArgs<abi>, "abi">);
+    /**
+     * Redeems pool shares (diesel tokens) for the underlying asset via this zapper.
+     */
+    redeem(tokenInAmount: bigint, receiver: Address): RawTx;
+    /**
+     * Redeems pool shares via this zapper with an EIP-2612 permit signature,
+     * skipping a separate approve transaction.
+     */
+    redeemWithPermit(tokenInAmount: bigint, receiver: Address, deadline: bigint, v: number, r: Hex, s: Hex): RawTx;
+}
+export {};

package/dist/types/sdk/market/zapper/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./IERC20ZapperDepositsContract.js";
+export * from "./IETHZapperDepositsContract.js";
+export * from "./IZapperContract.js";

package/dist/types/sdk/pools/PoolService.d.ts

@@ -1,6 +1,6 @@
 import type { Address } from "viem";
 import { SDKConstruct } from "../base/index.js";
-import type { AddLiquidityProps, DepositMetadata, IPoolsService, PoolServiceCall, RemoveLiquidityProps, WithdrawalMetadata } from "./types.js";
+import type { AddLiquidityProps, DepositMetadata, IPoolsService, PoolServiceCallResult, RemoveLiquidityProps, WithdrawalMetadata } from "./types.js";
 export declare class PoolService extends SDKConstruct implements IPoolsService {
     #private;
     /**
@@ -18,7 +18,7 @@ export declare class PoolService extends SDKConstruct implements IPoolsService {
     /**
      * {@inheritDoc IPoolsService.addLiquidity}
      */
-    addLiquidity(props: AddLiquidityProps): PoolServiceCall | undefined;
+    addLiquidity(props: AddLiquidityProps): PoolServiceCallResult | undefined;
     /**
      * {@inheritDoc IPoolsService.getWithdrawalTokensIn}
      */
@@ -30,7 +30,7 @@ export declare class PoolService extends SDKConstruct implements IPoolsService {
     /**
      * {@inheritDoc IPoolsService.removeLiquidity}
      */
-    removeLiquidity(props: RemoveLiquidityProps): PoolServiceCall;
+    removeLiquidity(props: RemoveLiquidityProps): PoolServiceCallResult;
     /**
      * {@inheritDoc IPoolsService.getWithdrawalMetadata}
      */

package/dist/types/sdk/pools/types.d.ts

@@ -1,6 +1,7 @@
 import type { Abi, Address, ContractFunctionArgs, ContractFunctionName } from "viem";
 import type { ZapperData } from "../market/index.js";
 import type { Asset } from "../router/index.js";
+import type { MultiCall, RawTx } from "../types/transactions.js";
 interface PermitResult {
     r: Address;
     s: Address;
@@ -19,6 +20,10 @@ export type PoolServiceCall<abi extends Abi | readonly unknown[] = Abi, function
     target: Address;
     value?: bigint;
 };
+export interface PoolServiceCallResult {
+    tx: RawTx;
+    calls: Array<MultiCall>;
+}
 export interface AddLiquidityProps {
     /**
      * Token and amount to deposit.
@@ -146,13 +151,13 @@ export interface IPoolsService {
      * @param props - {@link AddLiquidityProps}
      * @returns - {@link AddLiquidityCall}
      */
-    addLiquidity(props: AddLiquidityProps): PoolServiceCall | undefined;
+    addLiquidity(props: AddLiquidityProps): PoolServiceCallResult | undefined;
     /**
      * Construct a call to remove liquidity from a Gearbox lending pool.
      *
      * @param props - {@link RemoveLiquidityProps}
      * @returns - {@link RemoveLiquidityCall}
      */
-    removeLiquidity(props: RemoveLiquidityProps): PoolServiceCall;
+    removeLiquidity(props: RemoveLiquidityProps): PoolServiceCallResult;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "14.10.2",
+  "version": "14.10.3-next.1",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {