@prosopo/provider 2.9.8 → 3.0.6

package/dist/tests/unit/util.unit.test.js

@@ -1,6 +1,7 @@
 import { ScheduledTaskNames } from "@prosopo/types";
-import { describe, expect, it, vi } from "vitest";
-import { checkIfTaskIsRunning } from "../../util.js";
+import { at } from "@prosopo/util";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { checkIfTaskIsRunning, getIPAddress, validateIpAddress, } from "../../util.js";
 describe("checkIfTaskIsRunning", () => {
     it("should return false if the task is not running", async () => {
         const taskName = ScheduledTaskNames.StoreCommitmentsExternal;
@@ -37,4 +38,111 @@ describe("checkIfTaskIsRunning", () => {
         expect(result).toBe(true);
     });
 });
+describe("validateIpAddress", () => {
+    let mockLogger;
+    beforeEach(() => {
+        mockLogger = {
+            info: vi.fn().mockImplementation(console.info),
+            debug: vi.fn().mockImplementation(console.debug),
+            error: vi.fn().mockImplementation(console.error),
+            log: vi.fn().mockImplementation(console.log),
+            warn: vi.fn().mockImplementation(console.warn),
+        };
+        vi.clearAllMocks();
+    });
+    it("should return valid when IP is undefined", () => {
+        const result = validateIpAddress(undefined, BigInt(123456789), mockLogger);
+        expect(result.isValid).toBe(true);
+        expect(result.errorMessage).toBeUndefined();
+    });
+    it("should return valid when IP addresses match", () => {
+        const testIp = "212.132.203.186";
+        const ipBigInt = BigInt(3565472698);
+        const result = validateIpAddress(testIp, ipBigInt, mockLogger);
+        expect(result.isValid).toBe(true);
+        expect(result.errorMessage).toBeUndefined();
+        const logFn = mockLogger.info.mock.calls[0][0];
+        const logObj = logFn();
+        expect(logObj).toHaveProperty("data");
+        expect(logObj.data).toHaveProperty("ipV4orV6Address");
+        expect(logObj.data.ipV4orV6Address).toHaveProperty("address", testIp);
+    });
+    it("should return valid when when an IPV4 big int is returned from the DB and an IPV4 string is sent in the payload", () => {
+        const testIp = "82.43.214.180";
+        const ipBigInt = BigInt(1378604724);
+        const result = validateIpAddress(testIp, ipBigInt, mockLogger);
+        expect(result.isValid).toBe(true);
+        expect(result.errorMessage).toBeUndefined();
+        const logFn = mockLogger.info.mock.calls[0][0];
+        const logObj = logFn();
+        expect(logObj).toHaveProperty("data");
+        expect(logObj.data).toHaveProperty("ipV4orV6Address");
+        expect(logObj.data.ipV4orV6Address).toHaveProperty("address", testIp);
+    });
+    it("should return valid when when an IPV4 big int is returned from the DB and an IPV6 string is sent in the payload", () => {
+        const testIp = "::ffff:82.43.214.180";
+        const ipBigInt = BigInt(1378604724);
+        const result = validateIpAddress(testIp, ipBigInt, mockLogger);
+        expect(result.isValid).toBe(true);
+        expect(result.errorMessage).toBeUndefined();
+        const logFn = mockLogger.info.mock.calls[0][0];
+        const logObj = logFn();
+        expect(logObj).toHaveProperty("data");
+        expect(logObj.data).toHaveProperty("ipV4orV6Address");
+        expect(logObj.data.ipV4orV6Address).toHaveProperty("address", at(testIp.split(":"), 3));
+    });
+    it("should return valid when when an IPV6 big int is returned from the DB and an IPV4 string is sent in the payload", () => {
+        const testIp = "82.43.214.180";
+        const ipBigInt = 281472060348084n;
+        const result = validateIpAddress(testIp, ipBigInt, mockLogger);
+        expect(result.isValid).toBe(true);
+        expect(result.errorMessage).toBeUndefined();
+        const logFn = mockLogger.info.mock.calls[0][0];
+        const logObj = logFn();
+        expect(logObj).toHaveProperty("data");
+        expect(logObj.data).toHaveProperty("ipV4orV6Address");
+        expect(logObj.data.ipV4orV6Address).toHaveProperty("address", testIp);
+    });
+    it("should return valid when when an IPV6 big int is returned from the DB and an IPV6 string is sent in the payload", () => {
+        const testIp = "::ffff:82.43.214.180";
+        const ipBigInt = 281472060348084n;
+        const result = validateIpAddress(testIp, ipBigInt, mockLogger);
+        expect(result.isValid).toBe(true);
+        expect(result.errorMessage).toBeUndefined();
+        const logFn = mockLogger.info.mock.calls[0][0];
+        const logObj = logFn();
+        expect(logObj).toHaveProperty("data");
+        expect(logObj.data).toHaveProperty("ipV4orV6Address");
+        expect(logObj.data.ipV4orV6Address).toHaveProperty("address", at(testIp.split(":"), 3));
+    });
+    it("should return invalid when IP address is malformed", () => {
+        const invalidIp = "invalid.ip.address";
+        const challengeRecordIp = BigInt(3232235777);
+        const result = validateIpAddress(invalidIp, challengeRecordIp, mockLogger);
+        expect(result.isValid).toBe(false);
+        expect(result.errorMessage).toBe(`Invalid IP address: ${invalidIp}`);
+        const logFn = mockLogger.info.mock.calls[0][0];
+        const logObj = logFn();
+        expect(logObj).toHaveProperty("msg");
+        expect(logObj.msg).toEqual(`Invalid IP address: ${invalidIp}`);
+    });
+    it("should return invalid when IP addresses don't match", () => {
+        const providedIp = "192.168.1.1";
+        const storedIpBigInt = BigInt(3232235778);
+        const result = validateIpAddress(providedIp, storedIpBigInt, mockLogger);
+        expect(result.isValid).toBe(false);
+        expect(result.errorMessage).toContain("IP address mismatch:");
+        const logFn = mockLogger.info.mock.calls[1][0];
+        const logObj = logFn();
+        expect(logObj).toHaveProperty("msg");
+        expect(logObj.msg).toEqual("IP address mismatch: 192.168.1.2 !== 192.168.1.1");
+    });
+    it("should verify logger is called when IP validation occurs", () => {
+        const testIp = "127.0.0.1";
+        const ipAddress = getIPAddress(testIp);
+        const ipBigInt = ipAddress.bigInt();
+        validateIpAddress(testIp, ipBigInt, mockLogger);
+        expect(mockLogger.info).toHaveBeenCalledTimes(1);
+    });
+});
 //# sourceMappingURL=util.unit.test.js.map

package/dist/tests/unit/util.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.unit.test.js","sourceRoot":"","sources":["../../../src/tests/unit/util.unit.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,wBAAwB,CAAC;QAC7D,MAAM,EAAE,GAAG;YACV,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;SAC3B,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,wBAAwB,CAAC;QAC7D,MAAM,EAAE,GAAG;YACV,0BAA0B,EAAE,EAAE;iBAC5B,EAAE,EAAE;iBACJ,iBAAiB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAsC,CAAC;YACvE,sBAAsB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACjD,GAAG,EAAE,KAAK;gBACV,MAAM,EAAE,WAAW;aAC4B,CAAC;SACjB,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC5E,MAAM,QAAQ,GAAG,kBAAkB,CAAC,wBAAwB,CAAC;QAC7D,MAAM,EAAE,GAAG;YACV,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACrD,GAAG,EAAE,KAAK;gBACV,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;aACM,CAAC;YACtC,sBAAsB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;SACvB,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"util.unit.test.js","sourceRoot":"","sources":["../../../src/tests/unit/util.unit.test.ts"],"names":[],"mappings":"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"}

package/dist/util.d.ts

@@ -1,3 +1,4 @@
+import { type Logger } from "@prosopo/common";
 import { type IPAddress, type ScheduledTaskNames } from "@prosopo/types";
 import type { IProviderDatabase } from "@prosopo/types-database";
 export declare function encodeStringAddress(address: string): string;
@@ -5,4 +6,8 @@ export declare function shuffleArray<T>(array: T[]): T[];
 export declare function checkIfTaskIsRunning(taskName: ScheduledTaskNames, db: IProviderDatabase): Promise<boolean>;
 export declare const getIPAddress: (ipAddressString: string) => IPAddress;
 export declare const getIPAddressFromBigInt: (ipAddressBigInt: bigint) => IPAddress;
+export declare const validateIpAddress: (ip: string | undefined, challengeRecordIpAddress: bigint, logger: Logger) => {
+    isValid: boolean;
+    errorMessage?: string;
+};
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAkBA,OAAO,EACN,KAAK,SAAS,EACd,KAAK,kBAAkB,EAEvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAa,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAK5E,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAUlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQ/C;AAQD,wBAAsB,oBAAoB,CACzC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,iBAAiB,GACnB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED,eAAO,MAAM,YAAY,oBAAqB,MAAM,KAAG,SAStD,CAAC;AAEF,eAAO,MAAM,sBAAsB,oBAAqB,MAAM,KAAG,SAEhE,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAgBA,OAAO,EACN,KAAK,MAAM,EAGX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACN,KAAK,SAAS,EACd,KAAK,kBAAkB,EAEvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAMjE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAUlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQ/C;AAQD,wBAAsB,oBAAoB,CACzC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,iBAAiB,GACnB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED,eAAO,MAAM,YAAY,oBAAqB,MAAM,KAAG,SAUtD,CAAC;AAEF,eAAO,MAAM,sBAAsB,oBAAqB,MAAM,KAAG,SAShE,CAAC;AASF,eAAO,MAAM,iBAAiB,OACzB,MAAM,GAAG,SAAS,4BACI,MAAM,UACxB,MAAM,KACZ;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAsD3C,CAAC"}

package/dist/util.js

@@ -1,9 +1,9 @@
-import { decodeAddress, encodeAddress } from "@polkadot/util-crypto/address";
 import { hexToU8a } from "@polkadot/util/hex";
 import { isHex } from "@polkadot/util/is";
-import { ProsopoContractError, ProsopoEnvError } from "@prosopo/common";
+import { ProsopoContractError, ProsopoEnvError, } from "@prosopo/common";
 import { ScheduledTaskStatus, } from "@prosopo/types";
 import { at } from "@prosopo/util";
+import { decodeAddress, encodeAddress } from "@prosopo/util-crypto";
 import { Address4, Address6 } from "ip-address";
 export function encodeStringAddress(address) {
     try {
@@ -35,16 +35,68 @@ export async function checkIfTaskIsRunning(taskName, db) {
 }
 export const getIPAddress = (ipAddressString) => {
     try {
-        if (ipAddressString.match(/^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$/)) {
+        try {
             return new Address4(ipAddressString);
         }
-        return new Address6(ipAddressString);
+        catch (e) {
+            return new Address6(ipAddressString);
+        }
     }
     catch (e) {
         throw new ProsopoEnvError("API.INVALID_IP");
     }
 };
 export const getIPAddressFromBigInt = (ipAddressBigInt) => {
-    return Address4.fromBigInt(ipAddressBigInt);
+    try {
+        if (ipAddressBigInt > 4228250626n) {
+            return Address6.fromBigInt(BigInt(ipAddressBigInt));
+        }
+        return Address4.fromBigInt(BigInt(ipAddressBigInt));
+    }
+    catch (e) {
+        throw new ProsopoEnvError("API.INVALID_IP");
+    }
+};
+export const validateIpAddress = (ip, challengeRecordIpAddress, logger) => {
+    if (!ip) {
+        return { isValid: true };
+    }
+    let ipV4orV6Address;
+    try {
+        ipV4orV6Address = getIPAddress(ip);
+        logger.info(() => ({ data: { ipV4orV6Address } }));
+    }
+    catch (e) {
+        const errorMessage = `Invalid IP address: ${ip}`;
+        logger.info(() => ({ msg: errorMessage }));
+        return { isValid: false, errorMessage };
+    }
+    let challengeIpV4orV6Address = getIPAddressFromBigInt(challengeRecordIpAddress);
+    ipV4orV6Address =
+        "address4" in ipV4orV6Address && ipV4orV6Address.address4
+            ? ipV4orV6Address.address4
+            : ipV4orV6Address;
+    challengeIpV4orV6Address =
+        "address4" in challengeIpV4orV6Address && challengeIpV4orV6Address.address4
+            ? challengeIpV4orV6Address.address4
+            : challengeIpV4orV6Address;
+    if (ipV4orV6Address.v4 && !challengeIpV4orV6Address.v4) {
+        challengeIpV4orV6Address = new Address4(challengeIpV4orV6Address.to4().correctForm());
+    }
+    if (!ipV4orV6Address.v4 && challengeIpV4orV6Address.v4) {
+        ipV4orV6Address = new Address6(ipV4orV6Address.to4().correctForm());
+    }
+    if (challengeIpV4orV6Address.bigInt() - ipV4orV6Address.bigInt() !== 0n) {
+        const errorMessage = `IP address mismatch: ${challengeIpV4orV6Address.address} !== ${ipV4orV6Address.address}`;
+        logger.info(() => ({
+            msg: errorMessage,
+            data: {
+                challengeIp: challengeIpV4orV6Address.address,
+                providedIp: ipV4orV6Address.address,
+            },
+        }));
+        return { isValid: false, errorMessage };
+    }
+    return { isValid: true };
 };
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAGN,mBAAmB,GACnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGhD,MAAM,UAAU,mBAAmB,CAAC,OAAe;IAClD,IAAI,CAAC;QACJ,OAAO,aAAa,CACnB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAC3D,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,oBAAoB,CAAC,0BAA0B,EAAE;YAC1D,OAAO,EAAE,EAAE,OAAO,EAAE;SACpB,CAAC,CAAC;IACJ,CAAC;AACF,CAAC;AAED,MAAM,UAAU,YAAY,CAAI,KAAU;IACzC,KAAK,IAAI,UAAU,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,UAAU,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACjC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACzC,KAAK,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC;IACzB,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACzC,QAA4B,EAC5B,EAAqB;IAErB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,0BAA0B,CACtD,QAAQ,EACR,mBAAmB,CAAC,OAAO,CAC3B,CAAC;IACF,MAAM,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC;IAG3D,IAAI,WAAW,IAAI,WAAW,CAAC,QAAQ,GAAG,aAAa,EAAE,CAAC;QACzD,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,sBAAsB,CACpD,WAAW,CAAC,GAAe,EAC3B,mBAAmB,CAAC,SAAS,CAC7B,CAAC;QACF,OAAO,CAAC,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,eAAuB,EAAa,EAAE;IAClE,IAAI,CAAC;QACJ,IAAI,eAAe,CAAC,KAAK,CAAC,6CAA6C,CAAC,EAAE,CAAC;YAC1E,OAAO,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,MAAM,IAAI,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,eAAuB,EAAa,EAAE;IAC5E,OAAO,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;AAC7C,CAAC,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/provider",
-	"version": "2.9.8",
+	"version": "3.0.6",
 	"author": "PROSOPO LIMITED <info@prosopo.io>",
 	"license": "Apache-2.0",
 	"main": "./dist/index.js",
@@ -24,28 +24,32 @@
 	},
 	"dependencies": {
 		"@noble/hashes": "1.5.0",
-		"@polkadot/keyring": "12.6.2",
 		"@polkadot/util": "12.6.2",
-		"@polkadot/util-crypto": "12.6.2",
-		"@prosopo/api-express-router": "2.6.1",
-		"@prosopo/api-route": "2.6.1",
-		"@prosopo/common": "2.6.1",
-		"@prosopo/config": "2.6.0",
-		"@prosopo/database": "2.6.5",
-		"@prosopo/datasets": "2.6.12",
-		"@prosopo/env": "2.6.5",
-		"@prosopo/keyring": "2.6.4",
-		"@prosopo/types": "2.7.1",
-		"@prosopo/types-database": "2.7.2",
-		"@prosopo/types-env": "2.6.5",
-		"@prosopo/user-access-policy": "2.6.4",
-		"@prosopo/util": "2.6.0",
+		"@prosopo/api-express-router": "3.0.3",
+		"@prosopo/api-route": "2.6.7",
+		"@prosopo/common": "3.0.2",
+		"@prosopo/config": "3.1.0",
+		"@prosopo/database": "3.0.5",
+		"@prosopo/datasets": "3.0.5",
+		"@prosopo/env": "3.0.5",
+		"@prosopo/keyring": "2.8.5",
+		"@prosopo/types": "3.0.2",
+		"@prosopo/types-database": "3.0.5",
+		"@prosopo/types-env": "2.7.9",
+		"@prosopo/user-access-policy": "3.1.4",
+		"@prosopo/util": "3.0.2",
+		"@prosopo/util-crypto": "13.5.1",
+		"@typegoose/auto-increment": "4.13.0",
+		"axios": "1.10.0",
 		"cron": "3.1.7",
+		"esbuild": "0.25.6",
 		"express": "4.21.2",
 		"ip-address": "10.0.1",
 		"node-fetch": "3.3.2",
+		"openpgp": "5.11.3",
 		"read-tls-client-hello": "1.1.0",
-		"uuid": "10.0.0",
+		"uuid": "11.1.0",
+		"webpack-dev-server": "5.2.2",
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
@@ -55,11 +59,11 @@
 		"concurrently": "9.0.1",
 		"del-cli": "6.0.0",
 		"dotenv": "16.4.5",
-		"npm-run-all": "2.1.0",
+		"npm-run-all": "4.1.5",
 		"tslib": "2.7.0",
-		"tsx": "4.19.1",
+		"tsx": "4.20.3",
 		"typescript": "5.6.2",
-		"vite": "6.2.3",
+		"vite": "6.3.5",
 		"vitest": "3.0.9"
 	},
 	"repository": {

package/vite.test.config.ts

@@ -17,4 +17,4 @@ import { loadEnv } from "@prosopo/dotenv";
 
 loadEnv();
 
-export default ViteTestConfig;
+export default ViteTestConfig();

package/dist/api/authMiddleware.d.ts

@@ -1,6 +0,0 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
-import type { ProviderEnvironment } from "@prosopo/types-env";
-import type { NextFunction, Request, Response } from "express";
-export declare const authMiddleware: (env: ProviderEnvironment) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
-export declare const verifySignature: (signature: string, timestamp: string, pair: KeyringPair) => void;
-//# sourceMappingURL=authMiddleware.d.ts.map

package/dist/api/authMiddleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAI3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,cAAc,QAAS,mBAAmB,WACnC,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAuC7D,CAAC;AAyCF,eAAO,MAAM,eAAe,cAChB,MAAM,aACN,MAAM,QACX,WAAW,SAajB,CAAC"}

package/dist/api/authMiddleware.js

@@ -1,82 +0,0 @@
-import { hexToU8a, isHex } from "@polkadot/util";
-import { ProsopoApiError, ProsopoEnvError } from "@prosopo/common";
-export const authMiddleware = (env) => {
-    return async (req, res, next) => {
-        try {
-            const { signature, timestamp } = extractHeaders(req);
-            let error;
-            if (env.authAccount) {
-                try {
-                    verifySignature(signature, timestamp, env.authAccount);
-                    next();
-                    return;
-                }
-                catch (e) {
-                    req.logger.warn({
-                        message: e.message,
-                        code: e.code,
-                        account: env.authAccount.address,
-                    });
-                    error = e;
-                }
-            }
-            if (env.pair) {
-                verifySignature(signature, timestamp, env.pair);
-                next();
-                return;
-            }
-            res.status(401).json({
-                error: "Unauthorized",
-                message: new ProsopoEnvError(error || "CONTRACT.CANNOT_FIND_KEYPAIR"),
-            });
-            return;
-        }
-        catch (err) {
-            req.logger.error("Auth Middleware Error:", err);
-            res.status(401).json({ error: "Unauthorized", message: err });
-            return;
-        }
-    };
-};
-const extractHeaders = (req) => {
-    const signature = req.headers.signature;
-    const timestamp = req.headers.timestamp;
-    if (!timestamp) {
-        throw new ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
-            context: { error: "Missing timestamp", code: 400 },
-        });
-    }
-    if (!signature) {
-        throw new ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
-            context: { error: "Missing signature", code: 400 },
-        });
-    }
-    if (Array.isArray(signature) ||
-        Array.isArray(timestamp) ||
-        !isHex(signature)) {
-        throw new ProsopoApiError("CONTRACT.INVALID_DATA_FORMAT", {
-            context: { error: "Invalid header format", code: 400 },
-        });
-    }
-    const now = new Date().getTime();
-    const ts = Number.parseInt(timestamp);
-    if (now - ts > 300000) {
-        throw new ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
-            context: { error: "Timestamp is too old", code: 400 },
-        });
-    }
-    return { signature, timestamp };
-};
-export const verifySignature = (signature, timestamp, pair) => {
-    const u8Sig = hexToU8a(signature);
-    if (!pair.verify(timestamp, u8Sig, pair.publicKey)) {
-        throw new ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
-            context: {
-                error: "Signature verification failed",
-                code: 401,
-                account: pair.address,
-            },
-        });
-    }
-};
-//# sourceMappingURL=authMiddleware.js.map

