Skip to content

Commit fcf6adc

Browse files
portuu3portuu3
authored
Merge pull request #897 from humanprotocol/develop
Releae 20230919
2 parents df7b351 + 53b52af commit fcf6adc

File tree

235 files changed

+11160
-1995
lines changed

Some content is hidden

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

235 files changed

+11160
-1995
lines changed

‎.github/dependabot.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 2
2+
3+
updates:
4+
# Maintain dependencies for GitHub Actions
5+
- package-ecosystem: "github-actions"
6+
directory: "/"
7+
schedule:
8+
interval: "weekly"
9+
target-branch: "develop"
10+
11+
# Maintain dependencies for npm
12+
- package-ecosystem: "npm"
13+
directory: "/"
14+
schedule:
15+
interval: "weekly"
16+
target-branch: "develop"
17+
18+
# Maintain dependencies for pip
19+
- package-ecosystem: "pip"
20+
directory: "/"
21+
schedule:
22+
interval: "weekly"
23+
target-branch: "develop"

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

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
ETH_BSC_TESTNET_URL: ${{ secrets.ETH_BSC_TESTNET_URL }}
3030
ETH_MOONBEAM_URL: ${{ secrets.ETH_MOONBEAM_URL }}
3131
ETH_MOONBASE_ALPHA_URL: ${{ secrets.ETH_MOONBASE_ALPHA_URL }}
32-
ETH_MAINNET_TESTNET_URL: ${{ secrets.ETH_MAINNET_TESTNET_URL }}
32+
ETH_MAINNET_URL: ${{ secrets.ETH_MAINNET_URL }}
3333
ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
3434
POLYGONSCAN_API_KEY: ${{ secrets.POLYGONSCAN_API_KEY }}
3535
BSC_API_KEY: ${{ secrets.BSC_API_KEY }}
@@ -134,5 +134,44 @@ jobs:
134134
if: always() && github.event.inputs.rewardPool== 'true'
135135
run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.reward_pool }}
136136
working-directory: ./packages/core
137+
#Commit changes to develop
138+
- name: Check for Changes
139+
if: always()
140+
id: check_changes
141+
run: |
142+
git fetch
143+
if [[ -n "$(git diff --name-only)" ]]; then
144+
echo "Changes detected."
145+
echo "::set-output name=changes::true"
146+
else
147+
echo "No changes detected."
148+
echo "::set-output name=changes::false"
149+
fi
150+
151+
- name: stash
152+
if: always() && steps.check_changes.outputs.changes == 'true'
153+
run: |
154+
git status
155+
git stash --include-untracked
156+
- name: Checkout develop
157+
if: always() && steps.check_changes.outputs.changes == 'true'
158+
uses: actions/checkout@v3
159+
with:
160+
ref: develop
161+
token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
162+
- name: pop
163+
if: always() && steps.check_changes.outputs.changes == 'true'
164+
run: |
165+
git stash pop
166+
git status
167+
- name: Commit changes
168+
if: always() && steps.check_changes.outputs.changes == 'true'
169+
uses: EndBug/add-and-commit@v9
170+
with:
171+
add: "['./packages/core/.openzeppelin']"
172+
message: 'Update upgrade file from CD'
173+
default_author: github_actions
174+
tag_push: '--force'
175+
github_token: ${{ secrets.GH_TOKEN_CD_CONTRACTS }}
137176

138177

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
paths:
66
- 'packages/examples/cvat/exchange-oracle/**'
7+
- 'packages/sdk/python/human-protocol-sdk/**'
78

89
jobs:
910
cvat-exo-test:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
paths:
66
- 'packages/examples/cvat/recording-oracle/**'
7+
- 'packages/sdk/python/human-protocol-sdk/**'
78

89
jobs:
910
cvat-exo-test:

