Release 2.0.2

.github/workflows/prosoponator_bot.yml

@@ -7,7 +7,7 @@ on: issue_comment
 jobs:
     comment:
         # This job only runs for pull request comments
-        if: ${{ github.event.issue.pull_request }}
+        if: ${{ github.event.issue.pull_request }} && github.event.pull_request.draft == false
         runs-on: ubuntu-latest
         steps:
             - name: Print contexts

demos/client-bundle-example/package.json

@@ -1,23 +1,23 @@
 {
-	"name": "@prosopo/client-bundle-example",
-	"main": "index.js",
-	"engines": {
-		"node": ">=20",
-		"npm": ">=9"
-	},
-	"scripts": {
-		"test": "echo \"No test specified\"",
-		"build": "echo \"No build specified\"",
-		"start": "vite serve ./src --port 9232 --config vite.config.ts",
-		"clean": "echo 'nothing to clean'"
-	},
-	"dependencies": {
-		"dotenv": "^16.0.1",
-		"vite": "^5.1.7"
-	},
-	"version": "2.0.1",
-	"devDependencies": {
-		"tslib": "2.6.2",
-		"typescript": "5.1.6"
-	}
+  "name": "@prosopo/client-bundle-example",
+  "main": "index.js",
+  "engines": {
+    "node": ">=20",
+    "npm": ">=9"
+  },
+  "scripts": {
+    "test": "echo \"No test specified\"",
+    "build": "echo \"No build specified\"",
+    "start": "vite serve ./src --port 9232 --config vite.config.ts",
+    "clean": "echo 'nothing to clean'"
+  },
+  "dependencies": {
+    "dotenv": "^16.0.1",
+    "vite": "^5.1.7"
+  },
+  "version": "2.0.2",
+  "devDependencies": {
+    "tslib": "2.6.2",
+    "typescript": "5.1.6"
+  }
 }

demos/client-bundle-example/src/jsBundleTest.html

@@ -15,7 +15,7 @@
             <div
                 class="procaptcha"
                 data-theme="light"
-                data-sitekey="5HUBceb4Du6dvMA9BiwN5VzUrzUsX9Zp7z7nSR2cC1TCv5jg"
+                data-sitekey="5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw"
             ></div>
         </form>
     </body>

demos/client-example-server/env.development

@@ -1,13 +1,10 @@
 PROSOPO_VERIFY_ENDPOINT=http://localhost:9237/dev/siteverify
 PROSOPO_VERIFICATION_TYPE=local
 PROSOPO_SITE_KEY=5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw
-PROSOPO_SUBSTRATE_ENDPOINT=ws://localhost:9944
-PROSOPO_CONTRACT_ADDRESS=
 PROSOPO_WEB2=true
 PROSOPO_SERVER_URL=https://localhost
 PROSOPO_SITE_PRIVATE_KEY=//Eve
 PROSOPO_SERVER_PORT=9228
 PROSOPO_DEFAULT_ENVIRONMENT=development
-PROSOPO_DEFAULT_NETWORK=development
 PROSOPO_MONGO_EVENTS_URI=mongodb+srv://<MONGO_URI_HERE>/frictionless_events
-_DEV_ONLY_WATCH_EVENTS=false
+_DEV_ONLY_WATCH_EVENTS=false

demos/client-example-server/package.json

