@dripfi/drip-sdk 1.2.2 → 1.2.3

package/dist/DripApi.d.ts

@@ -8,6 +8,7 @@ import { UserBalance } from './types/UserBalance';
 import { VaultClaimData } from './types/VaultClaimData';
 import MyPerqData from './types/MyPerqData';
 import { BeansBalance } from './types/BeansBalance';
+import { PerqToBeansSwapInfo } from './types/PerqToBeansSwapInfo';
 export declare const IMPERSONATOR_HEADER = "impersonatorAddress";
 export default class DripApi {
     route: string;
@@ -57,4 +58,5 @@ export default class DripApi {
     }>;
     fetchMyPerqData(userAddress: string, token: string, headers?: Headers): Promise<MyPerqData>;
     getLoyaltyCardBoost(rewardId: string, token: string, headers?: Headers): Promise<number>;
+    getSwapPerqForBeansInfo(): Promise<PerqToBeansSwapInfo>;
 }

package/dist/DripApi.js

@@ -485,5 +485,17 @@ class DripApi {
             }
         });
     }
+    getSwapPerqForBeansInfo() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield fetch(`${this.route}/api-be/api/swap/price`, {});
+            if (res.ok) {
+                const data = yield res.json();
+                return data;
+            }
+            else {
+                throw Error(`${yield res.text()}`);
+            }
+        });
+    }
 }
 exports.default = DripApi;

package/dist/DripConfig.js

@@ -19,8 +19,8 @@ var Chain;
     Chain["SEPOLIA"] = "sepolia";
 })(Chain || (exports.Chain = Chain = {}));
 const SUBGRAPH_URL_SEPOLIA = 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api';
-const RECYCLER_ADDRESS_SEPOLIA = '0x463aea273644AfF560da07c7c09f3142b87E12f1';
-const DRIP_TOKEN_ADDRESS_SEPOLIA = '0xc9C66052327523d6A7a2ee5D50CF07e4415e27c7';
+const RECYCLER_ADDRESS_SEPOLIA = '0x07F2264E199D62afe07E8288eC9D36d155fc3f24';
+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 DRIP_TOKEN_ADDRESS_MAINNET = '';

package/dist/DripSdk.d.ts

@@ -1,4 +1,4 @@
-import { Signer } from 'ethers';
+import { BigNumber, Signer } from 'ethers';
 import { AuthenticationStatus } from './types/AuthenticationStatus';
 import { UserRewards } from './types/UserRewards';
 import { VaultStats } from './types/VaultStats';
@@ -10,6 +10,7 @@ import { LoyaltyCard } from './types/LoyaltyCard';
 import MyPerqData from './types/MyPerqData';
 import { Chain } from './DripConfig';
 import { BeansBalance } from './types/BeansBalance';
+import { PerqToBeansSwapInfo } from './types/PerqToBeansSwapInfo';
 export default class DripSdk {
     private dripApi;
     private dripTokenContract;
@@ -29,6 +30,7 @@ export default class DripSdk {
     deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
     private doDeposit;
     getTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
+    getTokenAllowanceForRecycler(tokenAddress: string): Promise<BigNumber>;
     getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
     getUserBalance(headers?: Headers): Promise<UserBalance>;
     getUserBoostedNfts(vaultAddress: string, headers?: Headers): Promise<string[]>;
@@ -44,7 +46,7 @@ export default class DripSdk {
     claimWithdraws(vaultAddress: string): Promise<string>;
     getVaultsClaimableData(headers?: Headers): Promise<VaultClaimData>;
     getBeansBalance(headers?: Headers): Promise<BeansBalance>;
-    recycleTokens(amount: string, beneficiary?: string): Promise<string>;
+    recycleTokens(tokenAddress: string | undefined, amountToRecycle: string, beneficiary: string | undefined, price: string, deadline: string, signature: string): Promise<string>;
     upgradeLoyaltyCard(): Promise<LoyaltyCard>;
     getNextLoyaltyCard(headers?: Headers): Promise<LoyaltyCard>;
     getOwnedLoyaltyCards(headers?: Headers): Promise<LoyaltyCard>;
@@ -54,6 +56,7 @@ export default class DripSdk {
     approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<string>;
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
     getDripTokenContractAddress(): string;
+    getSwapPerqForBeansInfo(): Promise<PerqToBeansSwapInfo>;
     private generateRedeemBagStruct;
     private getERC20Precission;
     private calculatePendingDeposits;

package/dist/DripSdk.js

@@ -155,6 +155,15 @@ class DripSdk {
             return currentTokenAllowance.toString();
         });
     }
+    getTokenAllowanceForRecycler(tokenAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
+            const allowance = yield this.getERC20TokenAllowance(this.dripTokenRecyclerContract.getContractAddress(), tokenAddress);
+            return allowance;
+        });
+    }
     getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
         return __awaiter(this, void 0, void 0, function* () {
             const userAddress = yield this.signer.getAddress();
@@ -353,8 +362,8 @@ class DripSdk {
             return this.dripApi.fetchBeansBalance(authData.token, headers);
         });
     }
