@prosopo/cli 2.3.1 → 2.4.1

package/dist/commands/index.d.ts

@@ -1,4 +1,3 @@
-export { default as commandAddBlockRules } from "./addBlockRules.js";
 export { default as commandProviderSetDataset } from "./providerSetDataset.js";
 export { default as commandStoreCaptchasExternally } from "./storeCaptchasExternally.js";
 export { default as commandVersion } from "./version.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/commands/index.js

@@ -1,4 +1,3 @@
-export { default as commandAddBlockRules } from "./addBlockRules.js";
 export { default as commandProviderSetDataset } from "./providerSetDataset.js";
 export { default as commandStoreCaptchasExternally } from "./storeCaptchasExternally.js";
 export { default as commandVersion } from "./version.js";

package/dist/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/commands/migrateBlockRulesToUserAccessRules.d.ts

@@ -0,0 +1,20 @@
+import type { KeyringPair } from "@polkadot/keyring/types";
+import type { BlockRule, ProsopoConfigOutput } from "@prosopo/types";
+import type { IPBlockRuleRecord, UserAccountBlockRuleRecord } from "@prosopo/types-database";
+import type { Rule } from "@prosopo/user-access-policy";
+import type { CommandModule } from "yargs";
+declare class MigrateBlockRuleDbRecordsToUserAccessPolicyCommand implements CommandModule {
+    private readonly pair;
+    private readonly config;
+    command: string;
+    describe: string;
+    constructor(pair: KeyringPair, config: ProsopoConfigOutput);
+    handler: () => Promise<void>;
+    protected convertIpBlockRulesToUserAccessRules(ipBlockRules: IPBlockRuleRecord[]): Rule[];
+    protected convertUserAccountBlockRulesToUserAccessRules(userAccountBlockRules: UserAccountBlockRuleRecord[]): Rule[];
+    protected convertIpBlockRuleToUserAccessRule(ipBlockRule: IPBlockRuleRecord): Rule;
+    protected convertUserAccountBlockRuleToUserAccessRule(userAccountBlockRule: UserAccountBlockRuleRecord): Rule;
+    protected convertBlockRuleToUserAccessRule(blockRule: BlockRule): Rule;
+}
+export { MigrateBlockRuleDbRecordsToUserAccessPolicyCommand };
+//# sourceMappingURL=migrateBlockRulesToUserAccessRules.d.ts.map

package/dist/commands/migrateBlockRulesToUserAccessRules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateBlockRulesToUserAccessRules.d.ts","sourceRoot":"","sources":["../../src/commands/migrateBlockRulesToUserAccessRules.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EACX,iBAAiB,EACjB,0BAA0B,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,cAAM,kDACL,YAAW,aAAa;IAMvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALjB,OAAO,SAA8C;IACrD,QAAQ,SAA8C;gBAG3C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB;IAGtC,OAAO,QAAa,OAAO,CAAC,IAAI,CAAC,CAsBtC;IAEF,SAAS,CAAC,oCAAoC,CAC7C,YAAY,EAAE,iBAAiB,EAAE,GAC/B,IAAI,EAAE;IAMT,SAAS,CAAC,6CAA6C,CACtD,qBAAqB,EAAE,0BAA0B,EAAE,GACjD,IAAI,EAAE;IAMT,SAAS,CAAC,kCAAkC,CAC3C,WAAW,EAAE,iBAAiB,GAC5B,IAAI;IAgBP,SAAS,CAAC,2CAA2C,CACpD,oBAAoB,EAAE,0BAA0B,GAC9C,IAAI;IASP,SAAS,CAAC,gCAAgC,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAiBtE;AAED,OAAO,EAAE,kDAAkD,EAAE,CAAC"}

package/dist/commands/migrateBlockRulesToUserAccessRules.js

