PR-1590 conflicts resolved #12
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Added hCaptcha job type * Updated job service * Updated generate manifest method * Added immo type * Added storage module and updated dependencies * Add storage module * Implemented json stringify module and fixed storage module * Added unit tests coverage * Removed unused exports * Removed job api key param * Resolved comments * Improved Storage module * Updated upload file method * Updated task data uri * Resolved comments * Added ground truth validator * Added site key * Removed undefined decorator * Added token fix * Updated unit tests, funds, fixes manifests * Logs * Updated manifest properties * Removed requester_question_example for categorization * Removed constrain from buildHCaptchaRestrictedAnswerSet * Updated constrain from buildHCaptchaRestrictedAnswerSet * Added default case for RestrictedAnswerSet * Removed logs * Resolved PRs comments * Resolved PRs comments * Added create manifest unit tests * Resolved PR comments * [Job Launcher] Lint fixes (humanprotocol#1249) * Lint fixes * Resolved error * Fixed lint error * Update packages/apps/job-launcher/server/src/main.ts Co-authored-by: portuu3 <61605646+portuu3@users.noreply.github.com> * merge develop into feature/launcher/hcaptcha * generate yarn.lock * remove duplicate * remove duplicates after merge * remove duplicate and clean imports * disable hcaptcha endpoint --------- Co-authored-by: portuu3 <61605646+portuu3@users.noreply.github.com> Co-authored-by: portuu3 <adrian.portugues.mas@gmail.com>
* fix dashboard admin build issue * use single quote
* add storage params cvat dto * disable GCS and fix tests * Add error message and test * Improve error checks and messages * use storage data class for hcaptcha
…humanprotocol#1388) * Using two separate streams for calculating file hash and uploading to s3 bucket * `copyFileFromURLToBucket` testcase updated to match `copyFileFromURLToBucket` method
* add google tag manager * fix dependency error
…col#1385) * fix ui bugs and tasks data on dashboard ui * fix tooltip title
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1521.0 to 2.1528.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Commits](aws/aws-sdk-js@v2.1521.0...v2.1528.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.10.4 to 20.10.6. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 8.1.3 to 9.0.4. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](reduxjs/react-redux@v8.1.3...v9.0.4) --- updated-dependencies: - dependency-name: react-redux dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@mui/x-date-pickers](https://github.com/mui/mui-x/tree/HEAD/packages/x-date-pickers) from 6.18.5 to 6.18.6. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/next/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v6.18.6/packages/x-date-pickers) --- updated-dependencies: - dependency-name: "@mui/x-date-pickers" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…anprotocol#1383) * split cron job and lock * fix retries and failure handling * fix cron job service * remove created at property * remove unnecessary CREATING status * fix job status and cron job check * refactor remaining cron jobs * fix cron job type enum and running check --------- Co-authored-by: portuu3 <adrian.portugues.mas@gmail.com>
* Updated regex * Added regex to error message * Added validation pipe for password * use relative paths --------- Co-authored-by: portuu3 <adrian.portugues.mas@gmail.com>
Bumps @graphprotocol/graph-cli from 0.62.0 to 0.64.1. --- updated-dependencies: - dependency-name: "@graphprotocol/graph-cli" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [web-vitals](https://github.com/GoogleChrome/web-vitals) from 3.5.0 to 3.5.1. - [Changelog](https://github.com/GoogleChrome/web-vitals/blob/main/CHANGELOG.md) - [Commits](GoogleChrome/web-vitals@v3.5.0...v3.5.1) --- updated-dependencies: - dependency-name: web-vitals dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [chai](https://github.com/chaijs/chai) from 4.3.10 to 4.4.0. - [Release notes](https://github.com/chaijs/chai/releases) - [Changelog](https://github.com/chaijs/chai/blob/main/History.md) - [Commits](chaijs/chai@v4.3.10...v4.4.0) --- updated-dependencies: - dependency-name: chai dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@strapi/plugin-i18n](https://github.com/strapi/strapi/tree/HEAD/packages/plugins/i18n) from 4.15.5 to 4.16.2. - [Release notes](https://github.com/strapi/strapi/releases) - [Commits](https://github.com/strapi/strapi/commits/v4.16.2/packages/plugins/i18n) --- updated-dependencies: - dependency-name: "@strapi/plugin-i18n" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 14.0.1 to 15.2.0. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](lint-staged/lint-staged@v14.0.1...v15.2.0) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* support s3 providers on cvat * disable GCS --------- Co-authored-by: portuu3 <adrian.portugues.mas@gmail.com>
Update ethers to v6 and all its references
* update web3 version * fix yarn lock
* Updated cancel method * Updated cancel method logic * Removed old implementation of cancel method * fix test and generate doc --------- Co-authored-by: Eric Lee <eric@hmt.ai>
Bumps [@nestjs/schedule](https://github.com/nestjs/schedule) from 3.0.4 to 4.0.0. - [Release notes](https://github.com/nestjs/schedule/releases) - [Changelog](https://github.com/nestjs/schedule/blob/master/.release-it.json) - [Commits](nestjs/schedule@3.0.4...4.0.0) --- updated-dependencies: - dependency-name: "@nestjs/schedule" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [supertest](https://github.com/ladjs/supertest) and [@types/supertest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/supertest). These dependencies needed to be updated together. Updates `supertest` from 6.3.3 to 6.3.4 - [Release notes](https://github.com/ladjs/supertest/releases) - [Commits](ladjs/supertest@v6.3.3...v6.3.4) Updates `@types/supertest` from 2.0.16 to 6.0.2 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/supertest) --- updated-dependencies: - dependency-name: supertest dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: "@types/supertest" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pg](https://github.com/brianc/node-postgres/tree/HEAD/packages/pg) from 8.8.0 to 8.11.3. - [Changelog](https://github.com/brianc/node-postgres/blob/master/CHANGELOG.md) - [Commits](https://github.com/brianc/node-postgres/commits/pg@8.11.3/packages/pg) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) and [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest). These dependencies needed to be updated together. Updates `jest` from 27.5.1 to 29.7.0 - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/jest) Updates `@types/jest` from 29.5.1 to 29.5.11 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) --- updated-dependencies: - dependency-name: jest dependency-type: direct:development update-type: version-update:semver-major - dependency-name: "@types/jest" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@nestjs/terminus](https://github.com/nestjs/terminus) from 10.2.0 to 10.2.1. - [Release notes](https://github.com/nestjs/terminus/releases) - [Changelog](https://github.com/nestjs/terminus/blob/master/CHANGELOG.md) - [Commits](nestjs/terminus@10.2.0...10.2.1) --- updated-dependencies: - dependency-name: "@nestjs/terminus" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [chai](https://github.com/chaijs/chai) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/chaijs/chai/releases) - [Changelog](https://github.com/chaijs/chai/blob/main/History.md) - [Commits](chaijs/chai@v4.4.0...v4.4.1) --- updated-dependencies: - dependency-name: chai dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps @graphprotocol/graph-ts from 0.31.0 to 0.32.0. --- updated-dependencies: - dependency-name: "@graphprotocol/graph-ts" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [prettier](https://github.com/prettier/prettier) from 3.1.1 to 3.2.5. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@3.1.1...3.2.5) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1561) * Update DB Job repository * Add a base repository to add all common methods and avoid duplicating code
…col#1545) * Update DB webhook repository * Fix imports * Improve the update method in webhook repository * Update `WebhookRepository`: changed `updateOne()` Update `WebhookService`: removed unnecessary methods; Update `WebhookEntity`: added constructor and default values for various fields; Update `CronJobService`: usage of `WebhookService`, `WebhookRepository` and `WebhookEntity` changed accordingly; * Remove webhookEntity constructor to be able to run migrations Fix cron-job.service injections Fix tests * Update webhook.entity.ts --------- Co-authored-by: Sergey Dzeranov <sergey.dzeranov@gmail.com>
…emas (humanprotocol#1558) * Update DB Cron Job repository * Update apikey, token and auth repositories * Update repositories to extend from the base repository
…ocol#1552) * Update DB Cron Job repository * Update cron job repository to extend from the base repository * Remove else from startCronJob in cron-job.service.ts
* Send hcaptcha token to server for verification * Fix tests for hcaptcha token * Uncomment cron expressions
Bumps [@stripe/stripe-js](https://github.com/stripe/stripe-js) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/stripe/stripe-js/releases) - [Commits](stripe/stripe-js@v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: "@stripe/stripe-js" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 6.2.0 to 6.4.2. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](testing-library/jest-dom@v6.2.0...v6.4.2) --- updated-dependencies: - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Refactor creteJob in job.service.ts * Remove wrong files pushed
…l#1591) * fix jl token email no created * fix token entity not saved
* Job launcher fixes * fix tests
…l#1586) * Added cron service, added payout service, updated reputation service, updated unit tests, updated dto * Updated dependencies * Updated migrations * Refactored payout and reputation modules * Lint fix * Added interfaces
* add pgp passphrase * Do not request private key for disabled encryption
Bumps [stripe](https://github.com/stripe/stripe-node) from 14.11.0 to 14.17.0. - [Release notes](https://github.com/stripe/stripe-node/releases) - [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md) - [Commits](stripe/stripe-node@v14.11.0...v14.17.0) --- updated-dependencies: - dependency-name: stripe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@hcaptcha/react-hcaptcha](https://github.com/hCaptcha/react-hcaptcha) from 1.9.2 to 1.10.1. - [Release notes](https://github.com/hCaptcha/react-hcaptcha/releases) - [Commits](hCaptcha/react-hcaptcha@1.9.2...1.10.1) --- updated-dependencies: - dependency-name: "@hcaptcha/react-hcaptcha" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.10.6 to 20.11.19. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@nestjs/serve-static](https://github.com/nestjs/serve-static) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/nestjs/serve-static/releases) - [Changelog](https://github.com/nestjs/serve-static/blob/master/.release-it.json) - [Commits](nestjs/serve-static@4.0.0...4.0.1) --- updated-dependencies: - dependency-name: "@nestjs/serve-static" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…l#1599) * Create a new entity in subgraph to store reputation network Create new methods in SDK to retrieve reputation network from subgraph Rename StakingUtils to OperatorUtils in python SDK Create new OperatorUtils in typescript SDK and remove some operator methods from StakingClient Update reputation oracle to check if the operator has previously assigned some required values in KVStore before signup and after that, create a new entry in KVStore setting the new operator as active * Fix all references to previous SDK implementation * Rename getReputationNetwork method to getReputationNetworkOperators Generate again all docs * Generate typescript docs * Update docs/sdk/changelog.md Co-authored-by: portuu3 <61605646+portuu3@users.noreply.github.com> * Update docs/sdk/changelog.md Co-authored-by: portuu3 <61605646+portuu3@users.noreply.github.com> --------- Co-authored-by: portuu3 <61605646+portuu3@users.noreply.github.com>
* Added pre-signup logic * Stringify typed structed data * Updated web3Service * Removed stringify mechanism
# Conflicts: # yarn.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.