@prosopo/types 0.3.41 → 1.0.1

package/dist/procaptcha/token.js

@@ -0,0 +1,36 @@
+import { ApiParams } from '../api/params.js';
+import { Option, Struct, str, u32 } from 'scale-ts';
+import { hexToU8a, u8aToHex } from '@polkadot/util';
+import { number, object, string } from 'zod';
+export const ProcaptchaOutputSchema = object({
+    [ApiParams.commitmentId]: string().optional(),
+    [ApiParams.providerUrl]: string().optional(),
+    [ApiParams.dapp]: string(),
+    [ApiParams.user]: string(),
+    [ApiParams.blockNumber]: number(),
+    [ApiParams.challenge]: string().optional(),
+    [ApiParams.nonce]: number().optional(),
+});
+export const ProcaptchaTokenCodec = Struct({
+    [ApiParams.commitmentId]: Option(str),
+    [ApiParams.providerUrl]: Option(str),
+    [ApiParams.dapp]: str,
+    [ApiParams.user]: str,
+    [ApiParams.blockNumber]: u32,
+    [ApiParams.challenge]: Option(str),
+    [ApiParams.nonce]: Option(u32),
+});
+export const ProcaptchaTokenSpec = string().startsWith('0x');
+export const encodeProcaptchaOutput = (procaptchaOutput) => {
+    return u8aToHex(ProcaptchaTokenCodec.enc({
+        [ApiParams.commitmentId]: undefined,
+        [ApiParams.providerUrl]: undefined,
+        [ApiParams.challenge]: undefined,
+        [ApiParams.nonce]: undefined,
+        ...procaptchaOutput,
+    }));
+};
+export const decodeProcaptchaOutput = (procaptchaToken) => {
+    return ProcaptchaOutputSchema.parse(ProcaptchaTokenCodec.dec(hexToU8a(procaptchaToken)));
+};
+//# sourceMappingURL=token.js.map

package/dist/procaptcha/token.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/procaptcha/token.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAmB,MAAM,KAAK,CAAA;AAE7D,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC;IACzC,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7C,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5C,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;IACjC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1C,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAA;AAYF,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC;IACvC,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC;IACrC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC;IACpC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG;IACrB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG;IACrB,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG;IAC5B,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC;IAClC,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC;CACjC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;AAG5D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,gBAAkC,EAAmB,EAAE;IAC1F,OAAO,QAAQ,CACX,oBAAoB,CAAC,GAAG,CAAC;QACrB,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,SAAS;QACnC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,SAAS;QAClC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS;QAChC,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS;QAE5B,GAAG,gBAAgB;KACtB,CAAC,CACL,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,eAAgC,EAAoB,EAAE;IACzF,OAAO,sBAAsB,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;AAC5F,CAAC,CAAA"}

package/dist/provider/accounts.d.ts

@@ -10,14 +10,14 @@ export interface IProviderAccount extends IUserAccount {
     url: string;
     fee: number;
     datasetFile: string;
-    stake: number | BN;
+    stake: BN;
     payee: Payee.dapp;
     captchaDatasetId: string;
     pair?: KeyringPair;
 }
 export interface IDappAccount {
     secret: string;
-    fundAmount: number | BN;
+    fundAmount: BN;
     pair?: KeyringPair;
 }
 //# sourceMappingURL=accounts.d.ts.map

package/dist/provider/accounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/provider/accounts.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAA;AAEjE,MAAM,WAAW,YAAY;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IAClD,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,GAAG,EAAE,CAAA;IAClB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,IAAI,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,MAAM,WAAW,YAAY;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,GAAG,EAAE,CAAA;IACvB,IAAI,CAAC,EAAE,WAAW,CAAA;CACrB"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/provider/accounts.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAA;AAEjE,MAAM,WAAW,YAAY;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IAClD,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,EAAE,CAAA;IACT,KAAK,EAAE,KAAK,CAAC,IAAI,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,IAAI,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,MAAM,WAAW,YAAY;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,EAAE,CAAA;IACd,IAAI,CAAC,EAAE,WAAW,CAAA;CACrB"}

package/dist/provider/api.d.ts

@@ -1,13 +1,15 @@
+import { ApiParams } from '../api/params.js';
 import { CaptchaWithProof } from '../datasets/index.js';
 import { Hash, Provider } from '@prosopo/captcha-contract/types-returns';
