@defisaver/positions-sdk 2.1.127-uniswap-dev → 2.1.127-uniswap-3-dev

package/cjs/claiming/uniswap.d.ts

@@ -1,4 +1,5 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types';
+import { UniswapAirdropClaimableToken } from '../types/claiming';
 export declare const fetchUniswapRewardsData: (walletAddress: EthAddress) => Promise<any>;
-export declare const getUniswapRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;
+export declare const getUniswapRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, UniswapAirdropClaimableToken[]>>;

package/cjs/claiming/uniswap.js

@@ -22,13 +22,13 @@ const EMPTY_DATA = (walletAddress) => ({
 });
 const fetchUniswapRewardsData = (walletAddress) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch(`https://uniswap-merkl-drop.defisaver.com/claims/${walletAddress}`, { signal: AbortSignal.timeout(5000) });
+        const res = yield fetch(`http://localhost:8888/api/rewards/uniswap?user=${walletAddress}`, { signal: AbortSignal.timeout(5000) });
         if (!res.ok)
             throw new Error(yield res.text());
         const data = yield res.json();
-        if (data.error)
+        if (data.data.error)
             return EMPTY_DATA(walletAddress);
-        return data;
+        return data.data;
     }
     catch (err) {
         console.error('External API Error: Error fetching Uniswap rewards:', err);
@@ -56,12 +56,18 @@ const getUniswapRewards = (provider, network, walletAddresses) => __awaiter(void
         }
         else {
             results[walletAddress.toLowerCase()] = [{
+                    symbol: 'UNI',
+                    underlyingSymbol: 'UNI',
+                    label: 'Uniswap Airdrop',
+                    tokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
                     amount: (0, tokens_1.assetAmountInEth)(amountToClaim.toString(), 'UNI'),
                     walletAddress,
                     claimType: claiming_1.ClaimType.UNI_REWARDS,
-                    index: data.index,
-                    proof: data.proof,
-                    isClaimed: cumulative,
+                    additionalClaimFields: {
+                        index: data.index,
+                        isClaimed: cumulative,
+                        proof: data.proof,
+                    },
                 }];
         }
     }

package/cjs/types/claiming.d.ts

@@ -83,5 +83,13 @@ export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & {
 export type EthenaAirdropClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.ETHENA_AIRDROP;
 };
+export type UniswapAirdropClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.UNI_REWARDS;
+    additionalClaimFields: {
+        index: number;
+        isClaimed: boolean;
+        proof: string[];
+    };
+};
 export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
 export {};

package/esm/claiming/uniswap.d.ts

@@ -1,4 +1,5 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types';
+import { UniswapAirdropClaimableToken } from '../types/claiming';
 export declare const fetchUniswapRewardsData: (walletAddress: EthAddress) => Promise<any>;
-export declare const getUniswapRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;
+export declare const getUniswapRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, UniswapAirdropClaimableToken[]>>;

package/esm/claiming/uniswap.js

@@ -16,13 +16,13 @@ const EMPTY_DATA = (walletAddress) => ({
 });
 export const fetchUniswapRewardsData = (walletAddress) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch(`https://uniswap-merkl-drop.defisaver.com/claims/${walletAddress}`, { signal: AbortSignal.timeout(5000) });
+        const res = yield fetch(`http://localhost:8888/api/rewards/uniswap?user=${walletAddress}`, { signal: AbortSignal.timeout(5000) });
         if (!res.ok)
             throw new Error(yield res.text());
         const data = yield res.json();
-        if (data.error)
+        if (data.data.error)
             return EMPTY_DATA(walletAddress);
-        return data;
+        return data.data;
     }
     catch (err) {
         console.error('External API Error: Error fetching Uniswap rewards:', err);
@@ -49,12 +49,18 @@ export const getUniswapRewards = (provider, network, walletAddresses) => __await
         }
         else {
             results[walletAddress.toLowerCase()] = [{
+                    symbol: 'UNI',
+                    underlyingSymbol: 'UNI',
+                    label: 'Uniswap Airdrop',
+                    tokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
                     amount: assetAmountInEth(amountToClaim.toString(), 'UNI'),
                     walletAddress,
                     claimType: ClaimType.UNI_REWARDS,
-                    index: data.index,
-                    proof: data.proof,
-                    isClaimed: cumulative,
+                    additionalClaimFields: {
+                        index: data.index,
+                        isClaimed: cumulative,
+                        proof: data.proof,
+                    },
                 }];
         }
     }

