783 run the cypress tests against the procaptcha bundle

.github/workflows/clippy.yml

@@ -49,6 +49,7 @@ jobs:
                       project-cache-${{ runner.os }}-${{ runner.arch }}-
 
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
 
             - name: Clippy
               run: |

.github/workflows/contract_version.yml

@@ -50,6 +50,7 @@ jobs:
                       project-cache-${{ runner.os }}-${{ runner.arch }}-
 
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
 
             - name: Check contract version matches provider version
               run: |

.github/workflows/dockerhub_publish.yml

@@ -83,7 +83,7 @@ jobs:
                   echo "Navigating to 'packages/procaptcha-bundle' and building JS bundle..."
                   cd packages/procaptcha-bundle
 
-                  NODE_ENV=production npm run build:prod
+                  NODE_ENV=production npm run bundle:prod
 
                   # Rename the bundle to include the version number
                   NEW_BUNDLE_FILENAME="procaptcha.bundle.${{ needs.check_version.outputs.next_version }}.js"
@@ -132,9 +132,9 @@ jobs:
                   cp ./dev/scripts/env.rococo ./packages/cli/.env.production
 
                   # Navigate to the provider CLI directory and build
-                  echo "Navigating to 'packages/cli' and building..."
+                  echo "Navigating to 'packages/cli' and bundling..."
                   cd packages/cli
-                  NODE_ENV=production npm run build:prod
+                  NODE_ENV=production npm run bundle:prod
 
                   # Navigate back to the project root
                   echo "Navigating back to project root..."

.github/workflows/lint.yml

@@ -48,4 +48,5 @@ jobs:
 
             - run: npm install -g npm@8.9
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
             - run: npm run lint

.github/workflows/post_pr.yml

@@ -53,6 +53,7 @@ jobs:
             - run: ls -la node_modules || true
 
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
 
             - name: Rust formatting check
               run: |

.github/workflows/provider_image.yml

@@ -51,6 +51,7 @@ jobs:
                       project-cache-${{ runner.os }}-${{ runner.arch }}-
 
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
 
             # build the packages
             - name: Build packages
@@ -62,7 +63,7 @@ jobs:
             - name: Build cli production bundle
               run: |
                   cp ./dev/scripts/env.rococo ./packages/cli/.env.production
-                  NODE_ENV=production npm run -w @prosopo/cli build:prod
+                  NODE_ENV=production npm run -w @prosopo/cli bundle:prod
 
             # create the provider image
             - name: Build provider image

.github/workflows/rustfmt.yml

@@ -49,6 +49,7 @@ jobs:
                       project-cache-${{ runner.os }}-${{ runner.arch }}-
 
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
 
             - name: Rust formatting check
               run: |

.github/workflows/tests.yml

@@ -49,6 +49,7 @@ jobs:
 
             - run: npm install -g npm@8.9
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
 
             # build all packages in workspace
             - run: npm run build:all
@@ -60,6 +61,7 @@ jobs:
                   cp demos/client-example/env.development demos/client-example/.env.test
                   cp dev/scripts/env.test dev/scripts/.env.test
                   cp dev/scripts/env.test packages/cli/.env.test
+                  cp dev/scripts/env.test packages/procaptcha-bundle/.env.test
                   echo NODE_ENV: $NODE_ENV
 
             - name: Start the docker images
@@ -68,9 +70,8 @@ jobs:
                   docker container ls
                   sleep 10s
 
-            # deploy dapp + protocol and run the unit tests
+            # deploy protocol and run the unit tests
             - run: npm run deploy_protocol
-            - run: npm run deploy_dapp
             - run: npm run test -- --watch=false
 
             # restart the docker images to drop any changes made by the unit tests to the contract(s) before running cypress tests
@@ -82,17 +83,22 @@ jobs:
                   sleep 10s
 
             # deploy dapp + protocol and run setup to register, stake and load a dataset for a provider