@@ -0,0 +1,65 @@
+import { ProviderEnvironment } from "@prosopo/env";
+import { Address4 } from "ip-address";
+class MigrateBlockRuleDbRecordsToUserAccessPolicyCommand {
+    constructor(pair, config) {
+        this.pair = pair;
+        this.config = config;
+        this.command = "migrate-block-rules-to-user-access-rules";
+        this.describe = "Migrate block rules to user access rules";
+        this.handler = async () => {
+            const env = new ProviderEnvironment(this.config, this.pair);
+            await env.isReady();
+            const db = env.getDb();
+            const ipBlockRules = await db.getAllIpBlockRules();
+            const userAccountBlockRules = await db.getAllUserAccountBlockRules();
+            const userAccessRulesFromIpBlockRules = this.convertIpBlockRulesToUserAccessRules(ipBlockRules);
+            const userAccessRulesFromUserAccountBlockRules = this.convertUserAccountBlockRulesToUserAccessRules(userAccountBlockRules);
+            const newUserAccessRules = [
+                ...userAccessRulesFromIpBlockRules,
+                ...userAccessRulesFromUserAccountBlockRules,
+            ];
+            const userAccessRulesStorage = db.getUserAccessRulesStorage();
+            await userAccessRulesStorage.insertMany(newUserAccessRules);
+        };
+    }
+    convertIpBlockRulesToUserAccessRules(ipBlockRules) {
+        return ipBlockRules.map((ipBlockRule) => this.convertIpBlockRuleToUserAccessRule(ipBlockRule));
+    }
+    convertUserAccountBlockRulesToUserAccessRules(userAccountBlockRules) {
+        return userAccountBlockRules.map((userAccountBlockRule) => this.convertUserAccountBlockRuleToUserAccessRule(userAccountBlockRule));
+    }
+    convertIpBlockRuleToUserAccessRule(ipBlockRule) {
+        const userAccessRule = this.convertBlockRuleToUserAccessRule(ipBlockRule);
+        const ipAsBigInt = BigInt(ipBlockRule.ip);
+        const ipAddress = Address4.fromBigInt(ipAsBigInt);
+        userAccessRule.userIp = {
+            v4: {
+                asNumeric: ipAsBigInt,
+                asString: ipAddress.address.toString(),
+            },
+        };
+        return userAccessRule;
+    }
+    convertUserAccountBlockRuleToUserAccessRule(userAccountBlockRule) {
+        const userAccessRule = this.convertBlockRuleToUserAccessRule(userAccountBlockRule);
+        userAccessRule.userId = userAccountBlockRule.userAccount;
+        return userAccessRule;
+    }
+    convertBlockRuleToUserAccessRule(blockRule) {
+        const userAccessRule = {
+            isUserBlocked: blockRule.hardBlock,
+            clientId: blockRule.dappAccount,
+        };
+        if (undefined !== blockRule.captchaConfig) {
+            userAccessRule.config = {
+                imageCaptcha: {
+                    solvedCount: blockRule.captchaConfig.solved.count,
+                    unsolvedCount: blockRule.captchaConfig.unsolved.count,
+                },
+            };
+        }
+        return userAccessRule;
+    }
+}
+export { MigrateBlockRuleDbRecordsToUserAccessPolicyCommand };
+//# sourceMappingURL=migrateBlockRulesToUserAccessRules.js.map

package/dist/commands/migrateBlockRulesToUserAccessRules.js.map

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

package/dist/commands/siteKeyRegister.d.ts

@@ -1,7 +1,30 @@
 import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
-import type { ProsopoConfigOutput } from "@prosopo/types";
+import { type ProsopoConfigOutput, Tier } from "@prosopo/types";
 import type { ArgumentsCamelCase, Argv } from "yargs";
