Skip to content

Commit b624184

Browse files
0xVoronov0xVoronov
committed
Resolved conflicts
2 parents 8484caa + 16d740b commit b624184

File tree

2,014 files changed

+99875
-57079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,014 files changed

+99875
-57079
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Purpose:
2+
# This file is used to improve the accuracy of `git blame` by ignoring specific commits that
3+
# introduce non-functional changes, such as formatting, refactoring, or large dependency updates.
4+
# By skipping these commits and using `git blame`, you can focus on meaningful code changes,
5+
# making it easier to trace the origin of code for debugging, understanding the history, or reviewing.
6+
#
7+
# Usage:
8+
# To automatically use this file with all `git blame` operations in this repository, run the following command:
9+
#
10+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
11+
#
12+
# And optionally:
13+
#
14+
# git config blame.markIgnoredLines true
15+
# git config blame.markUnblamableLines true
16+
#
17+
# This ensures that every `git blame` operation, whether invoked manually or through tools like IDEs,
18+
# ignores the revisions listed here.
19+
#
20+
# It also seamlessly works with GitHub. If you want to view original changes in GitHub, append ~ to viewed commit hash.
21+
#
22+
# For more details on the rationale and usage, see the following links:
23+
# - https://www.michaelheap.com/git-ignore-rev/
24+
# - https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
25+
# - https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
26+
#
27+
# Structure:
28+
# Below, you will find sections for different projects or types of changes.
29+
# Each commit hash should be accompanied by commit title and PR url.
30+
31+
# [Exchange Oracle] Add ruff (#2395) - https://github.com/humanprotocol/human-protocol/pull/2395
32+
e9ad17660a38864a73b28c4a5b610dedb5d767b4
33+
# [Recording Oracle] Add ruff (#2396) - https://github.com/humanprotocol/human-protocol/pull/2396
34+
2736ceb685967feacfcacfd8453868444995aabf

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,43 @@
1-
## Description
1+
## Issue tracking
2+
<!--
3+
Where is the progress of this issue being tracked?
4+
Where can one find the requirements for this issue?
5+
Where did this issue originated from?
26
3-
<!-- Describe the goal of this pull request. What does it change or fix? -->
7+
E.g. GitHub issue, Slack message, etc.
8+
-->
49

5-
## Summary of changes
10+
## Context behind the change
11+
<!--
12+
What changes have you made to the code, and why?
613
7-
<!-- At a high level, what parts of the code did you change and why? -->
14+
Describe the goal of this pull request. What does it change or fix?
15+
At a high level, what parts of the code did you change and why?
16+
-->
817

9-
## How test the changes
18+
## How has this been tested?
19+
<!--
20+
You should always test your changes.
1021
11-
<!-- If there are any special testing requirements, add them here -->
22+
Describe the steps you took to make sure your PR does what it's supposed to do.
23+
How we ensure that adjacent code/features are still working?
24+
Are there any performance implications?
25+
-->
1226

13-
## Related issues
14-
[Keywords for linking issues](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests)
27+
## Release plan
28+
<!--
29+
If not you, but somebody else will be deploying this, what they need to know/do to succeed?
1530
16-
<!-- Does this close any open issues? -->
31+
Add any action items that need to be done for the release (any step, before/during/after),
32+
e.g. running a DB migration, leaving a note about release in Slack, adding new envs, etc.
33+
-->
34+
35+
## Potential risks; What to monitor; Rollback plan
36+
<!--
37+
What might go wrong with deployment of this PR?
38+
Can it affect some other services/areas? In what way?
39+
What metrics/dashboards/etc. you should keep an eye on while/after deploying this?
40+
41+
How will we handle any issues if they arise? Do we need rollback plan?
42+
Do we need a second pair of eyes on this?
43+
-->

‎.github/workflows/cd-deploy-contracts.yaml‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ on:
99
escrowFactory:
1010
description: 'deploy escrow factory'
1111
required: true
12-
staking:
13-
description: 'deploy staking'
14-
required: true
15-
rewardPool:
16-
description: 'deploy reward pool'
17-
required: true
1812

