Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to main 20230531 #530

Merged
merged 8 commits into from
May 31, 2023
Merged

Develop to main 20230531 #530

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c002ecd
Deploy contracts upgrade to ethereum, moonbase and moonbeam (#522)
portuu3 May 30, 2023
ca9e6ee
Update graphql dependencies to avoid yarn install error (#521)
flopez7 May 30, 2023
34b2de9
enable networks fortune (#523)
portuu3 May 30, 2023
b69a54a
fix node.js sdk lint (#519)
leric7 May 30, 2023
2824386
[Escrow-dashboard] Fix solved tasks (#512)
m00n620 May 30, 2023
b98ddf4
fix: add manifest url to LaunchedEscrow entity (#527)
m00n620 May 31, 2023
7b7171a
update contract addresses and CD (#529)
portuu3 May 31, 2023
cb5ea69
fix node and python sdk (#526)
leric7 May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 37 additions & 16 deletions .github/workflows/cd-deploy-contracts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
MOONSCAN_API_KEY: ${{ secrets.MOONSCAN_API_KEY }}
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
- uses: actions/setup-node@v3 #Temporal until this gets fixed https://github.com/NomicFoundation/hardhat/issues/3877
with:
node-version: 18.15
Expand Down Expand Up @@ -132,6 +134,23 @@ jobs:
if: always() && github.event.inputs.rewardPool== 'true'
run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.reward_pool }}
working-directory: ./packages/core

#Deploy subgraph
- run: graph auth --product hosted-service ${API_KEY}
name: Authenticate Graph CLI
env:
API_KEY: ${{ secrets.HP_GRAPH_API_KEY }}
- run: yarn generate
name: Generate Subgraph
working-directory: ./packages/sdk/typescript/subgraph
env:
NETWORK: ${{ steps.networks.outputs.subgraph }}
- run: graph deploy --product hosted-service humanprotocol/${NETWORK}
name: Deploy Subgraph
working-directory: ./packages/sdk/typescript/subgraph
env:
NETWORK: ${{ steps.networks.outputs.subgraph }}
#Commit changes to develop
- name: Check for Changes
if: always()
id: check_changes
Expand All @@ -144,6 +163,21 @@ jobs:
echo "No changes detected."
echo "::set-output name=changes::false"
fi

- name: stash
run: |
git status
git stash --include-untracked
- name: Checkout develop
if: always() && steps.check_changes.outputs.changes == 'true'
uses: actions/checkout@v3
with:
ref: develop
token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
- name: pop
run: |
git stash pop
git status
- name: Commit changes
if: always() && steps.check_changes.outputs.changes == 'true'
uses: EndBug/add-and-commit@v9
Expand All @@ -152,19 +186,6 @@ jobs:
message: 'Update grafting and upgrade file from CD'
default_author: github_actions
tag_push: '--force'
- name: Checkout develop
if: always() && steps.check_changes.outputs.changes == 'true'
uses: actions/checkout@v3
with:
ref: develop
- name: Rebase develop
if: always() && steps.check_changes.outputs.changes == 'true'
run: |
git fetch
git rebase origin/main
git push --force
- name: Trigger Subgraph Workflow
uses: benc-uk/workflow-dispatch@v1
with:
workflow: Subgraph deployment
inputs: '{ "subgraph-name": "${{ steps.networks.outputs.subgraph }}" }'
github_token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}


45 changes: 22 additions & 23 deletions CONTRACTS_LIST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
|2023/02/03 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0xcbAd56bE3f504E98bd70875823d3CC0242B7bB29 |
|2023/02/03 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0xa8e32d777a3839440cc7c24D591A64B9481753B3 |
|2023/02/03 | EthKVStore | 0x35Cf4beBD58F9C8D75B9eA2599479b6C173d406F | N/A |
| | Reputation | N/A | N/A |

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

|🟢 Ethereum (Mainnet) | Contract | Address | Proxy |
|🟢 Ethereum (Mainnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
|2021/04/06 | HMToken | 0xd1ba9BAC957322D6e8c07a160a3A8dA11A0d2867 | N/A |
|2023/03/28 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/03/28 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
|2023/04/03 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
|2023/05/30 | EscrowFactory | 0x35Cf4beBD58F9C8D75B9eA2599479b6C173d406F | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/05/30 | Staking | 0x37Fd69b4C8f71C8C2BC5650cebd27C2Cda6F6256 | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
|2023/05/30 | RewardPool | 0xDfb63B336b41f355a784623D08A959258Df5D219 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
|2023/03/28 | EthKVStore | 0x70671167176C4934204B1C7e97F5e86695857ef2 | N/A |
| | Reputation | N/A | N/A |

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

|🟠 Rinkeby (Testnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
Expand All @@ -44,7 +40,6 @@
| | Staking | | |
| | RewardPool | | |
| | EthKVStore | | N/A |
| | Reputation | | |

|🟢 Binance SC (Mainnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
Expand All @@ -53,7 +48,6 @@
|2023/02/08 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
|2023/02/08 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
|2023/02/08 | EthKVStore | 0x70671167176C4934204B1C7e97F5e86695857ef2 | N/A |
| | Reputation | N/A | N/A |

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

|🟢 Moonbeam (Mainnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
|2022/05/26 | HMToken | 0x3b25BC1dC591D24d60560d0135D6750A561D4764 | N/A |
|2023/03/10 | EscrowFactory | 0x08Ceac089a895e8C26cC196f63FF24b77349e897 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/02/08 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
|2023/02/08 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
|2023/05/30 | EscrowFactory | 0xBDBfD2cC708199C5640C6ECdf3B0F4A4C67AdfcB | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/05/30 | Staking | 0xa8e32d777a3839440cc7c24D591A64B9481753B3 | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
|2023/05/30 | RewardPool | 0x7CDE135F949FE81b16d989cfb4D20e11caa4dE14 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
|2023/02/08 | EthKVStore | 0x70671167176C4934204B1C7e97F5e86695857ef2 | N/A |
| | Reputation | N/A | N/A |

|🟠 Moonbase Alpha (Testnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
|2023/03/16 | HMToken | 0x2dd72db2bBA65cE663e476bA8b84A1aAF802A8e3 | N/A |
|2023/03/16 | EscrowFactory | 0x4DCB3906A65B77f6a588087652E6Dd9685d1F67f | 0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed |
|2023/03/16 | Staking | 0x854EC65E9e5e973C458FC2c92F6E0CbD403f5b95 | 0xBFC7009F3371F93F3B54DdC8caCd02914a37495c |
|2023/03/16 | RewardPool | 0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18 | 0xf46B45Df3d956369726d8Bd93Ba33963Ab692920 |
|2023/05/30 | EscrowFactory | 0x55b051A6EeC38580c036Dcba5c75D5f90f5b43a2 | 0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed |
|2023/05/30 | Staking | 0xbc925DA632aC596D4809DD5985f48567110e8256 | 0xBFC7009F3371F93F3B54DdC8caCd02914a37495c |
|2023/05/30 | RewardPool | 0xe8807F2fA126D498f6c258F42a545649e7371bFa | 0xf46B45Df3d956369726d8Bd93Ba33963Ab692920 |
|2023/01/30 | EthKVStore | 0xE3D74BBFa45B4bCa69FF28891fBE392f4B4d4e4d | N/A |
|2023/03/16 | Reputation | 0xF09f451eC04cAb1b1FAe98C86F45291B00E52b03 | 0x87469B4f2Fcf37cBd34E54244c0BD4Fa0603664c |

|🟢 Avalanche (Mainnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
Expand All @@ -89,7 +80,6 @@
| | Staking | | |
| | RewardPool | | |
|2022/11/17 | EthKVStore | 0x4B79eaD28F52eD5686bf0e379717e85fc7aD10Df | N/A |
| | Reputation | | |

|🟠 Avalanche Fuji (Testnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
Expand All @@ -98,7 +88,6 @@
| | Staking | | |
| | RewardPool | | |
|2022/10/24 | EthKVStore | 0xd232c1426CF0653cE8a71DC98bCfDf10c471c114 | N/A |
| | Reputation | | |

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



Expand Down Expand Up @@ -145,6 +133,9 @@
|2022/05/31 | EscrowFactory | 0x3Cd0B117Be4CC1e31c8d7d1eD8b32208a2820902 | |
|2022/05/31 | EthKVStore | 0x64009ca5fb4b34769F7240c6073FEc34bf5b64E3 | N/A |
|2022/05/31 | HMToken | 0xe4C8eC5d057EacF40060b2174627a4941a5c8127 | N/A |
|2023/03/16 | EscrowFactory | 0x4DCB3906A65B77f6a588087652E6Dd9685d1F67f | 0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed |
|2023/03/16 | Staking | 0x854EC65E9e5e973C458FC2c92F6E0CbD403f5b95 | 0xBFC7009F3371F93F3B54DdC8caCd02914a37495c |
|2023/03/16 | RewardPool | 0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18 | 0xf46B45Df3d956369726d8Bd93Ba33963Ab692920 |

|🟢 Polygon (Mainnet) | Contract | Address | Proxy |
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
Expand All @@ -162,4 +153,12 @@
|----------------------------|----------------|--------------------------------------------|--------------------------------------------|
|2022/06/01 | EscrowFactory | 0x98108c28B7767a52BE38B4860832dd4e11A7ecad | |
|2022/06/01 | EthKVStore | 0x6617d21ab0f16A7079e2811Cf9306CAe7018bDd9 | N/A |
|2023/02/8 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/02/8 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/03/10 | EscrowFactory | 0x08Ceac089a895e8C26cC196f63FF24b77349e897 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/02/08 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
|2023/02/08 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |

|🟢 Ethereum (Mainnet) | Contract | Address | Proxy |
|2023/03/28 | EscrowFactory | 0xe44D7eb960f24797D36FAdD8a8FfF29C76375Ef0 | 0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a |
|2023/03/28 | Staking | 0xC2163A0928034e020f0d31e1171Ba0D6d9AfFB6c | 0x05398211bA2046E296fBc9a9D3EB49e3F15C3123 |
|2023/04/03 | RewardPool | 0x25E53A6D48A2744273C082e55bA5CCFCfD80f9e1 | 0x4A5963Dd6792692e9147EdC7659936b96251917a |
13 changes: 8 additions & 5 deletions packages/apps/escrow-dashboard/src/components/SolvedTasks/SolvedTasksContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ const SOLVED_TASKS = [
{ date: '2022-07-31', value: 2181348 },
{ date: '2022-08-31', value: 2537442 },
{ date: '2022-09-30', value: 7014852 },
{ date: '2022-10-31', value: 17189000 },
{ date: '2022-11-30', value: 97000578 },
{ date: '2022-12-31', value: 247392072 },
{ date: '2023-01-31', value: 209000000 },
{ date: '2022-10-31', value: 42615432 },
{ date: '2022-11-30', value: 88708986 },
{ date: '2022-12-31', value: 203793543 },
{ date: '2023-01-31', value: 209093427 },
{ date: '2023-02-28', value: 237012318 },
{ date: '2023-03-31', value: 212012559 },
{ date: '2023-04-30', value: 182462076 },
];

export const SolvedTasksContainer: FC = () => {
Expand Down Expand Up @@ -45,7 +48,7 @@ export const SolvedTasksContainer: FC = () => {
sx={{ fontSize: { xs: 32, md: 48, lg: 64, xl: 80 }, pl: 14 }}
lineHeight={1}
>
{numeral(solvedTasksCount).format('0,0')}
{numeral(solvedTasksCount).format('0.000 a').toUpperCase()}
</Typography>
</Box>
);
Expand Down
Loading