package/dist/api/authMiddleware.js.map

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

package/dist/api/requestLoggerMiddleware.d.ts

@@ -1,4 +0,0 @@
-import type { ProviderEnvironment } from "@prosopo/env";
-import type { NextFunction, Request, Response } from "express";
-export declare function requestLoggerMiddleware(env: ProviderEnvironment): (req: Request, res: Response, next: NextFunction) => void;
-//# sourceMappingURL=requestLoggerMiddleware.d.ts.map

package/dist/api/requestLoggerMiddleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"requestLoggerMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,SAClD,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAavD"}

package/dist/api/requestLoggerMiddleware.js

@@ -1,12 +0,0 @@
-import { getLogger } from "@prosopo/common";
-import { v4 as uuidv4 } from "uuid";
-export function requestLoggerMiddleware(env) {
-    return (req, res, next) => {
-        const requestId = req.headers["x-request-id"] || `e-${uuidv4()}`;
-        const logger = getLogger(env.config.logLevel, "request-logger", requestId);
-        req.logger = logger;
-        req.requestId = requestId;
-        next();
-    };
-}
-//# sourceMappingURL=requestLoggerMiddleware.js.map

package/dist/api/requestLoggerMiddleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"requestLoggerMiddleware.js","sourceRoot":"","sources":["../../src/api/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,UAAU,uBAAuB,CAAC,GAAwB;IAC/D,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC1D,MAAM,SAAS,GACb,GAAG,CAAC,OAAO,CAAC,cAAc,CAAY,IAAI,KAAK,MAAM,EAAE,EAAE,CAAC;QAE5D,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAG3E,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;QACpB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;QAG1B,IAAI,EAAE,CAAC;IACR,CAAC,CAAC;AACH,CAAC"}

