Skip to content

Commit 6019f76

Browse files
portuu3portuu3
authored
Merge pull request #530 from humanprotocol/develop
Develop to main 20230531
2 parents fe799c4 + cb5ea69 commit 6019f76

File tree

39 files changed

+4792
-4062
lines changed

39 files changed

+4792
-4062
lines changed

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

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636
MOONSCAN_API_KEY: ${{ secrets.MOONSCAN_API_KEY }}
3737
steps:
3838
- uses: actions/checkout@v3
39+
with:
40+
token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
3941
- uses: actions/setup-node@v3 #Temporal until this gets fixed https://github.com/NomicFoundation/hardhat/issues/3877
4042
with:
4143
node-version: 18.15
@@ -132,6 +134,23 @@ jobs:
132134
if: always() && github.event.inputs.rewardPool== 'true'
133135
run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.reward_pool }}
134136
working-directory: ./packages/core
137+
138+
#Deploy subgraph
139+
- run: graph auth --product hosted-service ${API_KEY}
140+
name: Authenticate Graph CLI
141+
env:
142+
API_KEY: ${{ secrets.HP_GRAPH_API_KEY }}
143+
- run: yarn generate
144+
name: Generate Subgraph
145+
working-directory: ./packages/sdk/typescript/subgraph
146+
env:
147+
NETWORK: ${{ steps.networks.outputs.subgraph }}
148+
- run: graph deploy --product hosted-service humanprotocol/${NETWORK}
149+
name: Deploy Subgraph
150+
working-directory: ./packages/sdk/typescript/subgraph
151+
env:
152+
NETWORK: ${{ steps.networks.outputs.subgraph }}
153+
#Commit changes to develop
135154
- name: Check for Changes
136155
if: always()
137156
id: check_changes
@@ -144,6 +163,21 @@ jobs:
144163
echo "No changes detected."
145164
echo "::set-output name=changes::false"
146165
fi
166+
167+
- name: stash
168+
run: |
169+
git status
170+
git stash --include-untracked
171+
- name: Checkout develop
172+
if: always() && steps.check_changes.outputs.changes == 'true'
173+
uses: actions/checkout@v3
174+
with:
175+
ref: develop
176+
token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
177+
- name: pop
178+
run: |
179+
git stash pop
180+
git status
147181
- name: Commit changes
148182
if: always() && steps.check_changes.outputs.changes == 'true'
149183
uses: EndBug/add-and-commit@v9
@@ -152,19 +186,6 @@ jobs:
152186
message: 'Update grafting and upgrade file from CD'
153187
default_author: github_actions
154188
tag_push: '--force'
155-
- name: Checkout develop
156-
if: always() && steps.check_changes.outputs.changes == 'true'
157-
uses: actions/checkout@v3
158-
with:
159-
ref: develop
160-
- name: Rebase develop
161-
if: always() && steps.check_changes.outputs.changes == 'true'
162-
run: |
163-
git fetch
164-
git rebase origin/main
165-
git push --force
166-
- name: Trigger Subgraph Workflow
167-
uses: benc-uk/workflow-dispatch@v1
168-
with:
169-
workflow: Subgraph deployment
170-
inputs: '{ "subgraph-name": "${{ steps.networks.outputs.subgraph }}" }'
189+
github_token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
190+
191+

