Merge branch 'develop' into feat/job-launcher/encrypt-manifest

humanprotocol · Jan 18, 2024 · 8a2d678 · 8a2d678
2 parents 5208b41 + 43f5735
commit 8a2d678
Show file tree

Hide file tree

Showing 449 changed files with 833 additions and 24,276 deletions.
diff --git a/.github/workflows/ci-mx-contracts.yaml b/.github/workflows/ci-mx-contracts.yaml
diff --git a/.github/workflows/ci-test-core.yaml b/.github/workflows/ci-test-core.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/ci-test-dashboard-ui.yaml b/.github/workflows/ci-test-dashboard-ui.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
       - 'packages/sdk/typescript/human-protocol-sdk/**'
       - 'packages/sdk/typescript/subgraph/**'
       - 'packages/apps/dashboard/ui/**'

diff --git a/.github/workflows/ci-test-faucet-server.yaml b/.github/workflows/ci-test-faucet-server.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
       - 'packages/sdk/typescript/human-protocol-sdk/**'
       - 'packages/apps/faucet-server/**'
   workflow_dispatch:

diff --git a/.github/workflows/ci-test-fortune-v3.yaml b/.github/workflows/ci-test-fortune-v3.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
       - 'packages/sdk/typescript/human-protocol-sdk/**'
       - 'packages/app/fortune/**'
   workflow_dispatch:

diff --git a/.github/workflows/ci-test-job-launcher.yaml b/.github/workflows/ci-test-job-launcher.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - "packages/core/**"
-      - "!packages/core/mx/**"
       - "packages/sdk/typescript/human-protocol-sdk/**"
       - "packages/apps/job-launcher/**"
   workflow_dispatch:

diff --git a/.github/workflows/ci-test-meta-code-verify.yaml b/.github/workflows/ci-test-meta-code-verify.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
       - 'packages/sdk/typescript/human-protocol-sdk/**'
       - 'packages/apps/meta-code-verify/**'
   workflow_dispatch:

diff --git a/.github/workflows/ci-test-node-sdk.yaml b/.github/workflows/ci-test-node-sdk.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
       - 'packages/sdk/typescript/human-protocol-sdk/**'
   workflow_dispatch:
 

diff --git a/.github/workflows/ci-test-python-sdk.yaml b/.github/workflows/ci-test-python-sdk.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
       - 'packages/sdk/python/human-protocol-sdk/**'
   workflow_dispatch:
 

diff --git a/.github/workflows/ci-test-reputation-oracle.yaml b/.github/workflows/ci-test-reputation-oracle.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - "packages/core/**"
-      - "!packages/core/mx/**"
       - "packages/sdk/typescript/human-protocol-sdk/**"
       - "packages/apps/reputation-oracle/**"
   workflow_dispatch:

diff --git a/.github/workflows/ci-test-subgraph.yaml b/.github/workflows/ci-test-subgraph.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - 'packages/core/**'
-      - '!packages/core/mx/**'
       - 'packages/sdk/typescript/subgraph/**'
   workflow_dispatch:
 

diff --git a/docs/sdk/changelog.md b/docs/sdk/changelog.md
@@ -2,17 +2,14 @@
 
 
 ### Added
-- __Add transaction options:__ passing transaction options when a transaction is sent allows the user to set custom parameters like gas limit, gas price, etc.
-- __Add gas estimation:__ add gas estimation as mechanism to verify that the transaction won't fail after being sent. Previously the transaction was sent and fees spent, but it failed if it didn't pass all requirements of the contract call.
 
 ### Changed
-- __KVStore contract addresses:__ new contracts deployed to include setBulk function.
+- __Update ethers version:__ update ethers to version 6.
+- __Update cancel escrow method:__ return transaction hash and refunded amount.
 
 ### Deprecated
 
 ### Removed
-- __Default value for gas limit in Python:__ gas limit should not be the same for all transactions.
-- __Gas price multiplier:__ gas price multiplier has been removed, but now the gas price can be passed as a parameter when the transaction is sent.
 
 ### Fixed
 

diff --git a/docs/sdk/python/human_protocol_sdk.escrow.escrow_client.md b/docs/sdk/python/human_protocol_sdk.escrow.escrow_client.md
@@ -48,6 +48,18 @@ escrow_client = EscrowClient(w3)
 
 ## Module
 
+### *class* human_protocol_sdk.escrow.escrow_client.EscrowCancel(tx_hash, amount_refunded)
+
+Bases: `object`
+
+#### \_\_init_\_(tx_hash, amount_refunded)
+
+Represents the result of an escrow cancellation transaction.
+Args:
+
+> tx_hash (str): The hash of the transaction that cancelled the escrow.
+> amount_refunded (Any): The amount refunded during the escrow cancellation.
+
 ### *class* human_protocol_sdk.escrow.escrow_client.EscrowClient(web3)
 
 Bases: `object`
@@ -215,11 +227,15 @@ Cancels the specified escrow and sends the balance to the canceler.
   * **escrow_address** (`str`) – Address of the escrow to cancel
   * **tx_options** (`Optional`[`TxParams`]) – (Optional) Additional transaction parameters
 * **Return type:**