-import { infer as zInfer } from 'zod';
+import { input, output, infer as zInfer } from 'zod';
 export declare enum ApiPaths {
-    GetCaptchaChallenge = "/v1/prosopo/provider/captcha",
+    GetImageCaptchaChallenge = "/v1/prosopo/provider/captcha/image",
     GetPowCaptchaChallenge = "/v1/prosopo/provider/captcha/pow",
-    SubmitCaptchaSolution = "/v1/prosopo/provider/solution",
+    SubmitImageCaptchaSolution = "/v1/prosopo/provider/solution",
     SubmitPowCaptchaSolution = "/v1/prosopo/provider/pow/solution",
-    ServerPowCaptchaVerify = "/v1/prosopo/provider/pow/server-verify",
-    VerifyCaptchaSolution = "/v1/prosopo/provider/verify",
+    VerifyPowCaptchaSolution = "/v1/prosopo/provider/pow/verify",
+    VerifyImageCaptchaSolutionDapp = "/v1/prosopo/provider/image/dapp/verify",
+    VerifyImageCaptchaSolutionUser = "/v1/prosopo/provider/image/user/verify",
     GetProviderStatus = "/v1/prosopo/provider/status",
     GetProviderDetails = "/v1/prosopo/provider/details",
     SubmitUserEvents = "/v1/prosopo/provider/events"
@@ -18,27 +20,6 @@ export declare enum AdminApiPaths {
     ProviderDeregister = "/v1/prosopo/provider/admin/deregister",
     ProviderUpdate = "/v1/prosopo/provider/admin/update"
 }
-export declare enum ApiParams {
-    datasetId = "datasetId",
-    user = "user",
-    dapp = "dapp",
-    provider = "provider",
-    blockNumber = "blockNumber",
-    signature = "signature",
-    requestHash = "requestHash",
-    captchas = "captchas",
-    commitmentId = "commitmentId",
-    proof = "proof",
-    providerUrl = "providerUrl",
-    procaptchaResponse = "procaptcha-response",
-    verifiedTimeout = "verifiedTimeout",
-    maxVerifiedTime = "maxVerifiedTime",
-    verified = "verified",
-    status = "status",
-    challenge = "challenge",
-    difficulty = "difficulty",
-    nonce = "nonce"
-}
 export interface DappUserSolutionResult {
     [ApiParams.captchas]: CaptchaIdAndProof[];
     partialFee?: string;
@@ -118,25 +99,20 @@ export declare const CaptchaSolutionBody: import("zod").ZodObject<{
 }>;
 export type CaptchaSolutionBodyType = zInfer<typeof CaptchaSolutionBody>;
 export declare const VerifySolutionBody: import("zod").ZodObject<{
-    dapp: import("zod").ZodString;
-    user: import("zod").ZodString;
-    blockNumber: import("zod").ZodNumber;
-    commitmentId: import("zod").ZodOptional<import("zod").ZodString>;
+    token: import("zod").ZodString;
+    dappUserSignature: import("zod").ZodString;
     maxVerifiedTime: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodNumber>>;
 }, "strip", import("zod").ZodTypeAny, {
-    user: string;
-    dapp: string;
-    blockNumber: number;
+    dappUserSignature: string;
     maxVerifiedTime: number;
-    commitmentId?: string | undefined;
+    token: string;
 }, {
-    user: string;
-    dapp: string;
-    blockNumber: number;
-    commitmentId?: string | undefined;
+    dappUserSignature: string;
+    token: string;
     maxVerifiedTime?: number | undefined;
 }>;
-export type VerifySolutionBodyType = zInfer<typeof VerifySolutionBody>;
+export type VerifySolutionBodyTypeInput = input<typeof VerifySolutionBody>;
+export type VerifySolutionBodyTypeOutput = output<typeof VerifySolutionBody>;
 export interface PendingCaptchaRequest {
     accountId: string;
     pending: boolean;
@@ -169,16 +145,16 @@ export interface PowCaptchaSolutionResponse {
     [ApiParams.verified]: boolean;
 }
 export declare const ServerPowCaptchaVerifyRequestBody: import("zod").ZodObject<{
-    challenge: import("zod").ZodString;
-    dapp: import("zod").ZodString;
+    token: import("zod").ZodString;
+    dappSignature: import("zod").ZodString;
     verifiedTimeout: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodNumber>>;
 }, "strip", import("zod").ZodTypeAny, {
-    dapp: string;
+    dappSignature: string;
     verifiedTimeout: number;
-    challenge: string;
+    token: string;
 }, {
-    dapp: string;
-    challenge: string;
+    dappSignature: string;
+    token: string;
     verifiedTimeout?: number | undefined;
 }>;
 export declare const GetPowCaptchaChallengeRequestBody: import("zod").ZodObject<{

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

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

package/dist/provider/api.js

@@ -1,14 +1,17 @@
+import { ApiParams } from '../api/params.js';
 import { CaptchaSolutionSchema } from '../datasets/index.js';
 import { DEFAULT_IMAGE_MAX_VERIFIED_TIME_CACHED, DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT } from '../config/index.js';
+import { ProcaptchaTokenSpec } from '../procaptcha/index.js';
 import { array, number, object, string } from 'zod';
 export var ApiPaths;
 (function (ApiPaths) {
-    ApiPaths["GetCaptchaChallenge"] = "/v1/prosopo/provider/captcha";
+    ApiPaths["GetImageCaptchaChallenge"] = "/v1/prosopo/provider/captcha/image";
     ApiPaths["GetPowCaptchaChallenge"] = "/v1/prosopo/provider/captcha/pow";
-    ApiPaths["SubmitCaptchaSolution"] = "/v1/prosopo/provider/solution";
+    ApiPaths["SubmitImageCaptchaSolution"] = "/v1/prosopo/provider/solution";
     ApiPaths["SubmitPowCaptchaSolution"] = "/v1/prosopo/provider/pow/solution";
-    ApiPaths["ServerPowCaptchaVerify"] = "/v1/prosopo/provider/pow/server-verify";
-    ApiPaths["VerifyCaptchaSolution"] = "/v1/prosopo/provider/verify";
+    ApiPaths["VerifyPowCaptchaSolution"] = "/v1/prosopo/provider/pow/verify";
+    ApiPaths["VerifyImageCaptchaSolutionDapp"] = "/v1/prosopo/provider/image/dapp/verify";
+    ApiPaths["VerifyImageCaptchaSolutionUser"] = "/v1/prosopo/provider/image/user/verify";
     ApiPaths["GetProviderStatus"] = "/v1/prosopo/provider/status";
     ApiPaths["GetProviderDetails"] = "/v1/prosopo/provider/details";
     ApiPaths["SubmitUserEvents"] = "/v1/prosopo/provider/events";
@@ -20,28 +23,6 @@ export var AdminApiPaths;
     AdminApiPaths["ProviderDeregister"] = "/v1/prosopo/provider/admin/deregister";
     AdminApiPaths["ProviderUpdate"] = "/v1/prosopo/provider/admin/update";
 })(AdminApiPaths || (AdminApiPaths = {}));
-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["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 || (ApiParams = {}));
 export const CaptchaRequestBody = object({
     [ApiParams.user]: string(),
     [ApiParams.dapp]: string(),
@@ -56,15 +37,13 @@ export const CaptchaSolutionBody = object({
     [ApiParams.signature]: string(),
 });
 export const VerifySolutionBody = object({
-    [ApiParams.dapp]: string(),
-    [ApiParams.user]: string(),
-    [ApiParams.blockNumber]: number(),
-    [ApiParams.commitmentId]: string().optional(),
+    [ApiParams.token]: ProcaptchaTokenSpec,
+    [ApiParams.dappUserSignature]: string(),
     [ApiParams.maxVerifiedTime]: number().optional().default(DEFAULT_IMAGE_MAX_VERIFIED_TIME_CACHED),
 });
 export const ServerPowCaptchaVerifyRequestBody = object({
-    [ApiParams.challenge]: string(),
-    [ApiParams.dapp]: string(),
+    [ApiParams.token]: ProcaptchaTokenSpec,
+    [ApiParams.dappSignature]: string(),
     [ApiParams.verifiedTimeout]: number().optional().default(DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT),
 });
 export const GetPowCaptchaChallengeRequestBody = object({

package/dist/provider/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/provider/api.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,qBAAqB,EAAoB,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,sCAAsC,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAA;AAEjH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAmB,MAAM,KAAK,CAAA;AAEpE,MAAM,CAAN,IAAY,QAUX;AAVD,WAAY,QAAQ;IAChB,gEAAoD,CAAA;IACpD,uEAA2D,CAAA;IAC3D,mEAAuD,CAAA;IACvD,0EAA8D,CAAA;IAC9D,6EAAiE,CAAA;IACjE,iEAAqD,CAAA;IACrD,6DAAiD,CAAA;IACjD,+DAAmD,CAAA;IACnD,4DAAgD,CAAA;AACpD,CAAC,EAVW,QAAQ,KAAR,QAAQ,QAUnB;AAED,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,iEAAgD,CAAA;IAChD,qEAAoD,CAAA;IACpD,6EAA4D,CAAA;IAC5D,qEAAoD,CAAA;AACxD,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED,MAAM,CAAN,IAAY,SAoBX;AApBD,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,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;AACnB,CAAC,EApBW,SAAS,KAAT,SAAS,QAoBpB;AAiBD,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC;IACrC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE;IAC/B,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;CACpC,CAAC,CAAA;AASF,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC;IACtC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,qBAAqB,CAAC;IAClD,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;IACjC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE;CAClC,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC;IACrC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;IACjC,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7C,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,sCAAsC,CAAC;CACnG,CAAC,CAAA;AAiDF,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC;IACpD,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE;IAC/B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;CACjG,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC;IACpD,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;CAC7B,CAAC,CAAA;AAMF,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC;IAC/C,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;IACjC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE;IAC/B,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE;IAChC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE;IAC/B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE;IAC1B,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE;IAC3B,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;CACjG,CAAC,CAAA"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/provider/api.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/types",
-    "version": "0.3.41",
+    "version": "1.0.1",
     "description": "Types for prosopo TypeScript packages",
     "main": "dist/index.js",
     "type": "module",
@@ -44,8 +44,8 @@
         "@polkadot/types": "10.13.1",
         "@polkadot/types-codec": "10.13.1",
         "@polkadot/util": "12.6.2",
-        "@prosopo/common": "0.3.41",
-        "@prosopo/captcha-contract": "0.3.41",
+        "@prosopo/common": "1.0.1",
+        "@prosopo/captcha-contract": "1.0.1",
         "zod": "^3.22.3"
     },
     "devDependencies": {