1913
jobs:
2014
deploy-contracts:
@@ -51,63 +45,43 @@ jobs:
5145
run: |
5246
case ${{ github.event.inputs.network }} in
5347
"sepolia")
54-
echo "escrow_factory=0xD6D347ba6987519B4e42EcED43dF98eFf5465a23" >> $GITHUB_OUTPUT
55-
echo "staking=0x2B9C5EC6220BA8Ad08CB51A60FFdbC6a6235B203" >> $GITHUB_OUTPUT
56-
echo "reward_pool=0xAFf5a986A530ff839d49325A5dF69F96627E8D29" >> $GITHUB_OUTPUT
48+
echo "escrow_factory=0x5987A5558d961ee674efe4A8c8eB7B1b5495D3bf" >> $GITHUB_OUTPUT
5749
echo "private_key=TESTNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
5850
;;
5951
"polygon")
6052
echo "escrow_factory=0xBDBfD2cC708199C5640C6ECdf3B0F4A4C67AdfcB" >> $GITHUB_OUTPUT
61-
echo "staking=0xcbAd56bE3f504E98bd70875823d3CC0242B7bB29" >> $GITHUB_OUTPUT
62-
echo "reward_pool=0x1371057BAec59944B924A7963F2EeCF43ff94CE4" >> $GITHUB_OUTPUT
6353
echo "private_key=MAINNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
6454
;;
6555
"polygonAmoy")
6656
echo "escrow_factory=0xAFf5a986A530ff839d49325A5dF69F96627E8D29" >> $GITHUB_OUTPUT
67-
echo "staking=0xCc0AF0635aa19fE799B6aFDBe28fcFAeA7f00a60" >> $GITHUB_OUTPUT
68-
echo "reward_pool=0xd866bCEFf6D0F77E1c3EAE28230AE6C79b03fDa7" >> $GITHUB_OUTPUT
6957
echo "private_key=TESTNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
7058
;;
7159
"bsc")
7260
echo "escrow_factory=0x92FD968AcBd521c232f5fB8c33b342923cC72714" >> $GITHUB_OUTPUT
73-
echo "staking=0xdFbB79dC35a3A53741be54a2C9b587d6BafAbd1C" >> $GITHUB_OUTPUT
74-
echo "reward_pool=0xf376443BCc6d4d4D63eeC086bc4A9E4a83878e0e" >> $GITHUB_OUTPUT
7561
echo "private_key=MAINNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
7662
;;
7763
"bscTestnet")
7864
echo "escrow_factory=0x2bfA592DBDaF434DDcbb893B1916120d181DAD18" >> $GITHUB_OUTPUT
79-
echo "staking=0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18" >> $GITHUB_OUTPUT
80-
echo "reward_pool=0xB0A0500103eCEc431b73F6BAd923F0a2774E6e29" >> $GITHUB_OUTPUT
8165
echo "private_key=TESTNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
8266
;;
8367
"moonbeam")
8468
echo "escrow_factory=0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a" >> $GITHUB_OUTPUT
85-
echo "staking=0x05398211bA2046E296fBc9a9D3EB49e3F15C3123" >> $GITHUB_OUTPUT
86-
echo "reward_pool=0x4A5963Dd6792692e9147EdC7659936b96251917a" >> $GITHUB_OUTPUT
8769
echo "private_key=MAINNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
8870
;;
8971
"moonbaseAlpha")
9072
echo "escrow_factory=0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed" >> $GITHUB_OUTPUT
91-
echo "staking=0xBFC7009F3371F93F3B54DdC8caCd02914a37495c" >> $GITHUB_OUTPUT
92-
echo "reward_pool=0xf46B45Df3d956369726d8Bd93Ba33963Ab692920" >> $GITHUB_OUTPUT
9373
echo "private_key=TESTNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
9474
;;
9575
"mainnet")
9676
echo "escrow_factory=0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a" >> $GITHUB_OUTPUT
97-
echo "staking=0x05398211bA2046E296fBc9a9D3EB49e3F15C3123" >> $GITHUB_OUTPUT
98-
echo "reward_pool=0x4A5963Dd6792692e9147EdC7659936b96251917a" >> $GITHUB_OUTPUT
9977
echo "private_key=MAINNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
10078
;;
10179
"avalanche")
10280
echo "escrow_factory=0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a" >> $GITHUB_OUTPUT
103-
echo "staking=0x05398211bA2046E296fBc9a9D3EB49e3F15C3123" >> $GITHUB_OUTPUT
104-
echo "reward_pool=0x4A5963Dd6792692e9147EdC7659936b96251917a" >> $GITHUB_OUTPUT
10581
echo "private_key=MAINNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
10682
;;
10783
"avalancheFujiTestnet")
10884
echo "escrow_factory=0x56C2ba540726ED4f46E7a134b6b9Ee9C867FcF92" >> $GITHUB_OUTPUT
109-
echo "staking=0x9890473B0b93E24d6D1a8Dfb739D577C6f25FFd3" >> $GITHUB_OUTPUT
110-
echo "reward_pool=0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18" >> $GITHUB_OUTPUT
11185
echo "private_key=TESTNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
11286
;;
11387
*)
@@ -116,30 +90,18 @@ jobs:
11690
;;
11791
esac
11892
- name: Upgrade Proxies
119-
if: github.event.inputs.escrowFactory == 'true' || github.event.inputs.staking == 'true' || github.event.inputs.rewardPool== 'true'
93+
if: github.event.inputs.escrowFactory == 'true'
12094
run: yarn upgrade:proxy --network ${{ github.event.inputs.network }}
12195
working-directory: ./packages/core
12296
env:
12397
PRIVATE_KEY: ${{ secrets[steps.networks.outputs.private_key] }}
12498
DEPLOY_ESCROW_FACTORY: ${{ github.event.inputs.escrowFactory }}
125-
DEPLOY_STAKING: ${{ github.event.inputs.staking }}
126-
DEPLOY_REWARD_POOL: ${{ github.event.inputs.rewardPool }}
12799
ESCROW_FACTORY_ADDRESS: ${{ steps.networks.outputs.escrow_factory }}
128-
STAKING_ADDRESS: ${{ steps.networks.outputs.staking }}
129-
REWARD_POOL_ADDRESS: ${{ steps.networks.outputs.reward_pool }}
130100

