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

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

@@ -1,3 +1,4 @@
-export * from "./IERC20ZapperDepositsContract.js";
-export * from "./IETHZapperDepositsContract.js";
-export * from "./IZapperContract.js";
+export * from "./createZapper.js";
+export * from "./IERC20ZapperContract.js";
+export * from "./IETHZapperContract.js";
+export * from "./Zapper.js";

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

@@ -7,10 +7,9 @@ import {
 } from "../base/index.js";
 import { NATIVE_ADDRESS } from "../constants/index.js";
 import {
-  IERC20ZapperDepositsContract,
-  IETHZapperDepositsContract,
-  IZapperContract
-} from "../market/zapper/index.js";
+  IERC20ZapperContract,
+  IETHZapperContract
+} from "../market/index.js";
 import { AddressSet, hexEq } from "../utils/index.js";
 class PoolService extends SDKConstruct {
   /**
@@ -82,23 +81,15 @@ 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);
+    if (zapper instanceof IETHZapperContract) {
+      const tx2 = zapper.depositWithReferral(wallet, referralCode ?? 0n);
       tx2.value = collateral.balance.toString();
       return {
         tx: tx2,
         calls: [{ target: zapper.baseParams.addr, callData: tx2.callData }]
       };
-    } else if (zapper) {
-      const zapperContract = new IERC20ZapperDepositsContract(this.sdk, {
-        addr: zapper.baseParams.addr,
-        name: `ERC20Zapper(${this.labelAddress(zapper.baseParams.addr)})`
-      });
-      const tx2 = permit ? zapperContract.depositWithReferralAndPermit(
+    } else if (zapper instanceof IERC20ZapperContract) {
+      const tx2 = permit ? zapper.depositWithReferralAndPermit(
         collateral.balance,
         wallet,
         referralCode ?? 0n,
@@ -106,7 +97,7 @@ class PoolService extends SDKConstruct {
         permit.v,
         permit.r,
         permit.s
-      ) : zapperContract.depositWithReferral(
+      ) : zapper.depositWithReferral(
         collateral.balance,
         wallet,
         referralCode ?? 0n
@@ -180,19 +171,15 @@ class PoolService extends SDKConstruct {
         };
       }
     }
-    if (meta.zapper) {
-      const zapperContract = new IZapperContract(this.sdk, {
-        addr: meta.zapper.baseParams.addr,
-        name: `Zapper(${this.labelAddress(meta.zapper.baseParams.addr)})`
-      });
-      const tx2 = permit ? zapperContract.redeemWithPermit(
+    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
-      ) : zapperContract.redeem(amount, wallet);
+      ) : meta.zapper.redeem(amount, wallet);
       return {
         tx: tx2,
         calls: [{ target: meta.zapper.baseParams.addr, callData: tx2.callData }]

package/dist/types/{sdk/market/zapper/IERC20ZapperDepositsContract.d.ts → abi/iERC20Zapper.d.ts}

@@ -1,8 +1,4 @@
-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 [{
+export declare const ierc20ZapperAbi: readonly [{
     readonly type: "function";
     readonly inputs: readonly [{
         readonly name: "tokenInAmount";
@@ -194,18 +190,124 @@ declare const abi: readonly [{
         readonly type: "uint256";
     }];
     readonly stateMutability: "nonpayable";
+}, {
+    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 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/IZapperContract.d.ts → abi/iETHZapper.d.ts}

@@ -1,8 +1,36 @@
-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 [{
+export declare const iethZapperAbi: 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";
+}, {
     readonly type: "function";
     readonly inputs: readonly [];
     readonly name: "pool";
@@ -123,17 +151,3 @@ declare const abi: readonly [{
     }];
     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/ZapperRegister.d.ts

@@ -1,17 +1,17 @@
 import type { Address } from "viem";
 import { SDKConstruct } from "../base/index.js";
 import { AddressMap } from "../utils/index.js";
-import type { ZapperData } from "./types.js";
+import { type Zapper } from "./zapper/index.js";
 export declare class ZapperRegister extends SDKConstruct {
     #private;
     /**
      * Load zappers for all pools using periphery compressor, adds hardcoded zappers
      */
     loadZappers(force?: boolean): Promise<void>;
-    get zappers(): AddressMap<ZapperData[]>;
-    poolZappers(pool: Address): ZapperData[];
+    get zappers(): AddressMap<Zapper[]>;
+    poolZappers(pool: Address): Zapper[];
     /**
      * Can return multiple zappers if there are multiple zappers for the same tokenIn and tokenOut
      */
-    getZapper(pool: Address, tokenIn: Address, tokenOut: Address): Array<ZapperData> | undefined;
+    getZapper(pool: Address, tokenIn: Address, tokenOut: Address): Array<Zapper> | undefined;
 }

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

@@ -0,0 +1,350 @@
+import type { Address, Hex } from "viem";
+import { BaseContract } from "../../base/index.js";
+import type { OnchainSDK } from "../../OnchainSDK.js";
+import type { RawTx } from "../../types/index.js";
+import type { ZapperData } from "../types.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";
+}, {
+    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 IERC20ZapperContract extends BaseContract<abi> implements ZapperData {
+    readonly pool: ZapperData["pool"];
+    readonly type: ZapperData["type"];
+    readonly baseParams: ZapperData["baseParams"];
+    readonly tokenIn: ZapperData["tokenIn"];
+    readonly tokenOut: ZapperData["tokenOut"];
+    constructor(sdk: OnchainSDK, data: ZapperData);
+    /**
+     * Deposits ERC20 tokens into the pool via this zapper.
+     */
+    deposit(tokenInAmount: bigint, receiver: Address): RawTx;
+    /**
+     * 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;
+    /**
+     * 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 {};