@gearbox-protocol/sdk 14.10.4 → 14.10.5

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

@@ -5,9 +5,10 @@ import {
   VERSION_RANGE_310
 } from "../constants/index.js";
 import { AddressMap, hexEq } from "../utils/index.js";
+import { createZapper } from "./zapper/index.js";
 class ZapperRegister extends SDKConstruct {
   /**
-   * Mapping pool.address -> ZapperData[]
+   * Mapping pool.address -> Zapper[]
    * Needs to be loaded explicitly using loadZappers method
    */
   #zappers;
@@ -55,16 +56,17 @@ class ZapperRegister extends SDKConstruct {
     }
   }
   #addZapper(z) {
+    const zapper = createZapper(this.sdk, z);
     const existing = this.zappers.get(z.pool);
     if (existing) {
       const hasZapper = existing.some(
         (zz) => hexEq(zz.baseParams.addr, z.baseParams.addr)
       );
       if (!hasZapper) {
-        existing.push(z);
+        existing.push(zapper);
       }
     } else {
-      this.zappers.upsert(z.pool, [z]);
+      this.zappers.upsert(z.pool, [zapper]);
     }
     const zappersTokens = [z.tokenIn, z.tokenOut];
     for (const t of zappersTokens) {

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/IERC20ZapperContract.js

@@ -0,0 +1,74 @@
+import { ierc20ZapperAbi } from "../../../abi/iERC20Zapper.js";
+import { BaseContract } from "../../base/index.js";
+const abi = ierc20ZapperAbi;
+class IERC20ZapperContract extends BaseContract {
+  pool;
+  type;
+  baseParams;
+  tokenIn;
+  tokenOut;
+  constructor(sdk, data) {
+    super(sdk, {
+      addr: data.baseParams.addr,
+      abi,
+      name: `ERC20Zapper(${sdk.labelAddress(data.baseParams.addr)})`,
+      version: data.baseParams.version,
+      contractType: data.baseParams.contractType
+    });
+    this.pool = data.pool;
+    this.type = data.type;
+    this.baseParams = data.baseParams;
+    this.tokenIn = data.tokenIn;
+    this.tokenOut = data.tokenOut;
+  }
+  /**
+   * Deposits ERC20 tokens into the pool via this zapper.
+   */
+  deposit(tokenInAmount, receiver) {
+    return this.createRawTx({
+      functionName: "deposit",
+      args: [tokenInAmount, receiver]
+    });
+  }
+  /**
+   * 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]
+    });
+  }
+  /**
+   * 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 {
+  IERC20ZapperContract
+};

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

@@ -0,0 +1,65 @@
+import { iethZapperAbi } from "../../../abi/iETHZapper.js";
+import { BaseContract } from "../../base/index.js";
+const abi = iethZapperAbi;
+class IETHZapperContract extends BaseContract {
+  pool;
+  type;
+  baseParams;
+  tokenIn;
+  tokenOut;
+  constructor(sdk, data) {
+    super(sdk, {
+      addr: data.baseParams.addr,
+      abi,
+      name: `ETHZapper(${sdk.labelAddress(data.baseParams.addr)})`,
+      version: data.baseParams.version,
+      contractType: data.baseParams.contractType
+    });
+    this.pool = data.pool;
+    this.type = data.type;
+    this.baseParams = data.baseParams;
+    this.tokenIn = data.tokenIn;
+    this.tokenOut = data.tokenOut;
+  }
+  /**
+   * Deposits native ETH into the pool via this zapper.
+   */
+  deposit(receiver) {
+    return this.createRawTx({
+      functionName: "deposit",
+      args: [receiver]
+    });
+  }
+  /**
+   * 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]
+    });
+  }
+  /**
+   * 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 {
+  IETHZapperContract
+};

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

@@ -0,0 +1,23 @@
+import { bytes32ToString } from "../../utils/index.js";
+class Zapper {
+  pool;
+  type;
+  baseParams;
+  tokenIn;
+  tokenOut;
+  contractType;
+  constructor(data) {
+    this.pool = data.pool;
+    this.type = data.type;
+    this.baseParams = data.baseParams;
+    this.tokenIn = data.tokenIn;
+    this.tokenOut = data.tokenOut;
+    this.contractType = Zapper.contractType(data.baseParams);
+  }
+  static contractType(baseParams) {
+    return bytes32ToString(baseParams.contractType);
+  }
+}
+export {
+  Zapper
+};

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

@@ -0,0 +1,21 @@
+import { IERC20ZapperContract } from "./IERC20ZapperContract.js";
+import { IETHZapperContract } from "./IETHZapperContract.js";
+import { Zapper } from "./Zapper.js";
+function createZapper(sdk, data) {
+  if (data.type === "base") {
+    const contractType = Zapper.contractType(data.baseParams);
+    switch (contractType) {
+      case "ZAPPER::ERC4626_UNDERLYING":
+        return new IERC20ZapperContract(sdk, data);
+      case "ZAPPER::WETH_DEPOSIT":
+        return new IETHZapperContract(sdk, data);
+      default:
+        sdk.logger?.warn(`Unknown zapper contract type: ${contractType}`);
+        return new Zapper(data);
+    }
+  }
+  return new Zapper(data);
+}
+export {
+  createZapper
+};

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

@@ -0,0 +1,4 @@
+export * from "./createZapper.js";
+export * from "./IERC20ZapperContract.js";
+export * from "./IETHZapperContract.js";
+export * from "./Zapper.js";

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

@@ -1,14 +1,15 @@
-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 {
+  IERC20ZapperContract,
+  IETHZapperContract
+} from "../market/index.js";
 import { AddressSet, hexEq } from "../utils/index.js";
 class PoolService extends SDKConstruct {
   /**
@@ -80,42 +81,42 @@ class PoolService extends SDKConstruct {
       }
     }
     const { zapper } = meta;
-    if (zapper && hexEq(zapper.tokenIn.addr, NATIVE_ADDRESS)) {
+    if (zapper instanceof IETHZapperContract) {
+      const tx2 = zapper.depositWithReferral(wallet, referralCode ?? 0n);
+      tx2.value = collateral.balance.toString();
       return {
-        target: zapper.baseParams.addr,
-        abi: iethZapperDepositsAbi,
-        functionName: "depositWithReferral",
-        args: [wallet, referralCode],
-        value: collateral.balance
-      };
-    } 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]
+        tx: tx2,
+        calls: [{ target: zapper.baseParams.addr, callData: tx2.callData }]
       };
-    } else {
+    } else if (zapper instanceof IERC20ZapperContract) {
+      const tx2 = permit ? zapper.depositWithReferralAndPermit(
+        collateral.balance,
+        wallet,
+        referralCode ?? 0n,
+        permit.deadline,
+        permit.v,
+        permit.r,
+        permit.s
+      ) : zapper.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 +156,40 @@ 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]
+    if (meta.zapper instanceof IETHZapperContract || meta.zapper instanceof IERC20ZapperContract) {
+      const tx2 = permit ? meta.zapper.redeemWithPermit(
+        amount,
+        wallet,
+        permit.deadline,
+        permit.v,
+        permit.r,
+        permit.s
+      ) : meta.zapper.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 }]
     };
   }
   /**