@prosopo/types 0.3.42 → 1.0.2

package/dist/api/api.d.ts

@@ -6,7 +6,8 @@ import { StoredEvents } from '../procaptcha/index.js';
 export interface ProviderApiInterface {
     getCaptchaChallenge(userAccount: AccountId, randomProvider: RandomProvider): Promise<CaptchaResponseBody>;
     submitCaptchaSolution(captchas: CaptchaSolution[], requestHash: string, userAccount: AccountId, salt: string, signature?: string): Promise<CaptchaSolutionResponse>;
-    verifyDappUser(dapp: AccountId, userAccount: AccountId, blockNumber: number, commitmentId?: string, maxVerifiedTime?: number): Promise<ImageVerificationResponse>;
+    verifyDappUser(dapp: AccountId, userAccount: AccountId, blockNumber: number, dappUserSignature: string, commitmentId?: string, maxVerifiedTime?: number): Promise<ImageVerificationResponse>;
+    verifyUser(dapp: AccountId, userAccount: AccountId, blockNumber: number, dappUserSignature: string, commitmentId?: string, maxVerifiedTime?: number): Promise<ImageVerificationResponse>;
     getPowCaptchaChallenge(userAccount: AccountId, dappAccount: AccountId): Promise<GetPowCaptchaResponse>;
     submitPowCaptchaSolution(challenge: GetPowCaptchaResponse, userAccount: AccountId, dappAccount: AccountId, randomProvider: RandomProvider, nonce: number): Promise<PowCaptchaSolutionResponse>;
     submitUserEvents(events: StoredEvents, accountId: AccountId): Promise<unknown>;

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

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api/api.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EACH,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,MAAM,WAAW,oBAAoB;IACjC,mBAAmB,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACzG,qBAAqB,CACjB,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,CAAA;IACnC,cAAc,CACV,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EACrB,eAAe,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,yBAAyB,CAAC,CAAA;IACrC,sBAAsB,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACtG,wBAAwB,CACpB,SAAS,EAAE,qBAAqB,EAChC,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,SAAS,EACtB,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,CAAC,CAAA;IACtC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC9E,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAChD,kBAAkB,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAA;CAC1C"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api/api.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EACH,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,MAAM,WAAW,oBAAoB;IACjC,mBAAmB,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACzG,qBAAqB,CACjB,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,CAAA;IACnC,cAAc,CACV,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,YAAY,CAAC,EAAE,MAAM,EACrB,eAAe,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,yBAAyB,CAAC,CAAA;IACrC,UAAU,CACN,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,YAAY,CAAC,EAAE,MAAM,EACrB,eAAe,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,yBAAyB,CAAC,CAAA;IACrC,sBAAsB,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACtG,wBAAwB,CACpB,SAAS,EAAE,qBAAqB,EAChC,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,SAAS,EACtB,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,CAAC,CAAA;IACtC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC9E,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAChD,kBAAkB,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAA;CAC1C"}

package/dist/api/index.d.ts

@@ -1,2 +1,3 @@
 export * from './api.js';
+export * from './params.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,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAaA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA"}

package/dist/api/index.js

@@ -1,2 +1,3 @@
 export * from './api.js';
+export * from './params.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,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAaA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA"}

package/dist/api/params.d.ts

@@ -0,0 +1,27 @@
+export declare enum ApiParams {
+    datasetId = "datasetId",
+    user = "user",
+    dapp = "dapp",
+    provider = "provider",
+    blockNumber = "blockNumber",
+    signature = "signature",
+    requestHash = "requestHash",
+    captchas = "captchas",
+    commitmentId = "commitmentId",
+    proof = "proof",
+    dappSignature = "dappSignature",
+    dappUserSignature = "dappUserSignature",
+    providerUrl = "providerUrl",
+    procaptchaResponse = "procaptcha-response",
+    verifiedTimeout = "verifiedTimeout",
+    maxVerifiedTime = "maxVerifiedTime",
+    verified = "verified",
+    status = "status",
+    challenge = "challenge",
+    difficulty = "difficulty",
+    nonce = "nonce",
+    timeouts = "timeouts",
+    token = "token",
+    secret = "secret"
+}
+//# sourceMappingURL=params.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/api/params.ts"],"names":[],"mappings":"AAaA,oBAAY,SAAS;IACjB,SAAS,cAAc;IACvB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,aAAa,kBAAkB;IAC/B,iBAAiB,sBAAsB;IACvC,WAAW,gBAAgB;IAC3B,kBAAkB,wBAAwB;IAC1C,eAAe,oBAAoB;IACnC,eAAe,oBAAoB;IACnC,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,MAAM,WAAW;CACpB"}

