@dripfi/drip-sdk 1.1.16 → 1.1.17

package/dist/DripConfig.d.ts

@@ -1,5 +1,6 @@
 import { ContractAddresses, SDKConfig } from '@spool.fi/spool-v2-sdk';
 import { Signer } from 'ethers';
+export declare const NULL_ADDRESS = "0x0000000000000000000000000000000000000000";
 export declare class DripConfig {
     internalConfig: SDKConfig;
     dripRoute: string;

package/dist/DripConfig.js

@@ -9,15 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DripConfig = void 0;
+exports.DripConfig = exports.NULL_ADDRESS = void 0;
 const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
-const NULL_ADDRESS = "0x0000000000000000000000000000000000000000";
+exports.NULL_ADDRESS = "0x0000000000000000000000000000000000000000";
 class DripConfig {
     constructor(subgraphUrl, priceFeedApiUrl, rewardsUrl, fastRedeemApi, contracts, dripRoute, dripTokenAddress, dripTokenRecyclerAddress) {
         this.internalConfig = new spool_v2_sdk_1.SDKConfig(subgraphUrl, priceFeedApiUrl, rewardsUrl, fastRedeemApi, contracts);
         this.dripRoute = dripRoute;
-        this.dripTokenAddress = dripTokenAddress ? dripTokenAddress : NULL_ADDRESS;
-        this.dripTokenRecyclerAddress = dripTokenRecyclerAddress ? dripTokenRecyclerAddress : NULL_ADDRESS;
+        this.dripTokenAddress = dripTokenAddress ? dripTokenAddress : exports.NULL_ADDRESS;
+        this.dripTokenRecyclerAddress = dripTokenRecyclerAddress ? dripTokenRecyclerAddress : exports.NULL_ADDRESS;
     }
     getSwapAndDepositContractAddress(signer) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/DripSdk.d.ts

@@ -1,4 +1,4 @@
-import { BigNumber, Signer, ethers } from 'ethers';
+import { BigNumber, Signer } from 'ethers';
 import { DripConfig } from './DripConfig';
 import { AuthenticationStatus } from './types/AuthenticationStatus';
 import { UserRewards } from './types/UserRewards';
@@ -41,11 +41,12 @@ export default class DripSdk {
     claimWithdraws(vaultAddress: string): Promise<string>;
     getVaultsClaimableData(headers?: Headers): Promise<VaultClaimData>;
     getBeansBalance(walletAddress: string, headers?: Headers): Promise<any>;
-    recycleTokens(amount: BigNumber): Promise<ethers.ContractTransaction>;
+    recycleTokens(amount: BigNumber): Promise<string>;
     upgradeLoyaltyCard(): Promise<LoyaltyCard>;
     getNextLoyaltyCard(headers?: Headers): Promise<LoyaltyCard>;
     getOwnedLoyaltyCards(headers?: Headers): Promise<LoyaltyCard>;
     getAllLoyaltyCards(headers?: Headers): Promise<LoyaltyCard[]>;
+    approveTokenForRecycler(tokenAddress: string, amount: string): Promise<void>;
     approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<void>;
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<void>;
     private generateRedeemBagStruct;

package/dist/DripSdk.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const web3_token_1 = __importDefault(require("web3-token"));
 const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
 const ethers_1 = require("ethers");
+const DripConfig_1 = require("./DripConfig");
 const utils_1 = require("./utils");
 const DripApi_1 = __importDefault(require("./DripApi"));
 const js_cookie_1 = __importDefault(require("js-cookie"));
@@ -345,15 +346,12 @@ class DripSdk {
             if (!authData.isAuthenticated) {
                 throw Error(`User not authenticated: ${authData.message}`);
             }
-            const recyclerContractAddress = this.dripTokenRecyclerContract.getContractAddress();
-            const allowance = yield this.dripTokenContract.getAllowance(recyclerContractAddress);
-            if (amount.gt(allowance)) {
-                const approveTx = yield this.dripTokenContract.approve(recyclerContractAddress, amount);
-                yield approveTx.wait();
+            if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
+                throw Error('Recycler contract address not defined');
             }
             const recycleTx = yield this.dripTokenRecyclerContract.recycle(amount);
-            yield recycleTx.wait();
-            return recycleTx;
+            const receipt = yield recycleTx.wait();
+            return receipt.transactionHash;
         });
     }
     upgradeLoyaltyCard() {
@@ -392,6 +390,21 @@ class DripSdk {
             return this.dripApi.fetchAllLoyaltyCards(authData.token, headers);
         });
     }
+    approveTokenForRecycler(tokenAddress, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
+            if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
+                throw Error('Recycler contract address not defined');
+            }
+            const decimals = yield this.getERC20Precission(tokenAddress);
+            const amountToApprove = ethers_1.ethers.utils.parseUnits(amount.toString(), decimals);
+            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+            const approveTx = yield erc20Instance.approve(this.dripConfig.dripTokenRecyclerAddress, amountToApprove);
+            yield approveTx.wait();
+        });
+    }
     approveTokenForSwapAndDeposit(tokenAddress, amount) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer) {

package/package.json

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