-            - run: npm run deploy_protocol
-            - run: npm run deploy_dapp
-            - run: npm run setup
+            - run: NODE_ENV=test npm run deploy_protocol
+            - run: NODE_ENV=test npm run setup
+
+            # Build a test version of the procaptcha bundle and run the cypress tests on it and on the React client-example
+            # Running bundle:dev instead of bundle:prod means the bundle will be built with selectors that can be used
+            # by the cypress tests to find the elements they need to interact with
+            - run: NODE_ENV=test npm -w @prosopo/procaptcha-bundle run bundle:dev
+
+            # Needs concurrently to avoid vite hanging forever https://github.com/vitejs/vite/discussions/8745
+            - name: Install concurrently and cypress
+              run: npm i concurrently cypress
 
             - name: Run the cypress tests on client-example
               run: |
-                  npm run start:provider &
-                  sleep 10s
-                  npm run start:server &
-                  sleep 10s
-                  npm run start:demo &
-                  sleep 10s
-                  npm i cypress
-                  npm -w @prosopo/client-example run cypress:run
+                  npx concurrently "npm run start:server" "npm run start:provider" "npm run start:demo" "sleep 10s && npm -w @prosopo/cypress-shared run cypress:run:client-example" --success "first" --kill-others
+
+            - name: Run the cypress tests on client-bundle-example
+              run: |
+                  npx concurrently "npm run start:server" "npm run start:provider" "npm run start:bundle" "sleep 10s && npm -w @prosopo/cypress-shared run cypress:run:client-bundle-example" --success "first" --kill-others

.github/workflows/tests_protocol.yml

@@ -49,6 +49,7 @@ jobs:
                       project-cache-${{ runner.os }}-${{ runner.arch }}-
 
             - run: npm install
+            - run: npm run removePolkadotJSWarnings
 
             - name: Build contracts
               id: build

contracts/captcha/package.json

@@ -27,6 +27,7 @@
     "scripts": {
         "clean": "tsc --build --clean",
         "build": "tsc --build --verbose",
+        "build:cjs": "npx vite --config vite.cjs.config.ts build",
         "lint": "npx eslint .",
         "lint:fix": "npx eslint . --fix --config ../../.eslintrc.js"
     },

contracts/captcha/src/captcha.json

