@dripfi/drip-sdk 1.4.14 → 1.4.15

package/README.md

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

package/dist/PerqSdk.d.ts

@@ -4,6 +4,7 @@ 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';
@@ -17,6 +18,7 @@ export default class PerqSdk {
     perqApi: PerqApi;
     signer?: Signer;
     lite: LitePackage;
+    v2: V2Package;
     vesting: VestingPackage;
     recycler: RecyclerPackage;
     loyaltyCards: LoyaltyCardsPackage;

package/dist/PerqSdk.js

@@ -7,6 +7,7 @@ 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");
@@ -19,6 +20,7 @@ class PerqSdk {
     perqApi;
     signer;
     lite;
+    v2;
     vesting;
     recycler;
     loyaltyCards;
@@ -42,6 +44,7 @@ class PerqSdk {
         }
         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);

package/dist/subpackages/V2Package.d.ts

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,207 @@
+"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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dripfi/drip-sdk",
-	"version": "1.4.14",
+	"version": "1.4.15",
 	"description": "Drip SDK",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",