@merkl/api 0.10.389 → 0.10.391

package/dist/src/eden/index.d.ts

@@ -2320,7 +2320,13 @@ declare const eden: {
                     fetch?: RequestInit | undefined;
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
-                        totalAmount: number;
+                        total: number;
+                        breakdown: {
+                            [key: number]: {
+                                chainAmount: number;
+                                percentage: number;
+                            };
+                        };
                     };
                 }>>;
                 "per-month": ((params: {
@@ -6468,7 +6474,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                     response: {
                         200: {
-                            totalAmount: number;
+                            total: number;
+                            breakdown: {
+                                [key: number]: {
+                                    chainAmount: number;
+                                    percentage: number;
+                                };
+                            };
                         };
                     };
                 };
@@ -10496,7 +10508,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     fetch?: RequestInit | undefined;
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
-                        totalAmount: number;
+                        total: number;
+                        breakdown: {
+                            [key: number]: {
+                                chainAmount: number;
+                                percentage: number;
+                            };
+                        };
                     };
                 }>>;
                 "per-month": ((params: {

package/dist/src/index.d.ts

@@ -2829,7 +2829,13 @@ declare const app: Elysia<"", false, {
                     };
                     response: {
                         200: {
-                            totalAmount: number;
+                            total: number;
+                            breakdown: {
+                                [key: number]: {
+                                    chainAmount: number;
+                                    percentage: number;
+                                };
+                            };
                         };
                     };
                 };

package/dist/src/libs/campaigns/campaignTypes/HyperdriveDynamicData.js

@@ -1,4 +1,4 @@
-import { BN2Number, HyperdriveTargetInterface, } from "@sdk";
+import { BN2Number, ETH_ADDRESS, HyperDriveSubCampaignType, HyperdriveTargetInterface, } from "@sdk";
 import { Pricer } from "../../../utils/pricer";
 export async function HyperdriveDynamicData(chainId, campaigns) {
     const pricer = await Pricer.load();
@@ -12,10 +12,6 @@ export async function HyperdriveDynamicData(chainId, campaigns) {
             allowFailure: false,
             callData: HyperdriveTargetInterface.encodeFunctionData("getPoolConfig"),
             target: campaign.campaignParameters.targetToken,
-        }, {
-            allowFailure: false,
-            callData: HyperdriveTargetInterface.encodeFunctionData("totalSupply", [campaign.campaignParameters.tokenId]),
-            target: campaign.campaignParameters.targetToken,
         });
     }
     return {
@@ -29,27 +25,34 @@ export async function HyperdriveDynamicData(chainId, campaigns) {
                 for (const campaign of campaigns) {
                     const poolInfo = HyperdriveTargetInterface.decodeFunctionResult("getPoolInfo", result[i++])[0];
                     const poolConfig = HyperdriveTargetInterface.decodeFunctionResult("getPoolConfig", result[i++])[0];
-                    const totalSupplyVaultToken = BN2Number(HyperdriveTargetInterface.decodeFunctionResult("totalSupply", result[i++])[0]);
                     const priceRewardToken = (await pricer.get({
                         address: campaign.rewardToken,
                         chainId,
                         symbol: campaign.campaignParameters.symbolRewardToken,
                     })) ?? 0;
-                    const priceTargetToken = (await pricer.get({
-                        address: campaign.campaignParameters.targetToken,
-                        chainId,
-                        symbol: campaign.campaignParameters.symbolTargetToken,
-                    })) ?? 0;
-                    const priceBaseToken = (await pricer.get({
-                        address: campaign.campaignParameters.baseToken,
-                        chainId,
-                        symbol: campaign.campaignParameters.baseTokenSymbol,
-                    })) ?? 0;
-                    const supply = totalSupplyVaultToken;
+                    const lpSupply = BN2Number(poolInfo.lpTotalSupply, 18);
+                    const longSupply = BN2Number(poolInfo.longsOutstanding, 18);
+                    const shortSupply = BN2Number(poolInfo.shortsOutstanding, 18);
+                    const marketSupply = lpSupply * BN2Number(poolInfo.lpSharePrice, 18);
+                    const priceBaseToken = (poolConfig.baseToken === ETH_ADDRESS
+                        ? await pricer.get({
+                            chainId,
+                            symbol: "ETH",
+                        })
+                        : await pricer.get({
+                            address: campaign.campaignParameters.baseToken,
+                            chainId,
+                            symbol: campaign.campaignParameters.baseTokenSymbol,
+                        })) ?? 0;
+                    const tvl = campaign.campaignSubType === HyperDriveSubCampaignType.LP
+                        ? priceBaseToken * marketSupply
+                        : campaign.campaignSubType === HyperDriveSubCampaignType.LONG
+                            ? priceBaseToken * longSupply
+                            : priceBaseToken * shortSupply;
                     dynamicData.push({
                         ...campaign,
-                        totalSupplyTargetToken: supply,
-                        tvl: 0,
+                        totalSupplyTargetToken: marketSupply,
+                        tvl: tvl,
                         apr: 0,
                         priceRewardToken: priceRewardToken,
                     });

package/dist/src/modules/v4/accounting/accounting.controller.d.ts

@@ -51,7 +51,13 @@ export declare const AccountingController: Elysia<"/accounting", false, {
                 };
                 response: {
                     200: {
-                        totalAmount: number;
+                        total: number;
+                        breakdown: {
+                            [key: number]: {
+                                chainAmount: number;
+                                percentage: number;
+                            };
+                        };
                     };
                 };
             };

package/dist/src/modules/v4/accounting/accounting.controller.js

@@ -12,7 +12,7 @@ export const AccountingController = new Elysia({ prefix: "/accounting", detail:
 })
     .group("/revenues", app => {
     return app
-        .get("", async () => await AccountingService.getRevenue(), {
+        .get("", async () => await AccountingService.getAllRevenueBreakdownByChain(), {
         headers: AuthorizationHeadersDto,
         beforeHandle: async ({ headers }) => {
             await BackOfficeGuard({ headers });

package/dist/src/modules/v4/accounting/accounting.service.d.ts

@@ -1,5 +1,5 @@
 import type { GetTransactionsQueryModel } from "./";
-import type { ChainId } from "@sdk";
+import { ChainId } from "@sdk";
 export declare class AccountingService {
     static hashId(chainId: ChainId, fromTokenId: string, toTokenId: string, timestamp: number): string;
     static getTokenId(chainId: number, address: string): string;
@@ -21,6 +21,15 @@ export declare class AccountingService {
     static getRevenueByChain(chainId: number): Promise<{
         totalAmount: number;
     }>;
+    static getAllRevenueBreakdownByChain(): Promise<{
+        total: number;
+        breakdown: {
+            [key: number]: {
+                chainAmount: number;
+                percentage: number;
+            };
+        };
+    }>;
     static getMonthlyRevenue(year: number, month: number): Promise<{
         totalAmount: number;
         from: string;

package/dist/src/modules/v4/accounting/accounting.service.js

@@ -1,5 +1,6 @@
 import { AccountingRepository } from "./accounting.repository";
 import { TokenService } from "../token";
+import { ChainId } from "@sdk";
 export class AccountingService {
     static hashId(chainId, fromTokenId, toTokenId, timestamp) {
         return Bun.hash(`${chainId}${fromTokenId}${toTokenId}${timestamp}`).toString();
@@ -26,6 +27,24 @@ export class AccountingService {
         }
         return { totalAmount };
     }
+    static async getAllRevenueBreakdownByChain() {
+        const breakdown = {};
+        let consolidatedAmount = 0;
+        for (const chainId of Object.values(ChainId).filter(id => typeof id === "number")) {
+            const data = await AccountingRepository.getForMultisigByChain(chainId);
+            let totalAmount = 0;
+            for (const tx of data) {
+                totalAmount += Number(tx.amountIn);
+            }
+            breakdown[chainId] = { chainAmount: totalAmount, percentage: 0 };
+            consolidatedAmount += totalAmount;
+        }
+        for (const chainId of Object.values(ChainId).filter(id => typeof id === "number")) {
+            const totalAmount = breakdown[chainId].chainAmount;
+            breakdown[chainId] = { chainAmount: totalAmount, percentage: (totalAmount * 100) / consolidatedAmount };
+        }
+        return { total: consolidatedAmount, breakdown };
+    }
     static async getMonthlyRevenue(year, month) {
         const startDate = new Date(year, month - 1, 1);
         const endDate = new Date(year, month, 0, 23, 59, 59);

package/dist/src/modules/v4/opportunity/opportunity.service.js

@@ -85,7 +85,7 @@ export class OpportunityService {
                 return getEulerMetadata(chainId, campaign.campaignId, campaign.subType, campaign.rewardTokenAddress, campaign.amount, campaignParams);
             case "HYPERDRIVELOGPROCESSOR":
             case "HYPERDRIVELOGFIXPROCESSOR":
-                return getHyperdriveMetadata(chainId, campaign.subType, campaignParams);
+                return getHyperdriveMetadata(chainId, campaignParams.subCampaignType, campaignParams);
             case "INVALID":
                 return {
                     name: "Invalid Campaigns",

package/dist/src/modules/v4/opportunity/subservices/getHyperdriveMetadata.service.d.ts

@@ -1,3 +1,3 @@
-import type { ChainId, HyperDriveLogCampaign } from "@sdk";
+import { type ChainId, type HyperDriveLogCampaign } from "@sdk";
 import type { OpportunityMetadata } from "../opportunity.model";
 export declare const getHyperdriveMetadata: (chainId: ChainId, campaignSubType: HyperDriveLogCampaign["campaignSubType"], params: HyperDriveLogCampaign["campaignParameters"]) => OpportunityMetadata;

package/dist/src/modules/v4/opportunity/subservices/getHyperdriveMetadata.service.js

@@ -1,10 +1,14 @@
 import { OpportunityAction } from "../../../../../database/api/.generated";
+import { HyperDriveSubCampaignType } from "@sdk";
 export const getHyperdriveMetadata = (chainId, campaignSubType, params) => {
     const subtypes = [
         { name: "Add Liquidity on", action: OpportunityAction.POOL },
         { name: "Open Long on", action: OpportunityAction.LONG },
         { name: "Open Short on", action: OpportunityAction.SHORT },
     ];
+    if (campaignSubType === HyperDriveSubCampaignType.LP) {
+        campaignSubType = 0;
+    }
     const subtype = subtypes[campaignSubType];
     return {
         action: subtype.action,

package/dist/src/modules/v4/reward/reward.service.js

@@ -361,6 +361,8 @@ export class RewardService {
             return { timestamp, total: 0, breakdowns: [] };
         const breakdowns = [];
         for (const { amount, rewardToken: address, chainId, startTimestamp: start, endTimestamp: end, campaignId, } of dynamicData) {
+            if (end < moment().unix())
+                continue;
             const timespan = Math.abs(end - start);
             const isWithinTimespan = moment().unix() > start && moment().unix() < end;
             const dayspan = Math.max(1, Math.floor(timespan / DAY));

package/dist/src/modules/v4/router.d.ts

@@ -2707,7 +2707,13 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                     response: {
                         200: {
-                            totalAmount: number;
+                            total: number;
+                            breakdown: {
+                                [key: number]: {
+                                    chainAmount: number;
+                                    percentage: number;
+                                };
+                            };
                         };
                     };
                 };