@prosopo/provider 5.3.1 → 5.3.3

package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js

@@ -1,15 +1,30 @@
+import { createRequire } from "node:module";
 import { ProsopoEnvError } from "@prosopo/common";
-import { CaptchaMerkleTree, computeCaptchaSolutionHash } from "@prosopo/datasets";
+import { CaptchaMerkleTree } from "@prosopo/datasets";
 //#region src/tasks/imgCaptcha/imgCaptchaTasksUtils.ts
+var req = createRequire(import.meta.url);
+var nativeMerkle = (() => {
+	try {
+		return req("@prosopo/native-merkle");
+	} catch {
+		return req("./prosopo-native-merkle.node");
+	}
+})();
 /**
-* Build merkle tree and get commitment from contract, returning the tree, commitment, and commitmentId
-* @param {CaptchaSolution[]} captchaSolutions
-* @returns {Promise<{ tree: CaptchaMerkleTree, commitmentId: string }>}
+* Build merkle tree and get commitment id, returning both. The hash-heavy
+* work (per-solution leaf hash + every intermediate layer) runs in Rust via
+* @prosopo/native-merkle; the resulting layers are grafted into a JS
+* CaptchaMerkleTree so callers can still generate proofs.
 */
 var buildTreeAndGetCommitmentId = (captchaSolutions) => {
+	if (captchaSolutions.length === 0) throw new ProsopoEnvError("CONTRACT.CAPTCHA_SOLUTION_COMMITMENT_DOES_NOT_EXIST", { context: {
+		failedFuncName: buildTreeAndGetCommitmentId.name,
+		commitmentId: null
+	} });
+	const solutionsHashed = captchaSolutions.map((captcha) => nativeMerkle.computeCaptchaSolutionHash(captcha.captchaId, captcha.captchaContentId, captcha.solution, captcha.salt));
+	const layers = nativeMerkle.buildMerkleLayers(solutionsHashed);
 	const tree = new CaptchaMerkleTree();
-	const solutionsHashed = captchaSolutions.map((captcha) => computeCaptchaSolutionHash(captcha));
-	tree.build(solutionsHashed);
+	tree.hydrateFromLayers(layers);
 	const commitmentId = tree.root?.hash;
 	if (!commitmentId) throw new ProsopoEnvError("CONTRACT.CAPTCHA_SOLUTION_COMMITMENT_DOES_NOT_EXIST", { context: {
 		failedFuncName: buildTreeAndGetCommitmentId.name,

package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"imgCaptchaTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACN,iBAAiB,EACjB,0BAA0B,GAC1B,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,gBAAmC,EACiB,EAAE;IACtD,MAAM,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;IACrC,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,0BAA0B,CAAC,OAAO,CAAC,CACnC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAE5B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;IACrC,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,MAAM,IAAI,eAAe,CACxB,qDAAqD,EACrD;YACC,OAAO,EAAE;gBACR,cAAc,EAAE,2BAA2B,CAAC,IAAI;gBAChD,YAAY,EAAE,YAAY;aAC1B;SACD,CACD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AAC/B,CAAC,CAAC"}
+{"version":3,"file":"imgCaptchaTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAetD,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3C,MAAM,YAAY,GAAuB,CAAC,GAAG,EAAE;IAC9C,IAAI,CAAC;QACJ,OAAO,GAAG,CAAC,wBAAwB,CAAuB,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QAIR,OAAO,GAAG,CAAC,8BAA8B,CAAuB,CAAC;IAClE,CAAC;AACF,CAAC,CAAC,EAAE,CAAC;AAQL,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,gBAAmC,EACiB,EAAE;IAKtD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,eAAe,CACxB,qDAAqD,EACrD;YACC,OAAO,EAAE;gBACR,cAAc,EAAE,2BAA2B,CAAC,IAAI;gBAChD,YAAY,EAAE,IAAI;aAClB;SACD,CACD,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,YAAY,CAAC,0BAA0B,CACtC,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,CACZ,CACD,CAAC;IACF,MAAM,MAAM,GAAG,YAAY,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IAE/D,MAAM,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;IACrC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE/B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;IACrC,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,MAAM,IAAI,eAAe,CACxB,qDAAqD,EACrD;YACC,OAAO,EAAE;gBACR,cAAc,EAAE,2BAA2B,CAAC,IAAI;gBAChD,YAAY,EAAE,YAAY;aAC1B;SACD,CACD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AAC/B,CAAC,CAAC"}

package/dist/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.unit.test.js

@@ -1,4 +1,4 @@
-import { CaptchaType } from "@prosopo/types";
+import { CaptchaType, ModeEnum } from "@prosopo/types";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { runConfiguredCaptchaTypeShortCircuit } from "../../../../../api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.js";
 const buildInput = (overrides = {}, { resolvedBundleId } = {}) => {
@@ -34,7 +34,7 @@ const buildInput = (overrides = {}, { resolvedBundleId } = {}) => {
             ipAddress: { lower: 0n, type: "v4" },
             ipInfo: undefined,
             flatHeaders: {},
-            sessionMode: undefined,
+            sessionMode: ModeEnum.visible,
             userSitekeyIpHash: "hash",
             logger: { info: vi.fn(), debug: vi.fn(), warn: vi.fn(), error: vi.fn() },
             ...overrides,

package/dist/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"shortCircuit.unit.test.js","sourceRoot":"","sources":["../../../../../../src/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.unit.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shortCircuit.unit.test.js","sourceRoot":"","sources":["../../../../../../src/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.unit.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/unit/api/rawTlsSignalsMiddleware.unit.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=rawTlsSignalsMiddleware.unit.test.d.ts.map

package/dist/tests/unit/api/rawTlsSignalsMiddleware.unit.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rawTlsSignalsMiddleware.unit.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/unit/api/rawTlsSignalsMiddleware.unit.test.ts"],"names":[],"mappings":""}

package/dist/tests/unit/api/rawTlsSignalsMiddleware.unit.test.js

@@ -0,0 +1,127 @@
+import { describe, expect, it, vi } from "vitest";
+import { getRawTlsSignals, rawTlsSignalsForSession, } from "../../../api/rawTlsSignalsMiddleware.js";
+const mockLogger = () => {
+    const log = {
+        debug: vi.fn(),
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+        trace: vi.fn(),
+        fatal: vi.fn(),
+        with: vi.fn().mockImplementation(() => log),
+    };
+    return log;
+};
+describe("getRawTlsSignals", () => {
+    it("parses every present header", () => {
+        const headers = {
+            "x-tls-syn-ns": "100000000",
+            "x-tls-synack-ns": "100050000",
+            "x-tls-ack-ns": "100100000",
+            "x-tls-observed-ttl": "53",
+            "x-tls-tcp-mss": "1452",
+            "x-tls-tcp-wscale": "7",
+            "x-tls-tcp-opts-flags": "31",
+            "x-tls-tcp-opts-order": "202818",
+            "x-tls-tcp-window": "64240",
+        };
+        const result = getRawTlsSignals(headers, mockLogger());
+        expect(result.synNs).toBe(100000000);
+        expect(result.synackNs).toBe(100050000);
+        expect(result.ackNs).toBe(100100000);
+        expect(result.observedTtl).toBe(53);
+        expect(result.tcpMss).toBe(1452);
+        expect(result.tcpWscale).toBe(7);
+        expect(result.tcpOptsFlags).toBe(31);
+        expect(result.tcpOptsOrder).toBe(202818);
+        expect(result.tcpWindow).toBe(64240);
+    });
+    it("returns undefined for every field when no headers are present", () => {
+        const result = getRawTlsSignals({}, mockLogger());
+        expect(result.synNs).toBeUndefined();
+        expect(result.synackNs).toBeUndefined();
+        expect(result.ackNs).toBeUndefined();
+        expect(result.observedTtl).toBeUndefined();
+        expect(result.tcpMss).toBeUndefined();
+        expect(result.tcpWscale).toBeUndefined();
+        expect(result.tcpOptsFlags).toBeUndefined();
+        expect(result.tcpOptsOrder).toBeUndefined();
+        expect(result.tcpWindow).toBeUndefined();
+    });
+    it("rejects out-of-range values with the field-specific cap", () => {
+        const headers = {
+            "x-tls-observed-ttl": "999",
+            "x-tls-tcp-mss": "70000",
+            "x-tls-tcp-opts-flags": "300",
+            "x-tls-tcp-wscale": "42",
+        };
+        const result = getRawTlsSignals(headers, mockLogger());
+        expect(result.observedTtl).toBeUndefined();
+        expect(result.tcpMss).toBeUndefined();
+        expect(result.tcpOptsFlags).toBeUndefined();
+        expect(result.tcpWscale).toBe(42);
+    });
+    it("rejects negative values", () => {
+        const headers = {
+            "x-tls-tcp-wscale": "-1",
+        };
+        const result = getRawTlsSignals(headers, mockLogger());
+        expect(result.tcpWscale).toBeUndefined();
+    });
+    it("rejects non-numeric values", () => {
+        const headers = {
+            "x-tls-tcp-mss": "not-a-number",
+            "x-tls-tcp-wscale": "7",
+        };
+        const result = getRawTlsSignals(headers, mockLogger());
+        expect(result.tcpMss).toBeUndefined();
+        expect(result.tcpWscale).toBe(7);
+    });
+    it("takes the first value when the header is repeated (string[])", () => {
+        const headers = {
+            "x-tls-tcp-mss": ["1452", "1460"],
+        };
+        const result = getRawTlsSignals(headers, mockLogger());
+        expect(result.tcpMss).toBe(1452);
+    });
+});
+describe("rawTlsSignalsForSession", () => {
+    it("omits undefined fields so Mongo docs stay slim", () => {
+        const out = rawTlsSignalsForSession({
+            tcpMss: 1460,
+        });
+        expect(out).toEqual({ tcpMss: 1460 });
+    });
+    it("copies every defined field verbatim", () => {
+        const out = rawTlsSignalsForSession({
+            synNs: 1,
+            synackNs: 2,
+            ackNs: 3,
+            observedTtl: 4,
+            tcpMss: 5,
+            tcpWscale: 6,
+            tcpOptsFlags: 7,
+            tcpOptsOrder: 8,
+            tcpWindow: 9,
+        });
+        expect(out).toEqual({
+            synNs: 1,
+            synackNs: 2,
+            ackNs: 3,
+            observedTtl: 4,
+            tcpMss: 5,
+            tcpWscale: 6,
+            tcpOptsFlags: 7,
+            tcpOptsOrder: 8,
+            tcpWindow: 9,
+        });
+    });
+});
+describe("rawTlsSignalsMiddleware", () => {
+    it("returns a middleware function", async () => {
+        const { rawTlsSignalsMiddleware } = await import("../../../api/rawTlsSignalsMiddleware.js");
+        const middleware = rawTlsSignalsMiddleware({});
+        expect(typeof middleware).toBe("function");
+    });
+});
+//# sourceMappingURL=rawTlsSignalsMiddleware.unit.test.js.map

package/dist/tests/unit/api/rawTlsSignalsMiddleware.unit.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rawTlsSignalsMiddleware.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/rawTlsSignalsMiddleware.unit.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js

@@ -1,62 +1,38 @@
 import { ProsopoEnvError } from "@prosopo/common";
-import { CaptchaMerkleTree, computeCaptchaSolutionHash, } from "@prosopo/datasets";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 import { buildTreeAndGetCommitmentId } from "../../../../tasks/imgCaptcha/imgCaptchaTasksUtils.js";
-vi.mock("@prosopo/datasets", () => ({
-    CaptchaMerkleTree: vi.fn().mockImplementation(function () {
-        return {
-            build: vi.fn(function () {
-                this.root = { hash: "mockedRootHash" };
-            }),
-            root: null,
-            getRoot: vi.fn().mockReturnValue({ hash: "mockedRootHash" }),
-        };
-    }),
-    computeCaptchaSolutionHash: vi.fn(),
-}));
+const mockCaptchaSolutions = [
+    {
+        captchaId: "captchaId1",
+        captchaContentId: "captchaContentId1",
+        salt: "salt1",
+        solution: ["a", "b"],
+    },
+    {
+        captchaId: "captchaId2",
+        captchaContentId: "captchaContentId2",
+        salt: "salt2",
+        solution: ["c", "d"],
+    },
+];
 describe("buildTreeAndGetCommitmentId", () => {
-    const mockCaptchaSolutions = [
-        { challenge: "challenge1", solution: "solution1", salt: "salt1" },
-        { challenge: "challenge2", solution: "solution2", salt: "salt2" },
-    ];
-    beforeEach(() => {
-        vi.clearAllMocks();
-        CaptchaMerkleTree.mockImplementation(function () {
-            return {
-                build: vi.fn(),
-                root: { hash: "mockedRootHash" },
-            };
-        });
+    it("builds a tree and returns a commitmentId that is deterministic across calls", () => {
+        const first = buildTreeAndGetCommitmentId(mockCaptchaSolutions);
+        const second = buildTreeAndGetCommitmentId(mockCaptchaSolutions);
+        expect(first.commitmentId).toMatch(/^0x[0-9a-f]{64}$/);
+        expect(first.commitmentId).toBe(second.commitmentId);
+        expect(first.tree.root?.hash).toBe(first.commitmentId);
+        expect(first.tree.leaves.length).toBe(mockCaptchaSolutions.length);
     });
-    it("should build a tree and return the commitmentId", () => {
-        computeCaptchaSolutionHash
-            .mockReturnValueOnce("hashedSolution1")
-            .mockReturnValueOnce("hashedSolution2");
-        const result = buildTreeAndGetCommitmentId(mockCaptchaSolutions);
-        expect(CaptchaMerkleTree).toHaveBeenCalled();
-        expect(computeCaptchaSolutionHash).toHaveBeenCalledWith(mockCaptchaSolutions[0]);
-        expect(computeCaptchaSolutionHash).toHaveBeenCalledWith(mockCaptchaSolutions[1]);
-        expect(result).toEqual({
-            tree: expect.any(Object),
-            commitmentId: "mockedRootHash",
-        });
+    it("still returns a valid commitmentId when there is only one solution (single-leaf tree)", () => {
+        const single = mockCaptchaSolutions.slice(0, 1);
+        const { commitmentId, tree } = buildTreeAndGetCommitmentId(single);
+        expect(commitmentId).toMatch(/^0x[0-9a-f]{64}$/);
+        expect(tree.root?.hash).toBe(commitmentId);
+        expect(tree.leaves.length).toBe(1);
     });
-    it("should throw an error if commitmentId does not exist", () => {
-        const originalMock = vi.mocked(CaptchaMerkleTree);
-        vi.mocked(CaptchaMerkleTree).mockImplementationOnce(function () {
-            return {
-                build: vi.fn(),
-                root: { hash: null },
-                getRoot: vi.fn().mockReturnValue({ hash: null }),
-            };
-        });
-        expect(() => buildTreeAndGetCommitmentId(mockCaptchaSolutions)).toThrow(new ProsopoEnvError("CONTRACT.CAPTCHA_SOLUTION_COMMITMENT_DOES_NOT_EXIST", {
-            context: {
-                failedFuncName: "buildTreeAndGetCommitmentId",
-                commitmentId: null,
-            },
-        }));
-        vi.mocked(CaptchaMerkleTree).mockImplementation(originalMock.getMockImplementation());
+    it("throws CAPTCHA_SOLUTION_COMMITMENT_DOES_NOT_EXIST when passed no solutions", () => {
+        expect(() => buildTreeAndGetCommitmentId([])).toThrow(ProsopoEnvError);
     });
 });
 //# sourceMappingURL=imgCaptchaTasksUtils.unit.test.js.map

package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"imgCaptchaTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imgCaptchaTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AAMnG,MAAM,oBAAoB,GAAsB;IAC/C;QACC,SAAS,EAAE,YAAY;QACvB,gBAAgB,EAAE,mBAAmB;QACrC,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;KACpB;IACD;QACC,SAAS,EAAE,YAAY;QACvB,gBAAgB,EAAE,mBAAmB;QACrC,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;KACpB;CACD,CAAC;AAEF,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACtF,MAAM,KAAK,GAAG,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;QAEjE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uFAAuF,EAAE,GAAG,EAAE;QAChG,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAEnE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAEjD,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QAGrF,MAAM,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/provider",
-	"version": "5.3.1",
+	"version": "5.3.3",
 	"author": "PROSOPO LIMITED <info@prosopo.io>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -23,25 +23,26 @@
 	"dependencies": {
 		"@noble/hashes": "1.8.0",
 		"@polkadot/util": "13.5.7",
-		"@prosopo/api": "4.0.9",
-		"@prosopo/api-express-router": "3.1.64",
+		"@prosopo/api": "4.0.11",
+		"@prosopo/api-express-router": "3.1.66",
 		"@prosopo/api-route": "2.6.55",
 		"@prosopo/common": "3.1.50",
 		"@prosopo/logger": "2.0.6",
-		"@prosopo/database": "4.0.10",
-		"@prosopo/datasets": "3.1.65",
-		"@prosopo/env": "3.6.33",
-		"@prosopo/ipinfo": "0.3.10",
-		"@prosopo/keyring": "2.9.72",
-		"@prosopo/load-balancer": "2.10.26",
+		"@prosopo/database": "4.0.12",
+		"@prosopo/datasets": "3.1.67",
+		"@prosopo/env": "3.6.35",
+		"@prosopo/ipinfo": "0.3.12",
+		"@prosopo/keyring": "2.9.74",
+		"@prosopo/load-balancer": "2.10.28",
 		"@prosopo/puzzle-assets": "0.1.1",
 		"@prosopo/redis-client": "1.0.32",
 		"@prosopo/locale": "3.3.0",
-		"@prosopo/native-ja4": "0.0.2",
-		"@prosopo/types": "5.2.1",
-		"@prosopo/types-database": "5.1.4",
-		"@prosopo/types-env": "2.10.29",
-		"@prosopo/user-access-policy": "3.12.20",
+		"@prosopo/native-ja4": "0.0.3",
+		"@prosopo/native-merkle": "0.0.3",
+		"@prosopo/types": "5.2.3",
+		"@prosopo/types-database": "5.1.6",
+		"@prosopo/types-env": "2.10.31",
+		"@prosopo/user-access-policy": "3.12.22",
 		"@prosopo/util": "3.3.6",
 		"@prosopo/util-crypto": "13.5.30",
 		"cron": "3.1.7",
@@ -56,7 +57,7 @@
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "3.3.10",
+		"@prosopo/config": "3.3.11",
 		"@types/node": "22.5.5",
 		"@types/pg": "8.16.0",
 		"@types/uuid": "10.0.0",