fix(conflicts): resolve

Author: mrcnk

.github/workflows/ci.yml

@@ -14,4 +14,4 @@ jobs:
       - run: bun i --no-save
       - run: bun run build
       - run: bun run test
-      - run: bunx pkg-pr-new publish './packages/klesia-sdk' './packages/accounts' './packages/connect' './packages/providers' './packages/utils'
+      - run: bunx pkg-pr-new publish './packages/klesia-sdk' './packages/klesia-utils' './packages/accounts' './packages/connect' './packages/providers' './packages/utils'

apps/klesia/package.json

@@ -1,37 +1,34 @@
 {
-	"name": "@mina-js/klesia",
-	"type": "module",
-	"version": "0.0.1",
-	"module": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"default": "./dist/index.js"
-		}
-	},
-	"scripts": {
-		"build": "tsup-node",
-		"dev": "tsup-node --watch --onSuccess \"node dist/server.js\"",
-		"start": "node dist/server.js",
-		"test": "bun test --rerun-each 3",
-		"cleanup": "rimraf dist .turbo node_modules"
-	},
-	"devDependencies": {
-		"@mina-js/utils": "0.1.1"
-	},
-	"dependencies": {
-		"@hono/node-server": "1.13.8",
-		"@hono/zod-openapi": "0.19.2",
-		"@urql/core": "5.1.1",
-		"bigint-quantile": "0.0.2",
-		"dayjs": "1.11.13",
-		"dotenv": "16.4.7",
-		"hono": "4.7.4",
-		"hono-rate-limiter": "0.4.2",
-		"nanoid": "5.1.3",
-		"ofetch": "1.4.1",
-		"ts-pattern": "5.6.2",
-		"zod": "3.24.2"
-	}
+  "name": "@mina-js/klesia",
+  "type": "module",
+  "version": "0.0.1",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "build": "tsup-node",
+    "dev": "tsup-node --watch --onSuccess \"node dist/server.js\"",
+    "start": "node dist/server.js",
+    "test": "bun test --rerun-each 3",
+    "cleanup": "rimraf dist .turbo node_modules"
+  },
+  "devDependencies": {
+    "@mina-js/klesia-utils": "0.1.1",
+    "@mina-js/utils": "0.1.1"
+  },
+  "dependencies": {
+    "@hono/node-server": "1.13.8",
+    "@hono/zod-openapi": "0.19.2",
+    "dotenv": "16.4.7",
+    "hono": "4.7.4",
+    "hono-rate-limiter": "0.4.2",
+    "nanoid": "5.1.3",
+    "ts-pattern": "5.6.2",
+    "zod": "3.24.2"
+  }
 }

apps/klesia/src/index.ts

@@ -1,18 +1,15 @@
 import { getConnInfo } from "@hono/node-server/conninfo";
 import { OpenAPIHono, createRoute } from "@hono/zod-openapi";
 import {
-	KlesiaRpcMethod,
 	KlesiaRpcMethodSchema,
 	KlesiaRpcResponseSchema,
-	PublicKeySchema,
-} from "@mina-js/utils";
+} from "@mina-js/klesia-utils";
+import { handleJsonRpcRequest } from "@mina-js/klesia-utils";
 import { rateLimiter } from "hono-rate-limiter";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
 import { nanoid } from "nanoid";
-import { match } from "ts-pattern";
-import { mina } from "./methods/mina";
-import { buildResponse } from "./utils/build-response";
+import { getNodeApiUrl } from "./utils/node";
 
 export const api = new OpenAPIHono();
 
@@ -61,76 +58,10 @@ const rpcRoute = createRoute({
 });
 
 export const klesiaRpcRoute = api.openapi(rpcRoute, async ({ req, json }) => {
-	const body = KlesiaRpcMethodSchema.parse(await req.json());
-	return match(body)
-		.with(
-			{ method: KlesiaRpcMethod.enum.mina_getTransactionCount },
-			async ({ params }) => {
-				const [publicKey] = params;
-				const result = await mina.getTransactionCount({
-					publicKey: PublicKeySchema.parse(publicKey),
-				});
-				return json(
-					buildResponse({
-						result,
-					}),
-					200,
-				);
-			},
-		)
-		.with(
-			{ method: KlesiaRpcMethod.enum.mina_getBalance },
-			async ({ params }) => {
-				const [publicKey] = params;
-				const result = await mina.getBalance({
-					publicKey: PublicKeySchema.parse(publicKey),
-				});
-				return json(buildResponse({ result }), 200);
-			},
-		)
-		.with({ method: KlesiaRpcMethod.enum.mina_blockHash }, async () => {
-			if (process.env.MINA_NETWORK === "zeko_devnet") {
-				return json(
-					buildResponse({
-						error: {
-							code: -32600,
-							message: "Network not supported.",
-						},
-					}),
-					200,
-				);
-			}
-			const result = await mina.blockHash();
-			return json(buildResponse({ result }), 200);
-		})
-		.with({ method: KlesiaRpcMethod.enum.mina_networkId }, async () => {
-			const result = await mina.networkId();
-			return json(buildResponse({ result }), 200);
-		})
-		.with(
-			{ method: KlesiaRpcMethod.enum.mina_sendTransaction },
-			async ({ params }) => {
-				const [signedTransaction, type] = params;
-				const result = await mina.sendTransaction({ signedTransaction, type });
-				return json(
-					buildResponse({
-						result,
-					}),
-					200,
-				);
-			},
-		)
-		.with(
-			{ method: KlesiaRpcMethod.enum.mina_getAccount },
-			async ({ params }) => {
-				const [publicKey] = params;
-				const result = await mina.getAccount({
-					publicKey: PublicKeySchema.parse(publicKey),
-				});
-				return json(buildResponse({ result }), 200);
-			},
-		)
-		.exhaustive();
+	return json(
+		await handleJsonRpcRequest(getNodeApiUrl(), await req.json()),
+		200,
+	);
 });
 
 export type KlesiaRpc = typeof klesiaRpcRoute;