package/esm/types/claiming.d.ts

@@ -83,5 +83,13 @@ export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & {
 export type EthenaAirdropClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.ETHENA_AIRDROP;
 };
+export type UniswapAirdropClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.UNI_REWARDS;
+    additionalClaimFields: {
+        index: number;
+        isClaimed: boolean;
+        proof: string[];
+    };
+};
 export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.127-uniswap-dev",
+  "version": "2.1.127-uniswap-3-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/claiming/uniswap.ts

@@ -3,7 +3,7 @@ import { Client } from 'viem';
 import { assetAmountInEth } from '@defisaver/tokens';
 import { EthAddress, NetworkNumber } from '../types';
 import { UniswapTokenDistributorViem } from '../contracts';
-import { ClaimType } from '../types/claiming';
+import { ClaimType, UniswapAirdropClaimableToken } from '../types/claiming';
 
 const EMPTY_DATA = (walletAddress: EthAddress) => ({
   address: walletAddress, index: 0, amount: '0x0', proof: [],
@@ -11,22 +11,22 @@ const EMPTY_DATA = (walletAddress: EthAddress) => ({
 
 export const fetchUniswapRewardsData = async (walletAddress: EthAddress) => {
   try {
-    const res = await fetch(`https://uniswap-merkl-drop.defisaver.com/claims/${walletAddress}`,
+    const res = await fetch(`http://localhost:8888/api/rewards/uniswap?user=${walletAddress}`,
       { signal: AbortSignal.timeout(5000) });
 
     if (!res.ok) throw new Error(await res.text());
 
     const data = await res.json();
-    if (data.error) return EMPTY_DATA(walletAddress);
+    if (data.data.error) return EMPTY_DATA(walletAddress);
 
-    return data;
+    return data.data;
   } catch (err) {
     console.error('External API Error: Error fetching Uniswap rewards:', err);
     return EMPTY_DATA(walletAddress);
   }
 };
 
-export const getUniswapRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => {
+export const getUniswapRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]): Promise<Record<string, UniswapAirdropClaimableToken[]>> => {
   // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
   const apiDataPromises = walletAddresses.map(address => fetchUniswapRewardsData(address));
   const apiDataArray = await Promise.all(apiDataPromises);
@@ -38,7 +38,7 @@ export const getUniswapRewards = async (provider: Client, network: NetworkNumber
   const cumulativeResults = await Promise.all(cumulativePromises);
 
   // Process results
-  const results: Record<string, any[]> = {};
+  const results: Record<string, UniswapAirdropClaimableToken[]> = {};
 
   for (let i = 0; i < walletAddresses.length; i++) {
     const walletAddress = walletAddresses[i];
@@ -51,12 +51,18 @@ export const getUniswapRewards = async (provider: Client, network: NetworkNumber
       results[walletAddress.toLowerCase() as EthAddress] = [];
     } else {
       results[walletAddress.toLowerCase() as EthAddress] = [{
+        symbol: 'UNI',
+        underlyingSymbol: 'UNI',
+        label: 'Uniswap Airdrop',
+        tokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
         amount: assetAmountInEth(amountToClaim.toString(), 'UNI'),
         walletAddress,
         claimType: ClaimType.UNI_REWARDS,
-        index: data.index,
-        proof: data.proof,
-        isClaimed: cumulative,
+        additionalClaimFields: {
+          index: data.index,
+          isClaimed: cumulative,
+          proof: data.proof,
+        },
       }];
     }
   }

package/src/types/claiming.ts

@@ -90,6 +90,15 @@ export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & { claimT
 
 export type EthenaAirdropClaimableToken = _ClaimableTokenPartial & { claimType: ClaimType.ETHENA_AIRDROP };
 
+export type UniswapAirdropClaimableToken = _ClaimableTokenPartial & {
+  claimType: ClaimType.UNI_REWARDS,
+  additionalClaimFields: {
+    index: number;
+    isClaimed: boolean;
+    proof: string[];
+  };
+};
+
 export type ClaimableToken =
     AaveRewardsClaimableToken
     | AaveMeritRewardsClaimableToken