-  `None`
+  [`EscrowCancel`](#human_protocol_sdk.escrow.escrow_client.EscrowCancel)
 * **Returns:**
-  None
+  EscrowCancel:
+  An instance of the EscrowCancel class containing details of the cancellation transaction,
+  including the transaction hash and the amount refunded.
 * **Raises:**
-  [**EscrowClientError**](#human_protocol_sdk.escrow.escrow_client.EscrowClientError) – If an error occurs while checking the parameters
+  * [**EscrowClientError**](#human_protocol_sdk.escrow.escrow_client.EscrowClientError) – If an error occurs while checking the parameters
+  * [**EscrowClientError**](#human_protocol_sdk.escrow.escrow_client.EscrowClientError) – If the transfer event associated with the cancellation
+    is not found in the transaction logs
 * **Example:**
   ```python
   from eth_typing import URI
@@ -242,7 +258,7 @@ Cancels the specified escrow and sends the balance to the canceler.
   (w3, gas_payer) = get_w3_with_priv_key('YOUR_PRIVATE_KEY')
   escrow_client = EscrowClient(w3)
 
-  transaction_hash = escrow_client.cancel(
+  escrow_cancel_data = escrow_client.cancel(
       "0x62dD51230A30401C455c8398d06F85e4EaB6309f"
   )
   ```

diff --git a/docs/sdk/python/human_protocol_sdk.escrow.md b/docs/sdk/python/human_protocol_sdk.escrow.md
@@ -8,6 +8,8 @@ obtain information from both the contracts and subgraph.
 * [human_protocol_sdk.escrow.escrow_client module](human_protocol_sdk.escrow.escrow_client.md)
   * [Code Example](human_protocol_sdk.escrow.escrow_client.md#code-example)
   * [Module](human_protocol_sdk.escrow.escrow_client.md#module)
+  * [`EscrowCancel`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowCancel)
+    * [`EscrowCancel.__init__()`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowCancel.__init__)
   * [`EscrowClient`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowClient)
     * [`EscrowClient.__init__()`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowClient.__init__)
     * [`EscrowClient.abort()`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowClient.abort)

diff --git a/docs/sdk/python/human_protocol_sdk.md b/docs/sdk/python/human_protocol_sdk.md
@@ -36,6 +36,7 @@
     * [human_protocol_sdk.escrow.escrow_client module](human_protocol_sdk.escrow.escrow_client.md)
       * [Code Example](human_protocol_sdk.escrow.escrow_client.md#code-example)
       * [Module](human_protocol_sdk.escrow.escrow_client.md#module)
+      * [`EscrowCancel`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowCancel)
       * [`EscrowClient`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowClient)
       * [`EscrowClientError`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowClientError)
       * [`EscrowConfig`](human_protocol_sdk.escrow.escrow_client.md#human_protocol_sdk.escrow.escrow_client.EscrowConfig)

diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@jest/globals": "^29.3.1",
-    "@types/jest": "^29.2.3",
+    "@types/jest": "^29.5.11",
     "@types/node": "^20.10.6",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
@@ -57,7 +57,7 @@
     "eslint-plugin-jest": "^27.1.5",
     "eslint-plugin-prettier": "^5.0.0",
     "husky": "^8.0.2",
-    "jest": "^29.3.1",
+    "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^15.2.0",
     "prettier": "^3.1.1",

diff --git a/packages/apps/dashboard/admin/package.json b/packages/apps/dashboard/admin/package.json
@@ -18,7 +18,7 @@
     "axios": "^1.5.1",
     "dayjs": "^1.11.10",
     "graphql-request": "^6.1.0",
-    "pg": "8.8.0",
+    "pg": "8.11.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "5.3.4",

diff --git a/packages/apps/dashboard/ui/src/hooks/useMonthlyTaskSummaries.ts b/packages/apps/dashboard/ui/src/hooks/useMonthlyTaskSummaries.ts
@@ -9,7 +9,9 @@ export function useMonthlyTaskSummaries() {
     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`).then((res) => res.data),
+      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),

diff --git a/packages/apps/fortune/exchange-oracle/server/package.json b/packages/apps/fortune/exchange-oracle/server/package.json
@@ -34,18 +34,18 @@
     "@nestjs/schematics": "^9.2.0",
     "@nestjs/testing": "^9.4.3",
     "@types/express": "^4.17.13",
-    "@types/jest": "29.5.1",
+    "@types/jest": "29.5.11",
     "@types/node": "20.10.6",
-    "@types/supertest": "^2.0.15",
+    "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint": "^8.55.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.0.0",
-    "jest": "29.5.0",
+    "jest": "29.7.0",
     "prettier": "^3.1.1",
     "source-map-support": "^0.5.20",
-    "supertest": "^6.1.3",
+    "supertest": "^6.3.4",
     "ts-jest": "29.1.1",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.2",

diff --git a/packages/apps/hufi/exchange-oracle/server/.env.example b/packages/apps/hufi/exchange-oracle/server/.env.example
diff --git a/packages/apps/hufi/exchange-oracle/server/.eslintrc.js b/packages/apps/hufi/exchange-oracle/server/.eslintrc.js
diff --git a/packages/apps/hufi/exchange-oracle/server/.gitignore b/packages/apps/hufi/exchange-oracle/server/.gitignore
diff --git a/packages/apps/hufi/exchange-oracle/server/.huskyrc b/packages/apps/hufi/exchange-oracle/server/.huskyrc
diff --git a/packages/apps/hufi/exchange-oracle/server/.prettierrc b/packages/apps/hufi/exchange-oracle/server/.prettierrc