@dripfi/drip-sdk 1.4.15 → 1.4.16

package/README.md

@@ -431,7 +431,6 @@ type NonceEnrichedSignedPayload<T> = {
 
 type PerqConfig = {
 	route: string;
-	spoolSdkConfig: SDKConfig;
 	yelayLiteSdkConfig: sdkConfig;
 	perqTokenAddress: string;
 	perqTokenRecyclerAddress: string;

package/dist/PerqSdk.d.ts

@@ -4,7 +4,6 @@ import PerqApi from './PerqApi';
 import { PerqSwapAndRecyclerContract, PerqTokenRecyclerContract, PerqVestingContract } from './contracts';
 import VestingPackage from './subpackages/VestingPackage';
 import LitePackage from './subpackages/LitePackage';
-import V2Package from './subpackages/V2Package';
 import RecyclerPackage from './subpackages/RecyclerPackage';
 import LoyaltyCardsPackage from './subpackages/LoyaltyCardsPackage';
 import { YelayLiteSdk } from '@yelay-lite/sdk';
@@ -12,13 +11,11 @@ import TokenUtilsPackage from './subpackages/TokenUtilsPackage';
 import UserPackage from './subpackages/UserPackage';
 import SignHandlerPackage from './subpackages/SignHandlerPackage';
 import PoolsPackage from './subpackages/PoolsPackage';
-import { SpoolSdk } from '@spool.fi/spool-v2-sdk';
 import { PerqSupportedChainId } from './types/PerqConfig';
 export default class PerqSdk {
     perqApi: PerqApi;
     signer?: Signer;
     lite: LitePackage;
-    v2: V2Package;
     vesting: VestingPackage;
     recycler: RecyclerPackage;
     loyaltyCards: LoyaltyCardsPackage;
@@ -28,7 +25,6 @@ export default class PerqSdk {
     pools: PoolsPackage;
     perqConfig: PerqConfig;
     yelayLiteSdk?: YelayLiteSdk;
-    spoolSdk?: SpoolSdk;
     perqVestingContract: PerqVestingContract;
     perqTokenRecyclerContract: PerqTokenRecyclerContract;
     perqSwapAndRecyclerContract: PerqSwapAndRecyclerContract;

package/dist/PerqSdk.js

@@ -7,7 +7,6 @@ const PerqApi_1 = __importDefault(require("./PerqApi"));
 const contracts_1 = require("./contracts");
 const VestingPackage_1 = __importDefault(require("./subpackages/VestingPackage"));
 const LitePackage_1 = __importDefault(require("./subpackages/LitePackage"));
-const V2Package_1 = __importDefault(require("./subpackages/V2Package"));
 const RecyclerPackage_1 = __importDefault(require("./subpackages/RecyclerPackage"));
 const LoyaltyCardsPackage_1 = __importDefault(require("./subpackages/LoyaltyCardsPackage"));
 const sdk_1 = require("@yelay-lite/sdk");
@@ -15,12 +14,10 @@ const TokenUtilsPackage_1 = __importDefault(require("./subpackages/TokenUtilsPac
 const UserPackage_1 = __importDefault(require("./subpackages/UserPackage"));
 const SignHandlerPackage_1 = __importDefault(require("./subpackages/SignHandlerPackage"));
 const PoolsPackage_1 = __importDefault(require("./subpackages/PoolsPackage"));
-const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
 class PerqSdk {
     perqApi;
     signer;
     lite;
-    v2;
     vesting;
     recycler;
     loyaltyCards;
@@ -30,7 +27,6 @@ class PerqSdk {
     pools;
     perqConfig;
     yelayLiteSdk;
-    spoolSdk;
     perqVestingContract;
     perqTokenRecyclerContract;
     perqSwapAndRecyclerContract;
@@ -40,11 +36,9 @@ class PerqSdk {
         if (newSigner) {
             this.signer = newSigner;
             this.yelayLiteSdk = new sdk_1.YelayLiteSdk(this.signer, chainId, false);
-            this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(perqConfig.spoolSdkConfig, this.signer);
         }
         this.vesting = new VestingPackage_1.default(this);
         this.lite = new LitePackage_1.default(this);
-        this.v2 = new V2Package_1.default(this);
         this.recycler = new RecyclerPackage_1.default(this);
         this.loyaltyCards = new LoyaltyCardsPackage_1.default(this);
         this.tokenUtils = new TokenUtilsPackage_1.default(this);
@@ -59,7 +53,6 @@ class PerqSdk {
     async updateSigner(newSigner, chainId) {
         this.signer = newSigner;
         this.yelayLiteSdk = new sdk_1.YelayLiteSdk(this.signer, chainId, false);
-        this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(this.perqConfig.spoolSdkConfig, this.signer);
         this.perqVestingContract = new contracts_1.PerqVestingContract(this);
         this.perqTokenRecyclerContract = new contracts_1.PerqTokenRecyclerContract(this);
         this.perqSwapAndRecyclerContract = new contracts_1.PerqSwapAndRecyclerContract(this);

package/dist/types/PerqConfig.d.ts

@@ -1,9 +1,7 @@
-import { SDKConfig as SpoolSdkConfig } from '@spool.fi/spool-v2-sdk';
 export declare const PERQ_SUPPORTED_CHAIN_IDS: readonly [1, 8453, 146];
 export type PerqSupportedChainId = (typeof PERQ_SUPPORTED_CHAIN_IDS)[number];
 type PerqConfig = {
     route: string;
-    spoolSdkConfig: SpoolSdkConfig;
     perqTokenAddress: string;
     perqTokenRecyclerAddress: string;
     perqSwapAndRecyclerAddress: string;

package/dist/types/PerqConfig.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEVELOPMENT = exports.PRODUCTION = exports.PERQ_SUPPORTED_CHAIN_IDS = void 0;
-const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
 const ChainId_1 = require("./ChainId");
 exports.PERQ_SUPPORTED_CHAIN_IDS = [ChainId_1.ETHEREUM_CHAIN_ID, ChainId_1.BASE_CHAIN_ID, ChainId_1.SONIC_CHAIN_ID];
 exports.PRODUCTION = {
     route: 'https://perq.finance',
-    spoolSdkConfig: (0, spool_v2_sdk_1.getMainnetConfig)('https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2/api'),
     perqTokenAddress: '0x2a414884a549ef5716bc1a4e648d3dc03f08b2cf',
     perqTokenRecyclerAddress: '0x2fdcdb17799557dce6f26921f12b7fa1dbcd79fa',
     perqSwapAndRecyclerAddress: '0x15ed53964e6a5ecbebab80a0fc68c2297b0eaa8d',
@@ -17,7 +15,6 @@ exports.PRODUCTION = {
 };
 exports.DEVELOPMENT = {
     route: 'https://dev.perq.finance',
-    spoolSdkConfig: (0, spool_v2_sdk_1.getSepoliaConfig)('https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api'),
     perqTokenAddress: '0x707b4cc05645713d8ea04fbc7192a0f2c1503d6e',
     perqTokenRecyclerAddress: '0x07f2264e199d62afe07e8288ec9d36d155fc3f24',
     perqSwapAndRecyclerAddress: '0xa4ed357ff233731860ec8d0446fd95756d564014',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dripfi/drip-sdk",
-	"version": "1.4.15",
+	"version": "1.4.16",
 	"description": "Drip SDK",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -14,7 +14,6 @@
 	},
 	"dependencies": {
 		"@yelay-lite/sdk": "1.0.7",
-		"@spool.fi/spool-v2-sdk": "2.0.53",
 		"ethers": "^5.7.2"
 	},
 	"author": "",

package/dist/subpackages/V2Package.d.ts

@@ -1,24 +0,0 @@
-import { UserVaultBalance, VaultData } from '../types';
-import PerqSdk from '../PerqSdk';
-export default class V2Package {
-    perqSdk: PerqSdk;
-    constructor(perqSdk: PerqSdk);
-    getPoolDetails(vaultAddress: string): Promise<VaultData>;
-    newDeposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
-    deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
-    private doDeposit;
-    getSwapAndDepositTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
-    getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
-    getUserPoolBalance(vaultAddress: string): Promise<UserVaultBalance>;
-    fastWithdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
-    swapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>;
-    newSwapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>;
-    private doSwapAndDeposit;
-    withdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
-    claimWithdraws(vaultAddress: string): Promise<string>;
-    approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<string>;
-    approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
-    private generateRedeemBagStruct;
-    private getTokenAllowanceForDeposit;
-    getTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
-}

package/dist/subpackages/V2Package.js

@@ -1,207 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const ERC20TokenContract_1 = __importDefault(require("../contracts/ERC20TokenContract"));
-const ChainId_1 = require("../types/ChainId");
-class V2Package {
-    perqSdk;
-    constructor(perqSdk) {
-        this.perqSdk = perqSdk;
-    }
-    async getPoolDetails(vaultAddress) {
-        return this.perqSdk.perqApi.fetchPoolV2Details(vaultAddress);
-    }
-    async newDeposit(tokenAddress, vaultAddress, amount) {
-        return this.doDeposit(tokenAddress, vaultAddress, amount, false);
-    }
-    async deposit(tokenAddress, vaultAddress, amount) {
-        return this.doDeposit(tokenAddress, vaultAddress, amount, true);
-    }
-    async doDeposit(tokenAddress, vaultAddress, amount, checkAllowance) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
-        const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
-        if (checkAllowance) {
-            const allowance = await tokenContract.getAllowance(await this.perqSdk.signer.getAddress(), this.perqSdk.perqConfig.smartVaultManagerContractAddress);
-            const currentTokenAllowance = parseFloat(ethers_1.ethers.utils.formatUnits(allowance, decimals));
-            if (amountWithDecimals > currentTokenAllowance) {
-                await this.approveTokenForDeposit(tokenAddress, amountWithDecimals.toString());
-            }
-        }
-        const amountToDeposit = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-        const signerAddress = await this.perqSdk.signer.getAddress();
-        if (!signerAddress) {
-            throw Error('Error fetching address');
-        }
-        const depositBagStruct = {
-            smartVault: vaultAddress.toLowerCase(),
-            assets: [amountToDeposit],
-            receiver: signerAddress,
-            referral: ethers_1.ethers.constants.AddressZero,
-            doFlush: false,
-        };
-        const depositTx = await this.perqSdk.spoolSdk.deposit(depositBagStruct);
-        const txReceipt = await depositTx.wait();
-        return txReceipt.transactionHash;
-    }
-    async getSwapAndDepositTokenAllowanceForCurrency(tokenAddress) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const allowance = await tokenContract.getAllowance(await this.perqSdk.signer.getAddress(), this.perqSdk.perqConfig.swapAndDepositContractAddress);
-        return allowance.toString();
-    }
-    async getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
-        return this.perqSdk.perqApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals, ChainId_1.ETHEREUM_CHAIN_ID.toString());
-    }
-    async getUserPoolBalance(vaultAddress) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const userAddress = await this.perqSdk.signer.getAddress();
-        return await this.perqSdk.perqApi.fetchV2PoolUserBalance(userAddress.toLowerCase(), vaultAddress.toLowerCase());
-    }
-    async fastWithdraw(vaultAddress, amountToWithdraw) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const userAddress = await this.perqSdk.signer.getAddress();
-        const vault = await this.getPoolDetails(vaultAddress);
-        const redeemBagStruct = await this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
-        const currentBlockNumber = await this.perqSdk.signer.provider?.getBlockNumber();
-        if (!currentBlockNumber) {
-            throw Error('Error fetching block number');
-        }
-        const redeemTx = await this.perqSdk.spoolSdk?.redeemFast(redeemBagStruct, userAddress, currentBlockNumber);
-        const txReceipt = await redeemTx.wait();
-        return txReceipt.transactionHash;
-    }
-    async swapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
-        return this.doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, true, ethAmount);
-    }
-    async newSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
-        return this.doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, false, ethAmount);
-    }
-    async doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, checkAllowance, ethAmount) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const userAddress = await this.perqSdk.signer.getAddress();
-        const tokenContract = new ERC20TokenContract_1.default(fromTokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
-        const amountWithDecimals = parseFloat(parseFloat(fromTokenAmount).toFixed(decimals));
-        if (amountWithDecimals > 0 && checkAllowance) {
-            const allowance = await tokenContract.getAllowance(await this.perqSdk.signer.getAddress(), this.perqSdk.perqConfig.swapAndDepositContractAddress);
-            const currentTokenAllowance = parseFloat(ethers_1.ethers.utils.formatUnits(allowance, decimals));
-            if (amountWithDecimals > currentTokenAllowance) {
-                await this.approveTokenForSwapAndDeposit(fromTokenAddress, amountWithDecimals.toString());
-            }
-        }
-        const fromToken = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-        const swapInfo = await this.perqSdk.perqApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, this.perqSdk.perqConfig.ethereumSwapperAddress, ChainId_1.ETHEREUM_CHAIN_ID);
-        const swapDepositBagStruct = {
-            inTokens: [fromTokenAddress],
-            inAmounts: [fromToken],
-            smartVault: vaultAddress.toLowerCase(),
-            swapInfo,
-            receiver: userAddress,
-            referral: ethers_1.ethers.constants.AddressZero,
-            doFlush: false,
-        };
-        const swapAndDepositRequest = ethAmount
-            ? await this.perqSdk.spoolSdk.swapAndDeposit(swapDepositBagStruct, {
-                value: ethers_1.ethers.utils.parseEther(ethAmount),
-            })
-            : await this.perqSdk.spoolSdk.swapAndDeposit(swapDepositBagStruct);
-        const txReceipt = await swapAndDepositRequest.wait();
-        return txReceipt?.transactionHash;
-    }
-    async withdraw(vaultAddress, amountToWithdraw) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const userAddress = await this.perqSdk.signer.getAddress();
-        const vault = await this.getPoolDetails(vaultAddress);
-        const redeemBagStruct = await this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
-        const redeemTx = await this.perqSdk.spoolSdk.redeem(redeemBagStruct, userAddress, false);
-        const redeemTxReceipt = await redeemTx.wait();
-        return redeemTxReceipt.transactionHash;
-    }
-    async claimWithdraws(vaultAddress) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const userAddress = await this.perqSdk.signer.getAddress();
-        const wnfts = await this.perqSdk.perqApi.fetchEnrichedUserWNFTForPool(vaultAddress, userAddress);
-        //! Shares come as Strings instead of BigNumber from our Backend
-        const nftIds = wnfts
-            .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
-            .map((item) => item.nftId.toString());
-        const nftAmounts = wnfts
-            .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
-            .map((item) => item.shares.toString());
-        const claimWithdrawTx = await this.perqSdk.spoolSdk.claimWithdrawal(vaultAddress.toLowerCase(), nftIds, nftAmounts, userAddress);
-        const txReceipt = await claimWithdrawTx.wait();
-        return txReceipt.transactionHash;
-    }
-    async approveTokenForSwapAndDeposit(tokenAddress, amount) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
-        const parsedAmount = ethers_1.ethers.utils.parseUnits(amount, decimals);
-        return await tokenContract.approveToken(this.perqSdk.perqConfig.swapAndDepositContractAddress, parsedAmount);
-    }
-    async approveTokenForDeposit(tokenAddress, amount) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
-        const parsedAmount = ethers_1.ethers.utils.parseUnits(amount, decimals);
-        return await tokenContract.approveToken(this.perqSdk.perqConfig.smartVaultManagerContractAddress, parsedAmount);
-    }
-    async generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
-        if (!this.perqSdk.spoolSdk) {
-            throw Error('No spool sdk provided');
-        }
-        const isFullWithdraw = !amountToWithdraw;
-        if (isFullWithdraw) {
-            return this.perqSdk.spoolSdk.views.userInfo.getMaxRedeemBag({
-                userAddress: signerAddress.toLowerCase(),
-                vaultAddress: vault.vaultAddress.toLowerCase(),
-            });
-        }
-        else {
-            return this.perqSdk.spoolSdk.views.userInfo.getMinimumBurnRedeemBag({
-                userAddress: signerAddress.toLowerCase(),
-                vaultAddress: vault.vaultAddress.toLowerCase(),
-                assetsToWithdraw: [Number(amountToWithdraw)],
-            });
-        }
-    }
-    async getTokenAllowanceForDeposit(tokenAddress) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const allowance = await tokenContract.getAllowance(await this.perqSdk.signer.getAddress(), this.perqSdk.perqConfig.smartVaultManagerContractAddress);
-        return allowance;
-    }
-    async getTokenAllowanceForCurrency(tokenAddress) {
-        if (!this.perqSdk.signer) {
-            throw Error('No signer provided');
-        }
-        const currentTokenAllowance = await this.getTokenAllowanceForDeposit(tokenAddress);
-        return currentTokenAllowance.toString();
-    }
-}
-exports.default = V2Package;