Merge branch 'develop' into contracts-v2

portuu3 · portuu3 · commit 0ddfd39159ed · 2025-09-22T10:50:21.000+02:00
diff --git a/.github/workflows/cd-cvat-exchange-oracle.yaml b/.github/workflows/cd-cvat-exchange-oracle.yaml
@@ -24,7 +24,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: PR check
         run: |
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - uses: convictional/trigger-workflow-and-wait@v1.6.5
       with:
diff --git a/.github/workflows/cd-cvat-recording-oracle.yaml b/.github/workflows/cd-cvat-recording-oracle.yaml
@@ -25,7 +25,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: PR check
         run: |
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - uses: convictional/trigger-workflow-and-wait@v1.6.5
       with:
diff --git a/.github/workflows/cd-deploy-contracts.yaml b/.github/workflows/cd-deploy-contracts.yaml
@@ -32,7 +32,7 @@ jobs:
       MOONSCAN_API_KEY: ${{ secrets.MOONSCAN_API_KEY }}
       AVALANCHE_API_KEY: ${{ secrets.AVALANCHE_API_KEY }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
       - uses: actions/setup-node@v4
@@ -126,7 +126,7 @@ jobs:
           git stash --include-untracked
       - name: Checkout develop
         if: always() && steps.check_changes.outputs.changes == 'true'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: develop
           token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
diff --git a/.github/workflows/cd-job-launcher-server.yaml b/.github/workflows/cd-job-launcher-server.yaml
@@ -21,7 +21,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: PR check
         run: |
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - uses: convictional/trigger-workflow-and-wait@v1.6.5
       with:
diff --git a/.github/workflows/cd-packages.yaml b/.github/workflows/cd-packages.yaml
@@ -13,7 +13,7 @@ jobs:
     name: Publish packages to NPM
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/cd-python-sdk.yaml b/.github/workflows/cd-python-sdk.yaml
@@ -14,7 +14,7 @@ jobs:
     name: Publish Python SDK
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
@@ -24,7 +24,7 @@ jobs:
       - name: Build core package
         run: yarn workspace @human-protocol/core build
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
       - name: Install dependencies
diff --git a/.github/workflows/cd-reputation-oracle.yaml b/.github/workflows/cd-reputation-oracle.yaml
@@ -21,7 +21,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: PR check
         run: |
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - uses: convictional/trigger-workflow-and-wait@v1.6.5
       with:
diff --git a/.github/workflows/cd-subgraph.yaml b/.github/workflows/cd-subgraph.yaml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: true
       max-parallel: 3
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-dependency-review.yaml b/.github/workflows/ci-dependency-review.yaml
@@ -12,8 +12,8 @@ jobs:
   dependency-review:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v5
       - name: Dependency Review
-        uses: actions/dependency-review-action@v4.7.2
+        uses: actions/dependency-review-action@v4.7.3
         with:
           show-openssf-scorecard: false
diff --git a/.github/workflows/ci-lint-cvat-exchange-oracle.yaml b/.github/workflows/ci-lint-cvat-exchange-oracle.yaml
@@ -18,12 +18,12 @@ jobs:
     name: CVAT Exchange Oracle Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
           version: 1.8.4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.10'
           cache: 'poetry'
diff --git a/.github/workflows/ci-lint-cvat-recording-oracle.yaml b/.github/workflows/ci-lint-cvat-recording-oracle.yaml
@@ -18,12 +18,12 @@ jobs:
     name: CVAT Recording Oracle Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
           version: 1.8.4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.10'
           cache: 'poetry'
diff --git a/.github/workflows/ci-lint.yaml b/.github/workflows/ci-lint.yaml
@@ -10,7 +10,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-core.yaml b/.github/workflows/ci-test-core.yaml
@@ -10,7 +10,7 @@ jobs:
     name: Core Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-cvat-exchange-oracle.yaml b/.github/workflows/ci-test-cvat-exchange-oracle.yaml
@@ -11,7 +11,7 @@ jobs:
     name: CVAT Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: CVAT Exchange Oracle tests
         working-directory: ./packages/examples/cvat/exchange-oracle
         run: docker compose -f docker-compose.test.yml up --attach test --exit-code-from test
diff --git a/.github/workflows/ci-test-cvat-recording-oracle.yaml b/.github/workflows/ci-test-cvat-recording-oracle.yaml
@@ -11,7 +11,7 @@ jobs:
     name: CVAT Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: CVAT Recording Oracle tests
         working-directory: ./packages/examples/cvat/recording-oracle
         run: docker compose -f docker-compose.test.yml up --attach test --exit-code-from test
diff --git a/.github/workflows/ci-test-dashboard.yaml b/.github/workflows/ci-test-dashboard.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Dashboard Server Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-faucet-server.yaml b/.github/workflows/ci-test-faucet-server.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Faucet Server Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-fortune.yaml b/.github/workflows/ci-test-fortune.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Fortune Exchange Oracle Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
@@ -28,7 +28,7 @@ jobs:
     name: Fortune Recording Oracle Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-human-app.yaml b/.github/workflows/ci-test-human-app.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Human App Server Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-job-launcher.yaml b/.github/workflows/ci-test-job-launcher.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Job Launcher Server Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-node-sdk.yaml b/.github/workflows/ci-test-node-sdk.yaml
@@ -11,7 +11,7 @@ jobs:
     name: Node.js SDK Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-python-sdk.yaml b/.github/workflows/ci-test-python-sdk.yaml
@@ -11,7 +11,7 @@ jobs:
     name: Python Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
@@ -21,7 +21,7 @@ jobs:
       - name: Build core package
         run: yarn workspace @human-protocol/core build
       - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.10'
       - name: Install pipenv
diff --git a/.github/workflows/ci-test-reputation-oracle.yaml b/.github/workflows/ci-test-reputation-oracle.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Reputation Oracle Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/.github/workflows/ci-test-subgraph.yaml b/.github/workflows/ci-test-subgraph.yaml
@@ -12,7 +12,7 @@ jobs:
     # TODO: Use ubuntu-latest when graph binary is not failing on ubuntu 24.04
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
diff --git a/packages/apps/faucet/client/package.json b/packages/apps/faucet/client/package.json
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "dotenv": "^17.0.0",
+    "dotenv": "^17.2.2",
     "eslint": "^8.55.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-import-resolver-typescript": "^3.7.0",
diff --git a/packages/apps/fortune/exchange-oracle/server/package.json b/packages/apps/fortune/exchange-oracle/server/package.json
@@ -46,7 +46,7 @@
     "body-parser": "^1.20.3",
     "class-transformer": "^0.5.1",
     "class-validator": "0.14.1",
-    "dotenv": "^17.0.0",
+    "dotenv": "^17.2.2",
     "ethers": "~6.15.0",
     "joi": "^17.13.3",
     "jsonwebtoken": "^9.0.2",
diff --git a/packages/apps/fortune/recording-oracle/package.json b/packages/apps/fortune/recording-oracle/package.json
@@ -35,7 +35,7 @@
     "body-parser": "^1.20.2",
     "class-transformer": "^0.5.1",
     "class-validator": "0.14.1",
-    "dotenv": "^17.0.0",
+    "dotenv": "^17.2.2",
     "helmet": "^7.1.0",
     "joi": "^17.13.3",
     "minio": "7.1.3",
diff --git a/packages/apps/job-launcher/server/package.json b/packages/apps/job-launcher/server/package.json
@@ -55,7 +55,7 @@
     "class-transformer": "^0.5.1",
     "class-validator": "0.14.1",
     "decimal.js": "^10.6.0",
-    "dotenv": "^17.0.0",
+    "dotenv": "^17.2.2",
     "helmet": "^7.1.0",
     "joi": "^17.13.3",
     "json-stable-stringify": "^1.2.1",
diff --git a/packages/apps/job-launcher/server/src/common/constants/payment.ts b/packages/apps/job-launcher/server/src/common/constants/payment.ts
@@ -3,5 +3,6 @@ import { ITokenId } from '../interfaces';
 export const CoingeckoTokenId: ITokenId = {
   hmt: 'human-protocol',
   usdt: 'tether',
+  usdt0: 'usdt0',
   usdc: 'usd-coin',
 };
diff --git a/packages/apps/job-launcher/server/src/common/constants/tokens.ts b/packages/apps/job-launcher/server/src/common/constants/tokens.ts
@@ -49,7 +49,7 @@ export const TOKEN_ADDRESSES: {
       address: NETWORKS[ChainId.POLYGON]!.hmtAddress,
       decimals: 18,
     },
-    [EscrowFundToken.USDT]: {
+    [EscrowFundToken.USDT0]: {
       address: '0xc2132D05D31c914a87C6611C10748AEb04B58e8F',
       decimals: 6,
     },
diff --git a/packages/apps/job-launcher/server/src/common/enums/job.ts b/packages/apps/job-launcher/server/src/common/enums/job.ts
@@ -456,5 +456,6 @@ export enum WorkerBrowser {
 export enum EscrowFundToken {
   HMT = 'hmt',
   USDT = 'usdt',
+  USDT0 = 'usdt0',
   USDC = 'usdc',
 }
diff --git a/packages/apps/job-launcher/server/src/modules/payment/payment.service.spec.ts b/packages/apps/job-launcher/server/src/modules/payment/payment.service.spec.ts
@@ -1317,6 +1317,7 @@ describe('PaymentService', () => {
           { currency: PaymentCurrency.USD, amount: 100 },
           { currency: PaymentCurrency.HMT, amount: 50 },
           { currency: PaymentCurrency.USDT, amount: 0 },
+          { currency: PaymentCurrency.USDT0, amount: 0 },
           { currency: PaymentCurrency.USDC, amount: 0 },
         ],
         totalUsdAmount: 150,
@@ -1336,8 +1337,8 @@ describe('PaymentService', () => {
       const balance = await paymentService.getUserBalance(userId);
 
       expect(balance).toEqual(expectedBalance);
-      expect(paymentService.getUserBalanceByCurrency).toHaveBeenCalledTimes(4);
-      expect(paymentService.convertToUSD).toHaveBeenCalledTimes(4);
+      expect(paymentService.getUserBalanceByCurrency).toHaveBeenCalledTimes(5);
+      expect(paymentService.convertToUSD).toHaveBeenCalledTimes(5);
     });
 
     it('should return zero balance for new users', async () => {
@@ -1347,6 +1348,7 @@ describe('PaymentService', () => {
           { currency: PaymentCurrency.USD, amount: 0 },
           { currency: PaymentCurrency.HMT, amount: 0 },
           { currency: PaymentCurrency.USDT, amount: 0 },
+          { currency: PaymentCurrency.USDT0, amount: 0 },
           { currency: PaymentCurrency.USDC, amount: 0 },
         ],
         totalUsdAmount: 0,
@@ -1366,8 +1368,8 @@ describe('PaymentService', () => {
       const balance = await paymentService.getUserBalance(userId);
 
       expect(balance).toEqual(expectedBalance);
-      expect(paymentService.getUserBalanceByCurrency).toHaveBeenCalledTimes(4);
-      expect(paymentService.convertToUSD).toHaveBeenCalledTimes(4);
+      expect(paymentService.getUserBalanceByCurrency).toHaveBeenCalledTimes(5);
+      expect(paymentService.convertToUSD).toHaveBeenCalledTimes(5);
     });
   });
 
diff --git a/packages/apps/reputation-oracle/server/package.json b/packages/apps/reputation-oracle/server/package.json
diff --git a/packages/examples/cvat/exchange-oracle/debug.py b/packages/examples/cvat/exchange-oracle/debug.py
diff --git a/packages/examples/cvat/exchange-oracle/src/chain/kvstore.py b/packages/examples/cvat/exchange-oracle/src/chain/kvstore.py
diff --git a/packages/examples/cvat/exchange-oracle/src/core/manifest.py b/packages/examples/cvat/exchange-oracle/src/core/manifest.py
diff --git a/packages/examples/cvat/exchange-oracle/src/crons/cvat/state_trackers.py b/packages/examples/cvat/exchange-oracle/src/crons/cvat/state_trackers.py
diff --git a/packages/examples/cvat/exchange-oracle/src/db/__init__.py b/packages/examples/cvat/exchange-oracle/src/db/__init__.py
diff --git a/packages/examples/cvat/exchange-oracle/src/endpoints/serializers.py b/packages/examples/cvat/exchange-oracle/src/endpoints/serializers.py
diff --git a/packages/examples/cvat/exchange-oracle/src/services/exchange.py b/packages/examples/cvat/exchange-oracle/src/services/exchange.py
diff --git a/packages/examples/cvat/exchange-oracle/tests/integration/services/test_exchange.py b/packages/examples/cvat/exchange-oracle/tests/integration/services/test_exchange.py
diff --git a/packages/examples/cvat/exchange-oracle/tests/utils/manifest.json b/packages/examples/cvat/exchange-oracle/tests/utils/manifest.json
diff --git a/packages/examples/cvat/recording-oracle/debug.py b/packages/examples/cvat/recording-oracle/debug.py
diff --git a/packages/examples/cvat/recording-oracle/src/chain/kvstore.py b/packages/examples/cvat/recording-oracle/src/chain/kvstore.py
diff --git a/packages/examples/gcv/package.json b/packages/examples/gcv/package.json
diff --git a/yarn.lock b/yarn.lock
