@defisaver/positions-sdk 2.1.111-merkl-auth-api-dev → 2.1.111-merkl-auth-api-2-dev

package/cjs/aaveV3/merkl.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMerkleCampaigns = exports.formatAaveAsset = exports.getAaveUnderlyingSymbol = void 0;
 const moneymarket_1 = require("../moneymarket");
 const utils_1 = require("../services/utils");
-const merkl_1 = require("../services/merkl");
 const types_1 = require("../types");
 const getAaveUnderlyingSymbol = (_symbol = '') => {
     let symbol = _symbol
@@ -41,7 +40,8 @@ const formatAaveAsset = (_symbol) => {
 exports.formatAaveAsset = formatAaveAsset;
 const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch(`${(0, merkl_1.getMerklApiUrl)()}/v4/opportunities?mainProtocolId=aave`, {
+        // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+        const res = yield fetch('https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
         });
         if (!res.ok)

package/cjs/aaveV4/merkl.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.attachAaveV4MerklIncentives = exports.getAaveV4MerkleCampaigns = void 0;
 const moneymarket_1 = require("../moneymarket");
 const utils_1 = require("../services/utils");
-const merkl_1 = require("../services/merkl");
 const types_1 = require("../types");
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
@@ -35,7 +34,8 @@ const buildIncentive = (opportunity) => {
 const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     const result = { hub: {}, spoke: {} };
     try {
-        const res = yield fetch(`${(0, merkl_1.getMerklApiUrl)()}/v4/opportunities?mainProtocolId=aave`, {
+        // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+        const res = yield fetch('https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
         });
         if (!res.ok)

package/cjs/claiming/aaveV3.d.ts

@@ -1,5 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { EthAddress, NetworkNumber } from '../types';
 import { ClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/cjs/claiming/aaveV3.js

@@ -19,7 +19,6 @@ const claiming_1 = require("../types/claiming");
 const contracts_1 = require("../contracts");
 const utils_1 = require("../services/utils");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
-const merkl_1 = require("../services/merkl");
 const mapAaveRewardsToClaimableTokens = (aaveRewards, marketAddress, walletAddress) => aaveRewards.map(reward => ({
     symbol: reward.symbol,
     amount: reward.amount,
@@ -100,7 +99,8 @@ function getMeritUnclaimedRewards(account, network) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
-            const res = yield fetch(`${(0, merkl_1.getMerklApiUrl)()}/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT) });
+            // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+            const res = yield fetch(`https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/get-user-rewards/${account}?chainId=${network}`, { signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT) });
             data = yield res.json();
         }
         catch (error) {

package/cjs/index.d.ts

@@ -22,5 +22,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { getMerklApiUrl, setMerklApiUrl } from './services/merkl';
 export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/cjs/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savings = exports.claiming = exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV4 = exports.aaveV3 = exports.aaveV2 = exports.setMerklApiUrl = exports.getMerklApiUrl = void 0;
+exports.savings = exports.claiming = exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV4 = exports.aaveV3 = exports.aaveV2 = void 0;
 require("./setup");
 const fluid = __importStar(require("./fluid"));
 exports.fluid = fluid;
@@ -83,6 +83,3 @@ exports.claiming = claiming;
 const savings = __importStar(require("./savings"));
 exports.savings = savings;
 __exportStar(require("./types"), exports);
-var merkl_1 = require("./services/merkl");
-Object.defineProperty(exports, "getMerklApiUrl", { enumerable: true, get: function () { return merkl_1.getMerklApiUrl; } });
-Object.defineProperty(exports, "setMerklApiUrl", { enumerable: true, get: function () { return merkl_1.setMerklApiUrl; } });

package/esm/aaveV3/merkl.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { aprToApy } from '../moneymarket';
 import { LONGER_TIMEOUT, wethToEth } from '../services/utils';
-import { getMerklApiUrl } from '../services/merkl';
 import { OpportunityAction, OpportunityStatus, } from '../types';
 export const getAaveUnderlyingSymbol = (_symbol = '') => {
     let symbol = _symbol
@@ -36,7 +35,8 @@ export const formatAaveAsset = (_symbol) => {
 };
 export const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch(`${getMerklApiUrl()}/v4/opportunities?mainProtocolId=aave`, {
+        // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+        const res = yield fetch('https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(LONGER_TIMEOUT),
         });
         if (!res.ok)

package/esm/aaveV4/merkl.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { aprToApy } from '../moneymarket';
 import { LONGER_TIMEOUT } from '../services/utils';
-import { getMerklApiUrl } from '../services/merkl';
 import { IncentiveKind, OpportunityAction, OpportunityStatus, } from '../types';
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
@@ -32,7 +31,8 @@ const buildIncentive = (opportunity) => {
 export const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     const result = { hub: {}, spoke: {} };
     try {
-        const res = yield fetch(`${getMerklApiUrl()}/v4/opportunities?mainProtocolId=aave`, {
+        // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+        const res = yield fetch('https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(LONGER_TIMEOUT),
         });
         if (!res.ok)

package/esm/claiming/aaveV3.d.ts

@@ -1,5 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { EthAddress, NetworkNumber } from '../types';
 import { ClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/esm/claiming/aaveV3.js

@@ -12,7 +12,6 @@ import { ClaimType } from '../types/claiming';
 import { AaveIncentiveDataProviderV3ContractViem, AaveRewardsControllerViem, } from '../contracts';
 import { compareAddresses, getEthAmountForDecimals, LONGER_TIMEOUT } from '../services/utils';
 import { getAaveUnderlyingSymbol } from '../helpers/aaveHelpers';
-import { getMerklApiUrl } from '../services/merkl';
 const mapAaveRewardsToClaimableTokens = (aaveRewards, marketAddress, walletAddress) => aaveRewards.map(reward => ({
     symbol: reward.symbol,
     amount: reward.amount,
@@ -93,7 +92,8 @@ export function getMeritUnclaimedRewards(account, network) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
-            const res = yield fetch(`${getMerklApiUrl()}/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
+            // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+            const res = yield fetch(`https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/get-user-rewards/${account}?chainId=${network}`, { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
             data = yield res.json();
         }
         catch (error) {

package/esm/index.d.ts

@@ -22,5 +22,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { getMerklApiUrl, setMerklApiUrl } from './services/merkl';
 export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/index.js

@@ -22,5 +22,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { getMerklApiUrl, setMerklApiUrl } from './services/merkl';
 export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.111-merkl-auth-api-dev",
+  "version": "2.1.111-merkl-auth-api-2-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/merkl.ts

@@ -1,6 +1,5 @@
 import { aprToApy } from '../moneymarket';
 import { LONGER_TIMEOUT, wethToEth } from '../services/utils';
-import { getMerklApiUrl } from '../services/merkl';
 import {
   MerkleRewardMap, MerklOpportunity, OpportunityAction, OpportunityStatus,
 } from '../types';
@@ -32,7 +31,8 @@ export const formatAaveAsset = (_symbol: string) => {
 
 export const getMerkleCampaigns = async (chainId: NetworkNumber): Promise<MerkleRewardMap> => {
   try {
-    const res = await fetch(`${getMerklApiUrl()}/v4/opportunities?mainProtocolId=aave`, {
+    // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+    const res = await fetch('https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/opportunities?mainProtocolId=aave', {
       signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
     if (!res.ok) throw new Error('Failed to fetch Merkle campaigns');

package/src/aaveV4/merkl.ts

@@ -1,6 +1,5 @@
 import { aprToApy } from '../moneymarket';
 import { LONGER_TIMEOUT } from '../services/utils';
-import { getMerklApiUrl } from '../services/merkl';
 import {
   AaveV4MerklRewardMap,
   AaveV4ReserveAssetData,
@@ -35,7 +34,8 @@ const buildIncentive = (opportunity: MerklOpportunity): IncentiveData => {
 export const getAaveV4MerkleCampaigns = async (chainId: NetworkNumber): Promise<AaveV4MerklRewardMap> => {
   const result: AaveV4MerklRewardMap = { hub: {}, spoke: {} };
   try {
-    const res = await fetch(`${getMerklApiUrl()}/v4/opportunities?mainProtocolId=aave`, {
+    // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+    const res = await fetch('https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/opportunities?mainProtocolId=aave', {
       signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
     if (!res.ok) throw new Error('Failed to fetch Aave V4 Merkle campaigns');

package/src/claiming/aaveV3.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { EthAddress, NetworkNumber } from '../types';
 import { ClaimableToken, ClaimType } from '../types/claiming';
 import {
   AaveIncentiveDataProviderV3ContractViem,
@@ -8,7 +8,6 @@ import {
 } from '../contracts';
 import { compareAddresses, getEthAmountForDecimals, LONGER_TIMEOUT } from '../services/utils';
 import { getAaveUnderlyingSymbol } from '../helpers/aaveHelpers';
-import { getMerklApiUrl } from '../services/merkl';
 
 type AaveReward = {
   amount: string;
@@ -107,7 +106,8 @@ export async function getUnclaimedRewardsForAllMarkets(
 export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]> {
   let data;
   try {
-    const res = await fetch(`${getMerklApiUrl()}/v4/users/${account}/rewards?chainId=${network}`,
+    // TEMP staging QA (DEV-12653): revert to https://fe.defisaver.com/api/merkl before merge
+    const res = await fetch(`https://stage.defisaver.com/dev-12653-merkl-auth-api/api/merkl/get-user-rewards/${account}?chainId=${network}`,
       { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
     data = await res.json();
   } catch (error) {

package/src/index.ts

@@ -25,8 +25,6 @@ import * as savings from './savings';
 
 export * from './types';
 
-export { getMerklApiUrl, setMerklApiUrl } from './services/merkl';
-
 export {
   aaveV2,
   aaveV3,

package/cjs/services/merkl.d.ts

@@ -1,2 +0,0 @@
-export declare const getMerklApiUrl: () => string;
-export declare const setMerklApiUrl: (url: string) => void;

package/cjs/services/merkl.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setMerklApiUrl = exports.getMerklApiUrl = void 0;
-/**
- * Configurable base URL for the Merkl API (https://developers.merkl.xyz).
- *
- * Defaults to Merkl's public host. Consumers can override it via `setMerklApiUrl` — e.g. to route
- * requests through their own backend proxy that attaches a Merkl API key (the key must stay
- * server-side, and a proxy also avoids browser CORS limits on the public host).
- */
-let merklApiUrl = 'https://api.merkl.xyz';
-const getMerklApiUrl = () => merklApiUrl;
-exports.getMerklApiUrl = getMerklApiUrl;
-const setMerklApiUrl = (url) => {
-    merklApiUrl = url.replace(/\/+$/, '');
-};
-exports.setMerklApiUrl = setMerklApiUrl;

package/esm/services/merkl.d.ts

@@ -1,2 +0,0 @@
-export declare const getMerklApiUrl: () => string;
-export declare const setMerklApiUrl: (url: string) => void;

package/esm/services/merkl.js

@@ -1,12 +0,0 @@
-/**
- * Configurable base URL for the Merkl API (https://developers.merkl.xyz).
- *
- * Defaults to Merkl's public host. Consumers can override it via `setMerklApiUrl` — e.g. to route
- * requests through their own backend proxy that attaches a Merkl API key (the key must stay
- * server-side, and a proxy also avoids browser CORS limits on the public host).
- */
-let merklApiUrl = 'https://api.merkl.xyz';
-export const getMerklApiUrl = () => merklApiUrl;
-export const setMerklApiUrl = (url) => {
-    merklApiUrl = url.replace(/\/+$/, '');
-};

package/src/services/merkl.ts

@@ -1,14 +0,0 @@
-/**
- * Configurable base URL for the Merkl API (https://developers.merkl.xyz).
- *
- * Defaults to Merkl's public host. Consumers can override it via `setMerklApiUrl` — e.g. to route
- * requests through their own backend proxy that attaches a Merkl API key (the key must stay
- * server-side, and a proxy also avoids browser CORS limits on the public host).
- */
-let merklApiUrl = 'https://api.merkl.xyz';
-
-export const getMerklApiUrl = (): string => merklApiUrl;
-
-export const setMerklApiUrl = (url: string): void => {
-  merklApiUrl = url.replace(/\/+$/, '');
-};