Skip to content

Commit

Permalink
Merge branch 'main' into nvmrc
Browse files Browse the repository at this point in the history
  • Loading branch information
goastler committed Dec 13, 2023
2 parents d6fe574 + d95d68f commit b831354
Show file tree
Hide file tree
Showing 18 changed files with 356 additions and 49 deletions.
38 changes: 38 additions & 0 deletions .github/actions/print_vars/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: 'Print Vars'
description: 'Prints github varibles'
runs:
using: 'composite'
steps:
- name: github context
shell: bash
run: echo "${{ toJson(github) }}"
- name: env context
shell: bash
run: echo "${{ toJson(env) }}"
- name: vars context
shell: bash
run: echo "${{ toJson(vars) }}"
- name: job context
shell: bash
run: echo "${{ toJson(job) }}"
- name: steps context
shell: bash
run: echo "${{ toJson(steps) }}"
- name: runner context
shell: bash
run: echo "${{ toJson(runner) }}"
- name: secrets context
shell: bash
run: echo "${{ toJson(secrets) }}"
- name: strategy context
shell: bash
run: echo "${{ toJson(strategy) }}"
- name: matrix context
shell: bash
run: echo "${{ toJson(matrix) }}"
- name: needs context
shell: bash
run: echo "${{ toJson(needs) }}"
- name: inputs context
shell: bash
run: echo "${{ toJson(inputs) }}"
48 changes: 48 additions & 0 deletions .github/workflows/consistent_versions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: consistent_versions

on:
pull_request:
branches: [main]
paths:
- '**/package.json'
- 'package.json'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
CARGO_TERM_COLOR: always
ENVIRONMENT: development
GH_TOKEN: ${{ github.token }}

jobs:
check:
runs-on: ubuntu-latest
steps:
# Checkout the repo
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18

- name: Check versions are consistent amongst packages
run: |
# for each package, get the version then filter to unique versions
versions=$(npx --workspaces npm pkg get version | grep "@" | awk '{print $2}' | uniq)
# if more than one version is detected, fail
if [ $(echo "$versions" | wc -l) -gt 1 ]; then
echo "Versions are not consistent amongst packages:"
echo "$versions"
exit 1
fi
# if version doesn't match the root workspace version, fail
root_version=$(npm pkg get version)
if [ "$versions" != "$root_version" ]; then
echo "Version is not consistent with root workspace version:"
echo "$versions"
echo "$root_version"
exit 1
fi
# else versions are consistent, pass
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[yaml]": {
"editor.defaultFormatter": "redhat.vscode-yaml"
}
}
6 changes: 5 additions & 1 deletion contracts/captcha/src/captcha.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"source": {
"hash": "0xbad91d0c90dc2e32488f195c0fa9bb86d26f4a0ab1ec89d3b0c0a52d2ef5d195",
"hash": "0xd9c06a36f86fd908528ddf79c7f71106103842e4d935dc3544fc1c51f2748179",
"language": "ink! 4.3.0",
"compiler": "rustc 1.69.0",
"build_info": {
Expand Down Expand Up @@ -1610,6 +1610,10 @@
{
"index": 30,
"name": "NotAuthor"
},
{
"index": 31,
"name": "Math"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/captcha/src/contract-info/captcha.ts

Large diffs are not rendered by default.

69 changes: 46 additions & 23 deletions contracts/captcha/src/data/captcha.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -160,7 +161,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -205,7 +207,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -586,7 +589,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -697,7 +701,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -827,7 +832,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -921,7 +927,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1027,7 +1034,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1097,7 +1105,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1301,7 +1310,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1361,7 +1371,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1433,7 +1444,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1508,7 +1520,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1597,7 +1610,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1679,7 +1693,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1828,7 +1843,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -1948,7 +1964,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -2068,7 +2085,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -2192,7 +2210,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -2385,7 +2404,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -2517,7 +2537,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -2650,7 +2671,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down Expand Up @@ -2724,7 +2746,8 @@
"NotEnoughActiveProviders": null,
"ProviderFeeTooHigh": null,
"CommitAlreadyExists": null,
"NotAuthor": null
"NotAuthor": null,
"Math": null
},
"isResult": false,
"isPrimitive": false,
Expand Down
1 change: 1 addition & 0 deletions contracts/captcha/src/types-arguments/captcha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export enum Error {
providerFeeTooHigh = 'ProviderFeeTooHigh',
commitAlreadyExists = 'CommitAlreadyExists',
notAuthor = 'NotAuthor',
math = 'Math',
}

export enum LangError {
Expand Down
1 change: 1 addition & 0 deletions contracts/captcha/src/types-returns/captcha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export enum Error {
providerFeeTooHigh = 'ProviderFeeTooHigh',
commitAlreadyExists = 'CommitAlreadyExists',
notAuthor = 'NotAuthor',
math = 'Math',
}

export enum LangError {
Expand Down
2 changes: 1 addition & 1 deletion contracts/common/src/common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"source": {
"hash": "0x8cc4d2656e1525d4fd701a3f4fa908e40cb0c7971ec7c472f6300e5eaf22e60c",
"hash": "0x43617ec70f4e657ccb8639658b2d074b8b8d4d2979e8339504d9a61c56dbb44e",
"language": "ink! 4.3.0",
"compiler": "rustc 1.69.0",
"build_info": {
Expand Down
4 changes: 2 additions & 2 deletions contracts/common/src/contract-info/common.ts

Large diffs are not rendered by default.

Loading

0 comments on commit b831354

Please sign in to comment.