Release 2.1.3 (#1438)

- **use sleep from util pkg (#1437)** - **Bump version to 2.1.3** --------- Co-authored-by: Chris Taylor <[email protected]> Co-authored-by: Hugh <[email protected]> Co-authored-by: Hugh <[email protected]> Co-authored-by: George Oastler <[email protected]> Co-authored-by: George Oastler <[email protected]> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
prosopo · Oct 10, 2024 · 482e303 · 482e303
1 parent 1060a43
commit 482e303
Show file tree

Hide file tree

Showing 68 changed files with 524 additions and 569 deletions.
diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml
@@ -81,9 +81,9 @@ jobs:
                   echo "inputs:" "$INPUTS_CONTEXT"
                   echo "******************************"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version-file: '.nvmrc'
             - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"
@@ -93,7 +93,7 @@ jobs:
 
             - name: Restore npm cache
               if: ${{ runner.environment != 'self-hosted' }} # don't restore cache on self-hosted runners, network speed not good enough
-              uses: actions/cache/restore@v3
+              uses: actions/cache/restore@v4
               with:
                   # must restore all cache dirs, and they must exist ahead of this!
                   path: |

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
@@ -63,15 +63,16 @@ jobs:
                   echo "inputs:" "$INPUTS_CONTEXT"
                   echo "******************************"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             # make cache dirs, these must exist before doing cache stuff
             - run: mkdir -p ~/.npm
             - run: mkdir -p ~/.cache/Cypress
 
             # don't restore the cache, otherwise we get artifacts left over from the previous run sit in the cache for eternity. Do a clean build every time.
+            - run: npm cache clean --force
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version-file: '.nvmrc'
             - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"
@@ -82,7 +83,7 @@ jobs:
             - run: npx cypress install
 
             - name: Save npm cache
-              uses: actions/cache/save@v3
+              uses: actions/cache/save@v4
               if: always()
               with:
                   path: |

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -5,6 +5,11 @@ name: cypress
 on:
     pull_request:
         branches: [main, dev, staging, release/*]
+        types: 
+            - opened # when a PR is opened
+            - synchronize # when a PR is pushed to
+            - reopened # when a PR is reopened
+            - ready_for_review # when a PR is marked as ready for review (e.g. taken off draft mode)
     workflow_dispatch:
 
 concurrency:
@@ -65,14 +70,14 @@ jobs:
                   echo "inputs:" "$INPUTS_CONTEXT"
                   echo "******************************"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - run: mkdir -p ~/.npm
             - run: mkdir -p ~/.cache/Cypress
 
             - name: Restore npm cache
               if: ${{ runner.environment != 'self-hosted' }} # don't restore cache on self-hosted runners, network speed not good enough
-              uses: actions/cache/restore@v3
+              uses: actions/cache/restore@v4
               with:
                   # must restore all cache dirs, and they must exist ahead of this!
                   path: |
@@ -85,7 +90,7 @@ jobs:
                   restore-keys: |
                       npm-${{ runner.os }}-${{ runner.arch }}-
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version-file: '.nvmrc'
             - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -5,6 +5,11 @@ name: lint
 on:
     pull_request:
         branches: [main, dev, staging, release/*]
+        types: 
+            - opened # when a PR is opened
+            - synchronize # when a PR is pushed to
+            - reopened # when a PR is reopened
+            - ready_for_review # when a PR is marked as ready for review (e.g. taken off draft mode)
     workflow_dispatch:
 
 concurrency:
@@ -64,14 +69,14 @@ jobs:
                   echo "inputs:" "$INPUTS_CONTEXT"
                   echo "******************************"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - run: mkdir -p ~/.npm
             - run: mkdir -p ~/.cache/Cypress
 
             - name: Restore npm cache
               if: ${{ runner.environment != 'self-hosted' }} # don't restore cache on self-hosted runners, network speed not good enough
-              uses: actions/cache/restore@v3
+              uses: actions/cache/restore@v4
               with:
                   # must restore all cache dirs, and they must exist ahead of this!
                   path: |
@@ -84,7 +89,7 @@ jobs:
                   restore-keys: |
                       npm-${{ runner.os }}-${{ runner.arch }}-
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version-file: '.nvmrc'
             - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"

diff --git a/.github/workflows/ls_cache.yml b/.github/workflows/ls_cache.yml
@@ -61,13 +61,13 @@ jobs:
                   echo "inputs:" "$INPUTS_CONTEXT"
                   echo "******************************"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - run: mkdir -p ~/.npm
             - run: mkdir -p ~/.cache/Cypress
 
             - name: Restore npm cache
-              uses: actions/cache/restore@v3
+              uses: actions/cache/restore@v4
               with:
                   # must restore all cache dirs, and they must exist ahead of this!
                   path: |

diff --git a/.github/workflows/prosoponator_bot.yml b/.github/workflows/prosoponator_bot.yml
@@ -58,9 +58,9 @@ jobs:
                   echo "inputs:" "$INPUTS_CONTEXT"
                   echo "******************************"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version-file: '.nvmrc'
             - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"

diff --git a/.github/workflows/provider_image.yml b/.github/workflows/provider_image.yml
@@ -5,6 +5,11 @@ name: provider_image
 on:
     pull_request:
         branches: [main, dev, staging, release/*]
+        types: 
+            - opened # when a PR is opened
+            - synchronize # when a PR is pushed to
+            - reopened # when a PR is reopened
+            - ready_for_review # when a PR is marked as ready for review (e.g. taken off draft mode)
     workflow_dispatch:
 
 concurrency:
@@ -64,14 +69,14 @@ jobs:
                   echo "inputs:" "$INPUTS_CONTEXT"
                   echo "******************************"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - run: mkdir -p ~/.npm
             - run: mkdir -p ~/.cache/Cypress
 
             - name: Restore npm cache
               if: ${{ runner.environment != 'self-hosted' }} # don't restore cache on self-hosted runners, network speed not good enough
-              uses: actions/cache/restore@v3
+              uses: actions/cache/restore@v4
               with:
                   # must restore all cache dirs, and they must exist ahead of this!
                   path: |
@@ -84,7 +89,7 @@ jobs:
                   restore-keys: |
                       npm-${{ runner.os }}-${{ runner.arch }}-
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version-file: '.nvmrc'
             - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"
@@ -107,11 +112,6 @@ jobs:
                     echo $(grep -PoIe "PROSOPO_PROVIDER_MNEMONIC.*" ./dev/scripts/env.development) > .env.production
                     NODE_ENV="production" npm run -w @prosopo/cli bundle
 
-            # Add support for more platforms with QEMU (optional)
-            # https://github.com/docker/setup-qemu-action
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v3
-
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@v3
 
@@ -131,19 +131,6 @@ jobs:
                   tags: prosopo/provider:dev
                   outputs: type=docker,dest=provider-amd64.tar
 
-            # create the provider image for ARM64
-            - name: Build the Provider Container
-              id: build_docker_provider_arm64
-              continue-on-error: false
-              uses: docker/build-push-action@v5
-              with:
-                  context: ${{github.workspace}}
-                  file: ${{github.workspace}}/docker/images/provider.dockerfile
-                  platforms: linux/arm64
-                  push: false
-                  tags: prosopo/provider:dev
-                  outputs: type=docker,dest=provider-arm64.tar
-
             # load the AMD64 image
             - name: Load the Provider Container
               run: docker load -i provider-amd64.tar

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,6 +7,10 @@ on:
         branches: [main, staging]
     workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
     GITHUB_TOKEN: ${{ secrets.PROSOPONATOR_PAT }}
     GH_TOKEN: ${{ secrets.PROSOPONATOR_PAT }}
@@ -60,7 +64,7 @@ jobs:
 
             - name: Restore npm cache
               if: ${{ runner.environment != 'self-hosted' }} # don't restore cache on self-hosted runners, network speed not good enough
-              uses: actions/cache/restore@v3
+              uses: actions/cache/restore@v4
               with:
                   # must restore all cache dirs, and they must exist ahead of this!
                   path: |
@@ -73,7 +77,7 @@ jobs:
                   restore-keys: |
                       npm-${{ runner.os }}-${{ runner.arch }}-
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Detect env
               id: env
@@ -127,7 +131,7 @@ jobs:
                     exit 1
                 fi
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version-file: '.nvmrc'
             - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"
@@ -139,6 +143,12 @@ jobs:
             - run: npm run build:all:cjs
             - run: npm run bundle:all
 
+            - name: Purge gh prerelease
+              if: ${{ steps.env.outputs.gh_prerelease }}
+              continue-on-error: true # don't fail the workflow if the release doesn't exist
+              run: |
+                  gh release delete "${{ steps.env.outputs.gh_release_tag }}" --yes --cleanup-tag
+
             - name: Github release
               continue-on-error: true # don't fail the workflow if the release already exists
               run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,6 +5,11 @@ name: tests
 on:
   pull_request:
     branches: [main, dev, staging, release/*]
+    types: 
+      - opened # when a PR is opened
+      - synchronize # when a PR is pushed to
+      - reopened # when a PR is reopened
+      - ready_for_review # when a PR is marked as ready for review (e.g. taken off draft mode)
   workflow_dispatch:
 
 concurrency:
@@ -65,14 +70,14 @@ jobs:
           echo "inputs:" "$INPUTS_CONTEXT"
           echo "******************************"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - run: mkdir -p ~/.npm
       - run: mkdir -p ~/.cache/Cypress
 
       - name: Restore npm cache
         if: ${{ runner.environment != 'self-hosted' }} # don't restore cache on self-hosted runners, network speed not good enough
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
             # must restore all cache dirs, and they must exist ahead of this!
             path: |
@@ -85,7 +90,7 @@ jobs:
             restore-keys: |
                 npm-${{ runner.os }}-${{ runner.arch }}-
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"

diff --git a/demos/client-bundle-example/package.json b/demos/client-bundle-example/package.json
@@ -12,7 +12,7 @@
 		"start": "vite serve ./src --port 9232 --config vite.config.ts",
 		"clean": "echo 'nothing to clean'"
 	},
-	"version": "2.1.2",
+	"version": "2.1.3",
 	"devDependencies": {
 		"@types/node": "22.5.5",
 		"@vitest/coverage-v8": "2.1.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.2",
+	"version": "2.1.3",
 	"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.2",
-		"@prosopo/contract": "2.1.2",
-		"@prosopo/dotenv": "2.1.2",
-		"@prosopo/server": "2.1.2",
-		"@prosopo/types": "2.1.2",
-		"@prosopo/util": "2.1.2",
+		"@prosopo/common": "2.1.3",
+		"@prosopo/contract": "2.1.3",
+		"@prosopo/dotenv": "2.1.3",
+		"@prosopo/server": "2.1.3",
+		"@prosopo/types": "2.1.3",
+		"@prosopo/util": "2.1.3",
 		"@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.2",
+		"@prosopo/config": "2.1.3",
 		"@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.2",
+	"version": "2.1.3",
 	"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.2",
-		"@prosopo/locale-browser": "2.1.2",
-		"@prosopo/procaptcha-frictionless": "2.1.2",
-		"@prosopo/procaptcha-pow": "2.1.2",
-		"@prosopo/procaptcha-react": "2.1.2",
-		"@prosopo/server": "2.1.2",
-		"@prosopo/types": "2.1.2",
-		"@prosopo/vite-plugin-watch-workspace": "2.1.2",
+		"@prosopo/common": "2.1.3",
+		"@prosopo/locale-browser": "2.1.3",
+		"@prosopo/procaptcha-frictionless": "2.1.3",
+		"@prosopo/procaptcha-pow": "2.1.3",
+		"@prosopo/procaptcha-react": "2.1.3",
+		"@prosopo/server": "2.1.3",
+		"@prosopo/types": "2.1.3",
+		"@prosopo/vite-plugin-watch-workspace": "2.1.3",
 		"@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.2",
-		"@prosopo/dotenv": "2.1.2",
+		"@prosopo/config": "2.1.3",
+		"@prosopo/dotenv": "2.1.3",
 		"@types/node": "22.5.5",
 		"@vitest/coverage-v8": "2.1.1",
 		"concurrently": "9.0.1",