@prosopo/api 1.0.1 → 2.0.0

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

@@ -1 +1 @@
-{"version":3,"file":"HttpClientBase.d.ts","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":"AAeA,qBAAa,cAAc;IACvB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEtB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAK;cAIxB,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;cAY5D,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;cAkBvE,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC;IASlE,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAQvD;AAED,eAAe,cAAc,CAAA"}
+{"version":3,"file":"HttpClientBase.d.ts","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":"AAeA,qBAAa,cAAc;IAC1B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEvB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAK;cAIxB,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;cAY5D,IAAI,CAAC,CAAC,EAAE,CAAC,EACxB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,CAAC,EACP,IAAI,CAAC,EAAE,WAAW,GAChB,OAAO,CAAC,CAAC,CAAC;cAqBG,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC;IASlE,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAQpD;AAED,eAAe,cAAc,CAAC"}

package/dist/api/HttpClientBase.js

@@ -1,6 +1,6 @@
-import { HttpError } from './HttpError.js';
+import { HttpError } from "./HttpError.js";
 export class HttpClientBase {
-    constructor(baseURL, prefix = '') {
+    constructor(baseURL, prefix = "") {
         this.baseURL = baseURL + prefix;
     }
     async fetch(input, init) {
@@ -16,10 +16,13 @@ export class HttpClientBase {
         }
     }
     async post(input, body, init) {
-        const headers = { 'Content-Type': 'application/json', ...(init?.headers || {}) };
+        const headers = {
+            "Content-Type": "application/json",
+            ...(init?.headers || {}),
+        };
         try {
             const response = await fetch(this.baseURL + input, {
-                method: 'POST',
+                method: "POST",
                 body: JSON.stringify(body),
                 headers,
                 ...init,
@@ -38,16 +41,16 @@ export class HttpClientBase {
             return await response.json();
         }
         catch (error) {
-            console.error('Error parsing JSON:', error);
+            console.error("Error parsing JSON:", error);
             throw error;
         }
     }
     errorHandler(error) {
         if (error instanceof HttpError) {
-            console.error('HTTP error:', error);
+            console.error("HTTP error:", error);
         }
         else {
-            console.error('API request error:', error);
+            console.error("API request error:", error);
         }
         return Promise.reject(error);
     }

package/dist/api/HttpClientBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpClientBase.js","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,OAAO,cAAc;IAGvB,YAAY,OAAe,EAAE,MAAM,GAAG,EAAE;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,GAAG,MAAM,CAAA;IACnC,CAAC;IAES,KAAK,CAAC,KAAK,CAAI,KAAkB,EAAE,IAAkB;QAC3D,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE,IAAI,CAAC,CAAA;YACxD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACd,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;aAC1E;YACD,OAAO,IAAI,CAAC,eAAe,CAAI,QAAQ,CAAC,CAAA;SAC3C;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,IAAI,CAAC,YAAY,CAAC,KAAc,CAAC,CAAA;SAC3C;IACL,CAAC;IAES,KAAK,CAAC,IAAI,CAAO,KAAkB,EAAE,IAAO,EAAE,IAAkB;QACtE,MAAM,OAAO,GAAG,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,CAAA;QAChF,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE;gBAC/C,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,OAAO;gBACP,GAAG,IAAI;aACV,CAAC,CAAA;YACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACd,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;aAC1E;YACD,OAAO,IAAI,CAAC,eAAe,CAAI,QAAQ,CAAC,CAAA;SAC3C;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,IAAI,CAAC,YAAY,CAAC,KAAc,CAAC,CAAA;SAC3C;IACL,CAAC;IAES,KAAK,CAAC,eAAe,CAAI,QAAkB;QACjD,IAAI;YACA,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;YAC3C,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAES,YAAY,CAAC,KAAY;QAC/B,IAAI,KAAK,YAAY,SAAS,EAAE;YAC5B,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;SACtC;aAAM;YACH,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;SAC7C;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;CACJ;AAED,eAAe,cAAc,CAAA"}
+{"version":3,"file":"HttpClientBase.js","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,OAAO,cAAc;IAG1B,YAAY,OAAe,EAAE,MAAM,GAAG,EAAE;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,KAAK,CAAI,KAAkB,EAAE,IAAkB;QAC9D,IAAI;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC;YACzD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACjB,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;aACxE;YACD,OAAO,IAAI,CAAC,eAAe,CAAI,QAAQ,CAAC,CAAC;SACzC;QAAC,OAAO,KAAK,EAAE;YACf,OAAO,IAAI,CAAC,YAAY,CAAC,KAAc,CAAC,CAAC;SACzC;IACF,CAAC;IAES,KAAK,CAAC,IAAI,CACnB,KAAkB,EAClB,IAAO,EACP,IAAkB;QAElB,MAAM,OAAO,GAAG;YACf,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC;SACxB,CAAC;QACF,IAAI;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE;gBAClD,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,OAAO;gBACP,GAAG,IAAI;aACP,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACjB,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;aACxE;YACD,OAAO,IAAI,CAAC,eAAe,CAAI,QAAQ,CAAC,CAAC;SACzC;QAAC,OAAO,KAAK,EAAE;YACf,OAAO,IAAI,CAAC,YAAY,CAAC,KAAc,CAAC,CAAC;SACzC;IACF,CAAC;IAES,KAAK,CAAC,eAAe,CAAI,QAAkB;QACpD,IAAI;YACH,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC7B;QAAC,OAAO,KAAK,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YAC5C,MAAM,KAAK,CAAC;SACZ;IACF,CAAC;IAES,YAAY,CAAC,KAAY;QAClC,IAAI,KAAK,YAAY,SAAS,EAAE;YAC/B,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SACpC;aAAM;YACN,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;SAC3C;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACD;AAED,eAAe,cAAc,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"HttpError.d.ts","sourceRoot":"","sources":["../../src/api/HttpError.ts"],"names":[],"mappings":"AAaA,qBAAa,SAAU,SAAQ,KAAK;IAErB,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,MAAM;IAClB,GAAG,EAAE,MAAM;gBAFX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM;CAKzB"}
+{"version":3,"file":"HttpError.d.ts","sourceRoot":"","sources":["../../src/api/HttpError.ts"],"names":[],"mappings":"AAaA,qBAAa,SAAU,SAAQ,KAAK;IAE3B,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,MAAM;IAClB,GAAG,EAAE,MAAM;gBAFX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM;CAKnB"}

package/dist/api/HttpError.js

@@ -4,7 +4,7 @@ export class HttpError extends Error {
         this.status = status;
         this.statusText = statusText;
         this.url = url;
-        this.name = 'HttpError';
+        this.name = "HttpError";
     }
 }
 //# sourceMappingURL=HttpError.js.map

package/dist/api/HttpError.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpError.js","sourceRoot":"","sources":["../../src/api/HttpError.ts"],"names":[],"mappings":"AAaA,MAAM,OAAO,SAAU,SAAQ,KAAK;IAChC,YACW,MAAc,EACd,UAAkB,EAClB,GAAW;QAElB,KAAK,CAAC,uBAAuB,MAAM,KAAK,UAAU,cAAc,GAAG,EAAE,CAAC,CAAA;QAJ/D,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAQ;QAClB,QAAG,GAAH,GAAG,CAAQ;QAGlB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAA;IAC3B,CAAC;CACJ"}
+{"version":3,"file":"HttpError.js","sourceRoot":"","sources":["../../src/api/HttpError.ts"],"names":[],"mappings":"AAaA,MAAM,OAAO,SAAU,SAAQ,KAAK;IACnC,YACQ,MAAc,EACd,UAAkB,EAClB,GAAW;QAElB,KAAK,CAAC,uBAAuB,MAAM,KAAK,UAAU,cAAc,GAAG,EAAE,CAAC,CAAC;QAJhE,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAQ;QAClB,QAAG,GAAH,GAAG,CAAQ;QAGlB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;IACzB,CAAC;CACD"}

package/dist/api/ProviderApi.d.ts

@@ -1,18 +1,16 @@
-import { AccountId } from '@prosopo/captcha-contract';
-import { CaptchaResponseBody, CaptchaSolution, CaptchaSolutionResponse, GetPowCaptchaResponse, ImageVerificationResponse, NetworkConfig, PowCaptchaSolutionResponse, ProcaptchaToken, ProviderRegistered, StoredEvents, VerificationResponse } from '@prosopo/types';
-import { Provider, RandomProvider } from '@prosopo/captcha-contract/types-returns';
-import HttpClientBase from './HttpClientBase.js';
+import { type CaptchaResponseBody, type CaptchaSolution, type CaptchaSolutionResponse, type GetPowCaptchaResponse, type ImageVerificationResponse, type NetworkConfig, type PowCaptchaSolutionResponse, type ProcaptchaToken, type Provider, type ProviderRegistered, type RandomProvider, type StoredEvents, type VerificationResponse } from "@prosopo/types";
+import HttpClientBase from "./HttpClientBase.js";
 export default class ProviderApi extends HttpClientBase implements ProviderApi {
     private network;
     private account;
-    constructor(network: NetworkConfig, providerUrl: string, account: AccountId);
-    getCaptchaChallenge(userAccount: AccountId, randomProvider: RandomProvider): Promise<CaptchaResponseBody>;
-    submitCaptchaSolution(captchas: CaptchaSolution[], requestHash: string, userAccount: AccountId, salt: string, signature?: string): Promise<CaptchaSolutionResponse>;
+    constructor(network: NetworkConfig, providerUrl: string, account: string);
+    getCaptchaChallenge(userAccount: string, randomProvider: RandomProvider): Promise<CaptchaResponseBody>;
+    submitCaptchaSolution(captchas: CaptchaSolution[], requestHash: string, userAccount: string, salt: string, timestamp: string, providerTimestampSignature: string, userRequestHashSignature: string): Promise<CaptchaSolutionResponse>;
     verifyDappUser(token: ProcaptchaToken, dappUserSignature: string, maxVerifiedTime?: number): Promise<ImageVerificationResponse>;
     verifyUser(token: ProcaptchaToken, dappUserSignature: string, maxVerifiedTime?: number): Promise<ImageVerificationResponse>;
-    getPowCaptchaChallenge(user: AccountId, dapp: AccountId): Promise<GetPowCaptchaResponse>;
-    submitPowCaptchaSolution(challenge: GetPowCaptchaResponse, userAccount: AccountId, dappAccount: AccountId, randomProvider: RandomProvider, nonce: number, timeout?: number): Promise<PowCaptchaSolutionResponse>;
-    submitUserEvents(events: StoredEvents, accountId: AccountId): Promise<unknown>;
+    getPowCaptchaChallenge(user: string, dapp: string): Promise<GetPowCaptchaResponse>;
+    submitPowCaptchaSolution(challenge: GetPowCaptchaResponse, userAccount: string, dappAccount: string, nonce: number, userTimestampSignature: string, timeout?: number): Promise<PowCaptchaSolutionResponse>;
+    submitUserEvents(events: StoredEvents, string: string): Promise<unknown>;
     getProviderStatus(): Promise<ProviderRegistered>;
     getProviderDetails(): Promise<Provider>;
     submitPowCaptchaVerify(token: string, signatureHex: string, recencyLimit: number): Promise<VerificationResponse>;

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

@@ -1 +1 @@
-{"version":3,"file":"ProviderApi.d.ts","sourceRoot":"","sources":["../../src/api/ProviderApi.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAGH,mBAAmB,EACnB,eAAe,EAGf,uBAAuB,EAEvB,qBAAqB,EACrB,yBAAyB,EACzB,aAAa,EACb,0BAA0B,EAC1B,eAAe,EACf,kBAAkB,EAElB,YAAY,EAEZ,oBAAoB,EAEvB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AAClF,OAAO,cAAc,MAAM,qBAAqB,CAAA;AAEhD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,cAAe,YAAW,WAAW;IAC1E,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,OAAO,CAAW;gBAEd,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS;IASpE,mBAAmB,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC;IASzG,qBAAqB,CACxB,QAAQ,EAAE,eAAe,EAAE,EAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,SAAS,EACtB,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,uBAAuB,CAAC;IAY5B,cAAc,CACjB,KAAK,EAAE,eAAe,EACtB,iBAAiB,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,yBAAyB,CAAC;IAY9B,UAAU,CACb,KAAK,EAAE,eAAe,EACtB,iBAAiB,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,yBAAyB,CAAC;IAU9B,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAQxF,wBAAwB,CAC3B,SAAS,EAAE,qBAAqB,EAChC,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,SAAS,EACtB,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,0BAA0B,CAAC;IAgB/B,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS;IAI3D,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIhD,kBAAkB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIvC,sBAAsB,CACzB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACrB,OAAO,CAAC,oBAAoB,CAAC;CAQnC"}
+{"version":3,"file":"ProviderApi.d.ts","sourceRoot":"","sources":["../../src/api/ProviderApi.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,eAAe,EAGpB,KAAK,uBAAuB,EAE5B,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAC/B,KAAK,eAAe,EACpB,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAEnB,KAAK,YAAY,EAEjB,KAAK,oBAAoB,EAE1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,cAAe,YAAW,WAAW;IAC5E,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IASjE,mBAAmB,CACxB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,mBAAmB,CAAC;IASxB,qBAAqB,CAC1B,QAAQ,EAAE,eAAe,EAAE,EAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,0BAA0B,EAAE,MAAM,EAClC,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,uBAAuB,CAAC;IAqB5B,cAAc,CACnB,KAAK,EAAE,eAAe,EACtB,iBAAiB,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,yBAAyB,CAAC;IAY9B,UAAU,CACf,KAAK,EAAE,eAAe,EACtB,iBAAiB,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,yBAAyB,CAAC;IAU9B,sBAAsB,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,qBAAqB,CAAC;IAQ1B,wBAAwB,CAC7B,SAAS,EAAE,qBAAqB,EAChC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,sBAAsB,EAAE,MAAM,EAC9B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,0BAA0B,CAAC;IAoB/B,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIrD,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIhD,kBAAkB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIvC,sBAAsB,CAC3B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,oBAAoB,CAAC;CAQjC"}

package/dist/api/ProviderApi.js

@@ -1,28 +1,36 @@
-import { ApiParams, ApiPaths, CaptchaSolutionBody, SubmitPowCaptchaSolutionBody, } from '@prosopo/types';
-import HttpClientBase from './HttpClientBase.js';
+import { ApiParams, ApiPaths, CaptchaSolutionBody, SubmitPowCaptchaSolutionBody, } from "@prosopo/types";
+import HttpClientBase from "./HttpClientBase.js";
 export default class ProviderApi extends HttpClientBase {
     constructor(network, providerUrl, account) {
-        if (!providerUrl.startsWith('http')) {
-            providerUrl = `https://${providerUrl}`;
-        }
-        super(providerUrl);
+        const providerUrlWithProtocol = !providerUrl.startsWith("http")
+            ? `https://${providerUrl}`
+            : providerUrl;
+        super(providerUrlWithProtocol);
         this.network = network;
         this.account = account;
     }
     getCaptchaChallenge(userAccount, randomProvider) {
         const { provider, blockNumber } = randomProvider;
         const dappAccount = this.account;
-        const url = `${ApiPaths.GetImageCaptchaChallenge}/${provider.datasetId}/${userAccount}/${dappAccount}/${blockNumber.toString().replace(/,/g, '')}`;
+        const url = `${ApiPaths.GetImageCaptchaChallenge}/${provider.datasetId}/${userAccount}/${dappAccount}/${blockNumber.toString().replace(/,/g, "")}`;
         return this.fetch(url);
     }
-    submitCaptchaSolution(captchas, requestHash, userAccount, salt, signature) {
+    submitCaptchaSolution(captchas, requestHash, userAccount, salt, timestamp, providerTimestampSignature, userRequestHashSignature) {
         const captchaSolutionBody = CaptchaSolutionBody.parse({
             captchas,
             requestHash,
             [ApiParams.user]: userAccount,
             [ApiParams.dapp]: this.account,
             salt,
-            signature,
+            [ApiParams.timestamp]: timestamp,
+            [ApiParams.signature]: {
+                [ApiParams.user]: {
+                    [ApiParams.requestHash]: userRequestHashSignature,
+                },
+                [ApiParams.provider]: {
+                    [ApiParams.timestamp]: providerTimestampSignature,
+                },
+            },
         });
         return this.post(ApiPaths.SubmitImageCaptchaSolution, captchaSolutionBody);
     }
@@ -51,22 +59,26 @@ export default class ProviderApi extends HttpClientBase {
         };
         return this.post(ApiPaths.GetPowCaptchaChallenge, body);
     }
-    submitPowCaptchaSolution(challenge, userAccount, dappAccount, randomProvider, nonce, timeout) {
-        const { blockNumber } = randomProvider;
+    submitPowCaptchaSolution(challenge, userAccount, dappAccount, nonce, userTimestampSignature, timeout) {
         const body = SubmitPowCaptchaSolutionBody.parse({
-            [ApiParams.blockNumber]: blockNumber,
             [ApiParams.challenge]: challenge.challenge,
             [ApiParams.difficulty]: challenge.difficulty,
-            [ApiParams.signature]: challenge.signature,
+            [ApiParams.timestamp]: challenge.timestamp,
             [ApiParams.user]: userAccount.toString(),
             [ApiParams.dapp]: dappAccount.toString(),
             [ApiParams.nonce]: nonce,
             [ApiParams.verifiedTimeout]: timeout,
+            [ApiParams.signature]: {
+                [ApiParams.provider]: challenge[ApiParams.signature][ApiParams.provider],
+                [ApiParams.user]: {
+                    [ApiParams.timestamp]: userTimestampSignature,
+                },
+            },
         });
         return this.post(ApiPaths.SubmitPowCaptchaSolution, body);
     }
-    submitUserEvents(events, accountId) {
-        return this.post(ApiPaths.SubmitUserEvents, { events, accountId });
+    submitUserEvents(events, string) {
+        return this.post(ApiPaths.SubmitUserEvents, { events, string });
     }
     getProviderStatus() {
         return this.fetch(ApiPaths.GetProviderStatus);

package/dist/api/ProviderApi.js.map

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

package/dist/api/index.d.ts

@@ -1,3 +1,3 @@
-export * from './HttpClientBase.js';
-export { default as ProviderApi } from './ProviderApi.js';
+export * from "./HttpClientBase.js";
+export { default as ProviderApi } from "./ProviderApi.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAaA,cAAc,qBAAqB,CAAA;AACnC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAaA,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/api/index.js

@@ -1,3 +1,3 @@
-export * from './HttpClientBase.js';
-export { default as ProviderApi } from './ProviderApi.js';
+export * from "./HttpClientBase.js";
+export { default as ProviderApi } from "./ProviderApi.js";
 //# sourceMappingURL=index.js.map

package/dist/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAaA,cAAc,qBAAqB,CAAA;AACnC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAaA,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/cjs/api/HttpClientBase.cjs

@@ -17,7 +17,10 @@ class HttpClientBase {
     }
   }
   async post(input, body, init) {
-    const headers = { "Content-Type": "application/json", ...init?.headers || {} };
+    const headers = {
+      "Content-Type": "application/json",
+      ...init?.headers || {}
+    };
     try {
       const response = await fetch(this.baseURL + input, {
         method: "POST",

package/dist/cjs/api/ProviderApi.cjs

@@ -3,10 +3,8 @@ const types = require("@prosopo/types");
 const HttpClientBase = require("./HttpClientBase.cjs");
 class ProviderApi extends HttpClientBase.HttpClientBase {
   constructor(network, providerUrl, account) {
-    if (!providerUrl.startsWith("http")) {
-      providerUrl = `https://${providerUrl}`;
-    }
-    super(providerUrl);
+    const providerUrlWithProtocol = !providerUrl.startsWith("http") ? `https://${providerUrl}` : providerUrl;
+    super(providerUrlWithProtocol);
     this.network = network;
     this.account = account;
   }
@@ -16,14 +14,22 @@ class ProviderApi extends HttpClientBase.HttpClientBase {
     const url = `${types.ApiPaths.GetImageCaptchaChallenge}/${provider.datasetId}/${userAccount}/${dappAccount}/${blockNumber.toString().replace(/,/g, "")}`;
     return this.fetch(url);
   }
-  submitCaptchaSolution(captchas, requestHash, userAccount, salt, signature) {
+  submitCaptchaSolution(captchas, requestHash, userAccount, salt, timestamp, providerTimestampSignature, userRequestHashSignature) {
     const captchaSolutionBody = types.CaptchaSolutionBody.parse({
       captchas,
       requestHash,
       [types.ApiParams.user]: userAccount,
       [types.ApiParams.dapp]: this.account,
       salt,
-      signature
+      [types.ApiParams.timestamp]: timestamp,
+      [types.ApiParams.signature]: {
+        [types.ApiParams.user]: {
+          [types.ApiParams.requestHash]: userRequestHashSignature
+        },
+        [types.ApiParams.provider]: {
+          [types.ApiParams.timestamp]: providerTimestampSignature
+        }
+      }
     });
     return this.post(types.ApiPaths.SubmitImageCaptchaSolution, captchaSolutionBody);
   }
@@ -52,23 +58,26 @@ class ProviderApi extends HttpClientBase.HttpClientBase {
     };
     return this.post(types.ApiPaths.GetPowCaptchaChallenge, body);
   }
-  submitPowCaptchaSolution(challenge, userAccount, dappAccount, randomProvider, nonce, timeout) {
-    const { blockNumber } = randomProvider;
+  submitPowCaptchaSolution(challenge, userAccount, dappAccount, nonce, userTimestampSignature, timeout) {
     const body = types.SubmitPowCaptchaSolutionBody.parse({
-      [types.ApiParams.blockNumber]: blockNumber,
       [types.ApiParams.challenge]: challenge.challenge,
       [types.ApiParams.difficulty]: challenge.difficulty,
-      [types.ApiParams.signature]: challenge.signature,
-      // TODO add utility to convert `AccountId` to string
+      [types.ApiParams.timestamp]: challenge.timestamp,
       [types.ApiParams.user]: userAccount.toString(),
       [types.ApiParams.dapp]: dappAccount.toString(),
       [types.ApiParams.nonce]: nonce,
-      [types.ApiParams.verifiedTimeout]: timeout
+      [types.ApiParams.verifiedTimeout]: timeout,
+      [types.ApiParams.signature]: {
+        [types.ApiParams.provider]: challenge[types.ApiParams.signature][types.ApiParams.provider],
+        [types.ApiParams.user]: {
+          [types.ApiParams.timestamp]: userTimestampSignature
+        }
+      }
     });
     return this.post(types.ApiPaths.SubmitPowCaptchaSolution, body);
   }
-  submitUserEvents(events, accountId) {
-    return this.post(types.ApiPaths.SubmitUserEvents, { events, accountId });
+  submitUserEvents(events, string) {
+    return this.post(types.ApiPaths.SubmitUserEvents, { events, string });
   }
   getProviderStatus() {
     return this.fetch(types.ApiPaths.GetProviderStatus);

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from './api/index.js';
+export * from "./api/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,gBAAgB,CAAC"}

package/dist/index.js

@@ -1,2 +1,2 @@
-export * from './api/index.js';
+export * from "./api/index.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,gBAAgB,CAAC"}

package/package.json

@@ -1,49 +1,42 @@
 {
-    "name": "@prosopo/api",
-    "version": "1.0.1",
-    "description": "Wrapper for the provider API",
-    "main": "dist/index.js",
-    "type": "module",
-    "engines": {
-        "node": ">=18",
-        "npm": ">=9"
-    },
-    "exports": {
-        ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/cjs/index.cjs"
-        }
-    },
-    "scripts": {
-        "test": "echo \"No test specified\"",
-        "clean": "tsc --build --clean",
-        "build": "tsc --build --verbose",
-        "build:cjs": "npx vite --config vite.cjs.config.ts build",
-        "eslint": "npx eslint . --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore --quiet",
-        "eslint:fix": "npm run eslint -- --fix",
-        "prettier": "npx prettier . --check --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
-        "prettier:fix": "npm run prettier -- --write",
-        "lint": "npm run eslint && npm run prettier",
-        "lint:fix": "npm run eslint:fix && npm run prettier:fix"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/prosopo/captcha.git"
-    },
-    "author": "PROSOPO LIMITED <info@prosopo.io>",
-    "license": "Apache-2.0",
-    "bugs": {
-        "url": "https://github.com/prosopo/captcha/issues"
-    },
-    "homepage": "https://github.com/prosopo/captcha#readme",
-    "dependencies": {
-        "@prosopo/types": "1.0.1"
-    },
-    "devDependencies": {
-        "@prosopo/captcha-contract": "1.0.1",
-        "@prosopo/config": "1.0.1",
-        "tslib": "2.6.2",
-        "typescript": "5.1.6"
-    },
-    "sideEffects": false
+	"name": "@prosopo/api",
+	"version": "2.0.0",
+	"description": "Wrapper for the provider API",
+	"main": "dist/index.js",
+	"type": "module",
+	"engines": {
+		"node": ">=20",
+		"npm": ">=9"
+	},
+	"exports": {
+		".": {
+			"import": "./dist/index.js",
+			"require": "./dist/cjs/index.cjs"
+		}
+	},
+	"scripts": {
+		"test": "echo \"No test specified\"",
+		"clean": "tsc --build --clean",
+		"build": "tsc --build --verbose",
+		"build:cjs": "npx vite --config vite.cjs.config.ts build"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/prosopo/captcha.git"
+	},
+	"author": "PROSOPO LIMITED <info@prosopo.io>",
+	"license": "Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/prosopo/captcha/issues"
+	},
+	"homepage": "https://github.com/prosopo/captcha#readme",
+	"dependencies": {
+		"@prosopo/types": "2.0.0"
+	},
+	"devDependencies": {
+		"@prosopo/config": "2.0.0",
+		"tslib": "2.6.2",
+		"typescript": "5.1.6"
+	},
+	"sideEffects": false
 }

package/vite.cjs.config.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 // Copyright 2021-2024 Prosopo (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,9 +12,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { ViteCommonJSConfig } from '@prosopo/config'
-import path from 'path'
+import { ViteCommonJSConfig } from "@prosopo/config";
 
 export default function () {
-    return ViteCommonJSConfig('api', path.resolve('./tsconfig.cjs.json'))
+	return ViteCommonJSConfig("api", path.resolve("./tsconfig.cjs.json"));
 }

package/typedoc.config.js

@@ -1,19 +0,0 @@
-// Copyright 2021-2024 Prosopo (UK) Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-export default {
-    entryPoints: ['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.js', 'src/**/*.jsx', 'src/**/*.json'],
-    includes: 'src',
-    extends: '../../typedoc.base.config.js',
-    readme: 'README.md',
-}