‎.github/workflows/cd-python-sdk.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ jobs:
4040
TWINE_USERNAME: __token__
4141
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
4242
run: |
43-
make build-package
44-
twine upload dist/* --skip-existing
43+
make publish-package

‎CONTRACTS_LIST.md‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
|2023/02/03 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0xcbAd56bE3f504E98bd70875823d3CC0242B7bB29 |
99
|2023/02/03 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0xa8e32d777a3839440cc7c24D591A64B9481753B3 |
1010
|2023/02/03 | EthKVStore | 0x35Cf4beBD58F9C8D75B9eA2599479b6C173d406F | N/A |
11-
| | Reputation | N/A | N/A |
1211

1312
|🟠 Polygon Mumbai (Testnet) | Contract | Address | Proxy |
1413
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -17,16 +16,14 @@
1716
|2023/05/12 | Staking | 0xE014F35dEa4f0EF07aDABb572AD942c7E52A6d4F | 0x7Fd3dF914E7b6Bd96B4c744Df32183b51368Bfac |
1817
|2023/05/12 | RewardPool | 0x658D49E6582E5374e81691CF862568A94A83ad94 | 0xf0145eD99AC3c4f877aDa7dA4D1E059ec9116BAE |
1918
|2023/01/26 | EthKVStore | 0xD7F61E812e139a5a02eDae9Dfec146E1b8eA3807 | N/A |
20-
|2023/01/26 | Reputation | 0x7B9f9Dc6c157899C1Eb1c6B86f94855cC2F537dF | 0xC522463d36f76b881bE66484e3068F11e7038Ace |
2119

22-
|🟢 Ethereum (Mainnet) | Contract | Address | Proxy |
20+
|🟢 Ethereum (Mainnet) | Contract | Address | Proxy |
2321
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
2422
|2021/04/06 | HMToken | 0xd1ba9BAC957322D6e8c07a160a3A8dA11A0d2867 | N/A |
25-
|2023/03/28 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
26-
|2023/03/28 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
27-
|2023/04/03 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
23+
|2023/05/30 | EscrowFactory | 0x35Cf4beBD58F9C8D75B9eA2599479b6C173d406F | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
24+
|2023/05/30 | Staking | 0x37Fd69b4C8f71C8C2BC5650cebd27C2Cda6F6256 | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
25+
|2023/05/30 | RewardPool | 0xDfb63B336b41f355a784623D08A959258Df5D219 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
2826
|2023/03/28 | EthKVStore | 0x70671167176C4934204B1C7e97F5e86695857ef2 | N/A |
29-
| | Reputation | N/A | N/A |
3027

3128
|🟠 Goerli (Testnet) | Contract | Address | Proxy |
3229
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -35,7 +32,6 @@
3532
|2023/05/12 | Staking | 0x32e27177BA6Ea91cf28dfd91a0Da9822A4b74EcF | 0xf46B45Df3d956369726d8Bd93Ba33963Ab692920 |
3633
|2023/01/30 | RewardPool | 0x6478312bE22FeE34a366d8e945d4dBd97388a306 | 0x0376D26246Eb35FF4F9924cF13E6C05fd0bD7Fb4 |
3734
|2023/01/30 | EthKVStore | 0xc9Fe39c4b6e1d7A2991355Af159956982DADf842 | N/A |
38-
|2023/01/30 | Reputation | 0x1BA4F1d2dA691fF0445345436b9306B29eEd3913 | 0x6B220A6306D8D86C9878A1FBb3F49707b3E2b405 |
3935

4036
|🟠 Rinkeby (Testnet) | Contract | Address | Proxy |
4137
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -44,7 +40,6 @@
4440
| | Staking | | |
4541
| | RewardPool | | |
4642
| | EthKVStore | | N/A |
47-
| | Reputation | | |
4843

4944
|🟢 Binance SC (Mainnet) | Contract | Address | Proxy |
5045
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -53,7 +48,6 @@
5348
|2023/02/08 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
5449
|2023/02/08 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
5550
|2023/02/08 | EthKVStore | 0x70671167176C4934204B1C7e97F5e86695857ef2 | N/A |
56-
| | Reputation | N/A | N/A |
5751

5852
|🟠 Binance SC (Testnet) | Contract | Address | Proxy |
5953
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -62,25 +56,22 @@
6256
|2023/01/27 | Staking | 0x854EC65E9e5e973C458FC2c92F6E0CbD403f5b95 | 0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18 |
6357
|2023/01/27 | RewardPool | 0xF09f451eC04cAb1b1FAe98C86F45291B00E52b03 | 0xB0A0500103eCEc431b73F6BAd923F0a2774E6e29 |
6458
|2023/01/27 | EthKVStore | 0x3aD4B091E054f192a822D1406f4535eAd38580e4 | N/A |
65-
|2023/01/27 | Reputation | 0x4DCB3906A65B77f6a588087652E6Dd9685d1F67f | 0xb8F62639aA3DD51A39d6AACD969363e7F87dcc98 |
6659

6760
|🟢 Moonbeam (Mainnet) | Contract | Address | Proxy |
6861
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
6962
|2022/05/26 | HMToken | 0x3b25BC1dC591D24d60560d0135D6750A561D4764 | N/A |
70-
|2023/03/10 | EscrowFactory | 0x08Ceac089a895e8C26cC196f63FF24b77349e897 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
71-
|2023/02/08 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
72-
|2023/02/08 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
63+
|2023/05/30 | EscrowFactory | 0xBDBfD2cC708199C5640C6ECdf3B0F4A4C67AdfcB | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
64+
|2023/05/30 | Staking | 0xa8e32d777a3839440cc7c24D591A64B9481753B3 | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
65+
|2023/05/30 | RewardPool | 0x7CDE135F949FE81b16d989cfb4D20e11caa4dE14 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
7366
|2023/02/08 | EthKVStore | 0x70671167176C4934204B1C7e97F5e86695857ef2 | N/A |
74-
| | Reputation | N/A | N/A |
7567

7668
|🟠 Moonbase Alpha (Testnet) | Contract | Address | Proxy |
7769
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
7870
|2023/03/16 | HMToken | 0x2dd72db2bBA65cE663e476bA8b84A1aAF802A8e3 | N/A |
79-
|2023/03/16 | EscrowFactory | 0x4DCB3906A65B77f6a588087652E6Dd9685d1F67f | 0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed |
80-
|2023/03/16 | Staking | 0x854EC65E9e5e973C458FC2c92F6E0CbD403f5b95 | 0xBFC7009F3371F93F3B54DdC8caCd02914a37495c |
81-
|2023/03/16 | RewardPool | 0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18 | 0xf46B45Df3d956369726d8Bd93Ba33963Ab692920 |
71+
|2023/05/30 | EscrowFactory | 0x55b051A6EeC38580c036Dcba5c75D5f90f5b43a2 | 0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed |
72+
|2023/05/30 | Staking | 0xbc925DA632aC596D4809DD5985f48567110e8256 | 0xBFC7009F3371F93F3B54DdC8caCd02914a37495c |
73+
|2023/05/30 | RewardPool | 0xe8807F2fA126D498f6c258F42a545649e7371bFa | 0xf46B45Df3d956369726d8Bd93Ba33963Ab692920 |
8274
|2023/01/30 | EthKVStore | 0xE3D74BBFa45B4bCa69FF28891fBE392f4B4d4e4d | N/A |
83-
|2023/03/16 | Reputation | 0xF09f451eC04cAb1b1FAe98C86F45291B00E52b03 | 0x87469B4f2Fcf37cBd34E54244c0BD4Fa0603664c |
8475

8576
|🟢 Avalanche (Mainnet) | Contract | Address | Proxy |
8677
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -89,7 +80,6 @@
8980
| | Staking | | |
9081
| | RewardPool | | |
9182
|2022/11/17 | EthKVStore | 0x4B79eaD28F52eD5686bf0e379717e85fc7aD10Df | N/A |
92-
| | Reputation | | |
9383

9484
|🟠 Avalanche Fuji (Testnet) | Contract | Address | Proxy |
9585
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -98,7 +88,6 @@
9888
| | Staking | | |
9989
| | RewardPool | | |
10090
|2022/10/24 | EthKVStore | 0xd232c1426CF0653cE8a71DC98bCfDf10c471c114 | N/A |
101-
| | Reputation | | |
10291

10392
|🟢 SKALE Human Protocol Chain (Mainnet) | Contract | Address | Proxy |
10493
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -107,7 +96,6 @@
10796
|2023/03/21 | Staking | 0x1D9f5Dc3078e9F734E4749f98176C2370516447f | 0x79F37FB9C210910733c16228AC4D14a8e32C11BD |
10897
|2023/03/21 | RewardPool | 0xca8745D76588C2aa8bA13E8ef14E986b8A74EE3E | 0x881218246c25C6898aE96145259584340153aDA2 |
10998
|2023/03/22 | EthKVStore | 0xE1055607327b1be2080D31211dCDC4D9338CaF4A | N/A |
110-
| | Reputation | N/A | N/A |
11199

112100

113101

@@ -145,6 +133,9 @@
145133
|2022/05/31 | EscrowFactory | 0x3Cd0B117Be4CC1e31c8d7d1eD8b32208a2820902 | |
146134
|2022/05/31 | EthKVStore | 0x64009ca5fb4b34769F7240c6073FEc34bf5b64E3 | N/A |
147135
|2022/05/31 | HMToken | 0xe4C8eC5d057EacF40060b2174627a4941a5c8127 | N/A |
136+
|2023/03/16 | EscrowFactory | 0x4DCB3906A65B77f6a588087652E6Dd9685d1F67f | 0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed |
137+
|2023/03/16 | Staking | 0x854EC65E9e5e973C458FC2c92F6E0CbD403f5b95 | 0xBFC7009F3371F93F3B54DdC8caCd02914a37495c |
138+
|2023/03/16 | RewardPool | 0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18 | 0xf46B45Df3d956369726d8Bd93Ba33963Ab692920 |
148139

149140
|🟢 Polygon (Mainnet) | Contract | Address | Proxy |
150141
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
@@ -162,4 +153,12 @@
162153
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
163154
|2022/06/01 | EscrowFactory | 0x98108c28B7767a52BE38B4860832dd4e11A7ecad | |
164155
|2022/06/01 | EthKVStore | 0x6617d21ab0f16A7079e2811Cf9306CAe7018bDd9 | N/A |
165-
|2023/02/8 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
156+
|2023/02/8 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
157+
|2023/03/10 | EscrowFactory | 0x08Ceac089a895e8C26cC196f63FF24b77349e897 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
158+
|2023/02/08 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
159+
|2023/02/08 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
160+
161+
|🟢 Ethereum (Mainnet) | Contract | Address | Proxy |
162+
|2023/03/28 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
163+
|2023/03/28 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
164+
|2023/04/03 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |

‎packages/apps/escrow-dashboard/src/components/SolvedTasks/SolvedTasksContainer.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ const SOLVED_TASKS = [
1111
{ date: '2022-07-31', value: 2181348 },
1212
{ date: '2022-08-31', value: 2537442 },
1313
{ date: '2022-09-30', value: 7014852 },
14-
{ date: '2022-10-31', value: 17189000 },
15-
{ date: '2022-11-30', value: 97000578 },
16-
{ date: '2022-12-31', value: 247392072 },
17-
{ date: '2023-01-31', value: 209000000 },
14+
{ date: '2022-10-31', value: 42615432 },
15+
{ date: '2022-11-30', value: 88708986 },
16+
{ date: '2022-12-31', value: 203793543 },
17+
{ date: '2023-01-31', value: 209093427 },
18+
{ date: '2023-02-28', value: 237012318 },
19+
{ date: '2023-03-31', value: 212012559 },
20+
{ date: '2023-04-30', value: 182462076 },
1821
];
1922

2023
export const SolvedTasksContainer: FC = () => {
@@ -45,7 +48,7 @@ export const SolvedTasksContainer: FC = () => {
4548
sx={{ fontSize: { xs: 32, md: 48, lg: 64, xl: 80 }, pl: 14 }}
4649
lineHeight={1}
4750
>
48-
{numeral(solvedTasksCount).format('0,0')}
51+
{numeral(solvedTasksCount).format('0.000 a').toUpperCase()}
4952
</Typography>
5053
</Box>
5154
);

0 commit comments

Comments
 (0)