Fix merge

src/clickhouse/createClient.ts

@@ -1,4 +1,3 @@
-// from: https://github.com/pinax-network/substreams-clock-api/blob/main/src/clickhouse/createClient.ts
 import { createClient } from "@clickhouse/client-web";
 import { ping } from "./ping.js";
 import { APP_NAME, config } from "../config.js";

src/clickhouse/makeQuery.ts

@@ -1,4 +1,3 @@
-// from: https://github.com/pinax-network/substreams-clock-api/blob/main/src/clickhouse/makeQuery.ts
 import { logger } from "../logger.js";
 import * as prometheus from "../prometheus.js";
 import client from "./createClient.js";

src/clickhouse/ping.ts

@@ -1,4 +1,3 @@
-// from: https://github.com/pinax-network/substreams-clock-api/blob/main/src/clickhouse/ping.ts
 import { PingResult } from "@clickhouse/client-web";
 import client from "./createClient.js";
 

src/config.ts

@@ -22,13 +22,13 @@ const opts = program
     .description(pkg.description)
     .showHelpAfterError()
     .addOption(new Option("-p, --port <number>", "HTTP port on which to attach the API").env("PORT").default(DEFAULT_PORT))
-    .addOption(new Option("-v, --verbose <boolean>", "Enable verbose logging").choices(["true", "false"]).env("VERBOSE").default(DEFAULT_VERBOSE))
     .addOption(new Option("--hostname <string>", "Server listen on HTTP hostname").env("HOSTNAME").default(DEFAULT_HOSTNAME))
     .addOption(new Option("--host <string>", "Database HTTP hostname").env("HOST").default(DEFAULT_HOST))
+    .addOption(new Option("--database <string>", "The database to use inside ClickHouse").env("DATABASE").default(DEFAULT_DATABASE))
     .addOption(new Option("--username <string>", "Database user").env("USERNAME").default(DEFAULT_USERNAME))
     .addOption(new Option("--password <string>", "Password associated with the specified username").env("PASSWORD").default(DEFAULT_PASSWORD))
-    .addOption(new Option("--database <string>", "The database to use inside ClickHouse").env("DATABASE").default(DEFAULT_DATABASE))
     .addOption(new Option("--max-limit <number>", "Maximum LIMIT queries").env("MAX_LIMIT").default(DEFAULT_MAX_LIMIT))
+    .addOption(new Option("-v, --verbose <boolean>", "Enable verbose logging").choices(["true", "false"]).env("VERBOSE").default(DEFAULT_VERBOSE))
     .parse()
     .opts();
 
@@ -41,4 +41,4 @@ export const config = z.object({
     password: z.string(),
     maxLimit: z.coerce.number(),
     verbose: z.coerce.boolean(),
-}).parse(opts);
+}).parse(opts);

src/fetch/GET.ts

@@ -25,4 +25,4 @@ export default async function (req: Request) {
     logger.warn(`Not found: ${pathname}`);
     prometheus.request_error.inc({ pathname, status: 404 });
     return new Response("Not found", { status: 404 });
-}
+}

src/fetch/chains.ts

@@ -1,4 +1,3 @@
-// from: https://github.com/pinax-network/substreams-clock-api/blob/main/src/fetch/chains.ts
 import { makeQuery } from "../clickhouse/makeQuery.js";
 import { logger } from "../logger.js";
 import * as prometheus from "../prometheus.js";

src/fetch/health.ts

@@ -1,4 +1,3 @@
-// from: https://github.com/pinax-network/substreams-clock-api/blob/main/src/fetch/health.ts
 import client from "../clickhouse/createClient.js";
 import { logger } from "../logger.js";
 import * as prometheus from "../prometheus.js";

src/fetch/openapi.ts

@@ -1,4 +1,3 @@
-// from: https://github.com/pinax-network/substreams-clock-api/blob/main/src/fetch/openapi.ts
 import pkg from "../../package.json" assert { type: "json" };
 
 import { OpenApiBuilder, SchemaObject, ExampleObject, ParameterObject } from "openapi3-ts/oas31";
@@ -100,7 +99,6 @@ const amountFilter = amountExamplesArrayFilter.map(name => {
   } as ParameterObject
 })
 
-
 export default new OpenApiBuilder()
   .addInfo({
     title: pkg.name,

src/queries.spec.ts

@@ -1,5 +1,3 @@
-// from: https://github.com/pinax-network/substreams-clock-api/blob/main/src/queries.spec.ts
-
 import { expect, test } from "bun:test";
 import {
     getChain,

src/queries.ts

@@ -219,4 +219,4 @@ export function getTransfers(searchParams: URLSearchParams, example?: boolean) {
 
 export function getChain() {
     return `SELECT DISTINCT chain FROM module_hashes`;
-}
+}

src/utils.ts

@@ -56,4 +56,4 @@ export function parseTimestamp(timestamp?: string | null | number) {
         }
     }
     return undefined;
-}
+}