@@ -1,52 +1,52 @@
 {
-	"name": "@prosopo/client-example-server",
-	"version": "2.0.1",
-	"description": "Backend for client-example",
-	"main": "dist/app.js",
-	"type": "module",
-	"engines": {
-		"node": ">=20",
-		"npm": ">=9"
-	},
-	"scripts": {
-		"test": "echo \"No test specified\"",
-		"dev": "NODE_ENV=${NODE_ENV:-development}; vite serve --mode=$NODE_ENV --config ./vite.config.ts --host",
-		"start": "node ./dist/app.js",
-		"start:bundle": "node ./dist/bundle/prosopo_client_example_server.app.bundle.js",
-		"build": "tsc --build --verbose",
-		"bundle": "NODE_ENV=${NODE_ENV:-production}; vite build --mode=$NODE_ENV --config ./vite.config.ts",
-		"clean": "tsc --build --clean"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/prosopo/client-example-server.git"
-	},
-	"author": "PROSOPO LIMITED <info@prosopo.io>",
-	"license": "Apache-2.0",
-	"bugs": {
-		"url": "https://github.com/prosopo/client-example-server/issues"
-	},
-	"homepage": "https://github.com/prosopo/client-example-server#readme",
-	"dependencies": {
-		"@noble/hashes": "^1.3.1",
-		"@polkadot/util": "12.6.2",
-		"@polkadot/util-crypto": "12.6.2",
-		"@prosopo/api": "2.0.1",
-		"@prosopo/contract": "2.0.1",
-		"@prosopo/procaptcha": "2.0.1",
-		"@prosopo/server": "2.0.1",
-		"@prosopo/types": "2.0.1",
-		"@typegoose/auto-increment": "^4.5.0",
-		"cors": "^2.8.5",
-		"jsonwebtoken": "^9.0.0",
-		"mongoose": "^8.5.1",
-		"zod": "^3.22.3"
-	},
-	"devDependencies": {
-		"@prosopo/config": "2.0.1",
-		"@types/jsonwebtoken": "^9.0.2",
-		"tslib": "2.6.2",
-		"typescript": "5.1.6",
-		"vite": "^5.1.7"
-	}
+  "name": "@prosopo/client-example-server",
+  "version": "2.0.2",
+  "description": "Backend for client-example",
+  "main": "dist/app.js",
+  "type": "module",
+  "engines": {
+    "node": ">=20",
+    "npm": ">=9"
+  },
+  "scripts": {
+    "test": "echo \"No test specified\"",
+    "dev": "NODE_ENV=${NODE_ENV:-development}; vite serve --mode=$NODE_ENV --config ./vite.config.ts --host",
+    "start": "node ./dist/app.js",
+    "start:bundle": "node ./dist/bundle/prosopo_client_example_server.app.bundle.js",
+    "build": "tsc --build --verbose",
+    "bundle": "NODE_ENV=${NODE_ENV:-production}; vite build --mode=$NODE_ENV --config ./vite.config.ts",
+    "clean": "tsc --build --clean"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/prosopo/client-example-server.git"
+  },
+  "author": "PROSOPO LIMITED <info@prosopo.io>",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/prosopo/client-example-server/issues"
+  },
+  "homepage": "https://github.com/prosopo/client-example-server#readme",
+  "dependencies": {
+    "@noble/hashes": "^1.3.1",
+    "@polkadot/util": "12.6.2",
+    "@polkadot/util-crypto": "12.6.2",
+    "@prosopo/api": "2.0.2",
+    "@prosopo/dotenv": "2.0.2",
+    "@prosopo/procaptcha": "2.0.2",
+    "@prosopo/server": "2.0.2",
+    "@prosopo/types": "2.0.2",
+    "@typegoose/auto-increment": "^4.5.0",
+    "cors": "^2.8.5",
+    "jsonwebtoken": "^9.0.0",
+    "mongoose": "^8.5.1",
+    "zod": "^3.22.3"
+  },
+  "devDependencies": {
+    "@prosopo/config": "2.0.2",
+    "@types/jsonwebtoken": "^9.0.2",
+    "tslib": "2.6.2",
+    "typescript": "5.1.6",
+    "vite": "^5.1.7"
+  }
 }

demos/client-example-server/src/app.ts

@@ -16,15 +16,13 @@ import { ProsopoEnvError, getLoggerDefault } from "@prosopo/common";
 import { getServerConfig } from "@prosopo/server";
 import { at } from "@prosopo/util";
 import cors from "cors";
