@merkl/api 0.19.28 → 0.19.30

package/dist/database/api/.generated/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "prisma-client-842a82af94b845e9a454c9ffa27bcbc996a240638fa2aaa44c3d8222e1d1f139",
+  "name": "prisma-client-89044a06b757b61d6512ccc35177e2e669c5861f63b5ed81f474812c9058bea8",
   "main": "index.js",
   "types": "index.d.ts",
   "browser": "index-browser.js",

package/dist/database/api/.generated/schema.prisma

@@ -73,7 +73,7 @@ model CampaignComputedValue {
 }
 
 model UserComputedValue {
-  id         Int      @id @default(autoincrement())
+  id         Int      @id @default(autoincrement()) // TODO Migrate to something smarter than Int ids
   campaignId String
   Campaign   Campaign @relation(fields: [campaignId], references: [id])
   address    String   @db.Char(42)
@@ -193,7 +193,7 @@ model AprRecord {
 }
 
 model AprBreakdown {
-  id          Int       @id @default(autoincrement())
+  id          Int       @id @default(autoincrement()) // TODO Migrate to something smarter than Int ids
   identifier  String
   type        AprType
   value       Float
@@ -217,7 +217,7 @@ model TVLRecord {
 }
 
 model TVLBreakdown {
-  id         Int     @id @default(autoincrement())
+  id         Int     @id @default(autoincrement()) // TODO Migrate to something smarter than Int ids
   identifier String
   type       TvlType
   value      Float
@@ -242,7 +242,7 @@ model DailyRewardsRecord {
 }
 
 model DailyRewardsBreakdown {
-  id                   Int                @id @default(autoincrement())
+  id                   Int                @id @default(autoincrement()) // TODO Migrate to something smarter than Int ids
   value                Float
   campaignId           String
   Campaign             Campaign           @relation(fields: [campaignId], references: [id])
@@ -292,7 +292,7 @@ model Reward {
 }
 
 model RewardBreakdown {
-  id         Int       @id @default(autoincrement())
+  id         BigInt    @id @default(autoincrement())
   Protocol   Protocol? @relation(fields: [protocolId], references: [id])
   protocolId String?
   reason     String

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

@@ -1,4 +1,4 @@
-import type { ChainId } from "@sdk";
+import { type ChainId } from "@sdk";
 import type { CreateRootModel, RootByTimestampModel } from "./merklRoot.model";
 export declare class MerklRootService {
     static firstRoot(chainId: ChainId): Promise<{
@@ -18,13 +18,7 @@ export declare class MerklRootService {
      * @param chainId to fetch roots for
      * @returns object with live and last tree roots
      */
-    static fetch(chainId: ChainId): Promise<{
-        live: any;
-        tree: any;
-        lastTree: any;
-        endOfDisputePeriod: any;
-        disputer: any;
-    }>;
+    static fetch(chainId: ChainId): Promise<any>;
     /**
      * Fetch all roots for the provided chains
      * @param chainIds to fetch roots for

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

@@ -1,3 +1,5 @@
+import { log } from "@/utils/logger";
+import { NETWORK_LABELS, withTimeout } from "@sdk";
 import { CacheService } from "../cache";
 import { TTLPresets } from "../cache/cache.model";
 import { ChainService } from "../chain/chain.service";
@@ -15,7 +17,17 @@ export class MerklRootService {
      * @returns object with live and last tree roots
      */
     static async fetch(chainId) {
-        return await CacheService.wrap(TTLPresets.MIN_1, MerklRootRepository.fetch, chainId);
+        try {
+            return await withTimeout(CacheService.wrap(TTLPresets.MIN_1, MerklRootRepository.fetch, chainId), 5_000);
+        }
+        catch (e) {
+            if (e.message === "Timed out after 3000ms") {
+                const errorMessage = `fetching Merkle Root for chain ${NETWORK_LABELS[chainId]} timed out`;
+                log.warn(errorMessage);
+                throw new Error(errorMessage);
+            }
+            throw e;
+        }
     }
     /**
      * Fetch all roots for the provided chains

package/dist/src/modules/v4/reward/reward.repository.d.ts

@@ -77,7 +77,7 @@ export declare abstract class RewardRepository {
             };
         } & {
             pending: string;
-            id: number;
+            id: bigint;
             reason: string;
             campaignId: string;
             amount: string;
@@ -102,7 +102,7 @@ export declare abstract class RewardRepository {
             };
         } & {
             pending: string;
-            id: number;
+            id: bigint;
             reason: string;
             campaignId: string;
             amount: string;

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

@@ -234,7 +234,7 @@ export declare abstract class RewardService {
             };
         } & {
             pending: string;
-            id: number;
+            id: bigint;
             reason: string;
             campaignId: string;
             amount: string;
@@ -535,7 +535,7 @@ export declare abstract class RewardService {
             };
         } & {
             pending: string;
-            id: number;
+            id: bigint;
             reason: string;
             campaignId: string;
             amount: string;