@dripfi/drip-sdk 1.2.5 → 1.2.7

package/dist/DripConfig.js

@@ -20,11 +20,11 @@ var Chain;
 })(Chain || (exports.Chain = Chain = {}));
 const SUBGRAPH_URL_SEPOLIA = 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api';
 const RECYCLER_ADDRESS_SEPOLIA = '0x07F2264E199D62afe07E8288eC9D36d155fc3f24';
-const SWAP_AND_RECYCLER_ADDRESS_SEPOLIA = '0xb381F676960a3E534E6cEb27c3290EBA8275cE3b';
+const SWAP_AND_RECYCLER_ADDRESS_SEPOLIA = '0xA4ed357FF233731860Ec8D0446FD95756d564014';
 const DRIP_TOKEN_ADDRESS_SEPOLIA = '0x707B4Cc05645713d8Ea04FBC7192A0f2c1503d6E';
 const SUBGRAPH_URL_MAINNET = 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2/api';
 // const RECYCLER_ADDRESS_MAINNET = '';
-// const SWAP_AND_RECYCLER_ADDRESS_MAINNET = '0xb381F676960a3E534E6cEb27c3290EBA8275cE3b';
+// const SWAP_AND_RECYCLER_ADDRESS_MAINNET = '0xA4ed357FF233731860Ec8D0446FD95756d564014';
 const DRIP_TOKEN_ADDRESS_MAINNET = '0x2a414884a549ef5716bc1a4e648d3dc03f08b2cf';
 const DEV_BACKEND_ROUTE = 'https://dev.drip.fi.io';
 const PROD_BACKEND_ROUTE = 'https://perq.finance';

package/dist/DripSdk.d.ts

@@ -51,7 +51,7 @@ export default class DripSdk {
     getBeansBalance(headers?: Headers): Promise<BeansBalance>;
     getBeansHistory(headers?: Headers): Promise<BeanEntry[]>;
     recycleTokens(tokenAddress: string | undefined, amountToRecycle: string, beneficiary: string | undefined, price: string, deadline: string, signature: string): Promise<string>;
-    swapAndRecycleETH(beneficiary: string, path: string[], minAmountOutWithDecimals: string, price: string, deadline: string, signature: string): Promise<string>;
+    swapAndRecycleETH(beneficiary: string, path: string[], minAmountOutWithDecimals: string, amountOfEth: string, price: string, deadline: string, signature: string): Promise<string>;
     swapAndRecycleERC20(beneficiary: string, path: string[], minAmountOutWithDecimals: string, amountInWithDecimals: string, price: string, deadline: string, signature: string): Promise<string>;
     upgradeLoyaltyCard(): Promise<LoyaltyCard>;
     getNextLoyaltyCard(headers?: Headers): Promise<LoyaltyCard>;
@@ -64,6 +64,7 @@ export default class DripSdk {
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
     getDripTokenContractAddress(): string;
     getSwapPerqForBeansInfo(): Promise<PerqToBeansSwapInfo>;
+    transferErc20Token(tokenAddress: string, amount: string, receiver: string): Promise<string>;
     private generateRedeemBagStruct;
     private getERC20Precission;
     private calculatePendingDeposits;

package/dist/DripSdk.js

@@ -398,7 +398,7 @@ class DripSdk {
             return receipt.transactionHash;
         });
     }
-    swapAndRecycleETH(beneficiary, path, minAmountOutWithDecimals, price, deadline, signature) {
+    swapAndRecycleETH(beneficiary, path, minAmountOutWithDecimals, amountOfEth, price, deadline, signature) {
         return __awaiter(this, void 0, void 0, function* () {
             const authData = yield this.isUserAuthenticated();
             if (!authData.isAuthenticated) {
@@ -407,16 +407,7 @@ class DripSdk {
             if (this.dripConfig.dripSwapAndRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
                 throw Error('Recycler contract address not defined');
             }
-            console.log("swap and recycle ETH with this: ", {
-                beneficiary,
-                path,
-                minAmountOutWithDecimals,
-                price,
-                deadline,
-                signature
-            });
-            //! IF ETH => first option in path needs to be WETH, so add WETH to index[0] to the path array
-            const swapAndRecycleTx = yield this.dripSwapAndRecyclerContract.swapETHAndRecycle(beneficiary, path, minAmountOutWithDecimals, price, deadline, signature);
+            const swapAndRecycleTx = yield this.dripSwapAndRecyclerContract.swapETHAndRecycle(beneficiary, path, minAmountOutWithDecimals, amountOfEth, price, deadline, signature);
             const receipt = yield swapAndRecycleTx.wait();
             return receipt.transactionHash;
         });
@@ -533,6 +524,18 @@ class DripSdk {
             return this.dripApi.getSwapPerqForBeansInfo();
         });
     }
+    transferErc20Token(tokenAddress, amount, receiver) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
+            const decimals = yield this.getERC20Precission(tokenAddress);
+            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+            const approveTx = yield erc20Instance.transfer(receiver, ethers_1.ethers.utils.parseUnits(amount, decimals));
+            const receipt = yield approveTx.wait();
+            return receipt.transactionHash;
+        });
+    }
     generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.spoolSdk) {

package/dist/contracts/DripSwapAndRecyclerContract.d.ts

@@ -3,5 +3,5 @@ import BaseDripContract from './BaseDripContract';
 export default class DripSwapAndRecyclerContract extends BaseDripContract {
     constructor(address: string, signer?: ethers.Signer);
     swapAndRecycle(beneficiary: string | undefined, path: string[], amountInWithDecimals: string, minAmountOutWithDecimals: string, price: string, deadline: string, signature: string): Promise<ContractTransaction>;
-    swapETHAndRecycle(beneficiary: string | undefined, path: string[], minAmountOutWithDecimals: string, price: string, deadline: string, signature: string): Promise<ContractTransaction>;
+    swapETHAndRecycle(beneficiary: string | undefined, path: string[], minAmountOutWithDecimals: string, amountInEth: string, price: string, deadline: string, signature: string): Promise<ContractTransaction>;
 }

package/dist/contracts/DripSwapAndRecyclerContract.js

@@ -29,11 +29,13 @@ class DripSwapAndRecyclerContract extends BaseDripContract_1.default {
         });
     }
     swapETHAndRecycle() {
-        return __awaiter(this, arguments, void 0, function* (beneficiary = DripConfig_1.NULL_ADDRESS, path, minAmountOutWithDecimals, price, deadline, signature) {
+        return __awaiter(this, arguments, void 0, function* (beneficiary = DripConfig_1.NULL_ADDRESS, path, minAmountOutWithDecimals, amountInEth, price, deadline, signature) {
             if (!this.contract.signer) {
                 throw Error('No signer provided');
             }
-            return yield this.contract.swapETHAndRecycle(beneficiary, path, minAmountOutWithDecimals, price, deadline, signature);
+            return yield this.contract.swapETHAndRecycle(beneficiary, path, minAmountOutWithDecimals, price, deadline, signature, {
+                value: amountInEth
+            });
         });
     }
 }

package/package.json

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