Merge pull request #1818 from humanprotocol/develop

Release Sprint 7 2024

Author: portuu3

.github/workflows/cd-cvat-exchange-oracle.yaml

@@ -2,11 +2,11 @@ name: Deploy CVAT Exchange Oracle
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [ develop, main, cvat-milestone-2 ]
     paths:
       - 'packages/examples/cvat/exchange-oracle/**'
   pull_request:
-    branches: [ develop, main ]
+    branches: [ develop, main, cvat-milestone-2 ]
     paths:
       - 'packages/examples/cvat/exchange-oracle/**'
   workflow_dispatch:

.github/workflows/cd-cvat-recording-oracle.yaml

@@ -2,11 +2,11 @@ name: Deploy CVAT Recording Oracle
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [ develop, main, cvat-milestone-2 ]
     paths:
       - 'packages/examples/cvat/recording-oracle/**'
   pull_request:
-    branches: [ develop, main ]
+    branches: [ develop, main, cvat-milestone-2 ]
     paths:
       - 'packages/examples/cvat/recording-oracle/**'
   workflow_dispatch:

.github/workflows/ci-dependency-review.yaml

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@v4
+        uses: actions/dependency-review-action@v4.2.5

docs/sdk/changelog.md

@@ -2,14 +2,8 @@
 
 ### Added
 
-- **Add function to get the encryption public key:** get public key function added to KVStore client.
-
 ### Changed
 
-- **Rename set url function of KVStore client:** function renamed to be descriptive. This function sets the url and the hash
-- **Rename get url function of KVStore client:** function renamed to be descriptive. This function gets the url and verifies the hash of the content.
-- **Convert operators config keys to snake_case:** use snake_case as standard.
-
 ### Deprecated
 
 ### Removed

package.json

@@ -41,7 +41,7 @@
   "devDependencies": {
     "@apollo/client": "^3.7.12",
     "@babel/core": "^7.23.5",
-    "@babel/preset-env": "^7.23.9",
+    "@babel/preset-env": "^7.24.3",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@jest/globals": "^29.3.1",
@@ -50,7 +50,7 @@
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
     "@typescript-eslint/utils": "^6.10.0",
-    "concurrently": "^7.5.0",
+    "concurrently": "^8.2.2",
     "dotenv": "^16.3.2",
     "eslint": "^8.55.0",
     "eslint-config-prettier": "^9.1.0",
@@ -73,6 +73,7 @@
     "node-fetch": "^2.6.7",
     "node-forge": "^1.0.0",
     "qrcode": "^1.5.0",
-    "semver": "^7.5.2"
+    "semver": "^7.5.2",
+    "undici": "^6.11.1"
   }
 }

packages/apps/dashboard/admin/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@human-protocol/sdk": "*",
     "@strapi/plugin-i18n": "4.16.2",
-    "@strapi/plugin-users-permissions": "4.15.5",
+    "@strapi/plugin-users-permissions": "4.20.5",
     "@strapi/strapi": "4.15.5",
     "axios": "^1.5.1",
     "dayjs": "^1.11.10",

packages/apps/dashboard/ui/package.json

@@ -73,7 +73,7 @@
     "test": "vitest -u",
     "format:prettier": "prettier --write '**/*.{ts,tsx}'",
     "format:lint": "eslint --fix '**/*.{ts,tsx}'",
-    "format": "npm run format:prettier && npm run format:lint",
+    "format": "yarn format:prettier && yarn format:lint",
     "vercel-build": "yarn workspace @human-protocol/sdk build && yarn build"
   },
   "browserslist": {

packages/apps/dashboard/ui/src/hooks/useMonthlyTaskSummaries.ts

@@ -6,16 +6,25 @@ export function useMonthlyTaskSummaries() {
   return useSWR(`human-protocol-dashboard-monthly-task-summaries`, async () => {
     const apiURL = import.meta.env.VITE_APP_ADMIN_API_URL;
 
-    const from = dayjs().startOf('month').format('YYYY-MM-DD');
-    const to = dayjs().endOf('month').format('YYYY-MM-DD');
-    const [cachedData, thisMonthData] = await Promise.all([
-      axios
-        .get(`${apiURL}/monthly-task-summaries?sort=id`)
-        .then((res) => res.data),
-      axios
-        .get(`${apiURL}/stats/tasks?to=${to}&from=${from}`)
-        .then((res) => res.data),
-    ]);
+    // const from = dayjs().startOf('month').format('YYYY-MM-DD');
+    // const to = dayjs().endOf('month').format('YYYY-MM-DD');
+    // const [cachedData, thisMonthData] = await Promise.all([
+    //   axios
+    //     .get(`${apiURL}/monthly-task-summaries?sort=id`)
+    //     .then((res) => res.data),
+    //   axios
+    //     .get(`${apiURL}/stats/tasks?to=${to}&from=${from}`)
+    //     .then((res) => res.data),
+    // ]);
+    let cachedData, thisMonthData;
+    try {
+      cachedData = (await axios.get(`${apiURL}/monthly-task-summaries?sort=id`))
+        .data;
+      thisMonthData = { dailyTasksData: [] };
+    } catch (error) {
+      cachedData = { data: [] };
+      thisMonthData = { dailyTasksData: [] };
+    }
 
     const totalSolvedTasks = thisMonthData.dailyTasksData.reduce(
       (a: number, b: any) => a + b.tasksSolved,

packages/apps/faucet-server/package.json

@@ -18,7 +18,7 @@
     "axios": "^1.3.4",
     "body-parser": "^1.20.0",
     "cors": "^2.8.5",
-    "express": "^4.18.1",
+    "express": "^4.19.2",
     "express-rate-limit": "^7.1.3",
     "node-cache": "^5.1.2",
     "web3": "^4.3.0"

packages/apps/fortune/exchange-oracle/server/Dockerfile

@@ -0,0 +1,17 @@
+# Base image
+FROM node:18
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Bundle app source
+COPY . .
+
+# Install app dependencies
+RUN yarn install
+
+# Creates a "dist" folder with the production build
+RUN yarn workspace @human-protocol/fortune-exchange-oracle-server build
+
+# Start the server using the production build
+CMD [ "node", "packages/apps/fortune/exchange-oracle/server/dist/src/main.js" ]