Release 2.1.11 (#1510)

prosopo · Nov 11, 2024 · d7e2257 · d7e2257
2 parents 38c651f + aaca233
commit d7e2257
Show file tree

Hide file tree

Showing 103 changed files with 23,342 additions and 22,615 deletions.
diff --git a/.npmrc b/.npmrc
@@ -4,4 +4,3 @@ fetch-retries=100 # try 100 times to download a pkg
 fetch-retry-mintimeout=1 # 1ms between retries minimum
 fetch-retry-maxtimeout=10000 # 10s between retries maximum
 fetch-retry-factor=2 # increase timeout by 2x each retry
-prefer-offline=true # don't hit the network for packages that are already in the cache
diff --git a/demos/client-bundle-example/package.json b/demos/client-bundle-example/package.json
@@ -13,9 +13,9 @@
 		"start": "vite serve ./src --port 9232 --config vite.config.ts",
 		"clean": "echo 'nothing to clean'"
 	},
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"devDependencies": {
-		"@prosopo/dotenv": "2.1.10",
+		"@prosopo/dotenv": "2.1.11",
 		"@types/node": "22.5.5",
 		"@vitest/coverage-v8": "2.1.1",
 		"concurrently": "9.0.1",

diff --git a/demos/client-example-server/package.json b/demos/client-example-server/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/client-example-server",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"description": "Backend for client-example",
 	"main": "dist/app.js",
 	"type": "module",
@@ -32,12 +32,12 @@
 		"@noble/hashes": "1.5.0",
 		"@polkadot/util": "12.6.2",
 		"@polkadot/util-crypto": "12.6.2",
-		"@prosopo/common": "2.1.10",
-		"@prosopo/contract": "2.1.10",
-		"@prosopo/dotenv": "2.1.10",
-		"@prosopo/server": "2.1.10",
-		"@prosopo/types": "2.1.10",
-		"@prosopo/util": "2.1.10",
+		"@prosopo/common": "2.1.11",
+		"@prosopo/contract": "2.1.11",
+		"@prosopo/dotenv": "2.1.11",
+		"@prosopo/server": "2.1.11",
+		"@prosopo/types": "2.1.11",
+		"@prosopo/util": "2.1.11",
 		"@typegoose/auto-increment": "4.6.0",
 		"cors": "2.8.5",
 		"express": "4.21.0",
@@ -47,7 +47,7 @@
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "2.1.10",
+		"@prosopo/config": "2.1.11",
 		"@types/jsonwebtoken": "9.0.6",
 		"@vitest/coverage-v8": "2.1.1",
 		"concurrently": "9.0.1",

diff --git a/demos/client-example/package.json b/demos/client-example/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/client-example",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"private": true,
 	"type": "module",
 	"engines": {
@@ -13,14 +13,14 @@
 		"@mui/material": "5.9.1",
 		"@polkadot/extension-dapp": "0.46.9",
 		"@polkadot/extension-inject": "0.46.9",
-		"@prosopo/common": "2.1.10",
-		"@prosopo/locale-browser": "2.1.10",
-		"@prosopo/procaptcha-frictionless": "2.1.10",
-		"@prosopo/procaptcha-pow": "2.1.10",
-		"@prosopo/procaptcha-react": "2.1.10",
-		"@prosopo/server": "2.1.10",
-		"@prosopo/types": "2.1.10",
-		"@prosopo/vite-plugin-watch-workspace": "2.1.10",
+		"@prosopo/common": "2.1.11",
+		"@prosopo/locale-browser": "2.1.11",
+		"@prosopo/procaptcha-frictionless": "2.1.11",
+		"@prosopo/procaptcha-pow": "2.1.11",
+		"@prosopo/procaptcha-react": "2.1.11",
+		"@prosopo/server": "2.1.11",
+		"@prosopo/types": "2.1.11",
+		"@prosopo/vite-plugin-watch-workspace": "2.1.11",
 		"@types/react-dom": "18.3.0",
 		"@vitejs/plugin-react": "4.3.1",
 		"react": "18.3.1",
@@ -40,8 +40,8 @@
 		}
 	},
 	"devDependencies": {
-		"@prosopo/config": "2.1.10",
-		"@prosopo/dotenv": "2.1.10",
+		"@prosopo/config": "2.1.11",
+		"@prosopo/dotenv": "2.1.11",
 		"@types/node": "22.5.5",
 		"@vitest/coverage-v8": "2.1.1",
 		"concurrently": "9.0.1",

diff --git a/demos/cypress-shared/cypress/e2e/captcha.cy.ts b/demos/cypress-shared/cypress/e2e/captcha.cy.ts
@@ -17,7 +17,11 @@ import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
 import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
-import { AdminApiPaths, type Captcha } from "@prosopo/types";
+import {
+	AdminApiPaths,
+	type Captcha,
+	type IUserSettings,
+} from "@prosopo/types";
 import { at } from "@prosopo/util";
 import { checkboxClass } from "../support/commands.js";
 
@@ -27,6 +31,12 @@ describe("Captchas", () => {
 		const pair = await getPairAsync(Cypress.env("PROSOPO_PROVIDER_MNEMONIC"));
 		const signature = u8aToHex(pair.sign(timestamp.toString()));
 		const adminSiteKeyURL = `http://localhost:9229${AdminApiPaths.SiteKeyRegister}`;
+		const settings: IUserSettings = {
+			captchaType: "pow",
+			domains: ["0.0.0.0"],
+			frictionlessThreshold: 0.5,
+			powDifficulty: 2,
+		};
 		await fetch(adminSiteKeyURL, {
 			method: "POST",
 			headers: {
@@ -36,6 +46,7 @@ describe("Captchas", () => {
 			},
 			body: JSON.stringify({
 				siteKey: Cypress.env("PROSOPO_SITE_KEY"),
+				settings,
 			}),
 		});
 	});

diff --git a/demos/cypress-shared/cypress/e2e/correct.captcha.cy.ts b/demos/cypress-shared/cypress/e2e/correct.captcha.cy.ts
@@ -17,7 +17,11 @@ import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
 import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
-import { AdminApiPaths, type Captcha } from "@prosopo/types";
+import {
+	AdminApiPaths,
+	type Captcha,
+	type IUserSettings,
+} from "@prosopo/types";
 import { checkboxClass } from "../support/commands.js";
 
 describe("Captchas", () => {
@@ -26,6 +30,12 @@ describe("Captchas", () => {
 		const pair = await getPairAsync(Cypress.env("PROSOPO_PROVIDER_MNEMONIC"));
 		const signature = u8aToHex(pair.sign(timestamp.toString()));
 		const adminSiteKeyURL = `http://localhost:9229${AdminApiPaths.SiteKeyRegister}`;
+		const settings: IUserSettings = {
+			captchaType: "pow",
+			domains: ["0.0.0.0"],
+			frictionlessThreshold: 0.5,
+			powDifficulty: 2,
+		};
 		await fetch(adminSiteKeyURL, {
 			method: "POST",
 			headers: {
@@ -35,6 +45,7 @@ describe("Captchas", () => {
 			},
 			body: JSON.stringify({
 				siteKey: Cypress.env("PROSOPO_SITE_KEY"),
+				settings,
 			}),
 		});
 	});

diff --git a/demos/cypress-shared/cypress/e2e/correct.captcha.signup.cy.ts b/demos/cypress-shared/cypress/e2e/correct.captcha.signup.cy.ts
@@ -17,7 +17,11 @@ import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
 import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
-import { AdminApiPaths, type Captcha } from "@prosopo/types";
+import {
+	AdminApiPaths,
+	type Captcha,
+	type IUserSettings,
+} from "@prosopo/types";
 import { checkboxClass } from "../support/commands.js";
 
 describe("Captchas", () => {
@@ -26,6 +30,12 @@ describe("Captchas", () => {
 		const pair = await getPairAsync(Cypress.env("PROSOPO_PROVIDER_MNEMONIC"));
 		const signature = u8aToHex(pair.sign(timestamp.toString()));
 		const adminSiteKeyURL = `http://localhost:9229${AdminApiPaths.SiteKeyRegister}`;
+		const settings: IUserSettings = {
+			captchaType: "pow",
+			domains: ["0.0.0.0"],
+			frictionlessThreshold: 0.5,
+			powDifficulty: 2,
+		};
 		await fetch(adminSiteKeyURL, {
 			method: "POST",
 			headers: {
@@ -35,6 +45,7 @@ describe("Captchas", () => {
 			},
 			body: JSON.stringify({
 				siteKey: Cypress.env("PROSOPO_SITE_KEY"),
+				settings,
 			}),
 		});
 	});

diff --git a/demos/cypress-shared/cypress/support/commands.ts b/demos/cypress-shared/cypress/support/commands.ts
@@ -35,7 +35,9 @@ declare global {
 
 export const checkboxClass = '[type="checkbox"]';
 function clickIAmHuman(): Cypress.Chainable<Captcha[]> {
-	cy.intercept("GET", "**/prosopo/provider/captcha/**").as("getCaptcha");
+	cy.intercept("POST", "**/prosopo/provider/client/captcha/**").as(
+		"getCaptcha",
+	);
 	cy.get(checkboxClass, { timeout: 12000 }).first().click();
 
 	return cy
@@ -131,7 +133,9 @@ function clickCorrectCaptchaImages(
 }
 
 function clickNextButton() {
-	cy.intercept("POST", "**/prosopo/provider/solution").as("postSolution");
+	cy.intercept("POST", "**/prosopo/provider/client/solution").as(
+		"postSolution",
+	);
 	// Go to the next captcha or submit solution
 	cy.get('button[data-cy="button-next"]').click({ force: true });
 	cy.wait(0);

diff --git a/demos/cypress-shared/package.json b/demos/cypress-shared/package.json
@@ -1,21 +1,21 @@
 {
 	"name": "@prosopo/cypress-shared",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"private": true,
 	"type": "module",
 	"engines": {
 		"node": "20",
 		"npm": ">=9"
 	},
 	"dependencies": {
-		"@prosopo/types": "2.1.10",
-		"@prosopo/util": "2.1.10"
+		"@prosopo/types": "2.1.11",
+		"@prosopo/util": "2.1.11"
 	},
 	"devDependencies": {
 		"@cypress/xpath": "2.0.3",
-		"@prosopo/common": "2.1.10",
-		"@prosopo/datasets": "2.1.10",
-		"@prosopo/types-database": "2.1.10",
+		"@prosopo/common": "2.1.11",
+		"@prosopo/datasets": "2.1.11",
+		"@prosopo/types-database": "2.1.11",
 		"@types/node": "22.5.5",
 		"@vitest/coverage-v8": "2.1.1",
 		"concurrently": "9.0.1",

diff --git a/demos/provider-mock/package.json b/demos/provider-mock/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/provider-mock",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"author": "PROSOPO LIMITED <[email protected]>",
 	"license": "Apache-2.0",
 	"main": "./dist/index.js",
@@ -16,9 +16,9 @@
 		"build:cjs": "echo 'no cjs build'"
 	},
 	"dependencies": {
-		"@prosopo/common": "2.1.10",
-		"@prosopo/provider": "2.1.10",
-		"@prosopo/types": "2.1.10",
+		"@prosopo/common": "2.1.11",
+		"@prosopo/provider": "2.1.11",
+		"@prosopo/types": "2.1.11",
 		"cors": "2.8.5",
 		"express": "4.21.0"
 	},

diff --git a/dev/config/package.json b/dev/config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/config",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"description": "Prosopo config library",
 	"main": "./dist/index.js",
 	"type": "module",
@@ -36,9 +36,9 @@
 		"@babel/plugin-transform-react-jsx": "7.25.2",
 		"@babel/plugin-transform-runtime": "7.25.4",
 		"@babel/preset-env": "7.25.4",
-		"@prosopo/common": "2.1.10",
-		"@prosopo/types": "2.1.10",
-		"@prosopo/util": "2.1.10",
+		"@prosopo/common": "2.1.11",
+		"@prosopo/types": "2.1.11",
+		"@prosopo/util": "2.1.11",
 		"@rollup/plugin-alias": "5.1.0",
 		"@rollup/plugin-babel": "6.0.4",
 		"@rollup/plugin-commonjs": "26.0.1",

diff --git a/dev/flux/package.json b/dev/flux/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/flux",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"description": "Tools for managing Flux deployment",
 	"main": "dist/index.js",
 	"bin": {
@@ -24,10 +24,10 @@
 		"@noble/curves": "1.6.0",
 		"@polkadot/util": "12.6.2",
 		"@polkadot/util-crypto": "12.6.2",
-		"@prosopo/common": "2.1.10",
-		"@prosopo/config": "2.1.10",
-		"@prosopo/dotenv": "2.1.10",
-		"@prosopo/util": "2.1.10",
+		"@prosopo/common": "2.1.11",
+		"@prosopo/config": "2.1.11",
+		"@prosopo/dotenv": "2.1.11",
+		"@prosopo/util": "2.1.11",
 		"openpgp": "5.11.2",
 		"qs": "6.13.0",
 		"socket.io-client": "4.7.5",

diff --git a/dev/gh-actions/package.json b/dev/gh-actions/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/gh-actions",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"description": "",
 	"private": true,
 	"scripts": {

diff --git a/dev/lint/package.json b/dev/lint/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/lint",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"description": "",
 	"private": true,
 	"scripts": {
@@ -37,7 +37,7 @@
 		"npm": ">=9"
 	},
 	"dependencies": {
-		"@prosopo/util": "2.1.10",
+		"@prosopo/util": "2.1.11",
 		"fast-glob": "3.3.2",
 		"zod": "3.23.8"
 	}

diff --git a/dev/prosoponator-bot/package.json b/dev/prosoponator-bot/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/prosoponator-bot",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"description": "",
 	"private": true,
 	"scripts": {

diff --git a/dev/scripts/env.development b/dev/scripts/env.development
@@ -18,7 +18,7 @@ PROSOPO_DEFAULT_ENVIRONMENT=development
 PROSOPO_LOG_LEVEL=debug
 PROSOPO_MONGO_CAPTCHA_URI=
 PROSOPO_MONGO_EVENTS_URI=mongodb+srv://<MONGO_URI_HERE>/frictionless_events
-PROSOPO_PACKAGE_VERSION=2.1.10
+PROSOPO_PACKAGE_VERSION=2.1.11
 PROSOPO_PROVIDER_ACCOUNT_PASSWORD=
 PROSOPO_PROVIDER_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
 PROSOPO_PROVIDER_JSON=
@@ -32,4 +32,6 @@ WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
 WATCHTOWER_NOTIFICATIONS=
 WATCHTOWER_POLL_INTERVAL=30
 WATCHTOWER_REMOVE_VOLUMES=true
-
+PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
+PROSOPO_ADMIN_JSON=
+PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant
diff --git a/dev/scripts/env.production b/dev/scripts/env.production
@@ -16,7 +16,7 @@ PROSOPO_DEFAULT_ENVIRONMENT=production
 PROSOPO_LOG_LEVEL=info
 PROSOPO_MONGO_CAPTCHA_URI=
 PROSOPO_MONGO_EVENTS_URI=mongodb+srv://<MONGO_URI_HERE>/frictionless_events
-PROSOPO_PACKAGE_VERSION=2.1.10
+PROSOPO_PACKAGE_VERSION=2.1.11
 PROSOPO_PROVIDER_ACCOUNT_PASSWORD=
 PROSOPO_PROVIDER_ADDRESS=
 PROSOPO_PROVIDER_JSON=

diff --git a/dev/scripts/env.staging b/dev/scripts/env.staging
@@ -21,7 +21,7 @@ PROSOPO_DEFAULT_ENVIRONMENT=staging
 PROSOPO_LOG_LEVEL=info
 PROSOPO_MONGO_CAPTCHA_URI=
 PROSOPO_MONGO_EVENTS_URI=mongodb+srv://<MONGO_URI_HERE>/frictionless_events
-PROSOPO_PACKAGE_VERSION=2.1.10
+PROSOPO_PACKAGE_VERSION=2.1.11
 PROSOPO_PROVIDER_ACCOUNT_PASSWORD=
 PROSOPO_PROVIDER_ADDRESS=
 PROSOPO_PROVIDER_JSON=
@@ -35,3 +35,6 @@ WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
 WATCHTOWER_NOTIFICATIONS=
 WATCHTOWER_POLL_INTERVAL=30
 WATCHTOWER_REMOVE_VOLUMES=true
+PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
+PROSOPO_ADMIN_JSON=
+PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant