Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci-lint-cvat-recording-oracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ jobs:
python-version: '3.10'
cache: 'poetry'
cache-dependency-path: ${{ env.WORKING_DIR }}/poetry.lock
- run: poetry install --no-root --only lint
- run: poetry install --no-root --only dev
- run: poetry run pre-commit run --all-files
2 changes: 1 addition & 1 deletion .github/workflows/ci-test-cvat-exchange-oracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
- uses: actions/checkout@v7
- 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
run: docker compose -f docker-compose.test.yml -f docker-compose.test.head.yml up --attach test --exit-code-from test
2 changes: 1 addition & 1 deletion .github/workflows/ci-test-cvat-recording-oracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
- uses: actions/checkout@v7
- 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
run: docker compose -f docker-compose.test.yml -f docker-compose.test.head.yml up --attach test --exit-code-from test
4 changes: 2 additions & 2 deletions docker-setup/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ infra-up: check-env-file
infra-stop:
@docker compose --env-file .env.compose.local stop postgres redis minio minio-client

# TODO: Revisit compose-native parallel builds once Docker Compose v5 parallel limits are reliable again.
build-services: check-env-file
@# TODO: Revisit compose-native parallel builds once Docker Compose v5 parallel limits are reliable again.
@docker compose --env-file .env.compose.local config --services | \
xargs -n $(DOCKER_PARALLEL) docker compose --env-file .env.compose.local build
@docker compose --env-file .env.compose.local up --no-start

# TODO: Revisit compose-native parallel builds once Docker Compose v5 parallel limits are reliable again.
services-up: check-env-file
@service_names="$(wordlist 2, $(words $(MAKECMDGOALS)), $(MAKECMDGOALS))"; \
@# TODO: Revisit compose-native parallel builds once Docker Compose v5 parallel limits are reliable again.
if [ -n "$$service_names" ]; then \
printf '%s\n' $$service_names | xargs -n $(DOCKER_PARALLEL) docker compose --env-file .env.compose.local up -d; \
else \
Expand Down
6 changes: 3 additions & 3 deletions packages/apps/dashboard/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@mui/styled-engine-sc": "9.0.1",
"@mui/system": "^9.0.1",
"@mui/x-data-grid": "^8.7.0",
"@mui/x-date-pickers": "^9.2.0",
"@mui/x-date-pickers": "^9.9.0",
"@tanstack/react-query": "^5.91.3",
"@types/react-router-dom": "^5.3.3",
"@types/recharts": "^1.8.29",
Expand All @@ -35,10 +35,10 @@
"react": "^19.2.6",
"react-dom": "^19.2.6",
"react-number-format": "^5.4.5",
"react-router-dom": "^7.18.0",
"react-router-dom": "^7.18.1",
"recharts": "^2.13.0-alpha.4",
"simplebar-react": "^3.3.2",
"styled-components": "^6.3.11",
"styled-components": "^6.4.3",
"swiper": "^11.1.3",
"use-debounce": "^10.1.0",
"vite-plugin-node-polyfills": "^0.25.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/apps/dashboard/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
"@keyv/redis": "^5.1.5",
"@nestjs/axios": "^4.0.1",
"@nestjs/cache-manager": "^3.1.0",
"@nestjs/common": "^11.1.12",
"@nestjs/common": "^11.1.27",
"@nestjs/config": "^4.0.2",
"@nestjs/core": "^11.1.12",
"@nestjs/mapped-types": "^2.1.1",
"@nestjs/platform-express": "^11.1.12",
"@nestjs/schedule": "^6.1.3",
"@nestjs/swagger": "^11.2.5",
"axios": "^1.3.1",
"cache-manager": "7.2.8",
"cache-manager": "7.2.9",
"class-transformer": "^0.5.1",
"class-validator": "0.14.1",
"dayjs": "^1.11.20",
"ethers": "~6.17.0",
"joi": "^17.13.3",
"keyv": "^5.5.5",
"lodash": "^4.17.21",
"lodash": "^4.18.1",
"minio": "8.0.7",
"reflect-metadata": "^0.2.2",
"rxjs": "^7.2.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CacheModuleAsyncOptions } from '@nestjs/common/cache';
import { CacheModuleAsyncOptions } from '@nestjs/cache-manager';
import { ConfigModule } from '@nestjs/config';
import * as _ from 'lodash';

