Skip to content

Commit

Permalink
Merge branch 'develop' into feat/rename-leader
Browse files Browse the repository at this point in the history
  • Loading branch information
portuu3 committed Feb 24, 2025
2 parents 2db692b + 060c601 commit 9007c81
Show file tree
Hide file tree
Showing 41 changed files with 1,208 additions and 1,379 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/cd-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: yarn --ignore-scripts
name: Install dependencies
- run: yarn build
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/cd-deploy-contracts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ jobs:
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- name: Install dependencies
run: npm install --global yarn && yarn --ignore-scripts
- run: yarn build
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/cd-node-sdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: yarn --ignore-scripts
name: Install dependencies
- run: yarn build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-subgraph.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '18.20.1'
node-version-file: .nvmrc
- name: Filter Networks
id: filter_networks
run: |
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: yarn lint
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn --ignore-scripts
name: Install dependencies
- run: yarn workspace @human-protocol/core test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: yarn workspace @human-protocol/dashboard-server test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-faucet-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: cp .env.example .env
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-fortune.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: yarn workspace @human-protocol/fortune-exchange-oracle-server test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-human-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: yarn workspace @human-protocol/human-app-server test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-job-launcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: yarn workspace @human-protocol/job-launcher-client test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-node-sdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn --ignore-scripts
name: Install dependencies
- run: yarn build
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-reputation-oracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: yarn workspace @human-protocol/reputation-oracle test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-test-subgraph.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- run: npm install --global yarn && yarn
name: Install dependencies
- run: yarn workspace @human-protocol/subgraph test
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22.14
15 changes: 5 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,10 @@
"typescript": "^5.6.3"
},
"resolutions": {
"ejs": "^3.1.10",
"gluegun": "^5.0.0",
"mocha": "^10.0.0",
"node-fetch": "^2.6.7",
"node-forge": "^1.0.0",
"qrcode": "^1.5.0",
"semver": "^7.5.2",
"undici": "^6.11.1",
"ws": "^8.17.1",
"fast-xml-parser": "4.4.1"
"**/gluegun/ejs": "^3.1.10",
"**/gluegun/semver": "^7.5.2",
"**/@ethersproject/providers/ws": "^7.5.10",
"**/@graphql-tools/**/ws": "^8.17.1",
"**/hardhat-gas-reporter/viem": "^2.15.1"
}
}
2 changes: 1 addition & 1 deletion packages/apps/dashboard/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"prettier": "3.4.2",
"sass": "^1.83.4",
"stylelint-prettier": "^5.0.0",
"typescript": "^5.2.2",
"typescript": "^5.6.3",
"vite": "^5.4.7",
"vite-plugin-svgr": "^4.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/dashboard/server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"target": "es2017",
"target": "es2023",
"sourceMap": true,
"outDir": "./dist",
"baseUrl": "./",
Expand Down
3 changes: 1 addition & 2 deletions packages/apps/faucet/server/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es2020",
"target": "es2023",
"module": "commonjs",
"moduleResolution": "node",
"pretty": true,
Expand All @@ -15,7 +15,6 @@
"skipLibCheck": true,
"esModuleInterop": true,
"outDir": "build",
"lib": ["es2020"],
"useUnknownInCatchVariables": false,
"strictNullChecks": false,
"allowJs": true
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/fortune/exchange-oracle/server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"allowJs": true,
"target": "es2020",
"target": "es2023",
"sourceMap": true,
"outDir": "./dist",
"baseUrl": "./",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/human-app/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Using bullseye instead of slim because it needs Python and build tools for node-gyp
FROM node:18-bullseye
FROM node:22.14-bullseye
ARG APP_PATH=packages/apps/human-app/frontend

# Create app directory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,34 @@ import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-use
export function WorkerProfilePage() {
const { user } = useAuthenticatedUser();
const isMobile = useIsMobile();
const { isConnected } = useWalletConnect();
const { isConnected, initializing, web3ProviderMutation } =
useWalletConnect();
const { showNotification } = useNotification();

const setNotifications = () => {
if (user.wallet_address) {
return;
useEffect(() => {
if (initializing) return;

if (!isConnected || !user.wallet_address) {
showNotification({
type: TopNotificationType.WARNING,
message: t('worker.profile.topNotifications.completeSteps'),
});
}
showNotification({
type: TopNotificationType.WARNING,
message: t('worker.profile.topNotifications.completeSteps'),
});
};

useEffect(() => {
setNotifications();
// eslint-disable-next-line react-hooks/exhaustive-deps -- call this once
}, [isConnected]);
if (web3ProviderMutation.isError && web3ProviderMutation.failureReason) {
showNotification({
type: TopNotificationType.WARNING,
message: web3ProviderMutation.failureReason.message,
});
}
}, [
isConnected,
initializing,
web3ProviderMutation.failureReason,
web3ProviderMutation.isError,
user.wallet_address,
showNotification,
]);

return (
<Paper
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/human-app/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-slim
FROM node:22.14-slim
ARG APP_PATH=packages/apps/human-app/server

# Create app directory
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/human-app/server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"allowJs": true,
"target": "es2020",
"target": "es2023",
"sourceMap": true,
"outDir": "./dist",
"baseUrl": "./",
Expand Down
21 changes: 0 additions & 21 deletions packages/apps/human-app/server/vercel.json

This file was deleted.

2 changes: 1 addition & 1 deletion packages/apps/job-launcher/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Using bullseye instead of slim because it needs Python and build tools for node-gyp
FROM node:18-bullseye
FROM node:22.14-bullseye
ARG APP_PATH=packages/apps/job-launcher/client

# Create app directory
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/job-launcher/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-slim
FROM node:22.14-slim
ARG APP_PATH=packages/apps/job-launcher/server

# Create app directory
Expand Down
1 change: 0 additions & 1 deletion packages/apps/job-launcher/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"@types/zxcvbn": "4.4.5",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"@vercel/node": "^3.0.26",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/job-launcher/server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"allowJs": true,
"target": "ES2022",
"target": "es2023",
"sourceMap": true,
"outDir": "./dist",
"baseUrl": "./",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/reputation-oracle/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-slim
FROM node:22.14-slim
ARG APP_PATH=packages/apps/reputation-oracle/server

# Create app directory
Expand Down
Loading

0 comments on commit 9007c81

Please sign in to comment.