@merkl/api 0.18.7 → 0.18.9

package/dist/src/libs/campaigns/utils/getUniswapV4Pools.js

@@ -23,14 +23,16 @@ export async function getUniswapV4Pools() {
             log.info(`found ${storedPoolsPerChain.length} already stored pools on ${NETWORK_LABELS[chainId]}`);
             let fromBlock;
             if (storedPoolsPerChain.length > 0) {
-                fromBlock = Math.max(...storedPools.map(x => x.fetchAtBlock)) + 1;
+                fromBlock = Math.max(...storedPoolsPerChain.map(x => x.fetchAtBlock)) + 1;
             }
             else {
                 fromBlock = await getContractCreationBlock(poolManagerAddress, jsonRPCprovider);
             }
             const toBlock = await jsonRPCprovider.getBlockNumber();
             const logs = await safeFetchLogs(chainId, // TODO: rm type enforcing
-            [UniswapV4PoolManagerInterface.getEventTopic("Initialize")], [poolManagerAddress], fromBlock, toBlock);
+            [UniswapV4PoolManagerInterface.getEventTopic("Initialize")], [poolManagerAddress], fromBlock, toBlock
+            // fromBlock + 10_000
+            );
             const decodedPools = await Promise.all(logs.map(async (log) => {
                 const [id, currency0, currency1, fee, tickSpacing, hooks] = UniswapV4PoolManagerInterface.decodeEventLog("Initialize", log.data, log.topics);
                 // Respect typing
@@ -78,6 +80,9 @@ export async function getUniswapV4Pools() {
                 if (pool.currency0 !== NULL_ADDRESS) {
                     try {
                         symbolCurrency0 = ERC20Interface.decodeFunctionResult("symbol", resCurrencies[index].returnData)[0];
+                        if (symbolCurrency0.includes("/") || symbolCurrency0.includes("\u0000")) {
+                            symbolCurrency0 = "INVALID";
+                        }
                         decimalsCurrency0 = ERC20Interface.decodeFunctionResult("decimals", resCurrencies[index + 1].returnData)[0];
                     }
                     catch {
@@ -94,6 +99,9 @@ export async function getUniswapV4Pools() {
                 if (pool.currency1 !== NULL_ADDRESS) {
                     try {
                         symbolCurrency1 = ERC20Interface.decodeFunctionResult("symbol", resCurrencies[index + 2].returnData)[0];
+                        if (symbolCurrency1.includes("/") || symbolCurrency1.includes("\u0000")) {
+                            symbolCurrency1 = "INVALID";
+                        }
                         decimalsCurrency1 = ERC20Interface.decodeFunctionResult("decimals", resCurrencies[index + 3].returnData)[0];
                     }
                     catch {
@@ -135,24 +143,27 @@ export async function getUniswapV4Pools() {
     });
     // Update the API database
     const tableData = Object.values(pools).flatMap(pools => Object.values(pools));
-    if (Object.values(pools).length > 0) {
-        try {
-            await apiDbClient.logged.createMany({
-                data: tableData.map(pool => ({
-                    fetchAtBlock: pool.fetchedAtBlock,
-                    caughtFromAddress: UniswapV4Addresses[pool.chainId]?.PoolManager ?? NULL_ADDRESS,
-                    chainId: pool.chainId,
-                    entityData: pool,
-                    id: Bun.hash(`${pool.poolId}-${pool.chainId}`).toString(),
-                    type: LoggedEntityType.UNISWAP_V4,
-                })),
-            });
-            log.info("✅ successfully saved vaults to API database (`Logged` table)");
-            // }
-        }
-        catch (e) {
-            log.error("getUniswapV4Pools/LoggedTableUpdate", e);
-            throw new Error("Error while saving UniV4 pools to API database (`Logged` table)");
+    for (const chainId of UNIV4_CHAINIDS) {
+        if (tableData.filter(p => p.chainId === chainId).length > 0) {
+            try {
+                await apiDbClient.logged.createMany({
+                    data: tableData
+                        .filter(point => point.chainId === chainId)
+                        .map(pool => ({
+                        fetchAtBlock: pool.fetchedAtBlock,
+                        caughtFromAddress: UniswapV4Addresses[pool.chainId]?.PoolManager ?? NULL_ADDRESS,
+                        chainId: pool.chainId,
+                        entityData: pool,
+                        id: Bun.hash(`${pool.poolId}-${pool.chainId}`).toString(),
+                        type: LoggedEntityType.UNISWAP_V4,
+                    })),
+                });
+                log.info(`✅ successfully saved vaults to API database ('Logged' table) on ${NETWORK_LABELS[chainId]}`);
+            }
+            catch (e) {
+                log.error("getUniswapV4Pools/LoggedTableUpdate", e);
+                throw new Error(`Error while saving UniV4 pools to API database ('Logged' table) on ${NETWORK_LABELS[chainId]}`);
+            }
         }
     }
     log.info(`✅ successfully fetched ${tableData.length} new pool(s) on UniswapV4`);

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

@@ -261,13 +261,13 @@ export class TokenService {
         const icon = properties.Icon.files?.[0]?.file.url;
         const iconFile = await fetch(icon);
         const mimeType = iconFile.headers.get("content-type");
-        const extension = mimeType.split("/")[1];
+        const extension = mimeType.split("/")[1].split("+")[0];
         const address = throwOnInvalidRequiredAddress(properties.Address.rich_text[0].plain_text);
         const chainId = properties["Chain ID"].number;
         throwOnUnsupportedChainId(chainId);
         const displaySymbol = properties.Symbol.rich_text[0]?.plain_text;
         const isVerified = properties.Verified.checkbox;
-        const coingeckoApiId = properties["CoinGecko API ID"].rich_text[0].plain_text;
+        const coingeckoApiId = properties["CoinGecko API ID"].rich_text[0]?.plain_text;
         const byteArray = await iconFile.bytes();
         const [token] = await TokenService.findManyOrCreate([
             {