+import { z } from "zod";
+export declare const SiteKeyRegisterCommandArgsSpec: z.ZodObject<{
+    sitekey: z.ZodString;
+    tier: z.ZodNativeEnum<typeof Tier>;
+    captcha_type: z.ZodNativeEnum<typeof import("@prosopo/types").CaptchaType>;
+    frictionless_threshold: z.ZodNumber;
+    pow_difficulty: z.ZodNumber;
+    domains: z.ZodArray<z.ZodString, "many">;
+}, "strip", z.ZodTypeAny, {
+    tier: Tier;
+    sitekey: string;
+    captcha_type: import("@prosopo/types").CaptchaType;
+    frictionless_threshold: number;
+    pow_difficulty: number;
+    domains: string[];
+}, {
+    tier: Tier;
+    sitekey: string;
+    captcha_type: import("@prosopo/types").CaptchaType;
+    frictionless_threshold: number;
+    pow_difficulty: number;
+    domains: string[];
+}>;
 declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
@@ -9,12 +32,14 @@ declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs
     describe: string;
     builder: (yargs: Argv) => Argv<{
         sitekey: string;
+    } & {
+        tier: string | undefined;
     } & {
         captcha_type: string | undefined;
     } & {
-        frictionless_threshold: number | undefined;
+        domains: (string | number)[] | undefined;
     } & {
-        url: (string | number)[] | undefined;
+        frictionless_threshold: number | undefined;
     } & {
         pow_difficulty: number | undefined;
     }>;

