@merkl/api 0.13.15 → 0.14.0

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

@@ -1,97 +1,159 @@
-import { log } from "../../../utils/logger";
 import { Storage } from "@google-cloud/storage";
+import { S3Client, gzipSync } from "bun";
+// ─── BucketService Class ─────────────────────────────────────────────────────
 export class BucketService {
-    // ─── Upload A File ───────────────────────────────────────────────────
-    static async upload(bucketName, filename, data, isPublic) {
-        const storage = new Storage({ projectId: "angle-production-1" });
-        const file = await storage.bucket(bucketName).file(filename);
-        await file.save(data);
-        if (isPublic)
-            await file.makePublic();
-        return `https://storage.googleapis.com/${bucketName}/${filename}`;
+    // ─── Private Properties ──────────────────────────────────────────────
+    #s3Client;
+    #gcsBucket;
+    #encoder;
+    #decoder;
+    // ─── Default Options ─────────────────────────────────────────────────────────
+    defaultUploadOptions = {
+        type: "text/plain",
+        compression: true,
+        overwrite: true,
+        isPublic: false,
+        transform: obj => `${JSON.stringify(obj)}`,
+        separator: "\n",
+    };
+    // ─── Constructor ─────────────────────────────────────────────────────
+    constructor(bucket) {
+        this.#s3Client = new S3Client({
+            accessKeyId: process.env.GCS_ACCESS_ID,
+            secretAccessKey: process.env.GCS_SECRET,
+            endpoint: process.env.GCS_ENDPOINT,
+            bucket,
+        });
+        this.#gcsBucket = new Storage().bucket(bucket);
+        this.#encoder = new TextEncoder();
+        this.#decoder = new TextDecoder();
     }