131101
- name: Verify Escrow Factory Proxy
132102
if: always() && github.event.inputs.escrowFactory == 'true'
133103
run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.escrow_factory }}
134104
working-directory: ./packages/core
135-
- name: Verify Staking Proxy
136-
if: always() && github.event.inputs.staking == 'true'
137-
run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.staking }}
138-
working-directory: ./packages/core
139-
- name: Verify Reward Pool Proxy
140-
if: always() && github.event.inputs.rewardPool== 'true'
141-
run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.reward_pool }}
142-
working-directory: ./packages/core
143105
#Commit changes to develop
144106
- name: Check for Changes
145107
if: always()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: "Checkout Repository"
1212
uses: actions/[email protected]
1313
- name: "Dependency Review"
14-
uses: actions/dependency-review-action@v4.3.3
14+
uses: actions/dependency-review-action@v4.5.0

‎.github/workflows/ci-lint-cvat-exchange-oracle.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: CVAT Exchange Oracle Lint
2+
3+
on:
4+
push:
5+
paths:
6+
- 'packages/examples/cvat/exchange-oracle/**'
7+
- '.github/workflows/ci-lint-cvat-exchange-oracle.yaml'
8+
9+
env:
10+
WORKING_DIR: ./packages/examples/cvat/exchange-oracle
11+
12+
defaults:
13+
run:
14+
working-directory: ./packages/examples/cvat/exchange-oracle
15+
16+
jobs:
17+
cvat-exo-lint:
18+
name: CVAT Exchange Oracle Lint
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v4
22+
- name: Install Poetry
23+
uses: snok/install-poetry@v1
24+
with:
25+
version: 1.8.4
26+
- uses: actions/setup-python@v5
27+
with:
28+
python-version: '3.10'
29+
cache: 'poetry'
30+
cache-dependency-path: ${{ env.WORKING_DIR }}/poetry.lock
31+
- run: poetry install --no-root --only dev
32+
- run: poetry run pre-commit run --all-files

‎.github/workflows/ci-lint-cvat-recording-oracle.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: CVAT Recording Oracle Lint
2+
3+
on:
4+
push:
5+
paths:
6+
- 'packages/examples/cvat/recording-oracle/**'
7+
- '.github/workflows/ci-lint-cvat-recording-oracle.yaml'
8+
9+
env:
10+
WORKING_DIR: ./packages/examples/cvat/recording-oracle
11+
12+
defaults:
13+
run:
14+
working-directory: ./packages/examples/cvat/recording-oracle
15+
16+
jobs:
17+
cvat-exo-lint:
18+
name: CVAT Recording Oracle Lint
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v4
22+
- name: Install Poetry
23+
uses: snok/install-poetry@v1
24+
with:
25+
version: 1.8.4
26+
- uses: actions/setup-python@v5
27+
with:
28+
python-version: '3.10'
29+
cache: 'poetry'
30+
cache-dependency-path: ${{ env.WORKING_DIR }}/poetry.lock
31+
- run: poetry install --no-root --only lint
32+
- run: poetry run pre-commit run --all-files

‎.github/workflows/ci-test-core.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ jobs:
1717
- uses: actions/checkout@v4
1818
- run: npm install --global yarn && yarn --ignore-scripts
1919
name: Install dependencies
20-
- run: yarn core:test
20+
- run: yarn workspace @human-protocol/core test
2121
name: Run protocol test

‎.github/workflows/ci-test-dashboard-ui.yaml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.github/workflows/ci-test-faucet-server.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths:
99
- 'packages/core/**'
1010
- 'packages/sdk/typescript/human-protocol-sdk/**'
11-
- 'packages/apps/faucet-server/**'
11+
- 'packages/apps/faucet/server/**'
1212
workflow_dispatch:
1313

1414
jobs:
@@ -21,6 +21,6 @@ jobs:
2121
name: Install dependencies
2222
- run: cp .env.example .env
2323
name: Create .env file
24-
working-directory: packages/apps/faucet-server
25-
- run: yarn faucet-server:test
26-
name: Run faucet-server test
24+
working-directory: packages/apps/faucet/server
25+
- run: yarn workspace @human-protocol/faucet-server test
26+
name: Run faucet/server test

‎.github/workflows/ci-test-fortune-v3.yaml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)