package/dist/api/params.js

@@ -0,0 +1,28 @@
+export var ApiParams;
+(function (ApiParams) {
+    ApiParams["datasetId"] = "datasetId";
+    ApiParams["user"] = "user";
+    ApiParams["dapp"] = "dapp";
+    ApiParams["provider"] = "provider";
+    ApiParams["blockNumber"] = "blockNumber";
+    ApiParams["signature"] = "signature";
+    ApiParams["requestHash"] = "requestHash";
+    ApiParams["captchas"] = "captchas";
+    ApiParams["commitmentId"] = "commitmentId";
+    ApiParams["proof"] = "proof";
+    ApiParams["dappSignature"] = "dappSignature";
+    ApiParams["dappUserSignature"] = "dappUserSignature";
+    ApiParams["providerUrl"] = "providerUrl";
+    ApiParams["procaptchaResponse"] = "procaptcha-response";
+    ApiParams["verifiedTimeout"] = "verifiedTimeout";
+    ApiParams["maxVerifiedTime"] = "maxVerifiedTime";
+    ApiParams["verified"] = "verified";
+    ApiParams["status"] = "status";
+    ApiParams["challenge"] = "challenge";
+    ApiParams["difficulty"] = "difficulty";
+    ApiParams["nonce"] = "nonce";
+    ApiParams["timeouts"] = "timeouts";
+    ApiParams["token"] = "token";
+    ApiParams["secret"] = "secret";
+})(ApiParams || (ApiParams = {}));
+//# sourceMappingURL=params.js.map

package/dist/api/params.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/api/params.ts"],"names":[],"mappings":"AAaA,MAAM,CAAN,IAAY,SAyBX;AAzBD,WAAY,SAAS;IACjB,oCAAuB,CAAA;IACvB,0BAAa,CAAA;IACb,0BAAa,CAAA;IACb,kCAAqB,CAAA;IACrB,wCAA2B,CAAA;IAC3B,oCAAuB,CAAA;IACvB,wCAA2B,CAAA;IAC3B,kCAAqB,CAAA;IACrB,0CAA6B,CAAA;IAC7B,4BAAe,CAAA;IACf,4CAA+B,CAAA;IAC/B,oDAAuC,CAAA;IACvC,wCAA2B,CAAA;IAC3B,uDAA0C,CAAA;IAC1C,gDAAmC,CAAA;IACnC,gDAAmC,CAAA;IACnC,kCAAqB,CAAA;IACrB,8BAAiB,CAAA;IACjB,oCAAuB,CAAA;IACvB,sCAAyB,CAAA;IACzB,4BAAe,CAAA;IACf,kCAAqB,CAAA;IACrB,4BAAe,CAAA;IACf,8BAAiB,CAAA;AACrB,CAAC,EAzBW,SAAS,KAAT,SAAS,QAyBpB"}

package/dist/cjs/api/index.cjs

@@ -1,2 +1,5 @@
 "use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./api.cjs");
+const params = require("./params.cjs");
+exports.ApiParams = params.ApiParams;

package/dist/cjs/api/params.cjs

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+var ApiParams = /* @__PURE__ */ ((ApiParams2) => {
+  ApiParams2["datasetId"] = "datasetId";
+  ApiParams2["user"] = "user";
+  ApiParams2["dapp"] = "dapp";
+  ApiParams2["provider"] = "provider";
+  ApiParams2["blockNumber"] = "blockNumber";
+  ApiParams2["signature"] = "signature";
+  ApiParams2["requestHash"] = "requestHash";
+  ApiParams2["captchas"] = "captchas";
+  ApiParams2["commitmentId"] = "commitmentId";
+  ApiParams2["proof"] = "proof";
+  ApiParams2["dappSignature"] = "dappSignature";
+  ApiParams2["dappUserSignature"] = "dappUserSignature";
+  ApiParams2["providerUrl"] = "providerUrl";
+  ApiParams2["procaptchaResponse"] = "procaptcha-response";
+  ApiParams2["verifiedTimeout"] = "verifiedTimeout";
+  ApiParams2["maxVerifiedTime"] = "maxVerifiedTime";
+  ApiParams2["verified"] = "verified";
+  ApiParams2["status"] = "status";
+  ApiParams2["challenge"] = "challenge";
+  ApiParams2["difficulty"] = "difficulty";
+  ApiParams2["nonce"] = "nonce";
+  ApiParams2["timeouts"] = "timeouts";
+  ApiParams2["token"] = "token";
+  ApiParams2["secret"] = "secret";
+  return ApiParams2;
+})(ApiParams || {});
+exports.ApiParams = ApiParams;

