Merge branch 'develop' into subgraph-upgrades

Author: portuu3

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,43 @@
-## Description
+## Issue tracking
+<!--
+  Where is the progress of this issue being tracked?
+  Where can one find the requirements for this issue?
+  Where did this issue originated from?
 
-<!-- Describe the goal of this pull request. What does it change or fix? -->
+  E.g. GitHub issue, Slack message, etc.
+-->
 
-## Summary of changes
+## Context behind the change
+<!--
+  What changes have you made to the code, and why?
 
-<!-- At a high level, what parts of the code did you change and why? -->
+  Describe the goal of this pull request. What does it change or fix?
+  At a high level, what parts of the code did you change and why?
+-->
 
-## How test the changes
+## How has this been tested?
+<!--
+  You should always test your changes.
 
-<!-- If there are any special testing requirements, add them here -->
+  Describe the steps you took to make sure your PR does what it's supposed to do.
+  How we ensure that adjacent code/features are still working?
+  Are there any performance implications?
+-->
 
-## Related issues
-[Keywords for linking issues](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests)
+## Release plan
+<!--
+  If not you, but somebody else will be deploying this, what they need to know/do to succeed?
 
-<!-- Does this close any open issues? -->
+  Add any action items that need to be done for the release (any step, before/during/after),
+  e.g. running a DB migration, leaving a note about release in Slack, adding new envs, etc.
+-->
+
+## Potential risks; What to monitor; Rollback plan
+<!--
+  What might go wrong with deployment of this PR?
+  Can it affect some other services/areas? In what way?
+  What metrics/dashboards/etc. you should keep an eye on while/after deploying this?
+ 
+  How will we handle any issues if they arise? Do we need rollback plan?
+  Do we need a second pair of eyes on this?
+-->

.github/workflows/ci-lint-cvat-exchange-oracle.yaml

@@ -19,11 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
         with:
-          cache: 'pip'
-          cache-dependency-path: ${{ env.WORKING_DIR }}/poetry.lock
-      - run: python -m pip install poetry
+          version: 1.8.4
       - uses: actions/setup-python@v5
         with:
           python-version: '3.10'

.github/workflows/ci-lint-cvat-recording-oracle.yaml

@@ -19,11 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
         with:
-          cache: 'pip'
-          cache-dependency-path: ${{ env.WORKING_DIR }}/poetry.lock
-      - run: python -m pip install poetry
+          version: 1.8.4
       - uses: actions/setup-python@v5
         with:
           python-version: '3.10'

.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx lint-staged
 
 # Format python file changes

docs/sdk/python/human_protocol_sdk.constants.md

@@ -54,6 +54,8 @@ Enum for KVStore keys
 
 #### public_key *= 'public_key'*
 
+#### registration_instructions *= 'registration_instructions'*
+
 #### registration_needed *= 'registration_needed'*
 
 #### role *= 'role'*

docs/sdk/python/human_protocol_sdk.md