package/dist/cjs/api/authMiddleware.cjs

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const util = require("@polkadot/util");
-const common = require("@prosopo/common");
-const authMiddleware = (env) => {
-  return async (req, res, next) => {
-    try {
-      const { signature, timestamp } = extractHeaders(req);
-      let error;
-      if (env.authAccount) {
-        try {
-          verifySignature(signature, timestamp, env.authAccount);
-          next();
-          return;
-        } catch (e) {
-          req.logger.warn({
-            message: e.message,
-            code: e.code,
-            account: env.authAccount.address
-          });
-          error = e;
-        }
-      }
-      if (env.pair) {
-        verifySignature(signature, timestamp, env.pair);
-        next();
-        return;
-      }
-      res.status(401).json({
-        error: "Unauthorized",
-        message: new common.ProsopoEnvError(error || "CONTRACT.CANNOT_FIND_KEYPAIR")
-      });
-      return;
-    } catch (err) {
-      req.logger.error("Auth Middleware Error:", err);
-      res.status(401).json({ error: "Unauthorized", message: err });
-      return;
-    }
-  };
-};
-const extractHeaders = (req) => {
-  const signature = req.headers.signature;
-  const timestamp = req.headers.timestamp;
-  if (!timestamp) {
-    throw new common.ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
-      context: { error: "Missing timestamp", code: 400 }
-    });
-  }
-  if (!signature) {
-    throw new common.ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
-      context: { error: "Missing signature", code: 400 }
-    });
-  }
-  if (Array.isArray(signature) || Array.isArray(timestamp) || !util.isHex(signature)) {
-    throw new common.ProsopoApiError("CONTRACT.INVALID_DATA_FORMAT", {
-      context: { error: "Invalid header format", code: 400 }
-    });
-  }
-  const now = (/* @__PURE__ */ new Date()).getTime();
-  const ts = Number.parseInt(timestamp);
-  if (now - ts > 3e5) {
-    throw new common.ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
-      context: { error: "Timestamp is too old", code: 400 }
-    });
-  }
-  return { signature, timestamp };
-};
-const verifySignature = (signature, timestamp, pair) => {
-  const u8Sig = util.hexToU8a(signature);
-  if (!pair.verify(timestamp, u8Sig, pair.publicKey)) {
-    throw new common.ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
-      context: {
-        error: "Signature verification failed",
-        code: 401,
-        account: pair.address
-      }
-    });
-  }
-};
-exports.authMiddleware = authMiddleware;
-exports.verifySignature = verifySignature;

package/dist/cjs/api/requestLoggerMiddleware.cjs

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const common = require("@prosopo/common");
-const uuid = require("uuid");
-function requestLoggerMiddleware(env) {
-  return (req, res, next) => {
-    const requestId = req.headers["x-request-id"] || `e-${uuid.v4()}`;
-    const logger = common.getLogger(env.config.logLevel, "request-logger", requestId);
-    req.logger = logger;
-    req.requestId = requestId;
-    next();
-  };
-}
-exports.requestLoggerMiddleware = requestLoggerMiddleware;

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

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

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

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