package/dist/cjs/config/config.cjs

@@ -165,7 +165,8 @@ const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
       maxBatchExtrinsicPercentage: 59
     }),
     server: ProsopoImageServerConfigSchema,
-    mongoEventsUri: z.string().optional()
+    mongoEventsUri: z.string().optional(),
+    mongoCaptchaUri: z.string().optional()
   })
 );
 exports.AccountCreatorConfigSchema = AccountCreatorConfigSchema;

package/dist/cjs/index.cjs

@@ -8,6 +8,7 @@ require("./provider/index.cjs");
 require("./procaptcha/index.cjs");
 const index$1 = require("./procaptcha-bundle/index.cjs");
 const index = require("./networks/index.cjs");
+const params = require("./api/params.cjs");
 const config = require("./config/config.cjs");
 const network = require("./config/network.cjs");
 const artifacts = require("./contract/artifacts.cjs");
@@ -18,8 +19,10 @@ const scheduler = require("./provider/scheduler.cjs");
 const argv = require("./provider/argv.cjs");
 const manager = require("./procaptcha/manager.cjs");
 const storage = require("./procaptcha/storage.cjs");
+const token = require("./procaptcha/token.cjs");
 exports.FeaturesEnum = index$1.FeaturesEnum;
 exports.networks = index;
+exports.ApiParams = params.ApiParams;
 exports.AccountCreatorConfigSchema = config.AccountCreatorConfigSchema;
 exports.BatchCommitConfigSchema = config.BatchCommitConfigSchema;
 exports.CaptchaTimeoutSchema = config.CaptchaTimeoutSchema;
@@ -87,7 +90,6 @@ exports.DatasetWithIdsAndTreeSchema = dataset.DatasetWithIdsAndTreeSchema;
 exports.DatasetWithIdsSchema = dataset.DatasetWithIdsSchema;
 exports.DatasetWithNumericSolutionSchema = dataset.DatasetWithNumericSolutionSchema;
 exports.AdminApiPaths = api.AdminApiPaths;
-exports.ApiParams = api.ApiParams;
 exports.ApiPaths = api.ApiPaths;
 exports.CaptchaRequestBody = api.CaptchaRequestBody;
 exports.CaptchaSolutionBody = api.CaptchaSolutionBody;
@@ -98,6 +100,10 @@ exports.VerifySolutionBody = api.VerifySolutionBody;
 exports.ScheduledTaskNames = scheduler.ScheduledTaskNames;
 exports.ScheduledTaskStatus = scheduler.ScheduledTaskStatus;
 exports.PayeeSchema = argv.PayeeSchema;
-exports.ProcaptchaOutputSchema = manager.ProcaptchaOutputSchema;
 exports.ProcaptchaResponse = manager.ProcaptchaResponse;
 exports.ProsopoLocalStorageSchema = storage.ProsopoLocalStorageSchema;
+exports.ProcaptchaOutputSchema = token.ProcaptchaOutputSchema;
+exports.ProcaptchaTokenCodec = token.ProcaptchaTokenCodec;
+exports.ProcaptchaTokenSpec = token.ProcaptchaTokenSpec;
+exports.decodeProcaptchaOutput = token.decodeProcaptchaOutput;
+exports.encodeProcaptchaOutput = token.encodeProcaptchaOutput;

package/dist/cjs/procaptcha/index.cjs

@@ -6,7 +6,12 @@ require("./collector.cjs");
 const manager = require("./manager.cjs");
 require("./props.cjs");
 const storage = require("./storage.cjs");
+const token = require("./token.cjs");
 require("./utils.cjs");
-exports.ProcaptchaOutputSchema = manager.ProcaptchaOutputSchema;
 exports.ProcaptchaResponse = manager.ProcaptchaResponse;
 exports.ProsopoLocalStorageSchema = storage.ProsopoLocalStorageSchema;