package/dist/commands/siteKeyRegister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAI/C,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;oBA2BC,kBAAkB;;;;;AAtC1C,wBA+DE"}
+{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;EAOzC,CAAC;+BAGI,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;oBAgCC,kBAAkB;;;;;AA3C1C,wBAqEE"}

package/dist/commands/siteKeyRegister.js

@@ -1,32 +1,47 @@
 import { LogLevel, getLogger } from "@prosopo/common";
 import { ProviderEnvironment } from "@prosopo/env";
 import { Tasks } from "@prosopo/provider";
+import { CaptchaTypeSpec, Tier, } from "@prosopo/types";
+import { z } from "zod";
 import { validateSiteKey } from "./validators.js";
+export const SiteKeyRegisterCommandArgsSpec = z.object({
+    sitekey: z.string(),
+    tier: z.nativeEnum(Tier),
+    captcha_type: CaptchaTypeSpec,
+    frictionless_threshold: z.number().max(1).min(0),
+    pow_difficulty: z.number(),
+    domains: z.array(z.string()),
+});
 export default (pair, config, cmdArgs) => {
     const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
     return {
-        command: "site_key_register <sitekey>",
+        command: "site_key_register <sitekey> <tier>",
         describe: "Register a Site Key",
         builder: (yargs) => yargs
             .positional("sitekey", {
             type: "string",
             demandOption: true,
             desc: "The AccountId of the application to register the Site Key with",
+        })
+            .option("tier", {
+            type: "string",
+            demandOption: false,
+            desc: "The AccountId of the application to register the Site Key with",
         })
             .option("captcha_type", {
             type: "string",
             demandOption: false,
             desc: "Captcha type for settings",
+        })
+            .option("domains", {
+            type: "array",
+            demandOption: false,
+            desc: "Domains for settings",
         })
             .option("frictionless_threshold", {
             type: "number",
             demandOption: false,
             desc: "Frictionless threshold for settings",
-        })
-            .option("url", {
-            type: "array",
-            demandOption: false,
-            desc: "URLs for settings",
         })
             .option("pow_difficulty", {
             type: "number",
@@ -37,12 +52,12 @@ export default (pair, config, cmdArgs) => {
             try {
                 const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
-                const { sitekey, captcha_type, frictionless_threshold, url, pow_difficulty, } = argv;
+                const { sitekey, tier, captcha_type, frictionless_threshold, pow_difficulty, domains, } = SiteKeyRegisterCommandArgsSpec.parse(argv);
                 const tasks = new Tasks(env);
-                await tasks.clientTaskManager.registerSiteKey(sitekey, {
-                    captchaType: captcha_type,
+                await tasks.clientTaskManager.registerSiteKey(sitekey, tier, {
+                    captchaType: CaptchaTypeSpec.parse(captcha_type),
                     frictionlessThreshold: frictionless_threshold,
-                    domains: url,
+                    domains: domains || [],
                     powDifficulty: pow_difficulty,
                 });
                 logger.info(`Site Key ${argv.sitekey} registered`);

package/dist/commands/siteKeyRegister.js.map

@@ -1 +1 @@
-{"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,eAAe,CACd,IAAiB,EACjB,MAA2B,EAC3B,OAA6B,EAC5B,EAAE;IACH,MAAM,MAAM,GACX,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAEvE,OAAO;QACN,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK;aACH,UAAU,CAAC,SAAS,EAAE;YACtB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,gEAAgE;SAC7D,CAAC;aACV,MAAM,CAAC,cAAc,EAAE;YACvB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,2BAA2B;SACxB,CAAC;aACV,MAAM,CAAC,wBAAwB,EAAE;YACjC,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,qCAAqC;SAClC,CAAC;aACV,MAAM,CAAC,KAAK,EAAE;YACd,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,mBAAmB;SAChB,CAAC;aACV,MAAM,CAAC,gBAAgB,EAAE;YACzB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,6BAA6B;SAC1B,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,EACL,OAAO,EACP,YAAY,EACZ,sBAAsB,EACtB,GAAG,EACH,cAAc,GACd,GAAG,IAAI,CAAC;gBACT,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,MAAM,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAiB,EAAE;oBAChE,WAAW,EAAE,YAAgD;oBAC7D,qBAAqB,EAAE,sBAAgC;oBACvD,OAAO,EAAE,GAAe;oBACxB,aAAa,EAAE,cAAwB;iBACvC,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACF,CAAC;QACD,WAAW,EAAE,CAAC,eAAe,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"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"}

package/dist/commands/siteKeyRegisterApi.d.ts

@@ -1,6 +1,6 @@
 import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
-import type { ProsopoConfigOutput } from "@prosopo/types";
+import { type ProsopoConfigOutput, Tier } from "@prosopo/types";
 import type { ArgumentsCamelCase, Argv } from "yargs";
 declare const _default: (pair: KeyringPair, authAccount: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
@@ -9,6 +9,8 @@ declare const _default: (pair: KeyringPair, authAccount: KeyringPair, config: Pr
     describe: string;
     builder: (yargs: Argv) => Argv<{
         sitekey: string;
+    } & {
+        tier: Tier;
     } & {
         url: string;
     } & {

package/dist/commands/siteKeyRegisterApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"siteKeyRegisterApi.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAI/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;oBAgCC,kBAAkB;;;;;AA5C1C,wBA8EE"}
+{"version":3,"file":"siteKeyRegisterApi.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAY/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;oBAqCC,kBAAkB;;;;;AAjD1C,wBAmFE"}

package/dist/commands/siteKeyRegisterApi.js

@@ -1,9 +1,14 @@
 import { ProviderApi } from "@prosopo/api";
 import { LogLevel, getLogger } from "@prosopo/common";
 import { ProviderEnvironment } from "@prosopo/env";
-import { Tasks } from "@prosopo/provider";
+import { CaptchaTypeSpec, Tier, } from "@prosopo/types";
 import { u8aToHex } from "@prosopo/util";
+import { z } from "zod";
+import { SiteKeyRegisterCommandArgsSpec } from "./siteKeyRegister.js";
 import { validateSiteKey } from "./validators.js";
+const SiteKeyRegisterApiCommandArgsSpec = SiteKeyRegisterCommandArgsSpec.extend({
+    url: z.string(),
+});
 export default (pair, authAccount, config, cmdArgs) => {
     const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
     return {
@@ -14,11 +19,16 @@ export default (pair, authAccount, config, cmdArgs) => {
             type: "string",
             demandOption: true,
             desc: "The AccountId of the application to register the Site Key with",
+        })
+            .positional("tier", {
+            choices: Object.values(Tier),
+            demandOption: true,
+            desc: "The tier of the account",
         })
             .option("url", {
             type: "string",
             demandOption: true,
-            desc: "URL to register the Site Key with",
+            desc: "Provider URL to register the Site Key with",
         })
             .option("captcha_type", {
             type: "string",
@@ -44,15 +54,14 @@ export default (pair, authAccount, config, cmdArgs) => {
             try {
                 const env = new ProviderEnvironment(config, pair, authAccount);
                 await env.isReady();
-                const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, } = argv;
-                const tasks = new Tasks(env);
+                const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
                 const api = new ProviderApi(url, pair.address);
                 const timestamp = new Date().getTime().toString();
                 const signature = u8aToHex(authAccount.sign(timestamp));
-                await api.registerSiteKey(sitekey, {
-                    captchaType: captcha_type,
+                await api.registerSiteKey(sitekey, argv.tier, {
+                    captchaType: CaptchaTypeSpec.parse(captcha_type),
                     frictionlessThreshold: frictionless_threshold,
-                    domains: domains,
+                    domains: domains || [],
                     powDifficulty: pow_difficulty,
                 }, timestamp, signature);
                 logger.info(`Site Key ${argv.sitekey} registered`);

package/dist/commands/siteKeyRegisterApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,eAAe,CACd,IAAiB,EACjB,WAAwB,EACxB,MAA2B,EAC3B,OAA6B,EAC5B,EAAE;IACH,MAAM,MAAM,GACX,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAEvE,OAAO;QACN,OAAO,EAAE,uCAAuC;QAChD,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK;aACH,UAAU,CAAC,SAAS,EAAE;YACtB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,gEAAgE;SAC7D,CAAC;aACV,MAAM,CAAC,KAAK,EAAE;YACd,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,mCAAmC;SAChC,CAAC;aACV,MAAM,CAAC,cAAc,EAAE;YACvB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,2BAA2B;SACxB,CAAC;aACV,MAAM,CAAC,wBAAwB,EAAE;YACjC,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,qCAAqC;SAClC,CAAC;aACV,MAAM,CAAC,SAAS,EAAE;YAClB,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,mBAAmB;SAChB,CAAC;aACV,MAAM,CAAC,gBAAgB,EAAE;YACzB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,6BAA6B;SAC1B,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC/D,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,EACL,OAAO,EACP,YAAY,EACZ,sBAAsB,EACtB,GAAG,EACH,OAAO,EACP,cAAc,GACd,GAAG,IAAI,CAAC;gBACT,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,GAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAClD,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACxD,MAAM,GAAG,CAAC,eAAe,CACxB,OAAiB,EACjB;oBACC,WAAW,EAAE,YAAgD;oBAC7D,qBAAqB,EAAE,sBAAgC;oBACvD,OAAO,EAAE,OAAmB;oBAC5B,aAAa,EAAE,cAAwB;iBACvC,EACD,SAAS,EACT,SAAS,CACT,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACF,CAAC;QACD,WAAW,EAAE,CAAC,eAAe,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"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"}

package/dist/commands/version.d.ts

@@ -6,7 +6,7 @@ declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs
 }) => {
     command: string;
     describe: string;
-    handler: () => Promise<void>;
+    handler: () => void;
 };
 export default _default;
 //# sourceMappingURL=version.d.ts.map

package/dist/commands/version.js

@@ -5,7 +5,7 @@ export default (pair, config, cmdArgs) => {
     return {
         command: "version",
         describe: "Return the version of the software",
-        handler: async () => {
+        handler: () => {
             logger.info(`Version: ${JSON.stringify(version)}`);
         },
     };

package/dist/commands/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,eAAe,CACd,IAAiB,EACjB,MAA2B,EAC3B,OAA6B,EAC5B,EAAE;IACH,MAAM,MAAM,GACX,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEjE,OAAO;QACN,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE,KAAK,IAAI,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACpD,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,eAAe,CACd,IAAiB,EACjB,MAA2B,EAC3B,OAA6B,EAC5B,EAAE;IACH,MAAM,MAAM,GACX,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEjE,OAAO;QACN,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE,GAAG,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACpD,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}

package/dist/prosopo.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAeA,OAAO,EAGN,KAAK,oCAAoC,EACzC,KAAK,kCAAkC,EAEvC,KAAK,mBAAmB,EAExB,MAAM,gBAAgB,CAAC;AA2BxB,MAAM,CAAC,OAAO,UAAU,SAAS,CAChC,sBAAsB,CAAC,EAAE,OAAO,kCAAkC,EAClE,kBAAkB,CAAC,EAAE,oCAAoC,EACzD,GAAG,SAAa,EAChB,KAAK,SAAU,GACb,mBAAmB,CA8DrB"}
+{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAeA,OAAO,EAIN,KAAK,oCAAoC,EACzC,KAAK,kCAAkC,EAEvC,KAAK,mBAAmB,EAExB,MAAM,gBAAgB,CAAC;AA2BxB,MAAM,CAAC,OAAO,UAAU,SAAS,CAChC,sBAAsB,CAAC,EAAE,OAAO,kCAAkC,EAClE,kBAAkB,CAAC,EAAE,oCAAoC,EACzD,GAAG,SAAa,EAChB,KAAK,SAAU,GACb,mBAAmB,CAiErB"}

package/dist/prosopo.config.js

@@ -1,5 +1,5 @@
 import { getLogLevel } from "@prosopo/common";
-import { DatabaseTypes, EnvironmentTypesSchema, ProsopoConfigSchema, } from "@prosopo/types";
+import { DatabaseTypes, EnvironmentTypesSchema, FrictionlessPenalties, ProsopoConfigSchema, } from "@prosopo/types";
 import { getRateLimitConfig } from "./RateLimiter.js";
 import { getAddress, getPassword, getSecret } from "./process.env.js";
 function getMongoURI() {
@@ -63,7 +63,10 @@ export default function getConfig(captchaSolutionsConfig, captchaServeConfig, wh
         },
         captchaSolutions: captchaSolutionsConfig,
         captchas: captchaServeConfig,
-        devOnlyWatchEvents: process.env._DEV_ONLY_WATCH_EVENTS === "true",
+        penalties: FrictionlessPenalties.parse({
+            PENALTY_OLD_TIMESTAMP: process.env.PENALTY_OLD_TIMESTAMP,
+            PENALTY_ACCESS_RULE: process.env.PENALTY_ACCESS_RULE,
+        }),
         mongoEventsUri: process.env.PROSOPO_MONGO_EVENTS_URI || "",
         mongoCaptchaUri: process.env.PROSOPO_MONGO_CAPTCHA_URI || "",
         mongoClientUri: process.env.PROSOPO_MONGO_CLIENT_URI || "",

package/dist/prosopo.config.js.map

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

package/dist/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA8DnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,mBAqCb;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAGxE"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA2FnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,mBAwCb;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAGxE"}

package/dist/start.js

@@ -1,9 +1,12 @@
+import { apiExpressRouterFactory, createApiExpressDefaultEndpointAdapter, } from "@prosopo/api-express-router";
 import { loadEnv } from "@prosopo/dotenv";
 import { ProviderEnvironment } from "@prosopo/env";
 import { getPairAsync } from "@prosopo/keyring";
 import { i18nMiddleware } from "@prosopo/locale";
-import { domainMiddleware, getClientList, headerCheckMiddleware, prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter, publicRouter, storeCaptchasExternally, } from "@prosopo/provider";
+import { createApiAdminRoutesProvider, domainMiddleware, getClientList, headerCheckMiddleware, prosopoRouter, prosopoVerifyRouter, publicRouter, storeCaptchasExternally, } from "@prosopo/provider";
 import { authMiddleware, blockMiddleware } from "@prosopo/provider";
+import { createApiRuleRoutesProvider, getExpressApiRuleRateLimits, } from "@prosopo/user-access-policy";
+import { apiRulePaths } from "@prosopo/user-access-policy";
 import cors from "cors";
 import express from "express";
 import rateLimit from "express-rate-limit";
@@ -13,6 +16,9 @@ function startApi(env, admin = false, port) {
     env.logger.info("Starting Prosopo API");
     const apiApp = express();
     const apiPort = port || env.config.server.port;
+    const apiEndpointAdapter = createApiExpressDefaultEndpointAdapter(env.logger);
+    const apiRuleRoutesProvider = createApiRuleRoutesProvider(env.getDb().getUserAccessRulesStorage());
+    const apiAdminRoutesProvider = createApiAdminRoutesProvider(env);
     apiApp.set("trust proxy", env.config.proxyCount);
     apiApp.use(cors());
     apiApp.use(express.json({ limit: "50mb" }));
@@ -23,9 +29,14 @@ function startApi(env, admin = false, port) {
     apiApp.use("/v1/prosopo/provider/client/", domainMiddleware(env));
     apiApp.use(prosopoRouter(env));
     apiApp.use(publicRouter(env));
+    env.logger.info("Enabling admin auth middleware");
     apiApp.use("/v1/prosopo/provider/admin", authMiddleware(env));
-    apiApp.use(prosopoAdminRouter(env));
-    const rateLimits = env.config.rateLimits;
+    apiApp.use(apiRulePaths.INSERT_MANY, authMiddleware(env));
+    apiApp.use(apiRulePaths.DELETE_MANY, authMiddleware(env));
+    apiApp.use(apiExpressRouterFactory.createRouter(apiRuleRoutesProvider, apiEndpointAdapter));
+    apiApp.use(apiExpressRouterFactory.createRouter(apiAdminRoutesProvider, createApiExpressDefaultEndpointAdapter(env.logger, 400)));
+    const configRateLimits = env.config.rateLimits;
+    const rateLimits = { ...configRateLimits, ...getExpressApiRuleRateLimits() };
     for (const [path, limit] of Object.entries(rateLimits)) {
         const enumPath = path;
         apiApp.use(enumPath, rateLimit(limit));
@@ -51,6 +62,7 @@ export async function start(env, admin, port) {
         env.logger.debug("Env already defined");
     }
     await env.isReady();
+    env.cleanup();
     if (env.pair) {
         storeCaptchasExternally(env.pair, env.config).catch((err) => {
             console.error("Failed to start scheduler:", err);

package/dist/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAeA,OAAO,EACN,uBAAuB,EACvB,sCAAsC,GACtC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACN,4BAA4B,EAC5B,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,uBAAuB,GACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,EACN,2BAA2B,EAC3B,2BAA2B,GAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAE5C,SAAS,QAAQ,CAChB,GAAwB,EACxB,KAAK,GAAG,KAAK,EACb,IAAa;IAEb,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAExC,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,MAAM,OAAO,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IAE/C,MAAM,kBAAkB,GAAG,sCAAsC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9E,MAAM,qBAAqB,GAAG,2BAA2B,CACxD,GAAG,CAAC,KAAK,EAAE,CAAC,yBAAyB,EAAE,CACvC,CAAC;IACF,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC;IAGjE,MAAM,CAAC,GAAG,CACT,aAAa,EACb,GAAG,CAAC,MAAM,CAAC,UAAU,CACrB,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACnB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,CAAC,8BAA8B,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC;IAEvE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAE/B,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IAG9B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IAClD,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,CACT,uBAAuB,CAAC,YAAY,CACnC,qBAAqB,EACrB,kBAAkB,CAClB,CACD,CAAC;IACF,MAAM,CAAC,GAAG,CACT,uBAAuB,CAAC,YAAY,CACnC,sBAAsB,EAEtB,sCAAsC,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CACvD,CACD,CAAC;IAGF,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC;IAC/C,MAAM,UAAU,GAAG,EAAE,GAAG,gBAAgB,EAAE,GAAG,2BAA2B,EAAE,EAAE,CAAC;IAC7E,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAwB,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE;QAClC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAC1B,GAAyB,EACzB,KAAe,EACf,IAAa;IAEb,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;QAGV,KAAK,EAAE,CAAC;QAER,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE;YACnC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;YACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,MAAM,YAAY,CACrC,SAAS,EACT,MAAM,CAAC,WAAW,CAAC,OAAO,CAC1B,CAAC;QACF,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAGpB,GAAG,CAAC,OAAO,EAAE,CAAC;IAGd,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACd,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3D,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACjD,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAyB,EAAE,KAAe;IAExE,OAAO,MAAM,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/cli",
-	"version": "2.3.1",
+	"version": "2.4.1",
 	"description": "CLI for Prosopo Provider",
 	"main": "dist/index.js",
 	"type": "module",
@@ -29,25 +29,29 @@
 		"@polkadot/keyring": "12.6.2",
 		"@polkadot/types-codec": "10.13.1",
 		"@polkadot/util-crypto": "12.6.2",
-		"@prosopo/api": "2.3.1",
-		"@prosopo/common": "2.3.1",
-		"@prosopo/config": "2.3.1",
-		"@prosopo/dotenv": "2.3.1",
-		"@prosopo/env": "2.3.1",
-		"@prosopo/keyring": "2.3.1",
-		"@prosopo/locale": "2.3.1",
-		"@prosopo/provider": "2.3.1",
-		"@prosopo/types": "2.3.1",
-		"@prosopo/util": "2.3.1",
+		"@prosopo/api": "2.4.1",
+		"@prosopo/api-express-router": "2.4.1",
+		"@prosopo/common": "2.4.1",
+		"@prosopo/config": "2.4.1",
+		"@prosopo/dotenv": "2.4.1",
+		"@prosopo/env": "2.4.1",
+		"@prosopo/keyring": "2.4.1",
+		"@prosopo/locale": "2.4.1",
+		"@prosopo/provider": "2.4.1",
+		"@prosopo/types": "2.4.1",
+		"@prosopo/user-access-policy": "2.4.1",
+		"@prosopo/util": "2.4.1",
 		"cors": "2.8.5",
 		"cron-parser": "4.9.0",
 		"dotenv": "16.4.5",
 		"express-rate-limit": "7.4.0",
+		"has-proto": "1.2.0",
+		"ip-address": "10.0.1",
 		"yargs": "17.7.2",
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "2.3.1",
+		"@prosopo/config": "2.4.1",
 		"@types/cors": "2.8.17",
 		"@types/yargs": "17.0.33",
 		"@vitest/coverage-v8": "2.1.1",

package/dist/commands/addBlockRules.d.ts

@@ -1,29 +0,0 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
-import { type Logger } from "@prosopo/common";
-import { type ProsopoConfigOutput } from "@prosopo/types";
-import type { ArgumentsCamelCase, Argv } from "yargs";
-declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
-    logger?: Logger;
-}) => {
-    command: string;
-    describe: string;
-    builder: (yargs: Argv) => Argv<{
-        ips: (string | number)[] | undefined;
-    } & {
-        users: (string | number)[] | undefined;
-    } & {
-        dapp: string | undefined;
-    } & {
-        global: string | true;
-    } & {
-        hardBlock: string | false;
-    } & {
-        solved: number | undefined;
-    } & {
-        unsolved: number | undefined;
-    }>;
-    handler: (argv: ArgumentsCamelCase) => Promise<void>;
-    middlewares: never[];
-};
-export default _default;
-//# sourceMappingURL=addBlockRules.d.ts.map

package/dist/commands/addBlockRules.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"addBlockRules.d.ts","sourceRoot":"","sources":["../../src/commands/addBlockRules.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,EAIN,KAAK,mBAAmB,EACxB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAG/C,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBASX,IAAI;;;;;;;;;;;;;;;oBAwCC,kBAAkB;;;AApD1C,wBAuGE"}