@dripfi/drip-sdk 1.3.1 → 1.3.3

package/dist/DripApi.d.ts

@@ -11,7 +11,7 @@ import { LoyaltyCard } from './types/LoyaltyCard';
 import { BeansBalance } from './types/BeansBalance';
 import { PerqToBeansSwapInfo } from './types/PerqToBeansSwapInfo';
 import BeanEntry from './types/BeanEntry';
-import { SignedPayload } from './types/SignedPayload';
+import { NonceEnrichedSignedPayload, NonceEnrichedPayload } from './types/SignedPayload';
 import { UpgradeLoyaltyCardPayload } from './types/UpgradeLoyaltyCardPayload';
 export default class DripApi {
     route: string;
@@ -37,8 +37,9 @@ export default class DripApi {
     fetchAllLoyaltyCards(): Promise<LoyaltyCard[]>;
     fetchOwnedLoyaltyCard(walletAddress: string): Promise<LoyaltyCard>;
     fetchBeansBalance(walletAddress: string): Promise<BeansBalance>;
-    upgradeLoyaltyCard(signedPayload: SignedPayload<UpgradeLoyaltyCardPayload>): Promise<LoyaltyCard>;
+    upgradeLoyaltyCard(signedPayload: NonceEnrichedSignedPayload<UpgradeLoyaltyCardPayload>): Promise<LoyaltyCard>;
     fetchMyPerqData(userAddress: string): Promise<MyPerqData>;
     getSwapPerqForBeansInfo(): Promise<PerqToBeansSwapInfo>;
     fetchBeansHistory(walletAddress: string): Promise<BeanEntry[]>;
+    getNonceEnrichedPayload<T>(payload: T): Promise<NonceEnrichedPayload<T>>;
 }

package/dist/DripApi.js

@@ -378,5 +378,22 @@ class DripApi {
             }
         });
     }
+    getNonceEnrichedPayload(payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield fetch(`${this.route}/api-be/api/nonce`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ payload }), // Wrap in payload property for BE
+            });
+            if (!res.ok) {
+                throw new Error('Failed to get nonce-enriched payload');
+            }
+            const enrichedPayload = yield res.json();
+            // Return the enriched payload without the extra nesting
+            return enrichedPayload.payload;
+        });
+    }
 }
 exports.default = DripApi;

package/dist/DripSdk.d.ts

@@ -12,7 +12,7 @@ import { BeansBalance } from './types/BeansBalance';
 import { PerqToBeansSwapInfo } from './types/PerqToBeansSwapInfo';
 import BeanEntry from './types/BeanEntry';
 import { VestingInfo } from './types/VestingInfo';