+exports.ProcaptchaOutputSchema = token.ProcaptchaOutputSchema;
+exports.ProcaptchaTokenCodec = token.ProcaptchaTokenCodec;
+exports.ProcaptchaTokenSpec = token.ProcaptchaTokenSpec;
+exports.decodeProcaptchaOutput = token.decodeProcaptchaOutput;
+exports.encodeProcaptchaOutput = token.encodeProcaptchaOutput;

package/dist/cjs/procaptcha/manager.cjs

@@ -1,18 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../provider/index.cjs");
+require("../api/index.cjs");
+const token = require("./token.cjs");
 const z = require("zod");
-const api = require("../provider/api.cjs");
-const ProcaptchaOutputSchema = z.object({
-  [api.ApiParams.commitmentId]: z.string().optional(),
-  [api.ApiParams.providerUrl]: z.string().optional(),
-  [api.ApiParams.dapp]: z.string(),
-  [api.ApiParams.user]: z.string(),
-  [api.ApiParams.blockNumber]: z.number().optional(),
-  [api.ApiParams.challenge]: z.string().optional()
-});
+const params = require("../api/params.cjs");
 const ProcaptchaResponse = z.object({
-  [api.ApiParams.procaptchaResponse]: ProcaptchaOutputSchema
+  [params.ApiParams.procaptchaResponse]: token.ProcaptchaTokenSpec
 });
-exports.ProcaptchaOutputSchema = ProcaptchaOutputSchema;
 exports.ProcaptchaResponse = ProcaptchaResponse;

package/dist/cjs/procaptcha/token.cjs

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const params = require("../api/params.cjs");
+const scaleTs = require("scale-ts");
+const util = require("@polkadot/util");
+const z = require("zod");
+const ProcaptchaOutputSchema = z.object({
+  [params.ApiParams.commitmentId]: z.string().optional(),
+  [params.ApiParams.providerUrl]: z.string().optional(),
+  [params.ApiParams.dapp]: z.string(),
+  [params.ApiParams.user]: z.string(),
+  [params.ApiParams.blockNumber]: z.number(),
+  [params.ApiParams.challenge]: z.string().optional(),
+  [params.ApiParams.nonce]: z.number().optional()
+});
+const ProcaptchaTokenCodec = scaleTs.Struct({
+  [params.ApiParams.commitmentId]: scaleTs.Option(scaleTs.str),
+  [params.ApiParams.providerUrl]: scaleTs.Option(scaleTs.str),
+  [params.ApiParams.dapp]: scaleTs.str,
+  [params.ApiParams.user]: scaleTs.str,
+  [params.ApiParams.blockNumber]: scaleTs.u32,
+  [params.ApiParams.challenge]: scaleTs.Option(scaleTs.str),
+  [params.ApiParams.nonce]: scaleTs.Option(scaleTs.u32)
+});
+const ProcaptchaTokenSpec = z.string().startsWith("0x");
+const encodeProcaptchaOutput = (procaptchaOutput) => {
+  return util.u8aToHex(
+    ProcaptchaTokenCodec.enc({
+      [params.ApiParams.commitmentId]: void 0,
+      [params.ApiParams.providerUrl]: void 0,
+      [params.ApiParams.challenge]: void 0,
+      [params.ApiParams.nonce]: void 0,
+      // override any optional fields by spreading the procaptchaOutput
+      ...procaptchaOutput
+    })
+  );
+};
+const decodeProcaptchaOutput = (procaptchaToken) => {
+  return ProcaptchaOutputSchema.parse(ProcaptchaTokenCodec.dec(util.hexToU8a(procaptchaToken)));
+};
+exports.ProcaptchaOutputSchema = ProcaptchaOutputSchema;
+exports.ProcaptchaTokenCodec = ProcaptchaTokenCodec;
+exports.ProcaptchaTokenSpec = ProcaptchaTokenSpec;
+exports.decodeProcaptchaOutput = decodeProcaptchaOutput;
+exports.encodeProcaptchaOutput = encodeProcaptchaOutput;

package/dist/cjs/provider/api.cjs

@@ -1,17 +1,21 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const params = require("../api/params.cjs");
 require("../datasets/index.cjs");
 require("../config/index.cjs");
+require("../procaptcha/index.cjs");
 const z = require("zod");
 const captcha = require("../datasets/captcha.cjs");