Expand Down
2 changes: 1 addition & 1 deletion packages/apps/faucet/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"react": "^19.2.6",
"react-dom": "^19.2.6",
"react-loading-skeleton": "^3.3.1",
"react-router-dom": "^7.18.0",
"react-router-dom": "^7.18.1",
"serve": "^14.2.6",
"viem": "^2.52.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/apps/fortune/exchange-oracle/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"@human-protocol/sdk": "workspace:^",
"@mui/icons-material": "^7.3.8",
"@mui/material": "^5.16.7",
"@tanstack/query-sync-storage-persister": "^5.68.0",
"@tanstack/query-sync-storage-persister": "^5.101.2",
"@tanstack/react-query": "^5.91.3",
"@tanstack/react-query-persist-client": "^5.80.7",
"axios": "^1.7.2",
"ethers": "^6.17.0",
"react": "^19.2.6",
"react-dom": "^19.2.6",
"react-router-dom": "^7.18.0",
"react-router-dom": "^7.18.1",
"serve": "^14.2.6",
"viem": "^2.52.2",
"wagmi": "^3.6.15"
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/fortune/exchange-oracle/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@human-protocol/logger": "workspace:*",
"@human-protocol/sdk": "workspace:*",
"@nestjs/axios": "^4.0.1",
"@nestjs/common": "^11.1.12",
"@nestjs/common": "^11.1.27",
"@nestjs/config": "^4.0.2",
"@nestjs/core": "^11.1.12",
"@nestjs/passport": "^11.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/fortune/recording-oracle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@human-protocol/logger": "workspace:*",
"@human-protocol/sdk": "workspace:*",
"@nestjs/axios": "^4.0.1",
"@nestjs/common": "^11.1.12",
"@nestjs/common": "^11.1.27",
"@nestjs/config": "^4.0.2",
"@nestjs/core": "^11.1.12",
"@nestjs/platform-express": "^11.1.12",
Expand Down
17 changes: 7 additions & 10 deletions packages/apps/human-app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@
"@hcaptcha/react-hcaptcha": "^1.14.0",
"@hookform/resolvers": "^5.1.0",
"@human-protocol/sdk": "workspace:*",
"@mui/icons-material": "^7.3.8",
"@mui/material": "^5.16.7",
"@mui/system": "^9.0.1",
"@mui/x-date-pickers": "^9.2.0",
"@mui/icons-material": "^9.2.0",
"@mui/material": "^9.2.0",
"@mui/x-date-pickers": "^9.9.0",
"@reown/appkit": "^1.8.20",
"@reown/appkit-adapter-wagmi": "^1.8.20",
"@synaps-io/verify-sdk": "^4.0.45",
Expand All @@ -38,9 +37,8 @@
"ethers": "^6.17.0",
"i18next": "^25.8.0",
"jwt-decode": "^4.0.0",
"lodash": "^4.17.21",
"lodash": "^4.18.1",
"material-react-table": "3.0.1",
"mui-image": "^1.0.7",
"notistack": "^3.0.1",
"prop-types": "^15.8.1",
"query-string": "^9.0.0",
Expand All @@ -50,7 +48,7 @@
"react-i18next": "^15.1.0",
"react-imask": "^7.4.0",
"react-number-format": "^5.4.5",
"react-router-dom": "^7.18.0",
"react-router-dom": "^7.18.1",
"serve": "^14.2.6",
"viem": "^2.52.2",
"vite-plugin-svgr": "^4.2.0",
Expand All @@ -62,8 +60,7 @@
"@eslint/js": "^10.0.1",
"@tanstack/eslint-plugin-query": "^5.60.1",
"@tanstack/react-query-devtools": "^5.59.16",
"@types/lodash": "^4.17.12",
"@types/mui-image": "^1.0.5",
"@types/lodash": "^4.17.24",
"@types/node": "^22.10.5",
"@types/prop-types": "^15",
"@types/react": "^19.2.15",
Expand All @@ -80,7 +77,7 @@
"husky": "^9.1.6",
"jsdom": "^29.1.1",
"prettier": "^3.8.1",
"typescript": "^5.6.3",
"typescript": "^6.0.2",
"typescript-eslint": "^8.57.0",
"vite": "^6.2.4",
"vitest": "^4.0.18"
Expand Down
46 changes: 19 additions & 27 deletions packages/apps/human-app/frontend/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ import CssBaseline from '@mui/material/CssBaseline';
import { BrowserRouter } from 'react-router-dom';
import { AuthProvider } from '@/modules/auth/context/auth-context';
import { Router } from '@/router/router';
import '@fontsource/inter';
import '@fontsource/inter/400.css';
import '@fontsource/inter/500.css';
import '@fontsource/inter/600.css';
import '@fontsource/inter/800.css';
import '@fontsource/roboto';
import '@fontsource/roboto/400.css';
import '@fontsource/roboto/500.css';
import { WalletConnectProvider } from '@/shared/contexts/wallet-connect';
Expand All @@ -23,7 +21,6 @@ import { HomePageStateProvider } from '@/shared/contexts/homepage-state';
import { NotificationProvider } from '@/shared/providers/notifications-provider';
import { ModalProvider } from './shared/contexts/modal-context';
import { GlobalModal } from './shared/components/ui/modal/global-modal';
import { UiConfigProvider } from './shared/providers/ui-config-provider';

