Release/2.0.0

.github/workflows/auto_merge.yml

@@ -28,43 +28,43 @@ jobs:
                   NEEDS_CONTEXT: ${{ toJson(needs) }}
                   INPUTS_CONTEXT: ${{ toJson(inputs) }}
               run: |
-                  echo "******************************"
-                  echo "github:" "$GITHUB_CONTEXT"
-                  echo "******************************"
-                  echo "env:" "$ENV_CONTEXT"
-                  echo "******************************"
-                  echo "vars:" "$VARS_CONTEXT"
-                  echo "******************************"
-                  echo "job:" "$JOB_CONTEXT"
-                  echo "******************************"
-                  echo "steps:" "$STEPS_CONTEXT"
-                  echo "******************************"
-                  echo "runner:" "$RUNNER_CONTEXT"
-                  echo "******************************"
-                  echo "secrets:" "$SECRETS_CONTEXT"
-                  echo "******************************"
-                  echo "strategy:" "$STRATEGY_CONTEXT"
-                  echo "******************************"
-                  echo "matrix:" "$MATRIX_CONTEXT"
-                  echo "******************************"
-                  echo "needs:" "$NEEDS_CONTEXT"
-                  echo "******************************"
-                  echo "inputs:" "$INPUTS_CONTEXT"
-                  echo "******************************"
+                    echo "******************************"
+                    echo "github:" "$GITHUB_CONTEXT"
+                    echo "******************************"
+                    echo "env:" "$ENV_CONTEXT"
+                    echo "******************************"
+                    echo "vars:" "$VARS_CONTEXT"
+                    echo "******************************"
+                    echo "job:" "$JOB_CONTEXT"
+                    echo "******************************"
+                    echo "steps:" "$STEPS_CONTEXT"
+                    echo "******************************"
+                    echo "runner:" "$RUNNER_CONTEXT"
+                    echo "******************************"
+                    echo "secrets:" "$SECRETS_CONTEXT"
+                    echo "******************************"
+                    echo "strategy:" "$STRATEGY_CONTEXT"
+                    echo "******************************"
+                    echo "matrix:" "$MATRIX_CONTEXT"
+                    echo "******************************"
+                    echo "needs:" "$NEEDS_CONTEXT"
+                    echo "******************************"
+                    echo "inputs:" "$INPUTS_CONTEXT"
+                    echo "******************************"
 
             - uses: actions/checkout@v3
             - uses: actions/setup-node@v3
               with:
-                  node-version-file: '.nvmrc'
+                  node-version-file: ".nvmrc"
 
             - name: Install
-              run: npm i -g npm@$(cat package.json | jq -r .engines.npm)
+              run: npm i -g "npm@$(jq -r .engines.npm < package.json)"
 
             - name: Enable auto-merge on PR
               env:
                   GITHUB_TOKEN: ${{ secrets.PROSOPONATOR_PAT }}
               run: |
-                  echo "Enabling auto-merge on PR"
+                echo "Enabling auto-merge on PR"
                     cd dev/gh-actions
-                    npm ci
-                    PR_NUMBER=${{ github.event.number }} npx tsx src/enableAutoMerge.ts
+                    npm i
+                    PR_NUMBER=${{ github.event.number }} REPO=${{ github.event.repository.name }} npx tsx src/enableAutoMerge.ts

.github/workflows/bump_version.yml

@@ -73,14 +73,6 @@ jobs:
                     # replace the version in all package.json files
                     xargs -I % sh -c "cat % | jq '.version = \"${{ github.event.inputs.version }}\"' > %.new && mv %.new %" <<< "$pkgJsons"
 
-                    # find all Cargo.toml files
-                    cargoTomls=$(find . -name Cargo.toml -prune -not -path '*/protocol/cargo-cache/*')
-                    # replace the first version line in all Cargo.toml files
-                    xargs -I % sh -c "sed -i '0,/version =/s/version =.*/version = \"${{ github.event.inputs.version }}\"/' %" <<< "$cargoTomls"
-
-                    # rebuild typechain
-                    npm run build:typechain
-
                     # lint
                     npm run lint:fix
 

.github/workflows/cache.yml

@@ -4,7 +4,7 @@ name: cache
 
 on:
     push:
-        branches: [main, dev]
+        branches: [main, dev, staging]
     workflow_dispatch:
 
 concurrency:
@@ -70,23 +70,12 @@ jobs:
             - uses: actions/setup-node@v3
               with:
                   node-version-file: '.nvmrc'
-            - run: npm i -g npm@$(cat package.json | jq -r .engines.npm)
+            - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"
 
             - run: npm ci
 
-            - run: npm -w @prosopo/protocol run rustfmt
-
-            - run: npm -w @prosopo/protocol run clippy
-
-            - run: npm -w @prosopo/protocol run build:all
-
-            - run: npm -w @prosopo/protocol run test:all
-
             # install cypress so we don't have to do that every time
-            - name: Cypress install
-              run: |
-                  npm i --save-dev cypress
-                  npx cypress install
+            - run: npx cypress install
 
             - run: ls -la ~/.cache/Cypress || true
             - run: ls -la protocol/cargo-cache || true
@@ -108,16 +97,18 @@ jobs:
             # remove all but the latest cache, leaving only the cache we just saved
             - name: Cleanup caches
               if: always()
+              env:
+                  REF: ${{ github.event.pull_request.head.ref || github.ref }}
               run: |
                   set -euxo pipefail # stop on errors, print commands, fail on pipe fails
 
                     set +e; gh extension install actions/gh-actions-cache; set -e
                     echo "Fetching list of cache key"