+const token = require("../procaptcha/token.cjs");
 const config = require("../config/config.cjs");
-var ApiPaths = /* @__PURE__ */ ((ApiPaths2) => {
-  ApiPaths2["GetCaptchaChallenge"] = "/v1/prosopo/provider/captcha";
+var ApiPaths = ((ApiPaths2) => {
+  ApiPaths2["GetImageCaptchaChallenge"] = "/v1/prosopo/provider/captcha/image";
   ApiPaths2["GetPowCaptchaChallenge"] = "/v1/prosopo/provider/captcha/pow";
-  ApiPaths2["SubmitCaptchaSolution"] = "/v1/prosopo/provider/solution";
+  ApiPaths2["SubmitImageCaptchaSolution"] = "/v1/prosopo/provider/solution";
   ApiPaths2["SubmitPowCaptchaSolution"] = "/v1/prosopo/provider/pow/solution";
-  ApiPaths2["ServerPowCaptchaVerify"] = "/v1/prosopo/provider/pow/server-verify";
-  ApiPaths2["VerifyCaptchaSolution"] = "/v1/prosopo/provider/verify";
+  ApiPaths2["VerifyPowCaptchaSolution"] = "/v1/prosopo/provider/pow/verify";
+  ApiPaths2["VerifyImageCaptchaSolutionDapp"] = `/v1/prosopo/provider/image/${params.ApiParams.dapp}/verify`;
+  ApiPaths2["VerifyImageCaptchaSolutionUser"] = `/v1/prosopo/provider/image/${params.ApiParams.user}/verify`;
   ApiPaths2["GetProviderStatus"] = "/v1/prosopo/provider/status";
   ApiPaths2["GetProviderDetails"] = "/v1/prosopo/provider/details";
   ApiPaths2["SubmitUserEvents"] = "/v1/prosopo/provider/events";
@@ -24,151 +28,45 @@ var AdminApiPaths = /* @__PURE__ */ ((AdminApiPaths2) => {
   AdminApiPaths2["ProviderUpdate"] = "/v1/prosopo/provider/admin/update";
   return AdminApiPaths2;
 })(AdminApiPaths || {});
-var ApiParams = /* @__PURE__ */ ((ApiParams2) => {
-  ApiParams2["datasetId"] = "datasetId";
-  ApiParams2["user"] = "user";
-  ApiParams2["dapp"] = "dapp";
-  ApiParams2["provider"] = "provider";
-  ApiParams2["blockNumber"] = "blockNumber";
-  ApiParams2["signature"] = "signature";
-  ApiParams2["requestHash"] = "requestHash";
-  ApiParams2["captchas"] = "captchas";
-  ApiParams2["commitmentId"] = "commitmentId";
-  ApiParams2["proof"] = "proof";
-  ApiParams2["providerUrl"] = "providerUrl";
-  ApiParams2["procaptchaResponse"] = "procaptcha-response";
-  ApiParams2["verifiedTimeout"] = "verifiedTimeout";
-  ApiParams2["maxVerifiedTime"] = "maxVerifiedTime";
-  ApiParams2["verified"] = "verified";
-  ApiParams2["status"] = "status";
-  ApiParams2["challenge"] = "challenge";
-  ApiParams2["difficulty"] = "difficulty";
-  ApiParams2["nonce"] = "nonce";
-  return ApiParams2;
-})(ApiParams || {});
 const CaptchaRequestBody = z.object({
-  [
-    "user"
-    /* user */
-  ]: z.string(),
-  [
-    "dapp"
-    /* dapp */
-  ]: z.string(),
-  [
-    "datasetId"
-    /* datasetId */
-  ]: z.string(),
-  [
-    "blockNumber"
-    /* blockNumber */
-  ]: z.string()
+  [params.ApiParams.user]: z.string(),
+  [params.ApiParams.dapp]: z.string(),
+  [params.ApiParams.datasetId]: z.string(),
+  [params.ApiParams.blockNumber]: z.string()
 });
 const CaptchaSolutionBody = z.object({
-  [
-    "user"
-    /* user */
-  ]: z.string(),
-  [
-    "dapp"
-    /* dapp */
-  ]: z.string(),
-  [
-    "captchas"
-    /* captchas */
-  ]: z.array(captcha.CaptchaSolutionSchema),
-  [
-    "requestHash"
-    /* requestHash */
-  ]: z.string(),
-  [
-    "signature"
-    /* signature */
-  ]: z.string()
+  [params.ApiParams.user]: z.string(),
+  [params.ApiParams.dapp]: z.string(),
+  [params.ApiParams.captchas]: z.array(captcha.CaptchaSolutionSchema),
+  [params.ApiParams.requestHash]: z.string(),
+  [params.ApiParams.signature]: z.string()
   // the signature to prove account ownership
 });
 const VerifySolutionBody = z.object({
-  [
-    "dapp"
-    /* dapp */
-  ]: z.string(),
-  [
-    "user"
-    /* user */
-  ]: z.string(),
-  [
-    "blockNumber"
-    /* blockNumber */
-  ]: z.number(),
-  [
-    "commitmentId"
-    /* commitmentId */
-  ]: z.string().optional(),
-  [
-    "maxVerifiedTime"
-    /* maxVerifiedTime */
-  ]: z.number().optional().default(config.DEFAULT_IMAGE_MAX_VERIFIED_TIME_CACHED)
+  [params.ApiParams.token]: token.ProcaptchaTokenSpec,
+  [params.ApiParams.dappUserSignature]: z.string(),
+  [params.ApiParams.maxVerifiedTime]: z.number().optional().default(config.DEFAULT_IMAGE_MAX_VERIFIED_TIME_CACHED)
 });
 const ServerPowCaptchaVerifyRequestBody = z.object({
-  [
-    "challenge"
-    /* challenge */
-  ]: z.string(),
-  [
-    "dapp"
-    /* dapp */
-  ]: z.string(),
-  [
-    "verifiedTimeout"
-    /* verifiedTimeout */
-  ]: z.number().optional().default(config.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT)
+  [params.ApiParams.token]: token.ProcaptchaTokenSpec,
+  [params.ApiParams.dappSignature]: z.string(),
+  [params.ApiParams.verifiedTimeout]: z.number().optional().default(config.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT)
 });
 const GetPowCaptchaChallengeRequestBody = z.object({
-  [
-    "user"
-    /* user */
-  ]: z.string(),
-  [
-    "dapp"
-    /* dapp */
-  ]: z.string()
+  [params.ApiParams.user]: z.string(),
+  [params.ApiParams.dapp]: z.string()
 });
 const SubmitPowCaptchaSolutionBody = z.object({
-  [
-    "blockNumber"
-    /* blockNumber */
-  ]: z.number(),
-  [
-    "challenge"
-    /* challenge */
-  ]: z.string(),
-  [
-    "difficulty"
-    /* difficulty */
-  ]: z.number(),
-  [
-    "signature"
-    /* signature */
-  ]: z.string(),
-  [
-    "user"
-    /* user */
-  ]: z.string(),
-  [
-    "dapp"
-    /* dapp */
-  ]: z.string(),
-  [
-    "nonce"
-    /* nonce */
-  ]: z.number(),
-  [
-    "verifiedTimeout"
-    /* verifiedTimeout */
-  ]: z.number().optional().default(config.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT)
+  [params.ApiParams.blockNumber]: z.number(),
+  [params.ApiParams.challenge]: z.string(),
+  [params.ApiParams.difficulty]: z.number(),
+  [params.ApiParams.signature]: z.string(),
+  [params.ApiParams.user]: z.string(),
+  [params.ApiParams.dapp]: z.string(),
+  [params.ApiParams.nonce]: z.number(),
+  [params.ApiParams.verifiedTimeout]: z.number().optional().default(config.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT)
 });
 exports.AdminApiPaths = AdminApiPaths;
-exports.ApiParams = ApiParams;
 exports.ApiPaths = ApiPaths;
 exports.CaptchaRequestBody = CaptchaRequestBody;
 exports.CaptchaSolutionBody = CaptchaSolutionBody;

package/dist/cjs/provider/index.cjs

@@ -5,7 +5,6 @@ const api = require("./api.cjs");
 const scheduler = require("./scheduler.cjs");
 const argv = require("./argv.cjs");
 exports.AdminApiPaths = api.AdminApiPaths;
-exports.ApiParams = api.ApiParams;
 exports.ApiPaths = api.ApiPaths;
 exports.CaptchaRequestBody = api.CaptchaRequestBody;
 exports.CaptchaSolutionBody = api.CaptchaSolutionBody;