-    recycleTokens(amount, beneficiary) {
-        return __awaiter(this, void 0, void 0, function* () {
+    recycleTokens() {
+        return __awaiter(this, arguments, void 0, function* (tokenAddress = this.dripConfig.dripTokenAddress, amountToRecycle, beneficiary = DripConfig_1.NULL_ADDRESS, price, deadline, signature) {
             const authData = yield this.isUserAuthenticated();
             if (!authData.isAuthenticated) {
                 throw Error(`User not authenticated: ${authData.message}`);
@@ -362,9 +371,9 @@ class DripSdk {
             if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
                 throw Error('Recycler contract address not defined');
             }
-            const decimals = yield this.getERC20Precission(this.dripConfig.dripTokenAddress);
-            const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
-            const recycleTx = yield this.dripTokenRecyclerContract.recycle(ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals).toString(), beneficiary);
+            const decimals = yield this.getERC20Precission(tokenAddress);
+            const amountWithDecimals = ethers_1.ethers.utils.parseUnits(amountToRecycle, decimals).toString();
+            const recycleTx = yield this.dripTokenRecyclerContract.recycle(amountWithDecimals, beneficiary, price, deadline, signature);
             const receipt = yield recycleTx.wait();
             return receipt.transactionHash;
         });
@@ -422,7 +431,7 @@ class DripSdk {
             if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
                 throw Error('Recycler contract address not defined');
             }
-            return yield this.approveToken(tokenAddress, amount.toString(), this.dripConfig.dripTokenRecyclerAddress);
+            return yield this.approveToken(tokenAddress, amount, this.dripConfig.dripTokenRecyclerAddress);
         });
     }
     approveTokenForSwapAndDeposit(tokenAddress, amount) {
@@ -446,6 +455,11 @@ class DripSdk {
     getDripTokenContractAddress() {
         return this.dripConfig.dripTokenAddress;
     }
+    getSwapPerqForBeansInfo() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.dripApi.getSwapPerqForBeansInfo();
+        });
+    }
     generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.spoolSdk) {

package/dist/contracts/DripTokenRecyclerContract.d.ts

@@ -2,5 +2,5 @@ import { ContractTransaction, ethers } from 'ethers';
 import BaseDripContract from './BaseDripContract';
 export default class DripTokenRecyclerContract extends BaseDripContract {
     constructor(address: string, signer?: ethers.Signer);
-    recycle(amount: string, rewardBeneficiary?: string): Promise<ContractTransaction>;
+    recycle(amountToRecycle: string, beneficiary: string | undefined, price: string, deadline: string, signature: string): Promise<ContractTransaction>;
 }

package/dist/contracts/DripTokenRecyclerContract.js

@@ -20,12 +20,12 @@ class DripTokenRecyclerContract extends BaseDripContract_1.default {
     constructor(address, signer) {
         super(address, new ethers_1.ethers.utils.Interface(TokenRecyclerAbi_json_1.default), signer);
     }
-    recycle(amount, rewardBeneficiary) {
-        return __awaiter(this, void 0, void 0, function* () {
+    recycle(amountToRecycle_1) {
+        return __awaiter(this, arguments, void 0, function* (amountToRecycle, beneficiary = DripConfig_1.NULL_ADDRESS, price, deadline, signature) {
             if (!this.contract.signer) {
                 throw Error('No signer provided');
             }
-            return yield this.contract.recycle(amount, rewardBeneficiary ? rewardBeneficiary : DripConfig_1.NULL_ADDRESS);
+            return yield this.contract.recycle(amountToRecycle, beneficiary, price, deadline, signature);
         });
     }
 }

package/dist/contracts/abi/TokenRecyclerAbi.json

@@ -13,17 +13,17 @@
             },
             {
                 "internalType": "address",
-                "name": "beneficiaryAddress_",
+                "name": "oracle",
                 "type": "address"
             },
             {
-                "internalType": "uint256",
-                "name": "beneficiaryShare_",
-                "type": "uint256"
+                "internalType": "address",
+                "name": "beneficiaryAddress_",
+                "type": "address"
             },
             {
                 "internalType": "uint256",
-                "name": "recycledTokenToRewardRatio_",
+                "name": "beneficiaryShare_",
                 "type": "uint256"
             }
         ],
@@ -73,6 +73,33 @@
         "name": "AddressInsufficientBalance",
         "type": "error"
     },
+    {
+        "inputs": [],
+        "name": "ECDSAInvalidSignature",
+        "type": "error"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "length",
+                "type": "uint256"
+            }
+        ],
+        "name": "ECDSAInvalidSignatureLength",
+        "type": "error"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "bytes32",
+                "name": "s",
+                "type": "bytes32"
+            }
+        ],
+        "name": "ECDSAInvalidSignatureS",
+        "type": "error"
+    },
     {
         "inputs": [],
         "name": "FailedInnerCall",
@@ -234,6 +261,19 @@
         "stateMutability": "view",
         "type": "function"
     },