@@ -54,11 +54,24 @@
       * [Module](human_protocol_sdk.kvstore.kvstore_client.md#module)
       * [`KVStoreClient`](human_protocol_sdk.kvstore.kvstore_client.md#human_protocol_sdk.kvstore.kvstore_client.KVStoreClient)
       * [`KVStoreClientError`](human_protocol_sdk.kvstore.kvstore_client.md#human_protocol_sdk.kvstore.kvstore_client.KVStoreClientError)
+<<<<<<< HEAD
     * [human_protocol_sdk.kvstore.kvstore_utils module](human_protocol_sdk.kvstore.kvstore_utils.md)
       * [Code Example](human_protocol_sdk.kvstore.kvstore_utils.md#code-example)
       * [Module](human_protocol_sdk.kvstore.kvstore_utils.md#module)
       * [`KVStoreData`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData)
       * [`KVStoreUtils`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils)
+=======
+* [human_protocol_sdk.kvstore.kvstore_utils module](human_protocol_sdk.kvstore.kvstore_utils.md)
+  * [Code Example](human_protocol_sdk.kvstore.kvstore_utils.md#code-example)
+  * [Module](human_protocol_sdk.kvstore.kvstore_utils.md#module)
+  * [`KVStoreData`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData)
+    * [`KVStoreData.__init__()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData.__init__)
+  * [`KVStoreUtils`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils)
+    * [`KVStoreUtils.get()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get)
+    * [`KVStoreUtils.get_file_url_and_verify_hash()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get_file_url_and_verify_hash)
+    * [`KVStoreUtils.get_kvstore_data()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get_kvstore_data)
+    * [`KVStoreUtils.get_public_key()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get_public_key)
+>>>>>>> develop
 * [human_protocol_sdk.operator package](human_protocol_sdk.operator.md)
   * [Submodules](human_protocol_sdk.operator.md#submodules)
     * [human_protocol_sdk.operator.operator_utils module](human_protocol_sdk.operator.operator_utils.md)
@@ -114,7 +127,10 @@
       * [`TransactionData`](human_protocol_sdk.transaction.transaction_utils.md#human_protocol_sdk.transaction.transaction_utils.TransactionData)
       * [`TransactionUtils`](human_protocol_sdk.transaction.transaction_utils.md#human_protocol_sdk.transaction.transaction_utils.TransactionUtils)
       * [`TransactionUtilsError`](human_protocol_sdk.transaction.transaction_utils.md#human_protocol_sdk.transaction.transaction_utils.TransactionUtilsError)
+<<<<<<< HEAD
       * [`Transfer`](human_protocol_sdk.transaction.transaction_utils.md#human_protocol_sdk.transaction.transaction_utils.Transfer)
+=======
+>>>>>>> develop
 
 ## Submodules
 
@@ -142,6 +158,7 @@
     * [`KVStoreKeys.fee`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.fee)
     * [`KVStoreKeys.job_types`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.job_types)
     * [`KVStoreKeys.public_key`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.public_key)
+    * [`KVStoreKeys.registration_instructions`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.registration_instructions)
     * [`KVStoreKeys.registration_needed`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.registration_needed)
     * [`KVStoreKeys.role`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.role)
     * [`KVStoreKeys.url`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.url)

docs/sdk/python/human_protocol_sdk.operator.operator_utils.md

@@ -17,6 +17,7 @@ print(
 
 ## Module
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ### *class* human_protocol_sdk.operator.operator_utils.LeaderData(chain_id, id, address, amount_staked, amount_allocated, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, url=None, job_types=None, registration_needed=None, registration_instructions=None, reputation_networks=None)
 
@@ -30,6 +31,13 @@ Bases: `object`
 
 #### \_\_init_\_(chain_id, id, address, amount_staked, amount_allocated, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, url=None, job_types=None)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+### *class* human_protocol_sdk.operator.operator_utils.LeaderData(chain_id, id, address, amount_staked, amount_allocated, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reputation, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, url=None, job_types=None, registration_needed=None, registration_instructions=None)
+
+Bases: `object`
+
+#### \_\_init_\_(chain_id, id, address, amount_staked, amount_allocated, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reputation, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, url=None, job_types=None, registration_needed=None, registration_instructions=None)
+>>>>>>> develop
 
 Initializes an LeaderData instance.
 
@@ -51,12 +59,17 @@ Initializes an LeaderData instance.
   * **webhook_url** (`Optional`[`str`]) – Webhook url
   * **url** (`Optional`[`str`]) – Url
   * **job_types** (`Optional`[`List`[`str`]]) – Job types
+<<<<<<< HEAD
 <<<<<<< HEAD
   * **reputation_networks** (`Optional`[`List`[`str`]]) – List of reputation networks
   * **registration_needed** (`Optional`[`bool`]) – True,
   * **registration_instructions** (`Optional`[`str`]) – Instructions url,
 =======
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+  * **registration_needed** (`Optional`[`bool`]) – True,
+  * **registration_instructions** (`Optional`[`str`]) – Instructions url,
+>>>>>>> develop
 
 ### *class* human_protocol_sdk.operator.operator_utils.LeaderFilter(chain_id, role=None)
 
@@ -72,17 +85,19 @@ Initializes a LeaderFilter instance.
   * **chain_id** ([`ChainId`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId)) – Chain Id to request data
   * **role** (`Optional`[`str`]) – Leader role
 
-### *class* human_protocol_sdk.operator.operator_utils.Operator(address, role, url='', job_types=[])
+### *class* human_protocol_sdk.operator.operator_utils.Operator(address, role, url='', job_types=[], registration_needed=None, registration_instructions=None)
 
 Bases: `object`
 
-#### \_\_init_\_(address, role, url='', job_types=[])
+#### \_\_init_\_(address, role, url='', job_types=[], registration_needed=None, registration_instructions=None)
 
 Initializes an Operator instance.
 
 * **Parameters:**
   * **address** (`str`) – Operator address
   * **role** (`str`) – Role of the operator
+  * **registration_needed** (`Optional`[`bool`]) – True,
+  * **registration_instructions** (`Optional`[`str`]) – Instructions url,
 
 ### *class* human_protocol_sdk.operator.operator_utils.OperatorUtils
 
@@ -142,8 +157,6 @@ Get the reputation network operators of the specified address.
   * **chain_id** ([`ChainId`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId)) – Network in which the reputation network exists
   * **address** (`str`) – Address of the reputation oracle
   * **role** (`Optional`[`str`]) – (Optional) Role of the operator
-* **Parem job_types:**
-  (Optional) Job types of the operator
 * **Return type:**
   `List`[[`Operator`](#human_protocol_sdk.operator.operator_utils.Operator)]
 * **Returns:**

docs/sdk/python/index.md

@@ -32,6 +32,11 @@ pip install human-protocol-sdk[agreement]
       * [Submodules](human_protocol_sdk.escrow.md#submodules)
     * [human_protocol_sdk.kvstore package](human_protocol_sdk.kvstore.md)
       * [Submodules](human_protocol_sdk.kvstore.md#submodules)
+    * [human_protocol_sdk.kvstore.kvstore_utils module](human_protocol_sdk.kvstore.kvstore_utils.md)
+      * [Code Example](human_protocol_sdk.kvstore.kvstore_utils.md#code-example)
+      * [Module](human_protocol_sdk.kvstore.kvstore_utils.md#module)
+      * [`KVStoreData`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData)
+      * [`KVStoreUtils`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils)
     * [human_protocol_sdk.operator package](human_protocol_sdk.operator.md)
       * [Submodules](human_protocol_sdk.operator.md#submodules)
     * [human_protocol_sdk.staking package](human_protocol_sdk.staking.md)

docs/sdk/typescript/base/classes/BaseEthersClient.md

@@ -40,11 +40,15 @@ The network information required to connect to the contracts
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [base.ts:20](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
 =======
 [base.ts:20](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
+>>>>>>> develop
 
 ## Properties
 
@@ -54,11 +58,15 @@ The network information required to connect to the contracts
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [base.ts:12](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 =======
 [base.ts:12](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+>>>>>>> develop
 
 ***
 
@@ -68,8 +76,12 @@ The network information required to connect to the contracts
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [base.ts:11](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 =======
 [base.ts:11](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+>>>>>>> develop

docs/sdk/typescript/encryption/classes/Encryption.md

@@ -65,11 +65,15 @@ The private key.
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [encryption.ts:52](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L52)
 =======
 [encryption.ts:53](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L53)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[encryption.ts:52](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L52)
+>>>>>>> develop
 
 ## Methods
 
@@ -121,11 +125,15 @@ const resultMessage = await encription.decrypt('message');
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [encryption.ts:179](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L179)
 =======
 [encryption.ts:180](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L180)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[encryption.ts:179](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L179)
+>>>>>>> develop
 
 ***
 
@@ -161,11 +169,15 @@ const resultMessage = await encription.sign('message');
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [encryption.ts:216](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L216)
 =======
 [encryption.ts:217](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L217)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[encryption.ts:216](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L216)
+>>>>>>> develop
 
 ***
 
@@ -230,11 +242,15 @@ const resultMessage = await encription.signAndEncrypt('message', publicKeys);
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [encryption.ts:128](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L128)
 =======
 [encryption.ts:129](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L129)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[encryption.ts:128](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L128)
+>>>>>>> develop
 
 ***
 
@@ -262,8 +278,12 @@ Optional: The passphrase for the private key.
 
 #### Defined in
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [encryption.ts:63](https://github.com/humanprotocol/human-protocol/blob/9ddd51f9c9a3ec97c56d6ffbca5fe9048b9ea0f8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L63)
 =======
 [encryption.ts:64](https://github.com/humanprotocol/human-protocol/blob/c09869ece39906cbc45f3dc508e1338970deeec5/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L64)
 >>>>>>> parent of cc79357b2 ([Subgraph][SDK] Add registration data to leaders entity (#2451))
+=======
+[encryption.ts:63](https://github.com/humanprotocol/human-protocol/blob/95ed623c67878973c127c8529a78774329277e86/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L63)
+>>>>>>> develop