@prosopo/types 0.2.6 → 0.2.8

package/dist/cjs/config/config.cjs

@@ -1,10 +1,11 @@
 "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 DatabaseTypes = z.z.enum(["mongo", "mongoMemory"]);
-const EnvironmentTypesSchema = z.z.enum(["development", "rococo", "kusama", "polkadot", "shiden"]);
-const NetworkNamesSchema = EnvironmentTypesSchema;
+const EnvironmentTypesSchema = z.z.enum(["development", "staging", "production"]);
 const DatabaseConfigSchema = z.z.record(
   EnvironmentTypesSchema,
   z.z.object({
@@ -13,52 +14,35 @@ const DatabaseConfigSchema = z.z.record(
     dbname: z.z.string(),
     authSource: z.z.string()
   })
-).optional();
+);
 const BatchCommitConfigSchema = z.z.object({
-  interval: z.z.number().positive(),
-  maxBatchExtrinsicPercentage: z.z.number().positive()
+  interval: z.z.number().positive().optional().default(300),
+  maxBatchExtrinsicPercentage: z.z.number().positive().optional().default(59)
 });
 const ProsopoBaseConfigSchema = z.z.object({
-  logLevel: common.LogLevel,
-  defaultEnvironment: EnvironmentTypesSchema.default(EnvironmentTypesSchema.Values.development),
-  // The account with which to query the contract and sign transactions
+  logLevel: common.LogLevel.optional().default(common.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
   account: z.z.object({
-    address: z.z.string(),
+    address: z.z.string().optional(),
     secret: z.z.string().optional(),
     password: z.z.string().optional()
   })
 });
-const NetworkConfigSchema = z.z.object({
-  endpoint: z.z.string().url(),
-  contract: z.z.object({
-    address: z.z.string(),
-    name: z.z.string()
-  }),
-  accounts: z.z.array(z.z.string()).optional()
-});
-const ProsopoNetworksSchema = z.z.record(NetworkNamesSchema, NetworkConfigSchema.required()).default({
-  development: {
-    endpoint: "ws://127.0.0.1:9944",
-    contract: {
-      address: "",
-      name: ""
-    },
-    accounts: []
-  }
-});
 const ProsopoBasicConfigSchema = ProsopoBaseConfigSchema.merge(
   z.z.object({
-    networks: ProsopoNetworksSchema,
+    networks: network.ProsopoNetworksSchema.default(index),
     database: DatabaseConfigSchema.optional()
   })
 );
 const ProsopoCaptchaCountConfigSchema = z.z.object({
   solved: z.z.object({
     count: z.z.number().positive()
-  }),
+  }).optional().default({ count: 1 }),
   unsolved: z.z.object({
     count: z.z.number().nonnegative()
-  })
+  }).optional().default({ count: 1 })
 });
 const ProsopoImageServerConfigSchema = z.z.object({
   baseURL: z.z.string().url(),
@@ -67,18 +51,17 @@ const ProsopoImageServerConfigSchema = z.z.object({
 const ProsopoCaptchaSolutionConfigSchema = z.z.object({
   requiredNumberOfSolutions: z.z.number().positive().min(2),
   solutionWinningPercentage: z.z.number().positive().max(100),
-  captchaFilePath: z.z.string(),
   captchaBlockRecency: z.z.number().positive().min(2)
 });
 const ProsopoClientConfigSchema = ProsopoBasicConfigSchema.merge(
   z.z.object({
     userAccountAddress: z.z.string().optional(),
-    web2: z.z.boolean(),
-    solutionThreshold: z.z.number().positive().max(100),
-    dappName: z.z.string(),
+    web2: z.z.boolean().optional().default(true),
+    solutionThreshold: z.z.number().positive().max(100).optional().default(80),
+    dappName: z.z.string().optional().default("ProsopoClientDapp"),
     serverUrl: z.z.string().url()
   })
-);
+).refine((schema) => schema.defaultNetwork in schema.networks, "defaultNetwork must be in networks");
 const ProsopoServerConfigSchema = ProsopoClientConfigSchema;
 const AccountCreatorConfigSchema = z.z.object({
   area: z.z.object({
@@ -93,17 +76,28 @@ const AccountCreatorConfigSchema = z.z.object({
   seed: z.z.number().positive()
 });
 const ThemeType = z.z.union([z.z.literal("light"), z.z.literal("dark")]);
-const ProcaptchaConfigSchema = ProsopoClientConfigSchema.merge(
+const ProcaptchaConfigSchema = ProsopoClientConfigSchema.and(
   z.z.object({
     accountCreator: AccountCreatorConfigSchema.optional(),
-    theme: ThemeType.optional()
+    theme: ThemeType.optional(),
+    challengeValidLength: z.z.number().positive().optional()
   })
 );
 const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
   z.z.object({
-    captchas: ProsopoCaptchaCountConfigSchema,
-    captchaSolutions: ProsopoCaptchaSolutionConfigSchema,
-    batchCommit: BatchCommitConfigSchema,
+    captchas: ProsopoCaptchaCountConfigSchema.optional().default({
+      solved: { count: 1 },
+      unsolved: { count: 1 }
+    }),
+    captchaSolutions: ProsopoCaptchaSolutionConfigSchema.optional().default({
+      requiredNumberOfSolutions: 3,
+      solutionWinningPercentage: 80,
+      captchaBlockRecency: 10
+    }),
+    batchCommit: BatchCommitConfigSchema.optional().default({
+      interval: 300,
+      maxBatchExtrinsicPercentage: 59
+    }),
     server: ProsopoImageServerConfigSchema
   })
 );
@@ -112,8 +106,6 @@ exports.BatchCommitConfigSchema = BatchCommitConfigSchema;
 exports.DatabaseConfigSchema = DatabaseConfigSchema;
 exports.DatabaseTypes = DatabaseTypes;
 exports.EnvironmentTypesSchema = EnvironmentTypesSchema;
-exports.NetworkConfigSchema = NetworkConfigSchema;
-exports.NetworkNamesSchema = NetworkNamesSchema;
 exports.ProcaptchaConfigSchema = ProcaptchaConfigSchema;
 exports.ProsopoBaseConfigSchema = ProsopoBaseConfigSchema;
 exports.ProsopoBasicConfigSchema = ProsopoBasicConfigSchema;
@@ -122,5 +114,4 @@ exports.ProsopoCaptchaSolutionConfigSchema = ProsopoCaptchaSolutionConfigSchema;
 exports.ProsopoClientConfigSchema = ProsopoClientConfigSchema;
 exports.ProsopoConfigSchema = ProsopoConfigSchema;
 exports.ProsopoImageServerConfigSchema = ProsopoImageServerConfigSchema;
-exports.ProsopoNetworksSchema = ProsopoNetworksSchema;
 exports.ProsopoServerConfigSchema = ProsopoServerConfigSchema;

package/dist/cjs/config/enumMap.cjs

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const z = require("zod");
+const enumMap = (enumeration, obj) => {
+  const validateKeysInEnum = (record) => Object.keys(record).every((key) => enumeration.safeParse(key).success);
+  return z.z.record(obj).refine(validateKeysInEnum);
+};
+exports.enumMap = enumMap;

package/dist/cjs/config/index.cjs

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const config = require("./config.cjs");
+const network = require("./network.cjs");
 exports.AccountCreatorConfigSchema = config.AccountCreatorConfigSchema;
 exports.BatchCommitConfigSchema = config.BatchCommitConfigSchema;
 exports.DatabaseConfigSchema = config.DatabaseConfigSchema;
 exports.DatabaseTypes = config.DatabaseTypes;
 exports.EnvironmentTypesSchema = config.EnvironmentTypesSchema;
-exports.NetworkConfigSchema = config.NetworkConfigSchema;
-exports.NetworkNamesSchema = config.NetworkNamesSchema;
 exports.ProcaptchaConfigSchema = config.ProcaptchaConfigSchema;
 exports.ProsopoBaseConfigSchema = config.ProsopoBaseConfigSchema;
 exports.ProsopoBasicConfigSchema = config.ProsopoBasicConfigSchema;
@@ -16,5 +15,8 @@ exports.ProsopoCaptchaSolutionConfigSchema = config.ProsopoCaptchaSolutionConfig
 exports.ProsopoClientConfigSchema = config.ProsopoClientConfigSchema;
 exports.ProsopoConfigSchema = config.ProsopoConfigSchema;
 exports.ProsopoImageServerConfigSchema = config.ProsopoImageServerConfigSchema;
-exports.ProsopoNetworksSchema = config.ProsopoNetworksSchema;
 exports.ProsopoServerConfigSchema = config.ProsopoServerConfigSchema;
+exports.NetworkConfigSchema = network.NetworkConfigSchema;
+exports.NetworkNamesSchema = network.NetworkNamesSchema;
+exports.NetworkPairTypeSchema = network.NetworkPairTypeSchema;
+exports.ProsopoNetworksSchema = network.ProsopoNetworksSchema;

package/dist/cjs/config/network.cjs

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const enumMap = require("./enumMap.cjs");
+const z = require("zod");
+const NetworkNamesSchema = z.z.enum(["development", "rococo", "shiden"]);
+const NetworkPairTypeSchema = z.z.union([
+  z.z.literal("sr25519"),
+  z.z.literal("ed25519"),
+  z.z.literal("ecdsa"),
+  z.z.literal("ethereum")
+]);
+const NetworkConfigSchema = z.z.object({
+  endpoint: z.z.string().url(),
+  contract: z.z.object({
+    address: z.z.string(),
+    name: z.z.string()
+  }),
+  pairType: NetworkPairTypeSchema,
+  ss58Format: z.z.number().positive().default(42)
+});
+const ProsopoNetworksSchema = enumMap.enumMap(
+  NetworkNamesSchema,
+  NetworkConfigSchema.required({
+    endpoint: true,
+    pairType: true,
+    ss58Format: true
+  })
+);
+exports.NetworkConfigSchema = NetworkConfigSchema;
+exports.NetworkNamesSchema = NetworkNamesSchema;
+exports.NetworkPairTypeSchema = NetworkPairTypeSchema;
+exports.ProsopoNetworksSchema = ProsopoNetworksSchema;