+    {
+        "inputs": [],
+        "name": "ORACLE_ROLE",
+        "outputs": [
+            {
+                "internalType": "bytes32",
+                "name": "",
+                "type": "bytes32"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [
             {
@@ -351,6 +391,21 @@
                 "internalType": "address",
                 "name": "rewardBeneficiary",
                 "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "price",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "deadline",
+                "type": "uint256"
+            },
+            {
+                "internalType": "bytes",
+                "name": "signature",
+                "type": "bytes"
             }
         ],
         "name": "recycle",
@@ -377,19 +432,6 @@
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [],
-        "name": "recycledTokenToRewardRatio",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [
             {
@@ -465,19 +507,6 @@
         "stateMutability": "nonpayable",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256",
-                "name": "recycledTokenToRewardRatio_",
-                "type": "uint256"
-            }
-        ],
-        "name": "setRecycledTokenToRewardRatio",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
     {
         "inputs": [
             {

package/dist/test.js

@@ -37,7 +37,7 @@ const testConfigParams = {
         }
     },
     dripContracts: {
-        DripTokenAddress: '0xc9C66052327523d6A7a2ee5D50CF07e4415e27c7', // Sepolia contract address
+        DripTokenAddress: '0x707B4Cc05645713d8Ea04FBC7192A0f2c1503d6E', // Sepolia contract address
         DripTokenRecyclerAddress: '0xe943A1320402fcf41cDc04275e842654165dAB78' // Sepolia contract address
     }
 };
@@ -58,7 +58,7 @@ const configParams = {
         },
     },
     dripContracts: {
-        DripTokenAddress: '0xc9C66052327523d6A7a2ee5D50CF07e4415e27c7', // Sepolia contract address
+        DripTokenAddress: '0x707B4Cc05645713d8Ea04FBC7192A0f2c1503d6E', // Sepolia contract address
         DripTokenRecyclerAddress: '0xe943A1320402fcf41cDc04275e842654165dAB78' // Sepolia contract address
     }
 };

package/dist/types/PerqToBeansSwapInfo.d.ts

@@ -0,0 +1,7 @@
+export type PerqToBeansSwapInfo = {
+    perqPrice: number;
+    price: number;
+    priceInFloat: number;
+    deadline: number;
+    signature: string;
+};

package/dist/types/PerqToBeansSwapInfo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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