From 42a97ec6dcb1cd047ffedf1fd74626340c400975 Mon Sep 17 00:00:00 2001 From: Gabriel Tozatti Date: Wed, 11 Mar 2026 15:15:09 -0300 Subject: [PATCH 1/5] feat: add base HTTP controller and routes structure --- packages/worker/src/http/index.ts | 9 ++++++++ .../src/http/middlewares/handleErrors.ts | 23 +++++++++++++++++++ .../src/http/modules/gasless/controller.ts | 16 +++++++++++++ .../worker/src/http/modules/gasless/routes.ts | 8 +++++++ packages/worker/src/index.ts | 2 ++ 5 files changed, 58 insertions(+) create mode 100644 packages/worker/src/http/index.ts create mode 100644 packages/worker/src/http/middlewares/handleErrors.ts create mode 100644 packages/worker/src/http/modules/gasless/controller.ts create mode 100644 packages/worker/src/http/modules/gasless/routes.ts diff --git a/packages/worker/src/http/index.ts b/packages/worker/src/http/index.ts new file mode 100644 index 000000000..b2c2d62fb --- /dev/null +++ b/packages/worker/src/http/index.ts @@ -0,0 +1,9 @@ +import { Application } from "express"; +import gaslessRouter from "./modules/gasless/routes"; +import { handleErrors } from "./middlewares/handleErrors"; + +export const setupRoutes = (app: Application): void => { + app.use("/worker/gasless", gaslessRouter); + + app.use(handleErrors); +}; diff --git a/packages/worker/src/http/middlewares/handleErrors.ts b/packages/worker/src/http/middlewares/handleErrors.ts new file mode 100644 index 000000000..66ff6dbfe --- /dev/null +++ b/packages/worker/src/http/middlewares/handleErrors.ts @@ -0,0 +1,23 @@ +import { Request, Response, NextFunction } from "express"; + +export class AppError extends Error { + constructor(public readonly statusCode: number, message: string) { + super(message); + this.name = "AppError"; + } +} + +export const handleErrors = ( + err: Error, + _req: Request, + res: Response, + _next: NextFunction +): void => { + if (err instanceof AppError) { + res.status(err.statusCode).json({ error: err.message }); + return; + } + + console.error("[HTTP]: Unhandled error", err); + res.status(500).json({ error: "Internal server error" }); +}; diff --git a/packages/worker/src/http/modules/gasless/controller.ts b/packages/worker/src/http/modules/gasless/controller.ts new file mode 100644 index 000000000..b1e7395af --- /dev/null +++ b/packages/worker/src/http/modules/gasless/controller.ts @@ -0,0 +1,16 @@ +import { Request, Response, NextFunction } from "express"; +import { AppError } from "@/http/middlewares/handleErrors"; + +export class GaslessController { + static async reserve( + _req: Request, + res: Response, + next: NextFunction + ): Promise { + try { + throw new AppError(501, "Not implemented"); + } catch (err) { + next(err); + } + } +} diff --git a/packages/worker/src/http/modules/gasless/routes.ts b/packages/worker/src/http/modules/gasless/routes.ts new file mode 100644 index 000000000..b6dc0f300 --- /dev/null +++ b/packages/worker/src/http/modules/gasless/routes.ts @@ -0,0 +1,8 @@ +import { Router } from "express"; +import { GaslessController } from "@/http/modules/gasless/controller"; + +const gaslessRouter = Router(); + +gaslessRouter.post("/reserve", GaslessController.reserve); + +export default gaslessRouter; diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 4c02e4f80..20a1c79f0 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -14,6 +14,7 @@ import { UserBlockSyncCron, } from "./queues/userBlockSync"; import { GaslessUtxoCleanup } from "@/queues/gaslessUtxos/gaslessUtxoCleanup"; +import { setupRoutes } from "@/http"; const { WORKER_PORT, @@ -54,6 +55,7 @@ console.log( ); const app = express(); +setupRoutes(app); const serverAdapter = new ExpressAdapter(); createBullBoard({ From 4a4b1f0b6b0ea2459f09104cb8774fb05162f764 Mon Sep 17 00:00:00 2001 From: Gabriel Tozatti Date: Wed, 11 Mar 2026 15:22:52 -0300 Subject: [PATCH 2/5] fix: remove console.log and add basic Express middleware --- packages/worker/src/http/middlewares/handleErrors.ts | 1 - packages/worker/src/index.ts | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/worker/src/http/middlewares/handleErrors.ts b/packages/worker/src/http/middlewares/handleErrors.ts index 66ff6dbfe..88c6940fe 100644 --- a/packages/worker/src/http/middlewares/handleErrors.ts +++ b/packages/worker/src/http/middlewares/handleErrors.ts @@ -18,6 +18,5 @@ export const handleErrors = ( return; } - console.error("[HTTP]: Unhandled error", err); res.status(500).json({ error: "Internal server error" }); }; diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 20a1c79f0..3b6cebb67 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -55,6 +55,8 @@ console.log( ); const app = express(); +app.use(express.json()); +app.use(express.urlencoded({ extended: true })); setupRoutes(app); const serverAdapter = new ExpressAdapter(); From 0889af849ae49e7ce1c177eca9e40f2d4e021923 Mon Sep 17 00:00:00 2001 From: Gabriel Tozatti Date: Thu, 12 Mar 2026 14:57:16 -0300 Subject: [PATCH 3/5] feat: implement POST /worker/gasless/reserve endpoint --- .../src/http/modules/gasless/controller.ts | 40 ++++++++++++++++++- .../worker/src/queues/gaslessUtxos/types.ts | 3 +- .../src/queues/gaslessUtxos/utils/reserve.ts | 7 ++-- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/packages/worker/src/http/modules/gasless/controller.ts b/packages/worker/src/http/modules/gasless/controller.ts index b1e7395af..232c30411 100644 --- a/packages/worker/src/http/modules/gasless/controller.ts +++ b/packages/worker/src/http/modules/gasless/controller.ts @@ -1,14 +1,50 @@ import { Request, Response, NextFunction } from "express"; +import { MongoDatabase } from "@/clients/mongoClient"; +import { gaslessUtxosCollection } from "@/queues/gaslessUtxos"; +import { COLLECTION_GASLESS_UTXOS } from "@/queues/gaslessUtxos/constants"; +import { GaslessUtxo } from "@/queues/gaslessUtxos/types"; import { AppError } from "@/http/middlewares/handleErrors"; export class GaslessController { static async reserve( - _req: Request, + req: Request, res: Response, next: NextFunction ): Promise { try { - throw new AppError(501, "Not implemented"); + const { accountId, estimatedMaxFee } = req.body; + + if (estimatedMaxFee === undefined || estimatedMaxFee === null) { + throw new AppError(400, "estimatedMaxFee is required"); + } + + if (typeof estimatedMaxFee !== "number" || estimatedMaxFee <= 0) { + throw new AppError(400, "estimatedMaxFee must be a positive number"); + } + + // TODO: space for blocking rules + + const db = await MongoDatabase.connect(); + const utxos = gaslessUtxosCollection( + db.getCollection(COLLECTION_GASLESS_UTXOS) + ); + + const utxo = await utxos.reserve({ + reservedBy: accountId ?? "anonymous", + estimatedMaxFee, + }); + + if (!utxo) { + throw new AppError(503, "POOL_EXHAUSTED"); + } + + res.status(200).json({ + utxoId: utxo.utxoId, + txId: utxo.txId, + outputIndex: utxo.outputIndex, + amount: utxo.amount, + owner: utxo.owner, + }); } catch (err) { next(err); } diff --git a/packages/worker/src/queues/gaslessUtxos/types.ts b/packages/worker/src/queues/gaslessUtxos/types.ts index 130db3dc4..7d0a44b14 100644 --- a/packages/worker/src/queues/gaslessUtxos/types.ts +++ b/packages/worker/src/queues/gaslessUtxos/types.ts @@ -6,6 +6,7 @@ export interface GaslessUtxo { txId: string; outputIndex: number; amount: string; + owner: string; status: "available" | "reserved" | "spent"; reservedAt?: Date; reservedBy?: string; @@ -22,5 +23,5 @@ export interface GaslessUtxoStats { export interface ReserveUtxoOptions { reservedBy: string; - ttlSeconds?: number; + estimatedMaxFee: number; } diff --git a/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts b/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts index ce322a04b..29a8ac977 100644 --- a/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts +++ b/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts @@ -1,15 +1,16 @@ import { Collection } from "mongodb"; import { GaslessUtxo, ReserveUtxoOptions } from "../types"; -import { DEFAULT_TTL_SECONDS } from "@/queues/gaslessUtxos/constants"; export const reserve = async ( collection: Collection, options: ReserveUtxoOptions ): Promise => { - const { reservedBy, ttlSeconds = DEFAULT_TTL_SECONDS } = options; + const { reservedBy, estimatedMaxFee } = options; + + const minAmount = String(Math.ceil(estimatedMaxFee * 1.5)); return collection.findOneAndUpdate( - { status: "available" }, + { status: "available", amount: { $gte: minAmount } }, { $set: { status: "reserved", From ef6444f92ae17268b151eda78012791c505b4492 Mon Sep 17 00:00:00 2001 From: Gabriel Tozatti Date: Thu, 12 Mar 2026 15:08:02 -0300 Subject: [PATCH 4/5] feat: implement GET /worker/gasless/pool/stats endpoint --- .../src/http/modules/gasless/controller.ts | 19 ++++++++++ .../worker/src/http/modules/gasless/routes.ts | 1 + .../worker/src/queues/gaslessUtxos/types.ts | 2 +- .../src/queues/gaslessUtxos/utils/getStats.ts | 36 +++++++++++-------- 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/packages/worker/src/http/modules/gasless/controller.ts b/packages/worker/src/http/modules/gasless/controller.ts index 232c30411..239360759 100644 --- a/packages/worker/src/http/modules/gasless/controller.ts +++ b/packages/worker/src/http/modules/gasless/controller.ts @@ -49,4 +49,23 @@ export class GaslessController { next(err); } } + + static async stats( + _req: Request, + res: Response, + next: NextFunction + ): Promise { + try { + const db = await MongoDatabase.connect(); + const utxos = gaslessUtxosCollection( + db.getCollection(COLLECTION_GASLESS_UTXOS) + ); + + const stats = await utxos.getStats(); + + res.status(200).json(stats); + } catch (err) { + next(err); + } + } } diff --git a/packages/worker/src/http/modules/gasless/routes.ts b/packages/worker/src/http/modules/gasless/routes.ts index b6dc0f300..ab61be140 100644 --- a/packages/worker/src/http/modules/gasless/routes.ts +++ b/packages/worker/src/http/modules/gasless/routes.ts @@ -4,5 +4,6 @@ import { GaslessController } from "@/http/modules/gasless/controller"; const gaslessRouter = Router(); gaslessRouter.post("/reserve", GaslessController.reserve); +gaslessRouter.get("/pool/stats", GaslessController.stats); export default gaslessRouter; diff --git a/packages/worker/src/queues/gaslessUtxos/types.ts b/packages/worker/src/queues/gaslessUtxos/types.ts index 7d0a44b14..294a6706e 100644 --- a/packages/worker/src/queues/gaslessUtxos/types.ts +++ b/packages/worker/src/queues/gaslessUtxos/types.ts @@ -18,7 +18,7 @@ export interface GaslessUtxoStats { available: number; reserved: number; spent: number; - total: number; + totalValue: string; } export interface ReserveUtxoOptions { diff --git a/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts b/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts index 4b1f52415..60349f73e 100644 --- a/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts +++ b/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts @@ -4,24 +4,32 @@ import { GaslessUtxo, GaslessUtxoStats } from "../types"; export const getStats = async ( collection: Collection ): Promise => { - const rows = await collection - .aggregate<{ _id: string; count: number }>([ - { $group: { _id: "$status", count: { $sum: 1 } } }, + const result = await collection + .aggregate<{ _id: string; count: number; totalAmount: string }>([ + { + $group: { + _id: "$status", + count: { $sum: 1 }, + totalAmount: { $sum: { $toLong: "$amount" } }, + }, + }, ]) .toArray(); - const stats: GaslessUtxoStats = { - available: 0, - reserved: 0, - spent: 0, - total: 0, - }; + const stats = { available: 0, reserved: 0, spent: 0, totalValue: BigInt(0) }; - for (const row of rows) { - const key = row._id as keyof Omit; - if (key in stats) stats[key] = row.count; - stats.total += row.count; + for (const row of result) { + const status = row._id as keyof Omit; + if (status in stats) { + stats[status] = row.count; + } + stats.totalValue += BigInt(row.totalAmount ?? 0); } - return stats; + return { + available: stats.available, + reserved: stats.reserved, + spent: stats.spent, + totalValue: stats.totalValue.toString(), + }; }; From 4b1ee523e98091312e0c08c7f450f1db367e15c2 Mon Sep 17 00:00:00 2001 From: Gabriel Tozatti Date: Thu, 12 Mar 2026 15:29:51 -0300 Subject: [PATCH 5/5] fix: address code review critical and important issues --- .../worker/src/http/modules/gasless/controller.ts | 7 ++++++- packages/worker/src/index.ts | 4 ++-- .../src/queues/gaslessUtxos/utils/getStats.ts | 13 +++++++++++-- .../worker/src/queues/gaslessUtxos/utils/reserve.ts | 5 ++++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/packages/worker/src/http/modules/gasless/controller.ts b/packages/worker/src/http/modules/gasless/controller.ts index 239360759..011379d47 100644 --- a/packages/worker/src/http/modules/gasless/controller.ts +++ b/packages/worker/src/http/modules/gasless/controller.ts @@ -22,7 +22,12 @@ export class GaslessController { throw new AppError(400, "estimatedMaxFee must be a positive number"); } - // TODO: space for blocking rules + if ( + accountId !== undefined && + (typeof accountId !== "string" || accountId.trim().length === 0) + ) { + throw new AppError(400, "accountId must be a non-empty string"); + } const db = await MongoDatabase.connect(); const utxos = gaslessUtxosCollection( diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 3b6cebb67..247e63bb0 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -55,8 +55,8 @@ console.log( ); const app = express(); -app.use(express.json()); -app.use(express.urlencoded({ extended: true })); +app.use(express.json({ limit: "1mb" })); +app.use(express.urlencoded({ extended: true, limit: "1mb" })); setupRoutes(app); const serverAdapter = new ExpressAdapter(); diff --git a/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts b/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts index 60349f73e..15870694b 100644 --- a/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts +++ b/packages/worker/src/queues/gaslessUtxos/utils/getStats.ts @@ -5,12 +5,21 @@ export const getStats = async ( collection: Collection ): Promise => { const result = await collection - .aggregate<{ _id: string; count: number; totalAmount: string }>([ + .aggregate<{ _id: string; count: number; totalAmount: number }>([ { $group: { _id: "$status", count: { $sum: 1 }, - totalAmount: { $sum: { $toLong: "$amount" } }, + totalAmount: { + $sum: { + $convert: { + input: "$amount", + to: "long", + onError: 0, + onNull: 0, + }, + }, + }, }, }, ]) diff --git a/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts b/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts index 29a8ac977..59f7b5aac 100644 --- a/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts +++ b/packages/worker/src/queues/gaslessUtxos/utils/reserve.ts @@ -7,7 +7,10 @@ export const reserve = async ( ): Promise => { const { reservedBy, estimatedMaxFee } = options; - const minAmount = String(Math.ceil(estimatedMaxFee * 1.5)); + const minAmount = ( + (BigInt(Math.floor(estimatedMaxFee)) * BigInt(150)) / + BigInt(100) + ).toString(); return collection.findOneAndUpdate( { status: "available", amount: { $gte: minAmount } },