@prosopo/types 0.2.32 → 0.2.33

package/dist/cjs/config/config.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const common = require("@prosopo/common");
 const network = require("./network.cjs");
 const z = require("zod");
 const index = require("../networks/index.cjs");
+const LogLevel = z.enum(["trace", "debug", "info", "warn", "error", "fatal", "log"]);
 const DatabaseTypes = z.enum(["mongo", "mongoMemory"]);
 const EnvironmentTypesSchema = z.enum(["development", "staging", "production"]);
 const DatabaseConfigSchema = z.record(
@@ -20,7 +20,7 @@ const BatchCommitConfigSchema = z.object({
   maxBatchExtrinsicPercentage: z.number().positive().optional().default(59)
 });
 const ProsopoBaseConfigSchema = z.object({
-  logLevel: common.LogLevel.optional().default(common.LogLevel.enum.info),
+  logLevel: LogLevel.optional().default(LogLevel.enum.info),
   defaultEnvironment: EnvironmentTypesSchema.default(EnvironmentTypesSchema.Values.production),
   defaultNetwork: network.NetworkNamesSchema.default(network.NetworkNamesSchema.Values.rococo),
   // The account with which to query the contract.merge sign transactions
@@ -61,8 +61,8 @@ const ProsopoClientConfigSchema = ProsopoBasicConfigSchema.merge(
     dappName: z.string().optional().default("ProsopoClientDapp"),
     serverUrl: z.string().optional()
   })
-).refine((schema) => schema.defaultNetwork in schema.networks, "defaultNetwork must be in networks");
-const ProsopoServerConfigSchema = ProsopoClientConfigSchema.innerType().merge(
+);
+const ProsopoServerConfigSchema = ProsopoClientConfigSchema.merge(
   z.object({
     serverUrl: z.string().url()
   })
@@ -84,14 +84,15 @@ const ProcaptchaConfigSchema = ProsopoClientConfigSchema.and(
   z.object({
     accountCreator: AccountCreatorConfigSchema.optional(),
     theme: ThemeType.optional(),
-    challengeValidLength: z.number().positive().optional()
+    challengeValidLength: z.number().positive().optional(),
+    devOnlyWatchEvents: z.boolean().optional()
   })
 );
 const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
   z.object({
     captchas: ProsopoCaptchaCountConfigSchema.optional().default({
       solved: { count: 1 },
-      unsolved: { count: 1 }
+      unsolved: { count: 0 }
     }),
     captchaSolutions: ProsopoCaptchaSolutionConfigSchema.optional().default({
       requiredNumberOfSolutions: 3,
@@ -102,7 +103,8 @@ const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
       interval: 300,
       maxBatchExtrinsicPercentage: 59
     }),
-    server: ProsopoImageServerConfigSchema
+    server: ProsopoImageServerConfigSchema,
+    mongoAtlasUri: z.string().optional()
   })
 );
 exports.AccountCreatorConfigSchema = AccountCreatorConfigSchema;

package/dist/cjs/index.cjs

@@ -72,6 +72,7 @@ exports.DatasetSchema = dataset.DatasetSchema;
 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;

package/dist/cjs/networks/index.cjs

@@ -2,12 +2,12 @@
 const network = require("../config/network.cjs");
 const pairTypeSr25519 = network.NetworkPairTypeSchema.parse("sr25519");
 const getContractAddress = (defaultAddress) => {
-  return process.env.PROTOCOL_CONTRACT_ADDRESS || process.env.PROSOPO_CONTRACT_ADDRESS || process.env.REACT_APP_PROSOPO_CONTRACT_ADDRESS || defaultAddress || "";
+  return process.env.PROSOPO_CONTRACT_ADDRESS ? process.env.PROSOPO_CONTRACT_ADDRESS : defaultAddress || "";
 };
 const networks = () => {
   return {
     [network.NetworkNamesSchema.Values.development]: {
-      endpoint: process.env.REACT_APP_SUBSTRATE_ENDPOINT || process.env.SUBSTRATE_NODE_URL || "ws://127.0.0.1:9944",
+      endpoint: process.env.PROSOPO_SUBSTRATE_ENDPOINT || "ws://127.0.0.1:9944",
       contract: {
         name: "captcha",
         address: getContractAddress("CONTRACT_NOT_DEPLOYED")
@@ -16,7 +16,7 @@ const networks = () => {
       ss58Format: 42
     },
     [network.NetworkNamesSchema.Values.rococo]: {
-      endpoint: process.env.REACT_APP_SUBSTRATE_ENDPOINT || process.env.SUBSTRATE_NODE_URL || "wss://rococo-contracts-rpc.polkadot.io:443",
+      endpoint: process.env.PROSOPO_SUBSTRATE_ENDPOINT || "wss://rococo-contracts-rpc.polkadot.io:443",
       contract: {
         name: "captcha",
         address: getContractAddress("5HiVWQhJrysNcFNEWf2crArKht16zrhro3FcekVWocyQjx5u")
@@ -25,7 +25,7 @@ const networks = () => {
       ss58Format: 42
     },
     [network.NetworkNamesSchema.Values.shiden]: {
-      endpoint: process.env.REACT_APP_SUBSTRATE_ENDPOINT || process.env.SUBSTRATE_NODE_URL || "wss://shiden.public.blastapi.io",
+      endpoint: process.env.PROSOPO_SUBSTRATE_ENDPOINT || "wss://shiden.public.blastapi.io",
       contract: {
         address: getContractAddress("XpRox5bNg6YV8BHafsuHQ3b8i7gSq3GKPeYLA1b8EZwrDb3"),
         name: "captcha"

package/dist/cjs/procaptcha/collector.cjs

@@ -0,0 +1 @@
+"use strict";

package/dist/cjs/procaptcha/index.cjs

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const manager = require("./manager.cjs");
+require("./collector.cjs");
 exports.ProcaptchaOutputSchema = manager.ProcaptchaOutputSchema;
 exports.ProcaptchaResponse = manager.ProcaptchaResponse;

package/dist/cjs/provider/api.cjs

@@ -9,8 +9,16 @@ var ApiPaths = /* @__PURE__ */ ((ApiPaths2) => {
   ApiPaths2["VerifyCaptchaSolution"] = "/v1/prosopo/provider/verify";
   ApiPaths2["GetProviderStatus"] = "/v1/prosopo/provider/status";
   ApiPaths2["GetProviderDetails"] = "/v1/prosopo/provider/details";
+  ApiPaths2["SubmitUserEvents"] = "/v1/prosopo/provider/events";
   return ApiPaths2;
 })(ApiPaths || {});
+var AdminApiPaths = /* @__PURE__ */ ((AdminApiPaths2) => {
+  AdminApiPaths2["BatchCommit"] = "/v1/prosopo/provider/admin/batch";
+  AdminApiPaths2["UpdateDataset"] = "/v1/prosopo/provider/admin/dataset";
+  AdminApiPaths2["ProviderDeregister"] = "/v1/prosopo/provider/admin/deregister";
+  AdminApiPaths2["ProviderUpdate"] = "/v1/prosopo/provider/admin/update";
+  return AdminApiPaths2;
+})(AdminApiPaths || {});
 var ApiParams = /* @__PURE__ */ ((ApiParams2) => {
   ApiParams2["datasetId"] = "datasetId";
   ApiParams2["user"] = "user";
@@ -23,6 +31,7 @@ var ApiParams = /* @__PURE__ */ ((ApiParams2) => {
   ApiParams2["proof"] = "proof";
   ApiParams2["providerUrl"] = "providerUrl";
   ApiParams2["procaptchaResponse"] = "procaptcha-response";
+  ApiParams2["maxVerifiedTime"] = "maxVerifiedTime";
   return ApiParams2;
 })(ApiParams || {});
 const CaptchaRequestBody = z.object({
@@ -67,6 +76,10 @@ const CaptchaSolutionBody = z.object({
   // the signature to prove account ownership
 });
 const VerifySolutionBody = z.object({
+  [
+    "dapp"
+    /* dapp */
+  ]: z.string(),
   [
     "user"
     /* user */
@@ -74,8 +87,13 @@ const VerifySolutionBody = z.object({
   [
     "commitmentId"
     /* commitmentId */
-  ]: z.string().optional()
+  ]: z.string().optional(),
+  [
+    "maxVerifiedTime"
+    /* maxVerifiedTime */
+  ]: z.number().optional()
 });
+exports.AdminApiPaths = AdminApiPaths;
 exports.ApiParams = ApiParams;
 exports.ApiPaths = ApiPaths;
 exports.CaptchaRequestBody = CaptchaRequestBody;

package/dist/cjs/provider/argv.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const captcha = require("../contracts/captcha/dist/types-arguments/captcha.cjs");
+const typesArguments = require("@prosopo/captcha-contract/types-arguments");
 const z = require("zod");
-const PayeeSchema = z.nativeEnum(captcha.Payee);
+const PayeeSchema = z.nativeEnum(typesArguments.Payee);
 exports.PayeeSchema = PayeeSchema;

package/dist/cjs/provider/index.cjs

@@ -4,6 +4,7 @@ require("./accounts.cjs");
 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;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/types",
-    "version": "0.2.32",
+    "version": "0.2.33",
     "description": "Types for prosopo TypeScript packages",
     "main": "dist/index.js",
     "type": "module",
@@ -40,8 +40,8 @@
         "@polkadot/api-contract": "10.11.1",
         "@polkadot/types": "10.11.1",
         "@polkadot/types-codec": "10.11.1",
-        "@prosopo/common": "0.2.32",
-        "@prosopo/captcha-contract": "0.2.32",
+        "@prosopo/common": "0.2.33",
+        "@prosopo/captcha-contract": "0.2.33",
         "consola": "^3.2.3",
         "zod": "^3.22.3"
     },

package/dist/cjs/contracts/captcha/dist/types-arguments/captcha.cjs

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-exports.Error = void 0;
-(function(Error) {
-  Error["notAuthorised"] = "NotAuthorised";
-  Error["transferFailed"] = "TransferFailed";
-  Error["setCodeHashFailed"] = "SetCodeHashFailed";
-  Error["invalidDestination"] = "InvalidDestination";
-  Error["unknownMessage"] = "UnknownMessage";
-  Error["providerAccountExists"] = "ProviderAccountExists";
-  Error["providerExists"] = "ProviderExists";
-  Error["providerAccountDoesNotExist"] = "ProviderAccountDoesNotExist";
-  Error["providerDoesNotExist"] = "ProviderDoesNotExist";
-  Error["providerInsufficientFunds"] = "ProviderInsufficientFunds";
-  Error["providerInactive"] = "ProviderInactive";
-  Error["providerUrlUsed"] = "ProviderUrlUsed";
-  Error["dappExists"] = "DappExists";
-  Error["dappDoesNotExist"] = "DappDoesNotExist";
-  Error["dappInactive"] = "DappInactive";
-  Error["dappInsufficientFunds"] = "DappInsufficientFunds";
-  Error["captchaDataDoesNotExist"] = "CaptchaDataDoesNotExist";
-  Error["commitDoesNotExist"] = "CommitDoesNotExist";
-  Error["dappUserDoesNotExist"] = "DappUserDoesNotExist";
-  Error["noActiveProviders"] = "NoActiveProviders";
-  Error["datasetIdSolutionsSame"] = "DatasetIdSolutionsSame";
-  Error["codeNotFound"] = "CodeNotFound";
-  Error["unknown"] = "Unknown";
-  Error["invalidContract"] = "InvalidContract";
-  Error["invalidPayee"] = "InvalidPayee";
-  Error["invalidCaptchaStatus"] = "InvalidCaptchaStatus";
-  Error["noCorrectCaptcha"] = "NoCorrectCaptcha";
-  Error["notEnoughActiveProviders"] = "NotEnoughActiveProviders";
-  Error["providerFeeTooHigh"] = "ProviderFeeTooHigh";
-  Error["commitAlreadyExists"] = "CommitAlreadyExists";
-  Error["notAuthor"] = "NotAuthor";
-})(exports.Error || (exports.Error = {}));
-exports.LangError = void 0;
-(function(LangError) {
-  LangError["couldNotReadInput"] = "CouldNotReadInput";
-})(exports.LangError || (exports.LangError = {}));
-exports.Payee = void 0;
-(function(Payee) {
-  Payee["provider"] = "Provider";
-  Payee["dapp"] = "Dapp";
-})(exports.Payee || (exports.Payee = {}));
-exports.DappPayee = void 0;
-(function(DappPayee) {
-  DappPayee["provider"] = "Provider";
-  DappPayee["dapp"] = "Dapp";
-  DappPayee["any"] = "Any";
-})(exports.DappPayee || (exports.DappPayee = {}));
-exports.GovernanceStatus = void 0;
-(function(GovernanceStatus) {
-  GovernanceStatus["active"] = "Active";
-  GovernanceStatus["inactive"] = "Inactive";
-})(exports.GovernanceStatus || (exports.GovernanceStatus = {}));
-exports.CaptchaStatus = void 0;
-(function(CaptchaStatus) {
-  CaptchaStatus["pending"] = "Pending";
-  CaptchaStatus["approved"] = "Approved";
-  CaptchaStatus["disapproved"] = "Disapproved";
-})(exports.CaptchaStatus || (exports.CaptchaStatus = {}));