-import dotenv from "dotenv";
+import { loadEnv } from "@prosopo/dotenv";
 import express from "express";
 import routesFactory from "./routes/routes.js";
 import connectionFactory from "./utils/connection.js";
 import memoryServerSetup from "./utils/database.js";
 
-export function loadEnv() {
-  dotenv.config({ path: getEnvFile() });
-}
+loadEnv();
 
 export function getEnvFile(filename = ".env", filepath = "./") {
   const env = process.env.NODE_ENV || "development";

demos/client-example-server/src/controllers/auth.ts

@@ -1,9 +1,3 @@
-import { blake2b } from "@noble/hashes/blake2b";
-import { u8aToHex } from "@polkadot/util";
-import { randomAsHex } from "@polkadot/util-crypto";
-import { ProsopoEnvError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
-import { ProsopoServer } from "@prosopo/server";
 // Copyright 2021-2024 Prosopo (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +11,13 @@ import { ProsopoServer } from "@prosopo/server";
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+import { blake2b } from "@noble/hashes/blake2b";
+import { u8aToHex } from "@polkadot/util";
+import { randomAsHex } from "@polkadot/util-crypto";
+import { ProsopoEnvError } from "@prosopo/common";
+import { getPairAsync } from "@prosopo/contract";
+import { ProsopoServer } from "@prosopo/server";
 import {
   ApiParams,
   type ProcaptchaToken,
@@ -86,7 +87,6 @@ const signup = async (
     });
     const payload = SubscribeBodySpec.parse(req.body);
     const pair = await getPairAsync(
-      config.networks[config.defaultNetwork],
       config.account.secret,
     );
     const prosopoServer = new ProsopoServer(config, pair);
@@ -153,7 +153,6 @@ const login = async (
 ) => {
   const User = mongoose.model<UserInterface>("User");
   const pair = await getPairAsync(
-    config.networks[config.defaultNetwork],
     config.account.secret,
   );
   const prosopoServer = new ProsopoServer(config, pair);

demos/client-example-server/vite.config.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import * as path from "node:path";
-import { loadEnv } from "@prosopo/cli";
+import { loadEnv } from "@prosopo/dotenv";
 import { ViteBackendConfig } from "@prosopo/config";
 import { defineConfig } from "vite";
 import { version } from "./package.json";
@@ -31,17 +31,17 @@ process.env.TS_NODE_PROJECT = path.resolve("./tsconfig.json");
 
 // Merge with generic backend config
 export default defineConfig(async ({ command, mode }) => {
-	const backendConfig = await ViteBackendConfig(
-		packageName,
-		packageVersion,
-		bundleName,
-		dir,
-		entry,
-		command,
-		mode,
-	);
-	return defineConfig({
-		...backendConfig,
-		server: { port: process.env.PROSOPO_SERVER_PORT },
-	});
+  const backendConfig = await ViteBackendConfig(
+    packageName,
+    packageVersion,
+    bundleName,
+    dir,
+    entry,
+    command,
+    mode,
+  );
+  return defineConfig({
+    ...backendConfig,
+    server: { port: process.env.PROSOPO_SERVER_PORT },
+  });
 });

demos/client-example/env.development

@@ -1,10 +1,8 @@
 PROSOPO_SITE_KEY=5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw
 PROSOPO_SUBSTRATE_ENDPOINT=ws://127.0.0.1:9944
-PROSOPO_CONTRACT_ADDRESS=
 PROSOPO_WEB2=true
 PROSOPO_SERVER_URL=http://localhost
 PROSOPO_PORT=9230
-PROSOPO_DEFAULT_NETWORK=development
 PROSOPO_DEFAULT_ENVIRONMENT=development
 PROSOPO_MONGO_EVENTS_URI=mongodb+srv://<MONGO_URI_HERE>/frictionless_events
 _DEV_ONLY_WATCH_EVENTS=false