@dripfi/drip-sdk 1.4.6 → 1.4.8

package/CHANGELOG.md

@@ -90,3 +90,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Upgraded version of `SpoolSDK` to `2.0.53` in order to fix potential issues with the generation of the redeem bag structure
+
+## [1.4.7] - 2025-02-13
+
+### Added
+
+- Added method `getSwapAndDepositTokenAllowanceForCurrency` to the `PerqSdk`
+
+## [1.4.8] - 2025-02-14
+
+### Changed
+
+- Updated `PerqApi` to use the new 1inch API endpoint

package/dist/PerqApi.js

@@ -88,14 +88,15 @@ class PerqApi {
         if (fromTokenAddress === toTokenAddress && fromTokenAddress === WETH_TOKEN_ADDRESS) {
             return [];
         }
-        const url = `${this.route}/oneinch?getRequest=/swap/v5.2/1/swap?fromTokenAddress=${fromTokenAddress}%26toTokenAddress=${toTokenAddress}%26amount=${amount.toString()}%26fromAddress=${fromAddress}%26slippage=0.1%26disableEstimate=true%26allowPartialFill=false%26includeTokensInfo=true`;
+        //TODO: Replace the /1/ in this string with dynamic chainId
+        const url = `${this.route}/oneinch?getRequest=/swap/v6.0/1/swap?fromTokenAddress=${fromTokenAddress}%26toTokenAddress=${toTokenAddress}%26amount=${amount.toString()}%26fromAddress=${fromAddress}%26slippage=0.1%26disableEstimate=true%26allowPartialFill=false%26includeTokensInfo=true`;
         const res = await fetch(url);
         if (res.ok) {
             const data = (await res.json());
             return [
                 {
                     swapTarget: data.tx.to,
-                    token: data.fromToken.address,
+                    token: data.srcToken.address,
                     swapCallData: data.tx.data,
                 },
             ];

package/dist/PerqSdk.d.ts

@@ -20,6 +20,7 @@ export default class PerqSdk {
     deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
     private doDeposit;
     getTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
+    getSwapAndDepositTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
     getTokenAllowanceForRecycler(tokenAddress: string): Promise<BigNumber>;
     getTokenAllowanceForSwapAndRecycler(tokenAddress: string): Promise<BigNumber>;
     getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;

package/dist/PerqSdk.js

@@ -91,6 +91,13 @@ class PerqSdk {
         const currentTokenAllowance = await this.getTokenAllowanceForDeposit(tokenAddress);
         return currentTokenAllowance.toString();
     }
+    async getSwapAndDepositTokenAllowanceForCurrency(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const currentTokenAllowance = await this.getTokenAllowanceForSwapAndDeposit(tokenAddress);
+        return currentTokenAllowance.toString();
+    }
     async getTokenAllowanceForRecycler(tokenAddress) {
         if (!this.signer) {
             throw Error('No signer provided');
@@ -203,7 +210,7 @@ class PerqSdk {
             }
         }
         const fromToken = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-        const swapInfo = await this.perqApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, userAddress);
+        const swapInfo = await this.perqApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, this.perqConfig.swapperAddress);
         const swapDepositBagStruct = {
             inTokens: [fromTokenAddress],
             inAmounts: [fromToken],
@@ -280,15 +287,6 @@ class PerqSdk {
         if (this.perqConfig.perqSwapAndRecyclerAddress === ethers_1.ethers.constants.AddressZero) {
             throw Error('Recycler contract address not defined');
         }
-        console.log('swap and recycle ERC-20 with this: ', {
-            beneficiary,
-            path,
-            amountInWithDecimals,
-            minAmountOutWithDecimals,
-            price,
-            deadline,
-            signature,
-        });
         const swapAndRecycleTx = await this.perqSwapAndRecyclerContract.swapAndRecycle(beneficiary, path, amountInWithDecimals, minAmountOutWithDecimals, price, deadline, signature);
         const receipt = await swapAndRecycleTx.wait();
         return receipt.transactionHash;

package/dist/types/PerqConfig.d.ts

@@ -7,6 +7,7 @@ type PerqConfig = {
     perqSwapAndRecyclerAddress: string;
     perqVestingAddress: string;
     swapAndDepositContractAddress: string;
+    swapperAddress: string;
     smartVaultManagerContractAddress: string;
 };
 export default PerqConfig;

package/dist/types/PerqConfig.js

@@ -10,6 +10,7 @@ exports.PRODUCTION = {
     perqSwapAndRecyclerAddress: '0x15ED53964E6a5EcbEBAb80A0Fc68c2297b0eaA8D',
     perqVestingAddress: '0x5e19C155C30bDEB83FCFE20a3b6f6Eda34B746c5',
     swapAndDepositContractAddress: '0xd8534197bd587f8226d12e0c864ef2cae6f82f5c',
+    swapperAddress: '0x33e52c206d584550193e642c8982f2fff6339994',
     smartVaultManagerContractAddress: '0x23daf34e2b9af02a74dc19cb52af727b19403874',
 };
 exports.DEVELOPMENT = {
@@ -20,5 +21,6 @@ exports.DEVELOPMENT = {
     perqSwapAndRecyclerAddress: '0xA4ed357FF233731860Ec8D0446FD95756d564014',
     perqVestingAddress: '0x1d3B9E32a7139718f94BE32c797682fFf2D1bE60',
     swapAndDepositContractAddress: '0x5fb08e00de169f041711206a0995410884080177',
+    swapperAddress: '0xE411921ee9EeDfEFd7b9Ae15bF232bd36949Fcbc',
     smartVaultManagerContractAddress: '0x2638d6c0b4ef6dee04050fa0b07ca62500435747',
 };

package/package.json

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