-                    cacheKeys=$(gh actions-cache list --sort created-at --order desc --limit 100 -R ${{ github.repository }} --key project-cache-${{ github.event.pull_request.head.ref || github.ref }}-${{ runner.os }}-${{ runner.arch }}- | cut -f 1 | tail -n +3)
+                    cacheKeys=$(gh actions-cache list --sort created-at --order desc --limit 100 -R "${{ github.repository }}" --key "project-cache-$REF-${{ runner.os }}-${{ runner.arch }}-" | cut -f 1 | tail -n +3)
                     echo caches to be removed:
-                    echo ${cacheKeys}
+                    echo "${cacheKeys}"
                     set +e
                     for cacheKey in $cacheKeys
                     do
-                        gh actions-cache delete $cacheKey -R ${{ github.repository }} --confirm
+                        gh actions-cache delete "$cacheKey" -R "${{ github.repository }}" --confirm
                     done

.github/workflows/check_version_bump.yml

@@ -55,43 +55,43 @@ jobs:
                   echo "******************************"
 
             - uses: actions/checkout@v3
+              with:
+                  # all history
+                  fetch-depth: 0
 
             # fail-fast step to check if the version has been bumped
             # when running manually, there won't be a version line change, so we need to skip this step in that case
             - name: Detect version bump
               run: |
-                  set -euxo pipefail # stop on errors, print commands, fail on pipe fails
 
+                  set -euxo pipefail # stop on errors, print commands, fail on pipe fails
 
                   # get the next version as the version currently set in the root package.json
                   NEXT=$(jq -r '.version' package.json)
                   echo "Next version: $NEXT"
 
-                  # checkout the repo back to before this pr
-                  git checkout ${{ github.event.before }}
+                  # checkout the dest branch
+                  git checkout ${{ github.event.pull_request.base.ref }}
 
                   # get the previous version as the version currently set in the root package.json in the before state
                   PREV=$(jq -r '.version' package.json)
                   echo "Previous version: $PREV"
 
-                  # switch back to the current state
-                  git switch -
-
                   # break next and previous versions into major, minor, patch
-                  NEXT_MAJOR=$(echo $NEXT | cut -d. -f1)
-                  NEXT_MINOR=$(echo $NEXT | cut -d. -f2)
-                  NEXT_PATCH=$(echo $NEXT | cut -d. -f3)
-                  PREV_MAJOR=$(echo $PREV | cut -d. -f1)
-                  PREV_MINOR=$(echo $PREV | cut -d. -f2)
-                  PREV_PATCH=$(echo $PREV | cut -d. -f3)
+                  NEXT_MAJOR=$(echo "$NEXT" | cut -d. -f1)
+                  NEXT_MINOR=$(echo "$NEXT" | cut -d. -f2)
+                  NEXT_PATCH=$(echo "$NEXT" | cut -d. -f3)
+                  PREV_MAJOR=$(echo "$PREV" | cut -d. -f1)
+                  PREV_MINOR=$(echo "$PREV" | cut -d. -f2)
+                  PREV_PATCH=$(echo "$PREV" | cut -d. -f3)
 
                   # compare the versions, checking for an *increasing* version
 
-                  if [[ $NEXT_MAJOR -gt $PREV_MAJOR ]]; then
+                  if [[ "$NEXT_MAJOR" -gt "$PREV_MAJOR" ]]; then
                       echo "Major version bump"
-                  elif [[ $NEXT_MAJOR -eq $PREV_MAJOR && $NEXT_MINOR -gt $PREV_MINOR ]]; then
+                  elif [[ "$NEXT_MAJOR" -eq "$PREV_MAJOR" && "$NEXT_MINOR" -gt "$PREV_MINOR" ]]; then
                       echo "Minor version bump"
-                  elif [[ $NEXT_MAJOR -eq $PREV_MAJOR && $NEXT_MINOR -eq $PREV_MINOR && $NEXT_PATCH -gt $PREV_PATCH ]]; then
+                  elif [[ "$NEXT_MAJOR" -eq "$PREV_MAJOR" && "$NEXT_MINOR" -eq "$PREV_MINOR" && "$NEXT_PATCH" -gt "$PREV_PATCH" ]]; then
                       echo "Patch version bump"
                   else
                       echo "Version not bumped / not an increasing version"

.github/workflows/consistent_engine_node.yml

@@ -4,7 +4,7 @@ name: consistent_engine_node
 
 on:
     pull_request:
-        branches: [main, dev, release/*]
+        branches: [main, dev, staging, release/*]
         paths:
             - '**/package.json'
             - '.github/workflows/consistent_engine_node.yml'
@@ -64,19 +64,18 @@ jobs:
 
             - uses: actions/checkout@v3
 
-            - name: Check contract version matches provider version
+            - name: Check node version matches
               run: |
-                  set -euxo pipefail # stop on errors, print commands, fail on pipe fails
+
+                set -euxo pipefail # stop on errors, print commands, fail on pipe fails
 
-                    # find all package.json files, recursively
-                    pkgJsons=$(find . -name package.json -prune -not -path '*/node_modules/*' -not -path '*/.next/*')
-
-                    # extract the node version from the package.json files
-                      versions=$(jq -r '.engines.node' $pkgJsons)
+                # find all package.json files, recursively
+                # extract the node version from the package.json files
+                versions=$(find . -name package.json -prune -not -path '*/node_modules/*' -not -path '*/.next/*' -exec jq -r '.engines.node // empty' {} \;)
 
-                      # ensure all node versions are the same
-                      if [ $(echo "$versions" | uniq | wc -l) -ne 1 ]; then
-                        echo "Node versions are not consistent across packages"
-                        echo "$versions"
-                        exit 1
-                      fi
+                # ensure all node versions are the same
+                if [ "$(echo "$versions" | uniq | wc -l)" -ne 1 ]; then
+                    echo "Versions are not consistent across packages"
+                    echo "$versions"
+                    exit 1
+                fi