const root = document.getElementById('root');
if (!root) throw Error('root element is undefined');
Expand All @@ -40,30 +37,25 @@ createRoot(root).render(
<ColorModeProvider>
<CssBaseline />
<QueryClientProvider client={queryClient}>
<UiConfigProvider>
<NotificationProvider>
<BrowserRouter>
<WalletConnectProvider>
<HomePageStateProvider>
<ModalProvider>
<Web3AuthProvider>
<AuthProvider>
<GlobalModal />
<JWTExpirationCheck>
<Router />
</JWTExpirationCheck>
</AuthProvider>
</Web3AuthProvider>
</ModalProvider>
</HomePageStateProvider>
<ReactQueryDevtools
client={queryClient}
initialIsOpen={false}
/>
</WalletConnectProvider>
</BrowserRouter>
</NotificationProvider>
</UiConfigProvider>
<NotificationProvider>
<BrowserRouter>
<WalletConnectProvider>
<HomePageStateProvider>
<ModalProvider>
<Web3AuthProvider>
<AuthProvider>
<GlobalModal />
<JWTExpirationCheck>
<Router />
</JWTExpirationCheck>
</AuthProvider>
</Web3AuthProvider>
</ModalProvider>
</HomePageStateProvider>
<ReactQueryDevtools client={queryClient} initialIsOpen={false} />
</WalletConnectProvider>
</BrowserRouter>
</NotificationProvider>
</QueryClientProvider>
</ColorModeProvider>
</StrictMode>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const userDataSchema = z.object({
user_id: z.number(),
reputation_network: z.string(),
exp: z.number(),
is_stake_eligible: z.boolean(),
});

export type UserData = z.infer<typeof userDataSchema>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function getProposalStatus(proposal: ProposalResponse): ProposalStatus {
if (voteStart <= now && now < voteEnd) return 'active';
return 'pending';
}

export function GovernanceBanner() {
const { t } = useTranslation();
const { data: proposal, isLoading, isError } = useProposalQuery();
Expand Down Expand Up @@ -53,45 +54,49 @@ export function GovernanceBanner() {
return (
<Grid
container
alignItems={{ xs: 'flex-start', sm: 'center' }}
justifyContent={{ xs: 'flex-start', sm: 'space-between' }}
bgcolor={background.primary}
color={text.secondary}
borderRadius="8px"
p={2}
gap={2}
mt={{ xs: 0, md: -8 }}
sx={{
alignItems: { xs: 'flex-start', sm: 'center' },
justifyContent: { xs: 'flex-start', sm: 'space-between' },
bgcolor: background.primary,
color: text.secondary,
borderRadius: '8px',
p: 2,
gap: 2,
mt: { xs: 0, md: -8 },
}}
>
{/* Left side: Countdown & "X votes" */}
<Grid
item
xs={12}
sm="auto"
display="flex"
alignItems="center"
flexWrap={{ xs: 'wrap', sm: 'nowrap' }}
gap={{ xs: 2, md: 0 }}
size={{ xs: 12, sm: 'auto' }}
sx={{
display: 'flex',
alignItems: 'center',
flexWrap: { xs: 'wrap', sm: 'nowrap' },
gap: { xs: 2, md: 0 },
}}
>
<Box display="flex" alignItems="center">
<Box sx={{ display: 'flex', alignItems: 'center' }}>
<AccessTimeIcon sx={{ mr: 1 }} />
<Typography variant="body2" color={text.secondary}>
<Typography variant="body2" sx={{ color: text.secondary }}>
{status === 'pending'
? t('governance.timeToStart', 'Voting starts in')
: t('governance.timeToReveal', 'Time to reveal vote')}
:
</Typography>
<Typography variant="body1" ml={1} color={text.primary}>
<Typography variant="body1" sx={{ ml: 1, color: text.primary }}>
{timeRemaining}
</Typography>
</Box>
{status === 'active' && (
<Typography
variant="body1"
ml={{ xs: 0, md: 8 }}
color={text.primary}
bgcolor={background.secondary}
borderRadius="8px"
padding="4px 8px"
sx={{
ml: { xs: 0, md: 8 },
color: text.primary,
bgcolor: background.secondary,
borderRadius: '8px',
p: '4px 8px',
}}
>
{totalVotes} {t('governance.votes', 'votes')}
</Typography>
Expand All @@ -100,19 +105,24 @@ export function GovernanceBanner() {

{/* Right side: "More details" link */}
<Grid
item
xs={12}
sm
display="flex"
justifyContent={{ xs: 'flex-start', sm: 'flex-end' }}
size={{ xs: 12, sm: 12 }}
sx={{
display: 'flex',
justifyContent: { xs: 'flex-start', sm: 'flex-end' },
}}
>
<MuiLink
href={env.VITE_GOVERNANCE_URL}
underline="none"
target="_blank"
rel="noopener noreferrer"
color={text.secondary}
fontWeight={500}
sx={{
color: text.secondary,
fontWeight: 500,
textDecoration: 'none',
'&:hover': {
textDecoration: 'underline',
},
}}
>
{t('governance.moreDetails', 'More details')} &rarr;
</MuiLink>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function ChooseSignUpAccountType() {
title={<Typography variant="h4">{t('homepage.welcome')} 👋</Typography>}
>
<Grid container spacing={4}>
<Grid item sx={{ paddingBottom: '16px' }} xs={12}>
<Grid size={12} sx={{ pb: 2 }}>
<Typography variant="h4">{t('homepage.howWillUse')}</Typography>
</Grid>
<WorkerSignUp />
Expand Down
Loading
Loading