@gearbox-protocol/sdk 15.0.0-next.2 → 15.0.0-pyth.1

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

@@ -1,8 +1,5 @@
 import { z } from "zod/v4";
-import {
-  PythOptions,
-  RedstoneOptions
-} from "./market/pricefeeds/updates/index.js";
+import { RedstoneOptions } from "./market/pricefeeds/updates/index.js";
 import { ZodAddress } from "./utils/index.js";
 const OnchainSDKOptionsSchema = z.object({
   /** When `true`, throw on unrecognised contract types. */
@@ -24,11 +21,11 @@ const AttachOptionsSchema = z.object({
   /** Addresses of market configurator contracts to load. */
   marketConfigurators: z.array(ZodAddress()).optional(),
   /**
-   * Addresses of KYC factory contracts to load.
-   * If not set, all default KYC factories for the chain are loaded
-   * (from {@link GearboxChain.kycFactories})
+   * Addresses of RWA factory contracts to load.
+   * If not set, all default RWA factories for the chain are loaded
+   * (from {@link GearboxChain.rwaFactories})
    **/
-  kycFactories: z.array(ZodAddress()).optional(),
+  rwaFactories: z.array(ZodAddress()).optional(),
   /** Pin SDK to a specific block number during attach. */
   blockNumber: z.union([z.bigint().nonnegative(), z.number().int().nonnegative()]).optional(),
   /** Skip fetching updatable price feeds on attach and sync. */
@@ -36,9 +33,7 @@ const AttachOptionsSchema = z.object({
   /** Pool addresses whose markets should be skipped. */
   ignoreMarkets: z.array(ZodAddress()).optional(),
   /** Options for Redstone price-feed updates. */
-  redstone: RedstoneOptions.optional(),
-  /** Options for Pyth price-feed updates. */
-  pyth: PythOptions.optional()
+  redstone: RedstoneOptions.optional()
 });
 export {
   AttachOptionsSchema,

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 {
-  KYC_UNDERLYING_DEFAULT,
-  KYC_UNDERLYING_ON_DEMAND,
+  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 {
   /**
@@ -16,11 +17,11 @@ class PoolService extends SDKConstruct {
    */
   getDepositTokensIn(pool) {
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       switch (underlying.contractType) {
-        case KYC_UNDERLYING_DEFAULT:
+        case RWA_UNDERLYING_DEFAULT:
           return this.#depositTokensIn(pool, false);
-        case KYC_UNDERLYING_ON_DEMAND:
+        case RWA_UNDERLYING_ON_DEMAND:
           return [underlying.asset];
       }
     }
@@ -31,11 +32,11 @@ class PoolService extends SDKConstruct {
    */
   getDepositTokensOut(pool, tokenIn) {
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       switch (underlying.contractType) {
-        case KYC_UNDERLYING_DEFAULT:
+        case RWA_UNDERLYING_DEFAULT:
           return this.#depositTokensOut(pool, tokenIn, false);
-        case KYC_UNDERLYING_ON_DEMAND:
+        case RWA_UNDERLYING_ON_DEMAND:
           return [];
       }
     }
@@ -46,23 +47,23 @@ class PoolService extends SDKConstruct {
    */
   getDepositMetadata(pool, tokenIn, tokenOut) {
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       switch (underlying.contractType) {
-        case KYC_UNDERLYING_DEFAULT: {
+        case RWA_UNDERLYING_DEFAULT: {
           return this.#depositMetadata(
-            "kyc-default",
+            "rwa-default",
             pool,
             tokenIn,
             tokenOut,
             false
           );
         }
-        case KYC_UNDERLYING_ON_DEMAND:
+        case RWA_UNDERLYING_ON_DEMAND:
           return {
             zapper: void 0,
             approveTarget: underlying.liquidityProvider.addr,
             permissible: false,
-            type: "kyc-on-demand"
+            type: "rwa-on-demand"
           };
       }
     }
@@ -74,59 +75,59 @@ class PoolService extends SDKConstruct {
   addLiquidity(props) {
     const { collateral, meta, permit, referralCode, pool, wallet } = props;
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      if (underlying.contractType === KYC_UNDERLYING_ON_DEMAND) {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
+      if (underlying.contractType === RWA_UNDERLYING_ON_DEMAND) {
         return void 0;
       }
     }
     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}
    */
   getWithdrawalTokensIn(pool) {
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       switch (underlying.contractType) {
-        case KYC_UNDERLYING_DEFAULT:
+        case RWA_UNDERLYING_DEFAULT:
           return this.#withdrawalTokensIn(pool, false);
-        case KYC_UNDERLYING_ON_DEMAND:
+        case RWA_UNDERLYING_ON_DEMAND:
           return [];
       }
     }
@@ -137,11 +138,11 @@ class PoolService extends SDKConstruct {
    */
   getWithdrawalTokensOut(pool, tokenIn) {
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       switch (underlying.contractType) {
-        case KYC_UNDERLYING_DEFAULT:
+        case RWA_UNDERLYING_DEFAULT:
           return this.#withdrawalTokensOut(pool, tokenIn, false);
-        case KYC_UNDERLYING_ON_DEMAND:
+        case RWA_UNDERLYING_ON_DEMAND:
           return [underlying.asset];
       }
     }
@@ -153,41 +154,42 @@ class PoolService extends SDKConstruct {
   removeLiquidity(props) {
     const { pool, amount, meta, wallet, permit } = props;
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      if (underlying.contractType === KYC_UNDERLYING_ON_DEMAND) {
-        return {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
+      if (underlying.contractType === RWA_UNDERLYING_ON_DEMAND) {
+        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 }]
     };
   }
   /**
@@ -195,23 +197,23 @@ class PoolService extends SDKConstruct {
    */
   getWithdrawalMetadata(pool, tokenIn, tokenOut) {
     const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
       switch (underlying.contractType) {
-        case KYC_UNDERLYING_DEFAULT: {
+        case RWA_UNDERLYING_DEFAULT: {
           return this.#withdrawalMetadata(
-            "kyc-default",
+            "rwa-default",
             pool,
             tokenIn,
             tokenOut,
             false
           );
         }
-        case KYC_UNDERLYING_ON_DEMAND:
+        case RWA_UNDERLYING_ON_DEMAND:
           return {
             zapper: void 0,
             approveTarget: void 0,
             permissible: false,
-            type: "kyc-on-demand"
+            type: "rwa-on-demand"
           };
       }
     }

package/dist/esm/sdk/utils/viem/simulateWithPriceUpdates.js

@@ -114,7 +114,7 @@ async function simulateWithPriceUpdates(client, parameters) {
       const r = multicallResults[1];
       if (r.status === "success") {
         const fromMc = BigInt(r.result);
-        if (!!r.result && fromMc !== parameters.blockNumber) {
+        if (r.result && fromMc !== parameters.blockNumber) {
           throw getSimulateWithPriceUpdatesError(
             new BaseError(
               `block number returned from multicall (${fromMc}) is different from the one provided (${parameters.blockNumber})`