Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring staging up to date with main #1478

Merged
merged 16 commits into from
Oct 28, 2024
Merged

Bring staging up to date with main #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
86b3ada
Merge branch 'main' into staging
forgetso Oct 18, 2024
001ffce
Merge branch 'staging' of github.com:prosopo/captcha into staging
forgetso Oct 18, 2024
7ebc5f4
Merge branch 'staging' of github.com:prosopo/captcha into staging
forgetso Oct 25, 2024
4ad2f76
Store IPs as numbers. Allow IPs to be blocked
forgetso Oct 26, 2024
22a76a1
Add ipaddress package
forgetso Oct 26, 2024
0ca9f8a
Get block middleware working
forgetso Oct 27, 2024
11e065c
User block rules
forgetso Oct 28, 2024
a66f8e0
Allow IP rules to be dapp level
forgetso Oct 28, 2024
3e0e2ab
debug and get rid of dev provider
forgetso Oct 28, 2024
fca1158
Get block rule importing working
forgetso Oct 28, 2024
2b3fca1
Add missing translations
forgetso Oct 28, 2024
9efa2e2
Use proper IP addresses in tests
forgetso Oct 28, 2024
c58fabd
Make sure some functions are present in unit tests
forgetso Oct 28, 2024
bd39c2f
Ip address blocking (#1477)
forgetso Oct 28, 2024
10ab2c0
Bump version to 2.1.8
prosoponator Oct 28, 2024
d6b87c9
Release 2.1.8 (#1480)
forgetso Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demos/client-bundle-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"start": "vite serve ./src --port 9232 --config vite.config.ts",
"clean": "echo 'nothing to clean'"
},
"version": "2.1.7",
"version": "2.1.8",
"devDependencies": {
"@prosopo/dotenv": "2.1.7",
"@prosopo/dotenv": "2.1.8",
"@types/node": "22.5.5",
"@vitest/coverage-v8": "2.1.1",
"concurrently": "9.0.1",
Expand Down
16 changes: 8 additions & 8 deletions demos/client-example-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/client-example-server",
"version": "2.1.7",
"version": "2.1.8",
"description": "Backend for client-example",
"main": "dist/app.js",
"type": "module",
Expand Down Expand Up @@ -32,12 +32,12 @@
"@noble/hashes": "1.5.0",
"@polkadot/util": "12.6.2",
"@polkadot/util-crypto": "12.6.2",
"@prosopo/common": "2.1.7",
"@prosopo/contract": "2.1.7",
"@prosopo/dotenv": "2.1.7",
"@prosopo/server": "2.1.7",
"@prosopo/types": "2.1.7",
"@prosopo/util": "2.1.7",
"@prosopo/common": "2.1.8",
"@prosopo/contract": "2.1.8",
"@prosopo/dotenv": "2.1.8",
"@prosopo/server": "2.1.8",
"@prosopo/types": "2.1.8",
"@prosopo/util": "2.1.8",
"@typegoose/auto-increment": "4.6.0",
"cors": "2.8.5",
"express": "4.21.0",
Expand All @@ -47,7 +47,7 @@
"zod": "3.23.8"
},
"devDependencies": {
"@prosopo/config": "2.1.7",
"@prosopo/config": "2.1.8",
"@types/jsonwebtoken": "9.0.6",
"@vitest/coverage-v8": "2.1.1",
"concurrently": "9.0.1",
Expand Down
22 changes: 11 additions & 11 deletions demos/client-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/client-example",
"version": "2.1.7",
"version": "2.1.8",
"private": true,
"type": "module",
"engines": {
Expand All @@ -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.7",
"@prosopo/locale-browser": "2.1.7",
"@prosopo/procaptcha-frictionless": "2.1.7",
"@prosopo/procaptcha-pow": "2.1.7",
"@prosopo/procaptcha-react": "2.1.7",
"@prosopo/server": "2.1.7",
"@prosopo/types": "2.1.7",
"@prosopo/vite-plugin-watch-workspace": "2.1.7",
"@prosopo/common": "2.1.8",
"@prosopo/locale-browser": "2.1.8",
"@prosopo/procaptcha-frictionless": "2.1.8",
"@prosopo/procaptcha-pow": "2.1.8",
"@prosopo/procaptcha-react": "2.1.8",
"@prosopo/server": "2.1.8",
"@prosopo/types": "2.1.8",
"@prosopo/vite-plugin-watch-workspace": "2.1.8",
"@types/react-dom": "18.3.0",
"@vitejs/plugin-react": "4.3.1",
"react": "18.3.1",
Expand All @@ -40,8 +40,8 @@
}
},
"devDependencies": {
"@prosopo/config": "2.1.7",
"@prosopo/dotenv": "2.1.7",
"@prosopo/config": "2.1.8",
"@prosopo/dotenv": "2.1.8",
"@types/node": "22.5.5",
"@vitest/coverage-v8": "2.1.1",
"concurrently": "9.0.1",
Expand Down
12 changes: 6 additions & 6 deletions demos/cypress-shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"name": "@prosopo/cypress-shared",
"version": "2.1.7",
"version": "2.1.8",
"private": true,
"type": "module",
"engines": {
"node": ">=20",
"npm": ">=9"
},
"dependencies": {
"@prosopo/types": "2.1.7",
"@prosopo/util": "2.1.7"
"@prosopo/types": "2.1.8",
"@prosopo/util": "2.1.8"
},
"devDependencies": {
"@cypress/xpath": "2.0.3",
"@prosopo/common": "2.1.7",
"@prosopo/datasets": "2.1.7",
"@prosopo/types-database": "2.1.7",
"@prosopo/common": "2.1.8",
"@prosopo/datasets": "2.1.8",
"@prosopo/types-database": "2.1.8",
"@types/node": "22.5.5",
"@vitest/coverage-v8": "2.1.1",
"concurrently": "9.0.1",
Expand Down
8 changes: 4 additions & 4 deletions demos/provider-mock/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/provider-mock",
"version": "2.1.7",
"version": "2.1.8",
"author": "PROSOPO LIMITED <[email protected]>",
"license": "Apache-2.0",
"main": "./dist/index.js",
Expand All @@ -16,9 +16,9 @@
"build:cjs": "echo 'no cjs build'"
},
"dependencies": {
"@prosopo/common": "2.1.7",
"@prosopo/provider": "2.1.7",
"@prosopo/types": "2.1.7",
"@prosopo/common": "2.1.8",
"@prosopo/provider": "2.1.8",
"@prosopo/types": "2.1.8",
"cors": "2.8.5",
"express": "4.21.0"
},
Expand Down
8 changes: 4 additions & 4 deletions dev/config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/config",
"version": "2.1.7",
"version": "2.1.8",
"description": "Prosopo config library",
"main": "./dist/index.js",
"type": "module",
Expand Down Expand Up @@ -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.7",
"@prosopo/types": "2.1.7",
"@prosopo/util": "2.1.7",
"@prosopo/common": "2.1.8",
"@prosopo/types": "2.1.8",
"@prosopo/util": "2.1.8",
"@rollup/plugin-alias": "5.1.0",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "26.0.1",
Expand Down
10 changes: 5 additions & 5 deletions dev/flux/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/flux",
"version": "2.1.7",
"version": "2.1.8",
"description": "Tools for managing Flux deployment",
"main": "dist/index.js",
"bin": {
Expand All @@ -24,10 +24,10 @@
"@noble/curves": "1.6.0",
"@polkadot/util": "12.6.2",
"@polkadot/util-crypto": "12.6.2",
"@prosopo/common": "2.1.7",
"@prosopo/config": "2.1.7",
"@prosopo/dotenv": "2.1.7",
"@prosopo/util": "2.1.7",
"@prosopo/common": "2.1.8",
"@prosopo/config": "2.1.8",
"@prosopo/dotenv": "2.1.8",
"@prosopo/util": "2.1.8",
"openpgp": "5.11.2",
"qs": "6.13.0",
"socket.io-client": "4.7.5",
Expand Down
2 changes: 1 addition & 1 deletion dev/gh-actions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/gh-actions",
"version": "2.1.7",
"version": "2.1.8",
"description": "",
"private": true,
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions dev/lint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/lint",
"version": "2.1.7",
"version": "2.1.8",
"description": "",
"private": true,
"scripts": {
Expand Down Expand Up @@ -37,7 +37,7 @@
"npm": ">=9"
},
"dependencies": {
"@prosopo/util": "2.1.7",
"@prosopo/util": "2.1.8",
"fast-glob": "3.3.2",
"zod": "3.23.8"
}
Expand Down
2 changes: 1 addition & 1 deletion dev/prosoponator-bot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/prosoponator-bot",
"version": "2.1.7",
"version": "2.1.8",
"description": "",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion dev/scripts/env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
PROSOPO_PACKAGE_VERSION=2.1.8
PROSOPO_PROVIDER_ACCOUNT_PASSWORD=
PROSOPO_PROVIDER_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
PROSOPO_PROVIDER_JSON=
Expand Down
2 changes: 1 addition & 1 deletion dev/scripts/env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
PROSOPO_PACKAGE_VERSION=2.1.8
PROSOPO_PROVIDER_ACCOUNT_PASSWORD=
PROSOPO_PROVIDER_ADDRESS=
PROSOPO_PROVIDER_JSON=
Expand Down
2 changes: 1 addition & 1 deletion dev/scripts/env.staging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
PROSOPO_PACKAGE_VERSION=2.1.8
PROSOPO_PROVIDER_ACCOUNT_PASSWORD=
PROSOPO_PROVIDER_ADDRESS=
PROSOPO_PROVIDER_JSON=
Expand Down
2 changes: 1 addition & 1 deletion dev/scripts/env.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PROSOPO_DEFAULT_ENVIRONMENT=development
PROSOPO_LOG_LEVEL=info
PROSOPO_MONGO_CAPTCHA_URI=mongodb://root:root@localhost:27017/captchastorage?authSource=admin
PROSOPO_MONGO_EVENTS_URI=mongodb+srv://<MONGO_URI_HERE>/frictionless_events
PROSOPO_PACKAGE_VERSION=2.1.7
PROSOPO_PACKAGE_VERSION=2.1.8
PROSOPO_PROVIDER_ACCOUNT_PASSWORD=
PROSOPO_PROVIDER_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
PROSOPO_PROVIDER_JSON=
Expand Down
26 changes: 13 additions & 13 deletions dev/scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prosopo/scripts",
"version": "2.1.7",
"version": "2.1.8",
"description": "Dev scripts for working with prosopo packages",
"main": "dist/index.js",
"type": "module",
Expand All @@ -26,18 +26,18 @@
"@polkadot/keyring": "12.6.2",
"@polkadot/util": "12.6.2",
"@polkadot/util-crypto": "12.6.2",
"@prosopo/cli": "2.1.7",
"@prosopo/common": "2.1.7",
"@prosopo/config": "2.1.7",
"@prosopo/contract": "2.1.7",
"@prosopo/datasets": "2.1.7",
"@prosopo/dotenv": "2.1.7",
"@prosopo/env": "2.1.7",
"@prosopo/provider": "2.1.7",
"@prosopo/types": "2.1.7",
"@prosopo/types-database": "2.1.7",
"@prosopo/types-env": "2.1.7",
"@prosopo/util": "2.1.7",
"@prosopo/cli": "2.1.8",
"@prosopo/common": "2.1.8",
"@prosopo/config": "2.1.8",
"@prosopo/contract": "2.1.8",
"@prosopo/datasets": "2.1.8",
"@prosopo/dotenv": "2.1.8",
"@prosopo/env": "2.1.8",
"@prosopo/provider": "2.1.8",
"@prosopo/types": "2.1.8",
"@prosopo/types-database": "2.1.8",
"@prosopo/types-env": "2.1.8",
"@prosopo/util": "2.1.8",
"dotenv": "16.4.5",
"fast-glob": "3.3.2",
"fs-extra": "11.2.0",
Expand Down
Loading
Loading