@@ -1,6 +1,6 @@
 {
     "source": {
-        "hash": "0xb9838a103f7f6f60fc5c2f4f4b7583b4d5b64d17e7a8b40d84101c50631467a8",
+        "hash": "0xcbf8a2ccb2d44ee4a81b5af2a080f50b5c5353e833737b6456bd155d7531a675",
         "language": "ink! 4.3.0",
         "compiler": "rustc 1.69.0",
         "build_info": {

contracts/captcha/tsconfig.cjs.json

@@ -0,0 +1,9 @@
+{
+    "extends": "../../tsconfig.cjs.json",
+    "compilerOptions": {
+        "rootDir": "./src",
+        "outDir": "./dist"
+    },
+    "include": ["src", "src/**/*.json"],
+    "references": []
+}

contracts/captcha/vite.cjs.config.ts

@@ -0,0 +1,6 @@
+import { ViteCommonJSConfig } from '@prosopo/config'
+import path from 'path'
+
+export default function () {
+    return ViteCommonJSConfig('captcha-contract', path.resolve('./tsconfig.cjs.json'))
+}

contracts/common/src/common.json

@@ -1,6 +1,6 @@
 {
     "source": {
-        "hash": "0xff9af5d896229b57a3278afb12a184fd2fc36f3c3367f86508efbc9a767e0f6d",
+        "hash": "0x3310de2401b8a9309d4769d470411ac3e99f10a6294b4deb990fce67cda37a19",
         "language": "ink! 4.3.0",
         "compiler": "rustc 1.69.0",
         "build_info": {

contracts/proxy/src/proxy.json

@@ -1,6 +1,6 @@
 {
     "source": {
-        "hash": "0xc42e28d6a7c04e67b95bb8becd47a40afd69f671246841517aaa9ffa68a03cf5",
+        "hash": "0xc94835e36abfa10f531eae6dc4b73f40949f5eff4707a7ec18e0643ce08077f3",
         "language": "ink! 4.3.0",
         "compiler": "rustc 1.69.0",
         "build_info": {

demos/client-bundle-example/package.json

@@ -6,7 +6,7 @@
         "npm": "8.9"
     },
     "scripts": {
-        "start": "light-server -s ./src -p 9231 -w \"**/*.html,**/*.css,**/*.js,**/*.gz\"",
+        "start": "light-server -s ./src -p 9232 -w \"**/*.html,**/*.css,**/*.js,**/*.gz\"",
         "clean": "echo 'nothing to clean'"
     },
     "dependencies": {

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

@@ -21,7 +21,7 @@
         <div
                 class="procaptcha"
                 data-theme="light"
-                data-sitekey="5HUBceb4Du6dvMA9BiwN5VzUrzUsX9Zp7z7nSR2cC1TCv5jg"
+                data-sitekey="5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw"
         ></div>
         <input type="submit" class="mui-btn mui-btn--raised"/>
     </form>
@@ -37,7 +37,7 @@
 
         // Render the CAPTCHA explicitly on a container with id "procaptcha-container"
         window.procaptcha.render('procaptcha-container', {
-            siteKey: '5HUBceb4Du6dvMA9BiwN5VzUrzUsX9Zp7z7nSR2cC1TCv5jg',
+            siteKey: '5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw',
             theme: 'dark',
             callback: 'onCaptchaVerified',
         })

demos/client-example-server/env.development

@@ -1,5 +1,5 @@
 REACT_APP_API_PATH_PREFIX=/v1/prosopo
-REACT_APP_DAPP_SITE_KEY=
+REACT_APP_DAPP_SITE_KEY=5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw
 REACT_APP_SUBSTRATE_NODE_URL=ws://localhost:9944
 REACT_APP_PROSOPO_CONTRACT_ADDRESS=
 REACT_APP_WEB2=true

demos/client-example-server/package.json

@@ -10,10 +10,11 @@
     },
     "scripts": {
         "dev": "vite serve --mode=development --config ./vite.config.ts --host",
-        "start": "node ./dist/bundle/prosopo_client_example_server.app.bundle.js",
-        "build": "npm run build:prod",
-        "build:prod": "vite build --mode=production --config ./vite.config.ts",
-        "build:dev": "vite build --mode=development --config ./vite.config.ts",
+        "start": "node ./dist/app.js",
+        "start:bundle": "node ./dist/bundle/prosopo_client_example_server.app.bundle.js",
+        "build": "tsc --build --verbose",
+        "bundle:prod": "vite build --mode=production --config ./vite.config.ts",
+        "bundle:dev": "vite build --mode=development --config ./vite.config.ts",
         "clean": "tsc --build --clean",
         "test": "echo \"Error: no test specified\" && exit 1",
         "lint:fix": "npx eslint . --fix"

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { ProsopoServer, getServerConfig } from '@prosopo/server'
-import { getPair } from '@prosopo/contract'
+import { getPairAsync } from '@prosopo/contract'
 import connectionFactory from './utils/connection.js'
 import cors from 'cors'
 import dotenv from 'dotenv'
@@ -62,7 +62,7 @@ async function main() {
     const config = getServerConfig()
 
     console.log('config', config)
-    const pair = await getPair(config.networks[config.defaultNetwork], process.env.REACT_APP_SERVER_MNEMONIC)
+    const pair = await getPairAsync(config.networks[config.defaultNetwork], process.env.REACT_APP_SERVER_MNEMONIC)
     const prosopoServer = new ProsopoServer(config, pair)
 
     app.use(routesFactory(mongoose, prosopoServer))

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

@@ -59,7 +59,6 @@ const signup = async (
             const salt = randomAsHex(32)
             // !!!DUMMY CODE!!! - Do not use in production. Use bcrypt or similar for password hashing.
             const passwordHash = hashPassword(`${req.body.password}${salt}`)
-
             if (passwordHash) {
                 return User.create({
                     email: req.body.email,
@@ -96,7 +95,6 @@ const login = async (mongoose: Connection, prosopoServer: ProsopoServer, req: Re
                 res.status(404).json({ message: 'user not found' })
             } else {
                 const payload = SubscribeBodySpec.parse(req.body)
-
                 if (await prosopoServer.isVerified(payload[ApiParams.procaptchaResponse])) {
                     // password hash
                     // !!!DUMMY CODE!!! - Do not use in production. Use bcrypt or similar for password hashing.

demos/client-example-server/src/models/user.ts

@@ -36,6 +36,10 @@ const UserSchema = new Schema<UserInterface>({
     id: {
         type: mongoose.SchemaTypes.Number,
     },
+    salt: {
+        type: mongoose.SchemaTypes.String,
+        required: true,
+    },
 })
 
 export default UserSchema