-import { SignedPayload } from './types/SignedPayload';
+import { NonceEnrichedSignedPayload } from './types/SignedPayload';
 export default class DripSdk {
     private dripApi;
     private dripTokenContract;
@@ -72,7 +72,8 @@ export default class DripSdk {
     getAllVestingInfo(beneficiaryAddress: string): Promise<VestingInfo>;
     claimVestedPerq(amount: string): Promise<string>;
     burnVestedPerq(amount: string, price: string, deadline: string, signature: string): Promise<string>;
-    signPayload<T extends Record<string, unknown>>(payload: T): Promise<SignedPayload<T>>;
+    signPayload<T>(payload: T): Promise<NonceEnrichedSignedPayload<T>>;
+    private getEnrichedPayload;
     private generateRedeemBagStruct;
     private getERC20Precission;
     private calculatePendingDeposits;

package/dist/DripSdk.js

@@ -167,21 +167,57 @@ class DripSdk {
     }
     getUserVaultBalance(vaultAddress) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
             const userAddress = yield this.signer.getAddress();
-            const vault = yield this.getVaultDetails(vaultAddress);
-            const dnfts = yield this.dripApi.fetchAllUserDNFTForVault(vaultAddress, userAddress);
-            const wnfts = yield this.dripApi.fetchAllUserWNFTForVault(vaultAddress, userAddress);
+            // Parallel fetch of vault, user dnfts and user wnfts
+            const [vault, userDnftsForVault, userWnftsForVault] = yield Promise.all([
+                this.getVaultDetails(vaultAddress),
+                this.dripApi.fetchAllUserDNFTForVault(vaultAddress, userAddress),
+                this.dripApi.fetchAllUserWNFTForVault(vaultAddress, userAddress),
+            ]);
             const decimals = yield this.getERC20Precission(vault.depositToken.tokenAddress);
-            const [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance] = yield this.calculateAllWithdrawalBalances(wnfts, vaultAddress, decimals);
-            const hasWithdrawsToClaim = this.checkIfUserHasWithdrawsToClaim(wnfts);
-            const pendingDeposits = this.calculatePendingDeposits(dnfts, decimals);
-            const userBalance = this.calculateAllDeposits(dnfts, decimals).sub(pendingDeposits);
+            // Calculate deposits
+            let pendingDeposits = ethers_1.BigNumber.from(0);
+            let currentlyDeposited = ethers_1.BigNumber.from(0);
+            for (const dnft of userDnftsForVault) {
+                if (dnft.assets && dnft.assets[0]) {
+                    const amount = ethers_1.ethers.utils.parseUnits(dnft.assets[0].toString(), decimals);
+                    if (!dnft.isDHWFinished) {
+                        // Pending deposits (not yet processed)
+                        pendingDeposits = pendingDeposits.add(amount);
+                    }
+                    else {
+                        // Processed deposits
+                        currentlyDeposited = currentlyDeposited.add(amount);
+                    }
+                }
+            }
+            // Calculate withdrawals
+            let pendingWithdraws = ethers_1.BigNumber.from(0);
+            let claimable = ethers_1.BigNumber.from(0);
+            for (const wnft of userWnftsForVault) {
+                if (!wnft.isBurned && wnft.svtWithdrawn) {
+                    const currentBlockNumber = wnft.blockNumber - 1;
+                    const assetsPerSvtAtBlock = yield this.dripApi.fetchAssetPerSvtAtBlock(vaultAddress, currentBlockNumber);
+                    const estimatedValueOfNFT = ethers_1.BigNumber.from(ethers_1.ethers.utils.formatUnits(ethers_1.BigNumber.from(wnft.svtWithdrawn).mul(assetsPerSvtAtBlock), 36).split('.')[0]);
+                    if (wnft.isDHWFinished) {
+                        // Processed and claimable
+                        claimable = claimable.add(estimatedValueOfNFT);
+                    }
+                    else {
+                        // Not processed, pending withdrawal
+                        pendingWithdraws = pendingWithdraws.add(estimatedValueOfNFT);
+                    }
+                }
+            }
             return {
-                hasWithdrawsToClaim,
-                userBalance: ethers_1.ethers.utils.formatUnits(userBalance, decimals),
+                hasWithdrawsToClaim: claimable.gt(0),
+                userBalance: ethers_1.ethers.utils.formatUnits(currentlyDeposited, decimals),
                 pendingUserBalance: ethers_1.ethers.utils.formatUnits(pendingDeposits, decimals),
-                pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(estimatedPendingWithdrawalBalance, decimals),
-                withdrawableBalance: ethers_1.ethers.utils.formatUnits(estimatedWithdrawableBalance, decimals),
+                pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(pendingWithdraws, decimals),
+                withdrawableBalance: ethers_1.ethers.utils.formatUnits(claimable, decimals),
             };
         });
     }
@@ -347,7 +383,9 @@ class DripSdk {
     }
     upgradeLoyaltyCard(index) {
         return __awaiter(this, void 0, void 0, function* () {
-            const payload = { index };
+            const payload = {
+                index
+            };
             const signedPayload = yield this.signPayload(payload);
             return this.dripApi.upgradeLoyaltyCard(signedPayload);
         });
@@ -557,20 +595,31 @@ class DripSdk {
     signPayload(payload) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer) {
-                throw Error('No signer provided');
+                throw new Error('No signer provided');
             }
+            // Wrap the payload in a Basepayload to enrich it later on
+            const basePayload = {
+                payload
+            };
             const signerAddress = yield this.signer.getAddress();
+            // Get enriched payload with nonce before signing
+            const enrichedPayload = yield this.getEnrichedPayload(basePayload);
             // Create message to sign
-            const message = JSON.stringify(payload);
+            const message = JSON.stringify(enrichedPayload);
             // Sign the message
             const signature = yield this.signer.signMessage(message);
             return {
                 signature,
                 signerAddress,
-                payload,
+                payload: enrichedPayload,
             };
         });
     }
+    getEnrichedPayload(payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.dripApi.getNonceEnrichedPayload(payload.payload);
+        });
+    }
     generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.spoolSdk) {

package/dist/types/SignedPayload.d.ts

@@ -1,5 +1,12 @@
-export type SignedPayload<T> = {
+export type BasePayload<T> = {
+    payload: T;
+};
+export type NonceEnrichedPayload<T> = T & {
+    deadline: number;
+    signature: string;
+};
+export type NonceEnrichedSignedPayload<T> = {
     signature: string;
     signerAddress: string;
-    payload: T;
+    payload: NonceEnrichedPayload<T>;
 };

package/package.json

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