‎packages/apps/escrow-dashboard/src/components/Cards/Charts/BarChart.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ export const BarChart: FC<BarChartProps> = ({ title, totalValue, series }) => {
5252
tickLine={false}
5353
interval="preserveStartEnd"
5454
ticks={[
55-
series[0].date,
56-
series[Math.ceil(series.length / 2) - 1].date,
57-
series[series.length - 1].date,
55+
series[0]?.date,
56+
series[Math.ceil(series.length / 2) - 1]?.date,
57+
series[series.length - 1]?.date,
5858
]}
5959
tick={{ fill: '#320A8D', fontSize: '12px', fontFamily: 'Inter' }}
6060
tickMargin={12}

‎packages/apps/escrow-dashboard/src/components/Cards/Charts/StackedBarChart.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export const StackedBarChart: FC<StackedBarChartProps> = ({
113113
axisLine={false}
114114
tickLine={false}
115115
interval="preserveStartEnd"
116-
ticks={[series[0].date, series[series.length - 1].date]}
116+
ticks={[series[0]?.date, series[series.length - 1]?.date]}
117117
tick={{
118118
fill: '#320A8D',
119119
fontSize: '12px',

‎packages/apps/job-launcher/client/.eslintrc.json‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"extends": [
3+
"plugin:import/recommended",
4+
"plugin:import/typescript",
5+
"plugin:prettier/recommended",
6+
"react-app"
7+
],
8+
"settings": {
9+
"import/resolver": {
10+
"typescript": {},
11+
"node": {
12+
"extensions": [".js", ".jsx", ".ts", ".tsx", ".d.ts"]
13+
}
14+
},
15+
"import/parsers": {
16+
"@typescript-eslint/parser": [".ts", ".tsx"]
17+
}
18+
},
19+
"parserOptions": {
20+
"ecmaVersion": 2020,
21+
"sourceType": "module"
22+
},
23+
"rules": {
24+
"no-console": "warn",
25+
"no-unused-vars": "off",
26+
"import/extensions": [
27+
"error",
28+
"ignorePackages",
29+
{
30+
"js": "never",
31+
"jsx": "never",
32+
"ts": "never",
33+
"tsx": "never"
34+
}
35+
],
36+
"import/order": [
37+
"error",
38+
{
39+
"pathGroups": [
40+
{
41+
"pattern": "~/**",
42+
"group": "external"
43+
}
44+
],
45+
"alphabetize": {
46+
"order": "asc",
47+
"caseInsensitive": true
48+
}
49+
}
50+
],
51+
"@typescript-eslint/no-unused-vars": ["error"],
52+
"prettier/prettier": ["error"]
53+
},
54+
"overrides": [
55+
{
56+
"files": ["*.ts", "*.tsx"],
57+
"rules": {
58+
"no-undef": "off"
59+
}
60+
}
61+
],
62+
"env": {
63+
"browser": true,
64+
"jest": true,
65+
"node": true
66+
}
67+
}

‎packages/apps/job-launcher/client/LICENSE‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2022 Metahuman Foundation
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎packages/apps/job-launcher/client/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## Job Launcher Client

‎packages/apps/job-launcher/client/index.html‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="/favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#000000" />
8+
<meta name="description" content="Human Protocol Job Launcher" />
9+
<link rel="apple-touch-icon" href="/logo192.png" />
10+
<!--
11+
manifest.json provides metadata used when your web app is installed on a
12+
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
13+
-->
14+
<link rel="manifest" href="/manifest.json" />
15+
<!--
16+
Notice the use of %PUBLIC_URL% in the tags above.
17+
It will be replaced with the URL of the `public` folder during the build.
18+
Only files inside the `public` folder can be referenced from the HTML.
19+
20+
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
21+
work correctly both with client-side routing and a non-root public URL.
22+
Learn how to configure a non-root public URL by running `npm run build`.
23+
-->
24+
<link
25+
rel="stylesheet"
26+
href="https://fonts.googleapis.com/css?family=Inter:300,400,500,600,700&display=swap"
27+
/>
28+
<title>Human Protocol Job Launcher</title>
29+
</head>
30+
<body>
31+
<div id="root"></div>
32+
<script type="module" src="/src/main.tsx"></script>
33+
</body>
34+
</html>

0 commit comments

Comments
 (0)