-    // ─── Write An Object As A Stream ─────────────────────────────────────
-    static async writeStreamToBucket(data, fileName, bucketName, projectID, hook = JSON.stringify, isPublic = false, withLog = true) {
-        const storage = new Storage({ projectId: projectID });
-        const bucket = storage.bucket(bucketName);
-        const file = bucket.file(fileName);
-        const [exist] = await file.exists();
-        if (exist) {
+    // ─── Process And Upload Chunks Of Data ───────────────────────────────
+    async pushArray(filename, arr, options) {
+        // const start = performance.now();
+        // ─── Initialization ──────────────────────────────────────────
+        options = { ...this.defaultUploadOptions, ...options };
+        const file = this.#s3Client.file(filename);
+        const writer = file.writer({
+            retry: 2,
+            queueSize: 10,
+            partSize: 5 * 1024 * 1024,
+            type: options.type,
+        });
+        // ─── Objects Array To Uint8Array ─────────────────────────────
+        const sink = new Bun.ArrayBufferSink();
+        sink.start({
+            asUint8Array: true,
+        });
+        for (let i = 0; i < arr.length; i++)
+            sink.write(this.#encoder.encode(`${options.transform(arr[i])}${options.separator}`));
+        let data = sink.end();
+        if (options.compression)
+            data = gzipSync(data);
+        // ─── ReadableStream Initialization From Blob ─────────────────
+        const blob = new Blob([data]);
+        const stream = blob.stream(50 * 1024 * 1024);
+        const reader = stream.getReader();
+        // ─── Start Writing Data To Bucket ────────────────────────────
+        if (options.overwrite && (await file.exists()))
             await file.delete();
+        let bytes = 0;
+        try {
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done)
+                    break;
+                bytes += await writer.write(value);
+            }
+            await writer.end();
         }
-        await file.save("", { resumable: false });
-        await file.setMetadata({
-            cacheControl: "public, max-age=300",
-        });
-        if (isPublic) {
-            await file.makePublic();
+        finally {
+            reader.releaseLock();
         }
-        const writeStream = file.createWriteStream({
-            resumable: false,
-            gzip: true, // Enable gzip compression
-        });
-        const streamPromise = new Promise((resolve, reject) => {
-            writeStream.on("error", reject);
-            writeStream.on("finish", resolve);
+        // ─── Setting Proper Metadata ─────────────────────────────────
+        if (options.compression)
+            await this.#gcsBucket.file(filename).setMetadata({ contentEncoding: "gzip" });
+        if (options.isPublic)
+            await this.#gcsBucket.makePublic();
+        // ─── Return The Number Of Bytes Written ──────────────────────
+        return bytes;
+    }
+    // ─── Upload Data To Bucket ───────────────────────────────────────────
+    async push(filename, text, options) {
+        // const start = performance.now();
+        // ─── Initialization ──────────────────────────────────────────
+        options = { ...this.defaultUploadOptions, ...options };
+        const file = this.#s3Client.file(filename);
+        const data = options.compression ? gzipSync(this.#encoder.encode(text)) : this.#encoder.encode(text);
+        const writer = file.writer({
+            retry: 2,
+            queueSize: 10,
+            partSize: 5 * 1024 * 1024,
+            type: options.type,
         });
-        for (const d of data) {
-            await writeStream.write(`${hook(d)}\n`);
+        const blob = new Blob([data]);
+        const stream = blob.stream(50 * 1024 * 1024);
+        const reader = stream.getReader();
+        if (options.overwrite && (await file.exists()))
+            await file.delete();
+        // ─── Start Writing Data To Bucket ────────────────────────────
+        let bytes = 0;
+        try {
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done)
+                    break;
+                bytes += await writer.write(value);
+            }
+            await writer.end();
         }
-        await writeStream.end();
-        await streamPromise;
-        withLog && log.local(`✅ successfully updated https://storage.cloud.google.com/${bucketName}/${fileName}`);
-    }
-    // ─── Read An Object As A Stream ──────────────────────────────────────
-    static async readStreamFromBucket(fileName, bucketName, projectID, hook = line => JSON.parse(line), withLog = true) {
-        const storage = new Storage({ projectId: projectID });
-        const bucket = storage.bucket(bucketName);
-        const file = bucket.file(fileName);
-        const [exists] = await file.exists();
-        if (!exists) {
-            throw new Error(`File ${fileName} does not exist in bucket ${bucketName}`);
+        finally {
+            reader.releaseLock();
         }
-        return new Promise((resolve, reject) => {
-            const data = [];
-            let buffer = "";
-            file
-                .createReadStream({
-                decompress: true,
-            })
-                .on("data", async (chunk) => {
-                // instead of using callback functions here, we could use pipe streams
-                buffer += chunk.toString();
-                const lines = buffer.split("\n");
-                buffer = lines.pop() || "";
-                for (const line of lines) {
-                    if (line.trim()) {
-                        const res = hook(line);
-                        data.push(res);
-                    }
+        // ─── Setting Proper Metadata ─────────────────────────────────
+        if (options.compression)
+            await this.#gcsBucket.file(filename).setMetadata({ contentEncoding: "gzip" });
+        if (options.isPublic)
+            await this.#gcsBucket.makePublic();
+        // ─── Return The Number Of Bytes Written ──────────────────────
+        return bytes;
+    }
+    // ─── Download And Process Chunks Of Data ─────────────────────────────
+    async pullArray(filename, callback, separator = "\n") {
+        const file = this.#s3Client.file(filename);
+        if (!(await file.exists))
+            throw new Error("File does not exists.");
+        const stream = file.stream();
+        const data = [];
+        let buffer = "";
+        for await (const chunk of stream) {
+            buffer += this.#decoder.decode(chunk);
+            const lines = buffer.split(separator);
+            buffer = lines.pop() || "";
+            for (const line of lines) {
+                try {
+                    data.push(callback(line));
                 }
-            })
-                .on("error", reject)
-                .on("end", async () => {
-                if (buffer.trim()) {
-                    const res = hook(buffer);
-                    data.push(res);
+                catch (err) {
+                    if (err instanceof Error && err.message === "JSON Parse error: Unexpected EOF")
+                        break;
                 }
-                withLog &&
-                    log.local(`✅ Successfully read ${data.length} items from https://storage.cloud.google.com/${bucketName}/${fileName}`);
-                resolve(data);
-            });
-        });
-    }
-    // ─── Delete A File ───────────────────────────────────────────────────
-    static async deleteFile(fileName, bucketName, projectID) {
-        const storage = new Storage({ projectId: projectID });
-        const bucket = storage.bucket(bucketName);
-        const file = bucket.file(fileName);
-        await file.delete();
+            }
+        }
+        if (buffer.trim())
+            data.push(callback(buffer));
+        return data;
     }
-    // ─── Check If A File Exists ──────────────────────────────────────────
-    static async exists(fileName, bucketName, projectID) {
-        const storage = new Storage({ projectId: projectID });
-        const [exists] = await storage.bucket(bucketName).file(fileName).exists();
-        return exists;
+    // ─── Download Data From Bucket ───────────────────────────────────────
+    async pull(filename) {
+        const file = this.#s3Client.file(filename);
+        if (!(await file.exists))
+            throw new Error("File does not exists.");
+        const stream = file.stream();
+        let buffer = "";
+        for await (const chunk of stream)
+            buffer += this.#decoder.decode(chunk);
+        buffer = buffer.trim();
+        return buffer;
     }
 }

package/dist/src/modules/v4/campaign/campaign.repository.js

@@ -3,7 +3,7 @@ import { log } from "../../../utils/logger";
 import { apiDbClient, engineDbClient } from "../../../utils/prisma";
 import { ALL_CAMPAIGNS_FOR_CHAIN_AFTER } from "../../../utils/queries/allCampaigns";
 import { Prisma, RunStatus } from "../../../../database/api/.generated";
-import { MAX_COMPUTE_JOB_TIME, WEEK } from "@sdk";
+import { MAX_COMPUTE_JOB_TIME } from "@sdk";
 import moment from "moment";
 import { OpportunityService } from "../opportunity";
 import { TokenService } from "../token";
@@ -235,7 +235,6 @@ export class CampaignRepository {
             where: {
                 distributionChainId,
                 startTimestamp: { lte: currentTime }, // The campaign has started
-                endTimestamp: { gte: currentTime - WEEK }, // The campaign ended less than a week ago
                 params: {
                     path: ["shouldIgnore"],
                     equals: Prisma.AnyNull,

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

@@ -251,6 +251,10 @@ export declare enum modeCampaigns {
     Kim_V4_WETH_MODE_Mode = "Kim V4 WETH/Mode 0x8cfE2A02dfBAbC56aE7e573170E35f88A38BeA55",
     Kim_Steer_CRS_V2_KIM_MODE_Mode = "Kim Steer CRS V2 Kim/Mode 0x86D9d9dd7A2c3146c6FAd51646F210Cb2E5FC12F",
     Kim_Steer_CRS_V2_and_EES_V2_WETH_USDT = "Kim Steer CRS V2 & EES V2 WETH/USDT 0xD8Abc2be7AD5D17940112969973357a3a3562998",
+    Kim_Ichi_SSD_Mode_Kim = "Kim Ichi SSD Mode/Kim 0x86d9d9dd7a2c3146c6fad51646f210cb2e5fc12f",
+    Kim_Steer_SSS_V2_weETH_ETH = "Kim Steer SSS V2 weETH/ETH 0xe24c8feb38ca2b18b542994bfba7e70880171035",
+    Kim_Ichi_SSD_wMLT_Mode = "Kim Ichi SSD wMLT/Mode 0xa186548320bdb79c714719e107ad5753ecb452d4",
+    Kim_Steer_CRS_V2_ezETH_ETH = "Kim Steer CRS V2 ezETH/ETH 0xd9a06f63e523757973ffd1a4606a1260252636d2",
     Ironclad_Borrow_uniBTC_Mode = "Ironclad Borrow uniBTC 0x80215c38DCb6ae91520F8251A077c124e7259688",
     Bedrock_Ionic_Supply_ionuniBTC_Mode = "Bedrock Ionic Supply uniBTC 0xa48750877a83f7dec11f722178c317b54a44d142",
     Bedrock_Ironclad_Supply_uniBTC_Mode = "Bedrock Ironclad Supply uniBTC 0x0F041cf2ae959f39215EFfB50d681Df55D4d90B1"

package/dist/src/modules/v4/programPayload/programPayload.repository.js

@@ -256,6 +256,10 @@ export var modeCampaigns;
     modeCampaigns["Kim_V4_WETH_MODE_Mode"] = "Kim V4 WETH/Mode 0x8cfE2A02dfBAbC56aE7e573170E35f88A38BeA55";
     modeCampaigns["Kim_Steer_CRS_V2_KIM_MODE_Mode"] = "Kim Steer CRS V2 Kim/Mode 0x86D9d9dd7A2c3146c6FAd51646F210Cb2E5FC12F";
     modeCampaigns["Kim_Steer_CRS_V2_and_EES_V2_WETH_USDT"] = "Kim Steer CRS V2 & EES V2 WETH/USDT 0xD8Abc2be7AD5D17940112969973357a3a3562998";
+    modeCampaigns["Kim_Ichi_SSD_Mode_Kim"] = "Kim Ichi SSD Mode/Kim 0x86d9d9dd7a2c3146c6fad51646f210cb2e5fc12f";
+    modeCampaigns["Kim_Steer_SSS_V2_weETH_ETH"] = "Kim Steer SSS V2 weETH/ETH 0xe24c8feb38ca2b18b542994bfba7e70880171035";
+    modeCampaigns["Kim_Ichi_SSD_wMLT_Mode"] = "Kim Ichi SSD wMLT/Mode 0xa186548320bdb79c714719e107ad5753ecb452d4";
+    modeCampaigns["Kim_Steer_CRS_V2_ezETH_ETH"] = "Kim Steer CRS V2 ezETH/ETH 0xd9a06f63e523757973ffd1a4606a1260252636d2";
     modeCampaigns["Ironclad_Borrow_uniBTC_Mode"] = "Ironclad Borrow uniBTC 0x80215c38DCb6ae91520F8251A077c124e7259688";
     modeCampaigns["Bedrock_Ionic_Supply_ionuniBTC_Mode"] = "Bedrock Ionic Supply uniBTC 0xa48750877a83f7dec11f722178c317b54a44d142";
     modeCampaigns["Bedrock_Ironclad_Supply_uniBTC_Mode"] = "Bedrock Ironclad Supply uniBTC 0x0F041cf2ae959f39215EFfB50d681Df55D4d90B1";
@@ -1581,7 +1585,7 @@ const ModeInterfaceCampaigns = {
         campaignType: Campaign.CLAMM,
         computeChainId: ChainId.MODE,
         hooks: [],
-        poolAddress: "0x879F9998c68cdaF28e4808fCc2b4f174c3CC5D97",
+        poolAddress: "0xd8abc2be7ad5d17940112969973357a3a3562998",
         whitelist: ["0x879F9998c68cdaF28e4808fCc2b4f174c3CC5D97", "0x908731366f82668dDd3aE3B2498ADF52604E892d"],
         blacklist: [],
         url: "https://app.kim.exchange/liquidity/wizard?token0=0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee&token1=0xf0f161fda2712db8b566946122a5af183995e2ed",
@@ -1591,6 +1595,20 @@ const ModeInterfaceCampaigns = {
         weightToken0: 4000,
         weightToken1: 4000,
     },
+    [modeCampaigns.Kim_Ichi_SSD_Mode_Kim]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.MODE,
+        hooks: [],
+        poolAddress: "0x86D9d9dd7A2c3146c6FAd51646F210Cb2E5FC12F",
+        whitelist: ["0x70F4A63DD7e81Cf43B8b0E1cf09a8fc70B7C278b"],
+        blacklist: [],
+        url: "https://app.kim.exchange/pools/vaults/ichi/0x70f4a63dd7e81cf43b8b0e1cf09a8fc70b7c278b",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 2000,
+        weightToken0: 4000,
+        weightToken1: 4000,
+    },
     [modeCampaigns.Kim_Gamma_WETH_KIM_Mode]: {
         campaignType: Campaign.CLAMM,
         computeChainId: ChainId.MODE,
@@ -1678,6 +1696,48 @@ const ModeInterfaceCampaigns = {
         weightToken0: 4000,
         weightToken1: 4000,
     },
+    [modeCampaigns.Kim_Steer_SSS_V2_weETH_ETH]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.MODE,
+        hooks: [],
+        poolAddress: "0xE24C8feB38ca2B18b542994BFBA7E70880171035",
+        whitelist: ["0x5Aa27D5d8aff8Cd5e683e23812124AcE4aA5af7D"],
+        blacklist: [],
+        url: "https://app.kim.exchange/pools/vaults/0x5aa27d5d8aff8cd5e683e23812124ace4aa5af7d",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 2000,
+        weightToken0: 4000,
+        weightToken1: 4000,
+    },
+    [modeCampaigns.Kim_Steer_CRS_V2_ezETH_ETH]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.MODE,
+        hooks: [],
+        poolAddress: "0xD9a06f63E523757973ffd1a4606A1260252636D2",
+        whitelist: ["0x83556D8bBa69bdD159f50B2127ccc88bebF73e39"],
+        blacklist: [],
+        url: "https://app.kim.exchange/pools/vaults/0x83556d8bba69bdd159f50b2127ccc88bebf73e39",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 2000,
+        weightToken0: 4000,
+        weightToken1: 4000,
+    },
+    [modeCampaigns.Kim_Ichi_SSD_wMLT_Mode]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.MODE,
+        hooks: [],
+        poolAddress: "0xA186548320Bdb79c714719e107aD5753eCb452d4",
+        whitelist: ["0x2660F0291F62FE9ce515b88B8080ce829e5c01c3"],
+        blacklist: [],
+        url: "https://app.kim.exchange/pools/vaults/ichi/0x2660f0291f62fe9ce515b88b8080ce829e5c01c3",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 2000,
+        weightToken0: 4000,
+        weightToken1: 4000,
+    },
     [modeCampaigns.Kim_V4_WETH_MODE_Mode]: {
         campaignType: Campaign.CLAMM,
         computeChainId: ChainId.MODE,