@merkl/api 0.20.103 → 0.20.105

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

@@ -1875,6 +1875,74 @@ declare const eden: {
                     200: number;
                 }>>;
             };
+            webhooks: {
+                notion: {
+                    post: (body: {
+                        data: {
+                            properties: {
+                                id: {
+                                    title: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                name: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                url: {
+                                    url: string;
+                                };
+                                description: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                tags: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                icon: {
+                                    files: ({
+                                        file: {
+                                            url: string;
+                                        };
+                                        name: string;
+                                    } | {
+                                        external: {
+                                            url: string;
+                                        };
+                                    })[];
+                                };
+                            };
+                        };
+                    }, options: {
+                        headers: {
+                            authorization: string;
+                        };
+                        query?: Record<string, unknown> | undefined;
+                        fetch?: RequestInit | undefined;
+                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                        200: {
+                            id: string;
+                            name: string;
+                            url: string;
+                            description: string;
+                            tags: string[];
+                            icon: string;
+                        };
+                    }>>;
+                };
+            };
         };
         explorers: {
             post: (body: {
@@ -7001,9 +7069,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             count: {
                 get: {
                     body: unknown;
@@ -7024,9 +7090,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             ":id": {
                 get: {
                     body: unknown;
@@ -7050,9 +7114,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             ":id": {
                 patch: {
                     body: {
@@ -7080,9 +7142,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             index: {
                 post: {
                     body: {
@@ -7110,6 +7170,77 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
+        } & {
+            webhooks: {
+                notion: {
+                    post: {
+                        body: {
+                            data: {
+                                properties: {
+                                    id: {
+                                        title: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    name: {
+                                        rich_text: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    url: {
+                                        url: string;
+                                    };
+                                    description: {
+                                        rich_text: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    tags: {
+                                        rich_text: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    icon: {
+                                        files: ({
+                                            file: {
+                                                url: string;
+                                            };
+                                            name: string;
+                                        } | {
+                                            external: {
+                                                url: string;
+                                            };
+                                        })[];
+                                    };
+                                };
+                            };
+                        };
+                        params: {};
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: {
+                                id: string;
+                                name: string;
+                                url: string;
+                                description: string;
+                                tags: string[];
+                                icon: string;
+                            };
+                        };
+                    };
+                };
+            };
         };
     };
 } & {
@@ -12789,6 +12920,74 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     200: number;
                 }>>;
             };
+            webhooks: {
+                notion: {
+                    post: (body: {
+                        data: {
+                            properties: {
+                                id: {
+                                    title: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                name: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                url: {
+                                    url: string;
+                                };
+                                description: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                tags: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                icon: {
+                                    files: ({
+                                        file: {
+                                            url: string;
+                                        };
+                                        name: string;
+                                    } | {
+                                        external: {
+                                            url: string;
+                                        };
+                                    })[];
+                                };
+                            };
+                        };
+                    }, options: {
+                        headers: {
+                            authorization: string;
+                        };
+                        query?: Record<string, unknown> | undefined;
+                        fetch?: RequestInit | undefined;
+                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                        200: {
+                            id: string;
+                            name: string;
+                            url: string;
+                            description: string;
+                            tags: string[];
+                            icon: string;
+                        };
+                    }>>;
+                };
+            };
         };
         explorers: {
             post: (body: {

package/dist/src/engine/campaignTVL/implementations/Erc20/computeSubTypes.js

@@ -45,7 +45,7 @@ export const computeSubTypes = async (chainId, campaigns) => {
             callData: BalancerV3StablePoolInterface.encodeFunctionData("getVault"),
             target: targetToken,
         });
-        if (calls.length !== callsPerCampaign * index)
+        if (calls.length !== callsPerCampaign * (index + 1))
             throw new Error("computeSubTypes: calls.length !== callsPerCampaign * index");
     }
     const callResult = await ChainInteractionService(chainId).fetchState(calls);
@@ -67,34 +67,47 @@ export const computeSubTypes = async (chainId, campaigns) => {
         // Get erc20SubType from factory address
         try {
             const factory = decodeReturnValue(values.factory, "factory");
-            res.push(getTypeFromFactoryAddress(factory));
-            continue;
+            const type = getTypeFromFactoryAddress(factory);
+            if (type !== Erc20SubType.unknown) {
+                res.push(type);
+                continue;
+            }
         }
         catch { }
         // Get erc20SubType from owner address
         try {
             const owner = decodeReturnValue(values.owner, "owner");
-            res.push(getTypeFromOwnerAddress(owner));
-            continue;
+            const type = getTypeFromOwnerAddress(owner);
+            if (type !== Erc20SubType.unknown) {
+                res.push(type);
+                continue;
+            }
         }
         catch { }
         // Get erc20SubType from address
         try {
-            res.push(getTypeFromAddressChain(chainId, targetToken));
-            continue;
+            const type = getTypeFromAddressChain(chainId, targetToken);
+            if (type !== Erc20SubType.unknown) {
+                res.push(type);
+                continue;
+            }
         }
         catch { }
         // Get erc20SubType for enzyme (factory is replaced by dispatcher)
         try {
             const factory = decodeReturnValue(values.creator, "getCreator");
-            res.push(getTypeFromFactoryAddress(factory));
-            continue;
+            const type = getTypeFromFactoryAddress(factory);
+            if (type !== Erc20SubType.unknown) {
+                res.push(type);
+                continue;
+            }
         }
         catch { }
         // Get erc20SubType for morpho
         try {
             decodeReturnValue(values.metamorpho, "MORPHO");
             res.push(Erc20SubType.metamorpho);
+            continue;
         }
         catch { }
         // Starting from this point, assume the name is working
@@ -104,11 +117,13 @@ export const computeSubTypes = async (chainId, campaigns) => {
             try {
                 decodeReturnValue(values.poolId, "getPoolId");
                 res.push(Erc20SubType.balancerPool);
+                continue;
             }
             catch { }
             try {
                 decodeReturnValue(values.vault, "getVault");
                 res.push(Erc20SubType.balancerPool);
+                continue;
             }
             catch { }
             // Get erc20SubType by parsing information from the erc20 name
@@ -124,5 +139,5 @@ export const computeSubTypes = async (chainId, campaigns) => {
     }
     if (res.length !== campaigns.length)
         throw new Error("computeSubTypes: res.length !== campaigns.length");
-    return [];
+    return res;
 };

package/dist/src/engine/campaignTVL/implementations/Erc20/index.js

@@ -3,7 +3,11 @@ import { computeSubTypes } from "./computeSubTypes";
 import { erc20SubTypeTVLBuilderFactory } from "./factory";
 export class Erc20CampaignTVLBuilder {
     async build(chainId, campaigns) {
+        console.log("START");
         const subTypes = await computeSubTypes(chainId, campaigns);
+        console.log(subTypes);
+        const dynamicDataList = await new Erc20DynamicData().build(chainId, campaigns);
+        console.log(dynamicDataList.map(d => d.typeInfo.type));
         let tvls = [];
         for (const subtype of new Set(subTypes)) {
             const builder = erc20SubTypeTVLBuilderFactory(subtype);
@@ -11,6 +15,7 @@ export class Erc20CampaignTVLBuilder {
                 tvls = tvls.concat(await builder.build(chainId, campaigns.filter((_campaign, index) => subTypes[index] === subtype)));
             }
             else {
+                console.log(`building TVLs for subtype ${subtype}`);
                 // @deprecated In case we don't have the new builder, use the old erc20 dynamic data
                 const dynamicDataList = await new Erc20DynamicData().build(chainId, campaigns);
                 for (const [index, dynamicData] of dynamicDataList.entries()) {

package/dist/src/index.d.ts

@@ -2153,9 +2153,7 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             count: {
                 get: {
                     body: unknown;
@@ -2176,9 +2174,7 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             ":id": {
                 get: {
                     body: unknown;
@@ -2202,9 +2198,7 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             ":id": {
                 patch: {
                     body: {
@@ -2232,9 +2226,7 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
-        };
-    } & {
-        protocols: {
+        } & {
             index: {
                 post: {
                     body: {
@@ -2262,6 +2254,77 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
+        } & {
+            webhooks: {
+                notion: {
+                    post: {
+                        body: {
+                            data: {
+                                properties: {
+                                    id: {
+                                        title: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    name: {
+                                        rich_text: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    url: {
+                                        url: string;
+                                    };
+                                    description: {
+                                        rich_text: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    tags: {
+                                        rich_text: {
+                                            text: {
+                                                content: string;
+                                            };
+                                        }[];
+                                    };
+                                    icon: {
+                                        files: ({
+                                            file: {
+                                                url: string;
+                                            };
+                                            name: string;
+                                        } | {
+                                            external: {
+                                                url: string;
+                                            };
+                                        })[];
+                                    };
+                                };
+                            };
+                        };
+                        params: {};
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: {
+                                id: string;
+                                name: string;
+                                url: string;
+                                description: string;
+                                tags: string[];
+                                icon: string;
+                            };
+                        };
+                    };
+                };
+            };
         };
     };
 } & {

package/dist/src/jobs/update-dynamic-data.js

@@ -40,11 +40,14 @@ const main = async () => {
     const futureOpportunities = await CampaignService.getFutureCampaigns({ computeChainId: chainId });
     const liveOpportunityIds = (await CampaignService.getLiveCampaigns({ computeChainId: chainId })).map(c => c.Opportunity.id);
     const idToUpdate = futureOpportunities
-        ?.filter(c => !liveOpportunityIds.includes(c.id) && c.Opportunity.status !== "SOON")
+        ?.filter(c => !liveOpportunityIds.includes(c.Opportunity.id) && c.Opportunity.status !== "SOON")
         .map(c => c.Opportunity.id);
     if (idToUpdate.length > 0) {
         await OpportunityService.updateMany(idToUpdate, { status: "SOON" });
-        logger.info(`updated ${idToUpdate.length} opportunities to SOON status.`);
+        if (idToUpdate.length === 1)
+            logger.info(`updated opportunity ${idToUpdate[0]} to SOON status.`);
+        else
+            logger.info(`updated ${idToUpdate.length} opportunities to SOON status.`);
     }
     // 4. Update the status of the opportunities associated to live campaigns
     await OpportunityService.updateMany(liveOpportunityIds, { status: "LIVE" });

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

@@ -3,6 +3,7 @@ export declare class BucketService {
     #private;
     defaultUploadOptions: UploadOptions<unknown>;
     constructor(bucket: string, projectId: string);
+    getBucketName(): string;
     pushArray<T>(filename: string, arr: T[], options?: UploadOptions<T>): Promise<number>;
     push(filename: string, text: string, options?: Omit<UploadOptions<never>, "transform" | "separator">): Promise<number>;
     pushRaw(filename: string, data: Uint8Array, options?: Omit<UploadOptions<never>, "transform" | "separator">): Promise<number>;

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

@@ -7,6 +7,7 @@ export class BucketService {
     #gcsBucket;
     #encoder;
     #decoder;
+    #bucketName;
     // ─── Default Options ─────────────────────────────────────────────────────────
     defaultUploadOptions = {
         type: "text/plain",
@@ -27,6 +28,10 @@ export class BucketService {
         this.#gcsBucket = new Storage({ projectId }).bucket(bucket);
         this.#encoder = new TextEncoder();
         this.#decoder = new TextDecoder();
+        this.#bucketName = bucket;
+    }
+    getBucketName() {
+        return this.#bucketName;
     }
     // ─── Process And Upload Chunks Of Data ───────────────────────────────
     async pushArray(filename, arr, options) {

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

@@ -1,5 +1,5 @@
 import type { BucketService } from "../bucket/bucket.service";
 import type { FileMetadata } from "./icon.model";
 export declare abstract class IconService {
-    static pullPush(url: string, bucket: BucketService, metadata?: FileMetadata): Promise<number>;
+    static pullPush(url: string, bucket: BucketService, metadata?: FileMetadata): Promise<string>;
 }

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

@@ -5,11 +5,12 @@ export class IconService {
         const mimeType = iconFile.headers.get("content-type");
         const extension = metadata?.extension ? metadata.extension : mimeType.split("/")[1].split("+")[0];
         const byteArray = await iconFile.bytes();
-        return await bucket.pushRaw(`${filename}.${extension}`, byteArray, {
+        await bucket.pushRaw(`${filename}.${extension}`, byteArray, {
             type: mimeType,
             isPublic: true,
             compression: true,
             overwrite: true,
         });
+        return `${process.env.GCS_ENDPOINT}/${bucket.getBucketName()}/${filename}.${extension}`;
     }
 }

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

@@ -44,9 +44,7 @@ export declare const ProtocolController: Elysia<"/protocols", false, {
                 };
             };
         };
-    };
-} & {
-    protocols: {
+    } & {
         count: {
             get: {
                 body: unknown;
@@ -67,9 +65,7 @@ export declare const ProtocolController: Elysia<"/protocols", false, {
                 };
             };
         };
-    };
-} & {
-    protocols: {
+    } & {
         ":id": {
             get: {
                 body: unknown;
@@ -93,9 +89,7 @@ export declare const ProtocolController: Elysia<"/protocols", false, {
                 };
             };
         };
-    };
-} & {
-    protocols: {
+    } & {
         ":id": {
             patch: {
                 body: {
@@ -123,9 +117,7 @@ export declare const ProtocolController: Elysia<"/protocols", false, {
                 };
             };
         };
-    };
-} & {
-    protocols: {
+    } & {
         index: {
             post: {
                 body: {
@@ -153,6 +145,77 @@ export declare const ProtocolController: Elysia<"/protocols", false, {
                 };
             };
         };
+    } & {
+        webhooks: {
+            notion: {
+                post: {
+                    body: {
+                        data: {
+                            properties: {
+                                id: {
+                                    title: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                name: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                url: {
+                                    url: string;
+                                };
+                                description: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                tags: {
+                                    rich_text: {
+                                        text: {
+                                            content: string;
+                                        };
+                                    }[];
+                                };
+                                icon: {
+                                    files: ({
+                                        file: {
+                                            url: string;
+                                        };
+                                        name: string;
+                                    } | {
+                                        external: {
+                                            url: string;
+                                        };
+                                    })[];
+                                };
+                            };
+                        };
+                    };
+                    params: {};
+                    query: unknown;
+                    headers: {
+                        authorization: string;
+                    };
+                    response: {
+                        200: {
+                            id: string;
+                            name: string;
+                            url: string;
+                            description: string;
+                            tags: string[];
+                            icon: string;
+                        };
+                    };
+                };
+            };
+        };
     };
 }, {
     derive: {};